From: Bruce Richardson Date: Thu, 15 Oct 2020 15:05:54 +0000 (+0100) Subject: build: replace use of old build macros X-Git-Url: http://git.droids-corp.org/?a=commitdiff_plain;h=a8d0d473a0a89b3c50813e3e144e9a5377429f24;p=dpdk.git build: replace use of old build macros 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 Acked-by: Andrew Rybchenko Acked-by: Rosen Xu Signed-off-by: Thomas Monjalon --- diff --git a/MAINTAINERS b/MAINTAINERS index abe2d5fe93..a3d1927476 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -146,7 +146,7 @@ EAL API and common code F: lib/librte_eal/common/ F: lib/librte_eal/unix/ F: lib/librte_eal/include/ -F: lib/librte_eal/rte_eal_version.map +F: lib/librte_eal/version.map F: doc/guides/prog_guide/env_abstraction_layer.rst F: app/test/test_alarm.c F: app/test/test_atomic.c diff --git a/app/proc-info/main.c b/app/proc-info/main.c index b0de39489a..353b3921cb 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 8aca492935..6d50e03396 100644 --- a/app/test-bbdev/meson.build +++ b/app/test-bbdev/meson.build @@ -6,12 +6,12 @@ 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 -if dpdk_conf.has('RTE_LIBRTE_PMD_BBDEV_ACC100') +if dpdk_conf.has('RTE_BASEBAND_ACC100') deps += ['baseband_acc100'] endif diff --git a/app/test-bbdev/test_bbdev_perf.c b/app/test-bbdev/test_bbdev_perf.c index 6e5535d361..2322675c64 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") @@ -52,7 +52,7 @@ #define FLR_5G_TIMEOUT 610 #endif -#ifdef RTE_LIBRTE_PMD_BBDEV_ACC100 +#ifdef RTE_BASEBAND_ACC100 #include #define ACC100PF_DRIVER_NAME ("intel_acc100_pf") #define ACC100VF_DRIVER_NAME ("intel_acc100_vf") @@ -577,7 +577,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 rte_fpga_lte_fec_conf conf; @@ -621,7 +621,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 rte_fpga_5gnr_fec_conf conf; @@ -665,7 +665,7 @@ add_bbdev_dev(uint8_t dev_id, struct rte_bbdev_info *info, info->dev_name); } #endif -#ifdef RTE_LIBRTE_PMD_BBDEV_ACC100 +#ifdef RTE_BASEBAND_ACC100 if ((get_init_device() == true) && (!strcmp(info->drv.driver_name, ACC100PF_DRIVER_NAME))) { struct rte_acc100_conf conf; diff --git a/app/test-crypto-perf/cperf_ops.c b/app/test-crypto-perf/cperf_ops.c index 3a64a2c348..0d7baf214b 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 256fabb072..9664a4b343 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 8e086f88ec..03ed6f5942 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 69f0943d14..4e67d3aebd 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 12d9ea4f9f..f30f7d5c2c 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 53864ffdd5..b9325d34ce 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 @@ -156,7 +156,7 @@ cperf_initialize_cryptodev(struct cperf_options *opts, uint8_t *enabled_cdevs) if (sess_size > max_sess_size) max_sess_size = sess_size; } -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY for (cdev_id = 0; cdev_id < rte_cryptodev_count(); cdev_id++) { sess_size = rte_security_session_get_size( rte_cryptodev_get_sec_ctx(cdev_id)); @@ -177,7 +177,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 @@ -245,7 +245,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_workers_get(cdev_id, NULL); diff --git a/app/test-crypto-perf/meson.build b/app/test-crypto-perf/meson.build index e6ddda6f0c..558c648788 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 7f0d6d3f18..c7be5942fa 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 5ee4c9f796..66bc706358 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 07ee4e4e13..cb9ffd8dc1 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" @@ -624,7 +624,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" @@ -5579,7 +5579,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")) @@ -5647,7 +5647,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; @@ -5752,7 +5752,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")) @@ -5815,7 +5815,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; @@ -5898,7 +5898,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; @@ -6668,7 +6668,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 { @@ -8957,12 +8957,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); @@ -9036,12 +9036,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); @@ -9112,17 +9112,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); @@ -9649,7 +9649,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 @@ -10213,7 +10213,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 @@ -10221,7 +10221,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; @@ -10312,7 +10312,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 @@ -10320,7 +10320,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; @@ -10403,7 +10403,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 @@ -10411,7 +10411,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; @@ -10494,7 +10494,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 @@ -10502,7 +10502,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) @@ -10576,7 +10576,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 @@ -10584,7 +10584,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; @@ -11480,7 +11480,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; @@ -13838,17 +13838,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); @@ -13944,17 +13944,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); @@ -14050,17 +14050,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); @@ -14154,17 +14154,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); @@ -14250,19 +14250,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 @@ -14349,11 +14349,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 @@ -14445,7 +14445,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 @@ -14537,17 +14537,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); @@ -14664,7 +14664,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 } @@ -14761,7 +14761,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 } @@ -14847,7 +14847,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) : @@ -14966,7 +14966,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) : @@ -15063,7 +15063,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 @@ -15153,7 +15153,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 @@ -15243,7 +15243,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 @@ -15337,7 +15337,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 @@ -15458,7 +15458,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 @@ -15558,7 +15558,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 @@ -15624,7 +15624,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 @@ -15673,7 +15673,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 @@ -16727,7 +16727,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 @@ -16811,7 +16811,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, @@ -16879,7 +16879,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, @@ -16934,7 +16934,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; @@ -16955,7 +16955,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); @@ -17170,7 +17170,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; @@ -17180,7 +17180,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) { @@ -17248,7 +17248,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; @@ -17260,7 +17260,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")) @@ -17371,7 +17371,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; @@ -17383,7 +17383,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")) @@ -17499,13 +17499,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, @@ -17604,12 +17604,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); @@ -17696,7 +17696,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 @@ -17770,7 +17770,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; @@ -17779,7 +17779,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 @@ -17797,7 +17797,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; @@ -17886,7 +17886,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; @@ -17896,7 +17896,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; @@ -17984,7 +17984,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; @@ -17994,7 +17994,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, @@ -18015,7 +18015,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", @@ -18093,7 +18093,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, @@ -18175,7 +18175,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 @@ -18252,13 +18252,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, @@ -19953,7 +19953,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, @@ -20200,7 +20200,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 ba17f3b0c2..c76a909c5f 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 @@ -4761,14 +4761,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) @@ -4921,7 +4921,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) @@ -4976,12 +4976,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 @@ -5277,7 +5277,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 2e8b9f8a99..7e9c7bdd69 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 5ae0cb6fd2..9d39c1c7e7 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= | --geneve-parsed-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 @@ -114,7 +114,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 " @@ -131,7 +131,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 @@ -231,7 +231,7 @@ usage(char* progname) " 0x01 - hairpin ports loop, 0x00 - hairpin port self\n"); } -#ifdef RTE_LIBRTE_CMDLINE +#ifdef RTE_LIB_CMDLINE static int init_peer_eth_addrs(char *config_filename) { @@ -594,7 +594,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 }, @@ -623,10 +623,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 }, @@ -703,7 +703,7 @@ launch_args_parse(int argc, char** argv) argvopt = argv; -#ifdef RTE_LIBRTE_CMDLINE +#ifdef RTE_LIB_CMDLINE #define SHORTOPTS "i" #else #define SHORTOPTS "" @@ -711,7 +711,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; @@ -727,7 +727,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; @@ -1004,7 +1004,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); @@ -1017,7 +1017,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 94e36886b6..a0ddaea673 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 @@ -419,13 +419,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 @@ -503,7 +503,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; @@ -2081,7 +2081,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; @@ -2096,7 +2096,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(); @@ -2109,7 +2109,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(); @@ -3527,7 +3527,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 @@ -3796,11 +3796,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 @@ -3842,7 +3842,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 @@ -3865,10 +3865,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 @@ -3947,7 +3947,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) @@ -3959,7 +3959,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) @@ -3969,7 +3969,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 833ca149cd..e016931376 100644 --- a/app/test-pmd/testpmd.h +++ b/app/test-pmd/testpmd.h @@ -444,12 +444,12 @@ extern uint16_t stats_period; extern uint16_t hairpin_mode; -#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 c5ce1d2c08..02d2e72360 100644 --- a/app/test/meson.build +++ b/app/test/meson.build @@ -338,32 +338,32 @@ 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'] - if dpdk_conf.has('RTE_LIBRTE_RING_PMD') + if dpdk_conf.has('RTE_NET_RING') test_sources += 'test_link_bonding_mode4.c' 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 c3b3780337..27f1b1c0e6 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 94d26ab1f6..afabfe42fc 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 3afc1d809d..6c5305c9f0 100644 --- a/app/test/test_cryptodev.c +++ b/app/test/test_cryptodev.c @@ -19,7 +19,7 @@ #include #include -#ifdef RTE_LIBRTE_PMD_CRYPTO_SCHEDULER +#ifdef RTE_CRYPTO_SCHEDULER #include #include #endif @@ -41,7 +41,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_sdap_test_vectors.h" #include "test_cryptodev_security_pdcp_test_func.h" @@ -89,17 +89,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; @@ -704,7 +704,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="}; @@ -751,7 +751,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) { @@ -782,7 +782,7 @@ testsuite_setup(void) unsigned int session_size = rte_cryptodev_sym_get_private_session_size(dev_id); -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY unsigned int security_session_size = rte_security_session_get_size( rte_cryptodev_get_sec_ctx(dev_id)); @@ -930,7 +930,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 @@ -7632,7 +7632,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) @@ -12737,7 +12737,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 worker IDs for the scheduler test */ uint8_t aesni_ids[2]; @@ -12957,7 +12957,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", @@ -13587,7 +13587,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, @@ -13880,7 +13880,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 d11d7cee7e..e261dfe36c 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 b019656b29..fc7d1a2f02 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 f5ddd03d76..2a0c134a99 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 931e8cb67e..9acdae15ba 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 3a655c3400..e1a7b4ae45 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 0c597c33f1..da1d67c0ab 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 d203810da9..731c6b4dc8 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 785cd048df..cc66b7a8a0 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 bc8d8a2e10..95034148cb 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 43b8855874..209bdbff2c 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 d05866240f..fb94dbb94d 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 7570e99639..530633a013 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 344457e8a3..b49203fa85 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/devtools/check-symbol-maps.sh b/devtools/check-symbol-maps.sh index dae92f77a4..0e097eed89 100755 --- a/devtools/check-symbol-maps.sh +++ b/devtools/check-symbol-maps.sh @@ -38,7 +38,7 @@ fi find_orphan_windows_symbols () { for def in $(find lib drivers -name '*_exports.def') ; do - map=${def/_exports.def}_version.map + map=$(dirname $def)/version.map for sym in $(grep -v ^EXPORTS $def); do grep -q $sym $map || echo $sym done diff --git a/devtools/update-abi.sh b/devtools/update-abi.sh index b9b859a3e9..45437f3c3b 100755 --- a/devtools/update-abi.sh +++ b/devtools/update-abi.sh @@ -41,6 +41,6 @@ echo "Path to update:" $update_path echo $abi_version > $abi_version_file -find $update_path -name \*version.map -exec \ +find $update_path -name version.map -exec \ devtools/update_version_map_abi.py {} \ $abi_version \; -print diff --git a/devtools/update_version_map_abi.py b/devtools/update_version_map_abi.py index 3536a54b44..d3068bbd2d 100755 --- a/devtools/update_version_map_abi.py +++ b/devtools/update_version_map_abi.py @@ -164,7 +164,7 @@ def __main(): arg_parser.add_argument("map_file", type=str, help='path to linker version script file ' - '(pattern: *version.map)') + '(pattern: version.map)') arg_parser.add_argument("abi_version", type=str, help='target ABI version (pattern: MAJOR.MINOR)') diff --git a/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c b/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c index b0055b1644..1a9dd18b99 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 1c07f2233e..0444b50a1e 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 ed27120604..252b4b24e3 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 7481e1d5e9..11e7bf5d18 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 f8e8750e4f..afcd6bd063 100644 --- a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c +++ b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c @@ -59,7 +59,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, @@ -1356,7 +1356,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); @@ -1384,7 +1384,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); @@ -1408,7 +1408,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; @@ -1523,7 +1523,7 @@ skip_tx: 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) { @@ -1562,7 +1562,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 @@ -1595,7 +1595,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; @@ -2597,7 +2597,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, @@ -3803,7 +3803,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) { @@ -3841,7 +3841,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; @@ -3880,7 +3880,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 310ef6a5b8..26f3d79db4 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 }; @@ -697,7 +697,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 f69cb57194..55f457ac9a 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 @@ -230,7 +230,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) { @@ -434,7 +434,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; @@ -1565,7 +1565,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) { @@ -1740,7 +1740,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( @@ -1787,7 +1787,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); @@ -1821,7 +1821,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); @@ -1878,7 +1878,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. */ @@ -2493,7 +2493,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, @@ -3299,7 +3299,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) { @@ -3338,7 +3338,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; @@ -3375,7 +3375,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 ddba529824..368699678b 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 @@ -126,7 +126,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 { @@ -169,7 +169,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 }; @@ -569,7 +569,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 e3f98a76ba..4b7676deb8 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 7254f5e3c5..b58be12822 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 4ee798992d..f7cab2f471 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 6b189c3191..6da9512fe4 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, @@ -265,7 +265,7 @@ static struct rte_cryptodev_ops crypto_qat_ops = { .sym_configure_raw_dp_ctx = qat_sym_configure_dp_ctx, }; -#ifdef RTE_LIBRTE_SECURITY +#ifdef RTE_LIB_SECURITY static const struct rte_security_capability * qat_security_cap_get(void *device __rte_unused) { @@ -390,7 +390,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), @@ -467,7 +467,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 @@ -492,7 +492,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 f32a77e608..e0992cbe27 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 ed4d001592..23d059bf84 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 9f1033baf6..011e5bb7ab 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 14a254ab74..00101c2eec 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 @@ -1152,7 +1152,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; @@ -3054,7 +3054,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 9bdef87fbd..33905f7136 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 b2a2bfc02f..6b3dea46ee 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 ce589b97a8..d1d3baff90 100644 --- a/drivers/net/ixgbe/ixgbe_rxtx.c +++ b/drivers/net/ixgbe/ixgbe_rxtx.c @@ -453,7 +453,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; @@ -646,7 +646,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 @@ -676,7 +676,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 @@ -690,7 +690,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 *) @@ -877,7 +877,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 @@ -1461,7 +1461,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) @@ -2401,7 +2401,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) { @@ -2498,7 +2498,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)) { @@ -2558,7 +2558,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 @@ -2726,7 +2726,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 @@ -3009,7 +3009,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 @@ -4839,7 +4839,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 @@ -5351,7 +5351,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 0b5589ef4d..6d2f7c9da3 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 e77a7f31ce..586a261808 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 0539b4768a..d9fa898d1a 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 e7f4493028..f3f52f7327 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 d7930862a7..963b30f209 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 e7656a3cda..06c0fe756d 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 b9b08153ac..3eeab0d1c1 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 416cef01cb..18e6a11aac 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 b179987f98..9d256af4b9 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 9fec7f883f..5244cd4ffc 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 86e3de078c..4132516307 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" @@ -396,7 +396,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 fdfdd1971e..cc8edac3df 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 f1a045a0a6..6afbaa6803 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 4519685932..a2d3331cb0 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 c3856456d6..118f48df73 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 b627310a0c..7ebabcae98 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 fd6ae4442a..58639b1392 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 7d3586e773..2b864918b8 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_workers = rte_cryptodev_scheduler_workers_get(cdev_id, NULL); diff --git a/examples/l2fwd-crypto/meson.build b/examples/l2fwd-crypto/meson.build index 9002d62a6c..1813f015b2 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 4cd694710d..eb8aef306a 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 bac6e5cd23..b0201f68b1 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 2485f3bd10..b2c125e2fa 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 1d00a6cf6c..228f06803d 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 8c725420d7..cd95266018 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 44d2508b10..17b38406fc 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 2dd132015f..1f813fbe87 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 9cf0e2ec01..9b579b8200 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 289ebae0bd..b97152aeb0 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 6c2391c563..3435a55425 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 9bbae28b75..609624c290 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 094454ea51..dd55b5cb53 100644 --- a/lib/meson.build +++ b/lib/meson.build @@ -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