config: change ABI versioning for global
Subsystems (9)
PATCH v8 5/12 buildtools: add ABI update shell script
In reply to Anatoly BurakovIn order to facilitate mass updating of version files, add a shell script that recurses into lib/ and drivers/ directories and calls the ABI version update script.
---
Notes:
v3:
- Switch to sh rather than bash, and remove bash-isms
- Address review comments
v2:
- Add this patch to split the shell script from previous commit
- Fixup miscellaneous bugs
buildtools/update-abi.sh | 46 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100755 buildtools/update-abi.sh
buildtools/update-abi.sh new file +46 -0
@@ -0,0 +1,46 @@ +#!/bin/sh -e +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2019 Intel Corporation + +abi_version=$1 +abi_version_file="./ABI_VERSION" +update_path="lib drivers" + +# check ABI version format string +check_abi_version() { + echo $1 | grep -q -e "^[[:digit:]]\{1,2\}\.[[:digit:]]\{1,2\}$" +} + +if [ -z "$1" ]; then + # output to stderr + >&2 echo "Please provide ABI version" + exit 1 +fi + +# check version string format +if ! check_abi_version $abi_version ; then + # output to stderr + >&2 echo "ABI version must be formatted as MAJOR.MINOR version" + exit 1 +fi + +if [ -n "$2" ]; then + abi_version_file=$2 +fi + +if [ -n "$3" ]; then + # drop $1 and $2 + shift 2 + # assign all other arguments as update paths + update_path=$@ +fi + +echo "New ABI version:" $abi_version +echo "ABI_VERSION path:" $abi_version_file +echo "Path to update:" $update_path + +echo $abi_version > $abi_version_file + +find $update_path -name \*version.map -exec \ + ./buildtools/update_version_map_abi.py {} \ + $abi_version \; -print
Signature · 1 line
2.17.1
PATCH v8 6/12 timer: remove deprecated code
In reply to Anatoly BurakovFrom: Marcin Baran <[email protected]>
Remove code for old ABI versions ahead of ABI version bump.
--- lib/librte_timer/rte_timer.c | 100 +++---------------------- lib/librte_timer/rte_timer.h | 15 ---- lib/librte_timer/rte_timer_version.map | 5 -- 3 files changed, 10 insertions(+), 110 deletions(-)
lib/librte_timer/rte_timer.c +10 -90
@@ -68,9 +68,6 @@ static struct rte_timer_data *rte_timer_data_arr;static const uint32_t default_data_id;static uint32_t rte_timer_subsystem_initialized; -/* For maintaining older interfaces for a period */ -static struct rte_timer_data default_timer_data; -/* when debug is enabled, store some statistics */ #ifdef RTE_LIBRTE_TIMER_DEBUG #define __TIMER_STAT_ADD (priv_timer, name, n) do { \
@@ -131,30 +128,14 @@ rte_timer_data_dealloc(uint32_t id)return 0 ; } -void __vsym -rte_timer_subsystem_init_v20 (void ) -{ -unsigned lcore_id; -struct priv_timer *priv_timer = default_timer_data.priv_timer; - -/* since priv_timer is static, it's zeroed by default, so only init some -* fields. -*/ -for (lcore_id =0 ; lcore_id <RTE_MAX_LCORE ; lcore_id ++) { -rte_spinlock_init (&priv_timer[lcore_id].list_lock); - priv_timer[lcore_id].prev_lcore = lcore_id; - } -} -VERSION_SYMBOL (rte_timer_subsystem_init, _v20,2.0 ); -/* Init the timer library. Allocate an array of timer data structs in shared * memory, and allocate the zeroth entry for use with original timer * APIs. Since the intersection of the sets of lcore ids in primary and * secondary processes should be empty, the zeroth entry can be shared by * multiple processes. */ -int __vsym -rte_timer_subsystem_init_v1905 (void ) +int +rte_timer_subsystem_init (void ) {const struct rte_memzone *mz;struct rte_timer_data *data;
@@ -209,9 +190,6 @@ rte_timer_subsystem_init_v1905(void)return 0 ; } -MAP_STATIC_SYMBOL(int rte_timer_subsystem_init(void), - rte_timer_subsystem_init_v1905); -BIND_DEFAULT_SYMBOL (rte_timer_subsystem_init, _v1905,19.05 );void rte_timer_subsystem_finalize (void )
@@ -551,43 +529,14 @@ __rte_timer_reset(struct rte_timer *tim, uint64_t expire, }/* Reset and start the timer associated with the timer handle tim */ -int __vsym -rte_timer_reset_v20 (struct rte_timer *tim,uint64_t ticks, -enum rte_timer_type type,unsigned int tim_lcore, -rte_timer_cb_t fct,void *arg) -{ -uint64_t cur_time =rte_get_timer_cycles (); -uint64_t period; - -if (unlikely ((tim_lcore != (unsigned )LCORE_ID_ANY ) && - !(rte_lcore_is_enabled (tim_lcore) || -rte_lcore_has_role (tim_lcore,ROLE_SERVICE )))) -return -1 ; - -if (type ==PERIODICAL ) - period = ticks; -else - period =0 ; - -return __rte_timer_reset (tim, cur_time + ticks, period, tim_lcore, - fct, arg,0 , &default_timer_data); -} -VERSION_SYMBOL (rte_timer_reset, _v20,2.0 ); - -int __vsym -rte_timer_reset_v1905 (struct rte_timer *tim,uint64_t ticks, +int +rte_timer_reset (struct rte_timer *tim,uint64_t ticks,enum rte_timer_type type,unsigned int tim_lcore,rte_timer_cb_t fct,void *arg) {return rte_timer_alt_reset (default_data_id, tim, ticks, type, tim_lcore, fct, arg); } -MAP_STATIC_SYMBOL(int rte_timer_reset(struct rte_timer *tim, uint64_t ticks, -enum rte_timer_type type, -unsigned int tim_lcore, - rte_timer_cb_t fct,void *arg), - rte_timer_reset_v1905); -BIND_DEFAULT_SYMBOL (rte_timer_reset, _v1905,19.05 ); int rte_timer_alt_reset(uint32_t timer_data_id, struct rte_timer *tim,
@@ -657,21 +606,11 @@ __rte_timer_stop(struct rte_timer *tim, int local_is_locked, }/* Stop the timer associated with the timer handle tim */ -int __vsym -rte_timer_stop_v20 (struct rte_timer *tim) -{ -return __rte_timer_stop (tim,0 , &default_timer_data); -} -VERSION_SYMBOL (rte_timer_stop, _v20,2.0 ); - -int __vsym -rte_timer_stop_v1905 (struct rte_timer *tim) +int +rte_timer_stop (struct rte_timer *tim) {return rte_timer_alt_stop (default_data_id, tim); } -MAP_STATIC_SYMBOL(int rte_timer_stop(struct rte_timer *tim), - rte_timer_stop_v1905); -BIND_DEFAULT_SYMBOL (rte_timer_stop, _v1905,19.05 );int rte_timer_alt_stop (uint32_t timer_data_id,struct rte_timer *tim)
@@ -817,15 +756,8 @@ __rte_timer_manage(struct rte_timer_data *timer_data) priv_timer[lcore_id].running_tim =NULL ; } -void __vsym -rte_timer_manage_v20 (void ) -{ -__rte_timer_manage (&default_timer_data); -} -VERSION_SYMBOL (rte_timer_manage, _v20,2.0 ); - -int __vsym -rte_timer_manage_v1905 (void ) +int +rte_timer_manage (void ) {struct rte_timer_data *timer_data;
@@ -835,8 +767,6 @@ rte_timer_manage_v1905(void)return 0 ; } -MAP_STATIC_SYMBOL(int rte_timer_manage(void), rte_timer_manage_v1905); -BIND_DEFAULT_SYMBOL (rte_timer_manage, _v1905,19.05 ); int rte_timer_alt_manage(uint32_t timer_data_id,
@@ -1074,21 +1004,11 @@ __rte_timer_dump_stats(struct rte_timer_data *timer_data __rte_unused, FILE *f)#endif } -void __vsym -rte_timer_dump_stats_v20 (FILE *f) -{ -__rte_timer_dump_stats (&default_timer_data, f); -} -VERSION_SYMBOL (rte_timer_dump_stats, _v20,2.0 ); - -int __vsym -rte_timer_dump_stats_v1905 (FILE *f) +int +rte_timer_dump_stats (FILE *f) {return rte_timer_alt_dump_stats (default_data_id, f); } -MAP_STATIC_SYMBOL(int rte_timer_dump_stats(FILE *f), - rte_timer_dump_stats_v1905); -BIND_DEFAULT_SYMBOL (rte_timer_dump_stats, _v1905,19.05 );int rte_timer_alt_dump_stats(uint32_t timer_data_id __rte_unused, FILE *f)
lib/librte_timer/rte_timer.h +0 -15
@@ -181,8 +181,6 @@ int rte_timer_data_dealloc(uint32_t id);* subsystem */ int rte_timer_subsystem_init (void ); -int rte_timer_subsystem_init_v1905 (void ); -void rte_timer_subsystem_init_v20 (void );/** * @warning
@@ -250,13 +248,6 @@ void rte_timer_init(struct rte_timer *tim);int rte_timer_reset (struct rte_timer *tim,uint64_t ticks,enum rte_timer_type type,unsigned tim_lcore,rte_timer_cb_t fct,void *arg); -int rte_timer_reset_v1905 (struct rte_timer *tim,uint64_t ticks, -enum rte_timer_type type,unsigned int tim_lcore, -rte_timer_cb_t fct,void *arg); -int rte_timer_reset_v20 (struct rte_timer *tim,uint64_t ticks, -enum rte_timer_type type,unsigned int tim_lcore, -rte_timer_cb_t fct,void *arg); -/** * Loop until rte_timer_reset() succeeds.
@@ -313,8 +304,6 @@ rte_timer_reset_sync(struct rte_timer *tim, uint64_t ticks,* - (-1): The timer is in the RUNNING or CONFIG state. */ int rte_timer_stop (struct rte_timer *tim); -int rte_timer_stop_v1905 (struct rte_timer *tim); -int rte_timer_stop_v20 (struct rte_timer *tim);/** * Loop until rte_timer_stop() succeeds.
@@ -358,8 +347,6 @@ int rte_timer_pending(struct rte_timer *tim);* - -EINVAL: timer subsystem not yet initialized */ int rte_timer_manage (void ); -int rte_timer_manage_v1905 (void ); -void rte_timer_manage_v20 (void );/** * Dump statistics about timers.
@@ -371,8 +358,6 @@ void rte_timer_manage_v20(void);* - -EINVAL: timer subsystem not yet initialized */ int rte_timer_dump_stats (FILE *f); -int rte_timer_dump_stats_v1905 (FILE *f); -void rte_timer_dump_stats_v20 (FILE *f);/** * @warning
lib/librte_timer/rte_timer_version.map +0 -5
@@ -1,15 +1,10 @@ DPDK_2.0 { global: - rte_timer_dump_stats; rte_timer_init; - rte_timer_manage; rte_timer_pending; - rte_timer_reset; rte_timer_reset_sync; - rte_timer_stop; rte_timer_stop_sync; - rte_timer_subsystem_init; local: *; };
Signature · 1 line
2.17.1
PATCH v8 7/12 lpm: remove deprecated code
In reply to Anatoly BurakovFrom: Marcin Baran <[email protected]>
Remove code for old ABI versions ahead of ABI version bump.
---
Notes:
v2:
- Moved this to before ABI version bump to avoid compile breakage
lib/librte_lpm/rte_lpm.c | 1010 ++-------------------------- lib/librte_lpm/rte_lpm.h | 88 --- lib/librte_lpm/rte_lpm6.c | 140 +--- lib/librte_lpm/rte_lpm6.h | 25 - lib/librte_lpm/rte_lpm_version.map | 11 - 5 files changed, 59 insertions(+), 1215 deletions(-)
lib/librte_lpm/rte_lpm.c +41 -969
@@ -90,34 +90,8 @@ depth_to_range(uint8_t depth)/* * Find an existing lpm table and return a pointer to it. */ -struct rte_lpm_v20 * __vsym -rte_lpm_find_existing_v20 (const char *name) -{ -struct rte_lpm_v20 *l =NULL ; -struct rte_tailq_entry *te; -struct rte_lpm_list *lpm_list; - - lpm_list =RTE_TAILQ_CAST (rte_lpm_tailq.head, rte_lpm_list); - -rte_mcfg_tailq_read_lock (); - TAILQ_FOREACH(te, lpm_list, next) { - l = te->data; -if (strncmp (name, l->name,RTE_LPM_NAMESIZE ) ==0 ) -break ; - } -rte_mcfg_tailq_read_unlock (); - -if (te ==NULL ) { - rte_errno =ENOENT ; -return NULL ; - } - -return l; -} -VERSION_SYMBOL (rte_lpm_find_existing, _v20,2.0 ); - -struct rte_lpm * __vsym -rte_lpm_find_existing_v1604 (const char *name) +struct rte_lpm * +rte_lpm_find_existing (const char *name) {struct rte_lpm *l =NULL ;struct rte_tailq_entry *te;
@@ -140,88 +114,12 @@ rte_lpm_find_existing_v1604(const char *name)return l; } -BIND_DEFAULT_SYMBOL (rte_lpm_find_existing, _v1604,16.04 ); -MAP_STATIC_SYMBOL(struct rte_lpm *rte_lpm_find_existing(const char *name), - rte_lpm_find_existing_v1604);/* * Allocates memory for LPM object */ -struct rte_lpm_v20 * __vsym -rte_lpm_create_v20 (const char *name,int socket_id,int max_rules, - __rte_unused int flags) -{ -char mem_name[RTE_LPM_NAMESIZE ]; -struct rte_lpm_v20 *lpm =NULL ; -struct rte_tailq_entry *te; -uint32_t mem_size; -struct rte_lpm_list *lpm_list; - - lpm_list =RTE_TAILQ_CAST (rte_lpm_tailq.head, rte_lpm_list); - -RTE_BUILD_BUG_ON (sizeof (struct rte_lpm_tbl_entry_v20 ) !=2 ); - -/* Check user arguments. */ -if ((name ==NULL ) || (socket_id <-1 ) || (max_rules ==0 )) { - rte_errno =EINVAL ; -return NULL ; - } - -snprintf (mem_name,sizeof (mem_name),"LPM_%s" , name); - -/* Determine the amount of memory to allocate. */ - mem_size =sizeof (*lpm) + (sizeof (lpm->rules_tbl[0 ]) * max_rules); - -rte_mcfg_tailq_write_lock (); - -/* guarantee there's no existing */ - TAILQ_FOREACH(te, lpm_list, next) { - lpm = te->data; -if (strncmp (name, lpm->name,RTE_LPM_NAMESIZE ) ==0 ) -break ; - } - -if (te !=NULL ) { - lpm =NULL ; - rte_errno =EEXIST ; - goto exit; - } - -/* allocate tailq entry */ - te =rte_zmalloc ("LPM_TAILQ_ENTRY" ,sizeof (*te),0 ); -if (te ==NULL ) { -RTE_LOG (ERR ,LPM ,"Failed to allocate tailq entry\n" ); - rte_errno =ENOMEM ; - goto exit; - } - -/* Allocate memory to store the LPM data structures. */ - lpm =rte_zmalloc_socket (mem_name, mem_size, -RTE_CACHE_LINE_SIZE , socket_id); -if (lpm ==NULL ) { -RTE_LOG (ERR ,LPM ,"LPM memory allocation failed\n" ); -rte_free (te); - rte_errno =ENOMEM ; - goto exit; - } - -/* Save user arguments. */ - lpm->max_rules = max_rules; -strlcpy (lpm->name, name,sizeof (lpm->name)); - - te->data = lpm; - -TAILQ_INSERT_TAIL (lpm_list, te, next); - -exit: -rte_mcfg_tailq_write_unlock (); - -return lpm; -} -VERSION_SYMBOL (rte_lpm_create, _v20,2.0 ); - -struct rte_lpm * __vsym -rte_lpm_create_v1604 (const char *name,int socket_id, +struct rte_lpm * +rte_lpm_create (const char *name,int socket_id,const struct rte_lpm_config *config) {char mem_name[RTE_LPM_NAMESIZE ];
@@ -321,45 +219,12 @@ rte_lpm_create_v1604(const char *name, int socket_id,return lpm; } -BIND_DEFAULT_SYMBOL (rte_lpm_create, _v1604,16.04 ); -MAP_STATIC_SYMBOL ( - struct rte_lpm *rte_lpm_create(const char *name, int socket_id, - const struct rte_lpm_config *config), rte_lpm_create_v1604);/* * Deallocates memory for given LPM table. */ -void __vsym -rte_lpm_free_v20 (struct rte_lpm_v20 *lpm) -{ -struct rte_lpm_list *lpm_list; -struct rte_tailq_entry *te; - -/* Check user arguments. */ -if (lpm ==NULL ) -return ; - - lpm_list =RTE_TAILQ_CAST (rte_lpm_tailq.head, rte_lpm_list); - -rte_mcfg_tailq_write_lock (); - -/* find our tailq entry */ - TAILQ_FOREACH(te, lpm_list, next) { -if (te->data == (void *) lpm) -break ; - } -if (te !=NULL ) -TAILQ_REMOVE (lpm_list, te, next); - -rte_mcfg_tailq_write_unlock (); - -rte_free (lpm); -rte_free (te); -} -VERSION_SYMBOL (rte_lpm_free, _v20,2.0 ); - -void __vsym -rte_lpm_free_v1604 (struct rte_lpm *lpm) +void +rte_lpm_free (struct rte_lpm *lpm) {struct rte_lpm_list *lpm_list;struct rte_tailq_entry *te;
@@ -387,9 +252,6 @@ rte_lpm_free_v1604(struct rte_lpm *lpm)rte_free (lpm);rte_free (te); } -BIND_DEFAULT_SYMBOL (rte_lpm_free, _v1604,16.04 ); -MAP_STATIC_SYMBOL(void rte_lpm_free(struct rte_lpm *lpm), - rte_lpm_free_v1604);/* * Adds a rule to the rule table.
@@ -402,79 +264,7 @@ MAP_STATIC_SYMBOL(void rte_lpm_free(struct rte_lpm *lpm),* NOTE: Valid range for depth parameter is 1 .. 32 inclusive. */ static int32_t -rule_add_v20 (struct rte_lpm_v20 *lpm,uint32_t ip_masked,uint8_t depth, -uint8_t next_hop) -{ -uint32_t rule_gindex, rule_index, last_rule; -int i; - -VERIFY_DEPTH (depth); - -/* Scan through rule group to see if rule already exists. */ -if (lpm->rule_info[depth -1 ].used_rules >0 ) { - -/* rule_gindex stands for rule group index. */ - rule_gindex = lpm->rule_info[depth -1 ].first_rule; -/* Initialise rule_index to point to start of rule group. */ - rule_index = rule_gindex; -/* Last rule = Last used rule in this rule group. */ - last_rule = rule_gindex + lpm->rule_info[depth -1 ].used_rules; - -for (; rule_index < last_rule; rule_index++) { - -/* If rule already exists update its next_hop and return. */ -if (lpm->rules_tbl[rule_index].ip == ip_masked) { - lpm->rules_tbl[rule_index].next_hop = next_hop; - -return rule_index; - } - } - -if (rule_index == lpm->max_rules) -return -ENOSPC ; - }else { -/* Calculate the position in which the rule will be stored. */ - rule_index =0 ; - -for (i = depth -1 ; i >0 ; i--) { -if (lpm->rule_info[i -1 ].used_rules >0 ) { - rule_index = lpm->rule_info[i -1 ].first_rule - + lpm->rule_info[i -1 ].used_rules; -break ; - } - } -if (rule_index == lpm->max_rules) -return -ENOSPC ; - - lpm->rule_info[depth -1 ].first_rule = rule_index; - } - -/* Make room for the new rule in the array. */ -for (i =RTE_LPM_MAX_DEPTH ; i > depth; i--) { -if (lpm->rule_info[i -1 ].first_rule - + lpm->rule_info[i -1 ].used_rules == lpm->max_rules) -return -ENOSPC ; - -if (lpm->rule_info[i -1 ].used_rules >0 ) { - lpm->rules_tbl[lpm->rule_info[i -1 ].first_rule - + lpm->rule_info[i -1 ].used_rules] - = lpm->rules_tbl[lpm->rule_info[i -1 ].first_rule]; - lpm->rule_info[i -1 ].first_rule++; - } - } - -/* Add the new rule. */ - lpm->rules_tbl[rule_index].ip = ip_masked; - lpm->rules_tbl[rule_index].next_hop = next_hop; - -/* Increment the used rules counter for this rule group. */ - lpm->rule_info[depth -1 ].used_rules++; - -return rule_index; -} - -static int32_t -rule_add_v1604 (struct rte_lpm *lpm,uint32_t ip_masked,uint8_t depth, +rule_add (struct rte_lpm *lpm,uint32_t ip_masked,uint8_t depth,uint32_t next_hop) {uint32_t rule_gindex, rule_index, last_rule;
@@ -550,30 +340,7 @@ rule_add_v1604(struct rte_lpm *lpm, uint32_t ip_masked, uint8_t depth,* NOTE: Valid range for depth parameter is 1 .. 32 inclusive. */ static void -rule_delete_v20 (struct rte_lpm_v20 *lpm,int32_t rule_index,uint8_t depth) -{ -int i; - -VERIFY_DEPTH (depth); - - lpm->rules_tbl[rule_index] = - lpm->rules_tbl[lpm->rule_info[depth -1 ].first_rule - + lpm->rule_info[depth -1 ].used_rules -1 ]; - -for (i = depth; i <RTE_LPM_MAX_DEPTH ; i++) { -if (lpm->rule_info[i].used_rules >0 ) { - lpm->rules_tbl[lpm->rule_info[i].first_rule -1 ] = - lpm->rules_tbl[lpm->rule_info[i].first_rule - + lpm->rule_info[i].used_rules -1 ]; - lpm->rule_info[i].first_rule--; - } - } - - lpm->rule_info[depth -1 ].used_rules--; -} - -static void -rule_delete_v1604 (struct rte_lpm *lpm,int32_t rule_index,uint8_t depth) +rule_delete (struct rte_lpm *lpm,int32_t rule_index,uint8_t depth) {int i;
@@ -600,28 +367,7 @@ rule_delete_v1604(struct rte_lpm *lpm, int32_t rule_index, uint8_t depth)* NOTE: Valid range for depth parameter is 1 .. 32 inclusive. */ static int32_t -rule_find_v20 (struct rte_lpm_v20 *lpm,uint32_t ip_masked,uint8_t depth) -{ -uint32_t rule_gindex, last_rule, rule_index; - -VERIFY_DEPTH (depth); - - rule_gindex = lpm->rule_info[depth -1 ].first_rule; - last_rule = rule_gindex + lpm->rule_info[depth -1 ].used_rules; - -/* Scan used rules at given depth to find rule. */ -for (rule_index = rule_gindex; rule_index < last_rule; rule_index++) { -/* If rule is found return the rule index. */ -if (lpm->rules_tbl[rule_index].ip == ip_masked) -return rule_index; - } - -/* If rule is not found return -EINVAL. */ -return -EINVAL ; -} - -static int32_t -rule_find_v1604 (struct rte_lpm *lpm,uint32_t ip_masked,uint8_t depth) +rule_find (struct rte_lpm *lpm,uint32_t ip_masked,uint8_t depth) {uint32_t rule_gindex, last_rule, rule_index;
@@ -645,42 +391,7 @@ rule_find_v1604(struct rte_lpm *lpm, uint32_t ip_masked, uint8_t depth)* Find, clean and allocate a tbl8. */ static int32_t -tbl8_alloc_v20 (struct rte_lpm_tbl_entry_v20 *tbl8) -{ -uint32_t group_idx;/* tbl8 group index. */ -struct rte_lpm_tbl_entry_v20 *tbl8_entry; - -/* Scan through tbl8 to find a free (i.e. INVALID) tbl8 group. */ -for (group_idx =0 ; group_idx <RTE_LPM_TBL8_NUM_GROUPS ; - group_idx++) { - tbl8_entry = &tbl8[group_idx *RTE_LPM_TBL8_GROUP_NUM_ENTRIES ]; -/* If a free tbl8 group is found clean it and set as VALID. */ -if (!tbl8_entry->valid_group) { -struct rte_lpm_tbl_entry_v20 new_tbl8_entry = { - .valid =INVALID , - .depth =0 , - .valid_group =VALID , - }; - new_tbl8_entry.next_hop =0 ; - -memset (&tbl8_entry[0 ],0 , -RTE_LPM_TBL8_GROUP_NUM_ENTRIES * -sizeof (tbl8_entry[0 ])); - -__atomic_store (tbl8_entry, &new_tbl8_entry, - __ATOMIC_RELAXED); - -/* Return group index for allocated tbl8 group. */ -return group_idx; - } - } - -/* If there are no tbl8 groups free then return error. */ -return -ENOSPC ; -} - -static int32_t -tbl8_alloc_v1604 (struct rte_lpm_tbl_entry *tbl8,uint32_t number_tbl8s) +tbl8_alloc (struct rte_lpm_tbl_entry *tbl8,uint32_t number_tbl8s) {uint32_t group_idx;/* tbl8 group index. */ struct rte_lpm_tbl_entry *tbl8_entry;
@@ -714,22 +425,7 @@ tbl8_alloc_v1604(struct rte_lpm_tbl_entry *tbl8, uint32_t number_tbl8s) }static void -tbl8_free_v20 (struct rte_lpm_tbl_entry_v20 *tbl8,uint32_t tbl8_group_start) -{ -/* Set tbl8 group invalid*/ -struct rte_lpm_tbl_entry_v20 zero_tbl8_entry = { - .valid =INVALID , - .depth =0 , - .valid_group =INVALID , - }; - zero_tbl8_entry.next_hop =0 ; - -__atomic_store (&tbl8[tbl8_group_start], &zero_tbl8_entry, - __ATOMIC_RELAXED); -} - -static void -tbl8_free_v1604 (struct rte_lpm_tbl_entry *tbl8,uint32_t tbl8_group_start) +tbl8_free (struct rte_lpm_tbl_entry *tbl8,uint32_t tbl8_group_start) {/* Set tbl8 group invalid*/ struct rte_lpm_tbl_entry zero_tbl8_entry = {0 };
@@ -739,78 +435,7 @@ tbl8_free_v1604(struct rte_lpm_tbl_entry *tbl8, uint32_t tbl8_group_start) } static __rte_noinline int32_t -add_depth_small_v20 (struct rte_lpm_v20 *lpm,uint32_t ip,uint8_t depth, -uint8_t next_hop) -{ -uint32_t tbl24_index, tbl24_range, tbl8_index, tbl8_group_end, i, j; - -/* Calculate the index into Table24. */ - tbl24_index = ip >>8 ; - tbl24_range =depth_to_range (depth); - -for (i = tbl24_index; i < (tbl24_index + tbl24_range); i++) { -/* -* For invalid OR valid and non-extended tbl 24 entries set -* entry. -*/ -if (!lpm->tbl24[i].valid || (lpm->tbl24[i].valid_group ==0 && - lpm->tbl24[i].depth <= depth)) { - -struct rte_lpm_tbl_entry_v20 new_tbl24_entry = { - .valid =VALID , - .valid_group =0 , - .depth = depth, - }; - new_tbl24_entry.next_hop = next_hop; - -/* Setting tbl24 entry in one go to avoid race -* conditions -*/ -__atomic_store (&lpm->tbl24[i], &new_tbl24_entry, - __ATOMIC_RELEASE); - -continue ; - } - -if (lpm->tbl24[i].valid_group ==1 ) { -/* If tbl24 entry is valid and extended calculate the -* index into tbl8. -*/ - tbl8_index = lpm->tbl24[i].group_idx * -RTE_LPM_TBL8_GROUP_NUM_ENTRIES ; - tbl8_group_end = tbl8_index + -RTE_LPM_TBL8_GROUP_NUM_ENTRIES ; - -for (j = tbl8_index; j < tbl8_group_end; j++) { -if (!lpm->tbl8[j].valid || - lpm->tbl8[j].depth <= depth) { -struct rte_lpm_tbl_entry_v20 - new_tbl8_entry = { - .valid =VALID , - .valid_group =VALID , - .depth = depth, - }; - new_tbl8_entry.next_hop = next_hop; - -/* -* Setting tbl8 entry in one go to avoid -* race conditions -*/ -__atomic_store (&lpm->tbl8[j], - &new_tbl8_entry, - __ATOMIC_RELAXED); - -continue ; - } - } - } - } - -return 0 ; -} - -static __rte_noinline int32_t -add_depth_small_v1604 (struct rte_lpm *lpm,uint32_t ip,uint8_t depth, +add_depth_small (struct rte_lpm *lpm,uint32_t ip,uint8_t depth,uint32_t next_hop) {#define group_idx next_hop
@@ -882,150 +507,7 @@ add_depth_small_v1604(struct rte_lpm *lpm, uint32_t ip, uint8_t depth, } static __rte_noinline int32_t -add_depth_big_v20 (struct rte_lpm_v20 *lpm,uint32_t ip_masked,uint8_t depth, -uint8_t next_hop) -{ -uint32_t tbl24_index; -int32_t tbl8_group_index, tbl8_group_start, tbl8_group_end, tbl8_index, - tbl8_range, i; - - tbl24_index = (ip_masked >>8 ); - tbl8_range =depth_to_range (depth); - -if (!lpm->tbl24[tbl24_index].valid) { -/* Search for a free tbl8 group. */ - tbl8_group_index =tbl8_alloc_v20 (lpm->tbl8); - -/* Check tbl8 allocation was successful. */ -if (tbl8_group_index <0 ) { -return tbl8_group_index; - } - -/* Find index into tbl8 and range. */ - tbl8_index = (tbl8_group_index * -RTE_LPM_TBL8_GROUP_NUM_ENTRIES ) + - (ip_masked &0xFF ); - -/* Set tbl8 entry. */ -for (i = tbl8_index; i < (tbl8_index + tbl8_range); i++) { -struct rte_lpm_tbl_entry_v20 new_tbl8_entry = { - .valid =VALID , - .depth = depth, - .valid_group = lpm->tbl8[i].valid_group, - }; - new_tbl8_entry.next_hop = next_hop; -__atomic_store (&lpm->tbl8[i], &new_tbl8_entry, - __ATOMIC_RELAXED); - } - -/* -* Update tbl24 entry to point to new tbl8 entry. Note: The -* ext_flag and tbl8_index need to be updated simultaneously, -* so assign whole structure in one go -*/ - -struct rte_lpm_tbl_entry_v20 new_tbl24_entry = { - .group_idx = (uint8_t )tbl8_group_index, - .valid =VALID , - .valid_group =1 , - .depth =0 , - }; - -__atomic_store (&lpm->tbl24[tbl24_index], &new_tbl24_entry, - __ATOMIC_RELEASE); - - }/* If valid entry but not extended calculate the index into Table8. */ -else if (lpm->tbl24[tbl24_index].valid_group ==0 ) { -/* Search for free tbl8 group. */ - tbl8_group_index =tbl8_alloc_v20 (lpm->tbl8); - -if (tbl8_group_index <0 ) { -return tbl8_group_index; - } - - tbl8_group_start = tbl8_group_index * -RTE_LPM_TBL8_GROUP_NUM_ENTRIES ; - tbl8_group_end = tbl8_group_start + -RTE_LPM_TBL8_GROUP_NUM_ENTRIES ; - -/* Populate new tbl8 with tbl24 value. */ -for (i = tbl8_group_start; i < tbl8_group_end; i++) { -struct rte_lpm_tbl_entry_v20 new_tbl8_entry = { - .valid =VALID , - .depth = lpm->tbl24[tbl24_index].depth, - .valid_group = lpm->tbl8[i].valid_group, - }; - new_tbl8_entry.next_hop = - lpm->tbl24[tbl24_index].next_hop; -__atomic_store (&lpm->tbl8[i], &new_tbl8_entry, - __ATOMIC_RELAXED); - } - - tbl8_index = tbl8_group_start + (ip_masked &0xFF ); - -/* Insert new rule into the tbl8 entry. */ -for (i = tbl8_index; i < tbl8_index + tbl8_range; i++) { -struct rte_lpm_tbl_entry_v20 new_tbl8_entry = { - .valid =VALID , - .depth = depth, - .valid_group = lpm->tbl8[i].valid_group, - }; - new_tbl8_entry.next_hop = next_hop; -__atomic_store (&lpm->tbl8[i], &new_tbl8_entry, - __ATOMIC_RELAXED); - } - -/* -* Update tbl24 entry to point to new tbl8 entry. Note: The -* ext_flag and tbl8_index need to be updated simultaneously, -* so assign whole structure in one go. -*/ - -struct rte_lpm_tbl_entry_v20 new_tbl24_entry = { - .group_idx = (uint8_t )tbl8_group_index, - .valid =VALID , - .valid_group =1 , - .depth =0 , - }; - -__atomic_store (&lpm->tbl24[tbl24_index], &new_tbl24_entry, - __ATOMIC_RELEASE); - - }else {/* -* If it is valid, extended entry calculate the index into tbl8. -*/ - tbl8_group_index = lpm->tbl24[tbl24_index].group_idx; - tbl8_group_start = tbl8_group_index * -RTE_LPM_TBL8_GROUP_NUM_ENTRIES ; - tbl8_index = tbl8_group_start + (ip_masked &0xFF ); - -for (i = tbl8_index; i < (tbl8_index + tbl8_range); i++) { - -if (!lpm->tbl8[i].valid || - lpm->tbl8[i].depth <= depth) { -struct rte_lpm_tbl_entry_v20 new_tbl8_entry = { - .valid =VALID , - .depth = depth, - .valid_group = lpm->tbl8[i].valid_group, - }; - new_tbl8_entry.next_hop = next_hop; -/* -* Setting tbl8 entry in one go to avoid race -* condition -*/ -__atomic_store (&lpm->tbl8[i], &new_tbl8_entry, - __ATOMIC_RELAXED); - -continue ; - } - } - } - -return 0 ; -} - -static __rte_noinline int32_t -add_depth_big_v1604 (struct rte_lpm *lpm,uint32_t ip_masked,uint8_t depth, +add_depth_big (struct rte_lpm *lpm,uint32_t ip_masked,uint8_t depth,uint32_t next_hop) {#define group_idx next_hop
@@ -1038,7 +520,7 @@ add_depth_big_v1604(struct rte_lpm *lpm, uint32_t ip_masked, uint8_t depth,if (!lpm->tbl24[tbl24_index].valid) {/* Search for a free tbl8 group. */ - tbl8_group_index =tbl8_alloc_v1604 (lpm->tbl8, lpm->number_tbl8s); + tbl8_group_index =tbl8_alloc (lpm->tbl8, lpm->number_tbl8s);/* Check tbl8 allocation was successful. */ if (tbl8_group_index <0 ) {
@@ -1084,7 +566,7 @@ add_depth_big_v1604(struct rte_lpm *lpm, uint32_t ip_masked, uint8_t depth, }/* If valid entry but not extended calculate the index into Table8. */ else if (lpm->tbl24[tbl24_index].valid_group ==0 ) {/* Search for free tbl8 group. */ - tbl8_group_index =tbl8_alloc_v1604 (lpm->tbl8, lpm->number_tbl8s); + tbl8_group_index =tbl8_alloc (lpm->tbl8, lpm->number_tbl8s);if (tbl8_group_index <0 ) {return tbl8_group_index;
@@ -1177,49 +659,8 @@ add_depth_big_v1604(struct rte_lpm *lpm, uint32_t ip_masked, uint8_t depth,/* * Add a route */ -int __vsym -rte_lpm_add_v20 (struct rte_lpm_v20 *lpm,uint32_t ip,uint8_t depth, -uint8_t next_hop) -{ -int32_t rule_index, status =0 ; -uint32_t ip_masked; - -/* Check user arguments. */ -if ((lpm ==NULL ) || (depth <1 ) || (depth >RTE_LPM_MAX_DEPTH )) -return -EINVAL ; - - ip_masked = ip &depth_to_mask (depth); - -/* Add the rule to the rule table. */ - rule_index =rule_add_v20 (lpm, ip_masked, depth, next_hop); - -/* If the is no space available for new rule return error. */ -if (rule_index <0 ) { -return rule_index; - } - -if (depth <=MAX_DEPTH_TBL24 ) { - status =add_depth_small_v20 (lpm, ip_masked, depth, next_hop); - }else {/* If depth > RTE_LPM_MAX_DEPTH_TBL24 */ - status =add_depth_big_v20 (lpm, ip_masked, depth, next_hop); - -/* -* If add fails due to exhaustion of tbl8 extensions delete -* rule that was added to rule table. -*/ -if (status <0 ) { -rule_delete_v20 (lpm, rule_index, depth); - -return status; - } - } - -return 0 ; -} -VERSION_SYMBOL (rte_lpm_add, _v20,2.0 ); - -int __vsym -rte_lpm_add_v1604 (struct rte_lpm *lpm,uint32_t ip,uint8_t depth, +int +rte_lpm_add (struct rte_lpm *lpm,uint32_t ip,uint8_t depth,uint32_t next_hop) {int32_t rule_index, status =0 ;
@@ -1232,7 +673,7 @@ rte_lpm_add_v1604(struct rte_lpm *lpm, uint32_t ip, uint8_t depth, ip_masked = ip &depth_to_mask (depth);/* Add the rule to the rule table. */ - rule_index =rule_add_v1604 (lpm, ip_masked, depth, next_hop); + rule_index =rule_add (lpm, ip_masked, depth, next_hop);/* If the is no space available for new rule return error. */ if (rule_index <0 ) {
@@ -1240,16 +681,16 @@ rte_lpm_add_v1604(struct rte_lpm *lpm, uint32_t ip, uint8_t depth, }if (depth <=MAX_DEPTH_TBL24 ) { - status =add_depth_small_v1604 (lpm, ip_masked, depth, next_hop); + status =add_depth_small (lpm, ip_masked, depth, next_hop); }else {/* If depth > RTE_LPM_MAX_DEPTH_TBL24 */ - status =add_depth_big_v1604 (lpm, ip_masked, depth, next_hop); + status =add_depth_big (lpm, ip_masked, depth, next_hop);/* * If add fails due to exhaustion of tbl8 extensions delete * rule that was added to rule table. */ if (status <0 ) { -rule_delete_v1604 (lpm, rule_index, depth); +rule_delete (lpm, rule_index, depth);return status; }
@@ -1257,42 +698,12 @@ rte_lpm_add_v1604(struct rte_lpm *lpm, uint32_t ip, uint8_t depth,return 0 ; } -BIND_DEFAULT_SYMBOL (rte_lpm_add, _v1604,16.04 ); -MAP_STATIC_SYMBOL(int rte_lpm_add(struct rte_lpm *lpm, uint32_t ip, - uint8_t depth, uint32_t next_hop), rte_lpm_add_v1604);/* * Look for a rule in the high-level rules table */ -int __vsym -rte_lpm_is_rule_present_v20 (struct rte_lpm_v20 *lpm,uint32_t ip,uint8_t depth, -uint8_t *next_hop) -{ -uint32_t ip_masked; -int32_t rule_index; - -/* Check user arguments. */ -if ((lpm ==NULL ) || - (next_hop ==NULL ) || - (depth <1 ) || (depth >RTE_LPM_MAX_DEPTH )) -return -EINVAL ; - -/* Look for the rule using rule_find. */ - ip_masked = ip &depth_to_mask (depth); - rule_index =rule_find_v20 (lpm, ip_masked, depth); - -if (rule_index >=0 ) { - *next_hop = lpm->rules_tbl[rule_index].next_hop; -return 1 ; - } - -/* If rule is not found return 0. */ -return 0 ; -} -VERSION_SYMBOL (rte_lpm_is_rule_present, _v20,2.0 ); - -int __vsym -rte_lpm_is_rule_present_v1604 (struct rte_lpm *lpm,uint32_t ip,uint8_t depth, +int +rte_lpm_is_rule_present (struct rte_lpm *lpm,uint32_t ip,uint8_t depth,uint32_t *next_hop) {uint32_t ip_masked;
@@ -1306,7 +717,7 @@ uint32_t *next_hop)/* Look for the rule using rule_find. */ ip_masked = ip &depth_to_mask (depth); - rule_index =rule_find_v1604 (lpm, ip_masked, depth); + rule_index =rule_find (lpm, ip_masked, depth);if (rule_index >=0 ) { *next_hop = lpm->rules_tbl[rule_index].next_hop;
@@ -1316,12 +727,9 @@ uint32_t *next_hop)/* If rule is not found return 0. */ return 0 ; } -BIND_DEFAULT_SYMBOL (rte_lpm_is_rule_present, _v1604,16.04 ); -MAP_STATIC_SYMBOL(int rte_lpm_is_rule_present(struct rte_lpm *lpm, uint32_t ip, - uint8_t depth, uint32_t *next_hop), rte_lpm_is_rule_present_v1604);static int32_t -find_previous_rule_v20 (struct rte_lpm_v20 *lpm,uint32_t ip,uint8_t depth, +find_previous_rule (struct rte_lpm *lpm,uint32_t ip,uint8_t depth,uint8_t *sub_rule_depth) {int32_t rule_index;
@@ -1331,7 +739,7 @@ find_previous_rule_v20(struct rte_lpm_v20 *lpm, uint32_t ip, uint8_t depth,for (prev_depth = (uint8_t )(depth -1 ); prev_depth >0 ; prev_depth--) { ip_masked = ip &depth_to_mask (prev_depth); - rule_index =rule_find_v20 (lpm, ip_masked, prev_depth); + rule_index =rule_find (lpm, ip_masked, prev_depth);if (rule_index >=0 ) { *sub_rule_depth = prev_depth;
@@ -1343,133 +751,7 @@ find_previous_rule_v20(struct rte_lpm_v20 *lpm, uint32_t ip, uint8_t depth, }static int32_t -find_previous_rule_v1604 (struct rte_lpm *lpm,uint32_t ip,uint8_t depth, -uint8_t *sub_rule_depth) -{ -int32_t rule_index; -uint32_t ip_masked; -uint8_t prev_depth; - -for (prev_depth = (uint8_t )(depth -1 ); prev_depth >0 ; prev_depth--) { - ip_masked = ip &depth_to_mask (prev_depth); - - rule_index =rule_find_v1604 (lpm, ip_masked, prev_depth); - -if (rule_index >=0 ) { - *sub_rule_depth = prev_depth; -return rule_index; - } - } - -return -1 ; -} - -static int32_t -delete_depth_small_v20 (struct rte_lpm_v20 *lpm,uint32_t ip_masked, -uint8_t depth,int32_t sub_rule_index,uint8_t sub_rule_depth) -{ -uint32_t tbl24_range, tbl24_index, tbl8_group_index, tbl8_index, i, j; - -/* Calculate the range and index into Table24. */ - tbl24_range =depth_to_range (depth); - tbl24_index = (ip_masked >>8 ); - -/* -* Firstly check the sub_rule_index. A -1 indicates no replacement rule -* and a positive number indicates a sub_rule_index. -*/ -if (sub_rule_index <0 ) { -/* -* If no replacement rule exists then invalidate entries -* associated with this rule. -*/ -for (i = tbl24_index; i < (tbl24_index + tbl24_range); i++) { - -if (lpm->tbl24[i].valid_group ==0 && - lpm->tbl24[i].depth <= depth) { -struct rte_lpm_tbl_entry_v20 - zero_tbl24_entry = { - .valid =INVALID , - .depth =0 , - .valid_group =0 , - }; - zero_tbl24_entry.next_hop =0 ; -__atomic_store (&lpm->tbl24[i], - &zero_tbl24_entry, __ATOMIC_RELEASE); - }else if (lpm->tbl24[i].valid_group ==1 ) { -/* -* If TBL24 entry is extended, then there has -* to be a rule with depth >= 25 in the -* associated TBL8 group. -*/ - - tbl8_group_index = lpm->tbl24[i].group_idx; - tbl8_index = tbl8_group_index * -RTE_LPM_TBL8_GROUP_NUM_ENTRIES ; - -for (j = tbl8_index; j < (tbl8_index + -RTE_LPM_TBL8_GROUP_NUM_ENTRIES ); j++) { - -if (lpm->tbl8[j].depth <= depth) - lpm->tbl8[j].valid =INVALID ; - } - } - } - }else { -/* -* If a replacement rule exists then modify entries -* associated with this rule. -*/ - -struct rte_lpm_tbl_entry_v20 new_tbl24_entry = { - .next_hop = lpm->rules_tbl[sub_rule_index].next_hop, - .valid =VALID , - .valid_group =0 , - .depth = sub_rule_depth, - }; - -struct rte_lpm_tbl_entry_v20 new_tbl8_entry = { - .valid =VALID , - .valid_group =VALID , - .depth = sub_rule_depth, - }; - new_tbl8_entry.next_hop = - lpm->rules_tbl[sub_rule_index].next_hop; - -for (i = tbl24_index; i < (tbl24_index + tbl24_range); i++) { - -if (lpm->tbl24[i].valid_group ==0 && - lpm->tbl24[i].depth <= depth) { -__atomic_store (&lpm->tbl24[i], &new_tbl24_entry, - __ATOMIC_RELEASE); - }else if (lpm->tbl24[i].valid_group ==1 ) { -/* -* If TBL24 entry is extended, then there has -* to be a rule with depth >= 25 in the -* associated TBL8 group. -*/ - - tbl8_group_index = lpm->tbl24[i].group_idx; - tbl8_index = tbl8_group_index * -RTE_LPM_TBL8_GROUP_NUM_ENTRIES ; - -for (j = tbl8_index; j < (tbl8_index + -RTE_LPM_TBL8_GROUP_NUM_ENTRIES ); j++) { - -if (lpm->tbl8[j].depth <= depth) -__atomic_store (&lpm->tbl8[j], - &new_tbl8_entry, - __ATOMIC_RELAXED); - } - } - } - } - -return 0 ; -} - -static int32_t -delete_depth_small_v1604 (struct rte_lpm *lpm,uint32_t ip_masked, +delete_depth_small (struct rte_lpm *lpm,uint32_t ip_masked,uint8_t depth,int32_t sub_rule_index,uint8_t sub_rule_depth) {#define group_idx next_hop
@@ -1576,7 +858,7 @@ delete_depth_small_v1604(struct rte_lpm *lpm, uint32_t ip_masked,* thus can be recycled */ static int32_t -tbl8_recycle_check_v20 (struct rte_lpm_tbl_entry_v20 *tbl8, +tbl8_recycle_check (struct rte_lpm_tbl_entry *tbl8,uint32_t tbl8_group_start) {uint32_t tbl8_group_end, i;
@@ -1623,140 +905,7 @@ tbl8_recycle_check_v20(struct rte_lpm_tbl_entry_v20 *tbl8, }static int32_t -tbl8_recycle_check_v1604 (struct rte_lpm_tbl_entry *tbl8, -uint32_t tbl8_group_start) -{ -uint32_t tbl8_group_end, i; - tbl8_group_end = tbl8_group_start +RTE_LPM_TBL8_GROUP_NUM_ENTRIES ; - -/* -* Check the first entry of the given tbl8. If it is invalid we know -* this tbl8 does not contain any rule with a depth < RTE_LPM_MAX_DEPTH -* (As they would affect all entries in a tbl8) and thus this table -* can not be recycled. -*/ -if (tbl8[tbl8_group_start].valid) { -/* -* If first entry is valid check if the depth is less than 24 -* and if so check the rest of the entries to verify that they -* are all of this depth. -*/ -if (tbl8[tbl8_group_start].depth <=MAX_DEPTH_TBL24 ) { -for (i = (tbl8_group_start +1 ); i < tbl8_group_end; - i++) { - -if (tbl8[i].depth != - tbl8[tbl8_group_start].depth) { - -return -EEXIST ; - } - } -/* If all entries are the same return the tb8 index */ -return tbl8_group_start; - } - -return -EEXIST ; - } -/* -* If the first entry is invalid check if the rest of the entries in -* the tbl8 are invalid. -*/ -for (i = (tbl8_group_start +1 ); i < tbl8_group_end; i++) { -if (tbl8[i].valid) -return -EEXIST ; - } -/* If no valid entries are found then return -EINVAL. */ -return -EINVAL ; -} - -static int32_t -delete_depth_big_v20 (struct rte_lpm_v20 *lpm,uint32_t ip_masked, -uint8_t depth,int32_t sub_rule_index,uint8_t sub_rule_depth) -{ -uint32_t tbl24_index, tbl8_group_index, tbl8_group_start, tbl8_index, - tbl8_range, i; -int32_t tbl8_recycle_index; - -/* -* Calculate the index into tbl24 and range. Note: All depths larger -* than MAX_DEPTH_TBL24 are associated with only one tbl24 entry. -*/ - tbl24_index = ip_masked >>8 ; - -/* Calculate the index into tbl8 and range. */ - tbl8_group_index = lpm->tbl24[tbl24_index].group_idx; - tbl8_group_start = tbl8_group_index *RTE_LPM_TBL8_GROUP_NUM_ENTRIES ; - tbl8_index = tbl8_group_start + (ip_masked &0xFF ); - tbl8_range =depth_to_range (depth); - -if (sub_rule_index <0 ) { -/* -* Loop through the range of entries on tbl8 for which the -* rule_to_delete must be removed or modified. -*/ -for (i = tbl8_index; i < (tbl8_index + tbl8_range); i++) { -if (lpm->tbl8[i].depth <= depth) - lpm->tbl8[i].valid =INVALID ; - } - }else { -/* Set new tbl8 entry. */ -struct rte_lpm_tbl_entry_v20 new_tbl8_entry = { - .valid =VALID , - .depth = sub_rule_depth, - .valid_group = lpm->tbl8[tbl8_group_start].valid_group, - }; - - new_tbl8_entry.next_hop = - lpm->rules_tbl[sub_rule_index].next_hop; -/* -* Loop through the range of entries on tbl8 for which the -* rule_to_delete must be modified. -*/ -for (i = tbl8_index; i < (tbl8_index + tbl8_range); i++) { -if (lpm->tbl8[i].depth <= depth) -__atomic_store (&lpm->tbl8[i], &new_tbl8_entry, - __ATOMIC_RELAXED); - } - } - -/* -* Check if there are any valid entries in this tbl8 group. If all -* tbl8 entries are invalid we can free the tbl8 and invalidate the -* associated tbl24 entry. -*/ - - tbl8_recycle_index =tbl8_recycle_check_v20 (lpm->tbl8, tbl8_group_start); - -if (tbl8_recycle_index == -EINVAL ) { -/* Set tbl24 before freeing tbl8 to avoid race condition. -* Prevent the free of the tbl8 group from hoisting. -*/ - lpm->tbl24[tbl24_index].valid =0 ; -__atomic_thread_fence (__ATOMIC_RELEASE); -tbl8_free_v20 (lpm->tbl8, tbl8_group_start); - }else if (tbl8_recycle_index >-1 ) { -/* Update tbl24 entry. */ -struct rte_lpm_tbl_entry_v20 new_tbl24_entry = { - .next_hop = lpm->tbl8[tbl8_recycle_index].next_hop, - .valid =VALID , - .valid_group =0 , - .depth = lpm->tbl8[tbl8_recycle_index].depth, - }; - -/* Set tbl24 before freeing tbl8 to avoid race condition. -* Prevent the free of the tbl8 group from hoisting. -*/ -__atomic_store (&lpm->tbl24[tbl24_index], &new_tbl24_entry, - __ATOMIC_RELAXED); -__atomic_thread_fence (__ATOMIC_RELEASE); -tbl8_free_v20 (lpm->tbl8, tbl8_group_start); - } - -return 0 ; -} - -static int32_t -delete_depth_big_v1604 (struct rte_lpm *lpm,uint32_t ip_masked, +delete_depth_big (struct rte_lpm *lpm,uint32_t ip_masked,uint8_t depth,int32_t sub_rule_index,uint8_t sub_rule_depth) {#define group_idx next_hop
@@ -1811,7 +960,7 @@ delete_depth_big_v1604(struct rte_lpm *lpm, uint32_t ip_masked,* associated tbl24 entry. */ - tbl8_recycle_index =tbl8_recycle_check_v1604 (lpm->tbl8, tbl8_group_start); + tbl8_recycle_index =tbl8_recycle_check (lpm->tbl8, tbl8_group_start);if (tbl8_recycle_index == -EINVAL ) {/* Set tbl24 before freeing tbl8 to avoid race condition.
@@ -1819,7 +968,7 @@ delete_depth_big_v1604(struct rte_lpm *lpm, uint32_t ip_masked,*/ lpm->tbl24[tbl24_index].valid =0 ;__atomic_thread_fence (__ATOMIC_RELEASE); -tbl8_free_v1604 (lpm->tbl8, tbl8_group_start); +tbl8_free (lpm->tbl8, tbl8_group_start); }else if (tbl8_recycle_index >-1 ) {/* Update tbl24 entry. */ struct rte_lpm_tbl_entry new_tbl24_entry = {
@@ -1835,7 +984,7 @@ delete_depth_big_v1604(struct rte_lpm *lpm, uint32_t ip_masked,__atomic_store (&lpm->tbl24[tbl24_index], &new_tbl24_entry, __ATOMIC_RELAXED);__atomic_thread_fence (__ATOMIC_RELEASE); -tbl8_free_v1604 (lpm->tbl8, tbl8_group_start); +tbl8_free (lpm->tbl8, tbl8_group_start); }#undef group_idxreturn 0 ;
@@ -1844,8 +993,8 @@ delete_depth_big_v1604(struct rte_lpm *lpm, uint32_t ip_masked,/* * Deletes a rule */ -int __vsym -rte_lpm_delete_v20 (struct rte_lpm_v20 *lpm,uint32_t ip,uint8_t depth) +int +rte_lpm_delete (struct rte_lpm *lpm,uint32_t ip,uint8_t depth) {int32_t rule_to_delete_index, sub_rule_index;uint32_t ip_masked;
@@ -1864,7 +1013,7 @@ rte_lpm_delete_v20(struct rte_lpm_v20 *lpm, uint32_t ip, uint8_t depth)* Find the index of the input rule, that needs to be deleted, in the * rule table. */ - rule_to_delete_index =rule_find_v20 (lpm, ip_masked, depth); + rule_to_delete_index =rule_find (lpm, ip_masked, depth);/* * Check if rule_to_delete_index was found. If no rule was found the
@@ -1874,7 +1023,7 @@ rte_lpm_delete_v20(struct rte_lpm_v20 *lpm, uint32_t ip, uint8_t depth)return -EINVAL ;/* Delete the rule from the rule table. */ -rule_delete_v20 (lpm, rule_to_delete_index, depth); +rule_delete (lpm, rule_to_delete_index, depth);/* * Find rule to replace the rule_to_delete. If there is no rule to
@@ -1882,100 +1031,26 @@ rte_lpm_delete_v20(struct rte_lpm_v20 *lpm, uint32_t ip, uint8_t depth)* entries associated with this rule. */ sub_rule_depth =0 ; - sub_rule_index =find_previous_rule_v20 (lpm, ip, depth, &sub_rule_depth); + sub_rule_index =find_previous_rule (lpm, ip, depth, &sub_rule_depth);/* * If the input depth value is less than 25 use function * delete_depth_small otherwise use delete_depth_big. */ if (depth <=MAX_DEPTH_TBL24 ) { -return delete_depth_small_v20 (lpm, ip_masked, depth, +return delete_depth_small (lpm, ip_masked, depth, sub_rule_index, sub_rule_depth); }else {/* If depth > MAX_DEPTH_TBL24 */ -return delete_depth_big_v20 (lpm, ip_masked, depth, sub_rule_index, +return delete_depth_big (lpm, ip_masked, depth, sub_rule_index, sub_rule_depth); } } -VERSION_SYMBOL (rte_lpm_delete, _v20,2.0 ); - -int __vsym -rte_lpm_delete_v1604 (struct rte_lpm *lpm,uint32_t ip,uint8_t depth) -{ -int32_t rule_to_delete_index, sub_rule_index; -uint32_t ip_masked; -uint8_t sub_rule_depth; -/* -* Check input arguments. Note: IP must be a positive integer of 32 -* bits in length therefore it need not be checked. -*/ -if ((lpm ==NULL ) || (depth <1 ) || (depth >RTE_LPM_MAX_DEPTH )) { -return -EINVAL ; - } - - ip_masked = ip &depth_to_mask (depth); - -/* -* Find the index of the input rule, that needs to be deleted, in the -* rule table. -*/ - rule_to_delete_index =rule_find_v1604 (lpm, ip_masked, depth); - -/* -* Check if rule_to_delete_index was found. If no rule was found the -* function rule_find returns -EINVAL. -*/ -if (rule_to_delete_index <0 ) -return -EINVAL ; - -/* Delete the rule from the rule table. */ -rule_delete_v1604 (lpm, rule_to_delete_index, depth); - -/* -* Find rule to replace the rule_to_delete. If there is no rule to -* replace the rule_to_delete we return -1 and invalidate the table -* entries associated with this rule. -*/ - sub_rule_depth =0 ; - sub_rule_index =find_previous_rule_v1604 (lpm, ip, depth, &sub_rule_depth); - -/* -* If the input depth value is less than 25 use function -* delete_depth_small otherwise use delete_depth_big. -*/ -if (depth <=MAX_DEPTH_TBL24 ) { -return delete_depth_small_v1604 (lpm, ip_masked, depth, - sub_rule_index, sub_rule_depth); - }else {/* If depth > MAX_DEPTH_TBL24 */ -return delete_depth_big_v1604 (lpm, ip_masked, depth, sub_rule_index, - sub_rule_depth); - } -} -BIND_DEFAULT_SYMBOL (rte_lpm_delete, _v1604,16.04 ); -MAP_STATIC_SYMBOL(int rte_lpm_delete(struct rte_lpm *lpm, uint32_t ip, - uint8_t depth), rte_lpm_delete_v1604);/* * Delete all rules from the LPM table. */ -void __vsym -rte_lpm_delete_all_v20 (struct rte_lpm_v20 *lpm) -{ -/* Zero rule information. */ -memset (lpm->rule_info,0 ,sizeof (lpm->rule_info)); - -/* Zero tbl24. */ -memset (lpm->tbl24,0 ,sizeof (lpm->tbl24)); - -/* Zero tbl8. */ -memset (lpm->tbl8,0 ,sizeof (lpm->tbl8)); - -/* Delete all rules form the rules table. */ -memset (lpm->rules_tbl,0 ,sizeof (lpm->rules_tbl[0 ]) * lpm->max_rules); -} -VERSION_SYMBOL (rte_lpm_delete_all, _v20,2.0 ); - -void __vsym -rte_lpm_delete_all_v1604 (struct rte_lpm *lpm) +void +rte_lpm_delete_all (struct rte_lpm *lpm) {/* Zero rule information. */ memset (lpm->rule_info,0 ,sizeof (lpm->rule_info));
@@ -1990,6 +1065,3 @@ rte_lpm_delete_all_v1604(struct rte_lpm *lpm)/* Delete all rules form the rules table. */ memset (lpm->rules_tbl,0 ,sizeof (lpm->rules_tbl[0 ]) * lpm->max_rules); } -BIND_DEFAULT_SYMBOL (rte_lpm_delete_all, _v1604,16.04 ); -MAP_STATIC_SYMBOL(void rte_lpm_delete_all(struct rte_lpm *lpm), - rte_lpm_delete_all_v1604);
lib/librte_lpm/rte_lpm.h +0 -88
154 lines not on this page · raw message
lib/librte_lpm/rte_lpm6.c +18 -122
213 lines not on this page · raw message
lib/librte_lpm/rte_lpm6.h +0 -25
@@ -96,12 +96,6 @@ rte_lpm6_free(struct rte_lpm6 *lpm);int rte_lpm6_add (struct rte_lpm6 *lpm,uint8_t *ip,uint8_t depth,uint32_t next_hop); -int -rte_lpm6_add_v20 (struct rte_lpm6 *lpm,uint8_t *ip,uint8_t depth, -uint8_t next_hop); -int -rte_lpm6_add_v1705 (struct rte_lpm6 *lpm,uint8_t *ip,uint8_t depth, -uint32_t next_hop);/** * Check if a rule is present in the LPM table,
@@ -121,12 +115,6 @@ rte_lpm6_add_v1705(struct rte_lpm6 *lpm, uint8_t *ip, uint8_t depth,int rte_lpm6_is_rule_present (struct rte_lpm6 *lpm,uint8_t *ip,uint8_t depth,uint32_t *next_hop); -int -rte_lpm6_is_rule_present_v20 (struct rte_lpm6 *lpm,uint8_t *ip,uint8_t depth, -uint8_t *next_hop); -int -rte_lpm6_is_rule_present_v1705 (struct rte_lpm6 *lpm,uint8_t *ip,uint8_t depth, -uint32_t *next_hop);/** * Delete a rule from the LPM table.
@@ -184,11 +172,6 @@ rte_lpm6_delete_all(struct rte_lpm6 *lpm);*/ int rte_lpm6_lookup (const struct rte_lpm6 *lpm,uint8_t *ip,uint32_t *next_hop); -int -rte_lpm6_lookup_v20 (const struct rte_lpm6 *lpm,uint8_t *ip,uint8_t *next_hop); -int -rte_lpm6_lookup_v1705 (const struct rte_lpm6 *lpm,uint8_t *ip, -uint32_t *next_hop);/** * Lookup multiple IP addresses in an LPM table.
@@ -210,14 +193,6 @@ int rte_lpm6_lookup_bulk_func(const struct rte_lpm6 *lpm, uint8_t ips[][RTE_LPM6_IPV6_ADDR_SIZE], int32_t *next_hops, unsigned int n); -int -rte_lpm6_lookup_bulk_func_v20 (const struct rte_lpm6 *lpm, -uint8_t ips[][RTE_LPM6_IPV6_ADDR_SIZE ], -int16_t *next_hops,unsigned int n); -int -rte_lpm6_lookup_bulk_func_v1705 (const struct rte_lpm6 *lpm, -uint8_t ips[][RTE_LPM6_IPV6_ADDR_SIZE ], -int32_t *next_hops,unsigned int n); #ifdef __cplusplus }
lib/librte_lpm/rte_lpm_version.map +0 -11
@@ -1,23 +1,12 @@ DPDK_2.0 { global: - rte_lpm_add; - rte_lpm_create; - rte_lpm_delete; - rte_lpm_delete_all; - rte_lpm_find_existing; - rte_lpm_free; - rte_lpm_is_rule_present; - rte_lpm6_add; rte_lpm6_create; rte_lpm6_delete; rte_lpm6_delete_all; rte_lpm6_delete_bulk_func; rte_lpm6_find_existing; rte_lpm6_free; - rte_lpm6_is_rule_present; - rte_lpm6_lookup; - rte_lpm6_lookup_bulk_func; local: *; };
Signature · 1 line
2.17.1
PATCH v8 8/12 distributor: remove deprecated code
In reply to Anatoly BurakovFrom: Marcin Baran <[email protected]>
Remove code for old ABI versions ahead of ABI version bump.
---
Notes:
v5:
- Fixed shared library linking error due to versioning still enabled
v2:
- Moved this to before ABI version bump to avoid compile breakage
v2:
- Moved this to before ABI version bump to avoid compile breakage
lib/librte_distributor/rte_distributor.c | 74 +++++-------------- .../rte_distributor_v1705.h | 61 --------------- lib/librte_distributor/rte_distributor_v20.c | 9 --- 3 files changed, 18 insertions(+), 126 deletions(-) delete mode 100644 lib/librte_distributor/rte_distributor_v1705.h
lib/librte_distributor/rte_distributor.c +18 -56
@@ -18,7 +18,6 @@#include "rte_distributor.h" #include "rte_distributor_v20.h" -#include "rte_distributor_v1705.h" #include "distributor_private.h" TAILQ_HEAD (rte_dist_burst_list, rte_distributor);
@@ -32,8 +31,8 @@ EAL_REGISTER_TAILQ(rte_dist_burst_tailq)/**** Burst Packet APIs called by workers ****/ -void __vsym -rte_distributor_request_pkt_v1705 (struct rte_distributor *d, +void +rte_distributor_request_pkt (struct rte_distributor *d,unsigned int worker_id,struct rte_mbuf **oldpkt,unsigned int count) {
@@ -83,14 +82,9 @@ rte_distributor_request_pkt_v1705(struct rte_distributor *d,__atomic_store_n (retptr64, *retptr64 |RTE_DISTRIB_GET_BUF , __ATOMIC_RELEASE); } -BIND_DEFAULT_SYMBOL (rte_distributor_request_pkt, _v1705,17.05 ); -MAP_STATIC_SYMBOL(void rte_distributor_request_pkt(struct rte_distributor *d, -unsigned int worker_id,struct rte_mbuf **oldpkt, -unsigned int count), - rte_distributor_request_pkt_v1705); -int __vsym -rte_distributor_poll_pkt_v1705 (struct rte_distributor *d, +int +rte_distributor_poll_pkt (struct rte_distributor *d,unsigned int worker_id,struct rte_mbuf **pkts) {struct rte_distributor_buffer *buf = &d->bufs[worker_id];
@@ -129,13 +123,9 @@ rte_distributor_poll_pkt_v1705(struct rte_distributor *d,return count; } -BIND_DEFAULT_SYMBOL (rte_distributor_poll_pkt, _v1705,17.05 ); -MAP_STATIC_SYMBOL(int rte_distributor_poll_pkt(struct rte_distributor *d, -unsigned int worker_id,struct rte_mbuf **pkts), - rte_distributor_poll_pkt_v1705); -int __vsym -rte_distributor_get_pkt_v1705 (struct rte_distributor *d, +int +rte_distributor_get_pkt (struct rte_distributor *d,unsigned int worker_id,struct rte_mbuf **pkts,struct rte_mbuf **oldpkt,unsigned int return_count) {
@@ -163,14 +153,9 @@ rte_distributor_get_pkt_v1705(struct rte_distributor *d, }return count; } -BIND_DEFAULT_SYMBOL (rte_distributor_get_pkt, _v1705,17.05 ); -MAP_STATIC_SYMBOL(int rte_distributor_get_pkt(struct rte_distributor *d, -unsigned int worker_id,struct rte_mbuf **pkts, -struct rte_mbuf **oldpkt,unsigned int return_count), - rte_distributor_get_pkt_v1705); -int __vsym -rte_distributor_return_pkt_v1705 (struct rte_distributor *d, +int +rte_distributor_return_pkt (struct rte_distributor *d,unsigned int worker_id,struct rte_mbuf **oldpkt,int num) {struct rte_distributor_buffer *buf = &d->bufs[worker_id];
@@ -202,10 +187,6 @@ rte_distributor_return_pkt_v1705(struct rte_distributor *d,return 0 ; } -BIND_DEFAULT_SYMBOL (rte_distributor_return_pkt, _v1705,17.05 ); -MAP_STATIC_SYMBOL(int rte_distributor_return_pkt(struct rte_distributor *d, -unsigned int worker_id,struct rte_mbuf **oldpkt,int num), - rte_distributor_return_pkt_v1705);/**** APIs called on distributor core ***/
@@ -359,8 +340,8 @@ release(struct rte_distributor *d, unsigned int wkr)/* process a set of packets to distribute them to workers */ -int __vsym -rte_distributor_process_v1705 (struct rte_distributor *d, +int +rte_distributor_process (struct rte_distributor *d,struct rte_mbuf **mbufs,unsigned int num_mbufs) {unsigned int next_idx =0 ;
@@ -500,14 +481,10 @@ rte_distributor_process_v1705(struct rte_distributor *d,return num_mbufs; } -BIND_DEFAULT_SYMBOL (rte_distributor_process, _v1705,17.05 ); -MAP_STATIC_SYMBOL(int rte_distributor_process(struct rte_distributor *d, -struct rte_mbuf **mbufs,unsigned int num_mbufs), - rte_distributor_process_v1705);/* return to the caller, packets returned from workers */ -int __vsym -rte_distributor_returned_pkts_v1705 (struct rte_distributor *d, +int +rte_distributor_returned_pkts (struct rte_distributor *d,struct rte_mbuf **mbufs,unsigned int max_mbufs) {struct rte_distributor_returned_pkts *returns = &d->returns;
@@ -532,10 +509,6 @@ rte_distributor_returned_pkts_v1705(struct rte_distributor *d,return retval; } -BIND_DEFAULT_SYMBOL (rte_distributor_returned_pkts, _v1705,17.05 ); -MAP_STATIC_SYMBOL(int rte_distributor_returned_pkts(struct rte_distributor *d, -struct rte_mbuf **mbufs,unsigned int max_mbufs), - rte_distributor_returned_pkts_v1705);/* * Return the number of packets in-flight in a distributor, i.e. packets
@@ -556,8 +529,8 @@ total_outstanding(const struct rte_distributor *d)* Flush the distributor, so that there are no outstanding packets in flight or * queued up. */ -int __vsym -rte_distributor_flush_v1705 (struct rte_distributor *d) +int +rte_distributor_flush (struct rte_distributor *d) {unsigned int flushed;unsigned int wkr;
@@ -586,13 +559,10 @@ rte_distributor_flush_v1705(struct rte_distributor *d)return flushed; } -BIND_DEFAULT_SYMBOL (rte_distributor_flush, _v1705,17.05 ); -MAP_STATIC_SYMBOL(int rte_distributor_flush(struct rte_distributor *d), - rte_distributor_flush_v1705);/* clears the internal returns array in the distributor */ -void __vsym -rte_distributor_clear_returns_v1705 (struct rte_distributor *d) +void +rte_distributor_clear_returns (struct rte_distributor *d) {unsigned int wkr;
@@ -608,13 +578,10 @@ rte_distributor_clear_returns_v1705(struct rte_distributor *d)__atomic_store_n (&(d->bufs[wkr].retptr64[0 ]),0 , __ATOMIC_RELEASE); } -BIND_DEFAULT_SYMBOL (rte_distributor_clear_returns, _v1705,17.05 ); -MAP_STATIC_SYMBOL(void rte_distributor_clear_returns(struct rte_distributor *d), - rte_distributor_clear_returns_v1705);/* creates a distributor instance */ -struct rte_distributor * __vsym -rte_distributor_create_v1705 (const char *name, +struct rte_distributor * +rte_distributor_create (const char *name,unsigned int socket_id,unsigned int num_workers,unsigned int alg_type)
@@ -688,8 +655,3 @@ rte_distributor_create_v1705(const char *name,return d; } -BIND_DEFAULT_SYMBOL (rte_distributor_create, _v1705,17.05 ); -MAP_STATIC_SYMBOL(struct rte_distributor *rte_distributor_create( -const char *name,unsigned int socket_id, -unsigned int num_workers,unsigned int alg_type), - rte_distributor_create_v1705);
lib/librte_distributor/rte_distributor_v1705.h deleted +0 -61
61 lines not on this page · raw message
lib/librte_distributor/rte_distributor_v20.c +0 -9
@@ -41,7 +41,6 @@ rte_distributor_request_pkt_v20(struct rte_distributor_v20 *d,/* Sync with distributor on GET_BUF flag. */ __atomic_store_n (&(buf->bufptr64), req, __ATOMIC_RELEASE); } -VERSION_SYMBOL (rte_distributor_request_pkt, _v20,2.0 ); struct rte_mbuf * __vsym rte_distributor_poll_pkt_v20(struct rte_distributor_v20 *d,
@@ -57,7 +56,6 @@ rte_distributor_poll_pkt_v20(struct rte_distributor_v20 *d,int64_t ret = buf->bufptr64 >>RTE_DISTRIB_FLAG_BITS ;return (struct rte_mbuf *)((uintptr_t )ret); } -VERSION_SYMBOL (rte_distributor_poll_pkt, _v20,2.0 ); struct rte_mbuf * __vsym rte_distributor_get_pkt_v20(struct rte_distributor_v20 *d,
@@ -69,7 +67,6 @@ rte_distributor_get_pkt_v20(struct rte_distributor_v20 *d,rte_pause ();return ret; } -VERSION_SYMBOL (rte_distributor_get_pkt, _v20,2.0 ); int __vsym rte_distributor_return_pkt_v20(struct rte_distributor_v20 *d,
@@ -82,7 +79,6 @@ rte_distributor_return_pkt_v20(struct rte_distributor_v20 *d,__atomic_store_n (&(buf->bufptr64), req, __ATOMIC_RELEASE);return 0 ; } -VERSION_SYMBOL (rte_distributor_return_pkt, _v20,2.0 );/**** APIs called on distributor core ***/
@@ -318,7 +314,6 @@ rte_distributor_process_v20(struct rte_distributor_v20 *d, d->returns.count = ret_count;return num_mbufs; } -VERSION_SYMBOL (rte_distributor_process, _v20,2.0 );/* return to the caller, packets returned from workers */ int __vsym
@@ -339,7 +334,6 @@ rte_distributor_returned_pkts_v20(struct rte_distributor_v20 *d,return retval; } -VERSION_SYMBOL (rte_distributor_returned_pkts, _v20,2.0 );/* return the number of packets in-flight in a distributor, i.e. packets * being worked on or queued up in a backlog.
@@ -369,7 +363,6 @@ rte_distributor_flush_v20(struct rte_distributor_v20 *d)return flushed; } -VERSION_SYMBOL (rte_distributor_flush, _v20,2.0 );/* clears the internal returns array in the distributor */ void __vsym
@@ -380,7 +373,6 @@ rte_distributor_clear_returns_v20(struct rte_distributor_v20 *d)memset (d->returns.mbufs,0 ,sizeof (d->returns.mbufs));#endif } -VERSION_SYMBOL (rte_distributor_clear_returns, _v20,2.0 );/* creates a distributor instance */ struct rte_distributor_v20 * __vsym
@@ -424,4 +416,3 @@ rte_distributor_create_v20(const char *name,return d; } -VERSION_SYMBOL (rte_distributor_create, _v20,2.0 );
Signature · 1 line
2.17.1
PATCH v8 9/12 distributor: rename v2.0 ABI to _single suffix
In reply to Anatoly BurakovFrom: Marcin Baran <[email protected]>
The original ABI versioning was slightly misleading in that the DPDK 2.0 ABI was really a single mode for the distributor, and is used as such throughout the distributor code.
Fix this by renaming all _v20 API's to _single API's, and remove symbol versioning.
---
Notes:
v4:
- Changed it back to how it was with v2
- Removed remaining v2.0 symbols
v3:
- Removed single mode from distributor as per Dave's comments
v2:
- Moved this to before ABI version bump to avoid compile breakage
lib/librte_distributor/Makefile | 2 +-
lib/librte_distributor/distributor_private.h | 10 +--
lib/librte_distributor/meson.build | 2 +-
lib/librte_distributor/rte_distributor.c | 24 +++----
...ributor_v20.c => rte_distributor_single.c} | 64 +++++++++----------
...ributor_v20.h => rte_distributor_single.h} | 26 ++++----
.../rte_distributor_version.map | 18 +-----
7 files changed, 66 insertions(+), 80 deletions(-)
rename lib/librte_distributor/{rte_distributor_v20.c => rte_distributor_single.c} (87%)
rename lib/librte_distributor/{rte_distributor_v20.h => rte_distributor_single.h} (89%)lib/librte_distributor/Makefile +1 -1
@@ -13,7 +13,7 @@ LDLIBS += -lrte_eal -lrte_mbuf -lrte_ethdev EXPORT_MAP := rte_distributor_version.map # all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_DISTRIBUTOR) := rte_distributor_v20.c +SRCS-$(CONFIG_RTE_LIBRTE_DISTRIBUTOR) := rte_distributor_single.c SRCS-$(CONFIG_RTE_LIBRTE_DISTRIBUTOR) += rte_distributor.c ifeq ($(CONFIG_RTE_ARCH_X86),y) SRCS-$(CONFIG_RTE_LIBRTE_DISTRIBUTOR) += rte_distributor_match_sse.c
lib/librte_distributor/distributor_private.h +5 -5
@@ -55,7 +55,7 @@ extern "C" {* the next cache line to worker 0, we pad this out to three cache lines. * Only 64-bits of the memory is actually used though. */ -union rte_distributor_buffer_v20 { +union rte_distributor_buffer_single {volatile int64_t bufptr64;char pad[RTE_CACHE_LINE_SIZE *3 ]; } __rte_cache_aligned;
@@ -80,8 +80,8 @@ struct rte_distributor_returned_pkts {struct rte_mbuf *mbufs[RTE_DISTRIB_MAX_RETURNS ]; }; -struct rte_distributor_v20 { -TAILQ_ENTRY (rte_distributor_v20) next;/**< Next in list. */ +struct rte_distributor_single { +TAILQ_ENTRY (rte_distributor_single) next;/**< Next in list. */ char name[RTE_DISTRIBUTOR_NAMESIZE ];/**< Name of the ring. */ unsigned int num_workers;/**< Number of workers polling */
@@ -96,7 +96,7 @@ struct rte_distributor_v20 {struct rte_distributor_backlog backlog[RTE_DISTRIB_MAX_WORKERS ]; -union rte_distributor_buffer_v20 bufs[RTE_DISTRIB_MAX_WORKERS ]; +union rte_distributor_buffer_single bufs[RTE_DISTRIB_MAX_WORKERS ];struct rte_distributor_returned_pkts returns; };
@@ -154,7 +154,7 @@ struct rte_distributor {enum rte_distributor_match_function dist_match_fn; -struct rte_distributor_v20 *d_v20; +struct rte_distributor_single *d_single; };void
lib/librte_distributor/meson.build +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Intel Corporation -sources = files('rte_distributor.c', 'rte_distributor_v20.c') +sources = files('rte_distributor.c', 'rte_distributor_single.c') if arch_subdir == 'x86' sources += files('rte_distributor_match_sse.c') else
lib/librte_distributor/rte_distributor.c +13 -11
@@ -17,7 +17,7 @@#include <rte_tailq.h> #include "rte_distributor.h" -#include "rte_distributor_v20.h" +#include "rte_distributor_single.h" #include "distributor_private.h" TAILQ_HEAD (rte_dist_burst_list, rte_distributor);
@@ -42,7 +42,7 @@ rte_distributor_request_pkt(struct rte_distributor *d,volatile int64_t *retptr64;if (unlikely (d->alg_type ==RTE_DIST_ALG_SINGLE )) { -rte_distributor_request_pkt_v20 (d->d_v20, +rte_distributor_request_pkt_single (d->d_single, worker_id, oldpkt[0 ]);return ; }
@@ -93,7 +93,8 @@ rte_distributor_poll_pkt(struct rte_distributor *d,unsigned int i;if (unlikely (d->alg_type ==RTE_DIST_ALG_SINGLE )) { - pkts[0 ] =rte_distributor_poll_pkt_v20 (d->d_v20, worker_id); + pkts[0 ] =rte_distributor_poll_pkt_single (d->d_single, + worker_id);return (pkts[0 ]) ?1 :0 ; }
@@ -133,7 +134,7 @@ rte_distributor_get_pkt(struct rte_distributor *d,if (unlikely (d->alg_type ==RTE_DIST_ALG_SINGLE )) {if (return_count <=1 ) { - pkts[0 ] =rte_distributor_get_pkt_v20 (d->d_v20, + pkts[0 ] =rte_distributor_get_pkt_single (d->d_single, worker_id, oldpkt[0 ]);return (pkts[0 ]) ?1 :0 ; }else
@@ -163,7 +164,7 @@ rte_distributor_return_pkt(struct rte_distributor *d,if (unlikely (d->alg_type ==RTE_DIST_ALG_SINGLE )) {if (num ==1 ) -return rte_distributor_return_pkt_v20 (d->d_v20, +return rte_distributor_return_pkt_single (d->d_single, worker_id, oldpkt[0 ]);else return -EINVAL ;
@@ -354,7 +355,8 @@ rte_distributor_process(struct rte_distributor *d,if (d->alg_type ==RTE_DIST_ALG_SINGLE ) {/* Call the old API */ -return rte_distributor_process_v20 (d->d_v20, mbufs, num_mbufs); +return rte_distributor_process_single (d->d_single, + mbufs, num_mbufs); }if (unlikely (num_mbufs ==0 )) {
@@ -494,7 +496,7 @@ rte_distributor_returned_pkts(struct rte_distributor *d,if (d->alg_type ==RTE_DIST_ALG_SINGLE ) {/* Call the old API */ -return rte_distributor_returned_pkts_v20 (d->d_v20, +return rte_distributor_returned_pkts_single (d->d_single, mbufs, max_mbufs); }
@@ -537,7 +539,7 @@ rte_distributor_flush(struct rte_distributor *d)if (d->alg_type ==RTE_DIST_ALG_SINGLE ) {/* Call the old API */ -return rte_distributor_flush_v20 (d->d_v20); +return rte_distributor_flush_single (d->d_single); } flushed =total_outstanding (d);
@@ -568,7 +570,7 @@ rte_distributor_clear_returns(struct rte_distributor *d)if (d->alg_type ==RTE_DIST_ALG_SINGLE ) {/* Call the old API */ -rte_distributor_clear_returns_v20 (d->d_v20); +rte_distributor_clear_returns_single (d->d_single);return ; }
@@ -610,9 +612,9 @@ rte_distributor_create(const char *name, rte_errno =ENOMEM ;return NULL ; } - d->d_v20 =rte_distributor_create_v20 (name, + d->d_single =rte_distributor_create_single (name, socket_id, num_workers); -if (d->d_v20 ==NULL ) { +if (d->d_single ==NULL ) {free (d);/* rte_errno will have been set */ return NULL ;
lib/librte_distributor/rte_distributor_single.c renamed from lib/librte_distributor/rte_distributor_v20.c +32 -32
169 lines not on this page · raw message
lib/librte_distributor/rte_distributor_single.h renamed from lib/librte_distributor/rte_distributor_v20.h +13 -13
@@ -2,8 +2,8 @@* Copyright(c) 2010-2014 Intel Corporation */ -#ifndef _RTE_DISTRIB_V20_H_ -#define _RTE_DISTRIB_V20_H_ +#ifndef _RTE_DISTRIB_SINGLE_H_ +#define _RTE_DISTRIB_SINGLE_H_/** * @file
@@ -19,7 +19,7 @@ extern "C" {#define RTE_DISTRIBUTOR_NAMESIZE 32/**< Length of name for instance */ -struct rte_distributor_v20 ; +struct rte_distributor_single ;struct rte_mbuf ;/**
@@ -38,8 +38,8 @@ struct rte_mbuf;* @return * The newly created distributor instance */ -struct rte_distributor_v20 * -rte_distributor_create_v20 (const char *name,unsigned int socket_id, +struct rte_distributor_single * +rte_distributor_create_single (const char *name,unsigned int socket_id,unsigned int num_workers);/* *** APIS to be called on the distributor lcore *** */
@@ -74,7 +74,7 @@ rte_distributor_create_v20(const char *name, unsigned int socket_id,* The number of mbufs processed. */ int -rte_distributor_process_v20 (struct rte_distributor_v20 *d, +rte_distributor_process_single (struct rte_distributor_single *d,struct rte_mbuf **mbufs,unsigned int num_mbufs);/**
@@ -92,7 +92,7 @@ rte_distributor_process_v20(struct rte_distributor_v20 *d,* The number of mbufs returned in the mbufs array. */ int -rte_distributor_returned_pkts_v20 (struct rte_distributor_v20 *d, +rte_distributor_returned_pkts_single (struct rte_distributor_single *d,struct rte_mbuf **mbufs,unsigned int max_mbufs);/**
@@ -107,7 +107,7 @@ rte_distributor_returned_pkts_v20(struct rte_distributor_v20 *d,* The number of queued/in-flight packets that were completed by this call. */ int -rte_distributor_flush_v20 (struct rte_distributor_v20 *d); +rte_distributor_flush_single (struct rte_distributor_single *d);/** * Clears the array of returned packets used as the source for the
@@ -119,7 +119,7 @@ rte_distributor_flush_v20(struct rte_distributor_v20 *d);* The distributor instance to be used */ void -rte_distributor_clear_returns_v20 (struct rte_distributor_v20 *d); +rte_distributor_clear_returns_single (struct rte_distributor_single *d);/* *** APIS to be called on the worker lcores *** */ /*
@@ -148,7 +148,7 @@ rte_distributor_clear_returns_v20(struct rte_distributor_v20 *d);* A new packet to be processed by the worker thread. */ struct rte_mbuf * -rte_distributor_get_pkt_v20 (struct rte_distributor_v20 *d, +rte_distributor_get_pkt_single (struct rte_distributor_single *d,unsigned int worker_id,struct rte_mbuf *oldpkt);/**
@@ -164,7 +164,7 @@ rte_distributor_get_pkt_v20(struct rte_distributor_v20 *d,* The previous packet being processed by the worker */ int -rte_distributor_return_pkt_v20 (struct rte_distributor_v20 *d, +rte_distributor_return_pkt_single (struct rte_distributor_single *d,unsigned int worker_id,struct rte_mbuf *mbuf);/**
@@ -188,7 +188,7 @@ rte_distributor_return_pkt_v20(struct rte_distributor_v20 *d,* The previous packet, if any, being processed by the worker */ void -rte_distributor_request_pkt_v20 (struct rte_distributor_v20 *d, +rte_distributor_request_pkt_single (struct rte_distributor_single *d,unsigned int worker_id,struct rte_mbuf *oldpkt);/**
@@ -208,7 +208,7 @@ rte_distributor_request_pkt_v20(struct rte_distributor_v20 *d,* packet is yet available. */ struct rte_mbuf * -rte_distributor_poll_pkt_v20 (struct rte_distributor_v20 *d, +rte_distributor_poll_pkt_single (struct rte_distributor_single *d,unsigned int worker_id);#ifdef __cplusplus
lib/librte_distributor/rte_distributor_version.map +1 -17
@@ -1,19 +1,3 @@ -DPDK_2.0 { - global: - - rte_distributor_clear_returns; - rte_distributor_create; - rte_distributor_flush; - rte_distributor_get_pkt; - rte_distributor_poll_pkt; - rte_distributor_process; - rte_distributor_request_pkt; - rte_distributor_return_pkt; - rte_distributor_returned_pkts; - - local: *; -}; - DPDK_17.05 { global:
@@ -26,4 +10,4 @@ DPDK_17.05 { rte_distributor_request_pkt; rte_distributor_return_pkt; rte_distributor_returned_pkts; -} DPDK_2.0; +};
Signature · 1 line
2.17.1
PATCH v8 10/12 drivers/octeontx: add missing public symbol
In reply to Anatoly BurakovThe logtype symbol was missing from the .map file. Add it.
---
Notes:
v2:
- add this patch to avoid compile breakage when bumping ABI
drivers/common/octeontx/rte_common_octeontx_version.map | 1 + 1 file changed, 1 insertion(+)
drivers/common/octeontx/rte_common_octeontx_version.map +1 -0
@@ -1,6 +1,7 @@ DPDK_18.05 { global: + octeontx_logtype_mbox; octeontx_mbox_set_ram_mbox_base; octeontx_mbox_set_reg; octeontx_mbox_send;
Signature · 1 line
2.17.1
PATCH v8 11/12 build: change ABI version to 20.0
In reply to Anatoly BurakovFrom: Pawel Modrak <[email protected]>
Merge all vesions in linker version script files to DPDK_20.0.
This commit was generated by running the following command:
:~/DPDK$ buildtools/update-abi.sh 20.0
--- .../rte_pmd_bbdev_fpga_lte_fec_version.map | 8 +- .../null/rte_pmd_bbdev_null_version.map | 2 +- .../rte_pmd_bbdev_turbo_sw_version.map | 2 +- drivers/bus/dpaa/rte_bus_dpaa_version.map | 113 +++--- drivers/bus/fslmc/rte_bus_fslmc_version.map | 154 ++++----- drivers/bus/ifpga/rte_bus_ifpga_version.map | 14 +- drivers/bus/pci/rte_bus_pci_version.map | 2 +- drivers/bus/vdev/rte_bus_vdev_version.map | 12 +- drivers/bus/vmbus/rte_bus_vmbus_version.map | 12 +- drivers/common/cpt/rte_common_cpt_version.map | 9 +- .../common/dpaax/rte_common_dpaax_version.map | 14 +- .../common/mvep/rte_common_mvep_version.map | 6 +- .../octeontx/rte_common_octeontx_version.map | 6 +- .../rte_common_octeontx2_version.map | 16 +- .../compress/isal/rte_pmd_isal_version.map | 2 +- .../rte_pmd_octeontx_compress_version.map | 2 +- drivers/compress/qat/rte_pmd_qat_version.map | 2 +- .../compress/zlib/rte_pmd_zlib_version.map | 2 +- .../aesni_gcm/rte_pmd_aesni_gcm_version.map | 2 +- .../aesni_mb/rte_pmd_aesni_mb_version.map | 2 +- .../crypto/armv8/rte_pmd_armv8_version.map | 2 +- .../caam_jr/rte_pmd_caam_jr_version.map | 3 +- drivers/crypto/ccp/rte_pmd_ccp_version.map | 3 +- .../dpaa2_sec/rte_pmd_dpaa2_sec_version.map | 10 +- .../dpaa_sec/rte_pmd_dpaa_sec_version.map | 10 +- .../crypto/kasumi/rte_pmd_kasumi_version.map | 2 +- .../crypto/mvsam/rte_pmd_mvsam_version.map | 2 +- .../crypto/nitrox/rte_pmd_nitrox_version.map | 2 +- .../null/rte_pmd_null_crypto_version.map | 2 +- .../rte_pmd_octeontx_crypto_version.map | 3 +- .../rte_pmd_octeontx2_crypto_version.map | 3 +- .../openssl/rte_pmd_openssl_version.map | 2 +- .../rte_pmd_crypto_scheduler_version.map | 19 +- .../crypto/snow3g/rte_pmd_snow3g_version.map | 2 +- .../virtio/rte_pmd_virtio_crypto_version.map | 2 +- drivers/crypto/zuc/rte_pmd_zuc_version.map | 2 +- .../event/dpaa/rte_pmd_dpaa_event_version.map | 3 +- .../dpaa2/rte_pmd_dpaa2_event_version.map | 2 +- .../event/dsw/rte_pmd_dsw_event_version.map | 2 +- .../rte_pmd_octeontx_event_version.map | 2 +- .../rte_pmd_octeontx2_event_version.map | 3 +- .../event/opdl/rte_pmd_opdl_event_version.map | 2 +- .../rte_pmd_skeleton_event_version.map | 3 +- drivers/event/sw/rte_pmd_sw_event_version.map | 2 +- .../bucket/rte_mempool_bucket_version.map | 3 +- .../mempool/dpaa/rte_mempool_dpaa_version.map | 2 +- .../dpaa2/rte_mempool_dpaa2_version.map | 12 +- .../octeontx/rte_mempool_octeontx_version.map | 2 +- .../rte_mempool_octeontx2_version.map | 4 +- .../mempool/ring/rte_mempool_ring_version.map | 3 +- .../stack/rte_mempool_stack_version.map | 3 +- .../af_packet/rte_pmd_af_packet_version.map | 3 +- drivers/net/af_xdp/rte_pmd_af_xdp_version.map | 2 +- drivers/net/ark/rte_pmd_ark_version.map | 5 +- .../net/atlantic/rte_pmd_atlantic_version.map | 4 +- drivers/net/avp/rte_pmd_avp_version.map | 2 +- drivers/net/axgbe/rte_pmd_axgbe_version.map | 2 +- drivers/net/bnx2x/rte_pmd_bnx2x_version.map | 3 +- drivers/net/bnxt/rte_pmd_bnxt_version.map | 4 +- drivers/net/bonding/rte_pmd_bond_version.map | 47 +-- drivers/net/cxgbe/rte_pmd_cxgbe_version.map | 3 +- drivers/net/dpaa/rte_pmd_dpaa_version.map | 11 +- drivers/net/dpaa2/rte_pmd_dpaa2_version.map | 12 +- drivers/net/e1000/rte_pmd_e1000_version.map | 3 +- drivers/net/ena/rte_pmd_ena_version.map | 3 +- drivers/net/enetc/rte_pmd_enetc_version.map | 3 +- drivers/net/enic/rte_pmd_enic_version.map | 3 +- .../net/failsafe/rte_pmd_failsafe_version.map | 3 +- drivers/net/fm10k/rte_pmd_fm10k_version.map | 3 +- drivers/net/hinic/rte_pmd_hinic_version.map | 3 +- drivers/net/hns3/rte_pmd_hns3_version.map | 4 +- drivers/net/i40e/rte_pmd_i40e_version.map | 65 +--- drivers/net/iavf/rte_pmd_iavf_version.map | 3 +- drivers/net/ice/rte_pmd_ice_version.map | 3 +- drivers/net/ifc/rte_pmd_ifc_version.map | 3 +- drivers/net/ipn3ke/rte_pmd_ipn3ke_version.map | 3 +- drivers/net/ixgbe/rte_pmd_ixgbe_version.map | 62 ++-- drivers/net/kni/rte_pmd_kni_version.map | 3 +- .../net/liquidio/rte_pmd_liquidio_version.map | 3 +- drivers/net/memif/rte_pmd_memif_version.map | 5 +- drivers/net/mlx4/rte_pmd_mlx4_version.map | 3 +- drivers/net/mlx5/rte_pmd_mlx5_version.map | 2 +- drivers/net/mvneta/rte_pmd_mvneta_version.map | 2 +- drivers/net/mvpp2/rte_pmd_mvpp2_version.map | 2 +- drivers/net/netvsc/rte_pmd_netvsc_version.map | 4 +- drivers/net/nfb/rte_pmd_nfb_version.map | 3 +- drivers/net/nfp/rte_pmd_nfp_version.map | 2 +- drivers/net/null/rte_pmd_null_version.map | 3 +- .../net/octeontx/rte_pmd_octeontx_version.map | 10 +- .../octeontx2/rte_pmd_octeontx2_version.map | 3 +- drivers/net/pcap/rte_pmd_pcap_version.map | 3 +- drivers/net/pfe/rte_pmd_pfe_version.map | 3 +- drivers/net/qede/rte_pmd_qede_version.map | 3 +- drivers/net/ring/rte_pmd_ring_version.map | 10 +- drivers/net/sfc/rte_pmd_sfc_version.map | 3 +- .../net/softnic/rte_pmd_softnic_version.map | 2 +- .../net/szedata2/rte_pmd_szedata2_version.map | 2 +- drivers/net/tap/rte_pmd_tap_version.map | 3 +- .../net/thunderx/rte_pmd_thunderx_version.map | 3 +- .../rte_pmd_vdev_netvsc_version.map | 3 +- drivers/net/vhost/rte_pmd_vhost_version.map | 11 +- drivers/net/virtio/rte_pmd_virtio_version.map | 3 +- .../net/vmxnet3/rte_pmd_vmxnet3_version.map | 3 +- .../rte_rawdev_dpaa2_cmdif_version.map | 3 +- .../rte_rawdev_dpaa2_qdma_version.map | 4 +- .../raw/ifpga/rte_rawdev_ifpga_version.map | 3 +- drivers/raw/ioat/rte_rawdev_ioat_version.map | 3 +- drivers/raw/ntb/rte_rawdev_ntb_version.map | 5 +- .../rte_rawdev_octeontx2_dma_version.map | 3 +- .../skeleton/rte_rawdev_skeleton_version.map | 3 +- lib/librte_acl/rte_acl_version.map | 2 +- .../rte_bitratestats_version.map | 2 +- lib/librte_cfgfile/rte_cfgfile_version.map | 34 +- lib/librte_cmdline/rte_cmdline_version.map | 10 +- .../rte_cryptodev_version.map | 102 ++---- .../rte_distributor_version.map | 4 +- lib/librte_eal/rte_eal_version.map | 324 ++++++------------ lib/librte_efd/rte_efd_version.map | 2 +- lib/librte_ethdev/rte_ethdev_version.map | 160 +++------ lib/librte_eventdev/rte_eventdev_version.map | 130 +++---- lib/librte_gro/rte_gro_version.map | 2 +- lib/librte_gso/rte_gso_version.map | 2 +- lib/librte_hash/rte_hash_version.map | 43 +-- lib/librte_ip_frag/rte_ip_frag_version.map | 10 +- lib/librte_jobstats/rte_jobstats_version.map | 10 +- lib/librte_kni/rte_kni_version.map | 2 +- lib/librte_kvargs/rte_kvargs_version.map | 4 +- .../rte_latencystats_version.map | 2 +- lib/librte_lpm/rte_lpm_version.map | 32 +- lib/librte_mbuf/rte_mbuf_version.map | 49 +-- lib/librte_member/rte_member_version.map | 2 +- lib/librte_mempool/rte_mempool_version.map | 44 +-- lib/librte_meter/rte_meter_version.map | 13 +- lib/librte_metrics/rte_metrics_version.map | 2 +- lib/librte_net/rte_net_version.map | 23 +- lib/librte_pci/rte_pci_version.map | 2 +- lib/librte_pdump/rte_pdump_version.map | 2 +- lib/librte_pipeline/rte_pipeline_version.map | 36 +- lib/librte_port/rte_port_version.map | 64 +--- lib/librte_power/rte_power_version.map | 24 +- lib/librte_rawdev/rte_rawdev_version.map | 4 +- lib/librte_reorder/rte_reorder_version.map | 8 +- lib/librte_ring/rte_ring_version.map | 10 +- lib/librte_sched/rte_sched_version.map | 14 +- lib/librte_security/rte_security_version.map | 2 +- lib/librte_table/rte_table_version.map | 2 +- lib/librte_timer/rte_timer_version.map | 21 +- lib/librte_vhost/rte_vhost_version.map | 52 +-- 148 files changed, 707 insertions(+), 1426 deletions(-)
drivers/baseband/fpga_lte_fec/rte_pmd_bbdev_fpga_lte_fec_version.map +4 -4
@@ -1,10 +1,10 @@ -DPDK_19.08 { - local: *; +DPDK_20.0 { + local: *; }; EXPERIMENTAL { - global: + global: - fpga_lte_fec_configure; + fpga_lte_fec_configure; };
drivers/baseband/null/rte_pmd_bbdev_null_version.map +1 -1
@@ -1,3 +1,3 @@ -DPDK_18.02 { +DPDK_20.0 { local: *; };
drivers/baseband/turbo_sw/rte_pmd_bbdev_turbo_sw_version.map +1 -1
@@ -1,3 +1,3 @@ -DPDK_18.02 { +DPDK_20.0 { local: *; };
drivers/bus/dpaa/rte_bus_dpaa_version.map +40 -73
167 lines not on this page · raw message
drivers/bus/fslmc/rte_bus_fslmc_version.map +60 -94
204 lines not on this page · raw message
drivers/bus/ifpga/rte_bus_ifpga_version.map +4 -10
@@ -1,17 +1,11 @@ -DPDK_18.05 { +DPDK_20.0 { global: - rte_ifpga_get_integer32_arg; - rte_ifpga_get_string_arg; rte_ifpga_driver_register; rte_ifpga_driver_unregister; + rte_ifpga_find_afu_by_name; + rte_ifpga_get_integer32_arg; + rte_ifpga_get_string_arg; local: *; }; - -DPDK_19.05 { - global: - - rte_ifpga_find_afu_by_name; - -} DPDK_18.05;
drivers/bus/pci/rte_bus_pci_version.map +1 -1
@@ -1,4 +1,4 @@ -DPDK_17.11 { +DPDK_20.0 { global: rte_pci_dump;
drivers/bus/vdev/rte_bus_vdev_version.map +3 -9
@@ -1,18 +1,12 @@ -DPDK_17.11 { +DPDK_20.0 { global: + rte_vdev_add_custom_scan; rte_vdev_init; rte_vdev_register; + rte_vdev_remove_custom_scan; rte_vdev_uninit; rte_vdev_unregister; local: *; }; - -DPDK_18.02 { - global: - - rte_vdev_add_custom_scan; - rte_vdev_remove_custom_scan; - -} DPDK_17.11;
drivers/bus/vmbus/rte_bus_vmbus_version.map +2 -10
@@ -1,6 +1,4 @@ -/* SPDX-License-Identifier: BSD-3-Clause */ - -DPDK_18.08 { +DPDK_20.0 { global: rte_vmbus_chan_close;
@@ -20,6 +18,7 @@ DPDK_18.08 { rte_vmbus_probe; rte_vmbus_register; rte_vmbus_scan; + rte_vmbus_set_latency; rte_vmbus_sub_channel_index; rte_vmbus_subchan_open; rte_vmbus_unmap_device;
@@ -27,10 +26,3 @@ DPDK_18.08 { local: *; }; - -DPDK_18.11 { - global: - - rte_vmbus_set_latency; - -} DPDK_18.08;
drivers/common/cpt/rte_common_cpt_version.map +2 -7
@@ -1,14 +1,9 @@ -DPDK_18.11 { +DPDK_20.0 { global: + cpt_pmd_ops_helper_asym_get_mlen; cpt_pmd_ops_helper_get_mlen_direct_mode; cpt_pmd_ops_helper_get_mlen_sg_mode; -}; - -DPDK_19.11 { - global: - - cpt_pmd_ops_helper_asym_get_mlen; local: *; };
drivers/common/dpaax/rte_common_dpaax_version.map +4 -10
@@ -1,29 +1,23 @@ -DPDK_18.11 { +DPDK_20.0 { global: - dpaax_iova_table_update; dpaax_iova_table_depopulate; dpaax_iova_table_dump; dpaax_iova_table_p; dpaax_iova_table_populate; - - local: *; -}; - -DPDK_19.11 { - global: + dpaax_iova_table_update; of_device_is_available; of_device_is_compatible; of_find_compatible_node; of_find_node_by_phandle; of_get_address; of_get_mac_address; + of_get_next_child; of_get_parent; of_get_property; of_init_path; of_n_addr_cells; of_translate_address; - of_get_next_child; local: *; -} DPDK_18.11; +};
drivers/common/mvep/rte_common_mvep_version.map +4 -2
@@ -1,6 +1,8 @@ -DPDK_18.11 { +DPDK_20.0 { global: - rte_mvep_init; rte_mvep_deinit; + rte_mvep_init; + + local: *; };
drivers/common/octeontx/rte_common_octeontx_version.map +4 -2
@@ -1,8 +1,10 @@ -DPDK_18.05 { +DPDK_20.0 { global: octeontx_logtype_mbox; + octeontx_mbox_send; octeontx_mbox_set_ram_mbox_base; octeontx_mbox_set_reg; - octeontx_mbox_send; + + local: *; };
drivers/common/octeontx2/rte_common_octeontx2_version.map +6 -10
@@ -1,39 +1,35 @@ -DPDK_19.08 { +DPDK_20.0 { global: otx2_dev_active_vfs; otx2_dev_fini; otx2_dev_priv_init; - + otx2_disable_irqs; + otx2_intra_dev_get_cfg; otx2_logtype_base; otx2_logtype_dpi; otx2_logtype_mbox; + otx2_logtype_nix; otx2_logtype_npa; otx2_logtype_npc; - otx2_logtype_nix; otx2_logtype_sso; - otx2_logtype_tm; otx2_logtype_tim; - + otx2_logtype_tm; otx2_mbox_alloc_msg_rsp; otx2_mbox_get_rsp; otx2_mbox_get_rsp_tmo; otx2_mbox_id2name; otx2_mbox_msg_send; otx2_mbox_wait_for_rsp; - - otx2_intra_dev_get_cfg; otx2_npa_lf_active; otx2_npa_lf_obj_get; otx2_npa_lf_obj_ref; otx2_npa_pf_func_get; otx2_npa_set_defaults; + otx2_register_irq; otx2_sso_pf_func_get; otx2_sso_pf_func_set; - - otx2_disable_irqs; otx2_unregister_irq; - otx2_register_irq; local: *; };
drivers/compress/isal/rte_pmd_isal_version.map +1 -1
@@ -1,3 +1,3 @@ -DPDK_18.05 { +DPDK_20.0 { local: *; };
drivers/compress/octeontx/rte_pmd_octeontx_compress_version.map +1 -1
@@ -1,3 +1,3 @@ -DPDK_18.08 { +DPDK_20.0 { local: *; };
drivers/compress/qat/rte_pmd_qat_version.map +1 -1
@@ -1,3 +1,3 @@ -DPDK_18.08 { +DPDK_20.0 { local: *; };
drivers/compress/zlib/rte_pmd_zlib_version.map +1 -1
@@ -1,3 +1,3 @@ -DPDK_18.08 { +DPDK_20.0 { local: *; };
drivers/crypto/aesni_gcm/rte_pmd_aesni_gcm_version.map +1 -1
@@ -1,3 +1,3 @@ -DPDK_16.04 { +DPDK_20.0 { local: *; };
drivers/crypto/aesni_mb/rte_pmd_aesni_mb_version.map +1 -1
@@ -1,3 +1,3 @@ -DPDK_2.2 { +DPDK_20.0 { local: *; };
drivers/crypto/armv8/rte_pmd_armv8_version.map +1 -1
@@ -1,3 +1,3 @@ -DPDK_17.02 { +DPDK_20.0 { local: *; };
drivers/crypto/caam_jr/rte_pmd_caam_jr_version.map +1 -2
@@ -1,4 +1,3 @@ -DPDK_18.11 { - +DPDK_20.0 { local: *; };
drivers/crypto/ccp/rte_pmd_ccp_version.map +1 -2
@@ -1,4 +1,3 @@ -DPDK_18.05 { - +DPDK_20.0 { local: *; };
drivers/crypto/dpaa2_sec/rte_pmd_dpaa2_sec_version.map +3 -7
@@ -1,12 +1,8 @@ -DPDK_17.05 { - - local: *; -}; - -DPDK_18.11 { +DPDK_20.0 { global: dpaa2_sec_eventq_attach; dpaa2_sec_eventq_detach; -} DPDK_17.05; + local: *; +};
drivers/crypto/dpaa_sec/rte_pmd_dpaa_sec_version.map +3 -7
@@ -1,12 +1,8 @@ -DPDK_17.11 { - - local: *; -}; - -DPDK_19.11 { +DPDK_20.0 { global: dpaa_sec_eventq_attach; dpaa_sec_eventq_detach; -} DPDK_17.11; + local: *; +};
drivers/crypto/kasumi/rte_pmd_kasumi_version.map +1 -1
@@ -1,3 +1,3 @@ -DPDK_16.07 { +DPDK_20.0 { local: *; };
drivers/crypto/mvsam/rte_pmd_mvsam_version.map +1 -1
@@ -1,3 +1,3 @@ -DPDK_17.11 { +DPDK_20.0 { local: *; };
drivers/crypto/nitrox/rte_pmd_nitrox_version.map +1 -1
@@ -1,3 +1,3 @@ -DPDK_19.11 { +DPDK_20.0 { local: *; };
drivers/crypto/null/rte_pmd_null_crypto_version.map +1 -1
@@ -1,3 +1,3 @@ -DPDK_16.04 { +DPDK_20.0 { local: *; };
drivers/crypto/octeontx/rte_pmd_octeontx_crypto_version.map +1 -2
@@ -1,4 +1,3 @@ -DPDK_18.11 { - +DPDK_20.0 { local: *; };
drivers/crypto/octeontx2/rte_pmd_octeontx2_crypto_version.map +1 -2
@@ -1,4 +1,3 @@ -DPDK_19.11 { - +DPDK_20.0 { local: *; };
drivers/crypto/openssl/rte_pmd_openssl_version.map +1 -1
@@ -1,3 +1,3 @@ -DPDK_16.11 { +DPDK_20.0 { local: *; };
drivers/crypto/scheduler/rte_pmd_crypto_scheduler_version.map +7 -12
@@ -1,21 +1,16 @@ -DPDK_17.02 { +DPDK_20.0 { global: rte_cryptodev_scheduler_load_user_scheduler; - rte_cryptodev_scheduler_slave_attach; - rte_cryptodev_scheduler_slave_detach; - rte_cryptodev_scheduler_ordering_set; - rte_cryptodev_scheduler_ordering_get; - -}; - -DPDK_17.05 { - global: - rte_cryptodev_scheduler_mode_get; rte_cryptodev_scheduler_mode_set; rte_cryptodev_scheduler_option_get; rte_cryptodev_scheduler_option_set; + rte_cryptodev_scheduler_ordering_get; + rte_cryptodev_scheduler_ordering_set; + rte_cryptodev_scheduler_slave_attach; + rte_cryptodev_scheduler_slave_detach; rte_cryptodev_scheduler_slaves_get; -} DPDK_17.02; + local: *; +};
drivers/crypto/snow3g/rte_pmd_snow3g_version.map +1 -1
@@ -1,3 +1,3 @@ -DPDK_16.04 { +DPDK_20.0 { local: *; };
drivers/crypto/virtio/rte_pmd_virtio_crypto_version.map +1 -1
@@ -1,3 +1,3 @@ -DPDK_18.05 { +DPDK_20.0 { local: *; };
drivers/crypto/zuc/rte_pmd_zuc_version.map +1 -1
@@ -1,3 +1,3 @@ -DPDK_16.11 { +DPDK_20.0 { local: *; };
drivers/event/dpaa/rte_pmd_dpaa_event_version.map +1 -2
@@ -1,4 +1,3 @@ -DPDK_18.02 { - +DPDK_20.0 { local: *; };
drivers/event/dpaa2/rte_pmd_dpaa2_event_version.map +1 -1
@@ -1,3 +1,3 @@ -DPDK_17.08 { +DPDK_20.0 { local: *; };
drivers/event/dsw/rte_pmd_dsw_event_version.map +1 -1
@@ -1,3 +1,3 @@ -DPDK_18.11 { +DPDK_20.0 { local: *; };
drivers/event/octeontx/rte_pmd_octeontx_event_version.map +1 -1
@@ -1,3 +1,3 @@ -DPDK_17.05 { +DPDK_20.0 { local: *; };
drivers/event/octeontx2/rte_pmd_octeontx2_event_version.map +1 -2
@@ -1,4 +1,3 @@ -DPDK_19.08 { +DPDK_20.0 { local: *; }; -
drivers/event/opdl/rte_pmd_opdl_event_version.map +1 -1
@@ -1,3 +1,3 @@ -DPDK_18.02 { +DPDK_20.0 { local: *; };
drivers/event/skeleton/rte_pmd_skeleton_event_version.map +1 -2
@@ -1,4 +1,3 @@ -DPDK_17.05 { - +DPDK_20.0 { local: *; };
drivers/event/sw/rte_pmd_sw_event_version.map +1 -1
@@ -1,3 +1,3 @@ -DPDK_17.05 { +DPDK_20.0 { local: *; };
drivers/mempool/bucket/rte_mempool_bucket_version.map +1 -2
@@ -1,4 +1,3 @@ -DPDK_18.05 { - +DPDK_20.0 { local: *; };
drivers/mempool/dpaa/rte_mempool_dpaa_version.map +1 -1
@@ -1,4 +1,4 @@ -DPDK_17.11 { +DPDK_20.0 { global: rte_dpaa_bpid_info;
drivers/mempool/dpaa2/rte_mempool_dpaa2_version.map +3 -9
@@ -1,16 +1,10 @@ -DPDK_17.05 { +DPDK_20.0 { global: rte_dpaa2_bpid_info; rte_dpaa2_mbuf_alloc_bulk; - - local: *; -}; - -DPDK_18.05 { - global: - rte_dpaa2_mbuf_from_buf_addr; rte_dpaa2_mbuf_pool_bpid; -} DPDK_17.05; + local: *; +};
drivers/mempool/octeontx/rte_mempool_octeontx_version.map +1 -1
@@ -1,3 +1,3 @@ -DPDK_17.11 { +DPDK_20.0 { local: *; };
drivers/mempool/octeontx2/rte_mempool_octeontx2_version.map +2 -2
@@ -1,8 +1,8 @@ -DPDK_19.08 { +DPDK_20.0 { global: - otx2_npa_lf_init; otx2_npa_lf_fini; + otx2_npa_lf_init; local: *; };
drivers/mempool/ring/rte_mempool_ring_version.map +1 -2
@@ -1,4 +1,3 @@ -DPDK_17.05 { - +DPDK_20.0 { local: *; };
drivers/mempool/stack/rte_mempool_stack_version.map +1 -2
@@ -1,4 +1,3 @@ -DPDK_17.05 { - +DPDK_20.0 { local: *; };
drivers/net/af_packet/rte_pmd_af_packet_version.map +1 -2
@@ -1,4 +1,3 @@ -DPDK_2.0 { - +DPDK_20.0 { local: *; };
drivers/net/af_xdp/rte_pmd_af_xdp_version.map +1 -1
@@ -1,3 +1,3 @@ -DPDK_19.05 { +DPDK_20.0 { local: *; };
drivers/net/ark/rte_pmd_ark_version.map +2 -3
@@ -1,4 +1,3 @@ -DPDK_17.05 { - local: *; - +DPDK_20.0 { + local: *; };
drivers/net/atlantic/rte_pmd_atlantic_version.map +1 -3
@@ -1,5 +1,4 @@ -DPDK_18.11 { - +DPDK_20.0 { local: *; };
@@ -13,4 +12,3 @@ EXPERIMENTAL { rte_pmd_atl_macsec_select_txsa; rte_pmd_atl_macsec_select_rxsa; }; -
drivers/net/avp/rte_pmd_avp_version.map +1 -1
@@ -1,3 +1,3 @@ -DPDK_17.05 { +DPDK_20.0 { local: *; };
drivers/net/axgbe/rte_pmd_axgbe_version.map +1 -1
@@ -1,3 +1,3 @@ -DPDK_18.05 { +DPDK_20.0 { local: *; };
drivers/net/bnx2x/rte_pmd_bnx2x_version.map +1 -2
@@ -1,4 +1,3 @@ -DPDK_2.1 { - +DPDK_20.0 { local: *; };
drivers/net/bnxt/rte_pmd_bnxt_version.map +2 -2
@@ -1,4 +1,4 @@ -DPDK_17.08 { +DPDK_20.0 { global: rte_pmd_bnxt_get_vf_rx_status;
@@ -10,13 +10,13 @@ DPDK_17.08 { rte_pmd_bnxt_set_tx_loopback; rte_pmd_bnxt_set_vf_mac_addr; rte_pmd_bnxt_set_vf_mac_anti_spoof; + rte_pmd_bnxt_set_vf_persist_stats; rte_pmd_bnxt_set_vf_rate_limit; rte_pmd_bnxt_set_vf_rxmode; rte_pmd_bnxt_set_vf_vlan_anti_spoof; rte_pmd_bnxt_set_vf_vlan_filter; rte_pmd_bnxt_set_vf_vlan_insert; rte_pmd_bnxt_set_vf_vlan_stripq; - rte_pmd_bnxt_set_vf_persist_stats; local: *; };
drivers/net/bonding/rte_pmd_bond_version.map +13 -34
58 lines not on this page · raw message
drivers/net/cxgbe/rte_pmd_cxgbe_version.map +1 -2
@@ -1,4 +1,3 @@ -DPDK_2.1 { - +DPDK_20.0 { local: *; };
drivers/net/dpaa/rte_pmd_dpaa_version.map +4 -7
@@ -1,12 +1,9 @@ -DPDK_17.11 { - - local: *; -}; - -DPDK_18.08 { +DPDK_20.0 { global: dpaa_eth_eventq_attach; dpaa_eth_eventq_detach; rte_pmd_dpaa_set_tx_loopback; -} DPDK_17.11; + + local: *; +};
drivers/net/dpaa2/rte_pmd_dpaa2_version.map +4 -8
@@ -1,15 +1,11 @@ -DPDK_17.05 { - - local: *; -}; - -DPDK_17.11 { +DPDK_20.0 { global: dpaa2_eth_eventq_attach; dpaa2_eth_eventq_detach; -} DPDK_17.05; + local: *; +}; EXPERIMENTAL { global:
@@ -17,4 +13,4 @@ EXPERIMENTAL { rte_pmd_dpaa2_mux_flow_create; rte_pmd_dpaa2_set_custom_hash; rte_pmd_dpaa2_set_timestamp; -} DPDK_17.11; +};
drivers/net/e1000/rte_pmd_e1000_version.map +1 -2
@@ -1,4 +1,3 @@ -DPDK_2.0 { - +DPDK_20.0 { local: *; };
drivers/net/ena/rte_pmd_ena_version.map +1 -2
@@ -1,4 +1,3 @@ -DPDK_16.04 { - +DPDK_20.0 { local: *; };
drivers/net/enetc/rte_pmd_enetc_version.map +1 -2
@@ -1,4 +1,3 @@ -DPDK_18.11 { - +DPDK_20.0 { local: *; };
drivers/net/enic/rte_pmd_enic_version.map +1 -2
@@ -1,4 +1,3 @@ -DPDK_2.0 { - +DPDK_20.0 { local: *; };
drivers/net/failsafe/rte_pmd_failsafe_version.map +1 -2
@@ -1,4 +1,3 @@ -DPDK_17.08 { - +DPDK_20.0 { local: *; };
drivers/net/fm10k/rte_pmd_fm10k_version.map +1 -2
@@ -1,4 +1,3 @@ -DPDK_2.0 { - +DPDK_20.0 { local: *; };
drivers/net/hinic/rte_pmd_hinic_version.map +1 -2
@@ -1,4 +1,3 @@ -DPDK_19.08 { - +DPDK_20.0 { local: *; };
drivers/net/hns3/rte_pmd_hns3_version.map +2 -2
@@ -1,3 +1,3 @@ -DPDK_19.11 { - local: *; +DPDK_20.0 { + local: *; };
drivers/net/i40e/rte_pmd_i40e_version.map +19 -46
86 lines not on this page · raw message
drivers/net/iavf/rte_pmd_iavf_version.map +1 -2
@@ -1,4 +1,3 @@ -DPDK_18.02 { - +DPDK_20.0 { local: *; };
drivers/net/ice/rte_pmd_ice_version.map +1 -2
@@ -1,5 +1,4 @@ -DPDK_19.02 { - +DPDK_20.0 { local: *; };
drivers/net/ifc/rte_pmd_ifc_version.map +1 -2
@@ -1,4 +1,3 @@ -DPDK_18.05 { - +DPDK_20.0 { local: *; };
drivers/net/ipn3ke/rte_pmd_ipn3ke_version.map +1 -2
@@ -1,4 +1,3 @@ -DPDK_19.05 { - +DPDK_20.0 { local: *; };
drivers/net/ixgbe/rte_pmd_ixgbe_version.map +22 -40
79 lines not on this page · raw message
drivers/net/kni/rte_pmd_kni_version.map +1 -2
@@ -1,4 +1,3 @@ -DPDK_17.05 { - +DPDK_20.0 { local: *; };
drivers/net/liquidio/rte_pmd_liquidio_version.map +1 -2
@@ -1,4 +1,3 @@ -DPDK_17.05 { - +DPDK_20.0 { local: *; };
drivers/net/memif/rte_pmd_memif_version.map +2 -3
@@ -1,4 +1,3 @@ -DPDK_19.08 { - - local: *; +DPDK_20.0 { + local: *; };
drivers/net/mlx4/rte_pmd_mlx4_version.map +1 -2
@@ -1,4 +1,3 @@ -DPDK_2.0 { - +DPDK_20.0 { local: *; };
drivers/net/mlx5/rte_pmd_mlx5_version.map +1 -1
@@ -1,3 +1,3 @@ -DPDK_2.2 { +DPDK_20.0 { local: *; };
drivers/net/mvneta/rte_pmd_mvneta_version.map +1 -1
@@ -1,3 +1,3 @@ -DPDK_18.11 { +DPDK_20.0 { local: *; };
drivers/net/mvpp2/rte_pmd_mvpp2_version.map +1 -1
@@ -1,3 +1,3 @@ -DPDK_17.11 { +DPDK_20.0 { local: *; };
drivers/net/netvsc/rte_pmd_netvsc_version.map +1 -3
@@ -1,5 +1,3 @@ -/* SPDX-License-Identifier: BSD-3-Clause */ - -DPDK_18.08 { +DPDK_20.0 { local: *; };
drivers/net/nfb/rte_pmd_nfb_version.map +1 -2
@@ -1,4 +1,3 @@ -DPDK_19.05 { - +DPDK_20.0 { local: *; };
drivers/net/nfp/rte_pmd_nfp_version.map +1 -1
@@ -1,3 +1,3 @@ -DPDK_2.2 { +DPDK_20.0 { local: *; };
drivers/net/null/rte_pmd_null_version.map +1 -2
@@ -1,4 +1,3 @@ -DPDK_2.0 { - +DPDK_20.0 { local: *; };
drivers/net/octeontx/rte_pmd_octeontx_version.map +3 -7
@@ -1,11 +1,7 @@ -DPDK_17.11 { - - local: *; -}; - -DPDK_18.02 { +DPDK_20.0 { global: rte_octeontx_pchan_map; -} DPDK_17.11; + local: *; +};
drivers/net/octeontx2/rte_pmd_octeontx2_version.map +1 -2
@@ -1,4 +1,3 @@ -DPDK_19.08 { - +DPDK_20.0 { local: *; };
drivers/net/pcap/rte_pmd_pcap_version.map +1 -2
@@ -1,4 +1,3 @@ -DPDK_2.0 { - +DPDK_20.0 { local: *; };
drivers/net/pfe/rte_pmd_pfe_version.map +1 -2
@@ -1,4 +1,3 @@ -DPDK_19.11 { - +DPDK_20.0 { local: *; };
drivers/net/qede/rte_pmd_qede_version.map +1 -2
@@ -1,4 +1,3 @@ -DPDK_16.04 { - +DPDK_20.0 { local: *; };
drivers/net/ring/rte_pmd_ring_version.map +2 -8
@@ -1,14 +1,8 @@ -DPDK_2.0 { +DPDK_20.0 { global: + rte_eth_from_ring; rte_eth_from_rings; local: *; }; - -DPDK_2.2 { - global: - - rte_eth_from_ring; - -} DPDK_2.0;
drivers/net/sfc/rte_pmd_sfc_version.map +1 -2
@@ -1,4 +1,3 @@ -DPDK_17.02 { - +DPDK_20.0 { local: *; };
drivers/net/softnic/rte_pmd_softnic_version.map +1 -1
@@ -1,4 +1,4 @@ -DPDK_17.11 { +DPDK_20.0 { global: rte_pmd_softnic_run;
drivers/net/szedata2/rte_pmd_szedata2_version.map +1 -1
@@ -1,3 +1,3 @@ -DPDK_2.2 { +DPDK_20.0 { local: *; };
drivers/net/tap/rte_pmd_tap_version.map +1 -2
@@ -1,4 +1,3 @@ -DPDK_17.02 { - +DPDK_20.0 { local: *; };
drivers/net/thunderx/rte_pmd_thunderx_version.map +1 -2
@@ -1,4 +1,3 @@ -DPDK_16.07 { - +DPDK_20.0 { local: *; };
drivers/net/vdev_netvsc/rte_pmd_vdev_netvsc_version.map +1 -2
@@ -1,4 +1,3 @@ -DPDK_18.02 { - +DPDK_20.0 { local: *; };
drivers/net/vhost/rte_pmd_vhost_version.map +3 -8
@@ -1,13 +1,8 @@ -DPDK_16.04 { +DPDK_20.0 { global: rte_eth_vhost_get_queue_event; - - local: *; -}; - -DPDK_16.11 { - global: - rte_eth_vhost_get_vid_from_port_id; + + local: *; };
drivers/net/virtio/rte_pmd_virtio_version.map +1 -2
@@ -1,4 +1,3 @@ -DPDK_2.0 { - +DPDK_20.0 { local: *; };
drivers/net/vmxnet3/rte_pmd_vmxnet3_version.map +1 -2
@@ -1,4 +1,3 @@ -DPDK_2.0 { - +DPDK_20.0 { local: *; };
drivers/raw/dpaa2_cmdif/rte_rawdev_dpaa2_cmdif_version.map +1 -2
@@ -1,4 +1,3 @@ -DPDK_18.05 { - +DPDK_20.0 { local: *; };
drivers/raw/dpaa2_qdma/rte_rawdev_dpaa2_qdma_version.map +2 -2
@@ -1,4 +1,4 @@ -DPDK_19.05 { +DPDK_20.0 { global: rte_qdma_attr_get;
@@ -9,9 +9,9 @@ DPDK_19.05 { rte_qdma_start; rte_qdma_stop; rte_qdma_vq_create; - rte_qdma_vq_destroy; rte_qdma_vq_dequeue; rte_qdma_vq_dequeue_multi; + rte_qdma_vq_destroy; rte_qdma_vq_enqueue; rte_qdma_vq_enqueue_multi; rte_qdma_vq_stats;
drivers/raw/ifpga/rte_rawdev_ifpga_version.map +1 -2
@@ -1,4 +1,3 @@ -DPDK_18.05 { - +DPDK_20.0 { local: *; };
drivers/raw/ioat/rte_rawdev_ioat_version.map +1 -2
@@ -1,4 +1,3 @@ -DPDK_19.08 { - +DPDK_20.0 { local: *; };
drivers/raw/ntb/rte_rawdev_ntb_version.map +2 -3
@@ -1,4 +1,3 @@ -DPDK_19.08 { - - local: *; +DPDK_20.0 { + local: *; };
drivers/raw/octeontx2_dma/rte_rawdev_octeontx2_dma_version.map +1 -2
@@ -1,4 +1,3 @@ -DPDK_19.08 { - +DPDK_20.0 { local: *; };
drivers/raw/skeleton/rte_rawdev_skeleton_version.map +1 -2
@@ -1,4 +1,3 @@ -DPDK_18.02 { - +DPDK_20.0 { local: *; };
lib/librte_acl/rte_acl_version.map +1 -1
@@ -1,4 +1,4 @@ -DPDK_2.0 { +DPDK_20.0 { global: rte_acl_add_rules;
lib/librte_bitratestats/rte_bitratestats_version.map +1 -1
@@ -1,4 +1,4 @@ -DPDK_17.05 { +DPDK_20.0 { global: rte_stats_bitrate_calc;
lib/librte_cfgfile/rte_cfgfile_version.map +8 -26
@@ -1,40 +1,22 @@ -DPDK_2.0 { +DPDK_20.0 { global: + rte_cfgfile_add_entry; + rte_cfgfile_add_section; rte_cfgfile_close; + rte_cfgfile_create; rte_cfgfile_get_entry; rte_cfgfile_has_entry; rte_cfgfile_has_section; rte_cfgfile_load; + rte_cfgfile_load_with_params; rte_cfgfile_num_sections; + rte_cfgfile_save; rte_cfgfile_section_entries; + rte_cfgfile_section_entries_by_index; rte_cfgfile_section_num_entries; rte_cfgfile_sections; + rte_cfgfile_set_entry; local: *; }; - -DPDK_16.04 { - global: - - rte_cfgfile_section_entries_by_index; - -} DPDK_2.0; - -DPDK_17.05 { - global: - - rte_cfgfile_load_with_params; - -} DPDK_16.04; - -DPDK_17.11 { - global: - - rte_cfgfile_add_entry; - rte_cfgfile_add_section; - rte_cfgfile_create; - rte_cfgfile_save; - rte_cfgfile_set_entry; - -} DPDK_17.05;
lib/librte_cmdline/rte_cmdline_version.map +2 -8
@@ -1,4 +1,4 @@ -DPDK_2.0 { +DPDK_20.0 { global: cirbuf_add_buf_head;
@@ -40,6 +40,7 @@ DPDK_2.0 { cmdline_parse_num; cmdline_parse_portlist; cmdline_parse_string; + cmdline_poll; cmdline_printf; cmdline_quit; cmdline_set_prompt;
@@ -68,10 +69,3 @@ DPDK_2.0 { local: *; }; - -DPDK_2.1 { - global: - - cmdline_poll; - -} DPDK_2.0;
lib/librte_cryptodev/rte_cryptodev_version.map +36 -66
128 lines not on this page · raw message
lib/librte_distributor/rte_distributor_version.map +3 -1
@@ -1,4 +1,4 @@ -DPDK_17.05 { +DPDK_20.0 { global: rte_distributor_clear_returns;
@@ -10,4 +10,6 @@ DPDK_17.05 { rte_distributor_request_pkt; rte_distributor_return_pkt; rte_distributor_returned_pkts; + + local: *; };
lib/librte_eal/rte_eal_version.map +114 -210
423 lines not on this page · raw message
lib/librte_efd/rte_efd_version.map +1 -1
@@ -1,4 +1,4 @@ -DPDK_17.02 { +DPDK_20.0 { global: rte_efd_create;
lib/librte_ethdev/rte_ethdev_version.map +47 -113
242 lines not on this page · raw message
lib/librte_eventdev/rte_eventdev_version.map +47 -83
163 lines not on this page · raw message
lib/librte_gro/rte_gro_version.map +1 -1
@@ -1,4 +1,4 @@ -DPDK_17.08 { +DPDK_20.0 { global: rte_gro_ctx_create;
lib/librte_gso/rte_gso_version.map +1 -1
@@ -1,4 +1,4 @@ -DPDK_17.11 { +DPDK_20.0 { global: rte_gso_segment;
lib/librte_hash/rte_hash_version.map +9 -34
67 lines not on this page · raw message
lib/librte_ip_frag/rte_ip_frag_version.map +2 -8
@@ -1,8 +1,9 @@ -DPDK_2.0 { +DPDK_20.0 { global: rte_ip_frag_free_death_row; rte_ip_frag_table_create; + rte_ip_frag_table_destroy; rte_ip_frag_table_statistics_dump; rte_ipv4_frag_reassemble_packet; rte_ipv4_fragment_packet;
@@ -12,13 +13,6 @@ DPDK_2.0 { local: *; }; -DPDK_17.08 { - global: - - rte_ip_frag_table_destroy; - -} DPDK_2.0; - EXPERIMENTAL { global:
lib/librte_jobstats/rte_jobstats_version.map +2 -8
@@ -1,6 +1,7 @@ -DPDK_2.0 { +DPDK_20.0 { global: + rte_jobstats_abort; rte_jobstats_context_finish; rte_jobstats_context_init; rte_jobstats_context_reset;
@@ -17,10 +18,3 @@ DPDK_2.0 { local: *; }; - -DPDK_16.04 { - global: - - rte_jobstats_abort; - -} DPDK_2.0;
lib/librte_kni/rte_kni_version.map +1 -1
@@ -1,4 +1,4 @@ -DPDK_2.0 { +DPDK_20.0 { global: rte_kni_alloc;
lib/librte_kvargs/rte_kvargs_version.map +2 -2
@@ -1,4 +1,4 @@ -DPDK_2.0 { +DPDK_20.0 { global: rte_kvargs_count;
@@ -15,4 +15,4 @@ EXPERIMENTAL { rte_kvargs_parse_delim; rte_kvargs_strcmp; -} DPDK_2.0; +};
lib/librte_latencystats/rte_latencystats_version.map +1 -1
@@ -1,4 +1,4 @@ -DPDK_17.05 { +DPDK_20.0 { global: rte_latencystats_get;
lib/librte_lpm/rte_lpm_version.map +10 -22
@@ -1,35 +1,23 @@ -DPDK_2.0 { +DPDK_20.0 { global: + rte_lpm6_add; rte_lpm6_create; rte_lpm6_delete; rte_lpm6_delete_all; rte_lpm6_delete_bulk_func; rte_lpm6_find_existing; rte_lpm6_free; - - local: *; -}; - -DPDK_16.04 { - global: - + rte_lpm6_is_rule_present; + rte_lpm6_lookup; + rte_lpm6_lookup_bulk_func; rte_lpm_add; - rte_lpm_find_existing; rte_lpm_create; - rte_lpm_free; - rte_lpm_is_rule_present; rte_lpm_delete; rte_lpm_delete_all; + rte_lpm_find_existing; + rte_lpm_free; + rte_lpm_is_rule_present; -} DPDK_2.0; - -DPDK_17.05 { - global: - - rte_lpm6_add; - rte_lpm6_is_rule_present; - rte_lpm6_lookup; - rte_lpm6_lookup_bulk_func; - -} DPDK_16.04; + local: *; +};
lib/librte_mbuf/rte_mbuf_version.map +13 -36
71 lines not on this page · raw message
lib/librte_member/rte_member_version.map +1 -1
@@ -1,4 +1,4 @@ -DPDK_17.11 { +DPDK_20.0 { global: rte_member_add;
lib/librte_mempool/rte_mempool_version.map +13 -31
70 lines not on this page · raw message
lib/librte_meter/rte_meter_version.map +4 -9
@@ -1,21 +1,16 @@ -DPDK_2.0 { +DPDK_20.0 { global: rte_meter_srtcm_color_aware_check; rte_meter_srtcm_color_blind_check; rte_meter_srtcm_config; + rte_meter_srtcm_profile_config; rte_meter_trtcm_color_aware_check; rte_meter_trtcm_color_blind_check; rte_meter_trtcm_config; - - local: *; -}; - -DPDK_18.08 { - global: - - rte_meter_srtcm_profile_config; rte_meter_trtcm_profile_config; + + local: *; }; EXPERIMENTAL {
lib/librte_metrics/rte_metrics_version.map +1 -1
@@ -1,4 +1,4 @@ -DPDK_17.05 { +DPDK_20.0 { global: rte_metrics_get_names;
lib/librte_net/rte_net_version.map +6 -17
@@ -1,25 +1,14 @@ -DPDK_16.11 { - global: - rte_net_get_ptype; - - local: *; -}; - -DPDK_17.05 { - global: - - rte_net_crc_calc; - rte_net_crc_set_alg; - -} DPDK_16.11; - -DPDK_19.08 { +DPDK_20.0 { global: rte_eth_random_addr; rte_ether_format_addr; + rte_net_crc_calc; + rte_net_crc_set_alg; + rte_net_get_ptype; -} DPDK_17.05; + local: *; +}; EXPERIMENTAL { global:
lib/librte_pci/rte_pci_version.map +1 -1
@@ -1,4 +1,4 @@ -DPDK_17.11 { +DPDK_20.0 { global: pci_map_resource;
lib/librte_pdump/rte_pdump_version.map +1 -1
@@ -1,4 +1,4 @@ -DPDK_16.07 { +DPDK_20.0 { global: rte_pdump_disable;
lib/librte_pipeline/rte_pipeline_version.map +9 -27
@@ -1,6 +1,8 @@ -DPDK_2.0 { +DPDK_20.0 { global: + rte_pipeline_ah_packet_drop; + rte_pipeline_ah_packet_hijack; rte_pipeline_check; rte_pipeline_create; rte_pipeline_flush;
@@ -9,42 +11,22 @@ DPDK_2.0 { rte_pipeline_port_in_create; rte_pipeline_port_in_disable; rte_pipeline_port_in_enable; + rte_pipeline_port_in_stats_read; rte_pipeline_port_out_create; rte_pipeline_port_out_packet_insert; + rte_pipeline_port_out_stats_read; rte_pipeline_run; rte_pipeline_table_create; rte_pipeline_table_default_entry_add; rte_pipeline_table_default_entry_delete; rte_pipeline_table_entry_add; - rte_pipeline_table_entry_delete; - - local: *; -}; - -DPDK_2.1 { - global: - - rte_pipeline_port_in_stats_read; - rte_pipeline_port_out_stats_read; - rte_pipeline_table_stats_read; - -} DPDK_2.0; - -DPDK_2.2 { - global: - rte_pipeline_table_entry_add_bulk; + rte_pipeline_table_entry_delete; rte_pipeline_table_entry_delete_bulk; + rte_pipeline_table_stats_read; -} DPDK_2.1; - -DPDK_16.04 { - global: - - rte_pipeline_ah_packet_hijack; - rte_pipeline_ah_packet_drop; - -} DPDK_2.2; + local: *; +}; EXPERIMENTAL { global:
lib/librte_port/rte_port_version.map +17 -47
82 lines not on this page · raw message
lib/librte_power/rte_power_version.map +6 -18
@@ -1,39 +1,27 @@ -DPDK_2.0 { +DPDK_20.0 { global: rte_power_exit; + rte_power_freq_disable_turbo; rte_power_freq_down; + rte_power_freq_enable_turbo; rte_power_freq_max; rte_power_freq_min; rte_power_freq_up; rte_power_freqs; + rte_power_get_capabilities; rte_power_get_env;
Lines of this file are not shown. View the raw message.
lib/librte_rawdev/rte_rawdev_version.map +2 -2
Lines of this file are not shown. View the raw message.
lib/librte_reorder/rte_reorder_version.map +4 -4
Lines of this file are not shown. View the raw message.
lib/librte_sched/rte_sched_version.map +4 -10
Lines of this file are not shown. View the raw message.
lib/librte_security/rte_security_version.map +1 -1
Lines of this file are not shown. View the raw message.
lib/librte_timer/rte_timer_version.map +8 -13
Lines of this file are not shown. View the raw message.
lib/librte_vhost/rte_vhost_version.map +11 -41
52 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.17.1
Part of the diff is not shown here. View the raw message.
Re: [dpdk-dev] [PATCH v8 11/12] build: change ABI version to 20.0
Quoted 8 lines · Anatoly Burakov
From: Pawel Modrak <[email protected]>
Merge all vesions in linker version script files to DPDK_20.0.
This commit was generated by running the following command:
:~/DPDK$ buildtools/update-abi.sh 20.0
Updated map files for i40e and ipn3ke, following rebase on next-net merge.
Signature · 1 line
David Marchand
PATCH v8 12/12 buildtools: add ABI versioning check script
In reply to Anatoly BurakovFrom: Marcin Baran <[email protected]>
Add a shell script that checks whether built libraries are versioned with expected ABI (current ABI, current ABI + 1, or EXPERIMENTAL).
The following command was used to verify current source tree (assuming build directory is in ./build):
find ./build/lib ./build/drivers -name \*.so \
-exec ./buildtools/check-abi-version.sh {} \; -print
---
Notes:
v2:
- Moved this to the end of the patchset
- Fixed bug when ABI symbols were not found because the .so did not declare any public symbols
buildtools/check-abi-version.sh | 54 +++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100755 buildtools/check-abi-version.sh
buildtools/check-abi-version.sh new file +54 -0
@@ -0,0 +1,54 @@ +#!/bin/sh +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2019 Intel Corporation + +# Check whether library symbols have correct +# version (provided ABI number or provided ABI +# number + 1 or EXPERIMENTAL). +# Args: +# $1: path of the library .so file +# $2: ABI major version number to check +# (defaults to ABI_VERSION file value) + +if [ -z "$1" ]; then + echo "Script checks whether library symbols have" + echo "correct version (ABI_VER/ABI_VER+1/EXPERIMENTAL)" + echo "Usage:" + echo " $0 SO_FILE_PATH [ABI_VER]" + exit 1 +fi + +LIB="$1" +DEFAULT_ABI=$(cat "$(dirname \ + $(readlink -f $0))/../ABI_VERSION" | \ + cut -d'.' -f 1) +ABIVER="DPDK_${2-$DEFAULT_ABI}" +NEXT_ABIVER="DPDK_$((${2-$DEFAULT_ABI}+1))" + +ret=0 + +# get output of objdump +OBJ_DUMP_OUTPUT=`objdump -TC --section=.text ${LIB} 2>&1 | grep ".text"` + +# there may not be any .text sections in the .so file, in which case exit early +echo "${OBJ_DUMP_OUTPUT}" | grep "not found in any input file" -q +if [ "$?" -eq 0 ]; then + exit 0 +fi + +# we have symbols, so let's see if the versions are correct +for SYM in $(echo "${OBJ_DUMP_OUTPUT}" | awk '{print $(NF-1) "-" $NF}') +do + version=$(echo $SYM | cut -d'-' -f 1) + symbol=$(echo $SYM | cut -d'-' -f 2) + case $version in (*"$ABIVER"*|*"$NEXT_ABIVER"*|"EXPERIMENTAL") + ;; + (*) + echo "Warning: symbol $symbol ($version) should be annotated " \ + "as ABI version $ABIVER / $NEXT_ABIVER, or EXPERIMENTAL." + ret=1 + ;; + esac +done + +exit $ret
Signature · 1 line
2.17.1
Re: [dpdk-dev] [PATCH v8 00/12] Implement the new ABI policy and add helper scripts
In reply to Anatoly Burakov20/11/2019 18:23, Anatoly Burakov:
Quoted 4 lines
This patchset prepares the codebase for the new ABI policy and adds a few helper scripts.
379 files changed, 1172 insertions(+), 3409 deletions(-)
Thanks for the great work Anatoly
David Marchand
AppliedRe: [dpdk-dev] [PATCH v8 00/12] Implement the new ABI policy and add helper scripts
Quoted 10 lines · Thomas Monjalon
20/11/2019 18:23, Anatoly Burakov:
Quoted 4 lines
This patchset prepares the codebase for the new ABI policy and adds a few helper scripts.
379 files changed, 1172 insertions(+), 3409 deletions(-)Thanks for the great work Anatoly
Acked-by Thomas Monjalon <[email protected]>
Added some entropy for external libraries using make, rebased on a (non-|) compiling master, fixed some typos (that codespell found) and added the new scripts in MAINTAINERS.
And with this, we are done :-).
Applied, thanks.
Signature · 1 line
David Marchand
Re: [dpdk-dev] [PATCH v8 00/12] Implement the new ABI policy and add helper scripts
Quoted 10 lines · David Marchand
Quoted 9 lines · Thomas Monjalon
20/11/2019 18:23, Anatoly Burakov:
Quoted 4 lines
This patchset prepares the codebase for the new ABI policy and adds a few helper scripts.
379 files changed, 1172 insertions(+), 3409 deletions(-)Thanks for the great work Anatoly
Quoted 9 lines
Quoted 1 line
Acked-by Thomas Monjalon <[email protected]>Added some entropy for external libraries using make, rebased on a (non-|) compiling master, fixed some typos (that codespell found) and added the new scripts in
MAINTAINERS.
And with this, we are done :-).Applied, thanks.
Thanks everyone for their help in getting this over the line!
Signature · 2 lines
Thanks, Anatoly
Re: [dpdk-dev] [PATCH v8 00/12] Implement the new ABI policy and add helper scripts
In reply to Thomas MonjalonQuoted 12 lines
-----Original Message-----
From: Thomas Monjalon <[email protected]>
Sent: Wednesday 20 November 2019 20:18
To: Burakov, Anatoly <[email protected]>
Cc: [email protected]; Mcnamara, John <[email protected]>; Kinsella, Ray <[email protected]>; Richardson, Bruce <[email protected]>; [email protected]
Subject: Re: [dpdk-dev] [PATCH v8 00/12] Implement the new ABI policy and add helper scripts
Quoted 5 lines
20/11/2019 18:23, Anatoly Burakov:
Quoted 4 lines
This patchset prepares the codebase for the new ABI policy and adds a few helper scripts.
379 files changed, 1172 insertions(+), 3409 deletions(-)
[rk] +1
Quoted 4 lines
Thanks for the great work Anatoly
Acked-by Thomas Monjalon <[email protected]>
PATCH v2 10/10 buildtools: add ABI versioning check script
In reply to Anatoly BurakovFrom: Marcin Baran <[email protected]>
Add a shell script that checks whether built libraries are versioned with expected ABI (current ABI, current ABI + 1, or EXPERIMENTAL).
The following command was used to verify current source tree (assuming build directory is in ./build):
find ./build/lib ./build/drivers -name \*.so \
-exec ./buildtools/check-abi-version.sh {} \; -print
---
Notes:
v2:
- Moved this to the end of the patchset
- Fixed bug when ABI symbols were not found because the .so did not declare any public symbols
buildtools/check-abi-version.sh | 54 +++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100755 buildtools/check-abi-version.sh
buildtools/check-abi-version.sh new file +54 -0
@@ -0,0 +1,54 @@ +#!/bin/sh +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2019 Intel Corporation + +# Check whether library symbols have correct +# version (provided ABI number or provided ABI +# number + 1 or EXPERIMENTAL). +# Args: +# $1: path of the library .so file +# $2: ABI major version number to check +# (defaults to ABI_VERSION file value) + +if [ -z "$1" ]; then + echo "Script checks whether library symbols have" + echo "correct version (ABI_VER/ABI_VER+1/EXPERIMENTAL)" + echo "Usage:" + echo " $0 SO_FILE_PATH [ABI_VER]" + exit 1 +fi + +LIB="$1" +DEFAULT_ABI=$(cat "$(dirname \ + $(readlink -f $0))/../config/ABI_VERSION" | \ + cut -d'.' -f 1) +ABIVER="DPDK_${2-$DEFAULT_ABI}" +NEXT_ABIVER="DPDK_$((${2-$DEFAULT_ABI}+1))" + +ret=0 + +# get output of objdump +OBJ_DUMP_OUTPUT=`objdump -TC --section=.text ${LIB} 2>&1 | grep ".text"` + +# there may not be any .text sections in the .so file, in which case exit early +echo "${OBJ_DUMP_OUTPUT}" | grep "not found in any input file" -q +if [ "$?" -eq 0 ]; then + exit 0 +fi + +# we have symbols, so let's see if the versions are correct +for SYM in `echo "${OBJ_DUMP_OUTPUT}" | awk '{print $(NF-1) "-" $NF}'` +do + version=$(echo $SYM | cut -d'-' -f 1) + symbol=$(echo $SYM | cut -d'-' -f 2) + case $version in (*"$ABIVER"*|*"$NEXT_ABIVER"*|"EXPERIMENTAL") + ;; + (*) + echo "Warning: symbol $symbol ($version) should be annotated " \ + "as ABI version $ABIVER / $NEXT_ABIVER, or EXPERIMENTAL." + ret=1 + ;; + esac +done + +exit $ret
Signature · 1 line
2.17.1