From patchwork Wed Oct 14 14:12:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 80749 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 99904A04B7; Wed, 14 Oct 2020 16:13:42 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 172B91DDA3; Wed, 14 Oct 2020 16:13:23 +0200 (CEST) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by dpdk.org (Postfix) with ESMTP id 3A05E1DB7A; Wed, 14 Oct 2020 16:13:20 +0200 (CEST) IronPort-SDR: REh5s0EeQnlHC7iwWDyfH33XEnijwhfgLp/ZvKed/FPjfLjuv4s+hC/7fAia4hYoItZkZO7zeL 1Ws8EX+fbVOA== X-IronPort-AV: E=McAfee;i="6000,8403,9773"; a="145421258" X-IronPort-AV: E=Sophos;i="5.77,374,1596524400"; d="scan'208";a="145421258" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Oct 2020 07:13:19 -0700 IronPort-SDR: au/Ljnj0lGf1cAqG93ED6t2o5TClPGAbUpRvC+Adrp6ByMfkK6onznB5ACOVhouxCTH8Vv1Y/Y fSCK6uBhIo5w== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,374,1596524400"; d="scan'208";a="299965375" Received: from silpixa00399126.ir.intel.com ([10.237.222.4]) by fmsmga007.fm.intel.com with ESMTP; 14 Oct 2020 07:13:18 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: david.marchand@redhat.com, arybchenko@solarflare.com, ferruh.yigit@intel.com, thomas@monjalon.net, bluca@debian.org, Bruce Richardson , stable@dpdk.org Date: Wed, 14 Oct 2020 15:12:58 +0100 Message-Id: <20201014141304.632120-2-bruce.richardson@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201014141304.632120-1-bruce.richardson@intel.com> References: <20200916164429.244847-1-bruce.richardson@intel.com> <20201014141304.632120-1-bruce.richardson@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v3 1/7] app: fix missing dependencies X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" A number of lib and driver dependencies for various apps were missed on build because the proper macro names for their use were mismatched between meson and make build systems. Before adding in equivalent compatibility macros we need to ensure to add the proper dependencies to ensure a valid build. Fixes: 16ade738fd0d ("app/testpmd: build with meson") Fixes: b5dc795a8a55 ("test: build app with meson as dpdk-test") Fixes: 996ef1176111 ("app: add all remaining apps to meson build") Cc: stable@dpdk.org Signed-off-by: Bruce Richardson Acked-by: Luca Boccassi --- app/test-crypto-perf/meson.build | 3 +++ app/test-pmd/meson.build | 12 ++++++++++++ 2 files changed, 15 insertions(+) diff --git a/app/test-crypto-perf/meson.build b/app/test-crypto-perf/meson.build index f394b75ba..4bd71510d 100644 --- a/app/test-crypto-perf/meson.build +++ b/app/test-crypto-perf/meson.build @@ -12,3 +12,6 @@ sources = files('cperf_ops.c', 'cperf_test_verify.c', 'main.c') deps += ['cryptodev', 'net', 'security'] +if dpdk_conf.has('RTE_LIBRTE_PMD_CRYPTO_SCHEDULER') + deps += 'pmd_crypto_scheduler' +endif diff --git a/app/test-pmd/meson.build b/app/test-pmd/meson.build index f52ab148f..0d9e45049 100644 --- a/app/test-pmd/meson.build +++ b/app/test-pmd/meson.build @@ -31,6 +31,18 @@ endif if dpdk_conf.has('RTE_LIBRTE_PDUMP') deps += 'pdump' endif +if dpdk_conf.has('RTE_LIBRTE_BITRATESTATS') + deps += 'bitratestats' +endif +if dpdk_conf.has('RTE_LIBRTE_LATENCYSTATS') + deps += 'latencystats' +endif +if dpdk_conf.has('RTE_LIBRTE_PMD_CRYPTO_SCHEDULER') + deps += 'pmd_crypto_scheduler' +endif +if dpdk_conf.has('RTE_LIBRTE_BOND_PMD') + deps += 'pmd_bond' +endif if dpdk_conf.has('RTE_LIBRTE_BNXT_PMD') deps += 'pmd_bnxt' endif From patchwork Wed Oct 14 14:12:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 80750 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id D0F15A04B7; Wed, 14 Oct 2020 16:14:12 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 70A861DE6A; Wed, 14 Oct 2020 16:13:35 +0200 (CEST) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by dpdk.org (Postfix) with ESMTP id D301F1DB6B; Wed, 14 Oct 2020 16:13:31 +0200 (CEST) IronPort-SDR: Eq8ATqSGMCD1CpoJU1og9PL09qQ3Dd2m1dPOfkaHA9pwWZr9LNJZZFe21e+UcSQSr0v8Bdd6iq KS75qOb91w+A== X-IronPort-AV: E=McAfee;i="6000,8403,9773"; a="145421278" X-IronPort-AV: E=Sophos;i="5.77,374,1596524400"; d="scan'208";a="145421278" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Oct 2020 07:13:22 -0700 IronPort-SDR: wgcW5lCTFya9JFJ9BMOYKomfXFFhFUAVFTH3F33CttyekkEGXqJuRYBbFkKa7+mwVXgeTsXHkt qTCtsaXhA4ZA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,374,1596524400"; d="scan'208";a="299965388" Received: from silpixa00399126.ir.intel.com ([10.237.222.4]) by fmsmga007.fm.intel.com with ESMTP; 14 Oct 2020 07:13:20 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: david.marchand@redhat.com, arybchenko@solarflare.com, ferruh.yigit@intel.com, thomas@monjalon.net, bluca@debian.org, Bruce Richardson , stable@dpdk.org Date: Wed, 14 Oct 2020 15:12:59 +0100 Message-Id: <20201014141304.632120-3-bruce.richardson@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201014141304.632120-1-bruce.richardson@intel.com> References: <20200916164429.244847-1-bruce.richardson@intel.com> <20201014141304.632120-1-bruce.richardson@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v3 2/7] examples/l2fwd-crypto: fix missing dependency X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" When the crypto-scheduler support is enabled, we were missing the dependency on it as part of the meson build. Fixes: 89f0711f9ddf ("examples: build some samples with meson") Cc: stable@dpdk.org Signed-off-by: Bruce Richardson Acked-by: Luca Boccassi --- examples/l2fwd-crypto/meson.build | 3 +++ 1 file changed, 3 insertions(+) diff --git a/examples/l2fwd-crypto/meson.build b/examples/l2fwd-crypto/meson.build index 6c852ad19..39e1604fa 100644 --- a/examples/l2fwd-crypto/meson.build +++ b/examples/l2fwd-crypto/meson.build @@ -7,6 +7,9 @@ # DPDK instance, use 'make' deps += 'cryptodev' +if dpdk_conf.has('RTE_LIBRTE_PMD_CRYPTO_SCHEDULER') + deps += 'pmd_crypto_scheduler' +endif allow_experimental_apis = true sources = files( 'main.c' From patchwork Wed Oct 14 14:13:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 80751 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id A22FFA04B7; Wed, 14 Oct 2020 16:14:40 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 667471DE7A; Wed, 14 Oct 2020 16:13:37 +0200 (CEST) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by dpdk.org (Postfix) with ESMTP id 450811DE68; Wed, 14 Oct 2020 16:13:33 +0200 (CEST) IronPort-SDR: hiRZVl2uF/Ii/WDdPoj4snziTE578x3tLez+5YjPp59cmh3NB9y5WsQwF63f88XYbmh7rVhWvf 9HpnbYeMOPAQ== X-IronPort-AV: E=McAfee;i="6000,8403,9773"; a="145421299" X-IronPort-AV: E=Sophos;i="5.77,374,1596524400"; d="scan'208";a="145421299" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Oct 2020 07:13:25 -0700 IronPort-SDR: aifOBv1QxCu/C0UKjsixIXVdeuzhYPgSfTbxv6BKlu13aaWH+X/X5n0j66xLiXRs5BU46u3eGc T1Uc7yb6rjNw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,374,1596524400"; d="scan'208";a="299965400" Received: from silpixa00399126.ir.intel.com ([10.237.222.4]) by fmsmga007.fm.intel.com with ESMTP; 14 Oct 2020 07:13:23 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: david.marchand@redhat.com, arybchenko@solarflare.com, ferruh.yigit@intel.com, thomas@monjalon.net, bluca@debian.org, Bruce Richardson , stable@dpdk.org Date: Wed, 14 Oct 2020 15:13:00 +0100 Message-Id: <20201014141304.632120-4-bruce.richardson@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201014141304.632120-1-bruce.richardson@intel.com> References: <20200916164429.244847-1-bruce.richardson@intel.com> <20201014141304.632120-1-bruce.richardson@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v3 3/7] build: add defines for compatibility with make build X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" The defines used to indicate what crypto, compression and eventdev drivers were being built were different to those used in the make build, with meson defining them with "_PMD" at the end, while make defined them with "_PMD" in the middle and the specific driver name at the end. This might cause compatibility issues for applications which used the older defines, which switching to build against new DPDK releases. As well as changing the default to match that of make, meson also special-cases the crypto/compression/event drivers to have both defines provided. This ensures compatibility for these macros with both meson and make from older versions. For a selection of other libraries and drivers, there were other incompatibilities between the meson and make-defined macros which were not previously highlighted in a deprecation notice, so we add per-macro compatibility defines for these to ease the transition from make to meson. Fixes: 5b9656b157d3 ("lib: build with meson") Fixes: 9314afb68a53 ("drivers: add infrastructure for meson build") Fixes: dcadbbde8e61 ("crypto/null: build with meson") Fixes: 3c32e89f68e1 ("compress/isal: add skeleton ISA-L compression PMD") Fixes: eca504f318db ("drivers/event: build skeleton and SW drivers with meson") Cc: stable@dpdk.org Signed-off-by: Bruce Richardson Acked-by: Luca Boccassi --- app/test/meson.build | 1 + config/meson.build | 3 +- config/rte_compatibility_defines.h | 129 +++++++++++++++++++++++++++++ config/rte_config.h | 1 + drivers/compress/meson.build | 2 +- drivers/crypto/meson.build | 2 +- drivers/event/meson.build | 2 +- drivers/meson.build | 15 ++++ 8 files changed, 151 insertions(+), 4 deletions(-) create mode 100644 config/rte_compatibility_defines.h diff --git a/app/test/meson.build b/app/test/meson.build index dedf29dd7..fc90a1909 100644 --- a/app/test/meson.build +++ b/app/test/meson.build @@ -415,6 +415,7 @@ endif if dpdk_conf.has('RTE_LIBRTE_PMD_CRYPTO_SCHEDULER') driver_test_names += 'cryptodev_scheduler_autotest' + test_deps += 'pmd_crypto_scheduler' endif foreach d:test_deps diff --git a/config/meson.build b/config/meson.build index d0e593226..89bffc85a 100644 --- a/config/meson.build +++ b/config/meson.build @@ -253,7 +253,8 @@ dpdk_conf.set('RTE_COMPILE_TIME_CPUFLAGS', ','.join(compile_time_cpuflags)) # set the install path for the drivers dpdk_conf.set_quoted('RTE_EAL_PMD_PATH', eal_pmd_path) -install_headers('rte_config.h', subdir: get_option('include_subdir_arch')) +install_headers(['rte_config.h', 'rte_compatibility_defines.h'], + subdir: get_option('include_subdir_arch')) # enable VFIO only if it is linux OS dpdk_conf.set('RTE_EAL_VFIO', is_linux) diff --git a/config/rte_compatibility_defines.h b/config/rte_compatibility_defines.h new file mode 100644 index 000000000..47600052b --- /dev/null +++ b/config/rte_compatibility_defines.h @@ -0,0 +1,129 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2017 Intel Corporation + */ + +#ifndef _RTE_CONFIG_H_ +#error "This file should only be included via rte_config.h" +#endif + +/* + * NOTE: these defines are for compatibility only and will be removed in a + * future DPDK release. + */ + +#ifdef RTE_LIBRTE_BITRATESTATS +#define RTE_LIBRTE_BITRATE +#endif + +#ifdef RTE_LIBRTE_LATENCYSTATS +#define RTE_LIBRTE_LATENCY_STATS +#endif + +#ifdef RTE_LIBRTE_DPAAX_COMMON +#define RTE_LIBRTE_COMMON_DPAAX +#endif + +#ifdef RTE_LIBRTE_VMBUS_BUS +#define RTE_LIBRTE_VMBUS +#endif + +#ifdef RTE_LIBRTE_BUCKET_MEMPOOL +#define RTE_DRIVER_MEMPOOL_BUCKET +#endif + +#ifdef RTE_LIBRTE_RING_MEMPOOL +#define RTE_DRIVER_MEMPOOL_RING +#endif + +#ifdef RTE_LIBRTE_STACK_MEMPOOL +#define RTE_DRIVER_MEMPOOL_STACK +#endif + +#ifdef RTE_LIBRTE_AF_PACKET_PMD +#define RTE_LIBRTE_PMD_AF_PACKET +#endif + +#ifdef RTE_LIBRTE_AF_XDP_PMD +#define RTE_LIBRTE_PMD_AF_XDP +#endif + +#ifdef RTE_LIBRTE_BOND_PMD +#define RTE_LIBRTE_PMD_BOND +#endif + +#ifdef RTE_LIBRTE_E1000_PMD +#define RTE_LIBRTE_EM_PMD +#endif + +#ifdef RTE_LIBRTE_E1000_PMD +#define RTE_LIBRTE_IGB_PMD +#endif + +#ifdef RTE_LIBRTE_FAILSAFE_PMD +#define RTE_LIBRTE_PMD_FAILSAFE +#endif + +#ifdef RTE_LIBRTE_KNI_PMD +#define RTE_LIBRTE_PMD_KNI +#endif + +#ifdef RTE_LIBRTE_LIQUIDIO_PMD +#define RTE_LIBRTE_LIO_PMD +#endif + +#ifdef RTE_LIBRTE_MEMIF_PMD +#define RTE_LIBRTE_PMD_MEMIF +#endif + +#ifdef RTE_LIBRTE_NULL_PMD +#define RTE_LIBRTE_PMD_NULL +#endif + +#ifdef RTE_LIBRTE_PCAP_PMD +#define RTE_LIBRTE_PMD_PCAP +#endif + +#ifdef RTE_LIBRTE_RING_PMD +#define RTE_LIBRTE_PMD_RING +#endif + +#ifdef RTE_LIBRTE_SFC_PMD +#define RTE_LIBRTE_SFC_EFX_PMD +#endif + +#ifdef RTE_LIBRTE_SOFTNIC_PMD +#define RTE_LIBRTE_PMD_SOFTNIC +#endif + +#ifdef RTE_LIBRTE_SZEDATA2_PMD +#define RTE_LIBRTE_PMD_SZEDATA2 +#endif + +#ifdef RTE_LIBRTE_TAP_PMD +#define RTE_LIBRTE_PMD_TAP +#endif + +#ifdef RTE_LIBRTE_THUNDERX_PMD +#define RTE_LIBRTE_THUNDERX_NICVF_PMD +#endif + +#ifdef RTE_LIBRTE_VHOST_PMD +#define RTE_LIBRTE_PMD_VHOST +#endif + +#ifdef RTE_LIBRTE_PMD_ARMV8 +#define RTE_LIBRTE_PMD_ARMV8_CRYPTO +#endif + +#ifdef RTE_LIBRTE_PMD_MVSAM +#define RTE_LIBRTE_PMD_MVSAM_CRYPTO +#endif + +#ifdef RTE_LIBRTE_PMD_OCTEONTX_COMPRESS +#define RTE_LIBRTE_PMD_OCTEONTX_ZIPVF +#endif + +#ifdef RTE_LIBRTE_PMD_OCTEONTX_EVENTDEV +#define RTE_LIBRTE_PMD_OCTEONTX_SSOVF +#endif + diff --git a/config/rte_config.h b/config/rte_config.h index 03d90d78b..1bebab335 100644 --- a/config/rte_config.h +++ b/config/rte_config.h @@ -13,6 +13,7 @@ #define _RTE_CONFIG_H_ #include +#include /* legacy defines */ #ifdef RTE_EXEC_ENV_LINUX diff --git a/drivers/compress/meson.build b/drivers/compress/meson.build index ee883c3f9..bea1720a0 100644 --- a/drivers/compress/meson.build +++ b/drivers/compress/meson.build @@ -8,5 +8,5 @@ endif drivers = ['isal', 'octeontx', 'qat', 'zlib'] std_deps = ['compressdev'] # compressdev pulls in all other needed deps -config_flag_fmt = 'RTE_LIBRTE_@0@_PMD' +config_flag_fmt = 'RTE_LIBRTE_PMD_@0@' driver_name_fmt = 'rte_pmd_@0@' diff --git a/drivers/crypto/meson.build b/drivers/crypto/meson.build index a2423507a..25b99c19c 100644 --- a/drivers/crypto/meson.build +++ b/drivers/crypto/meson.build @@ -26,5 +26,5 @@ drivers = ['aesni_gcm', 'zuc'] std_deps = ['cryptodev'] # cryptodev pulls in all other needed deps -config_flag_fmt = 'RTE_LIBRTE_@0@_PMD' +config_flag_fmt = 'RTE_LIBRTE_PMD_@0@' driver_name_fmt = 'rte_pmd_@0@' diff --git a/drivers/event/meson.build b/drivers/event/meson.build index ebe76a75c..f2a343147 100644 --- a/drivers/event/meson.build +++ b/drivers/event/meson.build @@ -11,5 +11,5 @@ if not (toolchain == 'gcc' and cc.version().version_compare('<4.8.6') and drivers += 'octeontx' endif std_deps = ['eventdev', 'kvargs'] -config_flag_fmt = 'RTE_LIBRTE_@0@_EVENTDEV_PMD' +config_flag_fmt = 'RTE_LIBRTE_PMD_@0@_EVENTDEV' driver_name_fmt = 'rte_pmd_@0@_event' diff --git a/drivers/meson.build b/drivers/meson.build index 5f9526557..b5ac483d3 100644 --- a/drivers/meson.build +++ b/drivers/meson.build @@ -117,6 +117,21 @@ foreach subpath:subdirs fmt_name = name endif dpdk_conf.set(config_flag_fmt.format(fmt_name.to_upper()),1) + # for driver compatibility, since we changed the + # default to match that of make. Remove in future release + # after following deprecation process + if config_flag_fmt.contains('_PMD_@0@') and (class == 'crypto' + or class == 'compress' + or class == 'event') + alt_flag_fmt = '_@0@_PMD'.join( + config_flag_fmt.split('_PMD_@0@')) + if config_flag_fmt.contains('EVENTDEV') + alt_flag_fmt = '_@0@_EVENTDEV_PMD'.join( + config_flag_fmt.split('_PMD_@0@_EVENTDEV')) + endif + dpdk_conf.set(alt_flag_fmt.format( + fmt_name.to_upper()), 1) + endif lib_name = driver_name_fmt.format(fmt_name) dpdk_extra_ldflags += pkgconfig_extra_libs From patchwork Wed Oct 14 14:13:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 80752 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id B3002A04B7; Wed, 14 Oct 2020 16:15:08 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 661141DE85; Wed, 14 Oct 2020 16:13:39 +0200 (CEST) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by dpdk.org (Postfix) with ESMTP id B944C1DB6B for ; Wed, 14 Oct 2020 16:13:33 +0200 (CEST) IronPort-SDR: 2NCn3AE63XB/NDoRXe8qEk01Dzd5Qe5VHcroeQFliVqz7xqI1jD/iREnbPzLfqlbU2Wy93dwSm nq+loLPRfI3Q== X-IronPort-AV: E=McAfee;i="6000,8403,9773"; a="145421324" X-IronPort-AV: E=Sophos;i="5.77,374,1596524400"; d="scan'208";a="145421324" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Oct 2020 07:13:29 -0700 IronPort-SDR: WtRUmvbjpW8QTdvG57nkuZ5//BqLmdq6E6HhxbPik2PWiPse73xqAQVPFKly41YWJWy2NMyngI JISmMqH+KDvA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,374,1596524400"; d="scan'208";a="299965419" Received: from silpixa00399126.ir.intel.com ([10.237.222.4]) by fmsmga007.fm.intel.com with ESMTP; 14 Oct 2020 07:13:27 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: david.marchand@redhat.com, arybchenko@solarflare.com, ferruh.yigit@intel.com, thomas@monjalon.net, bluca@debian.org, Bruce Richardson Date: Wed, 14 Oct 2020 15:13:01 +0100 Message-Id: <20201014141304.632120-5-bruce.richardson@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201014141304.632120-1-bruce.richardson@intel.com> References: <20200916164429.244847-1-bruce.richardson@intel.com> <20201014141304.632120-1-bruce.richardson@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v3 4/7] qat: build from common folder X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Since the drivers in the common directory can be processed out of order, in this case following the "bus" directory, we can simplify somewhat the build of the QAT driver to be done entirely from the "common/qat" folder rather than having it's build distributed across 3 folders. This also opens up the possibility of building the QAT driver with crypto only and the compression part disabled. It further allows more sensible naming of the resulting shared library in case of standardizing library names based on device class; i.e. common_qat is more descriptive for a combined crypto/compression driver than either of the other two prefixes individually. Signed-off-by: Bruce Richardson Acked-by: Luca Boccassi --- drivers/common/meson.build | 2 +- drivers/common/qat/meson.build | 69 ++++++++++++++++--- .../qat/rte_common_qat_version.map} | 0 drivers/compress/meson.build | 2 +- drivers/compress/qat/meson.build | 17 ----- drivers/crypto/meson.build | 1 - drivers/crypto/qat/meson.build | 23 ------- drivers/meson.build | 1 + 8 files changed, 63 insertions(+), 52 deletions(-) rename drivers/{compress/qat/rte_pmd_qat_version.map => common/qat/rte_common_qat_version.map} (100%) delete mode 100644 drivers/compress/qat/meson.build delete mode 100644 drivers/crypto/qat/meson.build diff --git a/drivers/common/meson.build b/drivers/common/meson.build index 7ac1ca73a..abb4f1529 100644 --- a/drivers/common/meson.build +++ b/drivers/common/meson.build @@ -6,6 +6,6 @@ if is_windows endif std_deps = ['eal'] -drivers = ['cpt', 'dpaax', 'iavf', 'mvep', 'octeontx', 'octeontx2', 'qat', 'sfc_efx'] +drivers = ['cpt', 'dpaax', 'iavf', 'mvep', 'octeontx', 'octeontx2', 'sfc_efx'] config_flag_fmt = 'RTE_LIBRTE_@0@_COMMON' driver_name_fmt = 'rte_common_@0@' diff --git a/drivers/common/qat/meson.build b/drivers/common/qat/meson.build index 8de249289..3409162d0 100644 --- a/drivers/common/qat/meson.build +++ b/drivers/common/qat/meson.build @@ -1,15 +1,66 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017-2018 Intel Corporation -# This does not build a driver, but instead holds common files for -# the crypto and compression drivers. -build = false -reason = '' # sentinal value to suppress printout -qat_deps = ['bus_pci'] -qat_sources = files('qat_common.c', +config_flag_fmt = 'RTE_LIBRTE_@0@_COMMON' +driver_name_fmt = 'rte_common_@0@' + +qat_crypto = true +qat_crypto_path = 'crypto/qat' +qat_crypto_relpath = '../../' + qat_crypto_path +qat_compress = true +qat_compress_path = 'compress/qat' +qat_compress_relpath = '../../' + qat_compress_path + +if disabled_drivers.contains(qat_crypto_path) + qat_crypto = false + dpdk_drvs_disabled += qat_crypto_path + set_variable(qat_crypto_path.underscorify() + '_disable_reason', + 'Explicitly disabled via build config') +endif +if disabled_drivers.contains(qat_compress_path) + qat_compress = false + dpdk_drvs_disabled += qat_compress_path + set_variable(qat_compress_path.underscorify() + '_disable_reason', + 'Explicitly disabled via build config') +endif + +libcrypto = dependency('libcrypto', required: false) +if qat_crypto and not libcrypto.found() + qat_crypto = false + dpdk_drvs_disabled += qat_crypto_path + set_variable(qat_crypto_path.underscorify() + '_disable_reason', + 'missing dependency, libcrypto') +endif + +# The driver should not build if both compression and crypto are disabled +#FIXME common code depends on compression files so check only compress! +if not qat_compress # and not qat_crypto + build = false + reason = '' # rely on reason for compress/crypto above + subdir_done() +endif + +deps += ['bus_pci', 'cryptodev', 'net', 'compressdev'] +sources += files('qat_common.c', 'qat_qp.c', 'qat_device.c', 'qat_logs.c') -qat_includes = [include_directories('.', 'qat_adf')] -qat_ext_deps = [] -qat_cflags = [] +includes += include_directories('qat_adf', + qat_crypto_relpath, + qat_compress_relpath) + +if qat_compress + foreach f: ['qat_comp_pmd.c', 'qat_comp.c'] + sources += files(join_paths(qat_compress_relpath, f)) + endforeach +endif + +if qat_crypto + foreach f: ['qat_sym_pmd.c', 'qat_sym.c', 'qat_sym_session.c', + 'qat_asym_pmd.c', 'qat_asym.c'] + sources += files(join_paths(qat_crypto_relpath, f)) + endforeach + deps += ['security'] + ext_deps += libcrypto + cflags += ['-DBUILD_QAT_SYM', '-DBUILD_QAT_ASYM'] +endif diff --git a/drivers/compress/qat/rte_pmd_qat_version.map b/drivers/common/qat/rte_common_qat_version.map similarity index 100% rename from drivers/compress/qat/rte_pmd_qat_version.map rename to drivers/common/qat/rte_common_qat_version.map diff --git a/drivers/compress/meson.build b/drivers/compress/meson.build index bea1720a0..3a4723c0c 100644 --- a/drivers/compress/meson.build +++ b/drivers/compress/meson.build @@ -5,7 +5,7 @@ if is_windows subdir_done() endif -drivers = ['isal', 'octeontx', 'qat', 'zlib'] +drivers = ['isal', 'octeontx', 'zlib'] std_deps = ['compressdev'] # compressdev pulls in all other needed deps config_flag_fmt = 'RTE_LIBRTE_PMD_@0@' diff --git a/drivers/compress/qat/meson.build b/drivers/compress/qat/meson.build deleted file mode 100644 index a00246980..000000000 --- a/drivers/compress/qat/meson.build +++ /dev/null @@ -1,17 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017-2018 Intel Corporation - - -# Add our sources files to the list -qat_sources += files('qat_comp_pmd.c', - 'qat_comp.c') -qat_includes += include_directories('.') -qat_deps += 'compressdev' -qat_ext_deps += dep - -# build the whole driver -sources += qat_sources -cflags += qat_cflags -deps += qat_deps -ext_deps += qat_ext_deps -includes += qat_includes diff --git a/drivers/crypto/meson.build b/drivers/crypto/meson.build index 25b99c19c..bd7a940e6 100644 --- a/drivers/crypto/meson.build +++ b/drivers/crypto/meson.build @@ -19,7 +19,6 @@ drivers = ['aesni_gcm', 'octeontx', 'octeontx2', 'openssl', - 'qat', 'scheduler', 'snow3g', 'virtio', diff --git a/drivers/crypto/qat/meson.build b/drivers/crypto/qat/meson.build deleted file mode 100644 index a225f374a..000000000 --- a/drivers/crypto/qat/meson.build +++ /dev/null @@ -1,23 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017-2018 Intel Corporation - -# this does not build the QAT driver, instead that is done in the compression -# driver which comes later. Here we just add our sources files to the list -build = false -reason = '' # sentinal value to suppress printout -dep = dependency('libcrypto', required: false) -qat_includes += include_directories('.') -qat_deps += 'cryptodev' -qat_deps += 'net' -qat_deps += 'security' -if dep.found() - # Add our sources files to the list - qat_sources += files('qat_sym_pmd.c', - 'qat_sym.c', - 'qat_sym_session.c', - 'qat_asym_pmd.c', - 'qat_asym.c') - qat_ext_deps += dep - qat_cflags += '-DBUILD_QAT_SYM' - qat_cflags += '-DBUILD_QAT_ASYM' -endif diff --git a/drivers/meson.build b/drivers/meson.build index b5ac483d3..b95b00583 100644 --- a/drivers/meson.build +++ b/drivers/meson.build @@ -6,6 +6,7 @@ subdirs = [ 'common', 'bus', 'common/mlx5', # depends on bus. + 'common/qat', # depends on bus. 'mempool', # depends on common and bus. 'net', # depends on common, bus, mempool 'raw', # depends on common, bus and net. From patchwork Wed Oct 14 14:13:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 80753 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id E5745A04B7; Wed, 14 Oct 2020 16:15:35 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 19B4A1DE8B; Wed, 14 Oct 2020 16:13:42 +0200 (CEST) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by dpdk.org (Postfix) with ESMTP id 649151DE79 for ; Wed, 14 Oct 2020 16:13:36 +0200 (CEST) IronPort-SDR: dAZV4vsSqkTqiBwwfQU+s+lm3S0zQy68BSqLwL/5wYL4PPcrtvtenBIwYTZVAjmGVh8cKkwBx4 IO2pZruXTLWg== X-IronPort-AV: E=McAfee;i="6000,8403,9773"; a="145421361" X-IronPort-AV: E=Sophos;i="5.77,374,1596524400"; d="scan'208";a="145421361" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Oct 2020 07:13:34 -0700 IronPort-SDR: 1EX1BgbvGQgqz+R19Zgf1d+Z14JT+ok4eQnwzNdARwT6LlyWhUkWYTeqHL27q2E7UgbetWgaI5 ODI+e8UeUVTg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,374,1596524400"; d="scan'208";a="299965431" Received: from silpixa00399126.ir.intel.com ([10.237.222.4]) by fmsmga007.fm.intel.com with ESMTP; 14 Oct 2020 07:13:32 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: david.marchand@redhat.com, arybchenko@solarflare.com, ferruh.yigit@intel.com, thomas@monjalon.net, bluca@debian.org, Bruce Richardson Date: Wed, 14 Oct 2020 15:13:02 +0100 Message-Id: <20201014141304.632120-6-bruce.richardson@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201014141304.632120-1-bruce.richardson@intel.com> References: <20200916164429.244847-1-bruce.richardson@intel.com> <20201014141304.632120-1-bruce.richardson@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v3 5/7] build: remove library name from version map filename X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Since each version map file is contained in the subdirectory of the library it refers to, there is no need to include the library name in the filename. This makes things simpler in case of library renaming. Signed-off-by: Bruce Richardson Acked-by: Luca Boccassi --- .../{rte_pmd_bbdev_fpga_5gnr_fec_version.map => version.map} | 0 .../{rte_pmd_bbdev_fpga_lte_fec_version.map => version.map} | 0 .../null/{rte_pmd_bbdev_null_version.map => version.map} | 0 .../{rte_pmd_bbdev_turbo_sw_version.map => version.map} | 0 drivers/bus/dpaa/{rte_bus_dpaa_version.map => version.map} | 0 drivers/bus/fslmc/{rte_bus_fslmc_version.map => version.map} | 0 drivers/bus/ifpga/{rte_bus_ifpga_version.map => version.map} | 0 drivers/bus/pci/{rte_bus_pci_version.map => version.map} | 0 drivers/bus/vdev/{rte_bus_vdev_version.map => version.map} | 0 drivers/bus/vmbus/{rte_bus_vmbus_version.map => version.map} | 0 .../common/cpt/{rte_common_cpt_version.map => version.map} | 0 .../dpaax/{rte_common_dpaax_version.map => version.map} | 0 .../common/iavf/{rte_common_iavf_version.map => version.map} | 0 .../common/mlx5/{rte_common_mlx5_version.map => version.map} | 0 .../common/mvep/{rte_common_mvep_version.map => version.map} | 0 .../octeontx/{rte_common_octeontx_version.map => version.map} | 0 .../{rte_common_octeontx2_version.map => version.map} | 0 .../common/qat/{rte_common_qat_version.map => version.map} | 0 .../sfc_efx/{rte_common_sfc_efx_version.map => version.map} | 0 .../compress/isal/{rte_pmd_isal_version.map => version.map} | 0 .../{rte_pmd_octeontx_compress_version.map => version.map} | 0 .../compress/zlib/{rte_pmd_zlib_version.map => version.map} | 0 .../aesni_gcm/{rte_pmd_aesni_gcm_version.map => version.map} | 0 .../aesni_mb/{rte_pmd_aesni_mb_version.map => version.map} | 0 .../crypto/armv8/{rte_pmd_armv8_version.map => version.map} | 0 .../caam_jr/{rte_pmd_caam_jr_version.map => version.map} | 0 drivers/crypto/ccp/{rte_pmd_ccp_version.map => version.map} | 0 .../dpaa2_sec/{rte_pmd_dpaa2_sec_version.map => version.map} | 0 .../dpaa_sec/{rte_pmd_dpaa_sec_version.map => version.map} | 0 .../crypto/kasumi/{rte_pmd_kasumi_version.map => version.map} | 0 .../crypto/mvsam/{rte_pmd_mvsam_version.map => version.map} | 0 .../crypto/nitrox/{rte_pmd_nitrox_version.map => version.map} | 0 .../null/{rte_pmd_null_crypto_version.map => version.map} | 0 .../{rte_pmd_octeontx_crypto_version.map => version.map} | 0 .../{rte_pmd_octeontx2_crypto_version.map => version.map} | 0 .../openssl/{rte_pmd_openssl_version.map => version.map} | 0 .../{rte_pmd_crypto_scheduler_version.map => version.map} | 0 .../crypto/snow3g/{rte_pmd_snow3g_version.map => version.map} | 0 .../virtio/{rte_pmd_virtio_crypto_version.map => version.map} | 0 drivers/crypto/zuc/{rte_pmd_zuc_version.map => version.map} | 0 .../dpaa/{rte_pmd_dpaa_event_version.map => version.map} | 0 .../dpaa2/{rte_pmd_dpaa2_event_version.map => version.map} | 0 .../event/dsw/{rte_pmd_dsw_event_version.map => version.map} | 0 .../{rte_pmd_octeontx_event_version.map => version.map} | 0 .../{rte_pmd_octeontx2_event_version.map => version.map} | 0 .../opdl/{rte_pmd_opdl_event_version.map => version.map} | 0 .../{rte_pmd_skeleton_event_version.map => version.map} | 0 .../event/sw/{rte_pmd_sw_event_version.map => version.map} | 0 .../bucket/{rte_mempool_bucket_version.map => version.map} | 0 .../dpaa/{rte_mempool_dpaa_version.map => version.map} | 0 .../dpaa2/{rte_mempool_dpaa2_version.map => version.map} | 0 .../{rte_mempool_octeontx_version.map => version.map} | 0 .../{rte_mempool_octeontx2_version.map => version.map} | 0 .../ring/{rte_mempool_ring_version.map => version.map} | 0 .../stack/{rte_mempool_stack_version.map => version.map} | 0 drivers/meson.build | 4 ++-- .../af_packet/{rte_pmd_af_packet_version.map => version.map} | 0 .../net/af_xdp/{rte_pmd_af_xdp_version.map => version.map} | 0 drivers/net/ark/{rte_pmd_ark_version.map => version.map} | 0 .../atlantic/{rte_pmd_atlantic_version.map => version.map} | 0 drivers/net/avp/{rte_pmd_avp_version.map => version.map} | 0 drivers/net/axgbe/{rte_pmd_axgbe_version.map => version.map} | 0 drivers/net/bnx2x/{rte_pmd_bnx2x_version.map => version.map} | 0 drivers/net/bnxt/{rte_pmd_bnxt_version.map => version.map} | 0 drivers/net/bonding/{rte_pmd_bond_version.map => version.map} | 0 drivers/net/cxgbe/{rte_pmd_cxgbe_version.map => version.map} | 0 drivers/net/dpaa/{rte_pmd_dpaa_version.map => version.map} | 0 drivers/net/dpaa2/{rte_pmd_dpaa2_version.map => version.map} | 0 drivers/net/e1000/{rte_pmd_e1000_version.map => version.map} | 0 drivers/net/ena/{rte_pmd_ena_version.map => version.map} | 0 drivers/net/enetc/{rte_pmd_enetc_version.map => version.map} | 0 drivers/net/enic/{rte_pmd_enic_version.map => version.map} | 0 .../failsafe/{rte_pmd_failsafe_version.map => version.map} | 0 drivers/net/fm10k/{rte_pmd_fm10k_version.map => version.map} | 0 drivers/net/hinic/{rte_pmd_hinic_version.map => version.map} | 0 drivers/net/hns3/{rte_pmd_hns3_version.map => version.map} | 0 drivers/net/i40e/{rte_pmd_i40e_version.map => version.map} | 0 drivers/net/iavf/{rte_pmd_iavf_version.map => version.map} | 0 drivers/net/ice/{rte_pmd_ice_version.map => version.map} | 0 drivers/net/igc/{rte_pmd_igc_version.map => version.map} | 0 drivers/net/ionic/{rte_pmd_ionic_version.map => version.map} | 0 .../net/ipn3ke/{rte_pmd_ipn3ke_version.map => version.map} | 0 drivers/net/ixgbe/{rte_pmd_ixgbe_version.map => version.map} | 0 drivers/net/kni/{rte_pmd_kni_version.map => version.map} | 0 .../liquidio/{rte_pmd_liquidio_version.map => version.map} | 0 drivers/net/memif/{rte_pmd_memif_version.map => version.map} | 0 drivers/net/mlx4/{rte_pmd_mlx4_version.map => version.map} | 0 drivers/net/mlx5/{rte_pmd_mlx5_version.map => version.map} | 0 .../net/mvneta/{rte_pmd_mvneta_version.map => version.map} | 0 drivers/net/mvpp2/{rte_pmd_mvpp2_version.map => version.map} | 0 .../net/netvsc/{rte_pmd_netvsc_version.map => version.map} | 0 drivers/net/nfb/{rte_pmd_nfb_version.map => version.map} | 0 drivers/net/nfp/{rte_pmd_nfp_version.map => version.map} | 0 drivers/net/null/{rte_pmd_null_version.map => version.map} | 0 .../octeontx/{rte_pmd_octeontx_version.map => version.map} | 0 .../octeontx2/{rte_pmd_octeontx2_version.map => version.map} | 0 drivers/net/pcap/{rte_pmd_pcap_version.map => version.map} | 0 drivers/net/pfe/{rte_pmd_pfe_version.map => version.map} | 0 drivers/net/qede/{rte_pmd_qede_version.map => version.map} | 0 drivers/net/ring/{rte_pmd_ring_version.map => version.map} | 0 drivers/net/sfc/{rte_pmd_sfc_version.map => version.map} | 0 .../net/softnic/{rte_pmd_softnic_version.map => version.map} | 0 .../szedata2/{rte_pmd_szedata2_version.map => version.map} | 0 drivers/net/tap/{rte_pmd_tap_version.map => version.map} | 0 .../thunderx/{rte_pmd_thunderx_version.map => version.map} | 0 .../{rte_pmd_vdev_netvsc_version.map => version.map} | 0 drivers/net/vhost/{rte_pmd_vhost_version.map => version.map} | 0 .../net/virtio/{rte_pmd_virtio_version.map => version.map} | 0 .../net/vmxnet3/{rte_pmd_vmxnet3_version.map => version.map} | 0 .../{rte_rawdev_dpaa2_cmdif_version.map => version.map} | 0 .../{rte_rawdev_dpaa2_qdma_version.map => version.map} | 0 .../raw/ifpga/{rte_rawdev_ifpga_version.map => version.map} | 0 drivers/raw/ioat/{rte_rawdev_ioat_version.map => version.map} | 0 drivers/raw/ntb/{rte_rawdev_ntb_version.map => version.map} | 0 .../{rte_rawdev_octeontx2_dma_version.map => version.map} | 0 .../{rte_rawdev_octeontx2_ep_version.map => version.map} | 0 .../skeleton/{rte_rawdev_skeleton_version.map => version.map} | 0 .../mlx5/{rte_pmd_mlx5_regex_version.map => version.map} | 0 .../{rte_pmd_octeontx2_regex_version.map => version.map} | 0 drivers/vdpa/ifc/{rte_pmd_ifc_version.map => version.map} | 0 .../vdpa/mlx5/{rte_pmd_mlx5_vdpa_version.map => version.map} | 0 lib/librte_acl/{rte_acl_version.map => version.map} | 0 lib/librte_bbdev/{rte_bbdev_version.map => version.map} | 0 .../{rte_bitratestats_version.map => version.map} | 0 lib/librte_bpf/{rte_bpf_version.map => version.map} | 0 lib/librte_cfgfile/{rte_cfgfile_version.map => version.map} | 0 lib/librte_cmdline/{rte_cmdline_version.map => version.map} | 0 .../{rte_compressdev_version.map => version.map} | 0 .../{rte_cryptodev_version.map => version.map} | 0 .../{rte_distributor_version.map => version.map} | 0 lib/librte_eal/{rte_eal_version.map => version.map} | 0 lib/librte_efd/{rte_efd_version.map => version.map} | 0 lib/librte_ethdev/{rte_ethdev_version.map => version.map} | 0 lib/librte_eventdev/{rte_eventdev_version.map => version.map} | 0 lib/librte_fib/{rte_fib_version.map => version.map} | 0 .../{rte_flow_classify_version.map => version.map} | 0 lib/librte_graph/{rte_graph_version.map => version.map} | 0 lib/librte_gro/{rte_gro_version.map => version.map} | 0 lib/librte_gso/{rte_gso_version.map => version.map} | 0 lib/librte_hash/{rte_hash_version.map => version.map} | 0 lib/librte_ip_frag/{rte_ip_frag_version.map => version.map} | 0 lib/librte_ipsec/{rte_ipsec_version.map => version.map} | 0 lib/librte_jobstats/{rte_jobstats_version.map => version.map} | 0 lib/librte_kni/{rte_kni_version.map => version.map} | 0 lib/librte_kvargs/{rte_kvargs_version.map => version.map} | 0 .../{rte_latencystats_version.map => version.map} | 0 lib/librte_lpm/{rte_lpm_version.map => version.map} | 0 lib/librte_mbuf/{rte_mbuf_version.map => version.map} | 0 lib/librte_member/{rte_member_version.map => version.map} | 0 lib/librte_mempool/{rte_mempool_version.map => version.map} | 0 lib/librte_meter/{rte_meter_version.map => version.map} | 0 lib/librte_metrics/{rte_metrics_version.map => version.map} | 0 lib/librte_net/{rte_net_version.map => version.map} | 0 lib/librte_node/{rte_node_version.map => version.map} | 0 lib/librte_pci/{rte_pci_version.map => version.map} | 0 lib/librte_pdump/{rte_pdump_version.map => version.map} | 0 lib/librte_pipeline/{rte_pipeline_version.map => version.map} | 0 lib/librte_port/{rte_port_version.map => version.map} | 0 lib/librte_power/{rte_power_version.map => version.map} | 0 lib/librte_rawdev/{rte_rawdev_version.map => version.map} | 0 lib/librte_rcu/{rte_rcu_version.map => version.map} | 0 lib/librte_regexdev/{rte_regexdev_version.map => version.map} | 0 lib/librte_reorder/{rte_reorder_version.map => version.map} | 0 lib/librte_rib/{rte_rib_version.map => version.map} | 0 lib/librte_ring/{rte_ring_version.map => version.map} | 0 lib/librte_sched/{rte_sched_version.map => version.map} | 0 lib/librte_security/{rte_security_version.map => version.map} | 0 lib/librte_stack/{rte_stack_version.map => version.map} | 0 lib/librte_table/{rte_table_version.map => version.map} | 0 .../{rte_telemetry_version.map => version.map} | 0 lib/librte_timer/{rte_timer_version.map => version.map} | 0 lib/librte_vhost/{rte_vhost_version.map => version.map} | 0 lib/meson.build | 4 ++-- 173 files changed, 4 insertions(+), 4 deletions(-) rename drivers/baseband/fpga_5gnr_fec/{rte_pmd_bbdev_fpga_5gnr_fec_version.map => version.map} (100%) rename drivers/baseband/fpga_lte_fec/{rte_pmd_bbdev_fpga_lte_fec_version.map => version.map} (100%) rename drivers/baseband/null/{rte_pmd_bbdev_null_version.map => version.map} (100%) rename drivers/baseband/turbo_sw/{rte_pmd_bbdev_turbo_sw_version.map => version.map} (100%) rename drivers/bus/dpaa/{rte_bus_dpaa_version.map => version.map} (100%) rename drivers/bus/fslmc/{rte_bus_fslmc_version.map => version.map} (100%) rename drivers/bus/ifpga/{rte_bus_ifpga_version.map => version.map} (100%) rename drivers/bus/pci/{rte_bus_pci_version.map => version.map} (100%) rename drivers/bus/vdev/{rte_bus_vdev_version.map => version.map} (100%) rename drivers/bus/vmbus/{rte_bus_vmbus_version.map => version.map} (100%) rename drivers/common/cpt/{rte_common_cpt_version.map => version.map} (100%) rename drivers/common/dpaax/{rte_common_dpaax_version.map => version.map} (100%) rename drivers/common/iavf/{rte_common_iavf_version.map => version.map} (100%) rename drivers/common/mlx5/{rte_common_mlx5_version.map => version.map} (100%) rename drivers/common/mvep/{rte_common_mvep_version.map => version.map} (100%) rename drivers/common/octeontx/{rte_common_octeontx_version.map => version.map} (100%) rename drivers/common/octeontx2/{rte_common_octeontx2_version.map => version.map} (100%) rename drivers/common/qat/{rte_common_qat_version.map => version.map} (100%) rename drivers/common/sfc_efx/{rte_common_sfc_efx_version.map => version.map} (100%) rename drivers/compress/isal/{rte_pmd_isal_version.map => version.map} (100%) rename drivers/compress/octeontx/{rte_pmd_octeontx_compress_version.map => version.map} (100%) rename drivers/compress/zlib/{rte_pmd_zlib_version.map => version.map} (100%) rename drivers/crypto/aesni_gcm/{rte_pmd_aesni_gcm_version.map => version.map} (100%) rename drivers/crypto/aesni_mb/{rte_pmd_aesni_mb_version.map => version.map} (100%) rename drivers/crypto/armv8/{rte_pmd_armv8_version.map => version.map} (100%) rename drivers/crypto/caam_jr/{rte_pmd_caam_jr_version.map => version.map} (100%) rename drivers/crypto/ccp/{rte_pmd_ccp_version.map => version.map} (100%) rename drivers/crypto/dpaa2_sec/{rte_pmd_dpaa2_sec_version.map => version.map} (100%) rename drivers/crypto/dpaa_sec/{rte_pmd_dpaa_sec_version.map => version.map} (100%) rename drivers/crypto/kasumi/{rte_pmd_kasumi_version.map => version.map} (100%) rename drivers/crypto/mvsam/{rte_pmd_mvsam_version.map => version.map} (100%) rename drivers/crypto/nitrox/{rte_pmd_nitrox_version.map => version.map} (100%) rename drivers/crypto/null/{rte_pmd_null_crypto_version.map => version.map} (100%) rename drivers/crypto/octeontx/{rte_pmd_octeontx_crypto_version.map => version.map} (100%) rename drivers/crypto/octeontx2/{rte_pmd_octeontx2_crypto_version.map => version.map} (100%) rename drivers/crypto/openssl/{rte_pmd_openssl_version.map => version.map} (100%) rename drivers/crypto/scheduler/{rte_pmd_crypto_scheduler_version.map => version.map} (100%) rename drivers/crypto/snow3g/{rte_pmd_snow3g_version.map => version.map} (100%) rename drivers/crypto/virtio/{rte_pmd_virtio_crypto_version.map => version.map} (100%) rename drivers/crypto/zuc/{rte_pmd_zuc_version.map => version.map} (100%) rename drivers/event/dpaa/{rte_pmd_dpaa_event_version.map => version.map} (100%) rename drivers/event/dpaa2/{rte_pmd_dpaa2_event_version.map => version.map} (100%) rename drivers/event/dsw/{rte_pmd_dsw_event_version.map => version.map} (100%) rename drivers/event/octeontx/{rte_pmd_octeontx_event_version.map => version.map} (100%) rename drivers/event/octeontx2/{rte_pmd_octeontx2_event_version.map => version.map} (100%) rename drivers/event/opdl/{rte_pmd_opdl_event_version.map => version.map} (100%) rename drivers/event/skeleton/{rte_pmd_skeleton_event_version.map => version.map} (100%) rename drivers/event/sw/{rte_pmd_sw_event_version.map => version.map} (100%) rename drivers/mempool/bucket/{rte_mempool_bucket_version.map => version.map} (100%) rename drivers/mempool/dpaa/{rte_mempool_dpaa_version.map => version.map} (100%) rename drivers/mempool/dpaa2/{rte_mempool_dpaa2_version.map => version.map} (100%) rename drivers/mempool/octeontx/{rte_mempool_octeontx_version.map => version.map} (100%) rename drivers/mempool/octeontx2/{rte_mempool_octeontx2_version.map => version.map} (100%) rename drivers/mempool/ring/{rte_mempool_ring_version.map => version.map} (100%) rename drivers/mempool/stack/{rte_mempool_stack_version.map => version.map} (100%) rename drivers/net/af_packet/{rte_pmd_af_packet_version.map => version.map} (100%) rename drivers/net/af_xdp/{rte_pmd_af_xdp_version.map => version.map} (100%) rename drivers/net/ark/{rte_pmd_ark_version.map => version.map} (100%) rename drivers/net/atlantic/{rte_pmd_atlantic_version.map => version.map} (100%) rename drivers/net/avp/{rte_pmd_avp_version.map => version.map} (100%) rename drivers/net/axgbe/{rte_pmd_axgbe_version.map => version.map} (100%) rename drivers/net/bnx2x/{rte_pmd_bnx2x_version.map => version.map} (100%) rename drivers/net/bnxt/{rte_pmd_bnxt_version.map => version.map} (100%) rename drivers/net/bonding/{rte_pmd_bond_version.map => version.map} (100%) rename drivers/net/cxgbe/{rte_pmd_cxgbe_version.map => version.map} (100%) rename drivers/net/dpaa/{rte_pmd_dpaa_version.map => version.map} (100%) rename drivers/net/dpaa2/{rte_pmd_dpaa2_version.map => version.map} (100%) rename drivers/net/e1000/{rte_pmd_e1000_version.map => version.map} (100%) rename drivers/net/ena/{rte_pmd_ena_version.map => version.map} (100%) rename drivers/net/enetc/{rte_pmd_enetc_version.map => version.map} (100%) rename drivers/net/enic/{rte_pmd_enic_version.map => version.map} (100%) rename drivers/net/failsafe/{rte_pmd_failsafe_version.map => version.map} (100%) rename drivers/net/fm10k/{rte_pmd_fm10k_version.map => version.map} (100%) rename drivers/net/hinic/{rte_pmd_hinic_version.map => version.map} (100%) rename drivers/net/hns3/{rte_pmd_hns3_version.map => version.map} (100%) rename drivers/net/i40e/{rte_pmd_i40e_version.map => version.map} (100%) rename drivers/net/iavf/{rte_pmd_iavf_version.map => version.map} (100%) rename drivers/net/ice/{rte_pmd_ice_version.map => version.map} (100%) rename drivers/net/igc/{rte_pmd_igc_version.map => version.map} (100%) rename drivers/net/ionic/{rte_pmd_ionic_version.map => version.map} (100%) rename drivers/net/ipn3ke/{rte_pmd_ipn3ke_version.map => version.map} (100%) rename drivers/net/ixgbe/{rte_pmd_ixgbe_version.map => version.map} (100%) rename drivers/net/kni/{rte_pmd_kni_version.map => version.map} (100%) rename drivers/net/liquidio/{rte_pmd_liquidio_version.map => version.map} (100%) rename drivers/net/memif/{rte_pmd_memif_version.map => version.map} (100%) rename drivers/net/mlx4/{rte_pmd_mlx4_version.map => version.map} (100%) rename drivers/net/mlx5/{rte_pmd_mlx5_version.map => version.map} (100%) rename drivers/net/mvneta/{rte_pmd_mvneta_version.map => version.map} (100%) rename drivers/net/mvpp2/{rte_pmd_mvpp2_version.map => version.map} (100%) rename drivers/net/netvsc/{rte_pmd_netvsc_version.map => version.map} (100%) rename drivers/net/nfb/{rte_pmd_nfb_version.map => version.map} (100%) rename drivers/net/nfp/{rte_pmd_nfp_version.map => version.map} (100%) rename drivers/net/null/{rte_pmd_null_version.map => version.map} (100%) rename drivers/net/octeontx/{rte_pmd_octeontx_version.map => version.map} (100%) rename drivers/net/octeontx2/{rte_pmd_octeontx2_version.map => version.map} (100%) rename drivers/net/pcap/{rte_pmd_pcap_version.map => version.map} (100%) rename drivers/net/pfe/{rte_pmd_pfe_version.map => version.map} (100%) rename drivers/net/qede/{rte_pmd_qede_version.map => version.map} (100%) rename drivers/net/ring/{rte_pmd_ring_version.map => version.map} (100%) rename drivers/net/sfc/{rte_pmd_sfc_version.map => version.map} (100%) rename drivers/net/softnic/{rte_pmd_softnic_version.map => version.map} (100%) rename drivers/net/szedata2/{rte_pmd_szedata2_version.map => version.map} (100%) rename drivers/net/tap/{rte_pmd_tap_version.map => version.map} (100%) rename drivers/net/thunderx/{rte_pmd_thunderx_version.map => version.map} (100%) rename drivers/net/vdev_netvsc/{rte_pmd_vdev_netvsc_version.map => version.map} (100%) rename drivers/net/vhost/{rte_pmd_vhost_version.map => version.map} (100%) rename drivers/net/virtio/{rte_pmd_virtio_version.map => version.map} (100%) rename drivers/net/vmxnet3/{rte_pmd_vmxnet3_version.map => version.map} (100%) rename drivers/raw/dpaa2_cmdif/{rte_rawdev_dpaa2_cmdif_version.map => version.map} (100%) rename drivers/raw/dpaa2_qdma/{rte_rawdev_dpaa2_qdma_version.map => version.map} (100%) rename drivers/raw/ifpga/{rte_rawdev_ifpga_version.map => version.map} (100%) rename drivers/raw/ioat/{rte_rawdev_ioat_version.map => version.map} (100%) rename drivers/raw/ntb/{rte_rawdev_ntb_version.map => version.map} (100%) rename drivers/raw/octeontx2_dma/{rte_rawdev_octeontx2_dma_version.map => version.map} (100%) rename drivers/raw/octeontx2_ep/{rte_rawdev_octeontx2_ep_version.map => version.map} (100%) rename drivers/raw/skeleton/{rte_rawdev_skeleton_version.map => version.map} (100%) rename drivers/regex/mlx5/{rte_pmd_mlx5_regex_version.map => version.map} (100%) rename drivers/regex/octeontx2/{rte_pmd_octeontx2_regex_version.map => version.map} (100%) rename drivers/vdpa/ifc/{rte_pmd_ifc_version.map => version.map} (100%) rename drivers/vdpa/mlx5/{rte_pmd_mlx5_vdpa_version.map => version.map} (100%) rename lib/librte_acl/{rte_acl_version.map => version.map} (100%) rename lib/librte_bbdev/{rte_bbdev_version.map => version.map} (100%) rename lib/librte_bitratestats/{rte_bitratestats_version.map => version.map} (100%) rename lib/librte_bpf/{rte_bpf_version.map => version.map} (100%) rename lib/librte_cfgfile/{rte_cfgfile_version.map => version.map} (100%) rename lib/librte_cmdline/{rte_cmdline_version.map => version.map} (100%) rename lib/librte_compressdev/{rte_compressdev_version.map => version.map} (100%) rename lib/librte_cryptodev/{rte_cryptodev_version.map => version.map} (100%) rename lib/librte_distributor/{rte_distributor_version.map => version.map} (100%) rename lib/librte_eal/{rte_eal_version.map => version.map} (100%) rename lib/librte_efd/{rte_efd_version.map => version.map} (100%) rename lib/librte_ethdev/{rte_ethdev_version.map => version.map} (100%) rename lib/librte_eventdev/{rte_eventdev_version.map => version.map} (100%) rename lib/librte_fib/{rte_fib_version.map => version.map} (100%) rename lib/librte_flow_classify/{rte_flow_classify_version.map => version.map} (100%) rename lib/librte_graph/{rte_graph_version.map => version.map} (100%) rename lib/librte_gro/{rte_gro_version.map => version.map} (100%) rename lib/librte_gso/{rte_gso_version.map => version.map} (100%) rename lib/librte_hash/{rte_hash_version.map => version.map} (100%) rename lib/librte_ip_frag/{rte_ip_frag_version.map => version.map} (100%) rename lib/librte_ipsec/{rte_ipsec_version.map => version.map} (100%) rename lib/librte_jobstats/{rte_jobstats_version.map => version.map} (100%) rename lib/librte_kni/{rte_kni_version.map => version.map} (100%) rename lib/librte_kvargs/{rte_kvargs_version.map => version.map} (100%) rename lib/librte_latencystats/{rte_latencystats_version.map => version.map} (100%) rename lib/librte_lpm/{rte_lpm_version.map => version.map} (100%) rename lib/librte_mbuf/{rte_mbuf_version.map => version.map} (100%) rename lib/librte_member/{rte_member_version.map => version.map} (100%) rename lib/librte_mempool/{rte_mempool_version.map => version.map} (100%) rename lib/librte_meter/{rte_meter_version.map => version.map} (100%) rename lib/librte_metrics/{rte_metrics_version.map => version.map} (100%) rename lib/librte_net/{rte_net_version.map => version.map} (100%) rename lib/librte_node/{rte_node_version.map => version.map} (100%) rename lib/librte_pci/{rte_pci_version.map => version.map} (100%) rename lib/librte_pdump/{rte_pdump_version.map => version.map} (100%) rename lib/librte_pipeline/{rte_pipeline_version.map => version.map} (100%) rename lib/librte_port/{rte_port_version.map => version.map} (100%) rename lib/librte_power/{rte_power_version.map => version.map} (100%) rename lib/librte_rawdev/{rte_rawdev_version.map => version.map} (100%) rename lib/librte_rcu/{rte_rcu_version.map => version.map} (100%) rename lib/librte_regexdev/{rte_regexdev_version.map => version.map} (100%) rename lib/librte_reorder/{rte_reorder_version.map => version.map} (100%) rename lib/librte_rib/{rte_rib_version.map => version.map} (100%) rename lib/librte_ring/{rte_ring_version.map => version.map} (100%) rename lib/librte_sched/{rte_sched_version.map => version.map} (100%) rename lib/librte_security/{rte_security_version.map => version.map} (100%) rename lib/librte_stack/{rte_stack_version.map => version.map} (100%) rename lib/librte_table/{rte_table_version.map => version.map} (100%) rename lib/librte_telemetry/{rte_telemetry_version.map => version.map} (100%) rename lib/librte_timer/{rte_timer_version.map => version.map} (100%) rename lib/librte_vhost/{rte_vhost_version.map => version.map} (100%) diff --git a/drivers/baseband/fpga_5gnr_fec/rte_pmd_bbdev_fpga_5gnr_fec_version.map b/drivers/baseband/fpga_5gnr_fec/version.map similarity index 100% rename from drivers/baseband/fpga_5gnr_fec/rte_pmd_bbdev_fpga_5gnr_fec_version.map rename to drivers/baseband/fpga_5gnr_fec/version.map diff --git a/drivers/baseband/fpga_lte_fec/rte_pmd_bbdev_fpga_lte_fec_version.map b/drivers/baseband/fpga_lte_fec/version.map similarity index 100% rename from drivers/baseband/fpga_lte_fec/rte_pmd_bbdev_fpga_lte_fec_version.map rename to drivers/baseband/fpga_lte_fec/version.map diff --git a/drivers/baseband/null/rte_pmd_bbdev_null_version.map b/drivers/baseband/null/version.map similarity index 100% rename from drivers/baseband/null/rte_pmd_bbdev_null_version.map rename to drivers/baseband/null/version.map diff --git a/drivers/baseband/turbo_sw/rte_pmd_bbdev_turbo_sw_version.map b/drivers/baseband/turbo_sw/version.map similarity index 100% rename from drivers/baseband/turbo_sw/rte_pmd_bbdev_turbo_sw_version.map rename to drivers/baseband/turbo_sw/version.map diff --git a/drivers/bus/dpaa/rte_bus_dpaa_version.map b/drivers/bus/dpaa/version.map similarity index 100% rename from drivers/bus/dpaa/rte_bus_dpaa_version.map rename to drivers/bus/dpaa/version.map diff --git a/drivers/bus/fslmc/rte_bus_fslmc_version.map b/drivers/bus/fslmc/version.map similarity index 100% rename from drivers/bus/fslmc/rte_bus_fslmc_version.map rename to drivers/bus/fslmc/version.map diff --git a/drivers/bus/ifpga/rte_bus_ifpga_version.map b/drivers/bus/ifpga/version.map similarity index 100% rename from drivers/bus/ifpga/rte_bus_ifpga_version.map rename to drivers/bus/ifpga/version.map diff --git a/drivers/bus/pci/rte_bus_pci_version.map b/drivers/bus/pci/version.map similarity index 100% rename from drivers/bus/pci/rte_bus_pci_version.map rename to drivers/bus/pci/version.map diff --git a/drivers/bus/vdev/rte_bus_vdev_version.map b/drivers/bus/vdev/version.map similarity index 100% rename from drivers/bus/vdev/rte_bus_vdev_version.map rename to drivers/bus/vdev/version.map diff --git a/drivers/bus/vmbus/rte_bus_vmbus_version.map b/drivers/bus/vmbus/version.map similarity index 100% rename from drivers/bus/vmbus/rte_bus_vmbus_version.map rename to drivers/bus/vmbus/version.map diff --git a/drivers/common/cpt/rte_common_cpt_version.map b/drivers/common/cpt/version.map similarity index 100% rename from drivers/common/cpt/rte_common_cpt_version.map rename to drivers/common/cpt/version.map diff --git a/drivers/common/dpaax/rte_common_dpaax_version.map b/drivers/common/dpaax/version.map similarity index 100% rename from drivers/common/dpaax/rte_common_dpaax_version.map rename to drivers/common/dpaax/version.map diff --git a/drivers/common/iavf/rte_common_iavf_version.map b/drivers/common/iavf/version.map similarity index 100% rename from drivers/common/iavf/rte_common_iavf_version.map rename to drivers/common/iavf/version.map diff --git a/drivers/common/mlx5/rte_common_mlx5_version.map b/drivers/common/mlx5/version.map similarity index 100% rename from drivers/common/mlx5/rte_common_mlx5_version.map rename to drivers/common/mlx5/version.map diff --git a/drivers/common/mvep/rte_common_mvep_version.map b/drivers/common/mvep/version.map similarity index 100% rename from drivers/common/mvep/rte_common_mvep_version.map rename to drivers/common/mvep/version.map diff --git a/drivers/common/octeontx/rte_common_octeontx_version.map b/drivers/common/octeontx/version.map similarity index 100% rename from drivers/common/octeontx/rte_common_octeontx_version.map rename to drivers/common/octeontx/version.map diff --git a/drivers/common/octeontx2/rte_common_octeontx2_version.map b/drivers/common/octeontx2/version.map similarity index 100% rename from drivers/common/octeontx2/rte_common_octeontx2_version.map rename to drivers/common/octeontx2/version.map diff --git a/drivers/common/qat/rte_common_qat_version.map b/drivers/common/qat/version.map similarity index 100% rename from drivers/common/qat/rte_common_qat_version.map rename to drivers/common/qat/version.map diff --git a/drivers/common/sfc_efx/rte_common_sfc_efx_version.map b/drivers/common/sfc_efx/version.map similarity index 100% rename from drivers/common/sfc_efx/rte_common_sfc_efx_version.map rename to drivers/common/sfc_efx/version.map diff --git a/drivers/compress/isal/rte_pmd_isal_version.map b/drivers/compress/isal/version.map similarity index 100% rename from drivers/compress/isal/rte_pmd_isal_version.map rename to drivers/compress/isal/version.map diff --git a/drivers/compress/octeontx/rte_pmd_octeontx_compress_version.map b/drivers/compress/octeontx/version.map similarity index 100% rename from drivers/compress/octeontx/rte_pmd_octeontx_compress_version.map rename to drivers/compress/octeontx/version.map diff --git a/drivers/compress/zlib/rte_pmd_zlib_version.map b/drivers/compress/zlib/version.map similarity index 100% rename from drivers/compress/zlib/rte_pmd_zlib_version.map rename to drivers/compress/zlib/version.map diff --git a/drivers/crypto/aesni_gcm/rte_pmd_aesni_gcm_version.map b/drivers/crypto/aesni_gcm/version.map similarity index 100% rename from drivers/crypto/aesni_gcm/rte_pmd_aesni_gcm_version.map rename to drivers/crypto/aesni_gcm/version.map diff --git a/drivers/crypto/aesni_mb/rte_pmd_aesni_mb_version.map b/drivers/crypto/aesni_mb/version.map similarity index 100% rename from drivers/crypto/aesni_mb/rte_pmd_aesni_mb_version.map rename to drivers/crypto/aesni_mb/version.map diff --git a/drivers/crypto/armv8/rte_pmd_armv8_version.map b/drivers/crypto/armv8/version.map similarity index 100% rename from drivers/crypto/armv8/rte_pmd_armv8_version.map rename to drivers/crypto/armv8/version.map diff --git a/drivers/crypto/caam_jr/rte_pmd_caam_jr_version.map b/drivers/crypto/caam_jr/version.map similarity index 100% rename from drivers/crypto/caam_jr/rte_pmd_caam_jr_version.map rename to drivers/crypto/caam_jr/version.map diff --git a/drivers/crypto/ccp/rte_pmd_ccp_version.map b/drivers/crypto/ccp/version.map similarity index 100% rename from drivers/crypto/ccp/rte_pmd_ccp_version.map rename to drivers/crypto/ccp/version.map diff --git a/drivers/crypto/dpaa2_sec/rte_pmd_dpaa2_sec_version.map b/drivers/crypto/dpaa2_sec/version.map similarity index 100% rename from drivers/crypto/dpaa2_sec/rte_pmd_dpaa2_sec_version.map rename to drivers/crypto/dpaa2_sec/version.map diff --git a/drivers/crypto/dpaa_sec/rte_pmd_dpaa_sec_version.map b/drivers/crypto/dpaa_sec/version.map similarity index 100% rename from drivers/crypto/dpaa_sec/rte_pmd_dpaa_sec_version.map rename to drivers/crypto/dpaa_sec/version.map diff --git a/drivers/crypto/kasumi/rte_pmd_kasumi_version.map b/drivers/crypto/kasumi/version.map similarity index 100% rename from drivers/crypto/kasumi/rte_pmd_kasumi_version.map rename to drivers/crypto/kasumi/version.map diff --git a/drivers/crypto/mvsam/rte_pmd_mvsam_version.map b/drivers/crypto/mvsam/version.map similarity index 100% rename from drivers/crypto/mvsam/rte_pmd_mvsam_version.map rename to drivers/crypto/mvsam/version.map diff --git a/drivers/crypto/nitrox/rte_pmd_nitrox_version.map b/drivers/crypto/nitrox/version.map similarity index 100% rename from drivers/crypto/nitrox/rte_pmd_nitrox_version.map rename to drivers/crypto/nitrox/version.map diff --git a/drivers/crypto/null/rte_pmd_null_crypto_version.map b/drivers/crypto/null/version.map similarity index 100% rename from drivers/crypto/null/rte_pmd_null_crypto_version.map rename to drivers/crypto/null/version.map diff --git a/drivers/crypto/octeontx/rte_pmd_octeontx_crypto_version.map b/drivers/crypto/octeontx/version.map similarity index 100% rename from drivers/crypto/octeontx/rte_pmd_octeontx_crypto_version.map rename to drivers/crypto/octeontx/version.map diff --git a/drivers/crypto/octeontx2/rte_pmd_octeontx2_crypto_version.map b/drivers/crypto/octeontx2/version.map similarity index 100% rename from drivers/crypto/octeontx2/rte_pmd_octeontx2_crypto_version.map rename to drivers/crypto/octeontx2/version.map diff --git a/drivers/crypto/openssl/rte_pmd_openssl_version.map b/drivers/crypto/openssl/version.map similarity index 100% rename from drivers/crypto/openssl/rte_pmd_openssl_version.map rename to drivers/crypto/openssl/version.map diff --git a/drivers/crypto/scheduler/rte_pmd_crypto_scheduler_version.map b/drivers/crypto/scheduler/version.map similarity index 100% rename from drivers/crypto/scheduler/rte_pmd_crypto_scheduler_version.map rename to drivers/crypto/scheduler/version.map diff --git a/drivers/crypto/snow3g/rte_pmd_snow3g_version.map b/drivers/crypto/snow3g/version.map similarity index 100% rename from drivers/crypto/snow3g/rte_pmd_snow3g_version.map rename to drivers/crypto/snow3g/version.map diff --git a/drivers/crypto/virtio/rte_pmd_virtio_crypto_version.map b/drivers/crypto/virtio/version.map similarity index 100% rename from drivers/crypto/virtio/rte_pmd_virtio_crypto_version.map rename to drivers/crypto/virtio/version.map diff --git a/drivers/crypto/zuc/rte_pmd_zuc_version.map b/drivers/crypto/zuc/version.map similarity index 100% rename from drivers/crypto/zuc/rte_pmd_zuc_version.map rename to drivers/crypto/zuc/version.map diff --git a/drivers/event/dpaa/rte_pmd_dpaa_event_version.map b/drivers/event/dpaa/version.map similarity index 100% rename from drivers/event/dpaa/rte_pmd_dpaa_event_version.map rename to drivers/event/dpaa/version.map diff --git a/drivers/event/dpaa2/rte_pmd_dpaa2_event_version.map b/drivers/event/dpaa2/version.map similarity index 100% rename from drivers/event/dpaa2/rte_pmd_dpaa2_event_version.map rename to drivers/event/dpaa2/version.map diff --git a/drivers/event/dsw/rte_pmd_dsw_event_version.map b/drivers/event/dsw/version.map similarity index 100% rename from drivers/event/dsw/rte_pmd_dsw_event_version.map rename to drivers/event/dsw/version.map diff --git a/drivers/event/octeontx/rte_pmd_octeontx_event_version.map b/drivers/event/octeontx/version.map similarity index 100% rename from drivers/event/octeontx/rte_pmd_octeontx_event_version.map rename to drivers/event/octeontx/version.map diff --git a/drivers/event/octeontx2/rte_pmd_octeontx2_event_version.map b/drivers/event/octeontx2/version.map similarity index 100% rename from drivers/event/octeontx2/rte_pmd_octeontx2_event_version.map rename to drivers/event/octeontx2/version.map diff --git a/drivers/event/opdl/rte_pmd_opdl_event_version.map b/drivers/event/opdl/version.map similarity index 100% rename from drivers/event/opdl/rte_pmd_opdl_event_version.map rename to drivers/event/opdl/version.map diff --git a/drivers/event/skeleton/rte_pmd_skeleton_event_version.map b/drivers/event/skeleton/version.map similarity index 100% rename from drivers/event/skeleton/rte_pmd_skeleton_event_version.map rename to drivers/event/skeleton/version.map diff --git a/drivers/event/sw/rte_pmd_sw_event_version.map b/drivers/event/sw/version.map similarity index 100% rename from drivers/event/sw/rte_pmd_sw_event_version.map rename to drivers/event/sw/version.map diff --git a/drivers/mempool/bucket/rte_mempool_bucket_version.map b/drivers/mempool/bucket/version.map similarity index 100% rename from drivers/mempool/bucket/rte_mempool_bucket_version.map rename to drivers/mempool/bucket/version.map diff --git a/drivers/mempool/dpaa/rte_mempool_dpaa_version.map b/drivers/mempool/dpaa/version.map similarity index 100% rename from drivers/mempool/dpaa/rte_mempool_dpaa_version.map rename to drivers/mempool/dpaa/version.map diff --git a/drivers/mempool/dpaa2/rte_mempool_dpaa2_version.map b/drivers/mempool/dpaa2/version.map similarity index 100% rename from drivers/mempool/dpaa2/rte_mempool_dpaa2_version.map rename to drivers/mempool/dpaa2/version.map diff --git a/drivers/mempool/octeontx/rte_mempool_octeontx_version.map b/drivers/mempool/octeontx/version.map similarity index 100% rename from drivers/mempool/octeontx/rte_mempool_octeontx_version.map rename to drivers/mempool/octeontx/version.map diff --git a/drivers/mempool/octeontx2/rte_mempool_octeontx2_version.map b/drivers/mempool/octeontx2/version.map similarity index 100% rename from drivers/mempool/octeontx2/rte_mempool_octeontx2_version.map rename to drivers/mempool/octeontx2/version.map diff --git a/drivers/mempool/ring/rte_mempool_ring_version.map b/drivers/mempool/ring/version.map similarity index 100% rename from drivers/mempool/ring/rte_mempool_ring_version.map rename to drivers/mempool/ring/version.map diff --git a/drivers/mempool/stack/rte_mempool_stack_version.map b/drivers/mempool/stack/version.map similarity index 100% rename from drivers/mempool/stack/rte_mempool_stack_version.map rename to drivers/mempool/stack/version.map diff --git a/drivers/meson.build b/drivers/meson.build index b95b00583..3d4bbff13 100644 --- a/drivers/meson.build +++ b/drivers/meson.build @@ -166,9 +166,9 @@ foreach subpath:subdirs install: true) # now build the shared driver - version_map = '@0@/@1@/@2@_version.map'.format( + version_map = '@0@/@1@/version.map'.format( meson.current_source_dir(), - drv_path, lib_name) + drv_path) implib = 'lib' + lib_name + '.dll.a' def_file = custom_target(lib_name + '_def', diff --git a/drivers/net/af_packet/rte_pmd_af_packet_version.map b/drivers/net/af_packet/version.map similarity index 100% rename from drivers/net/af_packet/rte_pmd_af_packet_version.map rename to drivers/net/af_packet/version.map diff --git a/drivers/net/af_xdp/rte_pmd_af_xdp_version.map b/drivers/net/af_xdp/version.map similarity index 100% rename from drivers/net/af_xdp/rte_pmd_af_xdp_version.map rename to drivers/net/af_xdp/version.map diff --git a/drivers/net/ark/rte_pmd_ark_version.map b/drivers/net/ark/version.map similarity index 100% rename from drivers/net/ark/rte_pmd_ark_version.map rename to drivers/net/ark/version.map diff --git a/drivers/net/atlantic/rte_pmd_atlantic_version.map b/drivers/net/atlantic/version.map similarity index 100% rename from drivers/net/atlantic/rte_pmd_atlantic_version.map rename to drivers/net/atlantic/version.map diff --git a/drivers/net/avp/rte_pmd_avp_version.map b/drivers/net/avp/version.map similarity index 100% rename from drivers/net/avp/rte_pmd_avp_version.map rename to drivers/net/avp/version.map diff --git a/drivers/net/axgbe/rte_pmd_axgbe_version.map b/drivers/net/axgbe/version.map similarity index 100% rename from drivers/net/axgbe/rte_pmd_axgbe_version.map rename to drivers/net/axgbe/version.map diff --git a/drivers/net/bnx2x/rte_pmd_bnx2x_version.map b/drivers/net/bnx2x/version.map similarity index 100% rename from drivers/net/bnx2x/rte_pmd_bnx2x_version.map rename to drivers/net/bnx2x/version.map diff --git a/drivers/net/bnxt/rte_pmd_bnxt_version.map b/drivers/net/bnxt/version.map similarity index 100% rename from drivers/net/bnxt/rte_pmd_bnxt_version.map rename to drivers/net/bnxt/version.map diff --git a/drivers/net/bonding/rte_pmd_bond_version.map b/drivers/net/bonding/version.map similarity index 100% rename from drivers/net/bonding/rte_pmd_bond_version.map rename to drivers/net/bonding/version.map diff --git a/drivers/net/cxgbe/rte_pmd_cxgbe_version.map b/drivers/net/cxgbe/version.map similarity index 100% rename from drivers/net/cxgbe/rte_pmd_cxgbe_version.map rename to drivers/net/cxgbe/version.map diff --git a/drivers/net/dpaa/rte_pmd_dpaa_version.map b/drivers/net/dpaa/version.map similarity index 100% rename from drivers/net/dpaa/rte_pmd_dpaa_version.map rename to drivers/net/dpaa/version.map diff --git a/drivers/net/dpaa2/rte_pmd_dpaa2_version.map b/drivers/net/dpaa2/version.map similarity index 100% rename from drivers/net/dpaa2/rte_pmd_dpaa2_version.map rename to drivers/net/dpaa2/version.map diff --git a/drivers/net/e1000/rte_pmd_e1000_version.map b/drivers/net/e1000/version.map similarity index 100% rename from drivers/net/e1000/rte_pmd_e1000_version.map rename to drivers/net/e1000/version.map diff --git a/drivers/net/ena/rte_pmd_ena_version.map b/drivers/net/ena/version.map similarity index 100% rename from drivers/net/ena/rte_pmd_ena_version.map rename to drivers/net/ena/version.map diff --git a/drivers/net/enetc/rte_pmd_enetc_version.map b/drivers/net/enetc/version.map similarity index 100% rename from drivers/net/enetc/rte_pmd_enetc_version.map rename to drivers/net/enetc/version.map diff --git a/drivers/net/enic/rte_pmd_enic_version.map b/drivers/net/enic/version.map similarity index 100% rename from drivers/net/enic/rte_pmd_enic_version.map rename to drivers/net/enic/version.map diff --git a/drivers/net/failsafe/rte_pmd_failsafe_version.map b/drivers/net/failsafe/version.map similarity index 100% rename from drivers/net/failsafe/rte_pmd_failsafe_version.map rename to drivers/net/failsafe/version.map diff --git a/drivers/net/fm10k/rte_pmd_fm10k_version.map b/drivers/net/fm10k/version.map similarity index 100% rename from drivers/net/fm10k/rte_pmd_fm10k_version.map rename to drivers/net/fm10k/version.map diff --git a/drivers/net/hinic/rte_pmd_hinic_version.map b/drivers/net/hinic/version.map similarity index 100% rename from drivers/net/hinic/rte_pmd_hinic_version.map rename to drivers/net/hinic/version.map diff --git a/drivers/net/hns3/rte_pmd_hns3_version.map b/drivers/net/hns3/version.map similarity index 100% rename from drivers/net/hns3/rte_pmd_hns3_version.map rename to drivers/net/hns3/version.map diff --git a/drivers/net/i40e/rte_pmd_i40e_version.map b/drivers/net/i40e/version.map similarity index 100% rename from drivers/net/i40e/rte_pmd_i40e_version.map rename to drivers/net/i40e/version.map diff --git a/drivers/net/iavf/rte_pmd_iavf_version.map b/drivers/net/iavf/version.map similarity index 100% rename from drivers/net/iavf/rte_pmd_iavf_version.map rename to drivers/net/iavf/version.map diff --git a/drivers/net/ice/rte_pmd_ice_version.map b/drivers/net/ice/version.map similarity index 100% rename from drivers/net/ice/rte_pmd_ice_version.map rename to drivers/net/ice/version.map diff --git a/drivers/net/igc/rte_pmd_igc_version.map b/drivers/net/igc/version.map similarity index 100% rename from drivers/net/igc/rte_pmd_igc_version.map rename to drivers/net/igc/version.map diff --git a/drivers/net/ionic/rte_pmd_ionic_version.map b/drivers/net/ionic/version.map similarity index 100% rename from drivers/net/ionic/rte_pmd_ionic_version.map rename to drivers/net/ionic/version.map diff --git a/drivers/net/ipn3ke/rte_pmd_ipn3ke_version.map b/drivers/net/ipn3ke/version.map similarity index 100% rename from drivers/net/ipn3ke/rte_pmd_ipn3ke_version.map rename to drivers/net/ipn3ke/version.map diff --git a/drivers/net/ixgbe/rte_pmd_ixgbe_version.map b/drivers/net/ixgbe/version.map similarity index 100% rename from drivers/net/ixgbe/rte_pmd_ixgbe_version.map rename to drivers/net/ixgbe/version.map diff --git a/drivers/net/kni/rte_pmd_kni_version.map b/drivers/net/kni/version.map similarity index 100% rename from drivers/net/kni/rte_pmd_kni_version.map rename to drivers/net/kni/version.map diff --git a/drivers/net/liquidio/rte_pmd_liquidio_version.map b/drivers/net/liquidio/version.map similarity index 100% rename from drivers/net/liquidio/rte_pmd_liquidio_version.map rename to drivers/net/liquidio/version.map diff --git a/drivers/net/memif/rte_pmd_memif_version.map b/drivers/net/memif/version.map similarity index 100% rename from drivers/net/memif/rte_pmd_memif_version.map rename to drivers/net/memif/version.map diff --git a/drivers/net/mlx4/rte_pmd_mlx4_version.map b/drivers/net/mlx4/version.map similarity index 100% rename from drivers/net/mlx4/rte_pmd_mlx4_version.map rename to drivers/net/mlx4/version.map diff --git a/drivers/net/mlx5/rte_pmd_mlx5_version.map b/drivers/net/mlx5/version.map similarity index 100% rename from drivers/net/mlx5/rte_pmd_mlx5_version.map rename to drivers/net/mlx5/version.map diff --git a/drivers/net/mvneta/rte_pmd_mvneta_version.map b/drivers/net/mvneta/version.map similarity index 100% rename from drivers/net/mvneta/rte_pmd_mvneta_version.map rename to drivers/net/mvneta/version.map diff --git a/drivers/net/mvpp2/rte_pmd_mvpp2_version.map b/drivers/net/mvpp2/version.map similarity index 100% rename from drivers/net/mvpp2/rte_pmd_mvpp2_version.map rename to drivers/net/mvpp2/version.map diff --git a/drivers/net/netvsc/rte_pmd_netvsc_version.map b/drivers/net/netvsc/version.map similarity index 100% rename from drivers/net/netvsc/rte_pmd_netvsc_version.map rename to drivers/net/netvsc/version.map diff --git a/drivers/net/nfb/rte_pmd_nfb_version.map b/drivers/net/nfb/version.map similarity index 100% rename from drivers/net/nfb/rte_pmd_nfb_version.map rename to drivers/net/nfb/version.map diff --git a/drivers/net/nfp/rte_pmd_nfp_version.map b/drivers/net/nfp/version.map similarity index 100% rename from drivers/net/nfp/rte_pmd_nfp_version.map rename to drivers/net/nfp/version.map diff --git a/drivers/net/null/rte_pmd_null_version.map b/drivers/net/null/version.map similarity index 100% rename from drivers/net/null/rte_pmd_null_version.map rename to drivers/net/null/version.map diff --git a/drivers/net/octeontx/rte_pmd_octeontx_version.map b/drivers/net/octeontx/version.map similarity index 100% rename from drivers/net/octeontx/rte_pmd_octeontx_version.map rename to drivers/net/octeontx/version.map diff --git a/drivers/net/octeontx2/rte_pmd_octeontx2_version.map b/drivers/net/octeontx2/version.map similarity index 100% rename from drivers/net/octeontx2/rte_pmd_octeontx2_version.map rename to drivers/net/octeontx2/version.map diff --git a/drivers/net/pcap/rte_pmd_pcap_version.map b/drivers/net/pcap/version.map similarity index 100% rename from drivers/net/pcap/rte_pmd_pcap_version.map rename to drivers/net/pcap/version.map diff --git a/drivers/net/pfe/rte_pmd_pfe_version.map b/drivers/net/pfe/version.map similarity index 100% rename from drivers/net/pfe/rte_pmd_pfe_version.map rename to drivers/net/pfe/version.map diff --git a/drivers/net/qede/rte_pmd_qede_version.map b/drivers/net/qede/version.map similarity index 100% rename from drivers/net/qede/rte_pmd_qede_version.map rename to drivers/net/qede/version.map diff --git a/drivers/net/ring/rte_pmd_ring_version.map b/drivers/net/ring/version.map similarity index 100% rename from drivers/net/ring/rte_pmd_ring_version.map rename to drivers/net/ring/version.map diff --git a/drivers/net/sfc/rte_pmd_sfc_version.map b/drivers/net/sfc/version.map similarity index 100% rename from drivers/net/sfc/rte_pmd_sfc_version.map rename to drivers/net/sfc/version.map diff --git a/drivers/net/softnic/rte_pmd_softnic_version.map b/drivers/net/softnic/version.map similarity index 100% rename from drivers/net/softnic/rte_pmd_softnic_version.map rename to drivers/net/softnic/version.map diff --git a/drivers/net/szedata2/rte_pmd_szedata2_version.map b/drivers/net/szedata2/version.map similarity index 100% rename from drivers/net/szedata2/rte_pmd_szedata2_version.map rename to drivers/net/szedata2/version.map diff --git a/drivers/net/tap/rte_pmd_tap_version.map b/drivers/net/tap/version.map similarity index 100% rename from drivers/net/tap/rte_pmd_tap_version.map rename to drivers/net/tap/version.map diff --git a/drivers/net/thunderx/rte_pmd_thunderx_version.map b/drivers/net/thunderx/version.map similarity index 100% rename from drivers/net/thunderx/rte_pmd_thunderx_version.map rename to drivers/net/thunderx/version.map diff --git a/drivers/net/vdev_netvsc/rte_pmd_vdev_netvsc_version.map b/drivers/net/vdev_netvsc/version.map similarity index 100% rename from drivers/net/vdev_netvsc/rte_pmd_vdev_netvsc_version.map rename to drivers/net/vdev_netvsc/version.map diff --git a/drivers/net/vhost/rte_pmd_vhost_version.map b/drivers/net/vhost/version.map similarity index 100% rename from drivers/net/vhost/rte_pmd_vhost_version.map rename to drivers/net/vhost/version.map diff --git a/drivers/net/virtio/rte_pmd_virtio_version.map b/drivers/net/virtio/version.map similarity index 100% rename from drivers/net/virtio/rte_pmd_virtio_version.map rename to drivers/net/virtio/version.map diff --git a/drivers/net/vmxnet3/rte_pmd_vmxnet3_version.map b/drivers/net/vmxnet3/version.map similarity index 100% rename from drivers/net/vmxnet3/rte_pmd_vmxnet3_version.map rename to drivers/net/vmxnet3/version.map diff --git a/drivers/raw/dpaa2_cmdif/rte_rawdev_dpaa2_cmdif_version.map b/drivers/raw/dpaa2_cmdif/version.map similarity index 100% rename from drivers/raw/dpaa2_cmdif/rte_rawdev_dpaa2_cmdif_version.map rename to drivers/raw/dpaa2_cmdif/version.map diff --git a/drivers/raw/dpaa2_qdma/rte_rawdev_dpaa2_qdma_version.map b/drivers/raw/dpaa2_qdma/version.map similarity index 100% rename from drivers/raw/dpaa2_qdma/rte_rawdev_dpaa2_qdma_version.map rename to drivers/raw/dpaa2_qdma/version.map diff --git a/drivers/raw/ifpga/rte_rawdev_ifpga_version.map b/drivers/raw/ifpga/version.map similarity index 100% rename from drivers/raw/ifpga/rte_rawdev_ifpga_version.map rename to drivers/raw/ifpga/version.map diff --git a/drivers/raw/ioat/rte_rawdev_ioat_version.map b/drivers/raw/ioat/version.map similarity index 100% rename from drivers/raw/ioat/rte_rawdev_ioat_version.map rename to drivers/raw/ioat/version.map diff --git a/drivers/raw/ntb/rte_rawdev_ntb_version.map b/drivers/raw/ntb/version.map similarity index 100% rename from drivers/raw/ntb/rte_rawdev_ntb_version.map rename to drivers/raw/ntb/version.map diff --git a/drivers/raw/octeontx2_dma/rte_rawdev_octeontx2_dma_version.map b/drivers/raw/octeontx2_dma/version.map similarity index 100% rename from drivers/raw/octeontx2_dma/rte_rawdev_octeontx2_dma_version.map rename to drivers/raw/octeontx2_dma/version.map diff --git a/drivers/raw/octeontx2_ep/rte_rawdev_octeontx2_ep_version.map b/drivers/raw/octeontx2_ep/version.map similarity index 100% rename from drivers/raw/octeontx2_ep/rte_rawdev_octeontx2_ep_version.map rename to drivers/raw/octeontx2_ep/version.map diff --git a/drivers/raw/skeleton/rte_rawdev_skeleton_version.map b/drivers/raw/skeleton/version.map similarity index 100% rename from drivers/raw/skeleton/rte_rawdev_skeleton_version.map rename to drivers/raw/skeleton/version.map diff --git a/drivers/regex/mlx5/rte_pmd_mlx5_regex_version.map b/drivers/regex/mlx5/version.map similarity index 100% rename from drivers/regex/mlx5/rte_pmd_mlx5_regex_version.map rename to drivers/regex/mlx5/version.map diff --git a/drivers/regex/octeontx2/rte_pmd_octeontx2_regex_version.map b/drivers/regex/octeontx2/version.map similarity index 100% rename from drivers/regex/octeontx2/rte_pmd_octeontx2_regex_version.map rename to drivers/regex/octeontx2/version.map diff --git a/drivers/vdpa/ifc/rte_pmd_ifc_version.map b/drivers/vdpa/ifc/version.map similarity index 100% rename from drivers/vdpa/ifc/rte_pmd_ifc_version.map rename to drivers/vdpa/ifc/version.map diff --git a/drivers/vdpa/mlx5/rte_pmd_mlx5_vdpa_version.map b/drivers/vdpa/mlx5/version.map similarity index 100% rename from drivers/vdpa/mlx5/rte_pmd_mlx5_vdpa_version.map rename to drivers/vdpa/mlx5/version.map diff --git a/lib/librte_acl/rte_acl_version.map b/lib/librte_acl/version.map similarity index 100% rename from lib/librte_acl/rte_acl_version.map rename to lib/librte_acl/version.map diff --git a/lib/librte_bbdev/rte_bbdev_version.map b/lib/librte_bbdev/version.map similarity index 100% rename from lib/librte_bbdev/rte_bbdev_version.map rename to lib/librte_bbdev/version.map diff --git a/lib/librte_bitratestats/rte_bitratestats_version.map b/lib/librte_bitratestats/version.map similarity index 100% rename from lib/librte_bitratestats/rte_bitratestats_version.map rename to lib/librte_bitratestats/version.map diff --git a/lib/librte_bpf/rte_bpf_version.map b/lib/librte_bpf/version.map similarity index 100% rename from lib/librte_bpf/rte_bpf_version.map rename to lib/librte_bpf/version.map diff --git a/lib/librte_cfgfile/rte_cfgfile_version.map b/lib/librte_cfgfile/version.map similarity index 100% rename from lib/librte_cfgfile/rte_cfgfile_version.map rename to lib/librte_cfgfile/version.map diff --git a/lib/librte_cmdline/rte_cmdline_version.map b/lib/librte_cmdline/version.map similarity index 100% rename from lib/librte_cmdline/rte_cmdline_version.map rename to lib/librte_cmdline/version.map diff --git a/lib/librte_compressdev/rte_compressdev_version.map b/lib/librte_compressdev/version.map similarity index 100% rename from lib/librte_compressdev/rte_compressdev_version.map rename to lib/librte_compressdev/version.map diff --git a/lib/librte_cryptodev/rte_cryptodev_version.map b/lib/librte_cryptodev/version.map similarity index 100% rename from lib/librte_cryptodev/rte_cryptodev_version.map rename to lib/librte_cryptodev/version.map diff --git a/lib/librte_distributor/rte_distributor_version.map b/lib/librte_distributor/version.map similarity index 100% rename from lib/librte_distributor/rte_distributor_version.map rename to lib/librte_distributor/version.map diff --git a/lib/librte_eal/rte_eal_version.map b/lib/librte_eal/version.map similarity index 100% rename from lib/librte_eal/rte_eal_version.map rename to lib/librte_eal/version.map diff --git a/lib/librte_efd/rte_efd_version.map b/lib/librte_efd/version.map similarity index 100% rename from lib/librte_efd/rte_efd_version.map rename to lib/librte_efd/version.map diff --git a/lib/librte_ethdev/rte_ethdev_version.map b/lib/librte_ethdev/version.map similarity index 100% rename from lib/librte_ethdev/rte_ethdev_version.map rename to lib/librte_ethdev/version.map diff --git a/lib/librte_eventdev/rte_eventdev_version.map b/lib/librte_eventdev/version.map similarity index 100% rename from lib/librte_eventdev/rte_eventdev_version.map rename to lib/librte_eventdev/version.map diff --git a/lib/librte_fib/rte_fib_version.map b/lib/librte_fib/version.map similarity index 100% rename from lib/librte_fib/rte_fib_version.map rename to lib/librte_fib/version.map diff --git a/lib/librte_flow_classify/rte_flow_classify_version.map b/lib/librte_flow_classify/version.map similarity index 100% rename from lib/librte_flow_classify/rte_flow_classify_version.map rename to lib/librte_flow_classify/version.map diff --git a/lib/librte_graph/rte_graph_version.map b/lib/librte_graph/version.map similarity index 100% rename from lib/librte_graph/rte_graph_version.map rename to lib/librte_graph/version.map diff --git a/lib/librte_gro/rte_gro_version.map b/lib/librte_gro/version.map similarity index 100% rename from lib/librte_gro/rte_gro_version.map rename to lib/librte_gro/version.map diff --git a/lib/librte_gso/rte_gso_version.map b/lib/librte_gso/version.map similarity index 100% rename from lib/librte_gso/rte_gso_version.map rename to lib/librte_gso/version.map diff --git a/lib/librte_hash/rte_hash_version.map b/lib/librte_hash/version.map similarity index 100% rename from lib/librte_hash/rte_hash_version.map rename to lib/librte_hash/version.map diff --git a/lib/librte_ip_frag/rte_ip_frag_version.map b/lib/librte_ip_frag/version.map similarity index 100% rename from lib/librte_ip_frag/rte_ip_frag_version.map rename to lib/librte_ip_frag/version.map diff --git a/lib/librte_ipsec/rte_ipsec_version.map b/lib/librte_ipsec/version.map similarity index 100% rename from lib/librte_ipsec/rte_ipsec_version.map rename to lib/librte_ipsec/version.map diff --git a/lib/librte_jobstats/rte_jobstats_version.map b/lib/librte_jobstats/version.map similarity index 100% rename from lib/librte_jobstats/rte_jobstats_version.map rename to lib/librte_jobstats/version.map diff --git a/lib/librte_kni/rte_kni_version.map b/lib/librte_kni/version.map similarity index 100% rename from lib/librte_kni/rte_kni_version.map rename to lib/librte_kni/version.map diff --git a/lib/librte_kvargs/rte_kvargs_version.map b/lib/librte_kvargs/version.map similarity index 100% rename from lib/librte_kvargs/rte_kvargs_version.map rename to lib/librte_kvargs/version.map diff --git a/lib/librte_latencystats/rte_latencystats_version.map b/lib/librte_latencystats/version.map similarity index 100% rename from lib/librte_latencystats/rte_latencystats_version.map rename to lib/librte_latencystats/version.map diff --git a/lib/librte_lpm/rte_lpm_version.map b/lib/librte_lpm/version.map similarity index 100% rename from lib/librte_lpm/rte_lpm_version.map rename to lib/librte_lpm/version.map diff --git a/lib/librte_mbuf/rte_mbuf_version.map b/lib/librte_mbuf/version.map similarity index 100% rename from lib/librte_mbuf/rte_mbuf_version.map rename to lib/librte_mbuf/version.map diff --git a/lib/librte_member/rte_member_version.map b/lib/librte_member/version.map similarity index 100% rename from lib/librte_member/rte_member_version.map rename to lib/librte_member/version.map diff --git a/lib/librte_mempool/rte_mempool_version.map b/lib/librte_mempool/version.map similarity index 100% rename from lib/librte_mempool/rte_mempool_version.map rename to lib/librte_mempool/version.map diff --git a/lib/librte_meter/rte_meter_version.map b/lib/librte_meter/version.map similarity index 100% rename from lib/librte_meter/rte_meter_version.map rename to lib/librte_meter/version.map diff --git a/lib/librte_metrics/rte_metrics_version.map b/lib/librte_metrics/version.map similarity index 100% rename from lib/librte_metrics/rte_metrics_version.map rename to lib/librte_metrics/version.map diff --git a/lib/librte_net/rte_net_version.map b/lib/librte_net/version.map similarity index 100% rename from lib/librte_net/rte_net_version.map rename to lib/librte_net/version.map diff --git a/lib/librte_node/rte_node_version.map b/lib/librte_node/version.map similarity index 100% rename from lib/librte_node/rte_node_version.map rename to lib/librte_node/version.map diff --git a/lib/librte_pci/rte_pci_version.map b/lib/librte_pci/version.map similarity index 100% rename from lib/librte_pci/rte_pci_version.map rename to lib/librte_pci/version.map diff --git a/lib/librte_pdump/rte_pdump_version.map b/lib/librte_pdump/version.map similarity index 100% rename from lib/librte_pdump/rte_pdump_version.map rename to lib/librte_pdump/version.map diff --git a/lib/librte_pipeline/rte_pipeline_version.map b/lib/librte_pipeline/version.map similarity index 100% rename from lib/librte_pipeline/rte_pipeline_version.map rename to lib/librte_pipeline/version.map diff --git a/lib/librte_port/rte_port_version.map b/lib/librte_port/version.map similarity index 100% rename from lib/librte_port/rte_port_version.map rename to lib/librte_port/version.map diff --git a/lib/librte_power/rte_power_version.map b/lib/librte_power/version.map similarity index 100% rename from lib/librte_power/rte_power_version.map rename to lib/librte_power/version.map diff --git a/lib/librte_rawdev/rte_rawdev_version.map b/lib/librte_rawdev/version.map similarity index 100% rename from lib/librte_rawdev/rte_rawdev_version.map rename to lib/librte_rawdev/version.map diff --git a/lib/librte_rcu/rte_rcu_version.map b/lib/librte_rcu/version.map similarity index 100% rename from lib/librte_rcu/rte_rcu_version.map rename to lib/librte_rcu/version.map diff --git a/lib/librte_regexdev/rte_regexdev_version.map b/lib/librte_regexdev/version.map similarity index 100% rename from lib/librte_regexdev/rte_regexdev_version.map rename to lib/librte_regexdev/version.map diff --git a/lib/librte_reorder/rte_reorder_version.map b/lib/librte_reorder/version.map similarity index 100% rename from lib/librte_reorder/rte_reorder_version.map rename to lib/librte_reorder/version.map diff --git a/lib/librte_rib/rte_rib_version.map b/lib/librte_rib/version.map similarity index 100% rename from lib/librte_rib/rte_rib_version.map rename to lib/librte_rib/version.map diff --git a/lib/librte_ring/rte_ring_version.map b/lib/librte_ring/version.map similarity index 100% rename from lib/librte_ring/rte_ring_version.map rename to lib/librte_ring/version.map diff --git a/lib/librte_sched/rte_sched_version.map b/lib/librte_sched/version.map similarity index 100% rename from lib/librte_sched/rte_sched_version.map rename to lib/librte_sched/version.map diff --git a/lib/librte_security/rte_security_version.map b/lib/librte_security/version.map similarity index 100% rename from lib/librte_security/rte_security_version.map rename to lib/librte_security/version.map diff --git a/lib/librte_stack/rte_stack_version.map b/lib/librte_stack/version.map similarity index 100% rename from lib/librte_stack/rte_stack_version.map rename to lib/librte_stack/version.map diff --git a/lib/librte_table/rte_table_version.map b/lib/librte_table/version.map similarity index 100% rename from lib/librte_table/rte_table_version.map rename to lib/librte_table/version.map diff --git a/lib/librte_telemetry/rte_telemetry_version.map b/lib/librte_telemetry/version.map similarity index 100% rename from lib/librte_telemetry/rte_telemetry_version.map rename to lib/librte_telemetry/version.map diff --git a/lib/librte_timer/rte_timer_version.map b/lib/librte_timer/version.map similarity index 100% rename from lib/librte_timer/rte_timer_version.map rename to lib/librte_timer/version.map diff --git a/lib/librte_vhost/rte_vhost_version.map b/lib/librte_vhost/version.map similarity index 100% rename from lib/librte_vhost/rte_vhost_version.map rename to lib/librte_vhost/version.map diff --git a/lib/meson.build b/lib/meson.build index e5597f174..8761457c9 100644 --- a/lib/meson.build +++ b/lib/meson.build @@ -139,8 +139,8 @@ foreach l:libraries # RTE_BUILD_SHARED_LIB defined cflags += '-DRTE_BUILD_SHARED_LIB' endif - version_map = '@0@/@1@/rte_@2@_version.map'.format( - meson.current_source_dir(), dir_name, name) + version_map = '@0@/@1@/version.map'.format( + meson.current_source_dir(), dir_name) implib = dir_name + '.dll.a' def_file = custom_target(libname + '_def', From patchwork Wed Oct 14 14:13:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 80754 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 69B01A04B7; Wed, 14 Oct 2020 16:16:02 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id AA7CE1DE93; Wed, 14 Oct 2020 16:13:43 +0200 (CEST) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by dpdk.org (Postfix) with ESMTP id BE8F01DE7E for ; Wed, 14 Oct 2020 16:13:38 +0200 (CEST) IronPort-SDR: 4gPBywLAgP8jcy7ReSv/Ho/Jf8IqEZK5Pr4eJr9YJb9zxQPaVU3ZCSaNDO9KNbxsrOqjN4zRJj l/ObVpeoZanw== X-IronPort-AV: E=McAfee;i="6000,8403,9773"; a="145421389" X-IronPort-AV: E=Sophos;i="5.77,374,1596524400"; d="scan'208";a="145421389" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Oct 2020 07:13:38 -0700 IronPort-SDR: VVEm3d2qV8Nkqp7Al3JJ03ELVVbDjWYU4yt0rWgsOrmT7qLhT09LWGbxMWj3duEs9jNj1zU+uA lTQOeBGpDEmQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,374,1596524400"; d="scan'208";a="299965438" Received: from silpixa00399126.ir.intel.com ([10.237.222.4]) by fmsmga007.fm.intel.com with ESMTP; 14 Oct 2020 07:13:36 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: david.marchand@redhat.com, arybchenko@solarflare.com, ferruh.yigit@intel.com, thomas@monjalon.net, bluca@debian.org, Bruce Richardson Date: Wed, 14 Oct 2020 15:13:03 +0100 Message-Id: <20201014141304.632120-7-bruce.richardson@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201014141304.632120-1-bruce.richardson@intel.com> References: <20200916164429.244847-1-bruce.richardson@intel.com> <20201014141304.632120-1-bruce.richardson@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v3 6/7] build: standardize component names and defines X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" As discussed on the dpdk-dev mailing list[1], we can make some easy improvements in standardizing the naming of the various components in DPDK, and their associated feature-enabled macros. Following this patch, each library will have the name in format, 'librte_.so', and the macro indicating that library is enabled in the build will have the form 'RTE_LIB_'. Similarly, for libraries, the equivalent name formats and macros are: 'librte__.so' and 'RTE__', where class is the device type taken from the relevant driver subdirectory name, i.e. 'net', 'crypto' etc. To avoid too many changes at once for end applications, the old macro names will still be provided in the build in this release, but will be removed subsequently. Signed-off-by: Bruce Richardson [1] http://inbox.dpdk.org/dev/ef7c1a87-79ab-e405-4202-39b7ad6b0c71@solarflare.com/t/#u Acked-by: Luca Boccassi --- app/test-bbdev/meson.build | 4 ++-- app/test-crypto-perf/meson.build | 2 +- app/test-pmd/meson.build | 12 ++++++------ app/test/meson.build | 8 ++++---- doc/guides/rel_notes/deprecation.rst | 8 ++++++++ drivers/baseband/meson.build | 1 - drivers/bus/meson.build | 1 - drivers/common/meson.build | 1 - drivers/common/mlx5/meson.build | 1 - drivers/common/qat/meson.build | 1 - drivers/compress/meson.build | 1 - drivers/compress/octeontx/meson.build | 2 +- drivers/crypto/meson.build | 1 - drivers/crypto/null/meson.build | 2 +- drivers/crypto/octeontx/meson.build | 2 +- drivers/crypto/octeontx2/meson.build | 2 +- drivers/crypto/scheduler/meson.build | 2 +- drivers/crypto/virtio/meson.build | 2 +- drivers/event/dpaa/meson.build | 2 +- drivers/event/dpaa2/meson.build | 2 +- drivers/event/meson.build | 1 - drivers/event/octeontx/meson.build | 2 +- drivers/event/octeontx2/meson.build | 2 +- drivers/mempool/meson.build | 1 - drivers/meson.build | 9 ++++----- drivers/net/meson.build | 1 - drivers/net/mlx4/meson.build | 2 +- drivers/raw/ifpga/meson.build | 2 +- drivers/raw/meson.build | 1 - drivers/regex/meson.build | 1 - drivers/vdpa/meson.build | 1 - examples/bond/meson.build | 2 +- examples/ethtool/meson.build | 2 +- examples/ioat/meson.build | 2 +- examples/l2fwd-crypto/meson.build | 2 +- examples/ntb/meson.build | 2 +- examples/vm_power_manager/meson.build | 6 +++--- lib/librte_ethdev/meson.build | 1 - lib/librte_graph/meson.build | 2 -- lib/meson.build | 3 ++- 40 files changed, 47 insertions(+), 55 deletions(-) diff --git a/app/test-bbdev/meson.build b/app/test-bbdev/meson.build index 18ab6a8c6..178306b08 100644 --- a/app/test-bbdev/meson.build +++ b/app/test-bbdev/meson.build @@ -7,8 +7,8 @@ sources = files('main.c', 'test_bbdev_vector.c') deps += ['bbdev', 'bus_vdev'] if dpdk_conf.has('RTE_LIBRTE_PMD_BBDEV_FPGA_LTE_FEC') - deps += ['pmd_bbdev_fpga_lte_fec'] + deps += ['baseband_fpga_lte_fec'] endif if dpdk_conf.has('RTE_LIBRTE_PMD_BBDEV_FPGA_5GNR_FEC') - deps += ['pmd_bbdev_fpga_5gnr_fec'] + deps += ['baseband_fpga_5gnr_fec'] endif diff --git a/app/test-crypto-perf/meson.build b/app/test-crypto-perf/meson.build index 4bd71510d..e6ddda6f0 100644 --- a/app/test-crypto-perf/meson.build +++ b/app/test-crypto-perf/meson.build @@ -13,5 +13,5 @@ sources = files('cperf_ops.c', 'main.c') deps += ['cryptodev', 'net', 'security'] if dpdk_conf.has('RTE_LIBRTE_PMD_CRYPTO_SCHEDULER') - deps += 'pmd_crypto_scheduler' + deps += 'crypto_scheduler' endif diff --git a/app/test-pmd/meson.build b/app/test-pmd/meson.build index 0d9e45049..2e8b9f8a9 100644 --- a/app/test-pmd/meson.build +++ b/app/test-pmd/meson.build @@ -38,22 +38,22 @@ if dpdk_conf.has('RTE_LIBRTE_LATENCYSTATS') deps += 'latencystats' endif if dpdk_conf.has('RTE_LIBRTE_PMD_CRYPTO_SCHEDULER') - deps += 'pmd_crypto_scheduler' + deps += 'crypto_scheduler' endif if dpdk_conf.has('RTE_LIBRTE_BOND_PMD') - deps += 'pmd_bond' + deps += 'net_bond' endif if dpdk_conf.has('RTE_LIBRTE_BNXT_PMD') - deps += 'pmd_bnxt' + deps += 'net_bnxt' endif if dpdk_conf.has('RTE_LIBRTE_I40E_PMD') - deps += 'pmd_i40e' + deps += 'net_i40e' endif if dpdk_conf.has('RTE_LIBRTE_IXGBE_PMD') - deps += 'pmd_ixgbe' + deps += 'net_ixgbe' endif if dpdk_conf.has('RTE_LIBRTE_DPAA_PMD') - deps += ['bus_dpaa', 'mempool_dpaa', 'pmd_dpaa'] + deps += ['bus_dpaa', 'mempool_dpaa', 'net_dpaa'] endif if dpdk_conf.has('RTE_LIBRTE_BPF') sources += files('bpf_cmd.c') diff --git a/app/test/meson.build b/app/test/meson.build index fc90a1909..c5ce1d2c0 100644 --- a/app/test/meson.build +++ b/app/test/meson.build @@ -345,7 +345,7 @@ if dpdk_conf.has('RTE_LIBRTE_STACK_MEMPOOL') test_deps += 'mempool_stack' endif if dpdk_conf.has('RTE_LIBRTE_SKELETON_EVENTDEV_PMD') - test_deps += 'pmd_skeleton_event' + test_deps += 'event_skeleton' endif if dpdk_conf.has('RTE_LIBRTE_TELEMETRY') test_sources += ['test_telemetry_json.c', 'test_telemetry_data.c'] @@ -355,7 +355,7 @@ endif # The following linkages of drivers are required because # they are used via a driver-specific API. if dpdk_conf.has('RTE_LIBRTE_BOND_PMD') - test_deps += 'pmd_bond' + test_deps += 'net_bond' test_sources += ['test_link_bonding.c', 'test_link_bonding_rssconf.c'] driver_test_names += ['link_bonding_autotest', 'link_bonding_rssconf_autotest'] if dpdk_conf.has('RTE_LIBRTE_RING_PMD') @@ -364,7 +364,7 @@ if dpdk_conf.has('RTE_LIBRTE_BOND_PMD') endif endif if dpdk_conf.has('RTE_LIBRTE_RING_PMD') - test_deps += 'pmd_ring' + test_deps += 'net_ring' test_sources += 'test_pmd_ring_perf.c' test_sources += 'test_pmd_ring.c' test_sources += 'test_event_eth_tx_adapter.c' @@ -415,7 +415,7 @@ endif if dpdk_conf.has('RTE_LIBRTE_PMD_CRYPTO_SCHEDULER') driver_test_names += 'cryptodev_scheduler_autotest' - test_deps += 'pmd_crypto_scheduler' + test_deps += 'crypto_scheduler' endif foreach d:test_deps diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst index 584e72087..69e3ef91c 100644 --- a/doc/guides/rel_notes/deprecation.rst +++ b/doc/guides/rel_notes/deprecation.rst @@ -11,6 +11,14 @@ here. Deprecation Notices ------------------- +* build: The macros defined to indicate which DPDK libraries and drivers + are included in the meson build are changing to a standardized format of + ``RTE_LIB_`` and ``RTE__``, where ``NAME`` is the + upper-case component name, e.g. EAL, ETHDEV, IXGBE, and ``CLASS`` is the + upper-case name of the device class to which a driver belongs e.g. + ``NET``, ``CRYPTO``, ``VDPA``. The old macros are deprecated and will be + removed in a future release. + * meson: The minimum supported version of meson for configuring and building DPDK will be increased to v0.47.1 (from 0.41) from DPDK 19.05 onwards. For those users with a version earlier than 0.47.1, an updated copy of meson diff --git a/drivers/baseband/meson.build b/drivers/baseband/meson.build index 415b6724b..7e1b64ffd 100644 --- a/drivers/baseband/meson.build +++ b/drivers/baseband/meson.build @@ -8,4 +8,3 @@ endif drivers = ['null', 'turbo_sw', 'fpga_lte_fec', 'fpga_5gnr_fec'] config_flag_fmt = 'RTE_LIBRTE_PMD_BBDEV_@0@' -driver_name_fmt = 'rte_pmd_bbdev_@0@' diff --git a/drivers/bus/meson.build b/drivers/bus/meson.build index 80de2d91d..bd73efd18 100644 --- a/drivers/bus/meson.build +++ b/drivers/bus/meson.build @@ -4,4 +4,3 @@ drivers = ['dpaa', 'fslmc', 'ifpga', 'pci', 'vdev', 'vmbus'] std_deps = ['eal'] config_flag_fmt = 'RTE_LIBRTE_@0@_BUS' -driver_name_fmt = 'rte_bus_@0@' diff --git a/drivers/common/meson.build b/drivers/common/meson.build index abb4f1529..d78882f05 100644 --- a/drivers/common/meson.build +++ b/drivers/common/meson.build @@ -8,4 +8,3 @@ endif std_deps = ['eal'] drivers = ['cpt', 'dpaax', 'iavf', 'mvep', 'octeontx', 'octeontx2', 'sfc_efx'] config_flag_fmt = 'RTE_LIBRTE_@0@_COMMON' -driver_name_fmt = 'rte_common_@0@' diff --git a/drivers/common/mlx5/meson.build b/drivers/common/mlx5/meson.build index 8e5608703..3dacc6f68 100644 --- a/drivers/common/mlx5/meson.build +++ b/drivers/common/mlx5/meson.build @@ -8,7 +8,6 @@ if not is_linux endif config_flag_fmt = 'RTE_LIBRTE_@0@_COMMON' -driver_name_fmt = 'rte_common_@0@' deps += ['hash', 'pci', 'bus_pci', 'net', 'eal', 'kvargs'] sources += files( 'mlx5_devx_cmds.c', diff --git a/drivers/common/qat/meson.build b/drivers/common/qat/meson.build index 3409162d0..fdf8b84f8 100644 --- a/drivers/common/qat/meson.build +++ b/drivers/common/qat/meson.build @@ -2,7 +2,6 @@ # Copyright(c) 2017-2018 Intel Corporation config_flag_fmt = 'RTE_LIBRTE_@0@_COMMON' -driver_name_fmt = 'rte_common_@0@' qat_crypto = true qat_crypto_path = 'crypto/qat' diff --git a/drivers/compress/meson.build b/drivers/compress/meson.build index 3a4723c0c..33f5e33dd 100644 --- a/drivers/compress/meson.build +++ b/drivers/compress/meson.build @@ -9,4 +9,3 @@ drivers = ['isal', 'octeontx', 'zlib'] std_deps = ['compressdev'] # compressdev pulls in all other needed deps config_flag_fmt = 'RTE_LIBRTE_PMD_@0@' -driver_name_fmt = 'rte_pmd_@0@' diff --git a/drivers/compress/octeontx/meson.build b/drivers/compress/octeontx/meson.build index 0dc98b762..2d71b4da2 100644 --- a/drivers/compress/octeontx/meson.build +++ b/drivers/compress/octeontx/meson.build @@ -1,7 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2018 Cavium, Inc -name = 'octeontx_compress' +fmt_name = 'octeontx_compress' sources = files('otx_zip.c', 'otx_zip_pmd.c') includes += include_directories('include') deps += ['mempool_octeontx', 'bus_pci'] diff --git a/drivers/crypto/meson.build b/drivers/crypto/meson.build index bd7a940e6..fa5c7ef3a 100644 --- a/drivers/crypto/meson.build +++ b/drivers/crypto/meson.build @@ -26,4 +26,3 @@ drivers = ['aesni_gcm', std_deps = ['cryptodev'] # cryptodev pulls in all other needed deps config_flag_fmt = 'RTE_LIBRTE_PMD_@0@' -driver_name_fmt = 'rte_pmd_@0@' diff --git a/drivers/crypto/null/meson.build b/drivers/crypto/null/meson.build index 502336da2..421414916 100644 --- a/drivers/crypto/null/meson.build +++ b/drivers/crypto/null/meson.build @@ -2,5 +2,5 @@ # Copyright(c) 2017 Intel Corporation deps += 'bus_vdev' -name = 'null_crypto' +fmt_name = 'null_crypto' sources = files('null_crypto_pmd.c', 'null_crypto_pmd_ops.c') diff --git a/drivers/crypto/octeontx/meson.build b/drivers/crypto/octeontx/meson.build index cf031b006..d6939720d 100644 --- a/drivers/crypto/octeontx/meson.build +++ b/drivers/crypto/octeontx/meson.build @@ -7,7 +7,7 @@ endif deps += ['bus_pci'] deps += ['common_cpt'] -name = 'octeontx_crypto' +fmt_name = 'octeontx_crypto' sources = files('otx_cryptodev.c', 'otx_cryptodev_capabilities.c', diff --git a/drivers/crypto/octeontx2/meson.build b/drivers/crypto/octeontx2/meson.build index 148ec184a..bf502e247 100644 --- a/drivers/crypto/octeontx2/meson.build +++ b/drivers/crypto/octeontx2/meson.build @@ -11,7 +11,7 @@ deps += ['common_cpt'] deps += ['common_octeontx2'] deps += ['ethdev'] deps += ['security'] -name = 'octeontx2_crypto' +fmt_name = 'octeontx2_crypto' sources = files('otx2_cryptodev.c', 'otx2_cryptodev_capabilities.c', diff --git a/drivers/crypto/scheduler/meson.build b/drivers/crypto/scheduler/meson.build index c5ba2d680..2209c5023 100644 --- a/drivers/crypto/scheduler/meson.build +++ b/drivers/crypto/scheduler/meson.build @@ -2,7 +2,7 @@ # Copyright(c) 2018 Luca Boccassi deps += ['bus_vdev', 'reorder'] -name = 'crypto_scheduler' +fmt_name = 'crypto_scheduler' sources = files( 'rte_cryptodev_scheduler.c', 'scheduler_failover.c', diff --git a/drivers/crypto/virtio/meson.build b/drivers/crypto/virtio/meson.build index b15b3f9fa..6cea782de 100644 --- a/drivers/crypto/virtio/meson.build +++ b/drivers/crypto/virtio/meson.build @@ -3,6 +3,6 @@ includes += include_directories('../../../lib/librte_vhost') deps += 'bus_pci' -name = 'virtio_crypto' +fmt_name = 'virtio_crypto' sources = files('virtio_cryptodev.c', 'virtio_pci.c', 'virtio_rxtx.c', 'virtqueue.c') diff --git a/drivers/event/dpaa/meson.build b/drivers/event/dpaa/meson.build index 2f761f8e5..9abb75e3e 100644 --- a/drivers/event/dpaa/meson.build +++ b/drivers/event/dpaa/meson.build @@ -5,7 +5,7 @@ if not is_linux build = false reason = 'only supported on linux' endif -deps += ['pmd_dpaa', 'pmd_dpaa_sec'] +deps += ['net_dpaa', 'crypto_dpaa_sec'] sources = files('dpaa_eventdev.c') includes += include_directories('../../crypto/dpaa_sec/') diff --git a/drivers/event/dpaa2/meson.build b/drivers/event/dpaa2/meson.build index 71c8be3d6..4ead7bb3e 100644 --- a/drivers/event/dpaa2/meson.build +++ b/drivers/event/dpaa2/meson.build @@ -5,7 +5,7 @@ if not is_linux build = false reason = 'only supported on linux' endif -deps += ['bus_vdev', 'pmd_dpaa2', 'pmd_dpaa2_sec'] +deps += ['bus_vdev', 'net_dpaa2', 'crypto_dpaa2_sec'] sources = files('dpaa2_hw_dpcon.c', 'dpaa2_eventdev.c', 'dpaa2_eventdev_selftest.c') diff --git a/drivers/event/meson.build b/drivers/event/meson.build index f2a343147..a7dac99de 100644 --- a/drivers/event/meson.build +++ b/drivers/event/meson.build @@ -12,4 +12,3 @@ if not (toolchain == 'gcc' and cc.version().version_compare('<4.8.6') and endif std_deps = ['eventdev', 'kvargs'] config_flag_fmt = 'RTE_LIBRTE_PMD_@0@_EVENTDEV' -driver_name_fmt = 'rte_pmd_@0@_event' diff --git a/drivers/event/octeontx/meson.build b/drivers/event/octeontx/meson.build index 2b74bb62d..41e367684 100644 --- a/drivers/event/octeontx/meson.build +++ b/drivers/event/octeontx/meson.build @@ -10,4 +10,4 @@ sources = files('ssovf_worker.c', 'timvf_probe.c' ) -deps += ['common_octeontx', 'mempool_octeontx', 'bus_vdev', 'pmd_octeontx'] +deps += ['common_octeontx', 'mempool_octeontx', 'bus_vdev', 'net_octeontx'] diff --git a/drivers/event/octeontx2/meson.build b/drivers/event/octeontx2/meson.build index 0ade51cec..3e5eb37d2 100644 --- a/drivers/event/octeontx2/meson.build +++ b/drivers/event/octeontx2/meson.build @@ -24,6 +24,6 @@ foreach flag: extra_flags endif endforeach -deps += ['bus_pci', 'common_octeontx2', 'mempool_octeontx2', 'pmd_octeontx2'] +deps += ['bus_pci', 'common_octeontx2', 'mempool_octeontx2', 'net_octeontx2'] includes += include_directories('../../crypto/octeontx2') diff --git a/drivers/mempool/meson.build b/drivers/mempool/meson.build index 7520e489f..a6ddd35b2 100644 --- a/drivers/mempool/meson.build +++ b/drivers/mempool/meson.build @@ -4,4 +4,3 @@ drivers = ['bucket', 'dpaa', 'dpaa2', 'octeontx', 'octeontx2', 'ring', 'stack'] std_deps = ['mempool'] config_flag_fmt = 'RTE_LIBRTE_@0@_MEMPOOL' -driver_name_fmt = 'rte_mempool_@0@' diff --git a/drivers/meson.build b/drivers/meson.build index 3d4bbff13..a5a6fed06 100644 --- a/drivers/meson.build +++ b/drivers/meson.build @@ -33,9 +33,6 @@ foreach subpath:subdirs drivers = [] std_deps = [] config_flag_fmt = '' # format string used to set the value in dpdk_conf - driver_name_fmt = '' # format string for driver name, used to name - # the library, the dependency and to find the - # version file for linking # subpath can be either "class" or "class/driver" if subpath.contains('/') @@ -113,11 +110,14 @@ foreach subpath:subdirs endif else enabled_drivers += name + lib_name = '_'.join(['rte', class, name]) + dpdk_conf.set(lib_name.to_upper(), 1) if fmt_name == '' fmt_name = name endif - dpdk_conf.set(config_flag_fmt.format(fmt_name.to_upper()),1) + + dpdk_conf.set(config_flag_fmt.format(fmt_name.to_upper()),1) #old-style macro # for driver compatibility, since we changed the # default to match that of make. Remove in future release # after following deprecation process @@ -133,7 +133,6 @@ foreach subpath:subdirs dpdk_conf.set(alt_flag_fmt.format( fmt_name.to_upper()), 1) endif - lib_name = driver_name_fmt.format(fmt_name) dpdk_extra_ldflags += pkgconfig_extra_libs diff --git a/drivers/net/meson.build b/drivers/net/meson.build index d56b24051..4e4c2c976 100644 --- a/drivers/net/meson.build +++ b/drivers/net/meson.build @@ -59,4 +59,3 @@ std_deps = ['ethdev', 'kvargs'] # 'ethdev' also pulls in mbuf, net, eal etc std_deps += ['bus_pci'] # very many PMDs depend on PCI, so make std std_deps += ['bus_vdev'] # same with vdev bus config_flag_fmt = 'RTE_LIBRTE_@0@_PMD' -driver_name_fmt = 'rte_pmd_@0@' diff --git a/drivers/net/mlx4/meson.build b/drivers/net/mlx4/meson.build index 5a25e11a7..404006515 100644 --- a/drivers/net/mlx4/meson.build +++ b/drivers/net/mlx4/meson.build @@ -116,7 +116,7 @@ configure_file(output : 'mlx4_autoconf.h', configuration : config) # Build Glue Library if dlopen_ibverbs dlopen_name = 'mlx4_glue' - dlopen_lib_name = driver_name_fmt.format(dlopen_name) + dlopen_lib_name = 'rte_net_' + dlopen_name dlopen_so_version = LIB_GLUE_VERSION dlopen_sources = files('mlx4_glue.c') dlopen_install_dir = [ eal_pmd_path + '-glue' ] diff --git a/drivers/raw/ifpga/meson.build b/drivers/raw/ifpga/meson.build index da454b194..027ff8056 100644 --- a/drivers/raw/ifpga/meson.build +++ b/drivers/raw/ifpga/meson.build @@ -11,7 +11,7 @@ subdir('base') objs = [base_objs] deps += ['ethdev', 'rawdev', 'pci', 'bus_pci', 'kvargs', - 'bus_vdev', 'bus_ifpga', 'net', 'pmd_i40e', 'pmd_ipn3ke'] + 'bus_vdev', 'bus_ifpga', 'net', 'net_i40e', 'net_ipn3ke'] sources = files('ifpga_rawdev.c') diff --git a/drivers/raw/meson.build b/drivers/raw/meson.build index 2c1e65ec7..d8d6cf582 100644 --- a/drivers/raw/meson.build +++ b/drivers/raw/meson.build @@ -12,4 +12,3 @@ drivers = ['dpaa2_cmdif', 'dpaa2_qdma', 'skeleton'] std_deps = ['rawdev'] config_flag_fmt = 'RTE_LIBRTE_PMD_@0@_RAWDEV' -driver_name_fmt = 'rte_rawdev_@0@' diff --git a/drivers/regex/meson.build b/drivers/regex/meson.build index 79bb5d5df..880a1b4a3 100644 --- a/drivers/regex/meson.build +++ b/drivers/regex/meson.build @@ -4,4 +4,3 @@ drivers = ['mlx5', 'octeontx2'] std_deps = ['ethdev', 'kvargs'] # 'ethdev' also pulls in mbuf, net, eal etc config_flag_fmt = 'RTE_LIBRTE_@0@_PMD' -driver_name_fmt = 'rte_pmd_@0@' diff --git a/drivers/vdpa/meson.build b/drivers/vdpa/meson.build index 798eb3830..b346e4308 100644 --- a/drivers/vdpa/meson.build +++ b/drivers/vdpa/meson.build @@ -10,4 +10,3 @@ drivers = ['ifc', std_deps = ['bus_pci', 'kvargs'] std_deps += ['vhost'] config_flag_fmt = 'RTE_LIBRTE_@0@_PMD' -driver_name_fmt = 'rte_pmd_@0@' diff --git a/examples/bond/meson.build b/examples/bond/meson.build index 82e355a49..69382ffcd 100644 --- a/examples/bond/meson.build +++ b/examples/bond/meson.build @@ -6,7 +6,7 @@ # To build this example as a standalone application with an already-installed # DPDK instance, use 'make' -deps += 'pmd_bond' +deps += 'net_bond' allow_experimental_apis = true sources = files( 'main.c' diff --git a/examples/ethtool/meson.build b/examples/ethtool/meson.build index bc7a35514..fdfdd1971 100644 --- a/examples/ethtool/meson.build +++ b/examples/ethtool/meson.build @@ -14,7 +14,7 @@ includes = include_directories('lib', 'ethtool-app') deps += 'bus_pci' if dpdk_conf.has('RTE_LIBRTE_IXGBE_PMD') - deps += 'pmd_ixgbe' + deps += 'net_ixgbe' endif allow_experimental_apis = true diff --git a/examples/ioat/meson.build b/examples/ioat/meson.build index f72cf70e7..f1a045a0a 100644 --- a/examples/ioat/meson.build +++ b/examples/ioat/meson.build @@ -9,7 +9,7 @@ allow_experimental_apis = true build = dpdk_conf.has('RTE_LIBRTE_PMD_IOAT_RAWDEV') -deps += ['rawdev_ioat'] +deps += ['raw_ioat'] sources = files( 'ioatfwd.c' diff --git a/examples/l2fwd-crypto/meson.build b/examples/l2fwd-crypto/meson.build index 39e1604fa..9002d62a6 100644 --- a/examples/l2fwd-crypto/meson.build +++ b/examples/l2fwd-crypto/meson.build @@ -8,7 +8,7 @@ deps += 'cryptodev' if dpdk_conf.has('RTE_LIBRTE_PMD_CRYPTO_SCHEDULER') - deps += 'pmd_crypto_scheduler' + deps += 'crypto_scheduler' endif allow_experimental_apis = true sources = files( diff --git a/examples/ntb/meson.build b/examples/ntb/meson.build index 45a59350c..bac6e5cd2 100644 --- a/examples/ntb/meson.build +++ b/examples/ntb/meson.build @@ -16,5 +16,5 @@ sources = files( 'ntb_fwd.c' ) if dpdk_conf.has('RTE_LIBRTE_PMD_NTB_RAWDEV') - deps += 'rawdev_ntb' + deps += 'raw_ntb' endif diff --git a/examples/vm_power_manager/meson.build b/examples/vm_power_manager/meson.build index 54e2b584f..2dd132015 100644 --- a/examples/vm_power_manager/meson.build +++ b/examples/vm_power_manager/meson.build @@ -14,15 +14,15 @@ endif deps += ['power'] if dpdk_conf.has('RTE_LIBRTE_BNXT_PMD') - deps += ['pmd_bnxt'] + deps += ['net_bnxt'] endif if dpdk_conf.has('RTE_LIBRTE_I40E_PMD') - deps += ['pmd_i40e'] + deps += ['net_i40e'] endif if dpdk_conf.has('RTE_LIBRTE_IXGBE_PMD') - deps += ['pmd_ixgbe'] + deps += ['net_ixgbe'] endif allow_experimental_apis = true diff --git a/lib/librte_ethdev/meson.build b/lib/librte_ethdev/meson.build index 8fc24e8c8..e4b610246 100644 --- a/lib/librte_ethdev/meson.build +++ b/lib/librte_ethdev/meson.build @@ -1,7 +1,6 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Intel Corporation -name = 'ethdev' sources = files('ethdev_private.c', 'ethdev_profile.c', 'ethdev_trace_points.c', diff --git a/lib/librte_graph/meson.build b/lib/librte_graph/meson.build index d5de1e250..d3ec78ca6 100644 --- a/lib/librte_graph/meson.build +++ b/lib/librte_graph/meson.build @@ -1,8 +1,6 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(C) 2020 Marvell International Ltd. -name = 'graph' - sources = files('node.c', 'graph.c', 'graph_ops.c', 'graph_debug.c', 'graph_stats.c', 'graph_populate.c') headers = files('rte_graph.h', 'rte_graph_worker.h') diff --git a/lib/meson.build b/lib/meson.build index 8761457c9..5f8177e1a 100644 --- a/lib/meson.build +++ b/lib/meson.build @@ -98,7 +98,8 @@ foreach l:libraries set_variable(name.underscorify() + '_disable_reason', reason) else enabled_libs += name - dpdk_conf.set('RTE_LIBRTE_' + name.to_upper(), 1) + dpdk_conf.set('RTE_LIBRTE_' + name.to_upper(), 1) #old macro + dpdk_conf.set('RTE_LIB_' + name.to_upper(), 1) # new macro install_headers(headers) libname = 'rte_' + name From patchwork Wed Oct 14 14:13:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 80755 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 54EE6A04B7; Wed, 14 Oct 2020 16:16:34 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id F36921DE9C; Wed, 14 Oct 2020 16:13:44 +0200 (CEST) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by dpdk.org (Postfix) with ESMTP id CBFBA1DE8F for ; Wed, 14 Oct 2020 16:13:42 +0200 (CEST) IronPort-SDR: zgG8H4/btbLEO++XIOMhK6MG9vmAxj3q4UTrd/+lxHxOkqG64IpbjlXb97X2rXln3lx/j/Qqjq TLJpeW4zDJFQ== X-IronPort-AV: E=McAfee;i="6000,8403,9773"; a="145421418" X-IronPort-AV: E=Sophos;i="5.77,374,1596524400"; d="scan'208";a="145421418" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Oct 2020 07:13:42 -0700 IronPort-SDR: 2/cAuhbSImIuvn7HUEXY+dQA0VPgecHa0BrQ2o4rjmiM9gu7icQoUNyASuEJgWPTyYAwcGWumv DF435V0on5bQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,374,1596524400"; d="scan'208";a="299965449" Received: from silpixa00399126.ir.intel.com ([10.237.222.4]) by fmsmga007.fm.intel.com with ESMTP; 14 Oct 2020 07:13:39 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: david.marchand@redhat.com, arybchenko@solarflare.com, ferruh.yigit@intel.com, thomas@monjalon.net, bluca@debian.org, Bruce Richardson Date: Wed, 14 Oct 2020 15:13:04 +0100 Message-Id: <20201014141304.632120-8-bruce.richardson@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201014141304.632120-1-bruce.richardson@intel.com> References: <20200916164429.244847-1-bruce.richardson@intel.com> <20201014141304.632120-1-bruce.richardson@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v3 7/7] build: replace use of old build macros X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Use the newer macros defined by meson in all DPDK source code, to ensure there are no errors when the old non-standard macros are removed. Signed-off-by: Bruce Richardson Acked-by: Luca Boccassi --- app/proc-info/main.c | 4 +- app/test-bbdev/meson.build | 4 +- app/test-bbdev/test_bbdev_perf.c | 8 +- app/test-crypto-perf/cperf_ops.c | 6 +- app/test-crypto-perf/cperf_options.h | 6 +- app/test-crypto-perf/cperf_options_parsing.c | 16 +- .../cperf_test_pmd_cyclecount.c | 2 +- app/test-crypto-perf/cperf_test_throughput.c | 2 +- app/test-crypto-perf/main.c | 6 +- app/test-crypto-perf/meson.build | 2 +- app/test-pipeline/main.c | 2 +- app/test-pmd/bpf_cmd.h | 4 +- app/test-pmd/cmdline.c | 190 +++++++++--------- app/test-pmd/config.c | 18 +- app/test-pmd/meson.build | 22 +- app/test-pmd/parameters.c | 30 +-- app/test-pmd/testpmd.c | 38 ++-- app/test-pmd/testpmd.h | 4 +- app/test/meson.build | 22 +- app/test/process.h | 16 +- app/test/test.c | 20 +- app/test/test_cryptodev.c | 26 +-- app/test/test_cryptodev_hash_test_vectors.h | 2 +- app/test/test_eal_flags.c | 4 +- app/test/test_func_reentrancy.c | 24 +-- app/test/test_kni.c | 2 +- app/test/test_mp_secondary.c | 12 +- app/test/test_power.c | 2 +- app/test/test_power_cpufreq.c | 2 +- app/test/test_power_kvm_vm.c | 2 +- app/test/test_table.c | 2 +- app/test/test_table.h | 2 +- app/test/test_table_combined.h | 2 +- app/test/test_table_tables.h | 2 +- config/arm/meson.build | 6 +- drivers/bus/fslmc/portal/dpaa2_hw_dpio.c | 6 +- drivers/compress/qat/qat_comp.h | 2 +- drivers/compress/qat/qat_comp_pmd.h | 2 +- .../crypto/aesni_mb/aesni_mb_pmd_private.h | 2 +- drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c | 22 +- drivers/crypto/dpaa2_sec/dpaa2_sec_priv.h | 8 +- drivers/crypto/dpaa_sec/dpaa_sec.c | 24 +-- drivers/crypto/dpaa_sec/dpaa_sec.h | 8 +- drivers/crypto/qat/qat_sym.c | 2 +- drivers/crypto/qat/qat_sym.h | 8 +- drivers/crypto/qat/qat_sym_capabilities.h | 2 +- drivers/crypto/qat/qat_sym_pmd.c | 12 +- drivers/crypto/qat/qat_sym_pmd.h | 2 +- drivers/crypto/qat/qat_sym_session.c | 4 +- drivers/crypto/qat/qat_sym_session.h | 4 +- drivers/net/ixgbe/ixgbe_ethdev.c | 6 +- drivers/net/ixgbe/ixgbe_ethdev.h | 4 +- drivers/net/ixgbe/ixgbe_flow.c | 6 +- drivers/net/ixgbe/ixgbe_rxtx.c | 26 +-- drivers/net/ixgbe/ixgbe_rxtx.h | 6 +- drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c | 6 +- drivers/net/kni/meson.build | 2 +- drivers/net/netvsc/meson.build | 2 +- drivers/net/vhost/meson.build | 2 +- drivers/raw/dpaa2_cmdif/meson.build | 2 +- drivers/raw/dpaa2_qdma/meson.build | 2 +- drivers/raw/ifpga/base/opae_osdep.h | 2 +- drivers/vdpa/ifc/meson.build | 2 +- examples/distributor/meson.build | 2 +- examples/ethtool/lib/rte_ethtool.c | 4 +- examples/ethtool/meson.build | 2 +- examples/ioat/meson.build | 2 +- examples/ip_pipeline/kni.c | 4 +- examples/ip_pipeline/kni.h | 4 +- examples/ip_pipeline/pipeline.c | 14 +- examples/kni/meson.build | 2 +- examples/l2fwd-crypto/main.c | 4 +- examples/l2fwd-crypto/meson.build | 2 +- examples/l3fwd-power/meson.build | 2 +- examples/ntb/meson.build | 2 +- examples/vhost_crypto/meson.build | 2 +- examples/vm_power_manager/channel_monitor.c | 8 +- .../vm_power_manager/guest_cli/meson.build | 2 +- examples/vm_power_manager/main.c | 12 +- examples/vm_power_manager/meson.build | 8 +- lib/librte_eal/linux/eal.c | 4 +- lib/librte_metrics/rte_metrics_telemetry.c | 4 +- lib/librte_metrics/rte_metrics_telemetry.h | 2 +- lib/librte_port/meson.build | 2 +- lib/meson.build | 2 +- 85 files changed, 389 insertions(+), 389 deletions(-) diff --git a/app/proc-info/main.c b/app/proc-info/main.c index b0de39489..353b3921c 100644 --- a/app/proc-info/main.c +++ b/app/proc-info/main.c @@ -30,7 +30,7 @@ #include #include #include -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY #include #endif #include @@ -739,7 +739,7 @@ show_port(void) } printf(" - cyrpto context\n"); -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY void *p_ctx = rte_eth_dev_get_sec_ctx(i); printf("\t -- security context - %p\n", p_ctx); diff --git a/app/test-bbdev/meson.build b/app/test-bbdev/meson.build index 178306b08..a2bd7dca6 100644 --- a/app/test-bbdev/meson.build +++ b/app/test-bbdev/meson.build @@ -6,9 +6,9 @@ sources = files('main.c', 'test_bbdev_perf.c', 'test_bbdev_vector.c') deps += ['bbdev', 'bus_vdev'] -if dpdk_conf.has('RTE_LIBRTE_PMD_BBDEV_FPGA_LTE_FEC') +if dpdk_conf.has('RTE_BASEBAND_FPGA_LTE_FEC') deps += ['baseband_fpga_lte_fec'] endif -if dpdk_conf.has('RTE_LIBRTE_PMD_BBDEV_FPGA_5GNR_FEC') +if dpdk_conf.has('RTE_BASEBAND_FPGA_5GNR_FEC') deps += ['baseband_fpga_5gnr_fec'] endif diff --git a/app/test-bbdev/test_bbdev_perf.c b/app/test-bbdev/test_bbdev_perf.c index 45c0d62ac..2e85eccf9 100644 --- a/app/test-bbdev/test_bbdev_perf.c +++ b/app/test-bbdev/test_bbdev_perf.c @@ -26,7 +26,7 @@ #define MAX_QUEUES RTE_MAX_LCORE #define TEST_REPETITIONS 1000 -#ifdef RTE_LIBRTE_PMD_BBDEV_FPGA_LTE_FEC +#ifdef RTE_BASEBAND_FPGA_LTE_FEC #include #define FPGA_LTE_PF_DRIVER_NAME ("intel_fpga_lte_fec_pf") #define FPGA_LTE_VF_DRIVER_NAME ("intel_fpga_lte_fec_vf") @@ -39,7 +39,7 @@ #define FLR_4G_TIMEOUT 610 #endif -#ifdef RTE_LIBRTE_PMD_BBDEV_FPGA_5GNR_FEC +#ifdef RTE_BASEBAND_FPGA_5GNR_FEC #include #define FPGA_5GNR_PF_DRIVER_NAME ("intel_fpga_5gnr_fec_pf") #define FPGA_5GNR_VF_DRIVER_NAME ("intel_fpga_5gnr_fec_vf") @@ -565,7 +565,7 @@ add_bbdev_dev(uint8_t dev_id, struct rte_bbdev_info *info, /* Configure fpga lte fec with PF & VF values * if '-i' flag is set and using fpga device */ -#ifdef RTE_LIBRTE_PMD_BBDEV_FPGA_LTE_FEC +#ifdef RTE_BASEBAND_FPGA_LTE_FEC if ((get_init_device() == true) && (!strcmp(info->drv.driver_name, FPGA_LTE_PF_DRIVER_NAME))) { struct fpga_lte_fec_conf conf; @@ -609,7 +609,7 @@ add_bbdev_dev(uint8_t dev_id, struct rte_bbdev_info *info, info->dev_name); } #endif -#ifdef RTE_LIBRTE_PMD_BBDEV_FPGA_5GNR_FEC +#ifdef RTE_BASEBAND_FPGA_5GNR_FEC if ((get_init_device() == true) && (!strcmp(info->drv.driver_name, FPGA_5GNR_PF_DRIVER_NAME))) { struct fpga_5gnr_fec_conf conf; diff --git a/app/test-crypto-perf/cperf_ops.c b/app/test-crypto-perf/cperf_ops.c index 3da835a9c..cc45af7f2 100644 --- a/app/test-crypto-perf/cperf_ops.c +++ b/app/test-crypto-perf/cperf_ops.c @@ -8,7 +8,7 @@ #include "cperf_ops.h" #include "cperf_test_vectors.h" -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY static int cperf_set_ops_security(struct rte_crypto_op **ops, uint32_t src_buf_offset __rte_unused, @@ -551,7 +551,7 @@ cperf_create_session(struct rte_mempool *sess_mp, struct rte_crypto_sym_xform aead_xform; struct rte_cryptodev_sym_session *sess = NULL; -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY /* * security only */ @@ -844,7 +844,7 @@ cperf_get_op_functions(const struct cperf_options *options, op_fns->populate_ops = cperf_set_ops_cipher; return 0; } -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY if (options->op_type == CPERF_PDCP) { op_fns->populate_ops = cperf_set_ops_security; return 0; diff --git a/app/test-crypto-perf/cperf_options.h b/app/test-crypto-perf/cperf_options.h index 256fabb07..9664a4b34 100644 --- a/app/test-crypto-perf/cperf_options.h +++ b/app/test-crypto-perf/cperf_options.h @@ -7,7 +7,7 @@ #include #include -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY #include #endif @@ -47,7 +47,7 @@ #define CPERF_DIGEST_SZ ("digest-sz") -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY #define CPERF_PDCP_SN_SZ ("pdcp-sn-sz") #define CPERF_PDCP_DOMAIN ("pdcp-domain") #define CPERF_PDCP_SES_HFN_EN ("pdcp-ses-hfn-en") @@ -123,7 +123,7 @@ struct cperf_options { uint16_t digest_sz; -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY uint16_t pdcp_sn_sz; uint16_t pdcp_ses_hfn_en; enum rte_security_pdcp_domain pdcp_domain; diff --git a/app/test-crypto-perf/cperf_options_parsing.c b/app/test-crypto-perf/cperf_options_parsing.c index 8e086f88e..03ed6f594 100644 --- a/app/test-crypto-perf/cperf_options_parsing.c +++ b/app/test-crypto-perf/cperf_options_parsing.c @@ -57,7 +57,7 @@ usage(char *progname) " --pmd-cyclecount-delay-ms N: set delay between enqueue\n" " and dequeue in pmd-cyclecount benchmarking mode\n" " --csv-friendly: enable test result output CSV friendly\n" -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY " --pdcp-sn-sz N: set PDCP SN size N <5/7/12/15/18>\n" " --pdcp-domain DOMAIN: set PDCP domain \n" " --pdcp-ses-hfn-en: enable session based fixed HFN\n" @@ -631,7 +631,7 @@ parse_digest_sz(struct cperf_options *opts, const char *arg) return parse_uint16_t(&opts->digest_sz, arg); } -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY static int parse_pdcp_sn_sz(struct cperf_options *opts, const char *arg) { @@ -841,7 +841,7 @@ static struct option lgopts[] = { { CPERF_DIGEST_SZ, required_argument, 0, 0 }, -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY { CPERF_PDCP_SN_SZ, required_argument, 0, 0 }, { CPERF_PDCP_DOMAIN, required_argument, 0, 0 }, { CPERF_PDCP_SES_HFN_EN, no_argument, 0, 0 }, @@ -913,7 +913,7 @@ cperf_options_default(struct cperf_options *opts) opts->digest_sz = 12; opts->pmdcc_delay = 0; -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY opts->pdcp_sn_sz = 12; opts->pdcp_domain = RTE_SECURITY_PDCP_MODE_CONTROL; opts->pdcp_ses_hfn_en = 0; @@ -954,7 +954,7 @@ cperf_opts_parse_long(int opt_idx, struct cperf_options *opts) { CPERF_AEAD_IV_SZ, parse_aead_iv_sz }, { CPERF_AEAD_AAD_SZ, parse_aead_aad_sz }, { CPERF_DIGEST_SZ, parse_digest_sz }, -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY { CPERF_PDCP_SN_SZ, parse_pdcp_sn_sz }, { CPERF_PDCP_DOMAIN, parse_pdcp_domain }, { CPERF_PDCP_SES_HFN_EN, parse_pdcp_ses_hfn_en }, @@ -1061,7 +1061,7 @@ check_cipher_buffer_length(struct cperf_options *options) return 0; } -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY static int check_docsis_buffer_length(struct cperf_options *options) { @@ -1215,7 +1215,7 @@ cperf_options_check(struct cperf_options *options) return -EINVAL; } -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY if (options->op_type == CPERF_DOCSIS) { if (check_docsis_buffer_length(options) < 0) return -EINVAL; @@ -1308,7 +1308,7 @@ cperf_options_dump(struct cperf_options *opts) printf("#\n"); } -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY if (opts->op_type == CPERF_DOCSIS) { printf("# docsis header size: %u\n", opts->docsis_hdr_sz); printf("#\n"); diff --git a/app/test-crypto-perf/cperf_test_pmd_cyclecount.c b/app/test-crypto-perf/cperf_test_pmd_cyclecount.c index 69f0943d1..4e67d3aeb 100644 --- a/app/test-crypto-perf/cperf_test_pmd_cyclecount.c +++ b/app/test-crypto-perf/cperf_test_pmd_cyclecount.c @@ -63,7 +63,7 @@ cperf_pmd_cyclecount_test_free(struct cperf_pmd_cyclecount_ctx *ctx) return; if (ctx->sess) { -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY if (ctx->options->op_type == CPERF_PDCP || ctx->options->op_type == CPERF_DOCSIS) { struct rte_security_ctx *sec_ctx = diff --git a/app/test-crypto-perf/cperf_test_throughput.c b/app/test-crypto-perf/cperf_test_throughput.c index 12d9ea4f9..f30f7d5c2 100644 --- a/app/test-crypto-perf/cperf_test_throughput.c +++ b/app/test-crypto-perf/cperf_test_throughput.c @@ -35,7 +35,7 @@ cperf_throughput_test_free(struct cperf_throughput_ctx *ctx) if (!ctx) return; if (ctx->sess) { -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY if (ctx->options->op_type == CPERF_PDCP || ctx->options->op_type == CPERF_DOCSIS) { struct rte_security_ctx *sec_ctx = diff --git a/app/test-crypto-perf/main.c b/app/test-crypto-perf/main.c index 8f8e580e4..f4f7e31c9 100644 --- a/app/test-crypto-perf/main.c +++ b/app/test-crypto-perf/main.c @@ -9,7 +9,7 @@ #include #include #include -#ifdef RTE_LIBRTE_PMD_CRYPTO_SCHEDULER +#ifdef RTE_CRYPTO_SCHEDULER #include #endif @@ -170,7 +170,7 @@ cperf_initialize_cryptodev(struct cperf_options *opts, uint8_t *enabled_cdevs) for (i = 0; i < enabled_cdev_count && i < RTE_CRYPTO_MAX_DEVS; i++) { cdev_id = enabled_cdevs[i]; -#ifdef RTE_LIBRTE_PMD_CRYPTO_SCHEDULER +#ifdef RTE_CRYPTO_SCHEDULER /* * If multi-core scheduler is used, limit the number * of queue pairs to 1, as there is no way to know @@ -238,7 +238,7 @@ cperf_initialize_cryptodev(struct cperf_options *opts, uint8_t *enabled_cdevs) */ if (!strcmp((const char *)opts->device_type, "crypto_scheduler")) { -#ifdef RTE_LIBRTE_PMD_CRYPTO_SCHEDULER +#ifdef RTE_CRYPTO_SCHEDULER uint32_t nb_slaves = rte_cryptodev_scheduler_slaves_get(cdev_id, NULL); diff --git a/app/test-crypto-perf/meson.build b/app/test-crypto-perf/meson.build index e6ddda6f0..558c64878 100644 --- a/app/test-crypto-perf/meson.build +++ b/app/test-crypto-perf/meson.build @@ -12,6 +12,6 @@ sources = files('cperf_ops.c', 'cperf_test_verify.c', 'main.c') deps += ['cryptodev', 'net', 'security'] -if dpdk_conf.has('RTE_LIBRTE_PMD_CRYPTO_SCHEDULER') +if dpdk_conf.has('RTE_CRYPTO_SCHEDULER') deps += 'crypto_scheduler' endif diff --git a/app/test-pipeline/main.c b/app/test-pipeline/main.c index 7f0d6d3f1..c7be5942f 100644 --- a/app/test-pipeline/main.c +++ b/app/test-pipeline/main.c @@ -126,7 +126,7 @@ app_lcore_main_loop(__rte_unused void *arg) return 0; case e_APP_PIPELINE_ACL: -#ifndef RTE_LIBRTE_ACL +#ifndef RTE_LIB_ACL rte_exit(EXIT_FAILURE, "ACL not present in build\n"); #else app_main_loop_worker_pipeline_acl(); diff --git a/app/test-pmd/bpf_cmd.h b/app/test-pmd/bpf_cmd.h index 5ee4c9f79..66bc70635 100644 --- a/app/test-pmd/bpf_cmd.h +++ b/app/test-pmd/bpf_cmd.h @@ -5,12 +5,12 @@ #ifndef _BPF_CMD_H_ #define _BPF_CMD_H_ -#ifdef RTE_LIBRTE_BPF +#ifdef RTE_LIB_BPF /* BPF CLI */ extern cmdline_parse_inst_t cmd_operate_bpf_ld_parse; extern cmdline_parse_inst_t cmd_operate_bpf_unld_parse; -#endif /* RTE_LIBRTE_BPF */ +#endif /* RTE_LIB_BPF */ #endif /* _BPF_CMD_H_ */ diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c index 273fb1af6..7a35a826d 100644 --- a/app/test-pmd/cmdline.c +++ b/app/test-pmd/cmdline.c @@ -50,20 +50,20 @@ #include #include #include -#ifdef RTE_LIBRTE_PMD_BOND +#ifdef RTE_NET_BOND #include #include #endif -#if defined RTE_LIBRTE_DPAA_BUS && defined RTE_LIBRTE_DPAA_PMD +#if defined RTE_BUS_DPAA && defined RTE_NET_DPAA #include #endif -#ifdef RTE_LIBRTE_IXGBE_PMD +#ifdef RTE_NET_IXGBE #include #endif -#ifdef RTE_LIBRTE_I40E_PMD +#ifdef RTE_NET_I40E #include #endif -#ifdef RTE_LIBRTE_BNXT_PMD +#ifdef RTE_NET_BNXT #include #endif #include "testpmd.h" @@ -612,7 +612,7 @@ static void cmd_help_long_parsed(void *parsed_result, " Show the bypass configuration for a bypass enabled NIC" " using the lowest port on the NIC.\n\n" -#ifdef RTE_LIBRTE_PMD_BOND +#ifdef RTE_NET_BOND "create bonded device (mode) (socket)\n" " Create a new bonded device with specific bonding mode and socket.\n\n" @@ -5457,7 +5457,7 @@ cmd_set_bypass_mode_parsed(void *parsed_result, portid_t port_id = res->port_id; int32_t rc = -EINVAL; -#if defined RTE_LIBRTE_IXGBE_PMD && defined RTE_LIBRTE_IXGBE_BYPASS +#if defined RTE_NET_IXGBE && defined RTE_LIBRTE_IXGBE_BYPASS uint32_t bypass_mode = RTE_PMD_IXGBE_BYPASS_MODE_NORMAL; if (!strcmp(res->value, "bypass")) @@ -5525,7 +5525,7 @@ cmd_set_bypass_event_parsed(void *parsed_result, struct cmd_set_bypass_event_result *res = parsed_result; portid_t port_id = res->port_id; -#if defined RTE_LIBRTE_IXGBE_PMD && defined RTE_LIBRTE_IXGBE_BYPASS +#if defined RTE_NET_IXGBE && defined RTE_LIBRTE_IXGBE_BYPASS uint32_t bypass_event = RTE_PMD_IXGBE_BYPASS_EVENT_NONE; uint32_t bypass_mode = RTE_PMD_IXGBE_BYPASS_MODE_NORMAL; @@ -5630,7 +5630,7 @@ cmd_set_bypass_timeout_parsed(void *parsed_result, { __rte_unused struct cmd_set_bypass_timeout_result *res = parsed_result; -#if defined RTE_LIBRTE_IXGBE_PMD && defined RTE_LIBRTE_IXGBE_BYPASS +#if defined RTE_NET_IXGBE && defined RTE_LIBRTE_IXGBE_BYPASS if (!strcmp(res->value, "1.5")) bypass_timeout = RTE_PMD_IXGBE_BYPASS_TMT_1_5_SEC; else if (!strcmp(res->value, "2")) @@ -5693,7 +5693,7 @@ cmd_show_bypass_config_parsed(void *parsed_result, struct cmd_show_bypass_config_result *res = parsed_result; portid_t port_id = res->port_id; int rc = -EINVAL; -#if defined RTE_LIBRTE_IXGBE_PMD && defined RTE_LIBRTE_IXGBE_BYPASS +#if defined RTE_NET_IXGBE && defined RTE_LIBRTE_IXGBE_BYPASS uint32_t event_mode; uint32_t bypass_mode; uint32_t timeout = bypass_timeout; @@ -5776,7 +5776,7 @@ cmdline_parse_inst_t cmd_show_bypass_config = { }, }; -#ifdef RTE_LIBRTE_PMD_BOND +#ifdef RTE_NET_BOND /* *** SET BONDING MODE *** */ struct cmd_set_bonding_mode_result { cmdline_fixed_string_t set; @@ -6546,7 +6546,7 @@ cmdline_parse_inst_t cmd_set_bonding_agg_mode_policy = { }; -#endif /* RTE_LIBRTE_PMD_BOND */ +#endif /* RTE_NET_BOND */ /* *** SET FORWARDING MODE *** */ struct cmd_set_fwd_mode_result { @@ -8831,12 +8831,12 @@ cmd_set_vf_rxmode_parsed(void *parsed_result, RTE_SET_USED(is_on); -#ifdef RTE_LIBRTE_IXGBE_PMD +#ifdef RTE_NET_IXGBE if (ret == -ENOTSUP) ret = rte_pmd_ixgbe_set_vf_rxmode(res->port_id, res->vf_id, vf_rxmode, (uint8_t)is_on); #endif -#ifdef RTE_LIBRTE_BNXT_PMD +#ifdef RTE_NET_BNXT if (ret == -ENOTSUP) ret = rte_pmd_bnxt_set_vf_rxmode(res->port_id, res->vf_id, vf_rxmode, (uint8_t)is_on); @@ -8910,12 +8910,12 @@ static void cmd_vf_mac_addr_parsed(void *parsed_result, if (strcmp(res->what, "add") != 0) return; -#ifdef RTE_LIBRTE_I40E_PMD +#ifdef RTE_NET_I40E if (ret == -ENOTSUP) ret = rte_pmd_i40e_add_vf_mac_addr(res->port_num, res->vf_num, &res->address); #endif -#ifdef RTE_LIBRTE_BNXT_PMD +#ifdef RTE_NET_BNXT if (ret == -ENOTSUP) ret = rte_pmd_bnxt_mac_addr_add(res->port_num, &res->address, res->vf_num); @@ -8986,17 +8986,17 @@ cmd_vf_rx_vlan_filter_parsed(void *parsed_result, __rte_unused int is_add = (strcmp(res->what, "add") == 0) ? 1 : 0; -#ifdef RTE_LIBRTE_IXGBE_PMD +#ifdef RTE_NET_IXGBE if (ret == -ENOTSUP) ret = rte_pmd_ixgbe_set_vf_vlan_filter(res->port_id, res->vlan_id, res->vf_mask, is_add); #endif -#ifdef RTE_LIBRTE_I40E_PMD +#ifdef RTE_NET_I40E if (ret == -ENOTSUP) ret = rte_pmd_i40e_set_vf_vlan_filter(res->port_id, res->vlan_id, res->vf_mask, is_add); #endif -#ifdef RTE_LIBRTE_BNXT_PMD +#ifdef RTE_NET_BNXT if (ret == -ENOTSUP) ret = rte_pmd_bnxt_set_vf_vlan_filter(res->port_id, res->vlan_id, res->vf_mask, is_add); @@ -9523,7 +9523,7 @@ cmd_global_config_parsed(void *parsed_result, conf.cfg.gre_key_len = res->len; ret = rte_eth_dev_filter_ctrl(res->port_id, RTE_ETH_FILTER_NONE, RTE_ETH_FILTER_SET, &conf); -#ifdef RTE_LIBRTE_I40E_PMD +#ifdef RTE_NET_I40E if (ret == -ENOTSUP) ret = rte_pmd_i40e_set_gre_key_len(res->port_id, res->len); #endif @@ -10087,7 +10087,7 @@ cmd_queue_region_parsed(void *parsed_result, { struct cmd_queue_region_result *res = parsed_result; int ret = -ENOTSUP; -#ifdef RTE_LIBRTE_I40E_PMD +#ifdef RTE_NET_I40E struct rte_pmd_i40e_queue_region_conf region_conf; enum rte_pmd_i40e_queue_region_op op_type; #endif @@ -10095,7 +10095,7 @@ cmd_queue_region_parsed(void *parsed_result, if (port_id_is_invalid(res->port_id, ENABLED_WARN)) return; -#ifdef RTE_LIBRTE_I40E_PMD +#ifdef RTE_NET_I40E memset(®ion_conf, 0, sizeof(region_conf)); op_type = RTE_PMD_I40E_RSS_QUEUE_REGION_SET; region_conf.region_id = res->region_id; @@ -10186,7 +10186,7 @@ cmd_region_flowtype_parsed(void *parsed_result, { struct cmd_region_flowtype_result *res = parsed_result; int ret = -ENOTSUP; -#ifdef RTE_LIBRTE_I40E_PMD +#ifdef RTE_NET_I40E struct rte_pmd_i40e_queue_region_conf region_conf; enum rte_pmd_i40e_queue_region_op op_type; #endif @@ -10194,7 +10194,7 @@ cmd_region_flowtype_parsed(void *parsed_result, if (port_id_is_invalid(res->port_id, ENABLED_WARN)) return; -#ifdef RTE_LIBRTE_I40E_PMD +#ifdef RTE_NET_I40E memset(®ion_conf, 0, sizeof(region_conf)); op_type = RTE_PMD_I40E_RSS_QUEUE_REGION_FLOWTYPE_SET; @@ -10277,7 +10277,7 @@ cmd_user_priority_region_parsed(void *parsed_result, { struct cmd_user_priority_region_result *res = parsed_result; int ret = -ENOTSUP; -#ifdef RTE_LIBRTE_I40E_PMD +#ifdef RTE_NET_I40E struct rte_pmd_i40e_queue_region_conf region_conf; enum rte_pmd_i40e_queue_region_op op_type; #endif @@ -10285,7 +10285,7 @@ cmd_user_priority_region_parsed(void *parsed_result, if (port_id_is_invalid(res->port_id, ENABLED_WARN)) return; -#ifdef RTE_LIBRTE_I40E_PMD +#ifdef RTE_NET_I40E memset(®ion_conf, 0, sizeof(region_conf)); op_type = RTE_PMD_I40E_RSS_QUEUE_REGION_USER_PRIORITY_SET; region_conf.user_priority = res->user_priority_id; @@ -10368,7 +10368,7 @@ cmd_flush_queue_region_parsed(void *parsed_result, { struct cmd_flush_queue_region_result *res = parsed_result; int ret = -ENOTSUP; -#ifdef RTE_LIBRTE_I40E_PMD +#ifdef RTE_NET_I40E struct rte_pmd_i40e_queue_region_conf region_conf; enum rte_pmd_i40e_queue_region_op op_type; #endif @@ -10376,7 +10376,7 @@ cmd_flush_queue_region_parsed(void *parsed_result, if (port_id_is_invalid(res->port_id, ENABLED_WARN)) return; -#ifdef RTE_LIBRTE_I40E_PMD +#ifdef RTE_NET_I40E memset(®ion_conf, 0, sizeof(region_conf)); if (strcmp(res->what, "on") == 0) @@ -10450,7 +10450,7 @@ cmd_show_queue_region_info_parsed(void *parsed_result, { struct cmd_show_queue_region_info *res = parsed_result; int ret = -ENOTSUP; -#ifdef RTE_LIBRTE_I40E_PMD +#ifdef RTE_NET_I40E struct rte_pmd_i40e_queue_regions rte_pmd_regions; enum rte_pmd_i40e_queue_region_op op_type; #endif @@ -10458,7 +10458,7 @@ cmd_show_queue_region_info_parsed(void *parsed_result, if (port_id_is_invalid(res->port_id, ENABLED_WARN)) return; -#ifdef RTE_LIBRTE_I40E_PMD +#ifdef RTE_NET_I40E memset(&rte_pmd_regions, 0, sizeof(rte_pmd_regions)); op_type = RTE_PMD_I40E_RSS_QUEUE_REGION_INFO_GET; @@ -11354,7 +11354,7 @@ cmd_flow_director_filter_parsed(void *parsed_result, } } else { if (!strcmp(res->mode_value, "raw")) { -#ifdef RTE_LIBRTE_I40E_PMD +#ifdef RTE_NET_I40E struct rte_pmd_i40e_flow_type_mapping mapping[RTE_PMD_I40E_FLOW_TYPE_MAX]; struct rte_pmd_i40e_pkt_template_conf conf; @@ -13712,17 +13712,17 @@ cmd_set_vf_vlan_anti_spoof_parsed( if (port_id_is_invalid(res->port_id, ENABLED_WARN)) return; -#ifdef RTE_LIBRTE_IXGBE_PMD +#ifdef RTE_NET_IXGBE if (ret == -ENOTSUP) ret = rte_pmd_ixgbe_set_vf_vlan_anti_spoof(res->port_id, res->vf_id, is_on); #endif -#ifdef RTE_LIBRTE_I40E_PMD +#ifdef RTE_NET_I40E if (ret == -ENOTSUP) ret = rte_pmd_i40e_set_vf_vlan_anti_spoof(res->port_id, res->vf_id, is_on); #endif -#ifdef RTE_LIBRTE_BNXT_PMD +#ifdef RTE_NET_BNXT if (ret == -ENOTSUP) ret = rte_pmd_bnxt_set_vf_vlan_anti_spoof(res->port_id, res->vf_id, is_on); @@ -13818,17 +13818,17 @@ cmd_set_vf_mac_anti_spoof_parsed( if (port_id_is_invalid(res->port_id, ENABLED_WARN)) return; -#ifdef RTE_LIBRTE_IXGBE_PMD +#ifdef RTE_NET_IXGBE if (ret == -ENOTSUP) ret = rte_pmd_ixgbe_set_vf_mac_anti_spoof(res->port_id, res->vf_id, is_on); #endif -#ifdef RTE_LIBRTE_I40E_PMD +#ifdef RTE_NET_I40E if (ret == -ENOTSUP) ret = rte_pmd_i40e_set_vf_mac_anti_spoof(res->port_id, res->vf_id, is_on); #endif -#ifdef RTE_LIBRTE_BNXT_PMD +#ifdef RTE_NET_BNXT if (ret == -ENOTSUP) ret = rte_pmd_bnxt_set_vf_mac_anti_spoof(res->port_id, res->vf_id, is_on); @@ -13924,17 +13924,17 @@ cmd_set_vf_vlan_stripq_parsed( if (port_id_is_invalid(res->port_id, ENABLED_WARN)) return; -#ifdef RTE_LIBRTE_IXGBE_PMD +#ifdef RTE_NET_IXGBE if (ret == -ENOTSUP) ret = rte_pmd_ixgbe_set_vf_vlan_stripq(res->port_id, res->vf_id, is_on); #endif -#ifdef RTE_LIBRTE_I40E_PMD +#ifdef RTE_NET_I40E if (ret == -ENOTSUP) ret = rte_pmd_i40e_set_vf_vlan_stripq(res->port_id, res->vf_id, is_on); #endif -#ifdef RTE_LIBRTE_BNXT_PMD +#ifdef RTE_NET_BNXT if (ret == -ENOTSUP) ret = rte_pmd_bnxt_set_vf_vlan_stripq(res->port_id, res->vf_id, is_on); @@ -14028,17 +14028,17 @@ cmd_set_vf_vlan_insert_parsed( if (port_id_is_invalid(res->port_id, ENABLED_WARN)) return; -#ifdef RTE_LIBRTE_IXGBE_PMD +#ifdef RTE_NET_IXGBE if (ret == -ENOTSUP) ret = rte_pmd_ixgbe_set_vf_vlan_insert(res->port_id, res->vf_id, res->vlan_id); #endif -#ifdef RTE_LIBRTE_I40E_PMD +#ifdef RTE_NET_I40E if (ret == -ENOTSUP) ret = rte_pmd_i40e_set_vf_vlan_insert(res->port_id, res->vf_id, res->vlan_id); #endif -#ifdef RTE_LIBRTE_BNXT_PMD +#ifdef RTE_NET_BNXT if (ret == -ENOTSUP) ret = rte_pmd_bnxt_set_vf_vlan_insert(res->port_id, res->vf_id, res->vlan_id); @@ -14124,19 +14124,19 @@ cmd_set_tx_loopback_parsed( if (port_id_is_invalid(res->port_id, ENABLED_WARN)) return; -#ifdef RTE_LIBRTE_IXGBE_PMD +#ifdef RTE_NET_IXGBE if (ret == -ENOTSUP) ret = rte_pmd_ixgbe_set_tx_loopback(res->port_id, is_on); #endif -#ifdef RTE_LIBRTE_I40E_PMD +#ifdef RTE_NET_I40E if (ret == -ENOTSUP) ret = rte_pmd_i40e_set_tx_loopback(res->port_id, is_on); #endif -#ifdef RTE_LIBRTE_BNXT_PMD +#ifdef RTE_NET_BNXT if (ret == -ENOTSUP) ret = rte_pmd_bnxt_set_tx_loopback(res->port_id, is_on); #endif -#if defined RTE_LIBRTE_DPAA_BUS && defined RTE_LIBRTE_DPAA_PMD +#if defined RTE_BUS_DPAA && defined RTE_NET_DPAA if (ret == -ENOTSUP) ret = rte_pmd_dpaa_set_tx_loopback(res->port_id, is_on); #endif @@ -14223,11 +14223,11 @@ cmd_set_all_queues_drop_en_parsed( if (port_id_is_invalid(res->port_id, ENABLED_WARN)) return; -#ifdef RTE_LIBRTE_IXGBE_PMD +#ifdef RTE_NET_IXGBE if (ret == -ENOTSUP) ret = rte_pmd_ixgbe_set_all_queues_drop_en(res->port_id, is_on); #endif -#ifdef RTE_LIBRTE_BNXT_PMD +#ifdef RTE_NET_BNXT if (ret == -ENOTSUP) ret = rte_pmd_bnxt_set_all_queues_drop_en(res->port_id, is_on); #endif @@ -14319,7 +14319,7 @@ cmd_set_vf_split_drop_en_parsed( if (port_id_is_invalid(res->port_id, ENABLED_WARN)) return; -#ifdef RTE_LIBRTE_IXGBE_PMD +#ifdef RTE_NET_IXGBE ret = rte_pmd_ixgbe_set_vf_split_drop_en(res->port_id, res->vf_id, is_on); #endif @@ -14411,17 +14411,17 @@ cmd_set_vf_mac_addr_parsed( if (port_id_is_invalid(res->port_id, ENABLED_WARN)) return; -#ifdef RTE_LIBRTE_IXGBE_PMD +#ifdef RTE_NET_IXGBE if (ret == -ENOTSUP) ret = rte_pmd_ixgbe_set_vf_mac_addr(res->port_id, res->vf_id, &res->mac_addr); #endif -#ifdef RTE_LIBRTE_I40E_PMD +#ifdef RTE_NET_I40E if (ret == -ENOTSUP) ret = rte_pmd_i40e_set_vf_mac_addr(res->port_id, res->vf_id, &res->mac_addr); #endif -#ifdef RTE_LIBRTE_BNXT_PMD +#ifdef RTE_NET_BNXT if (ret == -ENOTSUP) ret = rte_pmd_bnxt_set_vf_mac_addr(res->port_id, res->vf_id, &res->mac_addr); @@ -14538,7 +14538,7 @@ cmd_set_macsec_offload_on_parsed( return; if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_MACSEC_INSERT) { -#ifdef RTE_LIBRTE_IXGBE_PMD +#ifdef RTE_NET_IXGBE ret = rte_pmd_ixgbe_macsec_enable(port_id, en, rp); #endif } @@ -14635,7 +14635,7 @@ cmd_set_macsec_offload_off_parsed( return; if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_MACSEC_INSERT) { -#ifdef RTE_LIBRTE_IXGBE_PMD +#ifdef RTE_NET_IXGBE ret = rte_pmd_ixgbe_macsec_disable(port_id); #endif } @@ -14721,7 +14721,7 @@ cmd_set_macsec_sc_parsed( int ret = -ENOTSUP; int is_tx = (strcmp(res->tx_rx, "tx") == 0) ? 1 : 0; -#ifdef RTE_LIBRTE_IXGBE_PMD +#ifdef RTE_NET_IXGBE ret = is_tx ? rte_pmd_ixgbe_macsec_config_txsc(res->port_id, res->mac.addr_bytes) : @@ -14840,7 +14840,7 @@ cmd_set_macsec_sa_parsed( key[i] = (uint8_t) ((xdgt0 * 16) + xdgt1); } -#ifdef RTE_LIBRTE_IXGBE_PMD +#ifdef RTE_NET_IXGBE ret = is_tx ? rte_pmd_ixgbe_macsec_select_txsa(res->port_id, res->idx, res->an, res->pn, key) : @@ -14937,7 +14937,7 @@ cmd_set_vf_promisc_parsed( if (port_id_is_invalid(res->port_id, ENABLED_WARN)) return; -#ifdef RTE_LIBRTE_I40E_PMD +#ifdef RTE_NET_I40E ret = rte_pmd_i40e_set_vf_unicast_promisc(res->port_id, res->vf_id, is_on); #endif @@ -15027,7 +15027,7 @@ cmd_set_vf_allmulti_parsed( if (port_id_is_invalid(res->port_id, ENABLED_WARN)) return; -#ifdef RTE_LIBRTE_I40E_PMD +#ifdef RTE_NET_I40E ret = rte_pmd_i40e_set_vf_multicast_promisc(res->port_id, res->vf_id, is_on); #endif @@ -15117,7 +15117,7 @@ cmd_set_vf_broadcast_parsed( if (port_id_is_invalid(res->port_id, ENABLED_WARN)) return; -#ifdef RTE_LIBRTE_I40E_PMD +#ifdef RTE_NET_I40E ret = rte_pmd_i40e_set_vf_broadcast(res->port_id, res->vf_id, is_on); #endif @@ -15211,7 +15211,7 @@ cmd_set_vf_vlan_tag_parsed( if (port_id_is_invalid(res->port_id, ENABLED_WARN)) return; -#ifdef RTE_LIBRTE_I40E_PMD +#ifdef RTE_NET_I40E ret = rte_pmd_i40e_set_vf_vlan_tag(res->port_id, res->vf_id, is_on); #endif @@ -15332,7 +15332,7 @@ cmd_vf_max_bw_parsed( if (port_id_is_invalid(res->port_id, ENABLED_WARN)) return; -#ifdef RTE_LIBRTE_I40E_PMD +#ifdef RTE_NET_I40E ret = rte_pmd_i40e_set_vf_max_bw(res->port_id, res->vf_id, res->bw); #endif @@ -15432,7 +15432,7 @@ cmd_vf_tc_min_bw_parsed( if (ret) return; -#ifdef RTE_LIBRTE_I40E_PMD +#ifdef RTE_NET_I40E ret = rte_pmd_i40e_set_vf_tc_bw_alloc(res->port_id, res->vf_id, tc_num, bw); #endif @@ -15498,7 +15498,7 @@ cmd_tc_min_bw_parsed( if (ret) return; -#ifdef RTE_LIBRTE_IXGBE_PMD +#ifdef RTE_NET_IXGBE ret = rte_pmd_ixgbe_set_tc_bw_alloc(res->port_id, tc_num, bw); #endif @@ -15547,7 +15547,7 @@ cmd_vf_tc_max_bw_parsed( if (port_id_is_invalid(res->port_id, ENABLED_WARN)) return; -#ifdef RTE_LIBRTE_I40E_PMD +#ifdef RTE_NET_I40E ret = rte_pmd_i40e_set_vf_tc_max_bw(res->port_id, res->vf_id, res->tc_no, res->bw); #endif @@ -16601,7 +16601,7 @@ cmd_strict_link_prio_parsed( if (port_id_is_invalid(res->port_id, ENABLED_WARN)) return; -#ifdef RTE_LIBRTE_I40E_PMD +#ifdef RTE_NET_I40E ret = rte_pmd_i40e_set_tc_strict_prio(res->port_id, res->tc_map); #endif @@ -16685,7 +16685,7 @@ cmd_ddp_add_parsed( return; } -#ifdef RTE_LIBRTE_I40E_PMD +#ifdef RTE_NET_I40E if (ret == -ENOTSUP) ret = rte_pmd_i40e_process_ddp_package(res->port_id, buff, size, @@ -16753,7 +16753,7 @@ cmd_ddp_del_parsed( if (!buff) return; -#ifdef RTE_LIBRTE_I40E_PMD +#ifdef RTE_NET_I40E if (ret == -ENOTSUP) ret = rte_pmd_i40e_process_ddp_package(res->port_id, buff, size, @@ -16808,7 +16808,7 @@ cmd_ddp_info_parsed( uint8_t *pkg; uint32_t pkg_size; int ret = -ENOTSUP; -#ifdef RTE_LIBRTE_I40E_PMD +#ifdef RTE_NET_I40E uint32_t i, j, n; uint8_t *buff; uint32_t buff_size = 0; @@ -16829,7 +16829,7 @@ cmd_ddp_info_parsed( if (!pkg) return; -#ifdef RTE_LIBRTE_I40E_PMD +#ifdef RTE_NET_I40E ret = rte_pmd_i40e_get_ddp_info(pkg, pkg_size, (uint8_t *)&info, sizeof(info), RTE_PMD_I40E_PKG_INFO_GLOBAL_HEADER); @@ -17044,7 +17044,7 @@ cmd_ddp_get_list_parsed( __rte_unused struct cmdline *cl, __rte_unused void *data) { -#ifdef RTE_LIBRTE_I40E_PMD +#ifdef RTE_NET_I40E struct cmd_ddp_get_list_result *res = parsed_result; struct rte_pmd_i40e_profile_list *p_list; struct rte_pmd_i40e_profile_info *p_info; @@ -17054,7 +17054,7 @@ cmd_ddp_get_list_parsed( #endif int ret = -ENOTSUP; -#ifdef RTE_LIBRTE_I40E_PMD +#ifdef RTE_NET_I40E size = PROFILE_INFO_SIZE * MAX_PROFILE_NUM + 4; p_list = (struct rte_pmd_i40e_profile_list *)malloc(size); if (!p_list) { @@ -17122,7 +17122,7 @@ cmd_cfg_input_set_parsed( __rte_unused struct cmdline *cl, __rte_unused void *data) { -#ifdef RTE_LIBRTE_I40E_PMD +#ifdef RTE_NET_I40E struct cmd_cfg_input_set_result *res = parsed_result; enum rte_pmd_i40e_inset_type inset_type = INSET_NONE; struct rte_pmd_i40e_inset inset; @@ -17134,7 +17134,7 @@ cmd_cfg_input_set_parsed( return; } -#ifdef RTE_LIBRTE_I40E_PMD +#ifdef RTE_NET_I40E if (!strcmp(res->inset_type, "hash_inset")) inset_type = INSET_HASH; else if (!strcmp(res->inset_type, "fdir_inset")) @@ -17245,7 +17245,7 @@ cmd_clear_input_set_parsed( __rte_unused struct cmdline *cl, __rte_unused void *data) { -#ifdef RTE_LIBRTE_I40E_PMD +#ifdef RTE_NET_I40E struct cmd_clear_input_set_result *res = parsed_result; enum rte_pmd_i40e_inset_type inset_type = INSET_NONE; struct rte_pmd_i40e_inset inset; @@ -17257,7 +17257,7 @@ cmd_clear_input_set_parsed( return; } -#ifdef RTE_LIBRTE_I40E_PMD +#ifdef RTE_NET_I40E if (!strcmp(res->inset_type, "hash_inset")) inset_type = INSET_HASH; else if (!strcmp(res->inset_type, "fdir_inset")) @@ -17373,13 +17373,13 @@ cmd_show_vf_stats_parsed( memset(&stats, 0, sizeof(stats)); -#ifdef RTE_LIBRTE_I40E_PMD +#ifdef RTE_NET_I40E if (ret == -ENOTSUP) ret = rte_pmd_i40e_get_vf_stats(res->port_id, res->vf_id, &stats); #endif -#ifdef RTE_LIBRTE_BNXT_PMD +#ifdef RTE_NET_BNXT if (ret == -ENOTSUP) ret = rte_pmd_bnxt_get_vf_stats(res->port_id, res->vf_id, @@ -17478,12 +17478,12 @@ cmd_clear_vf_stats_parsed( if (port_id_is_invalid(res->port_id, ENABLED_WARN)) return; -#ifdef RTE_LIBRTE_I40E_PMD +#ifdef RTE_NET_I40E if (ret == -ENOTSUP) ret = rte_pmd_i40e_reset_vf_stats(res->port_id, res->vf_id); #endif -#ifdef RTE_LIBRTE_BNXT_PMD +#ifdef RTE_NET_BNXT if (ret == -ENOTSUP) ret = rte_pmd_bnxt_reset_vf_stats(res->port_id, res->vf_id); @@ -17570,7 +17570,7 @@ cmd_pctype_mapping_reset_parsed( if (port_id_is_invalid(res->port_id, ENABLED_WARN)) return; -#ifdef RTE_LIBRTE_I40E_PMD +#ifdef RTE_NET_I40E ret = rte_pmd_i40e_flow_type_mapping_reset(res->port_id); #endif @@ -17644,7 +17644,7 @@ cmd_pctype_mapping_get_parsed( { struct cmd_pctype_mapping_get_result *res = parsed_result; int ret = -ENOTSUP; -#ifdef RTE_LIBRTE_I40E_PMD +#ifdef RTE_NET_I40E struct rte_pmd_i40e_flow_type_mapping mapping[RTE_PMD_I40E_FLOW_TYPE_MAX]; int i, j, first_pctype; @@ -17653,7 +17653,7 @@ cmd_pctype_mapping_get_parsed( if (port_id_is_invalid(res->port_id, ENABLED_WARN)) return; -#ifdef RTE_LIBRTE_I40E_PMD +#ifdef RTE_NET_I40E ret = rte_pmd_i40e_flow_type_mapping_get(res->port_id, mapping); #endif @@ -17671,7 +17671,7 @@ cmd_pctype_mapping_get_parsed( return; } -#ifdef RTE_LIBRTE_I40E_PMD +#ifdef RTE_NET_I40E for (i = 0; i < RTE_PMD_I40E_FLOW_TYPE_MAX; i++) { if (mapping[i].pctype != 0ULL) { first_pctype = 1; @@ -17760,7 +17760,7 @@ cmd_pctype_mapping_update_parsed( { struct cmd_pctype_mapping_update_result *res = parsed_result; int ret = -ENOTSUP; -#ifdef RTE_LIBRTE_I40E_PMD +#ifdef RTE_NET_I40E struct rte_pmd_i40e_flow_type_mapping mapping; unsigned int i; unsigned int nb_item; @@ -17770,7 +17770,7 @@ cmd_pctype_mapping_update_parsed( if (port_id_is_invalid(res->port_id, ENABLED_WARN)) return; -#ifdef RTE_LIBRTE_I40E_PMD +#ifdef RTE_NET_I40E nb_item = parse_item_list(res->pctype_list, "pctypes", RTE_PMD_I40E_PCTYPE_MAX, pctype_list, 1); mapping.flow_type = res->flow_type; @@ -17858,7 +17858,7 @@ cmd_ptype_mapping_get_parsed( { struct cmd_ptype_mapping_get_result *res = parsed_result; int ret = -ENOTSUP; -#ifdef RTE_LIBRTE_I40E_PMD +#ifdef RTE_NET_I40E int max_ptype_num = 256; struct rte_pmd_i40e_ptype_mapping mapping[max_ptype_num]; uint16_t count; @@ -17868,7 +17868,7 @@ cmd_ptype_mapping_get_parsed( if (port_id_is_invalid(res->port_id, ENABLED_WARN)) return; -#ifdef RTE_LIBRTE_I40E_PMD +#ifdef RTE_NET_I40E ret = rte_pmd_i40e_ptype_mapping_get(res->port_id, mapping, max_ptype_num, @@ -17889,7 +17889,7 @@ cmd_ptype_mapping_get_parsed( printf("programming error: (%s)\n", strerror(-ret)); } -#ifdef RTE_LIBRTE_I40E_PMD +#ifdef RTE_NET_I40E if (!ret) { for (i = 0; i < count; i++) printf("%3d\t0x%08x\n", @@ -17967,7 +17967,7 @@ cmd_ptype_mapping_replace_parsed( if (port_id_is_invalid(res->port_id, ENABLED_WARN)) return; -#ifdef RTE_LIBRTE_I40E_PMD +#ifdef RTE_NET_I40E ret = rte_pmd_i40e_ptype_mapping_replace(res->port_id, res->target, res->mask, @@ -18049,7 +18049,7 @@ cmd_ptype_mapping_reset_parsed( if (port_id_is_invalid(res->port_id, ENABLED_WARN)) return; -#ifdef RTE_LIBRTE_I40E_PMD +#ifdef RTE_NET_I40E ret = rte_pmd_i40e_ptype_mapping_reset(res->port_id); #endif @@ -18126,13 +18126,13 @@ cmd_ptype_mapping_update_parsed( { struct cmd_ptype_mapping_update_result *res = parsed_result; int ret = -ENOTSUP; -#ifdef RTE_LIBRTE_I40E_PMD +#ifdef RTE_NET_I40E struct rte_pmd_i40e_ptype_mapping mapping; #endif if (port_id_is_invalid(res->port_id, ENABLED_WARN)) return; -#ifdef RTE_LIBRTE_I40E_PMD +#ifdef RTE_NET_I40E mapping.hw_ptype = res->hw_ptype; mapping.sw_ptype = res->sw_ptype; ret = rte_pmd_i40e_ptype_mapping_update(res->port_id, @@ -19824,7 +19824,7 @@ cmdline_parse_ctx_t main_ctx[] = { (cmdline_parse_inst_t *)&cmd_set_bypass_event, (cmdline_parse_inst_t *)&cmd_set_bypass_timeout, (cmdline_parse_inst_t *)&cmd_show_bypass_config, -#ifdef RTE_LIBRTE_PMD_BOND +#ifdef RTE_NET_BOND (cmdline_parse_inst_t *) &cmd_set_bonding_mode, (cmdline_parse_inst_t *) &cmd_show_bonding_config, (cmdline_parse_inst_t *) &cmd_set_bonding_primary, @@ -20071,7 +20071,7 @@ cmdline_parse_ctx_t main_ctx[] = { (cmdline_parse_inst_t *)&cmd_tx_offload_get_configuration, (cmdline_parse_inst_t *)&cmd_config_per_port_tx_offload, (cmdline_parse_inst_t *)&cmd_config_per_queue_tx_offload, -#ifdef RTE_LIBRTE_BPF +#ifdef RTE_LIB_BPF (cmdline_parse_inst_t *)&cmd_operate_bpf_ld_parse, (cmdline_parse_inst_t *)&cmd_operate_bpf_unld_parse, #endif diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c index 8ccd98956..91235a642 100644 --- a/app/test-pmd/config.c +++ b/app/test-pmd/config.c @@ -39,13 +39,13 @@ #include #include #include -#ifdef RTE_LIBRTE_IXGBE_PMD +#ifdef RTE_NET_IXGBE #include #endif -#ifdef RTE_LIBRTE_I40E_PMD +#ifdef RTE_NET_I40E #include #endif -#ifdef RTE_LIBRTE_BNXT_PMD +#ifdef RTE_NET_BNXT #include #endif #include @@ -4146,14 +4146,14 @@ get_fdir_info(portid_t port_id, struct rte_eth_fdir_info *fdir_info, return 0; } -#ifdef RTE_LIBRTE_I40E_PMD +#ifdef RTE_NET_I40E if (ret == -ENOTSUP) { ret = rte_pmd_i40e_get_fdir_info(port_id, fdir_info); if (!ret) ret = rte_pmd_i40e_get_fdir_stats(port_id, fdir_stat); } #endif -#ifdef RTE_LIBRTE_IXGBE_PMD +#ifdef RTE_NET_IXGBE if (ret == -ENOTSUP) { ret = rte_pmd_ixgbe_get_fdir_info(port_id, fdir_info); if (!ret) @@ -4306,7 +4306,7 @@ fdir_set_flex_payload(portid_t port_id, struct rte_eth_flex_payload_cfg *cfg) void set_vf_traffic(portid_t port_id, uint8_t is_rx, uint16_t vf, uint8_t on) { -#ifdef RTE_LIBRTE_IXGBE_PMD +#ifdef RTE_NET_IXGBE int diag; if (is_rx) @@ -4361,12 +4361,12 @@ set_vf_rate_limit(portid_t port_id, uint16_t vf, uint16_t rate, uint64_t q_msk) RTE_SET_USED(rate); RTE_SET_USED(q_msk); -#ifdef RTE_LIBRTE_IXGBE_PMD +#ifdef RTE_NET_IXGBE if (diag == -ENOTSUP) diag = rte_pmd_ixgbe_set_vf_rate_limit(port_id, vf, rate, q_msk); #endif -#ifdef RTE_LIBRTE_BNXT_PMD +#ifdef RTE_NET_BNXT if (diag == -ENOTSUP) diag = rte_pmd_bnxt_set_vf_rate_limit(port_id, vf, rate, q_msk); #endif @@ -4662,7 +4662,7 @@ close_file(uint8_t *buf) void port_queue_region_info_display(portid_t port_id, void *buf) { -#ifdef RTE_LIBRTE_I40E_PMD +#ifdef RTE_NET_I40E uint16_t i, j; struct rte_pmd_i40e_queue_regions *info = (struct rte_pmd_i40e_queue_regions *)buf; diff --git a/app/test-pmd/meson.build b/app/test-pmd/meson.build index 2e8b9f8a9..7e9c7bdd6 100644 --- a/app/test-pmd/meson.build +++ b/app/test-pmd/meson.build @@ -25,37 +25,37 @@ sources = files('5tswap.c', 'util.c') deps += ['ethdev', 'gro', 'gso', 'cmdline', 'metrics', 'meter', 'bus_pci'] -if dpdk_conf.has('RTE_LIBRTE_BITRATESTATS') +if dpdk_conf.has('RTE_LIB_BITRATESTATS') deps += 'bitratestats' endif -if dpdk_conf.has('RTE_LIBRTE_PDUMP') +if dpdk_conf.has('RTE_LIB_PDUMP') deps += 'pdump' endif -if dpdk_conf.has('RTE_LIBRTE_BITRATESTATS') +if dpdk_conf.has('RTE_LIB_BITRATESTATS') deps += 'bitratestats' endif -if dpdk_conf.has('RTE_LIBRTE_LATENCYSTATS') +if dpdk_conf.has('RTE_LIB_LATENCYSTATS') deps += 'latencystats' endif -if dpdk_conf.has('RTE_LIBRTE_PMD_CRYPTO_SCHEDULER') +if dpdk_conf.has('RTE_CRYPTO_SCHEDULER') deps += 'crypto_scheduler' endif -if dpdk_conf.has('RTE_LIBRTE_BOND_PMD') +if dpdk_conf.has('RTE_NET_BOND') deps += 'net_bond' endif -if dpdk_conf.has('RTE_LIBRTE_BNXT_PMD') +if dpdk_conf.has('RTE_NET_BNXT') deps += 'net_bnxt' endif -if dpdk_conf.has('RTE_LIBRTE_I40E_PMD') +if dpdk_conf.has('RTE_NET_I40E') deps += 'net_i40e' endif -if dpdk_conf.has('RTE_LIBRTE_IXGBE_PMD') +if dpdk_conf.has('RTE_NET_IXGBE') deps += 'net_ixgbe' endif -if dpdk_conf.has('RTE_LIBRTE_DPAA_PMD') +if dpdk_conf.has('RTE_NET_DPAA') deps += ['bus_dpaa', 'mempool_dpaa', 'net_dpaa'] endif -if dpdk_conf.has('RTE_LIBRTE_BPF') +if dpdk_conf.has('RTE_LIB_BPF') sources += files('bpf_cmd.c') deps += 'bpf' endif diff --git a/app/test-pmd/parameters.c b/app/test-pmd/parameters.c index 1ead59579..98e6740e6 100644 --- a/app/test-pmd/parameters.c +++ b/app/test-pmd/parameters.c @@ -39,7 +39,7 @@ #include #include #include -#ifdef RTE_LIBRTE_PMD_BOND +#ifdef RTE_NET_BOND #include #endif #include @@ -50,7 +50,7 @@ static void usage(char* progname) { printf("usage: %s [EAL options] -- " -#ifdef RTE_LIBRTE_CMDLINE +#ifdef RTE_LIB_CMDLINE "[--interactive|-i] " "[--cmdline-file=FILENAME] " #endif @@ -60,7 +60,7 @@ usage(char* progname) "--portlist=PORTLIST " "--mbuf-size= | --total-num-mbufs= | " "--nb-cores= | --nb-ports= | " -#ifdef RTE_LIBRTE_CMDLINE +#ifdef RTE_LIB_CMDLINE "--eth-peers-configfile= | " "--eth-peer=X,M:M:M:M:M:M | " "--tx-ip=SRC,DST | --tx-udp=PORT | " @@ -73,7 +73,7 @@ usage(char* progname) "--vxlan-gpe-port= | --record-core-cycles | " "--record-burst-stats]\n", progname); -#ifdef RTE_LIBRTE_CMDLINE +#ifdef RTE_LIB_CMDLINE printf(" --interactive: run in interactive mode.\n"); printf(" --cmdline-file: execute cli commands before startup.\n"); #endif @@ -112,7 +112,7 @@ usage(char* progname) printf(" --max-pkt-len=N: set the maximum size of packet to N bytes.\n"); printf(" --max-lro-pkt-size=N: set the maximum LRO aggregated packet " "size to N bytes.\n"); -#ifdef RTE_LIBRTE_CMDLINE +#ifdef RTE_LIB_CMDLINE printf(" --eth-peers-configfile=name: config file with ethernet addresses " "of peer ports.\n"); printf(" --eth-peer=X,M:M:M:M:M:M: set the MAC address of the X peer " @@ -129,7 +129,7 @@ usage(char* progname) "the packet will be enqueued into the rx drop-queue. " "If the drop-queue doesn't exist, the packet is dropped. " "By default drop-queue=127.\n"); -#ifdef RTE_LIBRTE_LATENCY_STATS +#ifdef RTE_LIB_LATENCYSTATS printf(" --latencystats=N: enable latency and jitter statistcs " "monitoring on forwarding lcore id N.\n"); #endif @@ -223,7 +223,7 @@ usage(char* progname) printf(" --record-burst-stats: enable display of RX and TX bursts.\n"); } -#ifdef RTE_LIBRTE_CMDLINE +#ifdef RTE_LIB_CMDLINE static int init_peer_eth_addrs(char *config_filename) { @@ -586,7 +586,7 @@ launch_args_parse(int argc, char** argv) static struct option lgopts[] = { { "help", 0, 0, 0 }, -#ifdef RTE_LIBRTE_CMDLINE +#ifdef RTE_LIB_CMDLINE { "interactive", 0, 0, 0 }, { "cmdline-file", 1, 0, 0 }, { "auto-start", 0, 0, 0 }, @@ -615,10 +615,10 @@ launch_args_parse(int argc, char** argv) { "pkt-filter-report-hash", 1, 0, 0 }, { "pkt-filter-size", 1, 0, 0 }, { "pkt-filter-drop-queue", 1, 0, 0 }, -#ifdef RTE_LIBRTE_LATENCY_STATS +#ifdef RTE_LIB_LATENCYSTATS { "latencystats", 1, 0, 0 }, #endif -#ifdef RTE_LIBRTE_BITRATESTATS +#ifdef RTE_LIB_BITRATESTATS { "bitrate-stats", 1, 0, 0 }, #endif { "disable-crc-strip", 0, 0, 0 }, @@ -691,7 +691,7 @@ launch_args_parse(int argc, char** argv) argvopt = argv; -#ifdef RTE_LIBRTE_CMDLINE +#ifdef RTE_LIB_CMDLINE #define SHORTOPTS "i" #else #define SHORTOPTS "" @@ -699,7 +699,7 @@ launch_args_parse(int argc, char** argv) while ((opt = getopt_long(argc, argvopt, SHORTOPTS "ah", lgopts, &opt_idx)) != EOF) { switch (opt) { -#ifdef RTE_LIBRTE_CMDLINE +#ifdef RTE_LIB_CMDLINE case 'i': printf("Interactive-mode selected\n"); interactive = 1; @@ -715,7 +715,7 @@ launch_args_parse(int argc, char** argv) usage(argv[0]); rte_exit(EXIT_SUCCESS, "Displayed help\n"); } -#ifdef RTE_LIBRTE_CMDLINE +#ifdef RTE_LIB_CMDLINE if (!strcmp(lgopts[opt_idx].name, "interactive")) { printf("Interactive-mode selected\n"); interactive = 1; @@ -982,7 +982,7 @@ launch_args_parse(int argc, char** argv) "drop queue %d invalid - must" "be >= 0 \n", n); } -#ifdef RTE_LIBRTE_LATENCY_STATS +#ifdef RTE_LIB_LATENCYSTATS if (!strcmp(lgopts[opt_idx].name, "latencystats")) { n = atoi(optarg); @@ -995,7 +995,7 @@ launch_args_parse(int argc, char** argv) " must be >= 0\n", n); } #endif -#ifdef RTE_LIBRTE_BITRATESTATS +#ifdef RTE_LIB_BITRATESTATS if (!strcmp(lgopts[opt_idx].name, "bitrate-stats")) { n = atoi(optarg); if (n >= 0) { diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c index ccba71c07..8efe06c64 100644 --- a/app/test-pmd/testpmd.c +++ b/app/test-pmd/testpmd.c @@ -46,18 +46,18 @@ #include #include #include -#ifdef RTE_LIBRTE_IXGBE_PMD +#ifdef RTE_NET_IXGBE #include #endif -#ifdef RTE_LIBRTE_PDUMP +#ifdef RTE_LIB_PDUMP #include #endif #include #include -#ifdef RTE_LIBRTE_BITRATESTATS +#ifdef RTE_LIB_BITRATESTATS #include #endif -#ifdef RTE_LIBRTE_LATENCY_STATS +#ifdef RTE_LIB_LATENCYSTATS #include #endif @@ -404,13 +404,13 @@ int do_mlockall = 0; * NIC bypass mode configuration options. */ -#if defined RTE_LIBRTE_IXGBE_PMD && defined RTE_LIBRTE_IXGBE_BYPASS +#if defined RTE_NET_IXGBE && defined RTE_LIBRTE_IXGBE_BYPASS /* The NIC bypass watchdog timeout. */ uint32_t bypass_timeout = RTE_PMD_IXGBE_BYPASS_TMT_OFF; #endif -#ifdef RTE_LIBRTE_LATENCY_STATS +#ifdef RTE_LIB_LATENCYSTATS /* * Set when latency stats is enabled in the commandline @@ -488,7 +488,7 @@ uint8_t record_burst_stats; unsigned int num_sockets = 0; unsigned int socket_ids[RTE_MAX_NUMA_NODES]; -#ifdef RTE_LIBRTE_BITRATESTATS +#ifdef RTE_LIB_BITRATESTATS /* Bitrate statistics */ struct rte_stats_bitrates *bitrate_data; lcoreid_t bitrate_lcore_id; @@ -2064,7 +2064,7 @@ run_pkt_fwd_on_lcore(struct fwd_lcore *fc, packet_fwd_t pkt_fwd) struct fwd_stream **fsm; streamid_t nb_fs; streamid_t sm_id; -#ifdef RTE_LIBRTE_BITRATESTATS +#ifdef RTE_LIB_BITRATESTATS uint64_t tics_per_1sec; uint64_t tics_datum; uint64_t tics_current; @@ -2079,7 +2079,7 @@ run_pkt_fwd_on_lcore(struct fwd_lcore *fc, packet_fwd_t pkt_fwd) do { for (sm_id = 0; sm_id < nb_fs; sm_id++) (*pkt_fwd)(fsm[sm_id]); -#ifdef RTE_LIBRTE_BITRATESTATS +#ifdef RTE_LIB_BITRATESTATS if (bitrate_enabled != 0 && bitrate_lcore_id == rte_lcore_id()) { tics_current = rte_rdtsc(); @@ -2092,7 +2092,7 @@ run_pkt_fwd_on_lcore(struct fwd_lcore *fc, packet_fwd_t pkt_fwd) } } #endif -#ifdef RTE_LIBRTE_LATENCY_STATS +#ifdef RTE_LIB_LATENCYSTATS if (latencystats_enabled != 0 && latencystats_lcore_id == rte_lcore_id()) rte_latencystats_update(); @@ -3347,7 +3347,7 @@ init_port_config(void) return; map_port_queue_stats_mapping_registers(pid, port); -#if defined RTE_LIBRTE_IXGBE_PMD && defined RTE_LIBRTE_IXGBE_BYPASS +#if defined RTE_NET_IXGBE && defined RTE_LIBRTE_IXGBE_BYPASS rte_pmd_ixgbe_bypass_init(pid); #endif @@ -3613,11 +3613,11 @@ signal_handler(int signum) if (signum == SIGINT || signum == SIGTERM) { printf("\nSignal %d received, preparing to exit...\n", signum); -#ifdef RTE_LIBRTE_PDUMP +#ifdef RTE_LIB_PDUMP /* uninitialize packet capture framework */ rte_pdump_uninit(); #endif -#ifdef RTE_LIBRTE_LATENCY_STATS +#ifdef RTE_LIB_LATENCYSTATS if (latencystats_enabled != 0) rte_latencystats_uninit(); #endif @@ -3659,7 +3659,7 @@ main(int argc, char** argv) if (ret != 0) rte_exit(EXIT_FAILURE, "Cannot register for ethdev events"); -#ifdef RTE_LIBRTE_PDUMP +#ifdef RTE_LIB_PDUMP /* initialize packet capture framework */ rte_pdump_init(); #endif @@ -3682,10 +3682,10 @@ main(int argc, char** argv) "Check the core mask argument\n"); /* Bitrate/latency stats disabled by default */ -#ifdef RTE_LIBRTE_BITRATESTATS +#ifdef RTE_LIB_BITRATESTATS bitrate_enabled = 0; #endif -#ifdef RTE_LIBRTE_LATENCY_STATS +#ifdef RTE_LIB_LATENCYSTATS latencystats_enabled = 0; #endif @@ -3764,7 +3764,7 @@ main(int argc, char** argv) /* Init metrics library */ rte_metrics_init(rte_socket_id()); -#ifdef RTE_LIBRTE_LATENCY_STATS +#ifdef RTE_LIB_LATENCYSTATS if (latencystats_enabled != 0) { int ret = rte_latencystats_init(1, NULL); if (ret) @@ -3776,7 +3776,7 @@ main(int argc, char** argv) #endif /* Setup bitrate stats */ -#ifdef RTE_LIBRTE_BITRATESTATS +#ifdef RTE_LIB_BITRATESTATS if (bitrate_enabled != 0) { bitrate_data = rte_stats_bitrate_create(); if (bitrate_data == NULL) @@ -3786,7 +3786,7 @@ main(int argc, char** argv) } #endif -#ifdef RTE_LIBRTE_CMDLINE +#ifdef RTE_LIB_CMDLINE if (strlen(cmdline_filename) != 0) cmdline_read_from_file(cmdline_filename); diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h index 227b69420..e447122d3 100644 --- a/app/test-pmd/testpmd.h +++ b/app/test-pmd/testpmd.h @@ -398,12 +398,12 @@ extern uint32_t param_total_num_mbufs; extern uint16_t stats_period; -#ifdef RTE_LIBRTE_LATENCY_STATS +#ifdef RTE_LIB_LATENCYSTATS extern uint8_t latencystats_enabled; extern lcoreid_t latencystats_lcore_id; #endif -#ifdef RTE_LIBRTE_BITRATESTATS +#ifdef RTE_LIB_BITRATESTATS extern lcoreid_t bitrate_lcore_id; extern uint8_t bitrate_enabled; #endif diff --git a/app/test/meson.build b/app/test/meson.build index c5ce1d2c0..f0e404156 100644 --- a/app/test/meson.build +++ b/app/test/meson.build @@ -338,23 +338,23 @@ dump_test_names = [ # unit tests without requiring that the developer install the # DPDK libraries. Explicit linkage of drivers (plugin libraries) # in applications should not be used. -if dpdk_conf.has('RTE_LIBRTE_RING_MEMPOOL') +if dpdk_conf.has('RTE_MEMPOOL_RING') test_deps += 'mempool_ring' endif -if dpdk_conf.has('RTE_LIBRTE_STACK_MEMPOOL') +if dpdk_conf.has('RTE_MEMPOOL_STACK') test_deps += 'mempool_stack' endif -if dpdk_conf.has('RTE_LIBRTE_SKELETON_EVENTDEV_PMD') +if dpdk_conf.has('RTE_EVENT_SKELETON') test_deps += 'event_skeleton' endif -if dpdk_conf.has('RTE_LIBRTE_TELEMETRY') +if dpdk_conf.has('RTE_LIB_TELEMETRY') test_sources += ['test_telemetry_json.c', 'test_telemetry_data.c'] fast_tests += [['telemetry_json_autotest', true], ['telemetry_data_autotest', true]] endif # The following linkages of drivers are required because # they are used via a driver-specific API. -if dpdk_conf.has('RTE_LIBRTE_BOND_PMD') +if dpdk_conf.has('RTE_NET_BOND') test_deps += 'net_bond' test_sources += ['test_link_bonding.c', 'test_link_bonding_rssconf.c'] driver_test_names += ['link_bonding_autotest', 'link_bonding_rssconf_autotest'] @@ -363,7 +363,7 @@ if dpdk_conf.has('RTE_LIBRTE_BOND_PMD') driver_test_names += 'link_bonding_mode4_autotest' endif endif -if dpdk_conf.has('RTE_LIBRTE_RING_PMD') +if dpdk_conf.has('RTE_NET_RING') test_deps += 'net_ring' test_sources += 'test_pmd_ring_perf.c' test_sources += 'test_pmd_ring.c' @@ -380,13 +380,13 @@ if dpdk_conf.has('RTE_LIBRTE_RING_PMD') fast_tests += [['pdump_autotest', true]] endif -if dpdk_conf.has('RTE_LIBRTE_POWER') +if dpdk_conf.has('RTE_LIB_POWER') test_deps += 'power' endif -if dpdk_conf.has('RTE_LIBRTE_KNI') +if dpdk_conf.has('RTE_LIB_KNI') test_deps += 'kni' endif -if dpdk_conf.has('RTE_LIBRTE_PDUMP') +if dpdk_conf.has('RTE_LIB_PDUMP') test_deps += 'pdump' endif @@ -403,7 +403,7 @@ cflags += '-fno-strict-aliasing' cflags += ['-DALLOW_INTERNAL_API'] test_dep_objs = [] -if dpdk_conf.has('RTE_LIBRTE_COMPRESSDEV') +if dpdk_conf.has('RTE_LIB_COMPRESSDEV') compress_test_dep = dependency('zlib', required: false) if compress_test_dep.found() test_dep_objs += compress_test_dep @@ -413,7 +413,7 @@ if dpdk_conf.has('RTE_LIBRTE_COMPRESSDEV') endif endif -if dpdk_conf.has('RTE_LIBRTE_PMD_CRYPTO_SCHEDULER') +if dpdk_conf.has('RTE_CRYPTO_SCHEDULER') driver_test_names += 'cryptodev_scheduler_autotest' test_deps += 'crypto_scheduler' endif diff --git a/app/test/process.h b/app/test/process.h index c3b378033..27f1b1c0e 100644 --- a/app/test/process.h +++ b/app/test/process.h @@ -24,8 +24,8 @@ #define exe "exe" #endif -#ifdef RTE_LIBRTE_PDUMP -#ifdef RTE_LIBRTE_RING_PMD +#ifdef RTE_LIB_PDUMP +#ifdef RTE_NET_RING #include extern void *send_pkts(void *empty); extern uint16_t flag_for_send_pkts; @@ -45,8 +45,8 @@ process_dup(const char *const argv[], int numargs, const char *env_value) char *argv_cpy[numargs + 1]; int i, status; char path[32]; -#ifdef RTE_LIBRTE_PDUMP -#ifdef RTE_LIBRTE_RING_PMD +#ifdef RTE_LIB_PDUMP +#ifdef RTE_NET_RING pthread_t thread; #endif #endif @@ -124,8 +124,8 @@ process_dup(const char *const argv[], int numargs, const char *env_value) } } /* parent process does a wait */ -#ifdef RTE_LIBRTE_PDUMP -#ifdef RTE_LIBRTE_RING_PMD +#ifdef RTE_LIB_PDUMP +#ifdef RTE_NET_RING if ((strcmp(env_value, "run_pdump_server_tests") == 0)) pthread_create(&thread, NULL, &send_pkts, NULL); #endif @@ -133,8 +133,8 @@ process_dup(const char *const argv[], int numargs, const char *env_value) while (wait(&status) != pid) ; -#ifdef RTE_LIBRTE_PDUMP -#ifdef RTE_LIBRTE_RING_PMD +#ifdef RTE_LIB_PDUMP +#ifdef RTE_NET_RING if ((strcmp(env_value, "run_pdump_server_tests") == 0)) { flag_for_send_pkts = 0; pthread_join(thread, NULL); diff --git a/app/test/test.c b/app/test/test.c index 94d26ab1f..afabfe42f 100644 --- a/app/test/test.c +++ b/app/test/test.c @@ -12,7 +12,7 @@ #include #include -#ifdef RTE_LIBRTE_CMDLINE +#ifdef RTE_LIB_CMDLINE #include #include #include @@ -25,12 +25,12 @@ extern cmdline_parse_ctx_t main_ctx[]; #include #include #include -#ifdef RTE_LIBRTE_TIMER +#ifdef RTE_LIB_TIMER #include #endif #include "test.h" -#ifdef RTE_LIBRTE_PDUMP +#ifdef RTE_LIB_PDUMP #include "test_pdump.h" #endif @@ -52,8 +52,8 @@ do_recursive_call(void) int (*action_fn)(void); } actions[] = { { "run_secondary_instances", test_mp_secondary }, -#ifdef RTE_LIBRTE_PDUMP -#ifdef RTE_LIBRTE_RING_PMD +#ifdef RTE_LIB_PDUMP +#ifdef RTE_NET_RING { "run_pdump_server_tests", test_pdump }, #endif #endif @@ -69,7 +69,7 @@ do_recursive_call(void) { "test_memory_flags", no_action }, { "test_file_prefix", no_action }, { "test_no_huge_flag", no_action }, -#ifdef RTE_LIBRTE_TIMER +#ifdef RTE_LIB_TIMER { "timer_secondary_spawn_wait", test_timer_secondary }, #endif }; @@ -91,7 +91,7 @@ int last_test_result; int main(int argc, char **argv) { -#ifdef RTE_LIBRTE_CMDLINE +#ifdef RTE_LIB_CMDLINE struct cmdline *cl; #endif char *extra_args; @@ -134,7 +134,7 @@ main(int argc, char **argv) goto out; } -#ifdef RTE_LIBRTE_TIMER +#ifdef RTE_LIB_TIMER if (rte_timer_subsystem_init() < 0) { ret = -1; goto out; @@ -163,7 +163,7 @@ main(int argc, char **argv) "HPET is not enabled, using TSC as default timer\n"); -#ifdef RTE_LIBRTE_CMDLINE +#ifdef RTE_LIB_CMDLINE cl = cmdline_stdin_new(main_ctx, "RTE>>"); if (cl == NULL) { ret = -1; @@ -191,7 +191,7 @@ main(int argc, char **argv) ret = 0; out: -#ifdef RTE_LIBRTE_TIMER +#ifdef RTE_LIB_TIMER rte_timer_subsystem_finalize(); #endif rte_eal_cleanup(); diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c index 153d00119..687a8830a 100644 --- a/app/test/test_cryptodev.c +++ b/app/test/test_cryptodev.c @@ -18,7 +18,7 @@ #include #include -#ifdef RTE_LIBRTE_PMD_CRYPTO_SCHEDULER +#ifdef RTE_CRYPTO_SCHEDULER #include #include #endif @@ -40,7 +40,7 @@ #include "test_cryptodev_aead_test_vectors.h" #include "test_cryptodev_hmac_test_vectors.h" #include "test_cryptodev_mixed_test_vectors.h" -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY #include "test_cryptodev_security_pdcp_test_vectors.h" #include "test_cryptodev_security_pdcp_test_func.h" #include "test_cryptodev_security_docsis_test_vectors.h" @@ -74,17 +74,17 @@ struct crypto_unittest_params { struct rte_crypto_sym_xform cipher_xform; struct rte_crypto_sym_xform auth_xform; struct rte_crypto_sym_xform aead_xform; -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY struct rte_security_docsis_xform docsis_xform; #endif union { struct rte_cryptodev_sym_session *sess; -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY struct rte_security_session *sec_session; #endif }; -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY enum rte_security_session_action_type type; #endif struct rte_crypto_op *op; @@ -475,7 +475,7 @@ testsuite_setup(void) } } -#ifdef RTE_LIBRTE_PMD_CRYPTO_SCHEDULER +#ifdef RTE_CRYPTO_SCHEDULER char vdev_args[VDEV_ARGS_SIZE] = {""}; char temp_str[VDEV_ARGS_SIZE] = {"mode=multi-core," "ordering=enable,name=cryptodev_test_scheduler,corelist="}; @@ -522,7 +522,7 @@ testsuite_setup(void) i, RTE_STR(CRYPTODEV_NAME_SCHEDULER_PMD)); } } -#endif /* RTE_LIBRTE_PMD_CRYPTO_SCHEDULER */ +#endif /* RTE_CRYPTO_SCHEDULER */ nb_devs = rte_cryptodev_count(); if (nb_devs < 1) { @@ -695,7 +695,7 @@ ut_teardown(void) struct rte_cryptodev_stats stats; /* free crypto session structure */ -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY if (ut_params->type == RTE_SECURITY_ACTION_TYPE_LOOKASIDE_PROTOCOL) { if (ut_params->sec_session) { rte_security_session_destroy(rte_cryptodev_get_sec_ctx @@ -7085,7 +7085,7 @@ test_authenticated_encryption(const struct aead_test_data *tdata) } -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY static int security_proto_supported(enum rte_security_session_action_type action, enum rte_security_session_protocol proto) @@ -11710,7 +11710,7 @@ test_chacha20_poly1305_decrypt_test_case_rfc8439(void) return test_authenticated_decryption(&chacha20_poly1305_case_rfc8439); } -#ifdef RTE_LIBRTE_PMD_CRYPTO_SCHEDULER +#ifdef RTE_CRYPTO_SCHEDULER /* global AESNI slave IDs for the scheduler test */ uint8_t aesni_ids[2]; @@ -11930,7 +11930,7 @@ static struct unit_test_suite cryptodev_scheduler_testsuite = { } }; -#endif /* RTE_LIBRTE_PMD_CRYPTO_SCHEDULER */ +#endif /* RTE_CRYPTO_SCHEDULER */ static struct unit_test_suite cryptodev_testsuite = { .suite_name = "Crypto Unit Test Suite", @@ -12551,7 +12551,7 @@ static struct unit_test_suite cryptodev_testsuite = { TEST_CASE_ST(ut_setup, ut_teardown, test_verify_auth_aes_cmac_cipher_null_test_case_1), -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY TEST_CASE_ST(ut_setup_security, ut_teardown, test_PDCP_PROTO_all), TEST_CASE_ST(ut_setup_security, ut_teardown, @@ -12877,7 +12877,7 @@ test_cryptodev_mrvl(void) return unit_test_suite_runner(&cryptodev_mrvl_testsuite); } -#ifdef RTE_LIBRTE_PMD_CRYPTO_SCHEDULER +#ifdef RTE_CRYPTO_SCHEDULER static int test_cryptodev_scheduler(void /*argv __rte_unused, int argc __rte_unused*/) diff --git a/app/test/test_cryptodev_hash_test_vectors.h b/app/test/test_cryptodev_hash_test_vectors.h index d11d7cee7..e261dfe36 100644 --- a/app/test/test_cryptodev_hash_test_vectors.h +++ b/app/test/test_cryptodev_hash_test_vectors.h @@ -5,7 +5,7 @@ #ifndef TEST_CRYPTODEV_HASH_TEST_VECTORS_H_ #define TEST_CRYPTODEV_HASH_TEST_VECTORS_H_ -#ifdef RTE_LIBRTE_PMD_AESNI_MB +#ifdef RTE_CRYPTO_AESNI_MB #include #endif diff --git a/app/test/test_eal_flags.c b/app/test/test_eal_flags.c index b019656b2..fc7d1a2f0 100644 --- a/app/test/test_eal_flags.c +++ b/app/test/test_eal_flags.c @@ -344,7 +344,7 @@ test_invalid_b_flag(void) static int test_invalid_vdev_flag(void) { -#ifdef RTE_LIBRTE_PMD_RING +#ifdef RTE_NET_RING #ifdef RTE_EXEC_ENV_FREEBSD /* BSD target doesn't support prefixes at this point, and we also need to * run another primary process here */ @@ -1504,7 +1504,7 @@ test_eal_flags(void) return ret; } -#ifdef RTE_LIBRTE_PMD_RING +#ifdef RTE_NET_RING ret = test_invalid_vdev_flag(); if (ret < 0) { printf("Error in test_invalid_vdev_flag()\n"); diff --git a/app/test/test_func_reentrancy.c b/app/test/test_func_reentrancy.c index f5ddd03d7..2a0c134a9 100644 --- a/app/test/test_func_reentrancy.c +++ b/app/test/test_func_reentrancy.c @@ -27,15 +27,15 @@ #include #include -#ifdef RTE_LIBRTE_HASH +#ifdef RTE_LIB_HASH #include #include #include -#endif /* RTE_LIBRTE_HASH */ +#endif /* RTE_LIB_HASH */ -#ifdef RTE_LIBRTE_LPM +#ifdef RTE_LIB_LPM #include -#endif /* RTE_LIBRTE_LPM */ +#endif /* RTE_LIB_LPM */ #include @@ -200,7 +200,7 @@ mempool_create_lookup(__rte_unused void *arg) return 0; } -#ifdef RTE_LIBRTE_HASH +#ifdef RTE_LIB_HASH static void hash_clean(unsigned lcore_id) { @@ -328,9 +328,9 @@ fbk_create_free(__rte_unused void *arg) return 0; } -#endif /* RTE_LIBRTE_HASH */ +#endif /* RTE_LIB_HASH */ -#ifdef RTE_LIBRTE_LPM +#ifdef RTE_LIB_LPM static void lpm_clean(unsigned int lcore_id) { @@ -388,7 +388,7 @@ lpm_create_free(__rte_unused void *arg) return 0; } -#endif /* RTE_LIBRTE_LPM */ +#endif /* RTE_LIB_LPM */ struct test_case{ case_func_t func; @@ -403,13 +403,13 @@ struct test_case test_cases[] = { { ring_create_lookup, NULL, ring_clean, "ring create/lookup" }, { mempool_create_lookup, NULL, mempool_clean, "mempool create/lookup" }, -#ifdef RTE_LIBRTE_HASH +#ifdef RTE_LIB_HASH { hash_create_free, NULL, hash_clean, "hash create/free" }, { fbk_create_free, NULL, fbk_clean, "fbk create/free" }, -#endif /* RTE_LIBRTE_HASH */ -#ifdef RTE_LIBRTE_LPM +#endif /* RTE_LIB_HASH */ +#ifdef RTE_LIB_LPM { lpm_create_free, NULL, lpm_clean, "lpm create/free" }, -#endif /* RTE_LIBRTE_LPM */ +#endif /* RTE_LIB_LPM */ }; /** diff --git a/app/test/test_kni.c b/app/test/test_kni.c index e47ab36e0..402f17064 100644 --- a/app/test/test_kni.c +++ b/app/test/test_kni.c @@ -11,7 +11,7 @@ #include "test.h" -#if !defined(RTE_EXEC_ENV_LINUX) || !defined(RTE_LIBRTE_KNI) +#if !defined(RTE_EXEC_ENV_LINUX) || !defined(RTE_LIB_KNI) static int test_kni(void) diff --git a/app/test/test_mp_secondary.c b/app/test/test_mp_secondary.c index 3a655c340..e1a7b4ae4 100644 --- a/app/test/test_mp_secondary.c +++ b/app/test/test_mp_secondary.c @@ -34,14 +34,14 @@ #include #include -#ifdef RTE_LIBRTE_HASH +#ifdef RTE_LIB_HASH #include #include -#endif /* RTE_LIBRTE_HASH */ +#endif /* RTE_LIB_HASH */ -#ifdef RTE_LIBRTE_LPM +#ifdef RTE_LIB_LPM #include -#endif /* RTE_LIBRTE_LPM */ +#endif /* RTE_LIB_LPM */ #include @@ -157,7 +157,7 @@ run_object_creation_tests(void) } printf("# Checked rte_mempool_create() OK\n"); -#ifdef RTE_LIBRTE_HASH +#ifdef RTE_LIB_HASH const struct rte_hash_parameters hash_params = { .name = "test_mp_hash" }; rte_errno=0; if ((rte_hash_create(&hash_params) != NULL) && @@ -177,7 +177,7 @@ run_object_creation_tests(void) printf("# Checked rte_fbk_hash_create() OK\n"); #endif -#ifdef RTE_LIBRTE_LPM +#ifdef RTE_LIB_LPM rte_errno=0; struct rte_lpm_config config; diff --git a/app/test/test_power.c b/app/test/test_power.c index 0c597c33f..da1d67c0a 100644 --- a/app/test/test_power.c +++ b/app/test/test_power.c @@ -11,7 +11,7 @@ #include "test.h" -#ifndef RTE_LIBRTE_POWER +#ifndef RTE_LIB_POWER static int test_power(void) diff --git a/app/test/test_power_cpufreq.c b/app/test/test_power_cpufreq.c index d203810da..731c6b4dc 100644 --- a/app/test/test_power_cpufreq.c +++ b/app/test/test_power_cpufreq.c @@ -11,7 +11,7 @@ #include "test.h" -#ifndef RTE_LIBRTE_POWER +#ifndef RTE_LIB_POWER static int test_power_cpufreq(void) diff --git a/app/test/test_power_kvm_vm.c b/app/test/test_power_kvm_vm.c index 785cd048d..cc66b7a8a 100644 --- a/app/test/test_power_kvm_vm.c +++ b/app/test/test_power_kvm_vm.c @@ -10,7 +10,7 @@ #include "test.h" -#ifndef RTE_LIBRTE_POWER +#ifndef RTE_LIB_POWER static int test_power_kvm_vm(void) diff --git a/app/test/test_table.c b/app/test/test_table.c index bc8d8a2e1..95034148c 100644 --- a/app/test/test_table.c +++ b/app/test/test_table.c @@ -180,7 +180,7 @@ test_table(void) } } -#ifdef RTE_LIBRTE_ACL +#ifdef RTE_LIB_ACL printf("\n\n\n\n************ACL tests************\n"); if (test_table_acl() < 0) { ret = TEST_FAILED; diff --git a/app/test/test_table.h b/app/test/test_table.h index 43b885587..209bdbff2 100644 --- a/app/test/test_table.h +++ b/app/test/test_table.h @@ -10,7 +10,7 @@ #include #include -#ifdef RTE_LIBRTE_ACL +#ifdef RTE_LIB_ACL #include #endif diff --git a/app/test/test_table_combined.h b/app/test/test_table_combined.h index d05866240..fb94dbb94 100644 --- a/app/test/test_table_combined.h +++ b/app/test/test_table_combined.h @@ -6,7 +6,7 @@ int test_table_stub_combined(void); int test_table_lpm_combined(void); int test_table_lpm_ipv6_combined(void); -#ifdef RTE_LIBRTE_ACL +#ifdef RTE_LIB_ACL int test_table_acl(void); #endif int test_table_hash8unoptimized(void); diff --git a/app/test/test_table_tables.h b/app/test/test_table_tables.h index 7570e9963..530633a01 100644 --- a/app/test/test_table_tables.h +++ b/app/test/test_table_tables.h @@ -7,7 +7,7 @@ int test_table_hash_cuckoo(void); int test_table_lpm(void); int test_table_lpm_ipv6(void); int test_table_array(void); -#ifdef RTE_LIBRTE_ACL +#ifdef RTE_LIB_ACL int test_table_acl(void); #endif int test_table_hash_unoptimized(void); diff --git a/config/arm/meson.build b/config/arm/meson.build index 344457e8a..b49203fa8 100644 --- a/config/arm/meson.build +++ b/config/arm/meson.build @@ -21,9 +21,9 @@ flags_common_default = [ # ['RTE_ARM64_MEMCPY_ALIGN_MASK', 0xF], # ['RTE_ARM64_MEMCPY_STRICT_ALIGN', false], - ['RTE_LIBRTE_FM10K_PMD', false], - ['RTE_LIBRTE_SFC_EFX_PMD', false], - ['RTE_LIBRTE_AVP_PMD', false], + ['RTE_NET_FM10K', false], + ['RTE_NET_SFC_EFX', false], + ['RTE_NET_AVP', false], ['RTE_SCHED_VECTOR', false], ['RTE_ARM_USE_WFE', false], diff --git a/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c b/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c index b0055b164..1a9dd18b9 100644 --- a/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c +++ b/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c @@ -120,7 +120,7 @@ dpaa2_core_cluster_sdest(int cpu_id) return dpaa2_core_cluster_base + x; } -#ifdef RTE_LIBRTE_PMD_DPAA2_EVENTDEV +#ifdef RTE_EVENT_DPAA2 static void dpaa2_affine_dpio_intr_to_respective_core(int32_t dpio_id, int cpu_id) { @@ -242,7 +242,7 @@ dpaa2_configure_stashing(struct dpaa2_dpio_dev *dpio_dev, int cpu_id) return -1; } -#ifdef RTE_LIBRTE_PMD_DPAA2_EVENTDEV +#ifdef RTE_EVENT_DPAA2 if (dpaa2_dpio_intr_init(dpio_dev, cpu_id)) { DPAA2_BUS_ERR("Interrupt registration failed for dpio"); return -1; @@ -255,7 +255,7 @@ dpaa2_configure_stashing(struct dpaa2_dpio_dev *dpio_dev, int cpu_id) static void dpaa2_put_qbman_swp(struct dpaa2_dpio_dev *dpio_dev) { if (dpio_dev) { -#ifdef RTE_LIBRTE_PMD_DPAA2_EVENTDEV +#ifdef RTE_EVENT_DPAA2 dpaa2_dpio_intr_deinit(dpio_dev); #endif rte_atomic16_clear(&dpio_dev->ref_count); diff --git a/drivers/compress/qat/qat_comp.h b/drivers/compress/qat/qat_comp.h index 1c07f2233..0444b50a1 100644 --- a/drivers/compress/qat/qat_comp.h +++ b/drivers/compress/qat/qat_comp.h @@ -5,7 +5,7 @@ #ifndef _QAT_COMP_H_ #define _QAT_COMP_H_ -#ifdef RTE_LIBRTE_COMPRESSDEV +#ifdef RTE_LIB_COMPRESSDEV #include #include diff --git a/drivers/compress/qat/qat_comp_pmd.h b/drivers/compress/qat/qat_comp_pmd.h index ed2712060..252b4b24e 100644 --- a/drivers/compress/qat/qat_comp_pmd.h +++ b/drivers/compress/qat/qat_comp_pmd.h @@ -5,7 +5,7 @@ #ifndef _QAT_COMP_PMD_H_ #define _QAT_COMP_PMD_H_ -#ifdef RTE_LIBRTE_COMPRESSDEV +#ifdef RTE_LIB_COMPRESSDEV #include #include diff --git a/drivers/crypto/aesni_mb/aesni_mb_pmd_private.h b/drivers/crypto/aesni_mb/aesni_mb_pmd_private.h index e0c7b4f7c..8e9b8bca2 100644 --- a/drivers/crypto/aesni_mb/aesni_mb_pmd_private.h +++ b/drivers/crypto/aesni_mb/aesni_mb_pmd_private.h @@ -7,7 +7,7 @@ #include -#if defined(RTE_LIBRTE_SECURITY) && (IMB_VERSION_NUM) >= IMB_VERSION(0, 54, 0) +#if defined(RTE_LIB_SECURITY) && (IMB_VERSION_NUM) >= IMB_VERSION(0, 54, 0) #define AESNI_MB_DOCSIS_SEC_ENABLED 1 #include #include diff --git a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c index 109e61ae1..41401c6f0 100644 --- a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c +++ b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c @@ -58,7 +58,7 @@ static uint8_t cryptodev_driver_id; -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY static inline int build_proto_compound_sg_fd(dpaa2_sec_session *sess, struct rte_crypto_op *op, @@ -1355,7 +1355,7 @@ build_sec_fd(struct rte_crypto_op *op, if (op->sess_type == RTE_CRYPTO_OP_WITH_SESSION) sess = (dpaa2_sec_session *)get_sym_session_private_data( op->sym->session, cryptodev_driver_id); -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY else if (op->sess_type == RTE_CRYPTO_OP_SECURITY_SESSION) sess = (dpaa2_sec_session *)get_sec_session_private_data( op->sym->sec_session); @@ -1383,7 +1383,7 @@ build_sec_fd(struct rte_crypto_op *op, case DPAA2_SEC_CIPHER_HASH: ret = build_authenc_sg_fd(sess, op, fd, bpid); break; -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY case DPAA2_SEC_IPSEC: case DPAA2_SEC_PDCP: ret = build_proto_compound_sg_fd(sess, op, fd, bpid); @@ -1407,7 +1407,7 @@ build_sec_fd(struct rte_crypto_op *op, case DPAA2_SEC_CIPHER_HASH: ret = build_authenc_fd(sess, op, fd, bpid); break; -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY case DPAA2_SEC_IPSEC: ret = build_proto_fd(sess, op, fd, bpid); break; @@ -1522,7 +1522,7 @@ dpaa2_sec_enqueue_burst(void *qp, struct rte_crypto_op **ops, return num_tx; } -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY static inline struct rte_crypto_op * sec_simple_fd_to_mbuf(const struct qbman_fd *fd) { @@ -1561,7 +1561,7 @@ sec_fd_to_mbuf(const struct qbman_fd *fd) struct ctxt_priv *priv; struct rte_mbuf *dst, *src; -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY if (DPAA2_FD_GET_FORMAT(fd) == qbman_fd_single) return sec_simple_fd_to_mbuf(fd); #endif @@ -1594,7 +1594,7 @@ sec_fd_to_mbuf(const struct qbman_fd *fd) } else dst = src; -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY if (op->sess_type == RTE_CRYPTO_OP_SECURITY_SESSION) { uint16_t len = DPAA2_GET_FD_LEN(fd); dst->pkt_len = len; @@ -2539,7 +2539,7 @@ dpaa2_sec_set_session_parameters(struct rte_cryptodev *dev, return ret; } -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY static int dpaa2_sec_ipsec_aead_init(struct rte_crypto_aead_xform *aead_xform, dpaa2_sec_session *session, @@ -3698,7 +3698,7 @@ static struct rte_cryptodev_ops crypto_ops = { .sym_session_clear = dpaa2_sec_sym_session_clear, }; -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY static const struct rte_security_capability * dpaa2_sec_capabilities_get(void *device __rte_unused) { @@ -3736,7 +3736,7 @@ dpaa2_sec_dev_init(struct rte_cryptodev *cryptodev) struct dpaa2_sec_dev_private *internals; struct rte_device *dev = cryptodev->device; struct rte_dpaa2_device *dpaa2_dev; -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY struct rte_security_ctx *security_instance; #endif struct fsl_mc_io *dpseci; @@ -3775,7 +3775,7 @@ dpaa2_sec_dev_init(struct rte_cryptodev *cryptodev) DPAA2_SEC_DEBUG("Device already init by primary process"); return 0; } -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY /* Initialize security_ctx only for primary process*/ security_instance = rte_malloc("rte_security_instances_ops", sizeof(struct rte_security_ctx), 0); diff --git a/drivers/crypto/dpaa2_sec/dpaa2_sec_priv.h b/drivers/crypto/dpaa2_sec/dpaa2_sec_priv.h index 528b64ef8..5d9cf12c4 100644 --- a/drivers/crypto/dpaa2_sec/dpaa2_sec_priv.h +++ b/drivers/crypto/dpaa2_sec/dpaa2_sec_priv.h @@ -8,7 +8,7 @@ #ifndef _DPAA2_SEC_PMD_PRIVATE_H_ #define _DPAA2_SEC_PMD_PRIVATE_H_ -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY #include #endif @@ -141,7 +141,7 @@ struct dpaa2_sec_aead_ctxt { uint8_t auth_cipher_text; /**< Authenticate/cipher ordering */ }; -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY /* * The structure is to be filled by user for PDCP Protocol */ @@ -193,7 +193,7 @@ typedef struct dpaa2_sec_session_entry { struct dpaa2_sec_aead_ctxt aead_ctxt; } ext_params; }; -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY struct dpaa2_pdcp_ctxt pdcp; #endif }; @@ -550,7 +550,7 @@ static const struct rte_cryptodev_capabilities dpaa2_sec_capabilities[] = { RTE_CRYPTODEV_END_OF_CAPABILITIES_LIST() }; -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY static const struct rte_cryptodev_capabilities dpaa2_pdcp_capabilities[] = { { /* SNOW 3G (UIA2) */ diff --git a/drivers/crypto/dpaa_sec/dpaa_sec.c b/drivers/crypto/dpaa_sec/dpaa_sec.c index 97002170b..c4d1747a7 100644 --- a/drivers/crypto/dpaa_sec/dpaa_sec.c +++ b/drivers/crypto/dpaa_sec/dpaa_sec.c @@ -15,7 +15,7 @@ #include #include #include -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY #include #endif #include @@ -229,7 +229,7 @@ static inline int is_decode(dpaa_sec_session *ses) return ses->dir == DIR_DEC; } -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY static int dpaa_sec_prep_pdcp_cdb(dpaa_sec_session *ses) { @@ -408,7 +408,7 @@ dpaa_sec_prep_cdb(dpaa_sec_session *ses) memset(cdb, 0, sizeof(struct sec_cdb)); switch (ses->ctxt) { -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY case DPAA_SEC_IPSEC: shared_desc_len = dpaa_sec_prep_ipsec_cdb(ses); break; @@ -1539,7 +1539,7 @@ build_cipher_auth(struct rte_crypto_op *op, dpaa_sec_session *ses) return cf; } -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY static inline struct dpaa_sec_job * build_proto(struct rte_crypto_op *op, dpaa_sec_session *ses) { @@ -1714,7 +1714,7 @@ dpaa_sec_enqueue_burst(void *qp, struct rte_crypto_op **ops, op->sym->session, cryptodev_driver_id); break; -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY case RTE_CRYPTO_OP_SECURITY_SESSION: ses = (dpaa_sec_session *) get_sec_session_private_data( @@ -1761,7 +1761,7 @@ dpaa_sec_enqueue_burst(void *qp, struct rte_crypto_op **ops, ((op->sym->m_dst == NULL) || rte_pktmbuf_is_contiguous(op->sym->m_dst))) { switch (ses->ctxt) { -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY case DPAA_SEC_PDCP: case DPAA_SEC_IPSEC: cf = build_proto(op, ses); @@ -1795,7 +1795,7 @@ dpaa_sec_enqueue_burst(void *qp, struct rte_crypto_op **ops, } } else { switch (ses->ctxt) { -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY case DPAA_SEC_PDCP: case DPAA_SEC_IPSEC: cf = build_proto_sg(op, ses); @@ -1852,7 +1852,7 @@ dpaa_sec_enqueue_burst(void *qp, struct rte_crypto_op **ops, ((auth_tail_len << 16) | auth_hdr_len); } -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY /* In case of PDCP, per packet HFN is stored in * mbuf priv after sym_op. */ @@ -2467,7 +2467,7 @@ dpaa_sec_sym_session_clear(struct rte_cryptodev *dev, } } -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY static int dpaa_sec_ipsec_aead_init(struct rte_crypto_aead_xform *aead_xform, struct rte_security_ipsec_xform *ipsec_xform, @@ -3271,7 +3271,7 @@ static struct rte_cryptodev_ops crypto_ops = { .sym_session_clear = dpaa_sec_sym_session_clear }; -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY static const struct rte_security_capability * dpaa_sec_capabilities_get(void *device __rte_unused) { @@ -3310,7 +3310,7 @@ static int dpaa_sec_dev_init(struct rte_cryptodev *cryptodev) { struct dpaa_sec_dev_private *internals; -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY struct rte_security_ctx *security_instance; #endif struct dpaa_sec_qp *qp; @@ -3347,7 +3347,7 @@ dpaa_sec_dev_init(struct rte_cryptodev *cryptodev) DPAA_SEC_WARN("Device already init by primary process"); return 0; } -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY /* Initialize security_ctx only for primary process*/ security_instance = rte_malloc("rte_security_instances_ops", sizeof(struct rte_security_ctx), 0); diff --git a/drivers/crypto/dpaa_sec/dpaa_sec.h b/drivers/crypto/dpaa_sec/dpaa_sec.h index 2cd50cc8d..45ae53499 100644 --- a/drivers/crypto/dpaa_sec/dpaa_sec.h +++ b/drivers/crypto/dpaa_sec/dpaa_sec.h @@ -98,7 +98,7 @@ struct sec_cdb { uint32_t sh_desc[DPAA_SEC_MAX_DESC_SIZE]; }; -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY /*! * The structure is to be filled by user as a part of * dpaa_sec_proto_ctxt for PDCP Protocol @@ -125,7 +125,7 @@ typedef struct dpaa_sec_session_entry { enum rte_crypto_cipher_algorithm cipher_alg; /*!< Cipher Algorithm*/ enum rte_crypto_auth_algorithm auth_alg; /*!< Authentication Algorithm*/ enum rte_crypto_aead_algorithm aead_alg; /*!< AEAD Algorithm*/ -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY enum rte_security_session_protocol proto_alg; /*!< Security Algorithm*/ #endif union { @@ -168,7 +168,7 @@ typedef struct dpaa_sec_session_entry { uint8_t auth_cipher_text; /**< Authenticate/cipher ordering */ }; -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY struct sec_pdcp_ctxt pdcp; #endif }; @@ -568,7 +568,7 @@ static const struct rte_cryptodev_capabilities dpaa_sec_capabilities[] = { RTE_CRYPTODEV_END_OF_CAPABILITIES_LIST() }; -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY static const struct rte_cryptodev_capabilities dpaa_pdcp_capabilities[] = { { /* SNOW 3G (UIA2) */ .op = RTE_CRYPTO_OP_TYPE_SYMMETRIC, diff --git a/drivers/crypto/qat/qat_sym.c b/drivers/crypto/qat/qat_sym.c index e3f98a76b..4b7676deb 100644 --- a/drivers/crypto/qat/qat_sym.c +++ b/drivers/crypto/qat/qat_sym.c @@ -180,7 +180,7 @@ qat_sym_build_request(void *in_op, uint8_t *out_msg, } else if (op->sess_type == RTE_CRYPTO_OP_WITH_SESSION) { ctx = (struct qat_sym_session *)get_sym_session_private_data( op->sym->session, qat_sym_driver_id); -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY } else { ctx = (struct qat_sym_session *)get_sec_session_private_data( op->sym->sec_session); diff --git a/drivers/crypto/qat/qat_sym.h b/drivers/crypto/qat/qat_sym.h index 1a9748849..da67a56b3 100644 --- a/drivers/crypto/qat/qat_sym.h +++ b/drivers/crypto/qat/qat_sym.h @@ -6,7 +6,7 @@ #define _QAT_SYM_H_ #include -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY #include #endif @@ -135,7 +135,7 @@ qat_bpicipher_postprocess(struct qat_sym_session *ctx, return sym_op->cipher.data.length - last_block_len; } -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY static inline void qat_crc_verify(struct qat_sym_session *ctx, struct rte_crypto_op *op) { @@ -231,7 +231,7 @@ qat_sym_process_response(void **op, uint8_t *resp) rx_op->status = RTE_CRYPTO_OP_STATUS_AUTH_FAILED; } else { -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY uint8_t is_docsis_sec = 0; if (rx_op->sess_type == RTE_CRYPTO_OP_SECURITY_SESSION) { @@ -256,7 +256,7 @@ qat_sym_process_response(void **op, uint8_t *resp) if (sess->bpi_ctx) { qat_bpicipher_postprocess(sess, rx_op); -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY if (is_docsis_sec) qat_crc_verify(sess, rx_op); #endif diff --git a/drivers/crypto/qat/qat_sym_capabilities.h b/drivers/crypto/qat/qat_sym_capabilities.h index 4ee798992..f7cab2f47 100644 --- a/drivers/crypto/qat/qat_sym_capabilities.h +++ b/drivers/crypto/qat/qat_sym_capabilities.h @@ -731,7 +731,7 @@ }, } \ } -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY #define QAT_SECURITY_SYM_CAPABILITIES \ { /* AES DOCSIS BPI */ \ .op = RTE_CRYPTO_OP_TYPE_SYMMETRIC, \ diff --git a/drivers/crypto/qat/qat_sym_pmd.c b/drivers/crypto/qat/qat_sym_pmd.c index 314742f53..a291004cf 100644 --- a/drivers/crypto/qat/qat_sym_pmd.c +++ b/drivers/crypto/qat/qat_sym_pmd.c @@ -8,7 +8,7 @@ #include #include #include -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY #include #endif @@ -39,7 +39,7 @@ static const struct rte_cryptodev_capabilities qat_gen3_sym_capabilities[] = { RTE_CRYPTODEV_END_OF_CAPABILITIES_LIST() }; -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY static const struct rte_cryptodev_capabilities qat_security_sym_capabilities[] = { QAT_SECURITY_SYM_CAPABILITIES, @@ -261,7 +261,7 @@ static struct rte_cryptodev_ops crypto_qat_ops = { .sym_session_clear = qat_sym_session_clear }; -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY static const struct rte_security_capability * qat_security_cap_get(void *device __rte_unused) { @@ -385,7 +385,7 @@ qat_sym_dev_create(struct qat_pci_device *qat_pci_dev, "QAT_SYM_CAPA_GEN_%d", qat_pci_dev->qat_dev_gen); -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY struct rte_security_ctx *security_instance; security_instance = rte_malloc("qat_sec", sizeof(struct rte_security_ctx), @@ -462,7 +462,7 @@ qat_sym_dev_create(struct qat_pci_device *qat_pci_dev, return 0; error: -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY rte_free(cryptodev->security_ctx); cryptodev->security_ctx = NULL; #endif @@ -487,7 +487,7 @@ qat_sym_dev_destroy(struct qat_pci_device *qat_pci_dev) /* free crypto device */ cryptodev = rte_cryptodev_pmd_get_dev(qat_pci_dev->sym_dev->sym_dev_id); -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY rte_free(cryptodev->security_ctx); cryptodev->security_ctx = NULL; #endif diff --git a/drivers/crypto/qat/qat_sym_pmd.h b/drivers/crypto/qat/qat_sym_pmd.h index f32a77e60..e0992cbe2 100644 --- a/drivers/crypto/qat/qat_sym_pmd.h +++ b/drivers/crypto/qat/qat_sym_pmd.h @@ -9,7 +9,7 @@ #include #include -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY #include #endif diff --git a/drivers/crypto/qat/qat_sym_session.c b/drivers/crypto/qat/qat_sym_session.c index ed4d00159..23d059bf8 100644 --- a/drivers/crypto/qat/qat_sym_session.c +++ b/drivers/crypto/qat/qat_sym_session.c @@ -14,7 +14,7 @@ #include #include #include -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY #include #endif @@ -2109,7 +2109,7 @@ int qat_sym_validate_zuc_key(int key_len, enum icp_qat_hw_cipher_algo *alg) return 0; } -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY static int qat_sec_session_check_docsis(struct rte_security_session_conf *conf) { diff --git a/drivers/crypto/qat/qat_sym_session.h b/drivers/crypto/qat/qat_sym_session.h index 9f1033baf..011e5bb7a 100644 --- a/drivers/crypto/qat/qat_sym_session.h +++ b/drivers/crypto/qat/qat_sym_session.h @@ -6,7 +6,7 @@ #include #include -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY #include #endif @@ -159,7 +159,7 @@ qat_cipher_get_block_size(enum icp_qat_hw_cipher_algo qat_cipher_alg); int qat_sym_validate_zuc_key(int key_len, enum icp_qat_hw_cipher_algo *alg); -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY int qat_security_session_create(void *dev, struct rte_security_session_conf *conf, struct rte_security_session *sess, struct rte_mempool *mempool); diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c index 0b98e210e..7cdb4dfe6 100644 --- a/drivers/net/ixgbe/ixgbe_ethdev.c +++ b/drivers/net/ixgbe/ixgbe_ethdev.c @@ -33,7 +33,7 @@ #include #include #include -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY #include #endif @@ -1151,7 +1151,7 @@ eth_ixgbe_dev_init(struct rte_eth_dev *eth_dev, void *init_params __rte_unused) /* Unlock any pending hardware semaphore */ ixgbe_swfw_lock_reset(hw); -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY /* Initialize security_ctx only for primary process*/ if (ixgbe_ipsec_ctx_create(eth_dev)) return -ENOMEM; @@ -3053,7 +3053,7 @@ ixgbe_dev_close(struct rte_eth_dev *dev) /* Remove all Traffic Manager configuration */ ixgbe_tm_conf_uninit(dev); -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY rte_free(dev->security_ctx); #endif diff --git a/drivers/net/ixgbe/ixgbe_ethdev.h b/drivers/net/ixgbe/ixgbe_ethdev.h index 9bdef87fb..33905f713 100644 --- a/drivers/net/ixgbe/ixgbe_ethdev.h +++ b/drivers/net/ixgbe/ixgbe_ethdev.h @@ -12,7 +12,7 @@ #include "base/ixgbe_dcb_82599.h" #include "base/ixgbe_dcb_82598.h" #include "ixgbe_bypass.h" -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY #include "ixgbe_ipsec.h" #endif #include @@ -494,7 +494,7 @@ struct ixgbe_adapter { struct ixgbe_filter_info filter; struct ixgbe_l2_tn_info l2_tn; struct ixgbe_bw_conf bw_conf; -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY struct ixgbe_ipsec ipsec; #endif bool rx_bulk_alloc_allowed; diff --git a/drivers/net/ixgbe/ixgbe_flow.c b/drivers/net/ixgbe/ixgbe_flow.c index b2a2bfc02..6b3dea46e 100644 --- a/drivers/net/ixgbe/ixgbe_flow.c +++ b/drivers/net/ixgbe/ixgbe_flow.c @@ -215,7 +215,7 @@ cons_parse_ntuple_filter(const struct rte_flow_attr *attr, memset(ð_null, 0, sizeof(struct rte_flow_item_eth)); memset(&vlan_null, 0, sizeof(struct rte_flow_item_vlan)); -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY /** * Special case for flow action type RTE_FLOW_ACTION_TYPE_SECURITY */ @@ -629,7 +629,7 @@ ixgbe_parse_ntuple_filter(struct rte_eth_dev *dev, if (ret) return ret; -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY /* ESP flow not really a flow*/ if (filter->proto == IPPROTO_ESP) return 0; @@ -3057,7 +3057,7 @@ ixgbe_flow_create(struct rte_eth_dev *dev, ret = ixgbe_parse_ntuple_filter(dev, attr, pattern, actions, &ntuple_filter, error); -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY /* ESP flow not really a flow*/ if (ntuple_filter.proto == IPPROTO_ESP) return flow; diff --git a/drivers/net/ixgbe/ixgbe_rxtx.c b/drivers/net/ixgbe/ixgbe_rxtx.c index 29d385c06..cc861187d 100644 --- a/drivers/net/ixgbe/ixgbe_rxtx.c +++ b/drivers/net/ixgbe/ixgbe_rxtx.c @@ -452,7 +452,7 @@ ixgbe_set_xmit_ctx(struct ixgbe_tx_queue *txq, seqnum_seed |= tx_offload.l2_len << IXGBE_ADVTXD_TUNNEL_LEN; } -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY if (ol_flags & PKT_TX_SEC_OFFLOAD) { union ixgbe_crypto_tx_desc_md *md = (union ixgbe_crypto_tx_desc_md *)mdata; @@ -645,7 +645,7 @@ ixgbe_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint32_t ctx = 0; uint32_t new_ctx; union ixgbe_tx_offload tx_offload; -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY uint8_t use_ipsec; #endif @@ -675,7 +675,7 @@ ixgbe_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, * are needed for offload functionality. */ ol_flags = tx_pkt->ol_flags; -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY use_ipsec = txq->using_ipsec && (ol_flags & PKT_TX_SEC_OFFLOAD); #endif @@ -689,7 +689,7 @@ ixgbe_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, tx_offload.tso_segsz = tx_pkt->tso_segsz; tx_offload.outer_l2_len = tx_pkt->outer_l2_len; tx_offload.outer_l3_len = tx_pkt->outer_l3_len; -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY if (use_ipsec) { union ixgbe_crypto_tx_desc_md *ipsec_mdata = (union ixgbe_crypto_tx_desc_md *) @@ -876,7 +876,7 @@ ixgbe_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, } olinfo_status |= (pkt_len << IXGBE_ADVTXD_PAYLEN_SHIFT); -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY if (use_ipsec) olinfo_status |= IXGBE_ADVTXD_POPTS_IPSEC; #endif @@ -1460,7 +1460,7 @@ rx_desc_error_to_pkt_flags(uint32_t rx_status) pkt_flags |= PKT_RX_EIP_CKSUM_BAD; } -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY if (rx_status & IXGBE_RXD_STAT_SECP) { pkt_flags |= PKT_RX_SEC_OFFLOAD; if (rx_status & IXGBE_RXDADV_LNKSEC_ERROR_BAD_SIG) @@ -2400,7 +2400,7 @@ ixgbe_dev_tx_done_cleanup(void *tx_queue, uint32_t free_cnt) { struct ixgbe_tx_queue *txq = (struct ixgbe_tx_queue *)tx_queue; if (txq->offloads == 0 && -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY !(txq->using_ipsec) && #endif txq->tx_rs_thresh >= RTE_PMD_IXGBE_TX_MAX_BURST) { @@ -2496,7 +2496,7 @@ ixgbe_set_tx_function(struct rte_eth_dev *dev, struct ixgbe_tx_queue *txq) { /* Use a simple Tx queue (no offloads, no multi segs) if possible */ if ((txq->offloads == 0) && -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY !(txq->using_ipsec) && #endif (txq->tx_rs_thresh >= RTE_PMD_IXGBE_TX_MAX_BURST)) { @@ -2555,7 +2555,7 @@ ixgbe_get_tx_port_offloads(struct rte_eth_dev *dev) hw->mac.type == ixgbe_mac_X550EM_a) tx_offload_capa |= DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM; -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY if (dev->security_ctx) tx_offload_capa |= DEV_TX_OFFLOAD_SECURITY; #endif @@ -2723,7 +2723,7 @@ ixgbe_dev_tx_queue_setup(struct rte_eth_dev *dev, txq->offloads = offloads; txq->ops = &def_txq_ops; txq->tx_deferred_start = tx_conf->tx_deferred_start; -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY txq->using_ipsec = !!(dev->data->dev_conf.txmode.offloads & DEV_TX_OFFLOAD_SECURITY); #endif @@ -3006,7 +3006,7 @@ ixgbe_get_rx_port_offloads(struct rte_eth_dev *dev) hw->mac.type == ixgbe_mac_X550EM_a) offloads |= DEV_RX_OFFLOAD_OUTER_IPV4_CKSUM; -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY if (dev->security_ctx) offloads |= DEV_RX_OFFLOAD_SECURITY; #endif @@ -4835,7 +4835,7 @@ ixgbe_set_rx_function(struct rte_eth_dev *dev) struct ixgbe_rx_queue *rxq = dev->data->rx_queues[i]; rxq->rx_using_sse = rx_using_sse; -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY rxq->using_ipsec = !!(dev->data->dev_conf.rxmode.offloads & DEV_RX_OFFLOAD_SECURITY); #endif @@ -5347,7 +5347,7 @@ ixgbe_dev_rxtx_start(struct rte_eth_dev *dev) ixgbe_setup_loopback_link_x540_x550(hw, true); } -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY if ((dev->data->dev_conf.rxmode.offloads & DEV_RX_OFFLOAD_SECURITY) || (dev->data->dev_conf.txmode.offloads & diff --git a/drivers/net/ixgbe/ixgbe_rxtx.h b/drivers/net/ixgbe/ixgbe_rxtx.h index 0b5589ef4..6d2f7c9da 100644 --- a/drivers/net/ixgbe/ixgbe_rxtx.h +++ b/drivers/net/ixgbe/ixgbe_rxtx.h @@ -113,7 +113,7 @@ struct ixgbe_rx_queue { uint16_t rx_free_trigger; /**< triggers rx buffer allocation */ uint8_t rx_using_sse; /**< indicates that vector RX is in use */ -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY uint8_t using_ipsec; /**< indicates that IPsec RX feature is in use */ #endif @@ -161,7 +161,7 @@ union ixgbe_tx_offload { /* fields for TX offloading of tunnels */ uint64_t outer_l3_len:8; /**< Outer L3 (IP) Hdr Length. */ uint64_t outer_l2_len:8; /**< Outer L2 (MAC) Hdr Length. */ -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY /* inline ipsec related*/ uint64_t sa_idx:8; /**< TX SA database entry index */ uint64_t sec_pad_len:4; /**< padding length */ @@ -230,7 +230,7 @@ struct ixgbe_tx_queue { struct ixgbe_advctx_info ctx_cache[IXGBE_CTX_NUM]; const struct ixgbe_txq_ops *ops; /**< txq ops */ uint8_t tx_deferred_start; /**< not in global dev start. */ -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY uint8_t using_ipsec; /**< indicates that IPsec TX feature is in use */ #endif diff --git a/drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c b/drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c index e77a7f31c..586a26180 100644 --- a/drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c +++ b/drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c @@ -93,7 +93,7 @@ ixgbe_rxq_rearm(struct ixgbe_rx_queue *rxq) IXGBE_PCI_REG_WC_WRITE(rxq->rdt_reg_addr, rx_id); } -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY static inline void desc_to_olflags_v_ipsec(__m128i descs[4], struct rte_mbuf **rx_pkts) { @@ -318,7 +318,7 @@ _recv_raw_pkts_vec(struct ixgbe_rx_queue *rxq, struct rte_mbuf **rx_pkts, volatile union ixgbe_adv_rx_desc *rxdp; struct ixgbe_rx_entry *sw_ring; uint16_t nb_pkts_recd; -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY uint8_t use_ipsec = rxq->using_ipsec; #endif int pos; @@ -484,7 +484,7 @@ _recv_raw_pkts_vec(struct ixgbe_rx_queue *rxq, struct rte_mbuf **rx_pkts, /* set ol_flags with vlan packet type */ desc_to_olflags_v(descs, mbuf_init, vlan_flags, &rx_pkts[pos]); -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY if (unlikely(use_ipsec)) desc_to_olflags_v_ipsec(descs, &rx_pkts[pos]); #endif diff --git a/drivers/net/kni/meson.build b/drivers/net/kni/meson.build index 0539b4768..d9fa898d1 100644 --- a/drivers/net/kni/meson.build +++ b/drivers/net/kni/meson.build @@ -2,7 +2,7 @@ # Copyright(c) 2018 Intel Corporation # this driver can be built if-and-only-if KNI library is buildable -build = dpdk_conf.has('RTE_LIBRTE_KNI') +build = dpdk_conf.has('RTE_LIB_KNI') reason = 'missing dependency, DPDK KNI library' sources = files('rte_eth_kni.c') deps += 'kni' diff --git a/drivers/net/netvsc/meson.build b/drivers/net/netvsc/meson.build index e7f449302..f3f52f732 100644 --- a/drivers/net/netvsc/meson.build +++ b/drivers/net/netvsc/meson.build @@ -1,7 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2018 Microsoft Corporation -build = dpdk_conf.has('RTE_LIBRTE_VMBUS_BUS') +build = dpdk_conf.has('RTE_BUS_VMBUS') reason = 'missing dependency, DPDK VMBus driver' sources = files('hn_ethdev.c', 'hn_rxtx.c', 'hn_rndis.c', 'hn_nvs.c', 'hn_vf.c') diff --git a/drivers/net/vhost/meson.build b/drivers/net/vhost/meson.build index d7930862a..963b30f20 100644 --- a/drivers/net/vhost/meson.build +++ b/drivers/net/vhost/meson.build @@ -1,7 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2018 Intel Corporation -build = dpdk_conf.has('RTE_LIBRTE_VHOST') +build = dpdk_conf.has('RTE_LIB_VHOST') reason = 'missing dependency, DPDK vhost library' sources = files('rte_eth_vhost.c') install_headers('rte_eth_vhost.h') diff --git a/drivers/raw/dpaa2_cmdif/meson.build b/drivers/raw/dpaa2_cmdif/meson.build index e7656a3cd..06c0fe756 100644 --- a/drivers/raw/dpaa2_cmdif/meson.build +++ b/drivers/raw/dpaa2_cmdif/meson.build @@ -1,7 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright 2018 NXP -build = dpdk_conf.has('RTE_LIBRTE_DPAA2_MEMPOOL') +build = dpdk_conf.has('RTE_MEMPOOL_DPAA2') reason = 'missing dependency, DPDK DPAA2 mempool driver' deps += ['rawdev', 'mempool_dpaa2', 'bus_vdev'] sources = files('dpaa2_cmdif.c') diff --git a/drivers/raw/dpaa2_qdma/meson.build b/drivers/raw/dpaa2_qdma/meson.build index b9b08153a..3eeab0d1c 100644 --- a/drivers/raw/dpaa2_qdma/meson.build +++ b/drivers/raw/dpaa2_qdma/meson.build @@ -1,7 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright 2018 NXP -build = dpdk_conf.has('RTE_LIBRTE_DPAA2_MEMPOOL') +build = dpdk_conf.has('RTE_MEMPOOL_DPAA2') reason = 'missing dependency, DPDK DPAA2 mempool driver' deps += ['rawdev', 'mempool_dpaa2', 'ring', 'kvargs'] sources = files('dpaa2_qdma.c') diff --git a/drivers/raw/ifpga/base/opae_osdep.h b/drivers/raw/ifpga/base/opae_osdep.h index 416cef01c..18e6a11aa 100644 --- a/drivers/raw/ifpga/base/opae_osdep.h +++ b/drivers/raw/ifpga/base/opae_osdep.h @@ -8,7 +8,7 @@ #include #include -#ifdef RTE_LIBRTE_EAL +#ifdef RTE_LIB_EAL #include "osdep_rte/osdep_generic.h" #else #include "osdep_raw/osdep_generic.h" diff --git a/drivers/vdpa/ifc/meson.build b/drivers/vdpa/ifc/meson.build index b179987f9..9d256af4b 100644 --- a/drivers/vdpa/ifc/meson.build +++ b/drivers/vdpa/ifc/meson.build @@ -1,7 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2018 Intel Corporation -build = dpdk_conf.has('RTE_LIBRTE_VHOST') +build = dpdk_conf.has('RTE_LIB_VHOST') reason = 'missing dependency, DPDK vhost library' sources = files('ifcvf_vdpa.c', 'base/ifcvf.c') includes += include_directories('base') diff --git a/examples/distributor/meson.build b/examples/distributor/meson.build index 9fec7f883..5244cd4ff 100644 --- a/examples/distributor/meson.build +++ b/examples/distributor/meson.build @@ -7,7 +7,7 @@ # DPDK instance, use 'make' # require the power library -build = dpdk_conf.has('RTE_LIBRTE_POWER') +build = dpdk_conf.has('RTE_LIB_POWER') allow_experimental_apis = true deps += ['distributor', 'power'] diff --git a/examples/ethtool/lib/rte_ethtool.c b/examples/ethtool/lib/rte_ethtool.c index db8150efd..13f9ba379 100644 --- a/examples/ethtool/lib/rte_ethtool.c +++ b/examples/ethtool/lib/rte_ethtool.c @@ -9,7 +9,7 @@ #include #include #include -#ifdef RTE_LIBRTE_IXGBE_PMD +#ifdef RTE_NET_IXGBE #include #endif #include "rte_ethtool.h" @@ -395,7 +395,7 @@ rte_ethtool_net_set_rx_mode(uint16_t port_id) /* Set VF vf_rx_mode, VF unsupport status is discard */ for (vf = 0; vf < num_vfs; vf++) { -#ifdef RTE_LIBRTE_IXGBE_PMD +#ifdef RTE_NET_IXGBE rte_pmd_ixgbe_set_vf_rxmode(port_id, vf, ETH_VMDQ_ACCEPT_UNTAG, 0); #endif diff --git a/examples/ethtool/meson.build b/examples/ethtool/meson.build index fdfdd1971..cc8edac3d 100644 --- a/examples/ethtool/meson.build +++ b/examples/ethtool/meson.build @@ -13,7 +13,7 @@ sources = files('lib/rte_ethtool.c', includes = include_directories('lib', 'ethtool-app') deps += 'bus_pci' -if dpdk_conf.has('RTE_LIBRTE_IXGBE_PMD') +if dpdk_conf.has('RTE_NET_IXGBE') deps += 'net_ixgbe' endif diff --git a/examples/ioat/meson.build b/examples/ioat/meson.build index f1a045a0a..6afbaa680 100644 --- a/examples/ioat/meson.build +++ b/examples/ioat/meson.build @@ -7,7 +7,7 @@ # DPDK instance, use 'make' allow_experimental_apis = true -build = dpdk_conf.has('RTE_LIBRTE_PMD_IOAT_RAWDEV') +build = dpdk_conf.has('RTE_RAW_IOAT') deps += ['raw_ioat'] diff --git a/examples/ip_pipeline/kni.c b/examples/ip_pipeline/kni.c index 451968593..a2d3331cb 100644 --- a/examples/ip_pipeline/kni.c +++ b/examples/ip_pipeline/kni.c @@ -24,7 +24,7 @@ kni_init(void) { TAILQ_INIT(&kni_list); -#ifdef RTE_LIBRTE_KNI +#ifdef RTE_LIB_KNI rte_kni_init(KNI_MAX); #endif @@ -46,7 +46,7 @@ kni_find(const char *name) return NULL; } -#ifndef RTE_LIBRTE_KNI +#ifndef RTE_LIB_KNI struct kni * kni_create(const char *name __rte_unused, diff --git a/examples/ip_pipeline/kni.h b/examples/ip_pipeline/kni.h index c3856456d..118f48df7 100644 --- a/examples/ip_pipeline/kni.h +++ b/examples/ip_pipeline/kni.h @@ -8,7 +8,7 @@ #include #include -#ifdef RTE_LIBRTE_KNI +#ifdef RTE_LIB_KNI #include #endif @@ -17,7 +17,7 @@ struct kni { TAILQ_ENTRY(kni) node; char name[NAME_SIZE]; -#ifdef RTE_LIBRTE_KNI +#ifdef RTE_LIB_KNI struct rte_kni *k; #endif }; diff --git a/examples/ip_pipeline/pipeline.c b/examples/ip_pipeline/pipeline.c index b627310a0..7ebabcae9 100644 --- a/examples/ip_pipeline/pipeline.c +++ b/examples/ip_pipeline/pipeline.c @@ -11,7 +11,7 @@ #include #include -#ifdef RTE_LIBRTE_KNI +#ifdef RTE_LIB_KNI #include #endif #include @@ -28,7 +28,7 @@ #include #include -#ifdef RTE_LIBRTE_KNI +#ifdef RTE_LIB_KNI #include "kni.h" #endif #include "link.h" @@ -160,7 +160,7 @@ pipeline_port_in_create(const char *pipeline_name, struct rte_port_ring_reader_params ring; struct rte_port_sched_reader_params sched; struct rte_port_fd_reader_params fd; -#ifdef RTE_LIBRTE_KNI +#ifdef RTE_LIB_KNI struct rte_port_kni_reader_params kni; #endif struct rte_port_source_params source; @@ -264,7 +264,7 @@ pipeline_port_in_create(const char *pipeline_name, break; } -#ifdef RTE_LIBRTE_KNI +#ifdef RTE_LIB_KNI case PORT_IN_KNI: { struct kni *kni; @@ -404,7 +404,7 @@ pipeline_port_out_create(const char *pipeline_name, struct rte_port_ring_writer_params ring; struct rte_port_sched_writer_params sched; struct rte_port_fd_writer_params fd; -#ifdef RTE_LIBRTE_KNI +#ifdef RTE_LIB_KNI struct rte_port_kni_writer_params kni; #endif struct rte_port_sink_params sink; @@ -415,7 +415,7 @@ pipeline_port_out_create(const char *pipeline_name, struct rte_port_ethdev_writer_nodrop_params ethdev; struct rte_port_ring_writer_nodrop_params ring; struct rte_port_fd_writer_nodrop_params fd; -#ifdef RTE_LIBRTE_KNI +#ifdef RTE_LIB_KNI struct rte_port_kni_writer_nodrop_params kni; #endif struct rte_port_sym_crypto_writer_nodrop_params sym_crypto; @@ -537,7 +537,7 @@ pipeline_port_out_create(const char *pipeline_name, break; } -#ifdef RTE_LIBRTE_KNI +#ifdef RTE_LIB_KNI case PORT_OUT_KNI: { struct kni *kni; diff --git a/examples/kni/meson.build b/examples/kni/meson.build index fd6ae4442..58639b139 100644 --- a/examples/kni/meson.build +++ b/examples/kni/meson.build @@ -7,7 +7,7 @@ # DPDK instance, use 'make' # this app can be built if-and-only-if KNI library is buildable -build = dpdk_conf.has('RTE_LIBRTE_KNI') +build = dpdk_conf.has('RTE_LIB_KNI') deps += ['kni', 'bus_pci'] sources = files( 'main.c' diff --git a/examples/l2fwd-crypto/main.c b/examples/l2fwd-crypto/main.c index 820470db5..8ea2677e5 100644 --- a/examples/l2fwd-crypto/main.c +++ b/examples/l2fwd-crypto/main.c @@ -43,7 +43,7 @@ #include #include #include -#ifdef RTE_LIBRTE_PMD_CRYPTO_SCHEDULER +#ifdef RTE_CRYPTO_SCHEDULER #include #endif @@ -2273,7 +2273,7 @@ initialize_cryptodevs(struct l2fwd_crypto_options *options, unsigned nb_ports, * (one for the header, one for the private data) */ if (!strcmp(dev_info.driver_name, "crypto_scheduler")) { -#ifdef RTE_LIBRTE_PMD_CRYPTO_SCHEDULER +#ifdef RTE_CRYPTO_SCHEDULER uint32_t nb_slaves = rte_cryptodev_scheduler_slaves_get(cdev_id, NULL); diff --git a/examples/l2fwd-crypto/meson.build b/examples/l2fwd-crypto/meson.build index 9002d62a6..1813f015b 100644 --- a/examples/l2fwd-crypto/meson.build +++ b/examples/l2fwd-crypto/meson.build @@ -7,7 +7,7 @@ # DPDK instance, use 'make' deps += 'cryptodev' -if dpdk_conf.has('RTE_LIBRTE_PMD_CRYPTO_SCHEDULER') +if dpdk_conf.has('RTE_CRYPTO_SCHEDULER') deps += 'crypto_scheduler' endif allow_experimental_apis = true diff --git a/examples/l3fwd-power/meson.build b/examples/l3fwd-power/meson.build index 4cd694710..eb8aef306 100644 --- a/examples/l3fwd-power/meson.build +++ b/examples/l3fwd-power/meson.build @@ -6,7 +6,7 @@ # To build this example as a standalone application with an already-installed # DPDK instance, use 'make' -if not dpdk_conf.has('RTE_LIBRTE_POWER') +if not dpdk_conf.has('RTE_LIB_POWER') build = false subdir_done() endif diff --git a/examples/ntb/meson.build b/examples/ntb/meson.build index bac6e5cd2..b0201f68b 100644 --- a/examples/ntb/meson.build +++ b/examples/ntb/meson.build @@ -15,6 +15,6 @@ cflags += ['-D_FILE_OFFSET_BITS=64'] sources = files( 'ntb_fwd.c' ) -if dpdk_conf.has('RTE_LIBRTE_PMD_NTB_RAWDEV') +if dpdk_conf.has('RTE_RAW_NTB') deps += 'raw_ntb' endif diff --git a/examples/vhost_crypto/meson.build b/examples/vhost_crypto/meson.build index 2485f3bd1..b2c125e2f 100644 --- a/examples/vhost_crypto/meson.build +++ b/examples/vhost_crypto/meson.build @@ -6,7 +6,7 @@ # To build this example as a standalone application with an already-installed # DPDK instance, use 'make' -build = dpdk_conf.has('RTE_LIBRTE_VHOST') +build = dpdk_conf.has('RTE_LIB_VHOST') allow_experimental_apis = true deps += ['vhost', 'cryptodev'] sources = files( diff --git a/examples/vm_power_manager/channel_monitor.c b/examples/vm_power_manager/channel_monitor.c index 1d00a6cf6..228f06803 100644 --- a/examples/vm_power_manager/channel_monitor.c +++ b/examples/vm_power_manager/channel_monitor.c @@ -28,7 +28,7 @@ #include #include #include -#ifdef RTE_LIBRTE_I40E_PMD +#ifdef RTE_NET_I40E #include #endif #include @@ -439,7 +439,7 @@ get_pfid(struct policy *pol) for (i = 0; i < pol->pkt.nb_mac_to_monitor; i++) { RTE_ETH_FOREACH_DEV(x) { -#ifdef RTE_LIBRTE_I40E_PMD +#ifdef RTE_NET_I40E ret = rte_pmd_i40e_query_vfid_by_mac(x, (struct rte_ether_addr *)&(pol->pkt.vfid[i])); #else @@ -538,13 +538,13 @@ get_pkt_diff(struct policy *pol) vsi_pkt_count_prev_total = 0; double rdtsc_curr, rdtsc_diff, diff; int x; -#ifdef RTE_LIBRTE_I40E_PMD +#ifdef RTE_NET_I40E struct rte_eth_stats vf_stats; #endif for (x = 0; x < pol->pkt.nb_mac_to_monitor; x++) { -#ifdef RTE_LIBRTE_I40E_PMD +#ifdef RTE_NET_I40E /*Read vsi stats*/ if (rte_pmd_i40e_get_vf_stats(x, pol->pfid[x], &vf_stats) == 0) vsi_pkt_count = vf_stats.ipackets; diff --git a/examples/vm_power_manager/guest_cli/meson.build b/examples/vm_power_manager/guest_cli/meson.build index 8c725420d..cd9526601 100644 --- a/examples/vm_power_manager/guest_cli/meson.build +++ b/examples/vm_power_manager/guest_cli/meson.build @@ -6,7 +6,7 @@ # To build this example as a standalone application with an already-installed # DPDK instance, use 'make' -if not dpdk_conf.has('RTE_LIBRTE_POWER') +if not dpdk_conf.has('RTE_LIB_POWER') build = false subdir_done() endif diff --git a/examples/vm_power_manager/main.c b/examples/vm_power_manager/main.c index 44d2508b1..17b38406f 100644 --- a/examples/vm_power_manager/main.c +++ b/examples/vm_power_manager/main.c @@ -31,13 +31,13 @@ #include "vm_power_cli.h" #include "oob_monitor.h" #include "parse.h" -#ifdef RTE_LIBRTE_IXGBE_PMD +#ifdef RTE_NET_IXGBE #include #endif -#ifdef RTE_LIBRTE_I40E_PMD +#ifdef RTE_NET_I40E #include #endif -#ifdef RTE_LIBRTE_BNXT_PMD +#ifdef RTE_NET_BNXT #include #endif @@ -397,16 +397,16 @@ main(int argc, char **argv) eth.addr_bytes[5] = w + 0xf0; ret = -ENOTSUP; -#ifdef RTE_LIBRTE_IXGBE_PMD +#ifdef RTE_NET_IXGBE ret = rte_pmd_ixgbe_set_vf_mac_addr(portid, w, ð); #endif -#ifdef RTE_LIBRTE_I40E_PMD +#ifdef RTE_NET_I40E if (ret == -ENOTSUP) ret = rte_pmd_i40e_set_vf_mac_addr( portid, w, ð); #endif -#ifdef RTE_LIBRTE_BNXT_PMD +#ifdef RTE_NET_BNXT if (ret == -ENOTSUP) ret = rte_pmd_bnxt_set_vf_mac_addr( portid, w, ð); diff --git a/examples/vm_power_manager/meson.build b/examples/vm_power_manager/meson.build index 2dd132015..1f813fbe8 100644 --- a/examples/vm_power_manager/meson.build +++ b/examples/vm_power_manager/meson.build @@ -6,22 +6,22 @@ # To build this example as a standalone application with an already-installed # DPDK instance, use 'make' -if not dpdk_conf.has('RTE_LIBRTE_POWER') +if not dpdk_conf.has('RTE_LIB_POWER') build = false subdir_done() endif deps += ['power'] -if dpdk_conf.has('RTE_LIBRTE_BNXT_PMD') +if dpdk_conf.has('RTE_NET_BNXT') deps += ['net_bnxt'] endif -if dpdk_conf.has('RTE_LIBRTE_I40E_PMD') +if dpdk_conf.has('RTE_NET_I40E') deps += ['net_i40e'] endif -if dpdk_conf.has('RTE_LIBRTE_IXGBE_PMD') +if dpdk_conf.has('RTE_NET_IXGBE') deps += ['net_ixgbe'] endif diff --git a/lib/librte_eal/linux/eal.c b/lib/librte_eal/linux/eal.c index 9cf0e2ec0..9b579b820 100644 --- a/lib/librte_eal/linux/eal.c +++ b/lib/librte_eal/linux/eal.c @@ -1085,7 +1085,7 @@ rte_eal_init(int argc, char **argv) */ iova_mode = RTE_IOVA_VA; RTE_LOG(DEBUG, EAL, "Physical addresses are unavailable, selecting IOVA as VA mode.\n"); -#if defined(RTE_LIBRTE_KNI) && LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) +#if defined(RTE_LIB_KNI) && LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) } else if (rte_eal_check_module("rte_kni") == 1) { iova_mode = RTE_IOVA_PA; RTE_LOG(DEBUG, EAL, "KNI is loaded, selecting IOVA as PA mode for better KNI performance.\n"); @@ -1102,7 +1102,7 @@ rte_eal_init(int argc, char **argv) RTE_LOG(DEBUG, EAL, "IOMMU is not available, selecting IOVA as PA mode.\n"); } } -#if defined(RTE_LIBRTE_KNI) && LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) +#if defined(RTE_LIB_KNI) && LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) /* Workaround for KNI which requires physical address to work * in kernels < 4.10 */ diff --git a/lib/librte_metrics/rte_metrics_telemetry.c b/lib/librte_metrics/rte_metrics_telemetry.c index 289ebae0b..b97152aeb 100644 --- a/lib/librte_metrics/rte_metrics_telemetry.c +++ b/lib/librte_metrics/rte_metrics_telemetry.c @@ -6,7 +6,7 @@ #include #include -#ifdef RTE_LIBRTE_TELEMETRY +#ifdef RTE_LIB_TELEMETRY #include #endif @@ -529,7 +529,7 @@ RTE_LOG_REGISTER(metrics_log_level, lib.metrics, ERR); RTE_INIT(metrics_ctor) { -#ifdef RTE_LIBRTE_TELEMETRY +#ifdef RTE_LIB_TELEMETRY rte_telemetry_legacy_register("ports_all_stat_values", DATA_NOT_REQ, handle_ports_all_stats_values); rte_telemetry_legacy_register("global_stat_values", DATA_NOT_REQ, diff --git a/lib/librte_metrics/rte_metrics_telemetry.h b/lib/librte_metrics/rte_metrics_telemetry.h index 6c2391c56..3435a5542 100644 --- a/lib/librte_metrics/rte_metrics_telemetry.h +++ b/lib/librte_metrics/rte_metrics_telemetry.h @@ -2,7 +2,7 @@ * Copyright(c) 2020 Intel Corporation */ -#ifdef RTE_LIBRTE_TELEMETRY +#ifdef RTE_LIB_TELEMETRY #include #else #define json_t void * diff --git a/lib/librte_port/meson.build b/lib/librte_port/meson.build index 9bbae28b7..609624c29 100644 --- a/lib/librte_port/meson.build +++ b/lib/librte_port/meson.build @@ -33,7 +33,7 @@ if dpdk_conf.has('RTE_PORT_PCAP') ext_deps += pcap_dep # dependency provided in config/meson.build endif -if dpdk_conf.has('RTE_LIBRTE_KNI') +if dpdk_conf.has('RTE_LIB_KNI') sources += files('rte_port_kni.c') headers += files('rte_port_kni.h') deps += 'kni' diff --git a/lib/meson.build b/lib/meson.build index 5f8177e1a..df4c1e334 100644 --- a/lib/meson.build +++ b/lib/meson.build @@ -73,7 +73,7 @@ foreach l:libraries ext_deps = [] deps = [] # eal is standard dependency once built - if dpdk_conf.has('RTE_LIBRTE_EAL') + if dpdk_conf.has('RTE_LIB_EAL') deps += ['eal'] endif