rework feature enabling macros for compatibility
Subsystems (10)
PATCH v5 8/8 build: replace use of old build macros
In reply to Bruce RichardsonUse 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.
--- 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(-)
app/proc-info/main.c +2 -2
@@ -30,7 +30,7 @@#include <rte_string_fns.h> #include <rte_metrics.h> #include <rte_cycles.h> -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY #include <rte_security.h> #endif #include <rte_cryptodev.h>
@@ -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);
app/test-bbdev/meson.build +2 -2
@@ -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
app/test-bbdev/test_bbdev_perf.c +4 -4
@@ -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 <fpga_lte_fec.h> #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 <rte_pmd_fpga_5gnr_fec.h> #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;
app/test-crypto-perf/cperf_ops.c +3 -3
@@ -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 ;
app/test-crypto-perf/cperf_options.h +3 -3
@@ -7,7 +7,7 @@#include <rte_crypto.h> #include <rte_cryptodev.h> -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY #include <rte_security.h> #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;
app/test-crypto-perf/cperf_options_parsing.c +8 -8
@@ -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 <control/user>\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" );
app/test-crypto-perf/cperf_test_pmd_cyclecount.c +1 -1
@@ -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 =
app/test-crypto-perf/cperf_test_throughput.c +1 -1
@@ -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 =
app/test-crypto-perf/main.c +3 -3
@@ -9,7 +9,7 @@#include <rte_random.h> #include <rte_eal.h> #include <rte_cryptodev.h> -#ifdef RTE_LIBRTE_PMD_CRYPTO_SCHEDULER +#ifdef RTE_CRYPTO_SCHEDULER #include <rte_cryptodev_scheduler.h> #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 );
app/test-crypto-perf/meson.build +1 -1
@@ -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
app/test-pipeline/main.c +1 -1
@@ -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 ();
app/test-pmd/bpf_cmd.h +2 -2
@@ -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_ */
app/test-pmd/cmdline.c +95 -95
701 lines not on this page · raw message
app/test-pmd/config.c +9 -9
@@ -39,13 +39,13 @@#include <rte_cycles.h> #include <rte_flow.h> #include <rte_errno.h> -#ifdef RTE_LIBRTE_IXGBE_PMD +#ifdef RTE_NET_IXGBE #include <rte_pmd_ixgbe.h> #endif -#ifdef RTE_LIBRTE_I40E_PMD +#ifdef RTE_NET_I40E #include <rte_pmd_i40e.h> #endif -#ifdef RTE_LIBRTE_BNXT_PMD +#ifdef RTE_NET_BNXT #include <rte_pmd_bnxt.h> #endif #include <rte_gro.h>
@@ -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;
app/test-pmd/meson.build +11 -11
@@ -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
app/test-pmd/parameters.c +15 -15
@@ -39,7 +39,7 @@#include <rte_ether.h> #include <rte_ethdev.h> #include <rte_string_fns.h> -#ifdef RTE_LIBRTE_PMD_BOND +#ifdef RTE_NET_BOND #include <rte_eth_bond.h> #endif #include <rte_flow.h>
@@ -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 ) {
app/test-pmd/testpmd.c +19 -19
@@ -46,18 +46,18 @@#include <rte_ethdev.h> #include <rte_dev.h> #include <rte_string_fns.h> -#ifdef RTE_LIBRTE_IXGBE_PMD +#ifdef RTE_NET_IXGBE #include <rte_pmd_ixgbe.h> #endif -#ifdef RTE_LIBRTE_PDUMP +#ifdef RTE_LIB_PDUMP #include <rte_pdump.h> #endif #include <rte_flow.h> #include <rte_metrics.h> -#ifdef RTE_LIBRTE_BITRATESTATS +#ifdef RTE_LIB_BITRATESTATS #include <rte_bitrate.h> #endif -#ifdef RTE_LIBRTE_LATENCY_STATS +#ifdef RTE_LIB_LATENCYSTATS #include <rte_latencystats.h> #endif
@@ -404,13 +404,13 @@ int do_mlockall = 0;* NIC bypass mode configuration options. */ -#if definedRTE_LIBRTE_IXGBE_PMD && definedRTE_LIBRTE_IXGBE_BYPASS +#if definedRTE_NET_IXGBE && definedRTE_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 definedRTE_LIBRTE_IXGBE_PMD && definedRTE_LIBRTE_IXGBE_BYPASS +#if definedRTE_NET_IXGBE && definedRTE_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);
app/test-pmd/testpmd.h +2 -2
@@ -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
app/test/meson.build +11 -11
@@ -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
app/test/process.h +8 -8
@@ -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 <pthread.h> 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);
app/test/test.c +10 -10
@@ -12,7 +12,7 @@#include <ctype.h> #include <sys/queue.h> -#ifdef RTE_LIBRTE_CMDLINE +#ifdef RTE_LIB_CMDLINE #include <cmdline_rdline.h> #include <cmdline_parse.h> #include <cmdline_socket.h>
@@ -25,12 +25,12 @@ extern cmdline_parse_ctx_t main_ctx[];#include <rte_cycles.h> #include <rte_log.h> #include <rte_string_fns.h> -#ifdef RTE_LIBRTE_TIMER +#ifdef RTE_LIB_TIMER #include <rte_timer.h> #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_TIMERrte_timer_subsystem_finalize ();#endif rte_eal_cleanup ();
app/test/test_cryptodev.c +13 -13
@@ -18,7 +18,7 @@#include <rte_cryptodev_pmd.h> #include <rte_string_fns.h> -#ifdef RTE_LIBRTE_PMD_CRYPTO_SCHEDULER +#ifdef RTE_CRYPTO_SCHEDULER #include <rte_cryptodev_scheduler.h> #include <rte_cryptodev_scheduler_operations.h> #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*/ )
app/test/test_cryptodev_hash_test_vectors.h +1 -1
@@ -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 <intel-ipsec-mb.h> #endif
app/test/test_eal_flags.c +2 -2
@@ -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" );
app/test/test_func_reentrancy.c +12 -12
@@ -27,15 +27,15 @@#include <rte_spinlock.h> #include <rte_malloc.h> -#ifdef RTE_LIBRTE_HASH +#ifdef RTE_LIB_HASH #include <rte_hash.h> #include <rte_fbk_hash.h> #include <rte_jhash.h> -#endif /* RTE_LIBRTE_HASH */ +#endif /* RTE_LIB_HASH */ -#ifdef RTE_LIBRTE_LPM +#ifdef RTE_LIB_LPM #include <rte_lpm.h> -#endif /* RTE_LIBRTE_LPM */ +#endif /* RTE_LIB_LPM */ #include <rte_string_fns.h>
@@ -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 */ };/**
app/test/test_kni.c +1 -1
@@ -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 )
app/test/test_mp_secondary.c +6 -6
@@ -34,14 +34,14 @@#include <rte_log.h> #include <rte_mempool.h> -#ifdef RTE_LIBRTE_HASH +#ifdef RTE_LIB_HASH #include <rte_hash.h> #include <rte_fbk_hash.h> -#endif /* RTE_LIBRTE_HASH */ +#endif /* RTE_LIB_HASH */ -#ifdef RTE_LIBRTE_LPM +#ifdef RTE_LIB_LPM #include <rte_lpm.h> -#endif /* RTE_LIBRTE_LPM */ +#endif /* RTE_LIB_LPM */ #include <rte_string_fns.h>
@@ -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;
app/test/test_power.c +1 -1
@@ -11,7 +11,7 @@#include "test.h" -#ifndef RTE_LIBRTE_POWER +#ifndef RTE_LIB_POWER static int test_power (void )
app/test/test_power_cpufreq.c +1 -1
@@ -11,7 +11,7 @@#include "test.h" -#ifndef RTE_LIBRTE_POWER +#ifndef RTE_LIB_POWER static int test_power_cpufreq (void )
app/test/test_power_kvm_vm.c +1 -1
@@ -10,7 +10,7 @@#include "test.h" -#ifndef RTE_LIBRTE_POWER +#ifndef RTE_LIB_POWER static int test_power_kvm_vm (void )
app/test/test_table.c +1 -1
@@ -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 ;
app/test/test_table.h +1 -1
@@ -10,7 +10,7 @@#include <rte_table_array.h> #include <rte_pipeline.h> -#ifdef RTE_LIBRTE_ACL +#ifdef RTE_LIB_ACL #include <rte_table_acl.h> #endif
app/test/test_table_combined.h +1 -1
@@ -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 );
app/test/test_table_tables.h +1 -1
@@ -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 );
config/arm/meson.build +3 -3
@@ -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],
drivers/bus/fslmc/portal/dpaa2_hw_dpio.c +3 -3
@@ -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);
drivers/compress/qat/qat_comp.h +1 -1
@@ -5,7 +5,7 @@#ifndef _QAT_COMP_H_#define _QAT_COMP_H_ -#ifdef RTE_LIBRTE_COMPRESSDEV +#ifdef RTE_LIB_COMPRESSDEV #include <rte_compressdev.h> #include <rte_compressdev_pmd.h>
drivers/compress/qat/qat_comp_pmd.h +1 -1
@@ -5,7 +5,7 @@#ifndef _QAT_COMP_PMD_H_#define _QAT_COMP_PMD_H_ -#ifdef RTE_LIBRTE_COMPRESSDEV +#ifdef RTE_LIB_COMPRESSDEV #include <rte_compressdev.h> #include <rte_compressdev_pmd.h>
drivers/crypto/aesni_mb/aesni_mb_pmd_private.h +1 -1
@@ -7,7 +7,7 @@#include <intel-ipsec-mb.h> -#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 <rte_security.h> #include <rte_security_driver.h>
drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c +11 -11
@@ -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 );
drivers/crypto/dpaa2_sec/dpaa2_sec_priv.h +4 -4
@@ -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 <rte_security_driver.h> #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) */
drivers/crypto/dpaa_sec/dpaa_sec.c +12 -12
@@ -15,7 +15,7 @@#include <rte_cryptodev_pmd.h> #include <rte_crypto.h> #include <rte_cryptodev.h> -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY #include <rte_security_driver.h> #endif #include <rte_cycles.h>
@@ -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 );
drivers/crypto/dpaa_sec/dpaa_sec.h +4 -4
@@ -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,
drivers/crypto/qat/qat_sym.c +1 -1
@@ -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);
drivers/crypto/qat/qat_sym.h +4 -4
@@ -6,7 +6,7 @@#define _QAT_SYM_H_#include <rte_cryptodev_pmd.h> -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY #include <rte_net_crc.h> #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
drivers/crypto/qat/qat_sym_capabilities.h +1 -1
@@ -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, \
drivers/crypto/qat/qat_sym_pmd.c +6 -6
@@ -8,7 +8,7 @@#include <rte_malloc.h> #include <rte_pci.h> #include <rte_cryptodev_pmd.h> -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY #include <rte_security_driver.h> #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
drivers/crypto/qat/qat_sym_pmd.h +1 -1
@@ -9,7 +9,7 @@#include <rte_ether.h> #include <rte_cryptodev.h> -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY #include <rte_security.h> #endif
drivers/crypto/qat/qat_sym_session.c +2 -2
@@ -14,7 +14,7 @@#include <rte_log.h> #include <rte_malloc.h> #include <rte_crypto_sym.h> -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY #include <rte_security.h> #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) {
drivers/crypto/qat/qat_sym_session.h +2 -2
@@ -6,7 +6,7 @@#include <rte_crypto.h> #include <rte_cryptodev_pmd.h> -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY #include <rte_security.h> #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);
drivers/net/ixgbe/ixgbe_ethdev.c +3 -3
@@ -33,7 +33,7 @@#include <rte_random.h> #include <rte_dev.h> #include <rte_hash_crc.h> -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY #include <rte_security_driver.h> #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
drivers/net/ixgbe/ixgbe_ethdev.h +2 -2
@@ -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 <rte_flow.h>
@@ -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;
drivers/net/ixgbe/ixgbe_flow.c +3 -3
@@ -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;
drivers/net/ixgbe/ixgbe_rxtx.c +13 -13
@@ -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 &
drivers/net/ixgbe/ixgbe_rxtx.h +3 -3
@@ -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
drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c +3 -3
@@ -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
drivers/net/kni/meson.build +1 -1
@@ -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'
drivers/net/netvsc/meson.build +1 -1
@@ -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')
drivers/net/vhost/meson.build +1 -1
@@ -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')
drivers/raw/dpaa2_cmdif/meson.build +1 -1
@@ -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')
drivers/raw/dpaa2_qdma/meson.build +1 -1
@@ -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')
drivers/raw/ifpga/base/opae_osdep.h +1 -1
@@ -8,7 +8,7 @@#include <string.h> #include <stdbool.h> -#ifdef RTE_LIBRTE_EAL +#ifdef RTE_LIB_EAL #include "osdep_rte/osdep_generic.h" #else #include "osdep_raw/osdep_generic.h"
drivers/vdpa/ifc/meson.build +1 -1
@@ -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')
examples/distributor/meson.build +1 -1
@@ -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']
examples/ethtool/lib/rte_ethtool.c +2 -2
@@ -9,7 +9,7 @@#include <rte_ethdev.h> #include <rte_ether.h> #include <rte_bus_pci.h> -#ifdef RTE_LIBRTE_IXGBE_PMD +#ifdef RTE_NET_IXGBE #include <rte_pmd_ixgbe.h> #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
examples/ethtool/meson.build +1 -1
@@ -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
examples/ioat/meson.build +1 -1
@@ -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']
examples/ip_pipeline/kni.c +2 -2
@@ -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,
examples/ip_pipeline/kni.h +2 -2
@@ -8,7 +8,7 @@#include <stdint.h> #include <sys/queue.h> -#ifdef RTE_LIBRTE_KNI +#ifdef RTE_LIB_KNI #include <rte_kni.h> #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 };
examples/ip_pipeline/pipeline.c +7 -7
@@ -11,7 +11,7 @@#include <rte_string_fns.h> #include <rte_port_ethdev.h> -#ifdef RTE_LIBRTE_KNI +#ifdef RTE_LIB_KNI #include <rte_port_kni.h> #endif #include <rte_port_ring.h>
@@ -28,7 +28,7 @@#include <rte_table_lpm_ipv6.h> #include <rte_table_stub.h> -#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;
examples/kni/meson.build +1 -1
@@ -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'
examples/l2fwd-crypto/main.c +2 -2
@@ -43,7 +43,7 @@#include <rte_prefetch.h> #include <rte_random.h> #include <rte_hexdump.h> -#ifdef RTE_LIBRTE_PMD_CRYPTO_SCHEDULER +#ifdef RTE_CRYPTO_SCHEDULER #include <rte_cryptodev_scheduler.h> #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 );
examples/l2fwd-crypto/meson.build +1 -1
@@ -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
examples/l3fwd-power/meson.build +1 -1
@@ -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
examples/ntb/meson.build +1 -1
@@ -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
examples/vhost_crypto/meson.build +1 -1
@@ -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(
examples/vm_power_manager/channel_monitor.c +4 -4
@@ -28,7 +28,7 @@#include <rte_atomic.h> #include <rte_cycles.h> #include <rte_ethdev.h> -#ifdef RTE_LIBRTE_I40E_PMD +#ifdef RTE_NET_I40E #include <rte_pmd_i40e.h> #endif #include <rte_power.h>
@@ -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;
examples/vm_power_manager/guest_cli/meson.build +1 -1
@@ -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
examples/vm_power_manager/main.c +6 -6
@@ -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 <rte_pmd_ixgbe.h> #endif -#ifdef RTE_LIBRTE_I40E_PMD +#ifdef RTE_NET_I40E #include <rte_pmd_i40e.h> #endif -#ifdef RTE_LIBRTE_BNXT_PMD +#ifdef RTE_NET_BNXT #include <rte_pmd_bnxt.h> #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, ð);
examples/vm_power_manager/meson.build +4 -4
@@ -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
lib/librte_eal/linux/eal.c +2 -2
@@ -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 */
lib/librte_metrics/rte_metrics_telemetry.c +2 -2
@@ -6,7 +6,7 @@#include <rte_ethdev.h> #include <rte_string_fns.h> -#ifdef RTE_LIBRTE_TELEMETRY +#ifdef RTE_LIB_TELEMETRY #include <rte_telemetry_legacy.h> #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,
lib/librte_metrics/rte_metrics_telemetry.h +1 -1
@@ -2,7 +2,7 @@* Copyright(c) 2020 Intel Corporation */ -#ifdef RTE_LIBRTE_TELEMETRY +#ifdef RTE_LIB_TELEMETRY #include <jansson.h> #else #define json_t void *
lib/librte_port/meson.build +1 -1
@@ -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'
lib/meson.build +1 -1
@@ -74,7 +74,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
Signature · 1 line
2.25.1
Re: [dpdk-dev] [PATCH v5 8/8] build: replace use of old build macros
Quoted 5 lines · Bruce Richardson
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 <[email protected]>Acked-by Luca Boccassi <[email protected]>
Many thanks for working on it.
Re: [dpdk-dev] [PATCH v5 8/8] build: replace use of old build macros
In reply to Bruce RichardsonQuoted 5 lines · Bruce Richardson
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 <[email protected]>Acked-by Luca Boccassi <[email protected]>
Re: [dpdk-dev] [PATCH v5 8/8] build: replace use of old build macros
In reply to Bruce Richardson15/10/2020 17:05, Bruce Richardson:
Quoted 7 lines
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 <[email protected]>Acked-by Luca Boccassi <[email protected]>---
85 files changed, 389 insertions(+), 389 deletions(-)
The rebase of this patch after pull of crypto tree is quite difficult.
I hope everything is OK.
912 occurences of options starting with RTE_LIBRTE_ are remaining. For consistency, we should rename them in -rc2.
Thomas Monjalon
AppliedRe: [dpdk-dev] [PATCH v5 0/8] Rework build macros
In reply to Bruce Richardson15/10/2020 17:05, Bruce Richardson:
Quoted 18 lines
Following on from discussion in RFC v1 and v2 of this set, this version reworks the automated macros defined by meson to indicate if a particular library or driver is enabled in the build. However, while it does so, it also maintains compatibility with previous releases to ease the transition for any apps using the older macros, which already has to contend with a change in DPDK build-system and to switch over to picking up the library names from pkg-config.
Advantages of this rework:
* Much cleaner having standard macros
* No need for defining the format of macros for each class
* Shorter macros (for the most part)Disadvantages:
* Potentially requires application changes
* Inconsistency between the auto-defined macros and the other feature-set ones.
Quoted 9 lines
Bruce Richardson (8):
app: fix missing dependencies examples/l2fwd-crypto: fix missing dependency
build: add defines for compatibility with make build
qat: build from common folder
build: remove library name from version map filename devtools/test-null: load all drivers from directory
build: standardize component names and defines
build: replace use of old build macros
Applied, thanks
Re: [dpdk-dev] [PATCH v5 0/8] Rework build macros
Quoted 30 lines · Thomas Monjalon
15/10/2020 17:05, Bruce Richardson:
Quoted 18 lines
Following on from discussion in RFC v1 and v2 of this set, this version reworks the automated macros defined by meson to indicate if a particular library or driver is enabled in the build. However, while it does so, it also maintains compatibility with previous releases to ease the transition for any apps using the older macros, which already has to contend with a change in DPDK build-system and to switch over to picking up the library names from pkg-config.
Advantages of this rework:
* Much cleaner having standard macros
* No need for defining the format of macros for each class
* Shorter macros (for the most part)Disadvantages:
* Potentially requires application changes
* Inconsistency between the auto-defined macros and the other feature-set ones.Quoted 9 lines
Bruce Richardson (8):
app: fix missing dependencies examples/l2fwd-crypto: fix missing dependency
build: add defines for compatibility with make build
qat: build from common folder
build: remove library name from version map filename devtools/test-null: load all drivers from directory
build: standardize component names and defines
build: replace use of old build macros
Quoted 1 line
Applied, thanks
kni compilation is broken, can you have a look?
http://mails.dpdk.org/archives/test-report/2020-October/160621.html
Thanks.
Signature · 1 line
David Marchand
Re: [dpdk-dev] [PATCH v5 0/8] Rework build macros
Quoted 31 lines · David Marchand
Quoted 30 lines · Thomas Monjalon
15/10/2020 17:05, Bruce Richardson:
Quoted 27 lines
Following on from discussion in RFC v1 and v2 of this set, this version reworks the automated macros defined by meson to indicate if a particular library or driver is enabled in the build. However, while it does so, it also maintains compatibility with previous releases to ease the transition for any apps using the older macros, which already has to contend with a change in DPDK build-system and to switch over to picking up the library names from pkg-config.
Advantages of this rework:
* Much cleaner having standard macros
* No need for defining the format of macros for each class
* Shorter macros (for the most part)Disadvantages:
* Potentially requires application changes
* Inconsistency between the auto-defined macros and the other feature-set ones.Bruce Richardson (8):
app: fix missing dependencies examples/l2fwd-crypto: fix missing dependency
build: add defines for compatibility with make build
qat: build from common folder
build: remove library name from version map filename devtools/test-null: load all drivers from directory
build: standardize component names and defines
build: replace use of old build macros
Quoted 7 lines
Quoted 1 line
Applied, thanks
kni compilation is broken, can you have a look?
http://mails.dpdk.org/archives/test-report/2020-October/160621.htmlThanks.
Yes, will do so.
/Bruce