git-lng-odp

git-lng-odp@lists.linaro.org

2 participants
1206 discussions

[COMMIT] branch api-next updated. v1.13.0.0-279-gfbab0b2

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, api-next has been updated via fbab0b2bab55742ceface59778de8606e3bd062c (commit) via 3528ca70668da492a2f1fe85c167b2024406dd8d (commit) via 332d48c9c25504b3cbb9451e292a98c15df17ccb (commit) via 0d3ee95d0fb3712631d81c5e6f4fb5f176617c5e (commit) via 0c3ee63ae7b133defa2e74d2573f541d68dae040 (commit) via 8f517b3a278d3742b182b67d6b50f9452dd3e519 (commit) via 2afd00967b751ef3a9fe45d2f966f35956c93520 (commit) via 969d1c74ef21b77df01b120297d4156b87183894 (commit) from a1bcdb71f9c5525e02a9609fb32b767f4f76b082 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit fbab0b2bab55742ceface59778de8606e3bd062c Merge: a1bcdb7 3528ca7 Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Thu Feb 9 22:47:56 2017 +0300 Merge branch 'master' into api-next Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> ----------------------------------------------------------------------- Summary of changes: .travis.yml | 15 ++++ helper/include/odp/helper/odph_cuckootable.h | 80 ++++++++++++++++++--- helper/include/odp/helper/odph_hashtable.h | 75 +++++++++++++++++++- helper/include/odp/helper/odph_iplookuptable.h | 97 ++++++++++++++++++++++---- helper/include/odp/helper/odph_lineartable.h | 65 ++++++++++++++++- helper/include/odp/helper/table.h | 10 ++- 6 files changed, 314 insertions(+), 28 deletions(-) hooks/post-receive --

8 years, 12 months

[COMMIT] branch master updated. v1.13.0.0-46-g3528ca7

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, master has been updated via 3528ca70668da492a2f1fe85c167b2024406dd8d (commit) from 332d48c9c25504b3cbb9451e292a98c15df17ccb (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 3528ca70668da492a2f1fe85c167b2024406dd8d Author: Bill Fischofer <bill.fischofer(a)linaro.org> Date: Thu Feb 9 13:35:35 2017 -0600 doc: helper: add missing doxygen for helper table functions Resolve Bug https://bugs.linaro.org/show_bug.cgi?id=2865 by adding missing doxygen documentation for helper table functions Signed-off-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/helper/include/odp/helper/odph_cuckootable.h b/helper/include/odp/helper/odph_cuckootable.h index d569980..55f43fe 100644 --- a/helper/include/odp/helper/odph_cuckootable.h +++ b/helper/include/odp/helper/odph_cuckootable.h @@ -52,28 +52,92 @@ extern "C" { #endif +/** + * @addtogroup odph_cuckootable ODPH CUCKOO TABLE + * @{ + */ + +/** + * Create a cuckoo table + * + * @param name Name of the cuckoo table to be created + * @param capacity Number of elements table may store + * @param key_size Size of the key for each element + * @param value_size Size of the value stored for each element + * + * @return Handle of created cuckoo table + * @retval NULL Create failed + */ odph_table_t odph_cuckoo_table_create( const char *name, uint32_t capacity, uint32_t key_size, uint32_t value_size); +/** + * Lookup a cuckoo table by name + * + * @param name Name of the table to be located + * + * @return Handle of the located cuckoo table + * @retval NULL No table matching supplied name found + */ odph_table_t odph_cuckoo_table_lookup(const char *name); +/** + * Destroy a cuckoo table + * + * @param table Handle of the cuckoo table to be destroyed + * + * @retval 0 Success + * @retval < 0 Failure + */ int odph_cuckoo_table_destroy(odph_table_t table); -int odph_cuckoo_table_put_value( - odph_table_t table, - void *key, void *value); +/** + * Insert a key/value pair into a cuckoo table + * + * @param table Table into which value is to be stored + * @param key Address of an odph_table_t to be used as key + * @param value Value to be associated with specified key + * + * @retval >= 0 Success + * @retval < 0 Failure + */ +int odph_cuckoo_table_put_value(odph_table_t table, void *key, void *value); -int odph_cuckoo_table_get_value( - odph_table_t table, - void *key, void *buffer, - uint32_t buffer_size); +/** + * Retrieve a value from a cuckoo table + * + * @param table Table from which value is to be retrieved + * @param key Address of an odph_table_t to be used as key + * @param[out] buffer Address of buffer to receive resulting value + * @param buffer_size Size of supplied buffer + * + * @retval 0 Success + * @retval 1 Success + * @retval < 0 Failure + */ +int odph_cuckoo_table_get_value(odph_table_t table, + void *key, void *buffer, + uint32_t buffer_size); +/** + * Remove a value from a cuckoo table + * + * @param table Table from which value is to be removed + * @param key Address of odph_table_t to be used as key + * + * @retval >= 0 Success + * @retval < 0 Failure + */ int odph_cuckoo_table_remove_value(odph_table_t table, void *key); -extern odph_table_ops_t odph_cuckoo_table_ops; +extern odph_table_ops_t odph_cuckoo_table_ops; /**< @internal */ + +/** + * @} + */ #ifdef __cplusplus } diff --git a/helper/include/odp/helper/odph_hashtable.h b/helper/include/odp/helper/odph_hashtable.h index bb75cb9..1f91f31 100644 --- a/helper/include/odp/helper/odph_hashtable.h +++ b/helper/include/odp/helper/odph_hashtable.h @@ -19,22 +19,93 @@ extern "C" { #endif +/** + * @addtogroup odph_hash_table ODPH HASH TABLE + * @{ + */ + +/** + * Create a hash table + * + * @param name Name of the hash table to be created. + * @param capacity Number of elements table may store + * @param key_size Size of the key for each element + * @param value_size Size of the value stored for each element + * + * @return Handle of created hash table + * @retval NULL Create failed + */ odph_table_t odph_hash_table_create(const char *name, uint32_t capacity, uint32_t key_size, uint32_t value_size); + +/** + * Lookup a hash table by name + * + * @param name Name of the table to be located + * + * @return Handle of the located hash table + * @return NULL No table matching supplied name found + */ odph_table_t odph_hash_table_lookup(const char *name); + +/** + * Destroy a hash table + * + * @param table Handle of the hash table to be destroyed + * + * @retval 0 Success + * @retval < 0 Failure + */ int odph_hash_table_destroy(odph_table_t table); + +/** + * Insert a key/value pair into a hash table + * + * @param table Table into which value is to be stored + * @param key Address of an odph_table_t to be used as key + * @param value Value to be associated with specified key + * + * @retval >= 0 Success + * @retval < 0 Failure + */ int odph_hash_put_value(odph_table_t table, void *key, void *value); + +/** + * Retrieve a value from a hash table + * + * @param table Table from which value is to be retrieved + * @param key Address of an odph_table_t to be used as key + * @param[out] buffer Address of buffer to receive resulting value + * @param buffer_size Size of supplied buffer + * + * @retval 0 Success + * @retval 1 Success + * @retval < 0 Failure + */ int odph_hash_get_value(odph_table_t table, void *key, void *buffer, uint32_t buffer_size); + +/** + * Remove a value from a hash table + * + * @param table Table from which value is to be removed + * @param key Address of odph_table_t to be used as key + * + * @retval >= 0 Success + * @retval < 0 Failure + */ int odph_hash_remove_value(odph_table_t table, void *key); -extern odph_table_ops_t odph_hash_table_ops; +extern odph_table_ops_t odph_hash_table_ops; /**< @internal */ + +/** + * @} + */ #ifdef __cplusplus } #endif #endif - diff --git a/helper/include/odp/helper/odph_iplookuptable.h b/helper/include/odp/helper/odph_iplookuptable.h index 0ae6b37..84c2cfd 100644 --- a/helper/include/odp/helper/odph_iplookuptable.h +++ b/helper/include/odp/helper/odph_iplookuptable.h @@ -24,32 +24,99 @@ extern "C" { #endif +/** + * @addtogroup odph_iplookuptable ODPH IP LOOKUP TABLE + * @{ + */ + +/** + * IP Lookup Prefix + */ typedef struct { - uint32_t ip; - uint8_t cidr; + uint32_t ip; /**< IPv4 address */ + uint8_t cidr; /**< CIDR value for prefix matching */ } odph_iplookup_prefix_t; -odph_table_t odph_iplookup_table_create( - const char *name, - uint32_t ODP_IGNORED_1, - uint32_t ODP_IGNORED_2, - uint32_t value_size); +/** + * Create an IP lookup table + * + * @param name Name of the table to be created + * @param ODP_IGNORED_1 Unused + * @param ODP_IGNORED_2 Unused + * @param value_size Byte size of each entry in the table + * + * @return Handle of the created ip lookup table + * @retval NULL If table create failed + */ +odph_table_t odph_iplookup_table_create(const char *name, + uint32_t ODP_IGNORED_1, + uint32_t ODP_IGNORED_2, + uint32_t value_size); +/** + * Lookup an IP lookup table by name + * + * @param name Name of the table to be located + * + * @return Handle of the located ip lookup table + * @retval NULL No table matching supplied name found + */ odph_table_t odph_iplookup_table_lookup(const char *name); +/** + * Destroy an IP lookup table + * + * @param table Handle of the ip lookup table to be destroyed + * + * @retval 0 Success + * @retval < 0 Failure + */ int odph_iplookup_table_destroy(odph_table_t table); -int odph_iplookup_table_put_value( - odph_table_t table, void *key, void *value); +/** + * Insert a key/value pair into an ip lookup table + * + * @param table Table into which value is to be stored + * @param key Address of an odph_iplookup_prefix_t to be used as key + * @param value Value to be associated with specified key + * + * @retval >= 0 Success + * @retval < 0 Failure + */ +int odph_iplookup_table_put_value(odph_table_t table, void *key, void *value); + +/** + * Retrieve a value from an iplookup table + * + * @param table Table from which value is to be retrieved + * @param key Address of an odph_iplookup_prefix_t to be used as key + * @param[out] buffer Address of buffer to receive resulting value + * @param buffer_size Size of supplied buffer + * + * @retval 0 Success + * @retval 1 Success + * @retval < 0 Failure + */ +int odph_iplookup_table_get_value(odph_table_t table, void *key, + void *buffer, uint32_t buffer_size); -int odph_iplookup_table_get_value( - odph_table_t table, void *key, - void *buffer, uint32_t buffer_size); +/** + * Remove a value from an iplookup table + * + * @param table Table from which value is to be removed + * @param key Address of odph_iplookup_prefix_t to be used as key + * + * @retval >= 0 Success + * @retval < 0 Failure + * + */ +int odph_iplookup_table_remove_value(odph_table_t table, void *key); -int odph_iplookup_table_remove_value( - odph_table_t table, void *key); +extern odph_table_ops_t odph_iplookup_table_ops; /**< @internal */ -extern odph_table_ops_t odph_iplookup_table_ops; +/** + * @} + */ #ifdef __cplusplus } diff --git a/helper/include/odp/helper/odph_lineartable.h b/helper/include/odp/helper/odph_lineartable.h index 0b56b7f..cd9fda3 100644 --- a/helper/include/odp/helper/odph_lineartable.h +++ b/helper/include/odp/helper/odph_lineartable.h @@ -20,21 +20,82 @@ extern "C" { #endif +/** + * @addtogroup odph_lineartable ODPH LINEAR TABLE + * @{ + */ + +/** + * Create a linear table + * + * @param name Name of the linear table to be created + * @param capacity Number of elements table may store + * @param ODP_IGNORED Ignored parameter + * @param value_size Size of the value stored for each element + * + * @return Handle of created linear table + * @return NULL Create failed + */ odph_table_t odph_linear_table_create(const char *name, uint32_t capacity, uint32_t ODP_IGNORED, uint32_t value_size); + +/** + * Lookup a linear table + * + * @param name Name of the table to be located + * + * @return Handle of the located linear table + * @retval NULL No table matching supplied name found + */ odph_table_t odph_linear_table_lookup(const char *name); + +/** + * Destroy a linear table + * + * @param table Handle of linear table to be destroyed + * + * @retval 0 Success + * @retval < 0 Failure + */ int odph_linear_table_destroy(odph_table_t table); + +/** + * Insert a value into a linear table + * + * @param table Table into which value is to be stored + * @param key Index value used as key + * @param value Value to be assoceiated with specified key index + * + * @retval >= 0 Success + * @retval < 0 Failure + */ int odph_linear_put_value(odph_table_t table, void *key, void *value); + +/** + * Retrieve a value from a linear table + * + * @param table Table from which value is to be retrieved + * @param key Index value used as key + * @param[out] buffer Address of buffer to receive resulting value + * @param buffer_size Size of supplied buffer + * + * @retval 0 Success + * @retval 1 Success + * @retval < 0 Failure + */ int odph_linear_get_value(odph_table_t table, void *key, void *buffer, uint32_t buffer_size); -extern odph_table_ops_t odph_linear_table_ops; +extern odph_table_ops_t odph_linear_table_ops; /**< @internal */ + +/** + * @} + */ #ifdef __cplusplus } #endif #endif - diff --git a/helper/include/odp/helper/table.h b/helper/include/odp/helper/table.h index 81022e5..b3440ef 100644 --- a/helper/include/odp/helper/table.h +++ b/helper/include/odp/helper/table.h @@ -80,6 +80,11 @@ extern "C" { #endif +/** + * @addtogroup odph_tables ODPH TABLES + * @{ + */ + #include <stdint.h> /** @@ -228,9 +233,12 @@ typedef struct odph_table_ops_t { odph_table_remove_value f_remove; } odph_table_ops_t; +/** + * @} + */ + #ifdef __cplusplus } #endif #endif - ----------------------------------------------------------------------- Summary of changes: helper/include/odp/helper/odph_cuckootable.h | 80 ++++++++++++++++++--- helper/include/odp/helper/odph_hashtable.h | 75 +++++++++++++++++++- helper/include/odp/helper/odph_iplookuptable.h | 97 ++++++++++++++++++++++---- helper/include/odp/helper/odph_lineartable.h | 65 ++++++++++++++++- helper/include/odp/helper/table.h | 10 ++- 5 files changed, 299 insertions(+), 28 deletions(-) hooks/post-receive --

8 years, 12 months

[COMMIT] branch api-next updated. v1.13.0.0-271-ga1bcdb7

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, api-next has been updated via a1bcdb71f9c5525e02a9609fb32b767f4f76b082 (commit) from f21b2d23874d517e147a3e096e99aa272b99dbe4 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit a1bcdb71f9c5525e02a9609fb32b767f4f76b082 Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Fri Jan 27 00:11:33 2017 +0300 linux-gen: support older libconfig version Travis CI uses old libconfig8 amd64 1.3.2-2ubuntu2, which does not have defines for errors. Move error print under ifdef to fix compilation. Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> Reviewed-by: Christophe Milard <christophe.milard(a)linaro.org> diff --git a/platform/linux-generic/odp_init.c b/platform/linux-generic/odp_init.c index 2cd8fe3..685e02f 100644 --- a/platform/linux-generic/odp_init.c +++ b/platform/linux-generic/odp_init.c @@ -130,12 +130,17 @@ static int read_configfile(void) if (config_filename) { ODP_DBG("Reading configuration file: %s\n", config_filename); if (!config_read_file(cf, config_filename)) { +#if defined(LIBCONFIG_VER_MAJOR) && LIBCONFIG_VER_MAJOR >= 1 && \ + LIBCONFIG_VER_MINOR >= 4 ODP_ERR("%s:%d - %s\n", config_error_file(cf), config_error_line(cf), config_error_text(cf)); +#else + ODP_ERR("config_read_file\n"); +#endif config_destroy(cf); - return(-1); + return -1; } } ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/odp_init.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) hooks/post-receive --

8 years, 12 months

[COMMIT] branch api-next updated. v1.13.0.0-270-gf21b2d2

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, api-next has been updated via f21b2d23874d517e147a3e096e99aa272b99dbe4 (commit) via 3ffa326e2dbdcfcc631c672bc5f443f4ca8fe911 (commit) via 66bc236b2059f554c378b90d5291ca4a8aecf5b4 (commit) via 22a659377f3b181e351428708708971c819582f7 (commit) via 458bc7ddf290806f0a95c76da6f6d4f3c8a07737 (commit) via 12229e66492f7947c180cf540aecd53096431bc8 (commit) via 7378c0ddeb8c34a38d0021230a65bccfc21a6f1b (commit) from 2961df923de0b3034c09a288b28394c1a2ea1a9d (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit f21b2d23874d517e147a3e096e99aa272b99dbe4 Author: Yi He <yi.he(a)linaro.org> Date: Fri Dec 23 02:32:09 2016 +0000 linux-gen: sched: fix SP scheduler hang in process mode SP scheduler hangs in process mode performance test due to global data structure were not created in shared memory region. Signed-off-by: Yi He <yi.he(a)linaro.org> Reviewed-and-tested-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/odp_schedule_sp.c b/platform/linux-generic/odp_schedule_sp.c index a592e5c..0fd4d87 100644 --- a/platform/linux-generic/odp_schedule_sp.c +++ b/platform/linux-generic/odp_schedule_sp.c @@ -9,6 +9,7 @@ #include <odp/api/thread.h> #include <odp/api/time.h> #include <odp/api/schedule.h> +#include <odp/api/shared_memory.h> #include <odp_schedule_if.h> #include <odp_debug_internal.h> #include <odp_align_internal.h> @@ -107,6 +108,7 @@ typedef struct { sched_cmd_t pktio_cmd[NUM_PKTIO]; prio_queue_t prio_queue[NUM_GROUP][NUM_PRIO]; sched_group_t sched_group; + odp_shm_t shm; } sched_global_t; typedef struct { @@ -118,7 +120,7 @@ typedef struct { int group[NUM_GROUP]; } sched_local_t; -static sched_global_t sched_global; +static sched_global_t *sched_global; static __thread sched_local_t sched_local; static inline uint32_t index_to_ring_idx(int pktio, uint32_t index) @@ -144,30 +146,44 @@ static inline uint32_t index_from_ring_idx(uint32_t *index, uint32_t ring_idx) static int init_global(void) { int i, j; - sched_group_t *sched_group = &sched_global.sched_group; + odp_shm_t shm; + sched_group_t *sched_group = NULL; ODP_DBG("Using SP scheduler\n"); - memset(&sched_global, 0, sizeof(sched_global_t)); + shm = odp_shm_reserve("sp_scheduler", + sizeof(sched_global_t), + ODP_CACHE_LINE_SIZE, 0); + + sched_global = odp_shm_addr(shm); + + if (sched_global == NULL) { + ODP_ERR("Schedule init: Shm reserve failed.\n"); + return -1; + } + + memset(sched_global, 0, sizeof(sched_global_t)); + sched_global->shm = shm; for (i = 0; i < NUM_QUEUE; i++) { - sched_global.queue_cmd[i].s.type = CMD_QUEUE; - sched_global.queue_cmd[i].s.index = i; - sched_global.queue_cmd[i].s.ring_idx = index_to_ring_idx(0, i); + sched_global->queue_cmd[i].s.type = CMD_QUEUE; + sched_global->queue_cmd[i].s.index = i; + sched_global->queue_cmd[i].s.ring_idx = index_to_ring_idx(0, i); } for (i = 0; i < NUM_PKTIO; i++) { - sched_global.pktio_cmd[i].s.type = CMD_PKTIO; - sched_global.pktio_cmd[i].s.index = i; - sched_global.pktio_cmd[i].s.ring_idx = index_to_ring_idx(1, i); - sched_global.pktio_cmd[i].s.prio = PKTIN_PRIO; - sched_global.pktio_cmd[i].s.group = GROUP_PKTIN; + sched_global->pktio_cmd[i].s.type = CMD_PKTIO; + sched_global->pktio_cmd[i].s.index = i; + sched_global->pktio_cmd[i].s.ring_idx = index_to_ring_idx(1, i); + sched_global->pktio_cmd[i].s.prio = PKTIN_PRIO; + sched_global->pktio_cmd[i].s.group = GROUP_PKTIN; } for (i = 0; i < NUM_GROUP; i++) for (j = 0; j < NUM_PRIO; j++) - ring_init(&sched_global.prio_queue[i][j].ring); + ring_init(&sched_global->prio_queue[i][j].ring); + sched_group = &sched_global->sched_group; odp_ticketlock_init(&sched_group->s.lock); for (i = 0; i < NUM_THREAD; i++) @@ -201,16 +217,22 @@ static int init_local(void) static int term_global(void) { - int qi; + int qi, ret = 0; for (qi = 0; qi < NUM_QUEUE; qi++) { - if (sched_global.queue_cmd[qi].s.init) { + if (sched_global->queue_cmd[qi].s.init) { /* todo: dequeue until empty ? */ sched_cb_queue_destroy_finalize(qi); } } - return 0; + ret = odp_shm_free(sched_global->shm); + if (ret < 0) { + ODP_ERR("Shm free failed for sp_scheduler"); + ret = -1; + } + + return ret; } static int term_local(void) @@ -266,7 +288,7 @@ static void remove_group(sched_group_t *sched_group, int thr, int group) static int thr_add(odp_schedule_group_t group, int thr) { - sched_group_t *sched_group = &sched_global.sched_group; + sched_group_t *sched_group = &sched_global->sched_group; if (group < 0 || group >= NUM_GROUP) return -1; @@ -291,7 +313,7 @@ static int thr_add(odp_schedule_group_t group, int thr) static int thr_rem(odp_schedule_group_t group, int thr) { - sched_group_t *sched_group = &sched_global.sched_group; + sched_group_t *sched_group = &sched_global->sched_group; if (group < 0 || group >= NUM_GROUP) return -1; @@ -319,7 +341,7 @@ static int num_grps(void) static int init_queue(uint32_t qi, const odp_schedule_param_t *sched_param) { - sched_group_t *sched_group = &sched_global.sched_group; + sched_group_t *sched_group = &sched_global->sched_group; odp_schedule_group_t group = sched_param->group; int prio = 0; @@ -332,18 +354,18 @@ static int init_queue(uint32_t qi, const odp_schedule_param_t *sched_param) if (sched_param->prio > 0) prio = LOWEST_QUEUE_PRIO; - sched_global.queue_cmd[qi].s.prio = prio; - sched_global.queue_cmd[qi].s.group = group; - sched_global.queue_cmd[qi].s.init = 1; + sched_global->queue_cmd[qi].s.prio = prio; + sched_global->queue_cmd[qi].s.group = group; + sched_global->queue_cmd[qi].s.init = 1; return 0; } static void destroy_queue(uint32_t qi) { - sched_global.queue_cmd[qi].s.prio = 0; - sched_global.queue_cmd[qi].s.group = 0; - sched_global.queue_cmd[qi].s.init = 0; + sched_global->queue_cmd[qi].s.prio = 0; + sched_global->queue_cmd[qi].s.group = 0; + sched_global->queue_cmd[qi].s.init = 0; } static inline void add_tail(sched_cmd_t *cmd) @@ -353,8 +375,7 @@ static inline void add_tail(sched_cmd_t *cmd) int prio = cmd->s.prio; uint32_t idx = cmd->s.ring_idx; - prio_queue = &sched_global.prio_queue[group][prio]; - + prio_queue = &sched_global->prio_queue[group][prio]; ring_enq(&prio_queue->ring, RING_MASK, idx); } @@ -364,8 +385,7 @@ static inline sched_cmd_t *rem_head(int group, int prio) uint32_t ring_idx, index; int pktio; - prio_queue = &sched_global.prio_queue[group][prio]; - + prio_queue = &sched_global->prio_queue[group][prio]; ring_idx = ring_deq(&prio_queue->ring, RING_MASK); if (ring_idx == RING_EMPTY) @@ -374,16 +394,16 @@ static inline sched_cmd_t *rem_head(int group, int prio) pktio = index_from_ring_idx(&index, ring_idx); if (pktio) - return &sched_global.pktio_cmd[index]; + return &sched_global->pktio_cmd[index]; - return &sched_global.queue_cmd[index]; + return &sched_global->queue_cmd[index]; } static int sched_queue(uint32_t qi) { sched_cmd_t *cmd; - cmd = &sched_global.queue_cmd[qi]; + cmd = &sched_global->queue_cmd[qi]; add_tail(cmd); return 0; @@ -414,7 +434,7 @@ static void pktio_start(int pktio_index, int num, int pktin_idx[]) ODP_DBG("pktio index: %i, %i pktin queues %i\n", pktio_index, num, pktin_idx[0]); - cmd = &sched_global.pktio_cmd[pktio_index]; + cmd = &sched_global->pktio_cmd[pktio_index]; if (num > NUM_PKTIN) ODP_ABORT("Supports only %i pktin queues per interface\n", @@ -432,7 +452,7 @@ static inline sched_cmd_t *sched_cmd(void) { int prio, i; int thr = sched_local.thr_id; - sched_group_t *sched_group = &sched_global.sched_group; + sched_group_t *sched_group = &sched_global->sched_group; thr_group_t *thr_group = &sched_group->s.thr[thr]; uint32_t gen_cnt; @@ -606,7 +626,7 @@ static odp_schedule_group_t schedule_group_create(const char *name, const odp_thrmask_t *thrmask) { odp_schedule_group_t group = ODP_SCHED_GROUP_INVALID; - sched_group_t *sched_group = &sched_global.sched_group; + sched_group_t *sched_group = &sched_global->sched_group; int i; odp_ticketlock_lock(&sched_group->s.lock); @@ -637,7 +657,7 @@ static odp_schedule_group_t schedule_group_create(const char *name, static int schedule_group_destroy(odp_schedule_group_t group) { - sched_group_t *sched_group = &sched_global.sched_group; + sched_group_t *sched_group = &sched_global->sched_group; if (group < NUM_STATIC_GROUP || group >= NUM_GROUP) return -1; @@ -660,7 +680,7 @@ static int schedule_group_destroy(odp_schedule_group_t group) static odp_schedule_group_t schedule_group_lookup(const char *name) { odp_schedule_group_t group = ODP_SCHED_GROUP_INVALID; - sched_group_t *sched_group = &sched_global.sched_group; + sched_group_t *sched_group = &sched_global->sched_group; int i; odp_ticketlock_lock(&sched_group->s.lock); @@ -681,7 +701,7 @@ static int schedule_group_join(odp_schedule_group_t group, const odp_thrmask_t *thrmask) { int thr; - sched_group_t *sched_group = &sched_global.sched_group; + sched_group_t *sched_group = &sched_global->sched_group; if (group < 0 || group >= NUM_GROUP) return -1; @@ -713,7 +733,7 @@ static int schedule_group_leave(odp_schedule_group_t group, const odp_thrmask_t *thrmask) { int thr; - sched_group_t *sched_group = &sched_global.sched_group; + sched_group_t *sched_group = &sched_global->sched_group; odp_thrmask_t *all = &sched_group->s.group[GROUP_ALL].mask; odp_thrmask_t not; @@ -747,7 +767,7 @@ static int schedule_group_leave(odp_schedule_group_t group, static int schedule_group_thrmask(odp_schedule_group_t group, odp_thrmask_t *thrmask) { - sched_group_t *sched_group = &sched_global.sched_group; + sched_group_t *sched_group = &sched_global->sched_group; if (group < 0 || group >= NUM_GROUP) return -1; @@ -769,7 +789,7 @@ static int schedule_group_thrmask(odp_schedule_group_t group, static int schedule_group_info(odp_schedule_group_t group, odp_schedule_group_info_t *info) { - sched_group_t *sched_group = &sched_global.sched_group; + sched_group_t *sched_group = &sched_global->sched_group; if (group < 0 || group >= NUM_GROUP) return -1; commit 3ffa326e2dbdcfcc631c672bc5f443f4ca8fe911 Merge: 2961df9 66bc236 Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Thu Feb 9 18:56:42 2017 +0300 Merge branch 'master' into api-next commit 66bc236b2059f554c378b90d5291ca4a8aecf5b4 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Wed Feb 8 14:19:41 2017 +0200 test: l2fwd: use packet_data Since l2fwd can assume that all packets are Ethernet. Also odp_packet_data() points to the first byte of the frame directly after packet input. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-and-tested-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/common_plat/performance/odp_l2fwd.c b/test/common_plat/performance/odp_l2fwd.c index 9864c64..8f5c5e1 100644 --- a/test/common_plat/performance/odp_l2fwd.c +++ b/test/common_plat/performance/odp_l2fwd.c @@ -241,15 +241,13 @@ static inline void fill_eth_addrs(odp_packet_t pkt_tbl[], odp_packet_prefetch(pkt, 0, ODPH_ETHHDR_LEN); - if (odp_packet_has_eth(pkt)) { - eth = (odph_ethhdr_t *)odp_packet_l2_ptr(pkt, NULL); + eth = odp_packet_data(pkt); - if (gbl_args->appl.src_change) - eth->src = gbl_args->port_eth_addr[dst_port]; + if (gbl_args->appl.src_change) + eth->src = gbl_args->port_eth_addr[dst_port]; - if (gbl_args->appl.dst_change) - eth->dst = gbl_args->dst_eth_addr[dst_port]; - } + if (gbl_args->appl.dst_change) + eth->dst = gbl_args->dst_eth_addr[dst_port]; } } commit 22a659377f3b181e351428708708971c819582f7 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Wed Feb 8 14:19:40 2017 +0200 test: l2fwd script: limit number of generator cpus During 'make check' run generator on up to four cpus. Generator on all cpus was an overkill compared to l2fwd on two cpus. Generator and l2fwd still share cpus (on odp-linux) as cpumask_default_worker() returns the same cpumask for both. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-and-tested-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/common_plat/performance/odp_l2fwd_run.sh b/test/common_plat/performance/odp_l2fwd_run.sh index 757cf53..dd42ede 100755 --- a/test/common_plat/performance/odp_l2fwd_run.sh +++ b/test/common_plat/performance/odp_l2fwd_run.sh @@ -66,12 +66,14 @@ run_l2fwd() exit 1 fi - #@todo: limit odp_generator to cores - #https://bugs.linaro.org/show_bug.cgi?id=1398 + # Max 4 workers + # @todo: ensure that generator and l2fwd workers are not allocated to + # the same CPUs (odp_generator${EXEEXT} --interval $FLOOD_MODE -I $IF0 \ --srcip 192.168.0.1 --dstip 192.168.0.2 \ - -m u 2>&1 > /dev/null) \ + -m u -w 4 2>&1 > /dev/null) \ 2>&1 > /dev/null & + GEN_PID=$! # this just turns off output buffering so that you still get periodic @@ -82,6 +84,8 @@ run_l2fwd() STDBUF= fi LOG=odp_l2fwd_tmp.log + + # Max 2 workers $STDBUF odp_l2fwd${EXEEXT} -i $IF1,$IF2 -m 0 -t 30 -c 2 | tee $LOG ret=$? commit 458bc7ddf290806f0a95c76da6f6d4f3c8a07737 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Wed Feb 8 14:19:39 2017 +0200 test: generator: various improvements User may select number of worker threads (-w) or cpumask (-c) (but not both) to limit number of worker thread. Increased pool size since many threads empty the pool easily and result some threads to give up (on the first time those see pool empty). Added EXAMPLE_ERR() before abort() to make debugging easier. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-and-tested-by: Bogdan Pricope <bogdan.pricope(a)linaro.org> Reviewed-and-tested-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/example/generator/odp_generator.c b/example/generator/odp_generator.c index 6ac8f2d..8062d87 100644 --- a/example/generator/odp_generator.c +++ b/example/generator/odp_generator.c @@ -22,10 +22,10 @@ #include <odp/helper/odph_api.h> -#define MAX_WORKERS 32 /**< max number of works */ -#define SHM_PKT_POOL_SIZE (512*2048) /**< pkt pool size */ -#define SHM_PKT_POOL_BUF_SIZE 1856 /**< pkt pool buf size */ -#define DEFAULT_PKT_INTERVAL 1000 /**< interval btw each pkt */ +#define MAX_WORKERS 32 /* Max number of workers */ +#define POOL_NUM_PKT 2048 /* Number of packets in packet pool */ +#define POOL_PKT_LEN 1856 /* Max packet length */ +#define DEFAULT_PKT_INTERVAL 1000 /* Interval between each packet */ #define APPL_MODE_UDP 0 /**< UDP mode */ #define APPL_MODE_PING 1 /**< ping mode */ @@ -41,7 +41,7 @@ * Parsed command line application arguments */ typedef struct { - int cpu_count; /**< system CPU count */ + int num_workers; /**< Number of worker thread */ const char *mask; /**< CPU mask */ int if_count; /**< Number of interfaces to be used */ char **if_names; /**< Array of pointers to interface names */ @@ -383,14 +383,17 @@ static int gen_send_thread(void *arg) (unsigned int)args->appl.number) break; + pkt = ODP_PACKET_INVALID; + if (args->appl.mode == APPL_MODE_UDP) pkt = pack_udp_pkt(thr_args->pool); else if (args->appl.mode == APPL_MODE_PING) pkt = pack_icmp_pkt(thr_args->pool); - else - pkt = ODP_PACKET_INVALID; - if (!odp_packet_is_valid(pkt)) { + if (pkt == ODP_PACKET_INVALID) { + /* Thread gives up as soon as it sees the pool empty. + * Depending on pool size and transmit latency, it may + * be normal that pool gets empty sometimes. */ EXAMPLE_ERR(" [%2i] alloc_single failed\n", thr); break; } @@ -671,13 +674,17 @@ int main(int argc, char *argv[]) /* Print both system and application information */ print_info(NO_PATH(argv[0]), &args->appl); - /* Default to system CPU count unless user specified */ + /* Default to max number of workers, unless user specified number of + * workers or cpumask */ num_workers = MAX_WORKERS; - if (args->appl.cpu_count) - num_workers = args->appl.cpu_count; - num_workers = odp_cpumask_default_worker(&cpumask, num_workers); - if (args->appl.mask) { + + if (args->appl.num_workers) { + /* -w option: number of workers */ + num_workers = args->appl.num_workers; + num_workers = odp_cpumask_default_worker(&cpumask, num_workers); + } else if (args->appl.mask) { + /* -c option: cpumask */ odp_cpumask_from_str(&cpumask, args->appl.mask); num_workers = odp_cpumask_count(&cpumask); } @@ -700,9 +707,9 @@ int main(int argc, char *argv[]) /* Create packet pool */ odp_pool_param_init(&params); - params.pkt.seg_len = SHM_PKT_POOL_BUF_SIZE; - params.pkt.len = SHM_PKT_POOL_BUF_SIZE; - params.pkt.num = SHM_PKT_POOL_SIZE/SHM_PKT_POOL_BUF_SIZE; + params.pkt.seg_len = POOL_PKT_LEN; + params.pkt.len = POOL_PKT_LEN; + params.pkt.num = POOL_NUM_PKT; params.type = ODP_POOL_PACKET; pool = odp_pool_create("packet_pool", &params); @@ -763,18 +770,24 @@ int main(int argc, char *argv[]) odp_cpumask_set(&cpu_mask, cpu_first); tq = odp_queue_create("", NULL); - if (tq == ODP_QUEUE_INVALID) + if (tq == ODP_QUEUE_INVALID) { + EXAMPLE_ERR("queue_create failed\n"); abort(); + } args->thread[1].pktio_dev = args->appl.if_names[0]; args->thread[1].pool = pool; args->thread[1].tp = tp; args->thread[1].tq = tq; args->thread[1].tim = odp_timer_alloc(tp, tq, NULL); - if (args->thread[1].tim == ODP_TIMER_INVALID) + if (args->thread[1].tim == ODP_TIMER_INVALID) { + EXAMPLE_ERR("timer_alloc failed\n"); abort(); + } args->thread[1].tmo_ev = odp_timeout_alloc(tmop); - if (args->thread[1].tmo_ev == ODP_TIMEOUT_INVALID) + if (args->thread[1].tmo_ev == ODP_TIMEOUT_INVALID) { + EXAMPLE_ERR("timeout_alloc failed\n"); abort(); + } args->thread[1].mode = args->appl.mode; memset(&thr_params, 0, sizeof(thr_params)); @@ -786,18 +799,24 @@ int main(int argc, char *argv[]) odph_odpthreads_create(&thread_tbl[1], &cpu_mask, &thr_params); tq = odp_queue_create("", NULL); - if (tq == ODP_QUEUE_INVALID) + if (tq == ODP_QUEUE_INVALID) { + EXAMPLE_ERR("queue_create failed\n"); abort(); + } args->thread[0].pktio_dev = args->appl.if_names[0]; args->thread[0].pool = pool; args->thread[0].tp = tp; args->thread[0].tq = tq; args->thread[0].tim = odp_timer_alloc(tp, tq, NULL); - if (args->thread[0].tim == ODP_TIMER_INVALID) + if (args->thread[0].tim == ODP_TIMER_INVALID) { + EXAMPLE_ERR("timer_alloc failed\n"); abort(); + } args->thread[0].tmo_ev = odp_timeout_alloc(tmop); - if (args->thread[0].tmo_ev == ODP_TIMEOUT_INVALID) + if (args->thread[0].tmo_ev == ODP_TIMEOUT_INVALID) { + EXAMPLE_ERR("timeout_alloc failed\n"); abort(); + } args->thread[0].mode = args->appl.mode; cpu_next = odp_cpumask_next(&cpumask, cpu_first); odp_cpumask_zero(&cpu_mask); @@ -819,17 +838,23 @@ int main(int argc, char *argv[]) args->thread[i].pktio_dev = args->appl.if_names[if_idx]; tq = odp_queue_create("", NULL); - if (tq == ODP_QUEUE_INVALID) + if (tq == ODP_QUEUE_INVALID) { + EXAMPLE_ERR("queue_create failed\n"); abort(); + } args->thread[i].pool = pool; args->thread[i].tp = tp; args->thread[i].tq = tq; args->thread[i].tim = odp_timer_alloc(tp, tq, NULL); - if (args->thread[i].tim == ODP_TIMER_INVALID) + if (args->thread[i].tim == ODP_TIMER_INVALID) { + EXAMPLE_ERR("timer_alloc failed\n"); abort(); + } args->thread[i].tmo_ev = odp_timeout_alloc(tmop); - if (args->thread[i].tmo_ev == ODP_TIMEOUT_INVALID) + if (args->thread[i].tmo_ev == ODP_TIMEOUT_INVALID) { + EXAMPLE_ERR("timeout_alloc failed\n"); abort(); + } args->thread[i].mode = args->appl.mode; if (args->appl.mode == APPL_MODE_UDP) { @@ -955,7 +980,7 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args) switch (opt) { case 'w': - appl_args->cpu_count = atoi(optarg); + appl_args->num_workers = atoi(optarg); break; case 'c': appl_args->mask = optarg; commit 12229e66492f7947c180cf540aecd53096431bc8 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Wed Feb 8 14:19:38 2017 +0200 validation: packet: print reason for suite init failure Knowing the reason for suite init function failure helps in debugging. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-and-tested-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/common_plat/validation/api/packet/packet.c b/test/common_plat/validation/api/packet/packet.c index fa5206f..e3d28f6 100644 --- a/test/common_plat/validation/api/packet/packet.c +++ b/test/common_plat/validation/api/packet/packet.c @@ -110,8 +110,10 @@ int packet_suite_init(void) uint8_t data = 0; uint32_t i; - if (odp_pool_capability(&capa) < 0) + if (odp_pool_capability(&capa) < 0) { + printf("pool_capability failed\n"); return -1; + } /* Pick a typical packet size and decrement it to the single segment * limit if needed (min_seg_len maybe equal to max_len @@ -136,14 +138,17 @@ int packet_suite_init(void) params.pkt.uarea_size = sizeof(struct udata_struct); packet_pool = odp_pool_create("packet_pool", &params); - if (packet_pool == ODP_POOL_INVALID) + if (packet_pool == ODP_POOL_INVALID) { + printf("pool_create failed: 1\n"); return -1; + } params.pkt.uarea_size = 0; packet_pool_no_uarea = odp_pool_create("packet_pool_no_uarea", &params); if (packet_pool_no_uarea == ODP_POOL_INVALID) { odp_pool_destroy(packet_pool); + printf("pool_create failed: 2\n"); return -1; } @@ -154,6 +159,7 @@ int packet_suite_init(void) if (packet_pool_double_uarea == ODP_POOL_INVALID) { odp_pool_destroy(packet_pool_no_uarea); odp_pool_destroy(packet_pool); + printf("pool_create failed: 3\n"); return -1; } @@ -174,8 +180,10 @@ int packet_suite_init(void) } while (segmented_test_packet == ODP_PACKET_INVALID); if (odp_packet_is_valid(test_packet) == 0 || - odp_packet_is_valid(segmented_test_packet) == 0) + odp_packet_is_valid(segmented_test_packet) == 0) { + printf("packet_is_valid failed\n"); return -1; + } segmentation_supported = odp_packet_is_segmented(segmented_test_packet); @@ -187,16 +195,21 @@ int packet_suite_init(void) udat = odp_packet_user_area(test_packet); udat_size = odp_packet_user_area_size(test_packet); - if (!udat || udat_size != sizeof(struct udata_struct)) + if (!udat || udat_size != sizeof(struct udata_struct)) { + printf("packet_user_area failed: 1\n"); return -1; + } odp_pool_print(packet_pool); memcpy(udat, &test_packet_udata, sizeof(struct udata_struct)); udat = odp_packet_user_area(segmented_test_packet); udat_size = odp_packet_user_area_size(segmented_test_packet); - if (udat == NULL || udat_size != sizeof(struct udata_struct)) + if (udat == NULL || udat_size != sizeof(struct udata_struct)) { + printf("packet_user_area failed: 2\n"); return -1; + } + memcpy(udat, &test_packet_udata, sizeof(struct udata_struct)); return 0; commit 7378c0ddeb8c34a38d0021230a65bccfc21a6f1b Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Wed Feb 8 14:19:37 2017 +0200 test: l2fwd: add pktio driver print out Print out pktio driver name in start up. Driver name (e.g. dpdk or netmap) helps in checking that correct pktio device started. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-and-tested-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/common_plat/performance/odp_l2fwd.c b/test/common_plat/performance/odp_l2fwd.c index 54dc4cf..9864c64 100644 --- a/test/common_plat/performance/odp_l2fwd.c +++ b/test/common_plat/performance/odp_l2fwd.c @@ -603,6 +603,7 @@ static int create_pktio(const char *dev, int idx, int num_rx, int num_tx, odp_pktio_op_mode_t mode_rx; odp_pktio_op_mode_t mode_tx; pktin_mode_t in_mode = gbl_args->appl.in_mode; + odp_pktio_info_t info; odp_pktio_param_init(&pktio_param); @@ -620,8 +621,13 @@ static int create_pktio(const char *dev, int idx, int num_rx, int num_tx, return -1; } - printf("created pktio %" PRIu64 " (%s)\n", - odp_pktio_to_u64(pktio), dev); + if (odp_pktio_info(pktio, &info)) { + LOG_ERR("Error: pktio info failed %s\n", dev); + return -1; + } + + printf("created pktio %" PRIu64 ", dev: %s, drv: %s\n", + odp_pktio_to_u64(pktio), dev, info.drv_name); if (odp_pktio_capability(pktio, &capa)) { LOG_ERR("Error: capability query failed %s\n", dev); ----------------------------------------------------------------------- Summary of changes: example/generator/odp_generator.c | 77 ++++++++++++------ platform/linux-generic/odp_schedule_sp.c | 100 ++++++++++++++---------- test/common_plat/performance/odp_l2fwd.c | 22 +++--- test/common_plat/performance/odp_l2fwd_run.sh | 10 ++- test/common_plat/validation/api/packet/packet.c | 23 ++++-- 5 files changed, 149 insertions(+), 83 deletions(-) hooks/post-receive --

8 years, 12 months

[COMMIT] branch next updated. v1.13.0.0-45-g332d48c

by git＠git-us.linaro.org

8 years, 12 months

[COMMIT] branch master updated. v1.13.0.0-45-g332d48c

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, master has been updated via 332d48c9c25504b3cbb9451e292a98c15df17ccb (commit) from 0d3ee95d0fb3712631d81c5e6f4fb5f176617c5e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 332d48c9c25504b3cbb9451e292a98c15df17ccb Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Thu Feb 9 00:50:53 2017 +0300 travis: add code style checks run checkpatch.pl to check code style for applied patches. Do not check spelling now. Will check it only on merge requests. Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> Reviewed-by: Mike Holmes <mike.holmes(a)linaro.org> diff --git a/.travis.yml b/.travis.yml index 5b9a29a..9544ec8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -95,6 +95,21 @@ before_install: - popd script: + - echo $TRAVIS_COMMIT_RANGE + - ODP_PACHES=`echo $TRAVIS_COMMIT_RANGE | sed 's/\.//'` +# Generate patches provided with $TRAVIS_COMMIT_RANGE. +# In case of force push and range is broken validate only the latest commit if it's not merge commit. + - git format-patch $ODP_PACHES; + if [ $? -ne 0 ]; then + git show --summary HEAD| grep -q '^Merge:'; + if [ $? -ne 0 ]; then + git format-patch HEAD^; + perl ./scripts/checkpatch.pl *.patch; + fi; + else + perl ./scripts/checkpatch.pl *.patch; + fi + - ./bootstrap - ./configure - make doxygen-doc ----------------------------------------------------------------------- Summary of changes: .travis.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) hooks/post-receive --

8 years, 12 months

[COMMIT] branch next updated. v1.13.0.0-44-g66bc236

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, next has been updated via 66bc236b2059f554c378b90d5291ca4a8aecf5b4 (commit) via 22a659377f3b181e351428708708971c819582f7 (commit) via 458bc7ddf290806f0a95c76da6f6d4f3c8a07737 (commit) via 12229e66492f7947c180cf540aecd53096431bc8 (commit) via 7378c0ddeb8c34a38d0021230a65bccfc21a6f1b (commit) via b8867b0a5ea5eeb8b0b7a95e36025c95738f48b3 (commit) via 6ad530311e9cbd5fd77b958e78921e80fbbfa943 (commit) via aa3bbe4da1639ac4649c7d34ae75b0230ade70b2 (commit) via 022cf4a7136c7369ee5f29f5d245ac8d052135e6 (commit) via c87d5cc8d70e6e4291d18b101882ea2ddded236e (commit) via 7539b2f3ce69085518ca596fba0261a19247b2d8 (commit) via 1c0488456166888148bf191960691d076f5a9c2e (commit) via 10cd6d5e4294d3a35a366e564fbc57abde732e85 (commit) via 0a62e1c5b92a5170aa807cc8803f42698b23f4c8 (commit) via 62108ed367a2718e0f0e2d7d8682b5c83d504670 (commit) via 4afed247a6ee3058aa6dc3e66ed0bd5acff9ce97 (commit) via 25ed19ceb50d77614644f6d4a28a0b23dbf1e94f (commit) via 810fbc9420e23f55e9038410f7f9d6e593537ff3 (commit) via 04b0be7579f77821418c0c7c524950af6aeab6a6 (commit) via 6ccae3b2720a4ad84d3e50aa5851f64eb3d83b3c (commit) via dd494a2b6a22f0516ce8890df05de826377fdae2 (commit) via 0bd1a1cea75d3788c062933e635849c35a0c6099 (commit) via 94071c18d342614d16b0a14f16f85119563dd70d (commit) via 54593e175a71f5716aa50e5a03be8c30bc15c550 (commit) via 7df357dd591cce23f76221945091a019c0caa7ec (commit) via a51c171ebe9e9b0aaced13bc0956bdb38c8cfc7b (commit) via 0d6c0804640151f8aa9970cc74f1fef28a11fac1 (commit) via b17aeea11a9bac1f5d55463e81904af12c99b4c7 (commit) via ffabb755ea070ee33fd23a88d920b832da5521e1 (commit) via f603483a31d03e5647c409f8ce71d72ebaadd93b (commit) via 29889bf258fc52ae7c950c11eb17503883cff47e (commit) via 88ed645e7378b955c580ec2b8ce9b846a5fb48f0 (commit) via 722fd6f8286722d30d50c00769fa4fcad5935dd2 (commit) via bbabb79cfaf5e28ec9e804b95a23605038b39d39 (commit) via c14ec3dc896e0dd14d0491f09f81ce09e9d53bc2 (commit) via 50ebc616ddd9d05651923134d7bfaa02c103fbce (commit) via 1ff6b7a7e44e7d7376920f1e1ee81dbf28f95563 (commit) via c15da68b8dc3187c1929ff7d7705a0958856cbad (commit) via 16dd00616f73f7e49c53e4b0ea957ac789125b25 (commit) via a5609cc551f4bc71fb69746f3d6cafaf64b87fbf (commit) via 03aafc317489232bab7e9048f9bd96a24e6f598d (commit) via 19a457a86880a6bc33afe891a6204752bde70088 (commit) via 7025b1b430237cddc10a0338c7b120d23b7985a8 (commit) via 0f18e317ede15081828deca1ff61d65b72e12926 (commit) via 3875d6ebf690e07b69f11621caefab1afc58e100 (commit) via b99095485be4ac14d16bef372b5c6521b396abaa (commit) from f53fda91d2919eee33b5a177ef818be1092c890b (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 66bc236b2059f554c378b90d5291ca4a8aecf5b4 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Wed Feb 8 14:19:41 2017 +0200 test: l2fwd: use packet_data Since l2fwd can assume that all packets are Ethernet. Also odp_packet_data() points to the first byte of the frame directly after packet input. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-and-tested-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/common_plat/performance/odp_l2fwd.c b/test/common_plat/performance/odp_l2fwd.c index 9864c64..8f5c5e1 100644 --- a/test/common_plat/performance/odp_l2fwd.c +++ b/test/common_plat/performance/odp_l2fwd.c @@ -241,15 +241,13 @@ static inline void fill_eth_addrs(odp_packet_t pkt_tbl[], odp_packet_prefetch(pkt, 0, ODPH_ETHHDR_LEN); - if (odp_packet_has_eth(pkt)) { - eth = (odph_ethhdr_t *)odp_packet_l2_ptr(pkt, NULL); + eth = odp_packet_data(pkt); - if (gbl_args->appl.src_change) - eth->src = gbl_args->port_eth_addr[dst_port]; + if (gbl_args->appl.src_change) + eth->src = gbl_args->port_eth_addr[dst_port]; - if (gbl_args->appl.dst_change) - eth->dst = gbl_args->dst_eth_addr[dst_port]; - } + if (gbl_args->appl.dst_change) + eth->dst = gbl_args->dst_eth_addr[dst_port]; } } commit 22a659377f3b181e351428708708971c819582f7 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Wed Feb 8 14:19:40 2017 +0200 test: l2fwd script: limit number of generator cpus During 'make check' run generator on up to four cpus. Generator on all cpus was an overkill compared to l2fwd on two cpus. Generator and l2fwd still share cpus (on odp-linux) as cpumask_default_worker() returns the same cpumask for both. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-and-tested-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/common_plat/performance/odp_l2fwd_run.sh b/test/common_plat/performance/odp_l2fwd_run.sh index 757cf53..dd42ede 100755 --- a/test/common_plat/performance/odp_l2fwd_run.sh +++ b/test/common_plat/performance/odp_l2fwd_run.sh @@ -66,12 +66,14 @@ run_l2fwd() exit 1 fi - #@todo: limit odp_generator to cores - #https://bugs.linaro.org/show_bug.cgi?id=1398 + # Max 4 workers + # @todo: ensure that generator and l2fwd workers are not allocated to + # the same CPUs (odp_generator${EXEEXT} --interval $FLOOD_MODE -I $IF0 \ --srcip 192.168.0.1 --dstip 192.168.0.2 \ - -m u 2>&1 > /dev/null) \ + -m u -w 4 2>&1 > /dev/null) \ 2>&1 > /dev/null & + GEN_PID=$! # this just turns off output buffering so that you still get periodic @@ -82,6 +84,8 @@ run_l2fwd() STDBUF= fi LOG=odp_l2fwd_tmp.log + + # Max 2 workers $STDBUF odp_l2fwd${EXEEXT} -i $IF1,$IF2 -m 0 -t 30 -c 2 | tee $LOG ret=$? commit 458bc7ddf290806f0a95c76da6f6d4f3c8a07737 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Wed Feb 8 14:19:39 2017 +0200 test: generator: various improvements User may select number of worker threads (-w) or cpumask (-c) (but not both) to limit number of worker thread. Increased pool size since many threads empty the pool easily and result some threads to give up (on the first time those see pool empty). Added EXAMPLE_ERR() before abort() to make debugging easier. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-and-tested-by: Bogdan Pricope <bogdan.pricope(a)linaro.org> Reviewed-and-tested-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/example/generator/odp_generator.c b/example/generator/odp_generator.c index 6ac8f2d..8062d87 100644 --- a/example/generator/odp_generator.c +++ b/example/generator/odp_generator.c @@ -22,10 +22,10 @@ #include <odp/helper/odph_api.h> -#define MAX_WORKERS 32 /**< max number of works */ -#define SHM_PKT_POOL_SIZE (512*2048) /**< pkt pool size */ -#define SHM_PKT_POOL_BUF_SIZE 1856 /**< pkt pool buf size */ -#define DEFAULT_PKT_INTERVAL 1000 /**< interval btw each pkt */ +#define MAX_WORKERS 32 /* Max number of workers */ +#define POOL_NUM_PKT 2048 /* Number of packets in packet pool */ +#define POOL_PKT_LEN 1856 /* Max packet length */ +#define DEFAULT_PKT_INTERVAL 1000 /* Interval between each packet */ #define APPL_MODE_UDP 0 /**< UDP mode */ #define APPL_MODE_PING 1 /**< ping mode */ @@ -41,7 +41,7 @@ * Parsed command line application arguments */ typedef struct { - int cpu_count; /**< system CPU count */ + int num_workers; /**< Number of worker thread */ const char *mask; /**< CPU mask */ int if_count; /**< Number of interfaces to be used */ char **if_names; /**< Array of pointers to interface names */ @@ -383,14 +383,17 @@ static int gen_send_thread(void *arg) (unsigned int)args->appl.number) break; + pkt = ODP_PACKET_INVALID; + if (args->appl.mode == APPL_MODE_UDP) pkt = pack_udp_pkt(thr_args->pool); else if (args->appl.mode == APPL_MODE_PING) pkt = pack_icmp_pkt(thr_args->pool); - else - pkt = ODP_PACKET_INVALID; - if (!odp_packet_is_valid(pkt)) { + if (pkt == ODP_PACKET_INVALID) { + /* Thread gives up as soon as it sees the pool empty. + * Depending on pool size and transmit latency, it may + * be normal that pool gets empty sometimes. */ EXAMPLE_ERR(" [%2i] alloc_single failed\n", thr); break; } @@ -671,13 +674,17 @@ int main(int argc, char *argv[]) /* Print both system and application information */ print_info(NO_PATH(argv[0]), &args->appl); - /* Default to system CPU count unless user specified */ + /* Default to max number of workers, unless user specified number of + * workers or cpumask */ num_workers = MAX_WORKERS; - if (args->appl.cpu_count) - num_workers = args->appl.cpu_count; - num_workers = odp_cpumask_default_worker(&cpumask, num_workers); - if (args->appl.mask) { + + if (args->appl.num_workers) { + /* -w option: number of workers */ + num_workers = args->appl.num_workers; + num_workers = odp_cpumask_default_worker(&cpumask, num_workers); + } else if (args->appl.mask) { + /* -c option: cpumask */ odp_cpumask_from_str(&cpumask, args->appl.mask); num_workers = odp_cpumask_count(&cpumask); } @@ -700,9 +707,9 @@ int main(int argc, char *argv[]) /* Create packet pool */ odp_pool_param_init(&params); - params.pkt.seg_len = SHM_PKT_POOL_BUF_SIZE; - params.pkt.len = SHM_PKT_POOL_BUF_SIZE; - params.pkt.num = SHM_PKT_POOL_SIZE/SHM_PKT_POOL_BUF_SIZE; + params.pkt.seg_len = POOL_PKT_LEN; + params.pkt.len = POOL_PKT_LEN; + params.pkt.num = POOL_NUM_PKT; params.type = ODP_POOL_PACKET; pool = odp_pool_create("packet_pool", &params); @@ -763,18 +770,24 @@ int main(int argc, char *argv[]) odp_cpumask_set(&cpu_mask, cpu_first); tq = odp_queue_create("", NULL); - if (tq == ODP_QUEUE_INVALID) + if (tq == ODP_QUEUE_INVALID) { + EXAMPLE_ERR("queue_create failed\n"); abort(); + } args->thread[1].pktio_dev = args->appl.if_names[0]; args->thread[1].pool = pool; args->thread[1].tp = tp; args->thread[1].tq = tq; args->thread[1].tim = odp_timer_alloc(tp, tq, NULL); - if (args->thread[1].tim == ODP_TIMER_INVALID) + if (args->thread[1].tim == ODP_TIMER_INVALID) { + EXAMPLE_ERR("timer_alloc failed\n"); abort(); + } args->thread[1].tmo_ev = odp_timeout_alloc(tmop); - if (args->thread[1].tmo_ev == ODP_TIMEOUT_INVALID) + if (args->thread[1].tmo_ev == ODP_TIMEOUT_INVALID) { + EXAMPLE_ERR("timeout_alloc failed\n"); abort(); + } args->thread[1].mode = args->appl.mode; memset(&thr_params, 0, sizeof(thr_params)); @@ -786,18 +799,24 @@ int main(int argc, char *argv[]) odph_odpthreads_create(&thread_tbl[1], &cpu_mask, &thr_params); tq = odp_queue_create("", NULL); - if (tq == ODP_QUEUE_INVALID) + if (tq == ODP_QUEUE_INVALID) { + EXAMPLE_ERR("queue_create failed\n"); abort(); + } args->thread[0].pktio_dev = args->appl.if_names[0]; args->thread[0].pool = pool; args->thread[0].tp = tp; args->thread[0].tq = tq; args->thread[0].tim = odp_timer_alloc(tp, tq, NULL); - if (args->thread[0].tim == ODP_TIMER_INVALID) + if (args->thread[0].tim == ODP_TIMER_INVALID) { + EXAMPLE_ERR("timer_alloc failed\n"); abort(); + } args->thread[0].tmo_ev = odp_timeout_alloc(tmop); - if (args->thread[0].tmo_ev == ODP_TIMEOUT_INVALID) + if (args->thread[0].tmo_ev == ODP_TIMEOUT_INVALID) { + EXAMPLE_ERR("timeout_alloc failed\n"); abort(); + } args->thread[0].mode = args->appl.mode; cpu_next = odp_cpumask_next(&cpumask, cpu_first); odp_cpumask_zero(&cpu_mask); @@ -819,17 +838,23 @@ int main(int argc, char *argv[]) args->thread[i].pktio_dev = args->appl.if_names[if_idx]; tq = odp_queue_create("", NULL); - if (tq == ODP_QUEUE_INVALID) + if (tq == ODP_QUEUE_INVALID) { + EXAMPLE_ERR("queue_create failed\n"); abort(); + } args->thread[i].pool = pool; args->thread[i].tp = tp; args->thread[i].tq = tq; args->thread[i].tim = odp_timer_alloc(tp, tq, NULL); - if (args->thread[i].tim == ODP_TIMER_INVALID) + if (args->thread[i].tim == ODP_TIMER_INVALID) { + EXAMPLE_ERR("timer_alloc failed\n"); abort(); + } args->thread[i].tmo_ev = odp_timeout_alloc(tmop); - if (args->thread[i].tmo_ev == ODP_TIMEOUT_INVALID) + if (args->thread[i].tmo_ev == ODP_TIMEOUT_INVALID) { + EXAMPLE_ERR("timeout_alloc failed\n"); abort(); + } args->thread[i].mode = args->appl.mode; if (args->appl.mode == APPL_MODE_UDP) { @@ -955,7 +980,7 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args) switch (opt) { case 'w': - appl_args->cpu_count = atoi(optarg); + appl_args->num_workers = atoi(optarg); break; case 'c': appl_args->mask = optarg; commit 12229e66492f7947c180cf540aecd53096431bc8 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Wed Feb 8 14:19:38 2017 +0200 validation: packet: print reason for suite init failure Knowing the reason for suite init function failure helps in debugging. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-and-tested-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/common_plat/validation/api/packet/packet.c b/test/common_plat/validation/api/packet/packet.c index fa5206f..e3d28f6 100644 --- a/test/common_plat/validation/api/packet/packet.c +++ b/test/common_plat/validation/api/packet/packet.c @@ -110,8 +110,10 @@ int packet_suite_init(void) uint8_t data = 0; uint32_t i; - if (odp_pool_capability(&capa) < 0) + if (odp_pool_capability(&capa) < 0) { + printf("pool_capability failed\n"); return -1; + } /* Pick a typical packet size and decrement it to the single segment * limit if needed (min_seg_len maybe equal to max_len @@ -136,14 +138,17 @@ int packet_suite_init(void) params.pkt.uarea_size = sizeof(struct udata_struct); packet_pool = odp_pool_create("packet_pool", &params); - if (packet_pool == ODP_POOL_INVALID) + if (packet_pool == ODP_POOL_INVALID) { + printf("pool_create failed: 1\n"); return -1; + } params.pkt.uarea_size = 0; packet_pool_no_uarea = odp_pool_create("packet_pool_no_uarea", &params); if (packet_pool_no_uarea == ODP_POOL_INVALID) { odp_pool_destroy(packet_pool); + printf("pool_create failed: 2\n"); return -1; } @@ -154,6 +159,7 @@ int packet_suite_init(void) if (packet_pool_double_uarea == ODP_POOL_INVALID) { odp_pool_destroy(packet_pool_no_uarea); odp_pool_destroy(packet_pool); + printf("pool_create failed: 3\n"); return -1; } @@ -174,8 +180,10 @@ int packet_suite_init(void) } while (segmented_test_packet == ODP_PACKET_INVALID); if (odp_packet_is_valid(test_packet) == 0 || - odp_packet_is_valid(segmented_test_packet) == 0) + odp_packet_is_valid(segmented_test_packet) == 0) { + printf("packet_is_valid failed\n"); return -1; + } segmentation_supported = odp_packet_is_segmented(segmented_test_packet); @@ -187,16 +195,21 @@ int packet_suite_init(void) udat = odp_packet_user_area(test_packet); udat_size = odp_packet_user_area_size(test_packet); - if (!udat || udat_size != sizeof(struct udata_struct)) + if (!udat || udat_size != sizeof(struct udata_struct)) { + printf("packet_user_area failed: 1\n"); return -1; + } odp_pool_print(packet_pool); memcpy(udat, &test_packet_udata, sizeof(struct udata_struct)); udat = odp_packet_user_area(segmented_test_packet); udat_size = odp_packet_user_area_size(segmented_test_packet); - if (udat == NULL || udat_size != sizeof(struct udata_struct)) + if (udat == NULL || udat_size != sizeof(struct udata_struct)) { + printf("packet_user_area failed: 2\n"); return -1; + } + memcpy(udat, &test_packet_udata, sizeof(struct udata_struct)); return 0; commit 7378c0ddeb8c34a38d0021230a65bccfc21a6f1b Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Wed Feb 8 14:19:37 2017 +0200 test: l2fwd: add pktio driver print out Print out pktio driver name in start up. Driver name (e.g. dpdk or netmap) helps in checking that correct pktio device started. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-and-tested-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/common_plat/performance/odp_l2fwd.c b/test/common_plat/performance/odp_l2fwd.c index 54dc4cf..9864c64 100644 --- a/test/common_plat/performance/odp_l2fwd.c +++ b/test/common_plat/performance/odp_l2fwd.c @@ -603,6 +603,7 @@ static int create_pktio(const char *dev, int idx, int num_rx, int num_tx, odp_pktio_op_mode_t mode_rx; odp_pktio_op_mode_t mode_tx; pktin_mode_t in_mode = gbl_args->appl.in_mode; + odp_pktio_info_t info; odp_pktio_param_init(&pktio_param); @@ -620,8 +621,13 @@ static int create_pktio(const char *dev, int idx, int num_rx, int num_tx, return -1; } - printf("created pktio %" PRIu64 " (%s)\n", - odp_pktio_to_u64(pktio), dev); + if (odp_pktio_info(pktio, &info)) { + LOG_ERR("Error: pktio info failed %s\n", dev); + return -1; + } + + printf("created pktio %" PRIu64 ", dev: %s, drv: %s\n", + odp_pktio_to_u64(pktio), dev, info.drv_name); if (odp_pktio_capability(pktio, &capa)) { LOG_ERR("Error: capability query failed %s\n", dev); ----------------------------------------------------------------------- Summary of changes: .codecov.yml | 25 + .travis.yml | 70 +- CHANGELOG | 178 +++ DEPENDENCIES | 4 +- configure.ac | 57 +- example/Makefile.inc | 3 +- example/classifier/odp_classifier.c | 4 +- example/generator/odp_generator.c | 83 +- example/hello/odp_hello.c | 15 +- example/ipsec/odp_ipsec.c | 6 +- example/ipsec/odp_ipsec_fwd_db.h | 1 - example/ipsec/odp_ipsec_loop_db.h | 1 - example/ipsec/odp_ipsec_misc.h | 4 +- example/ipsec/odp_ipsec_stream.c | 4 +- example/l2fwd_simple/odp_l2fwd_simple.c | 4 +- example/l3fwd/odp_l3fwd.c | 6 +- example/l3fwd/odp_l3fwd_db.h | 2 +- example/packet/odp_pktio.c | 4 +- example/switch/odp_switch.c | 4 +- example/time/time_global_test.c | 5 +- example/timer/odp_timer_test.c | 4 +- helper/Makefile.am | 36 +- helper/chksum.c | 4 +- helper/cuckootable.c | 52 +- helper/hashtable.c | 44 +- helper/include/odp/helper/odph_api.h | 39 + helper/{ => include/odp/helper}/odph_cuckootable.h | 0 helper/{ => include/odp/helper}/odph_hashtable.h | 0 .../{ => include/odp/helper}/odph_iplookuptable.h | 0 helper/{ => include/odp/helper}/odph_lineartable.h | 0 .../helper/platform/linux-generic/threads_extn.h | 112 ++ helper/include/odp/helper/{linux.h => threads.h} | 78 - helper/iplookuptable.c | 61 +- helper/lineartable.c | 29 +- helper/m4/configure.m4 | 14 + helper/odph_debug.h | 4 - helper/platform/linux-generic/thread.c | 313 ++++ helper/test/Makefile.am | 43 +- helper/test/chksum.c | 22 +- helper/test/cuckootable.c | 6 +- helper/test/iplookuptable.c | 6 +- helper/test/linux-generic/Makefile.am | 5 + helper/test/{ => linux-generic}/process.c | 16 +- helper/test/{ => linux-generic}/thread.c | 16 +- helper/test/odpthreads.c | 20 +- helper/test/parse.c | 89 +- helper/test/table.c | 15 +- helper/{linux.c => threads.c} | 242 +-- include/odp/arch/arm32-linux/odp/api/abi/buffer.h | 7 + .../arch/arm32-linux/odp/api/abi/classification.h | 7 + include/odp/arch/arm32-linux/odp/api/abi/crypto.h | 7 + include/odp/arch/arm32-linux/odp/api/abi/event.h | 7 + include/odp/arch/arm32-linux/odp/api/abi/packet.h | 7 + include/odp/arch/arm32-linux/odp/api/abi/pool.h | 7 + include/odp/arch/arm32-linux/odp/api/abi/queue.h | 7 + .../arch/arm32-linux/odp/api/abi/shared_memory.h | 7 + include/odp/arch/arm64-linux/odp/api/abi/buffer.h | 7 + .../arch/arm64-linux/odp/api/abi/classification.h | 7 + include/odp/arch/arm64-linux/odp/api/abi/crypto.h | 7 + include/odp/arch/arm64-linux/odp/api/abi/event.h | 7 + include/odp/arch/arm64-linux/odp/api/abi/packet.h | 7 + include/odp/arch/arm64-linux/odp/api/abi/pool.h | 7 + include/odp/arch/arm64-linux/odp/api/abi/queue.h | 7 + .../arch/arm64-linux/odp/api/abi/shared_memory.h | 7 + include/odp/arch/default/api/abi/buffer.h | 38 + include/odp/arch/default/api/abi/classification.h | 40 + include/odp/arch/default/api/abi/crypto.h | 36 + include/odp/arch/default/api/abi/event.h | 42 + include/odp/arch/default/api/abi/packet.h | 47 + include/odp/arch/default/api/abi/pool.h | 43 + include/odp/arch/default/api/abi/queue.h | 35 + include/odp/arch/default/api/abi/shared_memory.h | 35 + include/odp/arch/mips64-linux/odp/api/abi/buffer.h | 7 + .../arch/mips64-linux/odp/api/abi/classification.h | 7 + include/odp/arch/mips64-linux/odp/api/abi/crypto.h | 7 + include/odp/arch/mips64-linux/odp/api/abi/event.h | 7 + include/odp/arch/mips64-linux/odp/api/abi/packet.h | 7 + include/odp/arch/mips64-linux/odp/api/abi/pool.h | 7 + include/odp/arch/mips64-linux/odp/api/abi/queue.h | 7 + .../arch/mips64-linux/odp/api/abi/shared_memory.h | 7 + .../odp/arch/power64-linux/odp/api/abi/buffer.h | 7 + .../power64-linux/odp/api/abi/classification.h | 7 + .../odp/arch/power64-linux/odp/api/abi/crypto.h | 7 + include/odp/arch/power64-linux/odp/api/abi/event.h | 7 + .../odp/arch/power64-linux/odp/api/abi/packet.h | 7 + include/odp/arch/power64-linux/odp/api/abi/pool.h | 7 + include/odp/arch/power64-linux/odp/api/abi/queue.h | 7 + .../arch/power64-linux/odp/api/abi/shared_memory.h | 7 + include/odp/arch/x86_32-linux/odp/api/abi/buffer.h | 7 + .../arch/x86_32-linux/odp/api/abi/classification.h | 7 + include/odp/arch/x86_32-linux/odp/api/abi/crypto.h | 7 + include/odp/arch/x86_32-linux/odp/api/abi/event.h | 7 + include/odp/arch/x86_32-linux/odp/api/abi/packet.h | 7 + include/odp/arch/x86_32-linux/odp/api/abi/pool.h | 7 + include/odp/arch/x86_32-linux/odp/api/abi/queue.h | 7 + .../arch/x86_32-linux/odp/api/abi/shared_memory.h | 7 + include/odp/arch/x86_64-linux/odp/api/abi/buffer.h | 7 + .../arch/x86_64-linux/odp/api/abi/classification.h | 7 + include/odp/arch/x86_64-linux/odp/api/abi/crypto.h | 7 + include/odp/arch/x86_64-linux/odp/api/abi/event.h | 7 + include/odp/arch/x86_64-linux/odp/api/abi/packet.h | 7 + include/odp/arch/x86_64-linux/odp/api/abi/pool.h | 7 + include/odp/arch/x86_64-linux/odp/api/abi/queue.h | 7 + .../arch/x86_64-linux/odp/api/abi/shared_memory.h | 7 + ...inux.pc.in => libodphelper-linux-generic.pc.in} | 4 +- platform/Makefile.inc | 22 + platform/linux-generic/Makefile.am | 1 + platform/linux-generic/_ishm.c | 13 +- platform/linux-generic/_ishmphy.c | 42 +- platform/linux-generic/arch/arm/odp/api/cpu_arch.h | 6 + .../linux-generic/include/odp/api/classification.h | 9 +- .../include/odp/api/plat/buffer_types.h | 23 +- .../include/odp/api/plat/classification_types.h | 34 +- .../include/odp/api/plat/crypto_types.h | 21 +- .../include/odp/api/plat/event_types.h | 19 +- .../include/odp/api/plat/packet_types.h | 26 +- .../include/odp/api/plat/pool_types.h | 21 +- .../include/odp/api/plat/queue_types.h | 25 +- .../include/odp/api/plat/shared_memory_types.h | 16 +- platform/linux-generic/include/odp/api/queue.h | 4 + .../linux-generic/include/odp_align_internal.h | 108 +- .../include/odp_classification_datamodel.h | 19 +- .../include/odp_classification_inlines.h | 52 +- platform/linux-generic/include/odp_packet_dpdk.h | 2 +- .../linux-generic/include/odp_packet_internal.h | 5 + .../linux-generic/include/odp_packet_io_internal.h | 2 +- platform/linux-generic/include/odp_packet_netmap.h | 2 +- platform/linux-generic/include/odp_pool_internal.h | 1 + .../linux-generic/include/odp_queue_internal.h | 2 +- platform/linux-generic/include/protocols/ip.h | 14 +- platform/linux-generic/odp_buffer.c | 5 + platform/linux-generic/odp_classification.c | 39 +- platform/linux-generic/odp_crypto.c | 10 + platform/linux-generic/odp_event.c | 5 + platform/linux-generic/odp_packet.c | 16 +- platform/linux-generic/odp_pool.c | 12 +- platform/linux-generic/odp_queue.c | 5 + platform/linux-generic/odp_schedule.c | 8 +- platform/linux-generic/odp_schedule_sp.c | 7 +- platform/linux-generic/odp_shared_memory.c | 6 + platform/linux-generic/odp_timer.c | 9 +- platform/linux-generic/odp_traffic_mngr.c | 5 +- platform/linux-generic/pktio/dpdk.c | 14 +- platform/linux-generic/pktio/netmap.c | 37 +- test/Makefile.inc | 3 +- test/common_plat/common/odp_cunit_common.c | 2 +- .../common_plat/miscellaneous/odp_api_from_cpp.cpp | 2 +- test/common_plat/performance/.gitignore | 2 + test/common_plat/performance/Makefile.am | 15 +- .../common_plat/performance/dummy_crc.h | 46 +- test/common_plat/performance/odp_bench_packet.c | 1611 ++++++++++++++++++++ test/common_plat/performance/odp_crypto.c | 2 +- test/common_plat/performance/odp_l2fwd.c | 26 +- test/common_plat/performance/odp_l2fwd_run.sh | 10 +- test/common_plat/performance/odp_pktio_ordered.c | 1342 ++++++++++++++++ .../performance/odp_pktio_ordered_run.sh | 42 + test/common_plat/performance/odp_pktio_perf.c | 5 +- test/common_plat/performance/odp_sched_latency.c | 2 +- test/common_plat/performance/odp_scheduling.c | 2 +- .../common_plat/performance}/udp64.pcap | Bin test/common_plat/validation/api/Makefile.inc | 2 +- .../validation/api/classification/classification.h | 21 + .../api/classification/odp_classification_common.c | 153 +- .../classification/odp_classification_test_pmr.c | 296 +++- .../api/classification/odp_classification_tests.c | 46 +- .../classification/odp_classification_testsuites.h | 15 +- test/common_plat/validation/api/packet/packet.c | 23 +- test/common_plat/validation/api/pktio/pktio.c | 4 +- test/common_plat/validation/api/timer/timer.c | 2 +- .../validation/api/traffic_mngr/traffic_mngr.c | 6 +- test/linux-generic/Makefile.inc | 3 +- test/linux-generic/mmap_vlan_ins/mmap_vlan_ins.c | 30 +- test/linux-generic/mmap_vlan_ins/mmap_vlan_ins.sh | 15 +- test/linux-generic/pktio_ipc/ipc_common.h | 5 +- test/linux-generic/ring/ring_stress.c | 2 +- 175 files changed, 5717 insertions(+), 1091 deletions(-) create mode 100644 .codecov.yml create mode 100644 helper/include/odp/helper/odph_api.h rename helper/{ => include/odp/helper}/odph_cuckootable.h (100%) rename helper/{ => include/odp/helper}/odph_hashtable.h (100%) rename helper/{ => include/odp/helper}/odph_iplookuptable.h (100%) rename helper/{ => include/odp/helper}/odph_lineartable.h (100%) create mode 100644 helper/include/odp/helper/platform/linux-generic/threads_extn.h rename helper/include/odp/helper/{linux.h => threads.h} (74%) create mode 100644 helper/platform/linux-generic/thread.c create mode 100644 helper/test/linux-generic/Makefile.am rename helper/test/{ => linux-generic}/process.c (84%) rename helper/test/{ => linux-generic}/thread.c (84%) rename helper/{linux.c => threads.c} (66%) create mode 100644 include/odp/arch/arm32-linux/odp/api/abi/buffer.h create mode 100644 include/odp/arch/arm32-linux/odp/api/abi/classification.h create mode 100644 include/odp/arch/arm32-linux/odp/api/abi/crypto.h create mode 100644 include/odp/arch/arm32-linux/odp/api/abi/event.h create mode 100644 include/odp/arch/arm32-linux/odp/api/abi/packet.h create mode 100644 include/odp/arch/arm32-linux/odp/api/abi/pool.h create mode 100644 include/odp/arch/arm32-linux/odp/api/abi/queue.h create mode 100644 include/odp/arch/arm32-linux/odp/api/abi/shared_memory.h create mode 100644 include/odp/arch/arm64-linux/odp/api/abi/buffer.h create mode 100644 include/odp/arch/arm64-linux/odp/api/abi/classification.h create mode 100644 include/odp/arch/arm64-linux/odp/api/abi/crypto.h create mode 100644 include/odp/arch/arm64-linux/odp/api/abi/event.h create mode 100644 include/odp/arch/arm64-linux/odp/api/abi/packet.h create mode 100644 include/odp/arch/arm64-linux/odp/api/abi/pool.h create mode 100644 include/odp/arch/arm64-linux/odp/api/abi/queue.h create mode 100644 include/odp/arch/arm64-linux/odp/api/abi/shared_memory.h create mode 100644 include/odp/arch/default/api/abi/buffer.h create mode 100644 include/odp/arch/default/api/abi/classification.h create mode 100644 include/odp/arch/default/api/abi/crypto.h create mode 100644 include/odp/arch/default/api/abi/event.h create mode 100644 include/odp/arch/default/api/abi/packet.h create mode 100644 include/odp/arch/default/api/abi/pool.h create mode 100644 include/odp/arch/default/api/abi/queue.h create mode 100644 include/odp/arch/default/api/abi/shared_memory.h create mode 100644 include/odp/arch/mips64-linux/odp/api/abi/buffer.h create mode 100644 include/odp/arch/mips64-linux/odp/api/abi/classification.h create mode 100644 include/odp/arch/mips64-linux/odp/api/abi/crypto.h create mode 100644 include/odp/arch/mips64-linux/odp/api/abi/event.h create mode 100644 include/odp/arch/mips64-linux/odp/api/abi/packet.h create mode 100644 include/odp/arch/mips64-linux/odp/api/abi/pool.h create mode 100644 include/odp/arch/mips64-linux/odp/api/abi/queue.h create mode 100644 include/odp/arch/mips64-linux/odp/api/abi/shared_memory.h create mode 100644 include/odp/arch/power64-linux/odp/api/abi/buffer.h create mode 100644 include/odp/arch/power64-linux/odp/api/abi/classification.h create mode 100644 include/odp/arch/power64-linux/odp/api/abi/crypto.h create mode 100644 include/odp/arch/power64-linux/odp/api/abi/event.h create mode 100644 include/odp/arch/power64-linux/odp/api/abi/packet.h create mode 100644 include/odp/arch/power64-linux/odp/api/abi/pool.h create mode 100644 include/odp/arch/power64-linux/odp/api/abi/queue.h create mode 100644 include/odp/arch/power64-linux/odp/api/abi/shared_memory.h create mode 100644 include/odp/arch/x86_32-linux/odp/api/abi/buffer.h create mode 100644 include/odp/arch/x86_32-linux/odp/api/abi/classification.h create mode 100644 include/odp/arch/x86_32-linux/odp/api/abi/crypto.h create mode 100644 include/odp/arch/x86_32-linux/odp/api/abi/event.h create mode 100644 include/odp/arch/x86_32-linux/odp/api/abi/packet.h create mode 100644 include/odp/arch/x86_32-linux/odp/api/abi/pool.h create mode 100644 include/odp/arch/x86_32-linux/odp/api/abi/queue.h create mode 100644 include/odp/arch/x86_32-linux/odp/api/abi/shared_memory.h create mode 100644 include/odp/arch/x86_64-linux/odp/api/abi/buffer.h create mode 100644 include/odp/arch/x86_64-linux/odp/api/abi/classification.h create mode 100644 include/odp/arch/x86_64-linux/odp/api/abi/crypto.h create mode 100644 include/odp/arch/x86_64-linux/odp/api/abi/event.h create mode 100644 include/odp/arch/x86_64-linux/odp/api/abi/packet.h create mode 100644 include/odp/arch/x86_64-linux/odp/api/abi/pool.h create mode 100644 include/odp/arch/x86_64-linux/odp/api/abi/queue.h create mode 100644 include/odp/arch/x86_64-linux/odp/api/abi/shared_memory.h rename pkgconfig/{libodphelper-linux.pc.in => libodphelper-linux-generic.pc.in} (72%) copy platform/linux-generic/odp_hash.c => test/common_plat/performance/dummy_crc.h (96%) create mode 100644 test/common_plat/performance/odp_bench_packet.c create mode 100644 test/common_plat/performance/odp_pktio_ordered.c create mode 100755 test/common_plat/performance/odp_pktio_ordered_run.sh copy {example/l2fwd_simple => test/common_plat/performance}/udp64.pcap (100%) hooks/post-receive --

8 years, 12 months

[COMMIT] branch master updated. v1.13.0.0-44-g0d3ee95

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, master has been updated via 0d3ee95d0fb3712631d81c5e6f4fb5f176617c5e (commit) via 0c3ee63ae7b133defa2e74d2573f541d68dae040 (commit) via 8f517b3a278d3742b182b67d6b50f9452dd3e519 (commit) via 2afd00967b751ef3a9fe45d2f966f35956c93520 (commit) via 969d1c74ef21b77df01b120297d4156b87183894 (commit) from b8867b0a5ea5eeb8b0b7a95e36025c95738f48b3 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 0d3ee95d0fb3712631d81c5e6f4fb5f176617c5e Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Wed Feb 8 14:19:41 2017 +0200 test: l2fwd: use packet_data Since l2fwd can assume that all packets are Ethernet. Also odp_packet_data() points to the first byte of the frame directly after packet input. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-and-tested-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/common_plat/performance/odp_l2fwd.c b/test/common_plat/performance/odp_l2fwd.c index 9864c64..8f5c5e1 100644 --- a/test/common_plat/performance/odp_l2fwd.c +++ b/test/common_plat/performance/odp_l2fwd.c @@ -241,15 +241,13 @@ static inline void fill_eth_addrs(odp_packet_t pkt_tbl[], odp_packet_prefetch(pkt, 0, ODPH_ETHHDR_LEN); - if (odp_packet_has_eth(pkt)) { - eth = (odph_ethhdr_t *)odp_packet_l2_ptr(pkt, NULL); + eth = odp_packet_data(pkt); - if (gbl_args->appl.src_change) - eth->src = gbl_args->port_eth_addr[dst_port]; + if (gbl_args->appl.src_change) + eth->src = gbl_args->port_eth_addr[dst_port]; - if (gbl_args->appl.dst_change) - eth->dst = gbl_args->dst_eth_addr[dst_port]; - } + if (gbl_args->appl.dst_change) + eth->dst = gbl_args->dst_eth_addr[dst_port]; } } commit 0c3ee63ae7b133defa2e74d2573f541d68dae040 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Wed Feb 8 14:19:40 2017 +0200 test: l2fwd script: limit number of generator cpus During 'make check' run generator on up to four cpus. Generator on all cpus was an overkill compared to l2fwd on two cpus. Generator and l2fwd still share cpus (on odp-linux) as cpumask_default_worker() returns the same cpumask for both. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-and-tested-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/common_plat/performance/odp_l2fwd_run.sh b/test/common_plat/performance/odp_l2fwd_run.sh index 757cf53..dd42ede 100755 --- a/test/common_plat/performance/odp_l2fwd_run.sh +++ b/test/common_plat/performance/odp_l2fwd_run.sh @@ -66,12 +66,14 @@ run_l2fwd() exit 1 fi - #@todo: limit odp_generator to cores - #https://bugs.linaro.org/show_bug.cgi?id=1398 + # Max 4 workers + # @todo: ensure that generator and l2fwd workers are not allocated to + # the same CPUs (odp_generator${EXEEXT} --interval $FLOOD_MODE -I $IF0 \ --srcip 192.168.0.1 --dstip 192.168.0.2 \ - -m u 2>&1 > /dev/null) \ + -m u -w 4 2>&1 > /dev/null) \ 2>&1 > /dev/null & + GEN_PID=$! # this just turns off output buffering so that you still get periodic @@ -82,6 +84,8 @@ run_l2fwd() STDBUF= fi LOG=odp_l2fwd_tmp.log + + # Max 2 workers $STDBUF odp_l2fwd${EXEEXT} -i $IF1,$IF2 -m 0 -t 30 -c 2 | tee $LOG ret=$? commit 8f517b3a278d3742b182b67d6b50f9452dd3e519 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Wed Feb 8 14:19:39 2017 +0200 test: generator: various improvements User may select number of worker threads (-w) or cpumask (-c) (but not both) to limit number of worker thread. Increased pool size since many threads empty the pool easily and result some threads to give up (on the first time those see pool empty). Added EXAMPLE_ERR() before abort() to make debugging easier. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-and-tested-by: Bogdan Pricope <bogdan.pricope(a)linaro.org> Reviewed-and-tested-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/example/generator/odp_generator.c b/example/generator/odp_generator.c index 6ac8f2d..8062d87 100644 --- a/example/generator/odp_generator.c +++ b/example/generator/odp_generator.c @@ -22,10 +22,10 @@ #include <odp/helper/odph_api.h> -#define MAX_WORKERS 32 /**< max number of works */ -#define SHM_PKT_POOL_SIZE (512*2048) /**< pkt pool size */ -#define SHM_PKT_POOL_BUF_SIZE 1856 /**< pkt pool buf size */ -#define DEFAULT_PKT_INTERVAL 1000 /**< interval btw each pkt */ +#define MAX_WORKERS 32 /* Max number of workers */ +#define POOL_NUM_PKT 2048 /* Number of packets in packet pool */ +#define POOL_PKT_LEN 1856 /* Max packet length */ +#define DEFAULT_PKT_INTERVAL 1000 /* Interval between each packet */ #define APPL_MODE_UDP 0 /**< UDP mode */ #define APPL_MODE_PING 1 /**< ping mode */ @@ -41,7 +41,7 @@ * Parsed command line application arguments */ typedef struct { - int cpu_count; /**< system CPU count */ + int num_workers; /**< Number of worker thread */ const char *mask; /**< CPU mask */ int if_count; /**< Number of interfaces to be used */ char **if_names; /**< Array of pointers to interface names */ @@ -383,14 +383,17 @@ static int gen_send_thread(void *arg) (unsigned int)args->appl.number) break; + pkt = ODP_PACKET_INVALID; + if (args->appl.mode == APPL_MODE_UDP) pkt = pack_udp_pkt(thr_args->pool); else if (args->appl.mode == APPL_MODE_PING) pkt = pack_icmp_pkt(thr_args->pool); - else - pkt = ODP_PACKET_INVALID; - if (!odp_packet_is_valid(pkt)) { + if (pkt == ODP_PACKET_INVALID) { + /* Thread gives up as soon as it sees the pool empty. + * Depending on pool size and transmit latency, it may + * be normal that pool gets empty sometimes. */ EXAMPLE_ERR(" [%2i] alloc_single failed\n", thr); break; } @@ -671,13 +674,17 @@ int main(int argc, char *argv[]) /* Print both system and application information */ print_info(NO_PATH(argv[0]), &args->appl); - /* Default to system CPU count unless user specified */ + /* Default to max number of workers, unless user specified number of + * workers or cpumask */ num_workers = MAX_WORKERS; - if (args->appl.cpu_count) - num_workers = args->appl.cpu_count; - num_workers = odp_cpumask_default_worker(&cpumask, num_workers); - if (args->appl.mask) { + + if (args->appl.num_workers) { + /* -w option: number of workers */ + num_workers = args->appl.num_workers; + num_workers = odp_cpumask_default_worker(&cpumask, num_workers); + } else if (args->appl.mask) { + /* -c option: cpumask */ odp_cpumask_from_str(&cpumask, args->appl.mask); num_workers = odp_cpumask_count(&cpumask); } @@ -700,9 +707,9 @@ int main(int argc, char *argv[]) /* Create packet pool */ odp_pool_param_init(&params); - params.pkt.seg_len = SHM_PKT_POOL_BUF_SIZE; - params.pkt.len = SHM_PKT_POOL_BUF_SIZE; - params.pkt.num = SHM_PKT_POOL_SIZE/SHM_PKT_POOL_BUF_SIZE; + params.pkt.seg_len = POOL_PKT_LEN; + params.pkt.len = POOL_PKT_LEN; + params.pkt.num = POOL_NUM_PKT; params.type = ODP_POOL_PACKET; pool = odp_pool_create("packet_pool", &params); @@ -763,18 +770,24 @@ int main(int argc, char *argv[]) odp_cpumask_set(&cpu_mask, cpu_first); tq = odp_queue_create("", NULL); - if (tq == ODP_QUEUE_INVALID) + if (tq == ODP_QUEUE_INVALID) { + EXAMPLE_ERR("queue_create failed\n"); abort(); + } args->thread[1].pktio_dev = args->appl.if_names[0]; args->thread[1].pool = pool; args->thread[1].tp = tp; args->thread[1].tq = tq; args->thread[1].tim = odp_timer_alloc(tp, tq, NULL); - if (args->thread[1].tim == ODP_TIMER_INVALID) + if (args->thread[1].tim == ODP_TIMER_INVALID) { + EXAMPLE_ERR("timer_alloc failed\n"); abort(); + } args->thread[1].tmo_ev = odp_timeout_alloc(tmop); - if (args->thread[1].tmo_ev == ODP_TIMEOUT_INVALID) + if (args->thread[1].tmo_ev == ODP_TIMEOUT_INVALID) { + EXAMPLE_ERR("timeout_alloc failed\n"); abort(); + } args->thread[1].mode = args->appl.mode; memset(&thr_params, 0, sizeof(thr_params)); @@ -786,18 +799,24 @@ int main(int argc, char *argv[]) odph_odpthreads_create(&thread_tbl[1], &cpu_mask, &thr_params); tq = odp_queue_create("", NULL); - if (tq == ODP_QUEUE_INVALID) + if (tq == ODP_QUEUE_INVALID) { + EXAMPLE_ERR("queue_create failed\n"); abort(); + } args->thread[0].pktio_dev = args->appl.if_names[0]; args->thread[0].pool = pool; args->thread[0].tp = tp; args->thread[0].tq = tq; args->thread[0].tim = odp_timer_alloc(tp, tq, NULL); - if (args->thread[0].tim == ODP_TIMER_INVALID) + if (args->thread[0].tim == ODP_TIMER_INVALID) { + EXAMPLE_ERR("timer_alloc failed\n"); abort(); + } args->thread[0].tmo_ev = odp_timeout_alloc(tmop); - if (args->thread[0].tmo_ev == ODP_TIMEOUT_INVALID) + if (args->thread[0].tmo_ev == ODP_TIMEOUT_INVALID) { + EXAMPLE_ERR("timeout_alloc failed\n"); abort(); + } args->thread[0].mode = args->appl.mode; cpu_next = odp_cpumask_next(&cpumask, cpu_first); odp_cpumask_zero(&cpu_mask); @@ -819,17 +838,23 @@ int main(int argc, char *argv[]) args->thread[i].pktio_dev = args->appl.if_names[if_idx]; tq = odp_queue_create("", NULL); - if (tq == ODP_QUEUE_INVALID) + if (tq == ODP_QUEUE_INVALID) { + EXAMPLE_ERR("queue_create failed\n"); abort(); + } args->thread[i].pool = pool; args->thread[i].tp = tp; args->thread[i].tq = tq; args->thread[i].tim = odp_timer_alloc(tp, tq, NULL); - if (args->thread[i].tim == ODP_TIMER_INVALID) + if (args->thread[i].tim == ODP_TIMER_INVALID) { + EXAMPLE_ERR("timer_alloc failed\n"); abort(); + } args->thread[i].tmo_ev = odp_timeout_alloc(tmop); - if (args->thread[i].tmo_ev == ODP_TIMEOUT_INVALID) + if (args->thread[i].tmo_ev == ODP_TIMEOUT_INVALID) { + EXAMPLE_ERR("timeout_alloc failed\n"); abort(); + } args->thread[i].mode = args->appl.mode; if (args->appl.mode == APPL_MODE_UDP) { @@ -955,7 +980,7 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args) switch (opt) { case 'w': - appl_args->cpu_count = atoi(optarg); + appl_args->num_workers = atoi(optarg); break; case 'c': appl_args->mask = optarg; commit 2afd00967b751ef3a9fe45d2f966f35956c93520 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Wed Feb 8 14:19:38 2017 +0200 validation: packet: print reason for suite init failure Knowing the reason for suite init function failure helps in debugging. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-and-tested-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/common_plat/validation/api/packet/packet.c b/test/common_plat/validation/api/packet/packet.c index fa5206f..e3d28f6 100644 --- a/test/common_plat/validation/api/packet/packet.c +++ b/test/common_plat/validation/api/packet/packet.c @@ -110,8 +110,10 @@ int packet_suite_init(void) uint8_t data = 0; uint32_t i; - if (odp_pool_capability(&capa) < 0) + if (odp_pool_capability(&capa) < 0) { + printf("pool_capability failed\n"); return -1; + } /* Pick a typical packet size and decrement it to the single segment * limit if needed (min_seg_len maybe equal to max_len @@ -136,14 +138,17 @@ int packet_suite_init(void) params.pkt.uarea_size = sizeof(struct udata_struct); packet_pool = odp_pool_create("packet_pool", &params); - if (packet_pool == ODP_POOL_INVALID) + if (packet_pool == ODP_POOL_INVALID) { + printf("pool_create failed: 1\n"); return -1; + } params.pkt.uarea_size = 0; packet_pool_no_uarea = odp_pool_create("packet_pool_no_uarea", &params); if (packet_pool_no_uarea == ODP_POOL_INVALID) { odp_pool_destroy(packet_pool); + printf("pool_create failed: 2\n"); return -1; } @@ -154,6 +159,7 @@ int packet_suite_init(void) if (packet_pool_double_uarea == ODP_POOL_INVALID) { odp_pool_destroy(packet_pool_no_uarea); odp_pool_destroy(packet_pool); + printf("pool_create failed: 3\n"); return -1; } @@ -174,8 +180,10 @@ int packet_suite_init(void) } while (segmented_test_packet == ODP_PACKET_INVALID); if (odp_packet_is_valid(test_packet) == 0 || - odp_packet_is_valid(segmented_test_packet) == 0) + odp_packet_is_valid(segmented_test_packet) == 0) { + printf("packet_is_valid failed\n"); return -1; + } segmentation_supported = odp_packet_is_segmented(segmented_test_packet); @@ -187,16 +195,21 @@ int packet_suite_init(void) udat = odp_packet_user_area(test_packet); udat_size = odp_packet_user_area_size(test_packet); - if (!udat || udat_size != sizeof(struct udata_struct)) + if (!udat || udat_size != sizeof(struct udata_struct)) { + printf("packet_user_area failed: 1\n"); return -1; + } odp_pool_print(packet_pool); memcpy(udat, &test_packet_udata, sizeof(struct udata_struct)); udat = odp_packet_user_area(segmented_test_packet); udat_size = odp_packet_user_area_size(segmented_test_packet); - if (udat == NULL || udat_size != sizeof(struct udata_struct)) + if (udat == NULL || udat_size != sizeof(struct udata_struct)) { + printf("packet_user_area failed: 2\n"); return -1; + } + memcpy(udat, &test_packet_udata, sizeof(struct udata_struct)); return 0; commit 969d1c74ef21b77df01b120297d4156b87183894 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Wed Feb 8 14:19:37 2017 +0200 test: l2fwd: add pktio driver print out Print out pktio driver name in start up. Driver name (e.g. dpdk or netmap) helps in checking that correct pktio device started. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-and-tested-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/common_plat/performance/odp_l2fwd.c b/test/common_plat/performance/odp_l2fwd.c index 54dc4cf..9864c64 100644 --- a/test/common_plat/performance/odp_l2fwd.c +++ b/test/common_plat/performance/odp_l2fwd.c @@ -603,6 +603,7 @@ static int create_pktio(const char *dev, int idx, int num_rx, int num_tx, odp_pktio_op_mode_t mode_rx; odp_pktio_op_mode_t mode_tx; pktin_mode_t in_mode = gbl_args->appl.in_mode; + odp_pktio_info_t info; odp_pktio_param_init(&pktio_param); @@ -620,8 +621,13 @@ static int create_pktio(const char *dev, int idx, int num_rx, int num_tx, return -1; } - printf("created pktio %" PRIu64 " (%s)\n", - odp_pktio_to_u64(pktio), dev); + if (odp_pktio_info(pktio, &info)) { + LOG_ERR("Error: pktio info failed %s\n", dev); + return -1; + } + + printf("created pktio %" PRIu64 ", dev: %s, drv: %s\n", + odp_pktio_to_u64(pktio), dev, info.drv_name); if (odp_pktio_capability(pktio, &capa)) { LOG_ERR("Error: capability query failed %s\n", dev); ----------------------------------------------------------------------- Summary of changes: example/generator/odp_generator.c | 77 ++++++++++++++++--------- test/common_plat/performance/odp_l2fwd.c | 22 ++++--- test/common_plat/performance/odp_l2fwd_run.sh | 10 +++- test/common_plat/validation/api/packet/packet.c | 23 ++++++-- 4 files changed, 89 insertions(+), 43 deletions(-) hooks/post-receive --

8 years, 12 months

[COMMIT] branch api-next updated. v1.13.0.0-263-g2961df9

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, api-next has been updated via 2961df923de0b3034c09a288b28394c1a2ea1a9d (commit) from 9fbdbe9a6a86705339858a906ea66f076cc66785 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 2961df923de0b3034c09a288b28394c1a2ea1a9d Author: Yi He <yi.he(a)linaro.org> Date: Tue Feb 7 02:35:17 2017 +0000 linux-gen: fix odp_schedule.m4 Fixed configure script when enables schedule option schedule-iquery=yes or schedule-sp=yes: command not found Signed-off-by: Yi He <yi.he(a)linaro.org> Reviewed-and-tested-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/m4/odp_schedule.m4 b/platform/linux-generic/m4/odp_schedule.m4 index 2dcc9a7..91c19f2 100644 --- a/platform/linux-generic/m4/odp_schedule.m4 +++ b/platform/linux-generic/m4/odp_schedule.m4 @@ -1,13 +1,13 @@ AC_ARG_ENABLE([schedule-sp], [ --enable-schedule-sp enable strict priority scheduler], [if test x$enableval = xyes; then - schedule-sp=yes + schedule_sp_enabled=yes ODP_CFLAGS="$ODP_CFLAGS -DODP_SCHEDULE_SP" fi]) AC_ARG_ENABLE([schedule-iquery], [ --enable-schedule-iquery enable interests query (sparse bitmap) scheduler], [if test x$enableval = xyes; then - schedule-iquery=yes + schedule_iquery_enabled=yes ODP_CFLAGS="$ODP_CFLAGS -DODP_SCHEDULE_IQUERY" fi]) ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/m4/odp_schedule.m4 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) hooks/post-receive --

8 years, 12 months

[COMMIT] branch api-next updated. v1.13.0.0-262-g9fbdbe9

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, api-next has been updated via 9fbdbe9a6a86705339858a906ea66f076cc66785 (commit) via b8867b0a5ea5eeb8b0b7a95e36025c95738f48b3 (commit) via 6ad530311e9cbd5fd77b958e78921e80fbbfa943 (commit) via aa3bbe4da1639ac4649c7d34ae75b0230ade70b2 (commit) via 022cf4a7136c7369ee5f29f5d245ac8d052135e6 (commit) via c87d5cc8d70e6e4291d18b101882ea2ddded236e (commit) via 7539b2f3ce69085518ca596fba0261a19247b2d8 (commit) via 1c0488456166888148bf191960691d076f5a9c2e (commit) via 10cd6d5e4294d3a35a366e564fbc57abde732e85 (commit) via 0a62e1c5b92a5170aa807cc8803f42698b23f4c8 (commit) via 62108ed367a2718e0f0e2d7d8682b5c83d504670 (commit) via 4afed247a6ee3058aa6dc3e66ed0bd5acff9ce97 (commit) via 25ed19ceb50d77614644f6d4a28a0b23dbf1e94f (commit) via 810fbc9420e23f55e9038410f7f9d6e593537ff3 (commit) via 04b0be7579f77821418c0c7c524950af6aeab6a6 (commit) via 6ccae3b2720a4ad84d3e50aa5851f64eb3d83b3c (commit) via dd494a2b6a22f0516ce8890df05de826377fdae2 (commit) via 0bd1a1cea75d3788c062933e635849c35a0c6099 (commit) via 94071c18d342614d16b0a14f16f85119563dd70d (commit) via 54593e175a71f5716aa50e5a03be8c30bc15c550 (commit) via 7df357dd591cce23f76221945091a019c0caa7ec (commit) via a51c171ebe9e9b0aaced13bc0956bdb38c8cfc7b (commit) via 0d6c0804640151f8aa9970cc74f1fef28a11fac1 (commit) via b17aeea11a9bac1f5d55463e81904af12c99b4c7 (commit) via ffabb755ea070ee33fd23a88d920b832da5521e1 (commit) via f603483a31d03e5647c409f8ce71d72ebaadd93b (commit) via 29889bf258fc52ae7c950c11eb17503883cff47e (commit) via 88ed645e7378b955c580ec2b8ce9b846a5fb48f0 (commit) via 722fd6f8286722d30d50c00769fa4fcad5935dd2 (commit) via bbabb79cfaf5e28ec9e804b95a23605038b39d39 (commit) via c14ec3dc896e0dd14d0491f09f81ce09e9d53bc2 (commit) via 50ebc616ddd9d05651923134d7bfaa02c103fbce (commit) via 1ff6b7a7e44e7d7376920f1e1ee81dbf28f95563 (commit) via c15da68b8dc3187c1929ff7d7705a0958856cbad (commit) via 16dd00616f73f7e49c53e4b0ea957ac789125b25 (commit) via a5609cc551f4bc71fb69746f3d6cafaf64b87fbf (commit) via 03aafc317489232bab7e9048f9bd96a24e6f598d (commit) via 19a457a86880a6bc33afe891a6204752bde70088 (commit) via 7025b1b430237cddc10a0338c7b120d23b7985a8 (commit) via 0f18e317ede15081828deca1ff61d65b72e12926 (commit) from 0b6dec84249c688b00c3044064ed6645aff696fb (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 9fbdbe9a6a86705339858a906ea66f076cc66785 Merge: 0b6dec8 b8867b0 Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Tue Feb 7 17:35:24 2017 +0300 Merge branch 'master' into api-next Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --cc .travis.yml index a6f770c,5b9a29a..2fd7ef6 --- a/.travis.yml +++ b/.travis.yml @@@ -11,17 -13,52 +13,52 @@@ env global: # COVERITY_SCAN_TOKEN # ** specific to your project ** + # Note: + # You should have a github account and travis linked travis account. + # The secure key to be filled below is the 685 character long encrypted + # token you can find as follow from your coverity dashboard + # (at https://scan.coverity.com/dashboard): + # Click on the github project (<you>/odp) + # Click on "submit build" + # Click on "Configure Travis CI" + # Look at the COVERITY_SCAN_TOKEN in the env: global: section + # of the configuration example. + # copy the secure:<key> below + # - secure: "xxxx" + # + # By default Linaro CODECOV_TOKEN token is used. It's ok to use it to see + # for individual commit validation. But you you want to track tests history + # you need generated new one at https://codecov.io specific for your repo. + - CODECOV_TOKEN=8e1c0fd8-62ff-411e-a79f-5839f6662c11 - language: c - compiler: clang - sudo: required + matrix: + include: + - compiler: gcc-4.8 + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - gcc-4.8 + env: MY_CF="-O0 -coverage" MY_LDF="--coverage" DOCOV=1 + - compiler: clang + addons: + apt: + packages: + - clang before_install: + - echo 1000 | sudo tee /proc/sys/vm/nr_hugepages + - sudo mkdir -p /mnt/huge + - sudo mount -t hugetlbfs nodev /mnt/huge + - sudo apt-get -qq update - - sudo apt-get install automake autoconf libtool libssl-dev graphviz mscgen doxygen + - sudo apt-get install automake autoconf libtool libssl-dev graphviz mscgen doxygen libconfig-dev - sudo apt-get install libpcap-dev linux-headers-`uname -r` + - sudo pip install coverage - gem install asciidoctor + - PATH=${PATH//:\.\/node_modules\/\.bin/} # Install cunit for the validation tests because distro version is too old and fails C99 compile - export CUNIT_VERSION=2.1-3 diff --cc platform/Makefile.inc index 57026d0,7059d91..874cf88 --- a/platform/Makefile.inc +++ b/platform/Makefile.inc @@@ -61,19 -60,28 +61,41 @@@ odpapispecinclude_HEADERS = $(top_builddir)/include/odp/api/spec/version.h \ $(top_srcdir)/include/odp/api/spec/traffic_mngr.h +odpdrvspecincludedir= $(includedir)/odp/drv/spec +odpdrvspecinclude_HEADERS = \ + $(top_srcdir)/include/odp/drv/spec/align.h \ + $(top_srcdir)/include/odp/drv/spec/atomic.h \ + $(top_srcdir)/include/odp/drv/spec/barrier.h \ + $(top_srcdir)/include/odp/drv/spec/byteorder.h \ + $(top_srcdir)/include/odp/drv/spec/compiler.h \ + $(top_srcdir)/include/odp/drv/spec/driver.h \ + $(top_srcdir)/include/odp/drv/spec/shm.h \ + $(top_srcdir)/include/odp/drv/spec/spinlock.h \ + $(top_srcdir)/include/odp/drv/spec/std_types.h \ + $(top_srcdir)/include/odp/drv/spec/sync.h + + odpapiabidefaultincludedir= $(includedir)/odp/arch/default/api/abi + odpapiabidefaultinclude_HEADERS = \ + $(top_srcdir)/include/odp/arch/default/api/abi/buffer.h \ + $(top_srcdir)/include/odp/arch/default/api/abi/classification.h \ + $(top_srcdir)/include/odp/arch/default/api/abi/crypto.h \ + $(top_srcdir)/include/odp/arch/default/api/abi/event.h \ + $(top_srcdir)/include/odp/arch/default/api/abi/packet.h \ + $(top_srcdir)/include/odp/arch/default/api/abi/pool.h \ + $(top_srcdir)/include/odp/arch/default/api/abi/queue.h \ + $(top_srcdir)/include/odp/arch/default/api/abi/shared_memory.h + + odpapiabiarchincludedir= $(includedir)/odp/arch/@ARCH_ABI@/odp/api/abi + odpapiabiarchinclude_HEADERS = \ + $(top_srcdir)/include/odp/arch/@ARCH_ABI@/odp/api/abi/buffer.h \ + $(top_srcdir)/include/odp/arch/@ARCH_ABI@/odp/api/abi/classification.h \ + $(top_srcdir)/include/odp/arch/@ARCH_ABI@/odp/api/abi/crypto.h \ + $(top_srcdir)/include/odp/arch/@ARCH_ABI@/odp/api/abi/event.h \ + $(top_srcdir)/include/odp/arch/@ARCH_ABI@/odp/api/abi/packet.h \ + $(top_srcdir)/include/odp/arch/@ARCH_ABI@/odp/api/abi/pool.h \ + $(top_srcdir)/include/odp/arch/@ARCH_ABI@/odp/api/abi/queue.h \ + $(top_srcdir)/include/odp/arch/@ARCH_ABI@/odp/api/abi/shared_memory.h + EXTRA_DIST = \ arch/arm/odp/api/cpu_arch.h \ arch/arm/odp_cpu_arch.c \ diff --cc platform/linux-generic/Makefile.am index 90024bd,576fedf..66ff53d --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@@ -6,9 -6,9 +6,10 @@@ include $(top_srcdir)/platform/@with_pl AM_CFLAGS += -I$(srcdir)/include AM_CFLAGS += -I$(top_srcdir)/include + AM_CFLAGS += -I$(top_srcdir)/include/odp/arch/@ARCH_ABI@ AM_CFLAGS += -I$(top_builddir)/include AM_CFLAGS += -Iinclude +AM_CFLAGS += -DSYSCONFDIR=\"@sysconfdir@\" include_HEADERS = \ $(top_srcdir)/include/odp.h \ diff --cc platform/linux-generic/_ishmpool.c index df6e49e,0000000..064d78e mode 100644,000000..100644 --- a/platform/linux-generic/_ishmpool.c +++ b/platform/linux-generic/_ishmpool.c @@@ -1,811 -1,0 +1,807 @@@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +/* This file gathers the buddy and slab allocation functionality provided + * by _ishm. + * _odp_ishmpool_create() can be used to create a pool for buddy/slab + * allocation. _odp_ishmpool_create() will allocate a memory area using + * ishm_reserve() for both the control part (needed for tracking + * allocation/free...) and the user memory itself (part of which will be given + * at each ishmpool_alloc()). + * The element size provided at pool creation time determines whether + * to pool will of type buddy or slab. + * For buddy, all allocations are rounded to the nearest power of 2. + * + * The implementation of the buddy allocator is very traditional: it + * maintains N lists of free buffers. + * The control part actually contains these N queue heads, (N-M are actually + * used), the free buffers themselves being used for chaining (the chaining info + * is in the buffers: as they are "free" they should not be touched by the + * user). The control part also contains a array of bytes for remembering + * the size (actually the order) of the allocated buffers: + * There are 2^(N-M) such bytes, this number being the maximum number of + * allocated buffers (when all allocation are <= 2^M bytes) + * Buddy allocators handle fragmentation by splitting or merging blocks by 2. + * They guarantee a minimum efficiency of 50%, at worse case fragmentation. + * + * Slab implementation is even simpler, all free elements being queued in + * one single queue at init, taken from this queue when allocated and + * returned to this same queue when freed. + * + * The reason for not using malloc() is that malloc does not guarantee + * memory sharability between ODP threads (regardless of their implememtation) + * which ishm_reserve() can do. see the comments around + * _odp_ishmbud_pool_create() and ishm_reserve() for more details. + * + * This file is divided in 3 sections: the first one regroups functions + * needed by the buddy allocation. + * The second one regroups the functions needed by the slab allocator. + * The third section regroups the common functions exported externally. + */ + +#include <odp_posix_extensions.h> +#include <odp_internal.h> +#include <odp/api/spinlock.h> +#include <odp/api/align.h> +#include <odp/api/debug.h> +#include <odp/drv/shm.h> +#include <odp_shm_internal.h> +#include <odp_debug_internal.h> +#include <odp_align_internal.h> +#include <_ishm_internal.h> +#include <_ishmpool_internal.h> +#include <stdlib.h> +#include <stdio.h> +#include <unistd.h> +#include <string.h> +#include <inttypes.h> + +#define BUDDY_MIN_SIZE 32 /* minimal buddy allocation size */ + +typedef _odp_ishm_pool_t pool_t; /* for shorter writing */ + +/* array of ishm block index used for pools. only used for pool + * lookup by name */ +#define MAX_NB_POOL 100 +static int pool_blk_idx[MAX_NB_POOL]; + +/* section 1: functions for buddy allocation: */ + +/* free buddy blocks contains the following structure, used to link the + * free blocks together. + */ +typedef struct bblock_t { + struct bblock_t *next; + uint32_t order; +} bblock_t; + +/* value set in the 'order' table when the block is not allocated: */ +#define BBLOCK_FREE 0 + +/* compute ceil(log2(size)) */ +static uint8_t clog2(uint64_t size) +{ + uint64_t sz; + uint32_t bit; + uint8_t res; + + sz = size; /* we start by computing res = log2(sz)... */ + res = 0; + for (bit = 32; bit ; bit >>= 1) { + if (sz >= ((uint64_t)1 << bit)) { + sz >>= bit; + res += bit; + } + } + if (((uint64_t)1 << res) < size) /* ...and then ceil(x) */ + res++; + + return res; +} + +/* + * given a bblock address, and an order value, returns the address + * of the buddy bblock (the other "half") + */ +static inline bblock_t *get_bblock_buddy(pool_t *bpool, bblock_t *addr, + uint8_t order) +{ + uintptr_t b; + + b = ((uintptr_t)addr - (uintptr_t)bpool->ctrl.user_addr); + b ^= 1 << order; + return (void *)(b + (uintptr_t)bpool->ctrl.user_addr); +} + +/* + * given a buddy block address, return its number (used for busy flags): + */ +static inline uintptr_t get_bblock_nr(pool_t *bpool, void *addr) +{ + uintptr_t b; + uint8_t min_order; + + min_order = bpool->ctrl.min_order; + b = ((uintptr_t)addr - (uintptr_t)bpool->ctrl.user_addr) >> min_order; + return b; +} + +/* remove bblock from the list for bblocks of rank order. The bblock to be + * removed is really expected to be on the list: not finding it is an error */ +static inline void remove_from_list(pool_t *bpool, uint8_t order, + bblock_t *bblock) +{ + bblock_t *curr; /* current bblock (when parsing list) */ + bblock_t *prev; /* previous bblock (when parsing list) */ + + curr = bpool->ctrl.free_heads[order]; + if (!curr) + goto remove_from_list_error; + + if (curr == bblock) { + bpool->ctrl.free_heads[order] = curr->next; + return; + } + + while (curr) { + if (curr == bblock) { + prev->next = curr->next; + return; + } + prev = curr; + curr = curr->next; + } + +remove_from_list_error: + ODP_ERR("List corrupted\n"); +} + +/* + * create a buddy memory pool of given size (actually nearest power of 2), + * where allocation will never be smaller than min_alloc. + * returns a pointer to the created buddy_pool + * The allocated area contains: + * - The _odp_ishm_pool_ctrl_t structure + * - The array of ((order - min_order) of free list heads + * - The array of 'order' values, remembering sizes of allocated bblocks + * - alignment to cache line + * - The user memory + */ +static pool_t *_odp_ishmbud_pool_create(const char *pool_name, int store_idx, + uint64_t size, + uint64_t min_alloc, int flags) +{ + uint8_t order; /* pool order = ceil(log2(size)) */ + uint8_t min_order; /* pool min_order = ceil(log2(min_alloc))*/ + uint32_t max_nb_bblock; /* max number of bblock, when smallest */ + uint32_t control_sz; /* size of control area */ + uint32_t free_head_sz; /* mem area needed for list heads */ + uint32_t saved_order_sz; /* mem area to remember given sizes */ + uint64_t user_sz; /* 2^order bytes */ + uint64_t total_sz; /* total size to request */ + int blk_idx; /* as returned by _ishm_resrve() */ + pool_t *bpool; + int i; + bblock_t *first_block; + + /* a bblock_t must fit in the buffers for linked chain! */ + if (min_alloc < sizeof(bblock_t)) + min_alloc = sizeof(bblock_t); + + /* pool order is such that 2^order = size. same for min_order */ + order = clog2(size); + min_order = clog2(min_alloc); + + /* check parameters obvious wishes: */ + if (order >= 64) + return NULL; + if (order < min_order) + return NULL; + + /* at worst case, all bblocks have smallest (2^min_order) size */ + max_nb_bblock = (1 << (order - min_order)); + + /* space needed for the control area (padded to cache line size)*/ - control_sz = - ODP_CACHE_LINE_SIZE_ROUNDUP(sizeof(_odp_ishm_pool_ctrl_t)); ++ control_sz = ROUNDUP_CACHE_LINE(sizeof(_odp_ishm_pool_ctrl_t)); + + /* space needed for 'order' free bblock list heads: */ + /* Note that only lists from min_order to order are really used.*/ - free_head_sz = ODP_CACHE_LINE_SIZE_ROUNDUP(sizeof(void *) * - (order + 1)); ++ free_head_sz = ROUNDUP_CACHE_LINE(sizeof(void *) * (order + 1)); + + /* space needed for order -i.e. size- storage of alloc'd bblock:*/ - saved_order_sz = ODP_CACHE_LINE_SIZE_ROUNDUP(max_nb_bblock * - sizeof(uint8_t)); ++ saved_order_sz = ROUNDUP_CACHE_LINE(max_nb_bblock * sizeof(uint8_t)); + + /* space needed for user area is 2^order bytes: */ + user_sz = 1 << order; + + total_sz = control_sz + + free_head_sz + + saved_order_sz + + user_sz; + + /* allocate required memory: */ + blk_idx = _odp_ishm_reserve(pool_name, total_sz, -1, + ODP_CACHE_LINE_SIZE, flags, 0); + if (blk_idx < 0) { + ODP_ERR("_odp_ishm_reserve failed."); + return NULL; + } + + bpool = _odp_ishm_address(blk_idx); + if (bpool == NULL) { + ODP_ERR("_odp_ishm_address failed."); + return NULL; + } + + /* store in pool array (needed for look up): */ + pool_blk_idx[store_idx] = blk_idx; + + /* remember block index, needed when pool is destroyed */ + bpool->ctrl.ishm_blk_idx = blk_idx; + + /* remember element size: 0 means unknown size, i.e. buddy alloation*/ + bpool->ctrl.element_sz = 0; + + /* prepare mutex: */ + odp_spinlock_init(&bpool->ctrl.lock); + + /* initialise pointers and things... */ + bpool->ctrl.order = order; + bpool->ctrl.min_order = min_order; + bpool->ctrl.free_heads = + (void *)((uintptr_t)bpool + control_sz); + bpool->ctrl.alloced_order = + (uint8_t *)((uintptr_t)bpool->ctrl.free_heads + free_head_sz); + bpool->ctrl.user_addr = + (void *)((uintptr_t)bpool->ctrl.alloced_order + saved_order_sz); + + /* initialize all free list to NULL, except the top biggest element:*/ + for (i = 0; i < (order - min_order); i++) + bpool->ctrl.free_heads[i] = NULL; + bpool->ctrl.free_heads[order] = bpool->ctrl.user_addr; + first_block = (bblock_t *)bpool->ctrl.user_addr; + first_block->next = NULL; + first_block->order = order; + + /* set all 'order' of allocated bblocks to free: */ + memset(bpool->ctrl.alloced_order, BBLOCK_FREE, saved_order_sz); + + return bpool; +} + +/* allocated memory from the given buddy pool */ +static void *_odp_ishmbud_alloc(pool_t *bpool, uint64_t size) +{ + uint32_t rq_order; /* requested order */ + uint32_t try_order; + bblock_t *bblock; + bblock_t *buddy; + uintptr_t nr; + + /* if size is zero or too big reject: */ + if ((!size) && (size > (1U << bpool->ctrl.order))) { + ODP_ERR("Invalid alloc size (0 or larger than whole pool)\n"); + return NULL; + } + + /* compute ceil(log2(size)), to get the requested block order: */ + rq_order = clog2(size); + + /* make sure the requested order is bigger (or same) as minimum! */ + if (rq_order < bpool->ctrl.min_order) + rq_order = bpool->ctrl.min_order; + + /* mutex from here: */ + odp_spinlock_lock(&bpool->ctrl.lock); + + /* now, start trying to allocate a bblock of rq_order. If that + * fails keep trying larger orders until pool order is reached */ + bblock = NULL; + for (try_order = rq_order; try_order <= bpool->ctrl.order; + try_order++) { + if (bpool->ctrl.free_heads[try_order]) { + /* remove from list: */ + bblock = + (bblock_t *)(bpool->ctrl.free_heads[try_order]); + bpool->ctrl.free_heads[try_order] = bblock->next; + break; + } + } + + if (!bblock) { + odp_spinlock_unlock(&bpool->ctrl.lock); + ODP_ERR("Out of memory. (Buddy pool full)\n"); + return NULL; + } + + /* OK: we got a block, but possibbly too large (if try_order>rq_order) + * return the extra halves to the pool hence splitting the bblock at + * each 'extra' order: */ + while (try_order-- > rq_order) { + /* split: */ + buddy = (bblock_t *)((uintptr_t)bblock + (1 << try_order)); + buddy->order = try_order; + /* add to list: */ + buddy->next = bpool->ctrl.free_heads[try_order]; + bpool->ctrl.free_heads[try_order] = buddy; + /* mark as free (non allocated block get size 0): */ + nr = get_bblock_nr(bpool, buddy); + bpool->ctrl.alloced_order[nr] = BBLOCK_FREE; + } + + /* remember the size if the allocated block: */ + nr = get_bblock_nr(bpool, bblock); + bpool->ctrl.alloced_order[nr] = rq_order; + + /* and return the allocated block! */ + odp_spinlock_unlock(&bpool->ctrl.lock); + return (void *)bblock; +} + +/* free a previously allocated buffer from a given buddy pool */ +static int _odp_ishmbud_free(pool_t *bpool, void *addr) +{ + uintptr_t user_start; /* start of user area */ + uintptr_t user_stop; /* stop of user area */ + uintptr_t mask; /* 2^min_order - 1 */ + bblock_t *bblock; /* bblock being freed */ + bblock_t *buddy; /* buddy bblock of bblock being freed */ + uint8_t order; /* order of block being freed */ + uintptr_t nr; /* block number */ + + /* freeing NULL is regarded as OK, though without any effect: */ + if (!addr) + return 0; + + user_start = (uintptr_t)bpool->ctrl.user_addr; + user_stop = user_start + ((uintptr_t)1 << bpool->ctrl.order); + mask = ((uintptr_t)1 << bpool->ctrl.min_order) - 1; + + /* some sanity checks: check that given address is within pool and + * that relative address has 2^min_order granularity: */ + if (((uintptr_t)addr < user_start) || + ((uintptr_t)addr > user_stop) || + (((uintptr_t)addr - user_start) & mask)) { + ODP_ERR("Invalid address to be freed\n"); + return -1; + } + + /* mutex from here: */ + odp_spinlock_lock(&bpool->ctrl.lock); + + /* collect saved block order and make sure bblock was allocated */ + bblock = (bblock_t *)addr; + nr = get_bblock_nr(bpool, bblock); + order = bpool->ctrl.alloced_order[nr]; + if (order == BBLOCK_FREE) { + ODP_ERR("Double free error\n"); + odp_spinlock_unlock(&bpool->ctrl.lock); + return -1; + } + + /* this looks like a valid free, mark at least this as free: */ + bpool->ctrl.alloced_order[nr] = BBLOCK_FREE; + + /* go up in orders, trying to merge buddies... */ + while (order < bpool->ctrl.order) { + buddy = get_bblock_buddy(bpool, bblock, order); + /*if buddy is not free: no further merge possible */ + nr = get_bblock_nr(bpool, buddy); + if (bpool->ctrl.alloced_order[nr] != BBLOCK_FREE) + break; + /*merge only bblock of same order:*/ + if (buddy->order != order) + break; + /*merge: remove buddy from free list: */ + remove_from_list(bpool, order, buddy); + /*merge: make sure we point at start of block: */ + if (bblock > buddy) + bblock = buddy; + /*merge: size of bloack has dubbled: increse order: */ + order++; + } + + /* insert the bblock into its correct free block list: */ + bblock->next = bpool->ctrl.free_heads[order]; + bpool->ctrl.free_heads[order] = bblock; + + /* remember the (possibly now merged) block order: */ + bblock->order = order; + + odp_spinlock_unlock(&bpool->ctrl.lock); + return 0; +} + +/* print buddy pool status and performs sanity checks */ +static int _odp_ishmbud_pool_status(const char *title, pool_t *bpool) +{ + uint8_t order, pool_order, pool_min_order; + uint64_t free_q_nb_bblocks[64]; + uint64_t allocated_nb_bblocks[64]; + uint64_t free_q_nb_bblocks_bytes[64]; + uint64_t allocated_nb_bblocks_bytes[64]; + uint64_t total_bytes_free; + uint64_t total_bytes_allocated; + uint64_t nr; + bblock_t *bblock; + int res = 0; + + odp_spinlock_lock(&bpool->ctrl.lock); + + pool_order = bpool->ctrl.order; + pool_min_order = bpool->ctrl.min_order; + + ODP_DBG("\n%s\n", title); + ODP_DBG("Pool Type: BUDDY\n"); + ODP_DBG("pool size: %" PRIu64 " (bytes)\n", (1UL << pool_order)); + ODP_DBG("pool order: %d\n", (int)pool_order); + ODP_DBG("pool min_order: %d\n", (int)pool_min_order); + + /* a pool wholse order is more than 64 cannot even be reached on 64 + * bit machines! */ + if (pool_order > 64) { + odp_spinlock_unlock(&bpool->ctrl.lock); + return -1; + } + + total_bytes_free = 0; + total_bytes_allocated = 0; + + /* for each queue */ + for (order = pool_min_order; order <= pool_order; order++) { + free_q_nb_bblocks[order] = 0; + free_q_nb_bblocks_bytes[order] = 0; + allocated_nb_bblocks[order] = 0; + allocated_nb_bblocks_bytes[order] = 0; + + /* get the number of buffs in the free queue for this order: */ + bblock = bpool->ctrl.free_heads[order]; + while (bblock) { + free_q_nb_bblocks[order]++; + free_q_nb_bblocks_bytes[order] += (1 << order); + bblock = bblock->next; + } + + total_bytes_free += free_q_nb_bblocks_bytes[order]; + + /* get the number of allocated buffers of this order */ + for (nr = 0; + nr < (1U << (pool_order - pool_min_order)); nr++) { + if (bpool->ctrl.alloced_order[nr] == order) + allocated_nb_bblocks[order]++; + } + + allocated_nb_bblocks_bytes[order] = + allocated_nb_bblocks[order] * (1 << order); + + total_bytes_allocated += allocated_nb_bblocks_bytes[order]; + + ODP_DBG("Order %d => Free: %" PRIu64 " buffers " + "(%" PRIu64" bytes) " + "Allocated %" PRIu64 " buffers (%" PRIu64 " bytes) " + "Total: %" PRIu64 " bytes\n", + (int)order, free_q_nb_bblocks[order], + free_q_nb_bblocks_bytes[order], + allocated_nb_bblocks[order], + allocated_nb_bblocks_bytes[order], + free_q_nb_bblocks_bytes[order] + + allocated_nb_bblocks_bytes[order]); + } + + ODP_DBG("Allocated space: %" PRIu64 " (bytes)\n", + total_bytes_allocated); + ODP_DBG("Free space: %" PRIu64 " (bytes)\n", total_bytes_free); + + if (total_bytes_free + total_bytes_allocated != (1U << pool_order)) { + ODP_DBG("Lost bytes on this pool!\n"); + res = -1; + } + + if (res) + ODP_DBG("Pool inconsistent!\n"); + + odp_spinlock_unlock(&bpool->ctrl.lock); + return res; +} + +/* section 2: functions for slab allocation: */ + +/* free slab blocks contains the following structure, used to link the + * free blocks together. + */ +typedef struct sblock_t { + struct sblock_t *next; +} sblock_t; + +/* + * create a slab memory pool of given size (rounded up to the nearest integer + * number of element, where each element has size 'elt_size'). + * returns a pointer to the created slab pool. + * The allocated area contains: + * - The _odp_ishm_pool_ctrl_t structure + * - alignment to cache line + * - The user memory + */ +static pool_t *_odp_ishmslab_pool_create(const char *pool_name, int store_idx, + uint64_t size, + uint64_t elt_size, int flags) +{ + uint32_t nb_sblock; /* number of elements in the pool */ + uint32_t control_sz; /* size of control area */ + uint64_t total_sz; /* total size to request */ + uint64_t user_sz; /* 2^order bytes */ + int blk_idx; /* as returned by _ishm_reserve() */ + pool_t *spool; + unsigned int i; + sblock_t *block; + + /* a sblock_t must fit in the buffers for linked chain! */ + if (elt_size < sizeof(bblock_t)) { + elt_size = sizeof(bblock_t); + size = size * (sizeof(bblock_t) / elt_size + + ((sizeof(bblock_t) % elt_size) ? 1 : 0)); + } + + /* nb of element fitting in the pool is just ceil(size/elt_size)*/ + nb_sblock = (size / elt_size) + ((size % elt_size) ? 1 : 0); + + /* space needed for the control area (padded to cache line size)*/ - control_sz = - ODP_CACHE_LINE_SIZE_ROUNDUP(sizeof(_odp_ishm_pool_ctrl_t)); ++ control_sz = ROUNDUP_CACHE_LINE(sizeof(_odp_ishm_pool_ctrl_t)); + + /* space needed for user area is : */ + user_sz = nb_sblock * elt_size; + + total_sz = control_sz + + user_sz; + + /* allocate required memory: */ + blk_idx = _odp_ishm_reserve(pool_name, total_sz, -1, + ODP_CACHE_LINE_SIZE, flags, 0); + if (blk_idx < 0) { + ODP_ERR("_odp_ishm_reserve failed."); + return NULL; + } + + spool = _odp_ishm_address(blk_idx); + if (spool == NULL) { + ODP_ERR("_odp_ishm_address failed."); + return NULL; + } + + /* store in pool array (needed for look up): */ + pool_blk_idx[store_idx] = blk_idx; + + /* remember block index, needed when pool is destroyed */ + spool->ctrl.ishm_blk_idx = blk_idx; + + /* remember element (sblock) size and their number: */ + spool->ctrl.element_sz = elt_size; + spool->ctrl.nb_elem = nb_sblock; + + /* prepare mutex: */ + odp_spinlock_init(&spool->ctrl.lock); + + /* initialise pointers and things... */ + spool->ctrl.user_addr = + (void *)((uintptr_t)spool + control_sz); + + /* initialise the free list with the list of all elements:*/ + spool->ctrl.free_head = spool->ctrl.user_addr; + for (i = 0; i < nb_sblock - 1; i++) { + block = (sblock_t *)((uintptr_t)spool->ctrl.user_addr + + i * (uintptr_t)elt_size); + block->next = (sblock_t *)((uintptr_t)block + + (uintptr_t)elt_size); + } + block = (sblock_t *)((uintptr_t)spool->ctrl.user_addr + + (nb_sblock - 1) * (uintptr_t)elt_size); + block->next = NULL; + + return spool; +} + +/* allocated memory from the given slab pool */ +static void *_odp_ishmslab_alloc(pool_t *spool, uint64_t size) +{ + void *ret; + sblock_t *block; + + if (size > spool->ctrl.element_sz) + return NULL; + + odp_spinlock_lock(&spool->ctrl.lock); + ret = spool->ctrl.free_head; + if (!ret) { + odp_spinlock_unlock(&spool->ctrl.lock); + ODP_ERR("Out of memory. (Slab pool full)\n"); + return NULL; + } + + block = (sblock_t *)ret; + spool->ctrl.free_head = block->next; + + odp_spinlock_unlock(&spool->ctrl.lock); + return ret; +} + +/* free a previously allocated buffer from a given slab pool */ +static int _odp_ishmslab_free(pool_t *spool, void *addr) +{ + uintptr_t user_start; /* start of user area */ + uintptr_t user_stop; /* stop of user area */ + sblock_t *block; + + /* freeing NULL is regarded as OK, though without any effect: */ + if (!addr) + return 0; + + user_start = (uintptr_t)spool->ctrl.user_addr; + user_stop = user_start + spool->ctrl.element_sz * spool->ctrl.nb_elem; + + /* some sanity checks: check that given address is within pool and + * that relative address has element_sz granularity: */ + if (((uintptr_t)addr < user_start) || + ((uintptr_t)addr > user_stop) || + (((uintptr_t)addr - user_start) % spool->ctrl.element_sz)) { + ODP_ERR("Invalid address to be freed\n"); + return -1; + } + + odp_spinlock_lock(&spool->ctrl.lock); + block = (sblock_t *)addr; + block->next = (sblock_t *)spool->ctrl.free_head; + spool->ctrl.free_head = addr; + odp_spinlock_unlock(&spool->ctrl.lock); + + return 0; +} + +/* print slab pool status and performs sanity checks */ +static int _odp_ishmslab_pool_status(const char *title, pool_t *spool) +{ + sblock_t *sblock; + uint64_t nb_free_elts; /* number of free elements */ + + odp_spinlock_lock(&spool->ctrl.lock); + + ODP_DBG("\n%s\n", title); + ODP_DBG("Pool Type: FIXED SIZE\n"); + ODP_DBG("pool size: %" PRIu64 " (bytes)\n", + spool->ctrl.nb_elem * spool->ctrl.element_sz); + + /* count the number of free elements in the free list: */ + nb_free_elts = 0; + sblock = (sblock_t *)spool->ctrl.free_head; + while (sblock) { + nb_free_elts++; + sblock = sblock->next; + } + + ODP_DBG("%" PRIu64 "/%" PRIu64 " available elements.\n", + nb_free_elts, spool->ctrl.nb_elem); + + odp_spinlock_unlock(&spool->ctrl.lock); + return 0; +} + +/* section 3: common, external functions: */ + +/* create a pool: either with fixed alloc size (if max_alloc/min_alloc<2) or + * of variable block size (if max_alloc == 0) */ +pool_t *_odp_ishm_pool_create(const char *pool_name, uint64_t size, + uint64_t min_alloc, uint64_t max_alloc, int flags) +{ + int store_idx; + uint64_t real_pool_sz; + + if (min_alloc > max_alloc) { + ODP_ERR("invalid parameter: min_alloc > max_alloc"); + return NULL; + } + + /* search for a free index in pool_blk_idx for the pool */ + for (store_idx = 0; store_idx < MAX_NB_POOL; store_idx++) { + if (pool_blk_idx[store_idx] < 0) + break; + } + if (store_idx == MAX_NB_POOL) { + ODP_ERR("Max number of pool reached (MAX_NB_POOL)"); + return NULL; + } + + if ((min_alloc == 0) || ((max_alloc / min_alloc) > 2)) { + /* alloc variation is not constant enough: we go for a buddy + * allocator. The pool efficiency may go as low as 50% + * so we double the required size to make sure we can satisfy + * the user request */ + real_pool_sz = 2 * size; + return _odp_ishmbud_pool_create(pool_name, store_idx, + real_pool_sz, + BUDDY_MIN_SIZE, flags); + } else { + /* min and max are close enough so we go for constant size + * allocator: + * make sure the pool can fit the required size, even when + * only min_alloc allocation are performed: */ + real_pool_sz = ((size / min_alloc) + + ((size % min_alloc) ? 1 : 0)) + * max_alloc; + return _odp_ishmslab_pool_create(pool_name, store_idx, + real_pool_sz, + max_alloc, flags); + } +} + +/* destroy a pool. everything goes away. no operation on the pool should + * follow. */ +int _odp_ishm_pool_destroy(pool_t *pool) +{ + int store_idx; + + for (store_idx = 0; store_idx < MAX_NB_POOL; store_idx++) { + if (pool_blk_idx[store_idx] == pool->ctrl.ishm_blk_idx) { + pool_blk_idx[store_idx] = -1; + break; + } + } + + return _odp_ishm_free_by_index(pool->ctrl.ishm_blk_idx); +} + +/* allocated a buffer from a pool */ +void *_odp_ishm_pool_alloc(_odp_ishm_pool_t *pool, uint64_t size) +{ + if (!pool->ctrl.element_sz) + return _odp_ishmbud_alloc(pool, size); + else + return _odp_ishmslab_alloc(pool, size); +} + +/* free a previously allocated buffer from a pool */ +int _odp_ishm_pool_free(_odp_ishm_pool_t *pool, void *addr) +{ + if (!pool->ctrl.element_sz) + return _odp_ishmbud_free(pool, addr); + else + return _odp_ishmslab_free(pool, addr); +} + +/* Print a pool status */ +int _odp_ishm_pool_status(const char *title, _odp_ishm_pool_t *pool) +{ + if (!pool->ctrl.element_sz) + return _odp_ishmbud_pool_status(title, pool); + else + return _odp_ishmslab_pool_status(title, pool); +} + +void _odp_ishm_pool_init(void) +{ + int i; + + for (i = 0; i < MAX_NB_POOL; i++) + pool_blk_idx[i] = -1; +} + +_odp_ishm_pool_t *_odp_ishm_pool_lookup(const char *pool_name) +{ + int block_idx; + int store_idx; + + /* search for a _ishm block with the given name */ + block_idx = _odp_ishm_lookup_by_name(pool_name); + if (block_idx < 0) + return NULL; + + /* a block with that name exists: make sure it is within + * the registered pools */ + for (store_idx = 0; store_idx < MAX_NB_POOL; store_idx++) { + if (pool_blk_idx[store_idx] == block_idx) + return _odp_ishm_address(block_idx); + } + + return NULL; +} diff --cc platform/linux-generic/include/odp/api/plat/event_types.h index abaa770,a1aa0e4..0f51783 --- a/platform/linux-generic/include/odp/api/plat/event_types.h +++ b/platform/linux-generic/include/odp/api/plat/event_types.h @@@ -38,15 -39,8 +39,9 @@@ typedef enum odp_event_type_t ODP_EVENT_PACKET = 2, ODP_EVENT_TIMEOUT = 3, ODP_EVENT_CRYPTO_COMPL = 4, + ODP_EVENT_IPSEC_RESULT = 5 } odp_event_type_t; - /** Get printable format of odp_event_t */ - static inline uint64_t odp_event_to_u64(odp_event_t hdl) - { - return _odp_pri(hdl); - } - /** * @} */ diff --cc platform/linux-generic/odp_packet.c index 170965a,024f694..3aadc4d --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@@ -1709,11 -1496,9 +1709,11 @@@ int odp_packet_align(odp_packet_t *pkt if (align > ODP_CACHE_LINE_SIZE) return -1; + ODP_ASSERT(odp_packet_has_ref(*pkt) == 0); + if (seglen >= len) { misalign = align <= 1 ? 0 : - ODP_ALIGN_ROUNDUP(uaddr, align) - uaddr; + ROUNDUP_ALIGN(uaddr, align) - uaddr; if (misalign == 0) return 0; shift = align - misalign; diff --cc test/common_plat/validation/Makefile.inc index ffba620,0000000..3972ab4 mode 100644,000000..100644 --- a/test/common_plat/validation/Makefile.inc +++ b/test/common_plat/validation/Makefile.inc @@@ -1,16 -1,0 +1,16 @@@ +include $(top_srcdir)/test/Makefile.inc + +COMMON_DIR = $(top_builddir)/test/common_plat/common + +#the following option ensure that option '-I.' is not passed to gcc, +#therefore distinguishing between '#include "X"' and '#include <X>'. +#It allows common filenames (such as 'errno.h') to be used locally. +AUTOMAKE_OPTIONS = nostdinc + +AM_CFLAGS += -I$(top_srcdir)/test/common_plat/common +AM_LDFLAGS += -static + +LIBCUNIT_COMMON = $(COMMON_DIR)/libcunit_common.la +LIBCPUMASK_COMMON = $(COMMON_DIR)/libcpumask_common.la +LIBTHRMASK_COMMON = $(COMMON_DIR)/libthrmask_common.la - LIBODP = $(LIB)/libodphelper-linux.la $(LIB)/libodp-linux.la ++LIBODP = $(LIB)/libodphelper-linux-generic.la $(LIB)/libodp-linux.la ----------------------------------------------------------------------- Summary of changes: .codecov.yml | 25 + .travis.yml | 70 +- DEPENDENCIES | 4 +- configure.ac | 51 +- example/Makefile.inc | 3 +- example/classifier/odp_classifier.c | 4 +- example/generator/odp_generator.c | 6 +- example/hello/odp_hello.c | 34 +- example/ipsec/odp_ipsec.c | 6 +- example/ipsec/odp_ipsec_fwd_db.h | 1 - example/ipsec/odp_ipsec_loop_db.h | 1 - example/ipsec/odp_ipsec_misc.h | 4 +- example/ipsec/odp_ipsec_stream.c | 4 +- example/l2fwd_simple/odp_l2fwd_simple.c | 4 +- example/l3fwd/odp_l3fwd.c | 6 +- example/l3fwd/odp_l3fwd_db.h | 2 +- example/packet/odp_pktio.c | 4 +- example/switch/odp_switch.c | 4 +- example/time/time_global_test.c | 5 +- example/timer/odp_timer_test.c | 4 +- helper/Makefile.am | 36 +- helper/chksum.c | 4 +- helper/cuckootable.c | 52 +- helper/hashtable.c | 44 +- helper/include/odp/helper/odph_api.h | 39 + helper/{ => include/odp/helper}/odph_cuckootable.h | 0 helper/{ => include/odp/helper}/odph_hashtable.h | 0 .../{ => include/odp/helper}/odph_iplookuptable.h | 0 helper/{ => include/odp/helper}/odph_lineartable.h | 0 .../helper/platform/linux-generic/threads_extn.h | 112 ++ helper/include/odp/helper/{linux.h => threads.h} | 78 - helper/iplookuptable.c | 61 +- helper/lineartable.c | 29 +- helper/m4/configure.m4 | 14 + helper/odph_debug.h | 4 - helper/platform/linux-generic/thread.c | 313 ++++ helper/test/Makefile.am | 43 +- helper/test/chksum.c | 22 +- helper/test/cuckootable.c | 6 +- helper/test/iplookuptable.c | 6 +- helper/test/linux-generic/Makefile.am | 5 + helper/test/{ => linux-generic}/process.c | 16 +- helper/test/{ => linux-generic}/thread.c | 16 +- helper/test/odpthreads.c | 20 +- helper/test/parse.c | 89 +- helper/test/table.c | 15 +- helper/{linux.c => threads.c} | 242 +-- .../odp/arch/arm32-linux/odp/api/abi/buffer.h | 7 +- .../arch/arm32-linux/odp/api/abi/classification.h | 7 +- .../odp/arch/arm32-linux/odp/api/abi/crypto.h | 7 +- .../odp/arch/arm32-linux/odp/api/abi/event.h | 7 +- .../odp/arch/arm32-linux/odp/api/abi/packet.h | 7 +- .../odp/arch/arm32-linux/odp/api/abi/pool.h | 7 +- .../odp/arch/arm32-linux/odp/api/abi/queue.h | 7 +- .../arch/arm32-linux/odp/api/abi/shared_memory.h | 7 +- .../odp/arch/arm64-linux/odp/api/abi/buffer.h | 7 +- .../arch/arm64-linux/odp/api/abi/classification.h | 7 +- .../odp/arch/arm64-linux/odp/api/abi/crypto.h | 7 +- .../odp/arch/arm64-linux/odp/api/abi/event.h | 7 +- .../odp/arch/arm64-linux/odp/api/abi/packet.h | 7 +- .../odp/arch/arm64-linux/odp/api/abi/pool.h | 7 +- .../odp/arch/arm64-linux/odp/api/abi/queue.h | 7 +- .../arch/arm64-linux/odp/api/abi/shared_memory.h | 7 +- include/odp/arch/default/api/abi/buffer.h | 38 + include/odp/arch/default/api/abi/classification.h | 40 + include/odp/arch/default/api/abi/crypto.h | 36 + include/odp/arch/default/api/abi/event.h | 42 + include/odp/arch/default/api/abi/packet.h | 47 + include/odp/arch/default/api/abi/pool.h | 43 + include/odp/arch/default/api/abi/queue.h | 35 + include/odp/arch/default/api/abi/shared_memory.h | 35 + .../odp/arch/mips64-linux/odp/api/abi/buffer.h | 7 +- .../arch/mips64-linux/odp/api/abi/classification.h | 7 +- .../odp/arch/mips64-linux/odp/api/abi/crypto.h | 7 +- .../odp/arch/mips64-linux/odp/api/abi/event.h | 7 +- .../odp/arch/mips64-linux/odp/api/abi/packet.h | 7 +- .../odp/arch/mips64-linux/odp/api/abi/pool.h | 7 +- .../odp/arch/mips64-linux/odp/api/abi/queue.h | 7 +- .../arch/mips64-linux/odp/api/abi/shared_memory.h | 7 +- .../odp/arch/power64-linux/odp/api/abi/buffer.h | 7 +- .../power64-linux/odp/api/abi/classification.h | 7 +- .../odp/arch/power64-linux/odp/api/abi/crypto.h | 7 +- .../odp/arch/power64-linux/odp/api/abi/event.h | 7 +- .../odp/arch/power64-linux/odp/api/abi/packet.h | 7 +- .../odp/arch/power64-linux/odp/api/abi/pool.h | 7 +- .../odp/arch/power64-linux/odp/api/abi/queue.h | 7 +- .../arch/power64-linux/odp/api/abi/shared_memory.h | 7 +- .../odp/arch/x86_32-linux/odp/api/abi/buffer.h | 7 +- .../arch/x86_32-linux/odp/api/abi/classification.h | 7 +- .../odp/arch/x86_32-linux/odp/api/abi/crypto.h | 7 +- .../odp/arch/x86_32-linux/odp/api/abi/event.h | 7 +- .../odp/arch/x86_32-linux/odp/api/abi/packet.h | 7 +- .../odp/arch/x86_32-linux/odp/api/abi/pool.h | 7 +- .../odp/arch/x86_32-linux/odp/api/abi/queue.h | 7 +- .../arch/x86_32-linux/odp/api/abi/shared_memory.h | 7 +- .../odp/arch/x86_64-linux/odp/api/abi/buffer.h | 7 +- .../arch/x86_64-linux/odp/api/abi/classification.h | 7 +- .../odp/arch/x86_64-linux/odp/api/abi/crypto.h | 7 +- .../odp/arch/x86_64-linux/odp/api/abi/event.h | 7 +- .../odp/arch/x86_64-linux/odp/api/abi/packet.h | 7 +- .../odp/arch/x86_64-linux/odp/api/abi/pool.h | 7 +- .../odp/arch/x86_64-linux/odp/api/abi/queue.h | 7 +- .../arch/x86_64-linux/odp/api/abi/shared_memory.h | 7 +- ...inux.pc.in => libodphelper-linux-generic.pc.in} | 4 +- platform/Makefile.inc | 22 + platform/linux-generic/Makefile.am | 1 + platform/linux-generic/_ishm.c | 13 +- platform/linux-generic/_ishmphy.c | 42 +- platform/linux-generic/_ishmpool.c | 12 +- platform/linux-generic/arch/arm/odp/api/cpu_arch.h | 6 + .../linux-generic/include/odp/api/classification.h | 9 +- .../include/odp/api/plat/buffer_types.h | 23 +- .../include/odp/api/plat/classification_types.h | 34 +- .../include/odp/api/plat/crypto_types.h | 21 +- .../include/odp/api/plat/event_types.h | 19 +- .../include/odp/api/plat/packet_types.h | 26 +- .../include/odp/api/plat/pool_types.h | 21 +- .../include/odp/api/plat/queue_types.h | 25 +- .../include/odp/api/plat/shared_memory_types.h | 16 +- platform/linux-generic/include/odp/api/queue.h | 4 + .../linux-generic/include/odp_align_internal.h | 108 +- .../include/odp_classification_datamodel.h | 19 +- .../include/odp_classification_inlines.h | 52 +- platform/linux-generic/include/odp_packet_dpdk.h | 2 +- .../linux-generic/include/odp_packet_internal.h | 5 + .../linux-generic/include/odp_packet_io_internal.h | 2 +- platform/linux-generic/include/odp_packet_netmap.h | 2 +- platform/linux-generic/include/odp_pool_internal.h | 1 + .../linux-generic/include/odp_queue_internal.h | 2 +- platform/linux-generic/include/protocols/ip.h | 14 +- platform/linux-generic/odp_buffer.c | 5 + platform/linux-generic/odp_classification.c | 39 +- platform/linux-generic/odp_crypto.c | 10 + platform/linux-generic/odp_event.c | 5 + platform/linux-generic/odp_packet.c | 16 +- platform/linux-generic/odp_pool.c | 12 +- platform/linux-generic/odp_queue.c | 5 + platform/linux-generic/odp_schedule.c | 8 +- platform/linux-generic/odp_schedule_sp.c | 7 +- platform/linux-generic/odp_shared_memory.c | 6 + platform/linux-generic/odp_timer.c | 9 +- platform/linux-generic/odp_traffic_mngr.c | 5 +- platform/linux-generic/pktio/dpdk.c | 14 +- platform/linux-generic/pktio/netmap.c | 37 +- test/Makefile.inc | 3 +- test/common_plat/common/odp_cunit_common.c | 2 +- .../common_plat/miscellaneous/odp_api_from_cpp.cpp | 2 +- test/common_plat/performance/.gitignore | 2 + test/common_plat/performance/Makefile.am | 15 +- .../common_plat/performance/dummy_crc.h | 46 +- test/common_plat/performance/odp_bench_packet.c | 1611 ++++++++++++++++++++ test/common_plat/performance/odp_crypto.c | 2 +- test/common_plat/performance/odp_l2fwd.c | 4 +- test/common_plat/performance/odp_pktio_ordered.c | 1342 ++++++++++++++++ .../performance/odp_pktio_ordered_run.sh | 42 + test/common_plat/performance/odp_pktio_perf.c | 5 +- test/common_plat/performance/odp_sched_latency.c | 2 +- test/common_plat/performance/odp_scheduling.c | 2 +- .../common_plat/performance}/udp64.pcap | Bin test/common_plat/validation/Makefile.inc | 2 +- test/common_plat/validation/api/Makefile.inc | 17 +- .../validation/api/classification/classification.h | 21 + .../api/classification/odp_classification_common.c | 153 +- .../classification/odp_classification_test_pmr.c | 296 +++- .../api/classification/odp_classification_tests.c | 46 +- .../classification/odp_classification_testsuites.h | 15 +- test/common_plat/validation/api/pktio/pktio.c | 4 +- test/common_plat/validation/api/timer/timer.c | 2 +- .../validation/api/traffic_mngr/traffic_mngr.c | 6 +- test/linux-generic/Makefile.inc | 3 +- test/linux-generic/mmap_vlan_ins/mmap_vlan_ins.c | 30 +- test/linux-generic/mmap_vlan_ins/mmap_vlan_ins.sh | 15 +- test/linux-generic/pktio_ipc/ipc_common.h | 5 +- test/linux-generic/ring/ring_stress.c | 2 +- 174 files changed, 5201 insertions(+), 1339 deletions(-) create mode 100644 .codecov.yml create mode 100644 helper/include/odp/helper/odph_api.h rename helper/{ => include/odp/helper}/odph_cuckootable.h (100%) rename helper/{ => include/odp/helper}/odph_hashtable.h (100%) rename helper/{ => include/odp/helper}/odph_iplookuptable.h (100%) rename helper/{ => include/odp/helper}/odph_lineartable.h (100%) create mode 100644 helper/include/odp/helper/platform/linux-generic/threads_extn.h rename helper/include/odp/helper/{linux.h => threads.h} (74%) create mode 100644 helper/platform/linux-generic/thread.c create mode 100644 helper/test/linux-generic/Makefile.am rename helper/test/{ => linux-generic}/process.c (84%) rename helper/test/{ => linux-generic}/thread.c (84%) rename helper/{linux.c => threads.c} (66%) copy test/common_plat/validation/api/ipsec/ipsec_main.c => include/odp/arch/arm32-linux/odp/api/abi/buffer.h (56%) copy test/common_plat/validation/api/ipsec/ipsec_main.c => include/odp/arch/arm32-linux/odp/api/abi/classification.h (56%) copy test/common_plat/validation/api/ipsec/ipsec_main.c => include/odp/arch/arm32-linux/odp/api/abi/crypto.h (56%) copy test/common_plat/validation/api/ipsec/ipsec_main.c => include/odp/arch/arm32-linux/odp/api/abi/event.h (56%) copy test/common_plat/validation/api/ipsec/ipsec_main.c => include/odp/arch/arm32-linux/odp/api/abi/packet.h (56%) copy test/common_plat/validation/api/ipsec/ipsec_main.c => include/odp/arch/arm32-linux/odp/api/abi/pool.h (56%) copy test/common_plat/validation/api/ipsec/ipsec_main.c => include/odp/arch/arm32-linux/odp/api/abi/queue.h (56%) copy test/common_plat/validation/api/ipsec/ipsec_main.c => include/odp/arch/arm32-linux/odp/api/abi/shared_memory.h (56%) copy test/common_plat/validation/api/ipsec/ipsec_main.c => include/odp/arch/arm64-linux/odp/api/abi/buffer.h (56%) copy test/common_plat/validation/api/ipsec/ipsec_main.c => include/odp/arch/arm64-linux/odp/api/abi/classification.h (56%) copy test/common_plat/validation/api/ipsec/ipsec_main.c => include/odp/arch/arm64-linux/odp/api/abi/crypto.h (56%) copy test/common_plat/validation/api/ipsec/ipsec_main.c => include/odp/arch/arm64-linux/odp/api/abi/event.h (56%) copy test/common_plat/validation/api/ipsec/ipsec_main.c => include/odp/arch/arm64-linux/odp/api/abi/packet.h (56%) copy test/common_plat/validation/api/ipsec/ipsec_main.c => include/odp/arch/arm64-linux/odp/api/abi/pool.h (56%) copy test/common_plat/validation/api/ipsec/ipsec_main.c => include/odp/arch/arm64-linux/odp/api/abi/queue.h (56%) copy test/common_plat/validation/api/ipsec/ipsec_main.c => include/odp/arch/arm64-linux/odp/api/abi/shared_memory.h (56%) create mode 100644 include/odp/arch/default/api/abi/buffer.h create mode 100644 include/odp/arch/default/api/abi/classification.h create mode 100644 include/odp/arch/default/api/abi/crypto.h create mode 100644 include/odp/arch/default/api/abi/event.h create mode 100644 include/odp/arch/default/api/abi/packet.h create mode 100644 include/odp/arch/default/api/abi/pool.h create mode 100644 include/odp/arch/default/api/abi/queue.h create mode 100644 include/odp/arch/default/api/abi/shared_memory.h copy test/common_plat/validation/api/ipsec/ipsec_main.c => include/odp/arch/mips64-linux/odp/api/abi/buffer.h (56%) copy test/common_plat/validation/api/ipsec/ipsec_main.c => include/odp/arch/mips64-linux/odp/api/abi/classification.h (56%) copy test/common_plat/validation/api/ipsec/ipsec_main.c => include/odp/arch/mips64-linux/odp/api/abi/crypto.h (56%) copy test/common_plat/validation/api/ipsec/ipsec_main.c => include/odp/arch/mips64-linux/odp/api/abi/event.h (56%) copy test/common_plat/validation/api/ipsec/ipsec_main.c => include/odp/arch/mips64-linux/odp/api/abi/packet.h (56%) copy test/common_plat/validation/api/ipsec/ipsec_main.c => include/odp/arch/mips64-linux/odp/api/abi/pool.h (56%) copy test/common_plat/validation/api/ipsec/ipsec_main.c => include/odp/arch/mips64-linux/odp/api/abi/queue.h (56%) copy test/common_plat/validation/api/ipsec/ipsec_main.c => include/odp/arch/mips64-linux/odp/api/abi/shared_memory.h (56%) copy test/common_plat/validation/api/ipsec/ipsec_main.c => include/odp/arch/power64-linux/odp/api/abi/buffer.h (56%) copy test/common_plat/validation/api/ipsec/ipsec_main.c => include/odp/arch/power64-linux/odp/api/abi/classification.h (56%) copy test/common_plat/validation/api/ipsec/ipsec_main.c => include/odp/arch/power64-linux/odp/api/abi/crypto.h (56%) copy test/common_plat/validation/api/ipsec/ipsec_main.c => include/odp/arch/power64-linux/odp/api/abi/event.h (56%) copy test/common_plat/validation/api/ipsec/ipsec_main.c => include/odp/arch/power64-linux/odp/api/abi/packet.h (56%) copy test/common_plat/validation/api/ipsec/ipsec_main.c => include/odp/arch/power64-linux/odp/api/abi/pool.h (56%) copy test/common_plat/validation/api/ipsec/ipsec_main.c => include/odp/arch/power64-linux/odp/api/abi/queue.h (56%) copy test/common_plat/validation/api/ipsec/ipsec_main.c => include/odp/arch/power64-linux/odp/api/abi/shared_memory.h (56%) copy test/common_plat/validation/api/ipsec/ipsec_main.c => include/odp/arch/x86_32-linux/odp/api/abi/buffer.h (56%) copy test/common_plat/validation/api/ipsec/ipsec_main.c => include/odp/arch/x86_32-linux/odp/api/abi/classification.h (56%) copy test/common_plat/validation/api/ipsec/ipsec_main.c => include/odp/arch/x86_32-linux/odp/api/abi/crypto.h (56%) copy test/common_plat/validation/api/ipsec/ipsec_main.c => include/odp/arch/x86_32-linux/odp/api/abi/event.h (56%) copy test/common_plat/validation/api/ipsec/ipsec_main.c => include/odp/arch/x86_32-linux/odp/api/abi/packet.h (56%) copy test/common_plat/validation/api/ipsec/ipsec_main.c => include/odp/arch/x86_32-linux/odp/api/abi/pool.h (56%) copy test/common_plat/validation/api/ipsec/ipsec_main.c => include/odp/arch/x86_32-linux/odp/api/abi/queue.h (56%) copy test/common_plat/validation/api/ipsec/ipsec_main.c => include/odp/arch/x86_32-linux/odp/api/abi/shared_memory.h (56%) copy test/common_plat/validation/api/ipsec/ipsec_main.c => include/odp/arch/x86_64-linux/odp/api/abi/buffer.h (56%) copy test/common_plat/validation/api/ipsec/ipsec_main.c => include/odp/arch/x86_64-linux/odp/api/abi/classification.h (56%) copy test/common_plat/validation/api/ipsec/ipsec_main.c => include/odp/arch/x86_64-linux/odp/api/abi/crypto.h (56%) copy test/common_plat/validation/api/ipsec/ipsec_main.c => include/odp/arch/x86_64-linux/odp/api/abi/event.h (56%) copy test/common_plat/validation/api/ipsec/ipsec_main.c => include/odp/arch/x86_64-linux/odp/api/abi/packet.h (56%) copy test/common_plat/validation/api/ipsec/ipsec_main.c => include/odp/arch/x86_64-linux/odp/api/abi/pool.h (56%) copy test/common_plat/validation/api/ipsec/ipsec_main.c => include/odp/arch/x86_64-linux/odp/api/abi/queue.h (56%) copy test/common_plat/validation/api/ipsec/ipsec_main.c => include/odp/arch/x86_64-linux/odp/api/abi/shared_memory.h (56%) rename pkgconfig/{libodphelper-linux.pc.in => libodphelper-linux-generic.pc.in} (72%) copy platform/linux-generic/odp_hash.c => test/common_plat/performance/dummy_crc.h (96%) create mode 100644 test/common_plat/performance/odp_bench_packet.c create mode 100644 test/common_plat/performance/odp_pktio_ordered.c create mode 100755 test/common_plat/performance/odp_pktio_ordered_run.sh copy {example/l2fwd_simple => test/common_plat/performance}/udp64.pcap (100%) hooks/post-receive --

8 years, 12 months

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

git-lng-odp