git-lng-odp June 2016

git-lng-odp@lists.linaro.org

1 participants
22 discussions

[COMMIT] branch api-next updated. v1.10.1.0-34-g1a24b75

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 1a24b758857eef4caf2a1801851315b6c93edd76 (commit) via d1e693d7177d10f382d69b659ab359fddee783b5 (commit) from 449cd8f2c3a694b219fcbb98d7d9948bce583ca1 (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 1a24b758857eef4caf2a1801851315b6c93edd76 Author: Ru Jia <jiaru(a)ict.ac.cn> Date: Mon Jun 13 14:42:14 2016 +0800 helper: test: add test of cuckoo hash table This test program consists of basic validation tests and performance tests. Signed-off-by: Ru Jia <jiaru(a)ict.ac.cn> Reviewed-and-tested-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/helper/test/.gitignore b/helper/test/.gitignore index 5ce3c3b..482fdb5 100644 --- a/helper/test/.gitignore +++ b/helper/test/.gitignore @@ -1,6 +1,7 @@ *.trs *.log chksum +cuckootable odpthreads parse process diff --git a/helper/test/Makefile.am b/helper/test/Makefile.am index e9e8785..0811d28 100644 --- a/helper/test/Makefile.am +++ b/helper/test/Makefile.am @@ -6,10 +6,11 @@ AM_LDFLAGS += -static TESTS_ENVIRONMENT += TEST_DIR=${builddir} EXECUTABLES = chksum$(EXEEXT) \ + cuckootable$(EXEEXT) \ + table$(EXEEXT) \ thread$(EXEEXT) \ parse$(EXEEXT)\ - process$(EXEEXT)\ - table$(EXEEXT) + process$(EXEEXT) COMPILE_ONLY = odpthreads @@ -27,6 +28,7 @@ bin_PROGRAMS = $(EXECUTABLES) $(COMPILE_ONLY) EXTRA_DIST = odpthreads_as_processes odpthreads_as_pthreads dist_chksum_SOURCES = chksum.c +dist_cuckootable_SOURCES = cuckootable.c dist_odpthreads_SOURCES = odpthreads.c odpthreads_LDADD = $(LIB)/libodphelper-linux.la $(LIB)/libodp-linux.la dist_thread_SOURCES = thread.c diff --git a/helper/test/cuckootable.c b/helper/test/cuckootable.c new file mode 100644 index 0000000..5b4333b --- /dev/null +++ b/helper/test/cuckootable.c @@ -0,0 +1,573 @@ +/* Copyright (c) 2016, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +/*- + * BSD LICENSE + * + * Copyright(c) 2010-2016 Intel Corporation. All rights reserved. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * * Neither the name of Intel Corporation nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include <stdio.h> +#include <stdint.h> +#include <string.h> +#include <stdlib.h> +#include <stdarg.h> +#include <errno.h> +#include <sys/queue.h> +#include <sys/time.h> +#include <time.h> + +#include <odp_api.h> +#include <test_debug.h> +#include <../odph_cuckootable.h> + +/******************************************************************************* + * Hash function performance test configuration section. + * + * The five arrays below control what tests are performed. Every combination + * from the array entries is tested. + */ +/******************************************************************************/ + +/* 5-tuple key type */ +struct flow_key { + uint32_t ip_src; + uint32_t ip_dst; + uint16_t port_src; + uint16_t port_dst; + uint8_t proto; +} __packed; + +/* + * Print out result of unit test hash operation. + */ +static void print_key_info( + const char *msg, const struct flow_key *key) +{ + const uint8_t *p = (const uint8_t *)key; + unsigned i; + + printf("%s key:0x", msg); + for (i = 0; i < sizeof(struct flow_key); i++) + printf("%02X", p[i]); + printf("\n"); +} + +static double get_time_diff(struct timeval *start, struct timeval *end) +{ + int sec = end->tv_sec - start->tv_sec; + int usec = end->tv_usec - start->tv_usec; + + if (usec < 0) { + sec--; + usec += 1000000; + } + double diff = sec + (double)usec / 1000000; + + return diff; +} + +/** Create IPv4 address */ +#define IPv4(a, b, c, d) ((uint32_t)(((a) & 0xff) << 24) | \ + (((b) & 0xff) << 16) | \ + (((c) & 0xff) << 8) | \ + ((d) & 0xff)) + +/* Keys used by unit test functions */ +static struct flow_key keys[5] = { { + .ip_src = IPv4(0x03, 0x02, 0x01, 0x00), + .ip_dst = IPv4(0x07, 0x06, 0x05, 0x04), + .port_src = 0x0908, + .port_dst = 0x0b0a, + .proto = 0x0c, +}, { + .ip_src = IPv4(0x13, 0x12, 0x11, 0x10), + .ip_dst = IPv4(0x17, 0x16, 0x15, 0x14), + .port_src = 0x1918, + .port_dst = 0x1b1a, + .proto = 0x1c, +}, { + .ip_src = IPv4(0x23, 0x22, 0x21, 0x20), + .ip_dst = IPv4(0x27, 0x26, 0x25, 0x24), + .port_src = 0x2928, + .port_dst = 0x2b2a, + .proto = 0x2c, +}, { + .ip_src = IPv4(0x33, 0x32, 0x31, 0x30), + .ip_dst = IPv4(0x37, 0x36, 0x35, 0x34), + .port_src = 0x3938, + .port_dst = 0x3b3a, + .proto = 0x3c, +}, { + .ip_src = IPv4(0x43, 0x42, 0x41, 0x40), + .ip_dst = IPv4(0x47, 0x46, 0x45, 0x44), + .port_src = 0x4948, + .port_dst = 0x4b4a, + .proto = 0x4c, +} }; + +/* + * Basic sequence of operations for a single key: + * - put + * - get (hit) + * - remove + * - get (miss) + */ +static int test_put_remove(void) +{ + odph_table_t table; + odph_table_ops_t *ops; + + ops = &odph_cuckoo_table_ops; + + /* test with standard put/get/remove functions */ + int ret; + + table = ops->f_create("put_remove", 10, sizeof(struct flow_key), 0); + if (table == NULL) { + printf("cuckoo hash table creation failed\n"); + return -1; + } + + ret = odph_cuckoo_table_put_value(table, &keys[0], NULL); + print_key_info("Add", &keys[0]); + if (ret < 0) { + printf("failed to add key\n"); + odph_cuckoo_table_destroy(table); + return -1; + } + + ret = odph_cuckoo_table_get_value(table, &keys[0], NULL, 0); + print_key_info("Lkp", &keys[0]); + if (ret < 0) { + printf("failed to find key\n"); + odph_cuckoo_table_destroy(table); + return -1; + } + + ret = odph_cuckoo_table_remove_value(table, &keys[0]); + print_key_info("Del", &keys[0]); + if (ret < 0) { + printf("failed to delete key\n"); + odph_cuckoo_table_destroy(table); + return -1; + } + + ret = odph_cuckoo_table_get_value(table, &keys[0], NULL, 0); + print_key_info("Lkp", &keys[0]); + if (ret >= 0) { + printf("error: found key after deleting!\n"); + odph_cuckoo_table_destroy(table); + return -1; + } + + odph_cuckoo_table_destroy(table); + return 0; +} + +/* + * Sequence of operations for a single key: + * key type : struct flow_key + * value type: uint8_t + * - remove: miss + * - put + * - get: hit + * - put: update + * - get: hit (updated data) + * - remove: hit + * - remove: miss + */ +static int test_put_update_remove(void) +{ + odph_table_t table; + int ret; + uint8_t val1 = 1, val2 = 2, val = 0; + + table = odph_cuckoo_table_create( + "put_update_remove", + 10, sizeof(struct flow_key), sizeof(uint8_t)); + if (table == NULL) { + printf("failed to create table\n"); + return -1; + } + + ret = odph_cuckoo_table_remove_value(table, &keys[0]); + print_key_info("Del", &keys[0]); + if (ret >= 0) { + printf("error: found non-existent key\n"); + odph_cuckoo_table_destroy(table); + return -1; + } + + ret = odph_cuckoo_table_put_value(table, &keys[0], &val1); + print_key_info("Add", &keys[0]); + if (ret < 0) { + printf("failed to add key\n"); + odph_cuckoo_table_destroy(table); + return -1; + } + + ret = odph_cuckoo_table_get_value( + table, &keys[0], &val, sizeof(uint8_t)); + print_key_info("Lkp", &keys[0]); + if (ret < 0) { + printf("failed to find key\n"); + odph_cuckoo_table_destroy(table); + return -1; + } + + ret = odph_cuckoo_table_put_value(table, &keys[0], &val2); + if (ret < 0) { + printf("failed to re-add key\n"); + odph_cuckoo_table_destroy(table); + return -1; + } + + ret = odph_cuckoo_table_get_value( + table, &keys[0], &val, sizeof(uint8_t)); + print_key_info("Lkp", &keys[0]); + if (ret < 0) { + printf("failed to find key\n"); + odph_cuckoo_table_destroy(table); + return -1; + } + + ret = odph_cuckoo_table_remove_value(table, &keys[0]); + print_key_info("Del", &keys[0]); + if (ret < 0) { + printf("failed to delete key\n"); + odph_cuckoo_table_destroy(table); + return -1; + } + + ret = odph_cuckoo_table_remove_value(table, &keys[0]); + print_key_info("Del", &keys[0]); + if (ret >= 0) { + printf("error: deleted already deleted key\n"); + odph_cuckoo_table_destroy(table); + return -1; + } + + odph_cuckoo_table_destroy(table); + return 0; +} + +/* + * Sequence of operations for find existing hash table + * + * - create table + * - find existing table: hit + * - find non-existing table: miss + * + */ +static int test_table_lookup(void) +{ + odph_table_t table, result; + + /* Create cuckoo hash table. */ + table = odph_cuckoo_table_create("table_lookup", 10, 4, 0); + if (table == NULL) { + printf("failed to create table\n"); + return -1; + } + + /* Try to find existing hash table */ + result = odph_cuckoo_table_lookup("table_lookup"); + if (result != table) { + printf("error: could not find existing table\n"); + odph_cuckoo_table_destroy(table); + return -1; + } + + /* Try to find non-existing hash table */ + result = odph_cuckoo_table_lookup("non_existing"); + if (result != NULL) { + printf("error: found table that shouldn't exist.\n"); + odph_cuckoo_table_destroy(table); + return -1; + } + + /* Cleanup. */ + odph_cuckoo_table_destroy(table); + return 0; +} + +/* + * Sequence of operations for 5 keys + * - put keys + * - get keys: hit + * - remove keys : hit + * - get keys: miss + */ +static int test_five_keys(void) +{ + odph_table_t table; + unsigned i; + int ret; + + table = odph_cuckoo_table_create( + "five_keys", 10, sizeof(struct flow_key), 0); + if (table == NULL) { + printf("failed to create table\n"); + return -1; + } + + /* put */ + for (i = 0; i < 5; i++) { + ret = odph_cuckoo_table_put_value(table, &keys[i], NULL); + print_key_info("Add", &keys[i]); + if (ret < 0) { + printf("failed to add key %d\n", i); + odph_cuckoo_table_destroy(table); + return -1; + } + } + + /* get */ + for (i = 0; i < 5; i++) { + ret = odph_cuckoo_table_get_value(table, &keys[i], NULL, 0); + print_key_info("Lkp", &keys[i]); + if (ret < 0) { + printf("failed to find key %d\n", i); + odph_cuckoo_table_destroy(table); + return -1; + } + } + + /* remove */ + for (i = 0; i < 5; i++) { + ret = odph_cuckoo_table_remove_value(table, &keys[i]); + print_key_info("Del", &keys[i]); + if (ret < 0) { + printf("failed to delete key %d\n", i); + odph_cuckoo_table_destroy(table); + return -1; + } + } + + /* get */ + for (i = 0; i < 5; i++) { + ret = odph_cuckoo_table_get_value(table, &keys[i], NULL, 0); + print_key_info("Lkp", &keys[i]); + if (ret >= 0) { + printf("found non-existing key %d\n", i); + odph_cuckoo_table_destroy(table); + return -1; + } + } + + odph_cuckoo_table_destroy(table); + return 0; +} + +#define BUCKET_ENTRIES 4 +#define HASH_ENTRIES_MAX 1048576 +/* + * Do tests for cuchoo tabke creation with bad parameters. + */ +static int test_creation_with_bad_parameters(void) +{ + odph_table_t table; + + table = odph_cuckoo_table_create( + "bad_param_0", HASH_ENTRIES_MAX + 1, 4, 0); + if (table != NULL) { + odph_cuckoo_table_destroy(table); + printf("Impossible creating table successfully with entries in parameter exceeded\n"); + return -1; + } + + table = odph_cuckoo_table_create( + "bad_param_1", BUCKET_ENTRIES - 1, 4, 0); + if (table != NULL) { + odph_cuckoo_table_destroy(table); + printf("Impossible creating hash successfully if entries less than bucket_entries in parameter\n"); + return -1; + } + + table = odph_cuckoo_table_create("bad_param_2", 10, 0, 0); + if (table != NULL) { + odph_cuckoo_table_destroy(table); + printf("Impossible creating hash successfully if key_len in parameter is zero\n"); + return -1; + } + + printf("# Test successful. No more errors expected\n"); + + return 0; +} + +#define PERFORMANCE_CAPACITY 1000000 + +/* + * Test the performance of cuckoo hash table. + * table capacity : 1,000,000 + * key size : 4 bytes + * value size : 0 + * Insert at most number random keys into the table. If one + * insertion is failed, the rest insertions will be cancelled. + * The table utilization of the report will show actual number + * of items inserted. + * Then search all inserted items. + */ +static int test_performance(int number) +{ + odph_table_t table; + + /* generate random keys */ + uint8_t *key_space = NULL; + const void **key_ptr = NULL; + unsigned key_len = 4, j; + unsigned elem_num = (number > PERFORMANCE_CAPACITY) ? + PERFORMANCE_CAPACITY : number; + unsigned key_num = key_len * elem_num; + + key_space = (uint8_t *)malloc(key_num); + key_ptr = (const void **)malloc(sizeof(void *) * elem_num); + if (key_space == NULL) + return -ENOENT; + + for (j = 0; j < key_num; j++) { + key_space[j] = rand() % 255; + if (j % key_len == 0) + key_ptr[j / key_len] = &key_space[j]; + } + + unsigned num; + int ret = 0; + struct timeval start, end; + double add_time = 0; + + fflush(stdout); + table = odph_cuckoo_table_create( + "performance_test", PERFORMANCE_CAPACITY, key_len, 0); + if (table == NULL) { + printf("cuckoo table creation failed\n"); + return -ENOENT; + } + + /* insert (put) */ + gettimeofday(&start, 0); + for (j = 0; j < elem_num; j++) { + ret = odph_cuckoo_table_put_value( + table, &key_space[j * key_len], NULL); + if (ret < 0) + break; + } + gettimeofday(&end, 0); + num = j; + add_time = get_time_diff(&start, &end); + printf( + "add %u/%u (%.2f) items, time = %.9lfs\n", + num, PERFORMANCE_CAPACITY, + (double)num / PERFORMANCE_CAPACITY, add_time); + + /* search (get) */ + gettimeofday(&start, 0); + for (j = 0; j < num; j++) { + ret = odph_cuckoo_table_get_value( + table, &key_space[j * key_len], NULL, 0); + + if (ret < 0) + printf("lookup error\n"); + } + gettimeofday(&end, 0); + printf( + "lookup %u items, time = %.9lfs\n", + num, get_time_diff(&start, &end)); + + odph_cuckoo_table_destroy(table); + free(key_ptr); + free(key_space); + return ret; +} + +/* + * Do all unit and performance tests. + */ +static int +test_cuckoo_hash_table(void) +{ + if (test_put_remove() < 0) + return -1; + if (test_table_lookup() < 0) + return -1; + if (test_put_update_remove() < 0) + return -1; + if (test_five_keys() < 0) + return -1; + if (test_creation_with_bad_parameters() < 0) + return -1; + if (test_performance(950000) < 0) + return -1; + + return 0; +} + +int main(int argc TEST_UNUSED, char *argv[] TEST_UNUSED) +{ + odp_instance_t instance; + int ret = 0; + + ret = odp_init_global(&instance, NULL, NULL); + if (ret != 0) { + fprintf(stderr, "Error: ODP global init failed.\n"); + exit(EXIT_FAILURE); + } + + ret = odp_init_local(instance, ODP_THREAD_WORKER); + if (ret != 0) { + fprintf(stderr, "Error: ODP local init failed.\n"); + exit(EXIT_FAILURE); + } + + srand(time(0)); + ret = test_cuckoo_hash_table(); + + if (ret < 0) + printf("cuckoo hash table test fail!!\n"); + else + printf("All Tests pass!!\n"); + + if (odp_term_local()) { + fprintf(stderr, "Error: ODP local term failed.\n"); + exit(EXIT_FAILURE); + } + + if (odp_term_global(instance)) { + fprintf(stderr, "Error: ODP global term failed.\n"); + exit(EXIT_FAILURE); + } + + return ret; +} commit d1e693d7177d10f382d69b659ab359fddee783b5 Author: Ru Jia <jiaru(a)ict.ac.cn> Date: Mon Jun 13 14:42:13 2016 +0800 helper: table: add impl of cuckoo hash table Signed-off-by: Ru Jia <jiaru(a)ict.ac.cn> Reviewed-and-tested-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/helper/Makefile.am b/helper/Makefile.am index aa58e8c..116a1f0 100644 --- a/helper/Makefile.am +++ b/helper/Makefile.am @@ -27,6 +27,7 @@ noinst_HEADERS = \ $(srcdir)/odph_debug.h \ $(srcdir)/odph_hashtable.h \ $(srcdir)/odph_lineartable.h \ + $(srcdir)/odph_cuckootable.h \ $(srcdir)/odph_list_internal.h __LIB__libodphelper_linux_la_SOURCES = \ @@ -35,6 +36,7 @@ __LIB__libodphelper_linux_la_SOURCES = \ chksum.c \ linux.c \ hashtable.c \ - lineartable.c + lineartable.c \ + cuckootable.c lib_LTLIBRARIES = $(LIB)/libodphelper-linux.la diff --git a/helper/cuckootable.c b/helper/cuckootable.c new file mode 100644 index 0000000..91a73b4 --- /dev/null +++ b/helper/cuckootable.c @@ -0,0 +1,743 @@ +/* Copyright (c) 2016, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +/*- + * BSD LICENSE + * + * Copyright(c) 2010-2016 Intel Corporation. All rights reserved. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * * Neither the name of Intel Corporation nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include <string.h> +#include <stdint.h> +#include <errno.h> +#include <stdio.h> + +#include "odph_cuckootable.h" +#include "odph_debug.h" +#include <odp_api.h> + +/* More efficient access to a map of single ullong */ +#define ULLONG_FOR_EACH_1(IDX, MAP) \ + for (; MAP && (((IDX) = __builtin_ctzll(MAP)), true); \ + MAP = (MAP & (MAP - 1))) + +/** @magic word, write to the first byte of the memory block + * to indicate this block is used by a cuckoo hash table + */ +#define ODPH_CUCKOO_TABLE_MAGIC_WORD 0xDFDFFDFD + +/** Number of items per bucket. */ +#define HASH_BUCKET_ENTRIES 4 + +#define NULL_SIGNATURE 0 +#define KEY_ALIGNMENT 16 + +/** Maximum size of hash table that can be created. */ +#define HASH_ENTRIES_MAX 1048576 + +/** @internal signature struct + * Structure storing both primary and secondary hashes + */ +struct cuckoo_table_signatures { + union { + struct { + uint32_t current; + uint32_t alt; + }; + uint64_t sig; + }; +}; + +/** @internal kay-value struct + * Structure that stores key-value pair + */ +struct cuckoo_table_key_value { + uint8_t *key; + uint8_t *value; +}; + +/** @internal bucket structure + * Put the elements with defferent keys but a same signature + * into a bucket, and each bucket has at most HASH_BUCKET_ENTRIES + * elements. + */ +struct cuckoo_table_bucket { + struct cuckoo_table_signatures signatures[HASH_BUCKET_ENTRIES]; + /* Includes dummy key index that always contains index 0 */ + odp_buffer_t key_buf[HASH_BUCKET_ENTRIES + 1]; + uint8_t flag[HASH_BUCKET_ENTRIES]; +} ODP_ALIGNED_CACHE; + +/* More efficient access to a map of single ullong */ +#define ULLONG_FOR_EACH_1(IDX, MAP) \ + for (; MAP && (((IDX) = __builtin_ctzll(MAP)), true); \ + MAP = (MAP & (MAP - 1))) + +/** A hash table structure. */ +typedef struct { + /**< for check */ + uint32_t magicword; + /**< Name of the hash. */ + char name[ODPH_TABLE_NAME_LEN]; + /**< Total table entries. */ + uint32_t entries; + /**< Number of buckets in table. */ + uint32_t num_buckets; + /**< Length of hash key. */ + uint32_t key_len; + /**< Length of value. */ + uint32_t value_len; + /**< Bitmask for getting bucket index from hash signature. */ + uint32_t bucket_bitmask; + /**< Queue that stores all free key-value slots*/ + odp_queue_t free_slots; + /** Table with buckets storing all the hash values and key indexes + to the key table*/ + struct cuckoo_table_bucket *buckets; +} odph_cuckoo_table_impl ODP_ALIGNED_CACHE; + +/** + * Aligns input parameter to the next power of 2 + * + * @param x + * The integer value to algin + * + * @return + * Input parameter aligned to the next power of 2 + */ +static inline uint32_t +align32pow2(uint32_t x) +{ + x--; + x |= x >> 1; + x |= x >> 2; + x |= x >> 4; + x |= x >> 8; + x |= x >> 16; + + return x + 1; +} + +/** + * Returns true if n is a power of 2 + * @param n + * Number to check + * @return 1 if true, 0 otherwise + */ +static inline int +is_power_of_2(uint32_t n) +{ + return n && !(n & (n - 1)); +} + +odph_table_t +odph_cuckoo_table_lookup(const char *name) +{ + odph_cuckoo_table_impl *tbl = NULL; + + if (name == NULL || strlen(name) >= ODPH_TABLE_NAME_LEN) + return NULL; + + tbl = (odph_cuckoo_table_impl *)odp_shm_addr(odp_shm_lookup(name)); + + if ( + tbl != NULL && + tbl->magicword == ODPH_CUCKOO_TABLE_MAGIC_WORD && + strcmp(tbl->name, name) == 0) + return (odph_table_t)tbl; +} + +odph_table_t +odph_cuckoo_table_create( + const char *name, uint32_t capacity, uint32_t key_size, + uint32_t value_size) +{ + odph_cuckoo_table_impl *tbl; + odp_shm_t shm_tbl; + + odp_pool_t pool; + odp_pool_param_t param; + + odp_queue_t queue; + odp_queue_param_t qparam; + + char pool_name[ODPH_TABLE_NAME_LEN + 3], + queue_name[ODPH_TABLE_NAME_LEN + 3]; + unsigned i; + uint32_t impl_size, kv_entry_size, + bucket_num, bucket_size; + + /* Check for valid parameters */ + if ( + (capacity > HASH_ENTRIES_MAX) || + (capacity < HASH_BUCKET_ENTRIES) || + (key_size == 0) || + (strlen(name) == 0)) { + ODPH_DBG("invalid parameters\n"); + return NULL; + } + + /* Guarantee there's no existing */ + tbl = (odph_cuckoo_table_impl *)odph_cuckoo_table_lookup(name); + if (tbl != NULL) { + ODPH_DBG("cuckoo hash table %s already exists\n", name); + return NULL; + } + + /* Calculate the sizes of different parts of cuckoo hash table */ + impl_size = sizeof(odph_cuckoo_table_impl); + kv_entry_size = sizeof(struct cuckoo_table_key_value) + + key_size + value_size; + + bucket_num = align32pow2(capacity) / HASH_BUCKET_ENTRIES; + bucket_size = bucket_num * sizeof(struct cuckoo_table_bucket); + + shm_tbl = odp_shm_reserve( + name, impl_size + bucket_size, + ODP_CACHE_LINE_SIZE, ODP_SHM_SW_ONLY); + + if (shm_tbl == ODP_SHM_INVALID) { + ODPH_DBG( + "shm allocation failed for odph_cuckoo_table_impl %s\n", + name); + return NULL; + } + + tbl = (odph_cuckoo_table_impl *)odp_shm_addr(shm_tbl); + memset(tbl, 0, impl_size + bucket_size); + + /* header of this mem block is the table impl struct, + * then the bucket pool. + */ + tbl->buckets = (struct cuckoo_table_bucket *)( + (char *)tbl + impl_size); + + /* initialize key-value buffer pool */ + snprintf(pool_name, sizeof(pool_name), "kv_%s", name); + pool = odp_pool_lookup(pool_name); + + if (pool != ODP_POOL_INVALID) + odp_pool_destroy(pool); + + param.type = ODP_POOL_BUFFER; + param.buf.size = kv_entry_size; + param.buf.align = ODP_CACHE_LINE_SIZE; + param.buf.num = capacity; + + pool = odp_pool_create(pool_name, &param); + + if (pool == ODP_POOL_INVALID) { + ODPH_DBG("failed to create key-value pool\n"); + odp_shm_free(shm_tbl); + return NULL; + } + + /* initialize free_slots queue */ + odp_queue_param_init(&qparam); + qparam.type = ODP_QUEUE_TYPE_PLAIN; + + snprintf(queue_name, sizeof(queue_name), "fs_%s", name); + queue = odp_queue_create(queue_name, &qparam); + if (queue == ODP_QUEUE_INVALID) { + ODPH_DBG("failed to create free_slots queue\n"); + odp_pool_destroy(pool); + odp_shm_free(shm_tbl); + return NULL; + } + + /* Setup hash context */ + snprintf(tbl->name, sizeof(tbl->name), "%s", name); + tbl->magicword = ODPH_CUCKOO_TABLE_MAGIC_WORD; + tbl->entries = capacity; + tbl->key_len = key_size; + tbl->value_len = value_size; + tbl->num_buckets = bucket_num; + tbl->bucket_bitmask = bucket_num - 1; + tbl->free_slots = queue; + + /* generate all free buffers, and put into queue */ + for (i = 0; i < capacity; i++) { + odp_event_t ev = odp_buffer_to_event( + odp_buffer_alloc(pool)); + if (ev == ODP_EVENT_INVALID) { + ODPH_DBG("failed to generate free slots\n"); + odph_cuckoo_table_destroy((odph_table_t)tbl); + return NULL; + } + + if (odp_queue_enq(queue, ev) < 0) { + ODPH_DBG("failed to enqueue free slots\n"); + odph_cuckoo_table_destroy((odph_table_t)tbl); + return NULL; + } + } + + return (odph_table_t)tbl; +} + +int +odph_cuckoo_table_destroy(odph_table_t tbl) +{ + int ret, i, j; + odph_cuckoo_table_impl *impl = NULL; + char pool_name[ODPH_TABLE_NAME_LEN + 3]; + + if (tbl == NULL) + return -1; + + impl = (odph_cuckoo_table_impl *)tbl; + + /* check magic word */ + if (impl->magicword != ODPH_CUCKOO_TABLE_MAGIC_WORD) { + ODPH_DBG("wrong magicword for cuckoo table\n"); + return -1; + } + + /* free all used buffers*/ + for (i = 0; i < impl->num_buckets; i++) { + for (j = 0; j < HASH_BUCKET_ENTRIES; j++) { + if (impl->buckets[i].signatures[j].current + != NULL_SIGNATURE) + odp_buffer_free(impl->buckets[i].key_buf[j]); + } + } + + /* free all free buffers */ + odp_event_t ev; + + while ((ev = odp_queue_deq(impl->free_slots)) + != ODP_EVENT_INVALID) { + odp_buffer_free(odp_buffer_from_event(ev)); + } + + /* destroy free_slots queue */ + ret = odp_queue_destroy(impl->free_slots); + if (ret < 0) + ODPH_DBG("failed to destroy free_slots queue\n"); + + /* destroy key-value pool */ + snprintf(pool_name, sizeof(pool_name), "kv_%s", impl->name); + ret = odp_pool_destroy(odp_pool_lookup(pool_name)); + if (ret != 0) { + ODPH_DBG("failed to destroy key-value buffer pool\n"); + return ret; + } + + /* free impl */ + odp_shm_free(odp_shm_lookup(impl->name)); +} + +static uint32_t hash(const odph_cuckoo_table_impl *h, const void *key) +{ + /* calc hash result by key */ + return odp_hash_crc32c(key, h->key_len, 0); +} + +/* Calc the secondary hash value from the primary hash value of a given key */ +static inline uint32_t +hash_secondary(const uint32_t primary_hash) +{ + static const unsigned all_bits_shift = 12; + static const unsigned alt_bits_xor = 0x5bd1e995; + + uint32_t tag = primary_hash >> all_bits_shift; + + return (primary_hash ^ ((tag + 1) * alt_bits_xor)); +} + +/* Search for an entry that can be pushed to its alternative location */ +static inline int +make_space_bucket( + const odph_cuckoo_table_impl *impl, + struct cuckoo_table_bucket *bkt) +{ + unsigned i, j; + int ret; + uint32_t next_bucket_idx; + struct cuckoo_table_bucket *next_bkt[HASH_BUCKET_ENTRIES]; + + /* + * Push existing item (search for bucket with space in + * alternative locations) to its alternative location + */ + for (i = 0; i < HASH_BUCKET_ENTRIES; i++) { + /* Search for space in alternative locations */ + next_bucket_idx = bkt->signatures[i].alt & impl->bucket_bitmask; + next_bkt[i] = &impl->buckets[next_bucket_idx]; + for (j = 0; j < HASH_BUCKET_ENTRIES; j++) { + if (next_bkt[i]->signatures[j].sig == NULL_SIGNATURE) + break; + } + + if (j != HASH_BUCKET_ENTRIES) + break; + } + + /* Alternative location has spare room (end of recursive function) */ + if (i != HASH_BUCKET_ENTRIES) { + next_bkt[i]->signatures[j].alt = bkt->signatures[i].current; + next_bkt[i]->signatures[j].current = bkt->signatures[i].alt; + next_bkt[i]->key_buf[j] = bkt->key_buf[i]; + return i; + } + + /* Pick entry that has not been pushed yet */ + for (i = 0; i < HASH_BUCKET_ENTRIES; i++) + if (bkt->flag[i] == 0) + break; + + /* All entries have been pushed, so entry cannot be added */ + if (i == HASH_BUCKET_ENTRIES) + return -ENOSPC; + + /* Set flag to indicate that this entry is going to be pushed */ + bkt->flag[i] = 1; + /* Need room in alternative bucket to insert the pushed entry */ + ret = make_space_bucket(impl, next_bkt[i]); + /* + * After recursive function. + * Clear flags and insert the pushed entry + * in its alternative location if successful, + * or return error + */ + bkt->flag[i] = 0; + if (ret >= 0) { + next_bkt[i]->signatures[ret].alt = bkt->signatures[i].current; + next_bkt[i]->signatures[ret].current = bkt->signatures[i].alt; + next_bkt[i]->key_buf[ret] = bkt->key_buf[i]; + return i; + } + + return ret; +} + +static inline int32_t +cuckoo_table_add_key_with_hash( + const odph_cuckoo_table_impl *h, const void *key, + uint32_t sig, void *data) +{ + uint32_t alt_hash; + uint32_t prim_bucket_idx, sec_bucket_idx; + unsigned i; + struct cuckoo_table_bucket *prim_bkt, *sec_bkt; + struct cuckoo_table_key_value *new_kv, *kv; + + odp_buffer_t new_buf; + int ret; + + prim_bucket_idx = sig & h->bucket_bitmask; + prim_bkt = &h->buckets[prim_bucket_idx]; + __builtin_prefetch((const void *)(uintptr_t)prim_bkt, 0, 3); + + alt_hash = hash_secondary(sig); + sec_bucket_idx = alt_hash & h->bucket_bitmask; + sec_bkt = &h->buckets[sec_bucket_idx]; + __builtin_prefetch((const void *)(uintptr_t)sec_bkt, 0, 3); + + /* Get a new slot for storing the new key */ + new_buf = odp_buffer_from_event(odp_queue_deq(h->free_slots)); + if (new_buf == ODP_BUFFER_INVALID) + return -ENOSPC; + + /* Check if key is already inserted in primary location */ + for (i = 0; i < HASH_BUCKET_ENTRIES; i++) { + if ( + prim_bkt->signatures[i].current == sig && + prim_bkt->signatures[i].alt == alt_hash) { + kv = (struct cuckoo_table_key_value *)odp_buffer_addr( + prim_bkt->key_buf[i]); + if (memcmp(key, kv->key, h->key_len) == 0) { + odp_queue_enq( + h->free_slots, + odp_buffer_to_event(new_buf)); + /* Update data */ + if (kv->value != NULL) + memcpy(kv->value, data, h->value_len); + + /* Return bucket index */ + return prim_bucket_idx; + } + } + } + + /* Check if key is already inserted in secondary location */ + for (i = 0; i < HASH_BUCKET_ENTRIES; i++) { + if ( + sec_bkt->signatures[i].alt == sig && + sec_bkt->signatures[i].current == alt_hash) { + kv = (struct cuckoo_table_key_value *)odp_buffer_addr( + sec_bkt->key_buf[i]); + if (memcmp(key, kv->key, h->key_len) == 0) { + odp_queue_enq( + h->free_slots, + odp_buffer_to_event(new_buf)); + /* Update data */ + if (kv->value != NULL) + memcpy(kv->value, data, h->value_len); + + /* Return bucket index */ + return sec_bucket_idx; + } + } + } + + new_kv = (struct cuckoo_table_key_value *)odp_buffer_addr(new_buf); + __builtin_prefetch((const void *)(uintptr_t)new_kv, 0, 3); + + /* Copy key and value. + * key-value mem block : struct cuckoo_table_key_value + * + key (key_len) + value (value_len) + */ + new_kv->key = (uint8_t *)new_kv + + sizeof(struct cuckoo_table_key_value); + memcpy(new_kv->key, key, h->key_len); + + if (h->value_len > 0) { + new_kv->value = new_kv->key + h->key_len; + memcpy(new_kv->value, data, h->value_len); + } else { + new_kv->value = NULL; + } + + /* Insert new entry is there is room in the primary bucket */ + for (i = 0; i < HASH_BUCKET_ENTRIES; i++) { + /* Check if slot is available */ + if (odp_likely(prim_bkt->signatures[i].sig == NULL_SIGNATURE)) { + prim_bkt->signatures[i].current = sig; + prim_bkt->signatures[i].alt = alt_hash; + prim_bkt->key_buf[i] = new_buf; + return prim_bucket_idx; + } + } + + /* Primary bucket is full, so we need to make space for new entry */ + ret = make_space_bucket(h, prim_bkt); + + /* + * After recursive function. + * Insert the new entry in the position of the pushed entry + * if successful or return error and + * store the new slot back in the pool + */ + if (ret >= 0) { + prim_bkt->signatures[ret].current = sig; + prim_bkt->signatures[ret].alt = alt_hash; + prim_bkt->key_buf[ret] = new_buf; + return prim_bucket_idx; + } + + /* Error in addition, store new slot back in the free_slots */ + odp_queue_enq(h->free_slots, odp_buffer_to_event(new_buf)); + return ret; +} + +int +odph_cuckoo_table_put_value(odph_table_t tbl, void *key, void *value) +{ + if ((tbl == NULL) || (key == NULL)) + return -EINVAL; + + odph_cuckoo_table_impl *impl = (odph_cuckoo_table_impl *)tbl; + int ret = cuckoo_table_add_key_with_hash( + impl, key, hash(impl, key), value); + + if (ret < 0) + return -1; + + return 0; +} + +static inline int32_t +cuckoo_table_lookup_with_hash( + const odph_cuckoo_table_impl *h, const void *key, + uint32_t sig, void **data_ptr) +{ + uint32_t bucket_idx; + uint32_t alt_hash; + unsigned i; + struct cuckoo_table_bucket *bkt; + struct cuckoo_table_key_value *kv; + + bucket_idx = sig & h->bucket_bitmask; + bkt = &h->buckets[bucket_idx]; + + /* Check if key is in primary location */ + for (i = 0; i < HASH_BUCKET_ENTRIES; i++) { + if ( + bkt->signatures[i].current == sig && + bkt->signatures[i].sig != NULL_SIGNATURE) { + kv = (struct cuckoo_table_key_value *)odp_buffer_addr( + bkt->key_buf[i]); + if (memcmp(key, kv->key, h->key_len) == 0) { + if (data_ptr != NULL) + *data_ptr = kv->value; + /* + * Return index where key is stored, + * subtracting the first dummy index + */ + return bucket_idx; + } + } + } + + /* Calculate secondary hash */ + alt_hash = hash_secondary(sig); + bucket_idx = alt_hash & h->bucket_bitmask; + bkt = &h->buckets[bucket_idx]; + + /* Check if key is in secondary location */ + for (i = 0; i < HASH_BUCKET_ENTRIES; i++) { + if ( + bkt->signatures[i].current == alt_hash && + bkt->signatures[i].alt == sig) { + kv = (struct cuckoo_table_key_value *)odp_buffer_addr( + bkt->key_buf[i]); + if (memcmp(key, kv->key, h->key_len) == 0) { + if (data_ptr != NULL) + *data_ptr = kv->value; + /* + * Return index where key is stored, + * subtracting the first dummy index + */ + return bucket_idx; + } + } + } + + return -ENOENT; +} + +int +odph_cuckoo_table_get_value( + odph_table_t tbl, void *key, void *buffer, uint32_t buffer_size) +{ + if ((tbl == NULL) || (key == NULL)) + return -EINVAL; + + odph_cuckoo_table_impl *impl = (odph_cuckoo_table_impl *)tbl; + void *tmp = NULL; + int ret; + + ret = cuckoo_table_lookup_with_hash(impl, key, hash(impl, key), &tmp); + + if (ret < 0) + return -1; + + if (impl->value_len > 0) + memcpy(buffer, tmp, impl->value_len); + + return 0; +} + +static inline int32_t +cuckoo_table_del_key_with_hash( + const odph_cuckoo_table_impl *h, + const void *key, uint32_t sig) +{ + uint32_t bucket_idx; + uint32_t alt_hash; + unsigned i; + struct cuckoo_table_bucket *bkt; + struct cuckoo_table_key_value *kv; + + bucket_idx = sig & h->bucket_bitmask; + bkt = &h->buckets[bucket_idx]; + + /* Check if key is in primary location */ + for (i = 0; i < HASH_BUCKET_ENTRIES; i++) { + if ( + bkt->signatures[i].current == sig && + bkt->signatures[i].sig != NULL_SIGNATURE) { + kv = (struct cuckoo_table_key_value *)odp_buffer_addr( + bkt->key_buf[i]); + if (memcmp(key, kv->key, h->key_len) == 0) { + bkt->signatures[i].sig = NULL_SIGNATURE; + odp_queue_enq( + h->free_slots, + odp_buffer_to_event( + bkt->key_buf[i])); + return bucket_idx; + } + } + } + + /* Calculate secondary hash */ + alt_hash = hash_secondary(sig); + bucket_idx = alt_hash & h->bucket_bitmask; + bkt = &h->buckets[bucket_idx]; + + /* Check if key is in secondary location */ + for (i = 0; i < HASH_BUCKET_ENTRIES; i++) { + if ( + bkt->signatures[i].current == alt_hash && + bkt->signatures[i].sig != NULL_SIGNATURE) { + kv = (struct cuckoo_table_key_value *)odp_buffer_addr( + bkt->key_buf[i]); + if (memcmp(key, kv->key, h->key_len) == 0) { + bkt->signatures[i].sig = NULL_SIGNATURE; + odp_queue_enq( + h->free_slots, + odp_buffer_to_event( + bkt->key_buf[i])); + return bucket_idx; + } + } + } + + return -ENOENT; +} + +int +odph_cuckoo_table_remove_value(odph_table_t tbl, void *key) +{ + if ((tbl == NULL) || (key == NULL)) + return -EINVAL; + + odph_cuckoo_table_impl *impl = (odph_cuckoo_table_impl *)tbl; + int ret = cuckoo_table_del_key_with_hash( + impl, key, hash(impl, key)); + + if (ret < 0) + return -1; + + return 0; +} + +odph_table_ops_t odph_cuckoo_table_ops = { + odph_cuckoo_table_create, + odph_cuckoo_table_lookup, + odph_cuckoo_table_destroy, + odph_cuckoo_table_put_value, + odph_cuckoo_table_get_value, + odph_cuckoo_table_remove_value +}; diff --git a/helper/odph_cuckootable.h b/helper/odph_cuckootable.h new file mode 100644 index 0000000..d569980 --- /dev/null +++ b/helper/odph_cuckootable.h @@ -0,0 +1,82 @@ +/* Copyright (c) 2016, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +/*- + * BSD LICENSE + * + * Copyright(c) 2010-2016 Intel Corporation. All rights reserved. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * * Neither the name of Intel Corporation nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef ODPH_CUCKOO_TABLE_H_ +#define ODPH_CUCKOO_TABLE_H_ + +#include <odp/helper/table.h> + +/** + * @file + * + * ODP Cuckoo Hash Table + */ + +#ifdef __cplusplus +extern "C" { +#endif + +odph_table_t odph_cuckoo_table_create( + const char *name, + uint32_t capacity, + uint32_t key_size, + uint32_t value_size); + +odph_table_t odph_cuckoo_table_lookup(const char *name); + +int odph_cuckoo_table_destroy(odph_table_t table); + +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); + +int odph_cuckoo_table_remove_value(odph_table_t table, void *key); + +extern odph_table_ops_t odph_cuckoo_table_ops; + +#ifdef __cplusplus +} +#endif + +#endif /* ODPH_CUCKOO_TABLE_H_ */ ----------------------------------------------------------------------- Summary of changes: helper/Makefile.am | 4 +- helper/cuckootable.c | 743 ++++++++++++++++++++++++++++++++++++++++++++++ helper/odph_cuckootable.h | 82 +++++ helper/test/.gitignore | 1 + helper/test/Makefile.am | 6 +- helper/test/cuckootable.c | 573 +++++++++++++++++++++++++++++++++++ 6 files changed, 1406 insertions(+), 3 deletions(-) create mode 100644 helper/cuckootable.c create mode 100644 helper/odph_cuckootable.h create mode 100644 helper/test/cuckootable.c hooks/post-receive --

8 years, 7 months

[COMMIT] branch master updated. v1.10.1.0-34-g15f3c17

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 15f3c174f5a104e9749ed83797acb00660d675ad (commit) via f9baafc4a5644973410ef6c5a1d233671bec1d17 (commit) from 1b1da0fe917cb916232fd9aad615b68941b8f490 (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 15f3c174f5a104e9749ed83797acb00660d675ad Author: Bill Fischofer <bill.fischofer(a)linaro.org> Date: Thu Jun 9 07:12:41 2016 -0500 validation: packet: ensure user area is copied correctly As part of resolution of Bug https://bugs.linaro.org/show_bug.cgi?id=2310 make sure that odp_packet_copy() handles user area copies correctly. The copy should fail if the target pool's user area size is not large enough to contain the source user area. Signed-off-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Zoltan Kiss <zoltan.kiss(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/packet/packet.c b/test/validation/packet/packet.c index 6770339..a4426e2 100644 --- a/test/validation/packet/packet.c +++ b/test/validation/packet/packet.c @@ -14,7 +14,7 @@ /* Reserve some tailroom for tests */ #define PACKET_TAILROOM_RESERVE 4 -static odp_pool_t packet_pool; +static odp_pool_t packet_pool, packet_pool_no_uarea, packet_pool_double_uarea; static uint32_t packet_len; static uint32_t segmented_packet_len; @@ -65,6 +65,24 @@ int packet_suite_init(void) if (packet_pool == ODP_POOL_INVALID) 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); + return -1; + } + + params.pkt.uarea_size = 2 * sizeof(struct udata_struct); + packet_pool_double_uarea = odp_pool_create("packet_pool_double_uarea", + &params); + + if (packet_pool_double_uarea == ODP_POOL_INVALID) { + odp_pool_destroy(packet_pool_no_uarea); + odp_pool_destroy(packet_pool); + return -1; + } + test_packet = odp_packet_alloc(packet_pool, packet_len); for (i = 0; i < packet_len; i++) { @@ -113,8 +131,12 @@ int packet_suite_term(void) { odp_packet_free(test_packet); odp_packet_free(segmented_test_packet); - if (odp_pool_destroy(packet_pool) != 0) + + if (odp_pool_destroy(packet_pool_double_uarea) != 0 || + odp_pool_destroy(packet_pool_no_uarea) != 0 || + odp_pool_destroy(packet_pool) != 0) return -1; + return 0; } @@ -863,32 +885,41 @@ free_packet: odp_packet_free(pkt); } -#define COMPARE_INFLAG(p1, p2, flag) \ +#define COMPARE_HAS_INFLAG(p1, p2, flag) \ CU_ASSERT(odp_packet_has_##flag(p1) == odp_packet_has_##flag(p2)) +#define COMPARE_INFLAG(p1, p2, flag) \ + CU_ASSERT(odp_packet_##flag(p1) == odp_packet_##flag(p2)) + static void _packet_compare_inflags(odp_packet_t pkt1, odp_packet_t pkt2) { - COMPARE_INFLAG(pkt1, pkt2, l2); - COMPARE_INFLAG(pkt1, pkt2, l3); - COMPARE_INFLAG(pkt1, pkt2, l4); - COMPARE_INFLAG(pkt1, pkt2, eth); - COMPARE_INFLAG(pkt1, pkt2, eth_bcast); - COMPARE_INFLAG(pkt1, pkt2, eth_mcast); - COMPARE_INFLAG(pkt1, pkt2, jumbo); - COMPARE_INFLAG(pkt1, pkt2, vlan); - COMPARE_INFLAG(pkt1, pkt2, vlan_qinq); - COMPARE_INFLAG(pkt1, pkt2, arp); - COMPARE_INFLAG(pkt1, pkt2, ipv4); - COMPARE_INFLAG(pkt1, pkt2, ipv6); - COMPARE_INFLAG(pkt1, pkt2, ip_bcast); - COMPARE_INFLAG(pkt1, pkt2, ip_mcast); - COMPARE_INFLAG(pkt1, pkt2, ipfrag); - COMPARE_INFLAG(pkt1, pkt2, ipopt); - COMPARE_INFLAG(pkt1, pkt2, ipsec); - COMPARE_INFLAG(pkt1, pkt2, udp); - COMPARE_INFLAG(pkt1, pkt2, tcp); - COMPARE_INFLAG(pkt1, pkt2, sctp); - COMPARE_INFLAG(pkt1, pkt2, icmp); + COMPARE_HAS_INFLAG(pkt1, pkt2, l2); + COMPARE_HAS_INFLAG(pkt1, pkt2, l3); + COMPARE_HAS_INFLAG(pkt1, pkt2, l4); + COMPARE_HAS_INFLAG(pkt1, pkt2, eth); + COMPARE_HAS_INFLAG(pkt1, pkt2, eth_bcast); + COMPARE_HAS_INFLAG(pkt1, pkt2, eth_mcast); + COMPARE_HAS_INFLAG(pkt1, pkt2, jumbo); + COMPARE_HAS_INFLAG(pkt1, pkt2, vlan); + COMPARE_HAS_INFLAG(pkt1, pkt2, vlan_qinq); + COMPARE_HAS_INFLAG(pkt1, pkt2, arp); + COMPARE_HAS_INFLAG(pkt1, pkt2, ipv4); + COMPARE_HAS_INFLAG(pkt1, pkt2, ipv6); + COMPARE_HAS_INFLAG(pkt1, pkt2, ip_bcast); + COMPARE_HAS_INFLAG(pkt1, pkt2, ip_mcast); + COMPARE_HAS_INFLAG(pkt1, pkt2, ipfrag); + COMPARE_HAS_INFLAG(pkt1, pkt2, ipopt); + COMPARE_HAS_INFLAG(pkt1, pkt2, ipsec); + COMPARE_HAS_INFLAG(pkt1, pkt2, udp); + COMPARE_HAS_INFLAG(pkt1, pkt2, tcp); + COMPARE_HAS_INFLAG(pkt1, pkt2, sctp); + COMPARE_HAS_INFLAG(pkt1, pkt2, icmp); + COMPARE_HAS_INFLAG(pkt1, pkt2, flow_hash); + COMPARE_HAS_INFLAG(pkt1, pkt2, ts); + + COMPARE_INFLAG(pkt1, pkt2, color); + COMPARE_INFLAG(pkt1, pkt2, drop_eligible); + COMPARE_INFLAG(pkt1, pkt2, shaper_len_adjust); } static void _packet_compare_data(odp_packet_t pkt1, odp_packet_t pkt2) @@ -913,6 +944,20 @@ static void _packet_compare_data(odp_packet_t pkt1, odp_packet_t pkt2) } } +static void _packet_compare_udata(odp_packet_t pkt1, odp_packet_t pkt2) +{ + uint32_t usize1 = odp_packet_user_area_size(pkt1); + uint32_t usize2 = odp_packet_user_area_size(pkt2); + + void *uaddr1 = odp_packet_user_area(pkt1); + void *uaddr2 = odp_packet_user_area(pkt2); + + uint32_t cmplen = usize1 <= usize2 ? usize1 : usize2; + + if (cmplen) + CU_ASSERT(!memcmp(uaddr1, uaddr2, cmplen)); +} + static void _packet_compare_offset(odp_packet_t pkt1, uint32_t off1, odp_packet_t pkt2, uint32_t off2, uint32_t len) @@ -948,6 +993,11 @@ void packet_test_copy(void) uint32_t i, plen, seg_len, src_offset, dst_offset; void *pkt_data; + pkt = odp_packet_copy(test_packet, packet_pool_no_uarea); + CU_ASSERT(pkt == ODP_PACKET_INVALID); + if (pkt != ODP_PACKET_INVALID) + odp_packet_free(pkt); + pkt = odp_packet_copy(test_packet, odp_packet_pool(test_packet)); CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID); _packet_compare_data(pkt, test_packet); @@ -962,6 +1012,30 @@ void packet_test_copy(void) _packet_compare_inflags(pkt, pkt_copy); _packet_compare_data(pkt, pkt_copy); + CU_ASSERT(odp_packet_user_area_size(pkt) == + odp_packet_user_area_size(test_packet)); + _packet_compare_udata(pkt, pkt_copy); + odp_packet_free(pkt_copy); + odp_packet_free(pkt); + + pkt = odp_packet_copy(test_packet, packet_pool_double_uarea); + CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID); + _packet_compare_data(pkt, test_packet); + pool = odp_packet_pool(pkt); + CU_ASSERT_FATAL(pool != ODP_POOL_INVALID); + pkt_copy = odp_packet_copy(pkt, pool); + CU_ASSERT_FATAL(pkt_copy != ODP_PACKET_INVALID); + + CU_ASSERT(pkt != pkt_copy); + CU_ASSERT(odp_packet_data(pkt) != odp_packet_data(pkt_copy)); + CU_ASSERT(odp_packet_len(pkt) == odp_packet_len(pkt_copy)); + + _packet_compare_inflags(pkt, pkt_copy); + _packet_compare_data(pkt, pkt_copy); + CU_ASSERT(odp_packet_user_area_size(pkt) == + 2 * odp_packet_user_area_size(test_packet)); + _packet_compare_udata(pkt, pkt_copy); + _packet_compare_udata(pkt, test_packet); odp_packet_free(pkt_copy); /* Now test copy_part */ commit f9baafc4a5644973410ef6c5a1d233671bec1d17 Author: Bill Fischofer <bill.fischofer(a)linaro.org> Date: Thu Jun 9 07:12:40 2016 -0500 linux-generic: packet: copy user area as part of odp_packet_copy() Resolve Bug https://bugs.linaro.org/show_bug.cgi?id=2310 by copying the user area as part of odp_packet_copy(). The copy fails if the user area size of the destination pool is not large enough to hold the source packet user area. Reported-by: Zoltan Kiss <zoltan.kiss(a)linaro.org> Signed-off-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Zoltan Kiss <zoltan.kiss(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/include/odp_packet_internal.h b/platform/linux-generic/include/odp_packet_internal.h index eedb416..4c4e36c 100644 --- a/platform/linux-generic/include/odp_packet_internal.h +++ b/platform/linux-generic/include/odp_packet_internal.h @@ -199,6 +199,9 @@ static inline void copy_packet_cls_metadata(odp_packet_hdr_t *src_hdr, { dst_hdr->p = src_hdr->p; dst_hdr->dst_queue = src_hdr->dst_queue; + dst_hdr->flow_hash = src_hdr->flow_hash; + dst_hdr->timestamp = src_hdr->timestamp; + dst_hdr->op_result = src_hdr->op_result; } static inline void *packet_map(odp_packet_hdr_t *pkt_hdr, @@ -301,7 +304,7 @@ static inline int packet_parse_not_complete(odp_packet_hdr_t *pkt_hdr) } /* Forward declarations */ -void _odp_packet_copy_md_to_packet(odp_packet_t srcpkt, odp_packet_t dstpkt); +int _odp_packet_copy_md_to_packet(odp_packet_t srcpkt, odp_packet_t dstpkt); odp_packet_t packet_alloc(odp_pool_t pool_hdl, uint32_t len, int parse); diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index c319833..9f81073 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -756,22 +756,11 @@ odp_packet_t odp_packet_copy(odp_packet_t pkt, odp_pool_t pool) { odp_packet_hdr_t *srchdr = odp_packet_hdr(pkt); uint32_t pktlen = srchdr->frame_len; - uint32_t meta_offset = ODP_FIELD_SIZEOF(odp_packet_hdr_t, buf_hdr); odp_packet_t newpkt = odp_packet_alloc(pool, pktlen); if (newpkt != ODP_PACKET_INVALID) { - odp_packet_hdr_t *newhdr = odp_packet_hdr(newpkt); - uint8_t *newstart, *srcstart; - - /* Must copy metadata first, followed by packet data */ - newstart = (uint8_t *)newhdr + meta_offset; - srcstart = (uint8_t *)srchdr + meta_offset; - - memcpy(newstart, srcstart, - sizeof(odp_packet_hdr_t) - meta_offset); - - if (odp_packet_copy_from_pkt(newpkt, 0, pkt, 0, - pktlen) != 0) { + if (_odp_packet_copy_md_to_packet(pkt, newpkt) || + odp_packet_copy_from_pkt(newpkt, 0, pkt, 0, pktlen)) { odp_packet_free(newpkt); newpkt = ODP_PACKET_INVALID; } @@ -966,7 +955,7 @@ int odp_packet_is_valid(odp_packet_t pkt) * */ -void _odp_packet_copy_md_to_packet(odp_packet_t srcpkt, odp_packet_t dstpkt) +int _odp_packet_copy_md_to_packet(odp_packet_t srcpkt, odp_packet_t dstpkt) { odp_packet_hdr_t *srchdr = odp_packet_hdr(srcpkt); odp_packet_hdr_t *dsthdr = odp_packet_hdr(dstpkt); @@ -987,6 +976,12 @@ void _odp_packet_copy_md_to_packet(odp_packet_t srcpkt, odp_packet_t dstpkt) odp_atomic_load_u32( &srchdr->buf_hdr.ref_count)); copy_packet_parser_metadata(srchdr, dsthdr); + + /* Metadata copied, but return indication of whether the packet + * user area was truncated in the process. Note this can only + * happen when copying between different pools. + */ + return dsthdr->buf_hdr.uarea_size < srchdr->buf_hdr.uarea_size; } /** ----------------------------------------------------------------------- Summary of changes: .../linux-generic/include/odp_packet_internal.h | 5 +- platform/linux-generic/odp_packet.c | 23 ++-- test/validation/packet/packet.c | 122 +++++++++++++++++---- 3 files changed, 111 insertions(+), 39 deletions(-) hooks/post-receive --

8 years, 7 months

[COMMIT] branch api-next updated. v1.10.1.0-32-g449cd8f

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 449cd8f2c3a694b219fcbb98d7d9948bce583ca1 (commit) from 093fb17ce654532dc1e6c379aa13a3dbab9407d6 (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 449cd8f2c3a694b219fcbb98d7d9948bce583ca1 Author: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Date: Tue Jun 28 17:35:54 2016 +0530 api: traffic_mngr: Add pktio interface to odp_tm_egress_t struct Replaces pktio interface as input to TM system instead of odp_pktout_queue_t.This creates an 1 to 1 mapping between a TM system and pktio interface. Signed-off-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/include/odp/api/spec/traffic_mngr.h b/include/odp/api/spec/traffic_mngr.h index 83b89e7..c9e6f8f 100644 --- a/include/odp/api/spec/traffic_mngr.h +++ b/include/odp/api/spec/traffic_mngr.h @@ -270,6 +270,12 @@ typedef struct { * have their fan_in only from tm_queues. */ uint8_t max_levels; + /** egress_fcn_supported indicates whether the tm system supports + * egress function. It is an optional feature used to receive the + * packet from the tm system and its performance might be limited. + */ + odp_bool_t egress_fcn_supported; + /** tm_queue_shaper_supported indicates that the tm_queues support * proper TM shaping. Note that TM Shaping is NOT the same thing as * Ingress Metering/Policing as specified by RFC 2697 (A Single Rate @@ -467,7 +473,7 @@ typedef struct { odp_tm_egress_kind_t egress_kind; /**< Union discriminator */ union { - odp_pktout_queue_t pktout; + odp_pktio_t pktio; odp_tm_egress_fcn_t egress_fcn; }; } odp_tm_egress_t; diff --git a/platform/linux-generic/include/odp_traffic_mngr_internal.h b/platform/linux-generic/include/odp_traffic_mngr_internal.h index 3586889..3e13a0a 100644 --- a/platform/linux-generic/include/odp_traffic_mngr_internal.h +++ b/platform/linux-generic/include/odp_traffic_mngr_internal.h @@ -379,7 +379,7 @@ typedef struct { tm_queue_info_t priority_info[ODP_TM_MAX_PRIORITIES]; tm_random_data_t tm_random_data; - + odp_pktout_queue_t pktout; uint64_t current_time; uint8_t tm_idx; uint8_t first_enq; diff --git a/platform/linux-generic/odp_traffic_mngr.c b/platform/linux-generic/odp_traffic_mngr.c index 1fa2d27..54c3517 100644 --- a/platform/linux-generic/odp_traffic_mngr.c +++ b/platform/linux-generic/odp_traffic_mngr.c @@ -2106,7 +2106,7 @@ static void tm_send_pkt(tm_system_t *tm_system, uint32_t max_sends) tm_system->egress_pkt_desc = EMPTY_PKT_DESC; if (tm_system->egress.egress_kind == ODP_TM_EGRESS_PKT_IO) - odp_pktout_send(tm_system->egress.pktout, &odp_pkt, 1); + odp_pktout_send(tm_system->pktout, &odp_pkt, 1); else if (tm_system->egress.egress_kind == ODP_TM_EGRESS_FN) tm_system->egress.egress_fcn(odp_pkt); else @@ -2424,6 +2424,7 @@ int odp_tm_capabilities(odp_tm_capabilities_t capabilities[] ODP_UNUSED, cap_ptr->max_tm_queues = ODP_TM_MAX_TM_QUEUES; cap_ptr->max_levels = ODP_TM_MAX_LEVELS; cap_ptr->tm_queue_shaper_supported = true; + cap_ptr->egress_fcn_supported = true; cap_ptr->tm_queue_wred_supported = true; cap_ptr->tm_queue_dual_slope_supported = true; cap_ptr->vlan_marking_supported = true; @@ -2605,6 +2606,7 @@ odp_tm_t odp_tm_create(const char *name, tm_system_t *tm_system; odp_bool_t create_fail; odp_tm_t odp_tm; + odp_pktout_queue_t pktout; uint32_t malloc_len, max_num_queues, max_queued_pkts, max_timers; uint32_t max_tm_queues, max_sorted_lists; int rc; @@ -2625,6 +2627,10 @@ odp_tm_t odp_tm_create(const char *name, return ODP_TM_INVALID; } + if (odp_pktout_queue(egress->pktio, &pktout, 1) != 1) + return ODP_TM_INVALID; + + tm_system->pktout = pktout; tm_system->name_tbl_id = name_tbl_id; max_tm_queues = requirements->max_tm_queues; memcpy(&tm_system->egress, egress, sizeof(odp_tm_egress_t)); diff --git a/test/validation/traffic_mngr/traffic_mngr.c b/test/validation/traffic_mngr/traffic_mngr.c index 0645370..2fcf2fa 100644 --- a/test/validation/traffic_mngr/traffic_mngr.c +++ b/test/validation/traffic_mngr/traffic_mngr.c @@ -323,7 +323,7 @@ static odp_pktio_t pktios[MAX_NUM_IFACES]; static odp_pktin_queue_t pktins[MAX_NUM_IFACES]; static odp_pktout_queue_t pktouts[MAX_NUM_IFACES]; static odp_pktin_queue_t rcv_pktin; -static odp_pktout_queue_t xmt_pktout; +static odp_pktio_t xmt_pktio; static odph_ethaddr_t src_mac; static odph_ethaddr_t dst_mac; @@ -543,7 +543,7 @@ static int open_pktios(void) } if (2 <= num_ifaces) { - xmt_pktout = pktouts[0]; + xmt_pktio = pktios[0]; rcv_pktin = pktins[1]; ret = odp_pktio_start(pktios[1]); if (ret != 0) { @@ -551,7 +551,7 @@ static int open_pktios(void) return -1; } } else { - xmt_pktout = pktouts[0]; + xmt_pktio = pktios[0]; rcv_pktin = pktins[0]; } @@ -1627,7 +1627,7 @@ static int create_tm_system(void) } egress.egress_kind = ODP_TM_EGRESS_PKT_IO; - egress.pktout = xmt_pktout; + egress.pktio = xmt_pktio; snprintf(tm_name, sizeof(tm_name), "TM_system_%u", num_odp_tm_systems); odp_tm = odp_tm_create(tm_name, &requirements, &egress); ----------------------------------------------------------------------- Summary of changes: include/odp/api/spec/traffic_mngr.h | 8 +++++++- platform/linux-generic/include/odp_traffic_mngr_internal.h | 2 +- platform/linux-generic/odp_traffic_mngr.c | 8 +++++++- test/validation/traffic_mngr/traffic_mngr.c | 8 ++++---- 4 files changed, 19 insertions(+), 7 deletions(-) hooks/post-receive --

8 years, 7 months

[COMMIT] branch master updated. v1.10.1.0-32-g1b1da0f

by git＠git-us.linaro.org

8 years, 7 months

[COMMIT] branch master updated. v1.10.1.0-31-ge9545af

by git＠git-us.linaro.org

8 years, 7 months

[COMMIT] branch master updated. v1.10.1.0-30-ge9d434f

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 e9d434fd193e501ef9ca69f530ce4e5f9448594d (commit) via 50078445f1a944309fb88946582a2015fd098f6b (commit) from 8e6e5e999ce3d9edb704e18bedf6bc0ebc6ecf79 (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 e9d434fd193e501ef9ca69f530ce4e5f9448594d Author: Bill Fischofer <bill.fischofer(a)linaro.org> Date: Wed Jun 29 06:59:43 2016 -0500 validation: queue: use malloc to avoid limits on max_queues odp_queue_capability() returns max_queues which may be more than 64K. Use malloc to allocate an array of queue handles to test the ability to create max_queues to avoid limiting the test to 64K queues. If this malloc fails then attempt a reduced test with 64K queues. Signed-off-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/queue/queue.c b/test/validation/queue/queue.c index 96941f4..2c8658e 100644 --- a/test/validation/queue/queue.c +++ b/test/validation/queue/queue.c @@ -55,7 +55,7 @@ void queue_test_capa(void) odp_queue_capability_t capa; odp_queue_param_t qparams; char name[ODP_QUEUE_NAME_LEN]; - odp_queue_t queue[MAX_QUEUES]; + odp_queue_t *queue; uint32_t num_queues, i; memset(&capa, 0, sizeof(odp_queue_capability_t)); @@ -71,10 +71,15 @@ void queue_test_capa(void) name[ODP_QUEUE_NAME_LEN - 1] = 0; - if (capa.max_queues > MAX_QUEUES) + num_queues = capa.max_queues; + queue = malloc(num_queues * sizeof(odp_queue_t)); + if (queue == NULL) { + printf("Unable to alloc %d queues, trying with %d\n", + num_queues, MAX_QUEUES); num_queues = MAX_QUEUES; - else - num_queues = capa.max_queues; + queue = malloc(num_queues * sizeof(odp_queue_t)); + CU_ASSERT_FATAL(queue != NULL); + } odp_queue_param_init(&qparams); @@ -93,6 +98,8 @@ void queue_test_capa(void) for (i = 0; i < num_queues; i++) CU_ASSERT(odp_queue_destroy(queue[i]) == 0); + + free(queue); } void queue_test_mode(void) commit 50078445f1a944309fb88946582a2015fd098f6b Author: Bill Fischofer <bill.fischofer(a)linaro.org> Date: Wed Jun 29 06:59:41 2016 -0500 validation: queue: avoid out of bounds references Resolve Bug https://bugs.linaro.org/show_bug.cgi?id=2377 by correcting loop bounds for error case. Signed-off-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/queue/queue.c b/test/validation/queue/queue.c index be9c0dc..96941f4 100644 --- a/test/validation/queue/queue.c +++ b/test/validation/queue/queue.c @@ -84,7 +84,7 @@ void queue_test_capa(void) if (queue[i] == ODP_QUEUE_INVALID) { CU_FAIL("Queue create failed"); - num_queues = i - 1; + num_queues = i; break; } ----------------------------------------------------------------------- Summary of changes: test/validation/queue/queue.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) hooks/post-receive --

8 years, 7 months

[COMMIT] branch master updated. v1.10.1.0-28-g8e6e5e9

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 8e6e5e999ce3d9edb704e18bedf6bc0ebc6ecf79 (commit) via 1a6766a3b0b2befb065336d54fff735db62aa96f (commit) via f606e161748d68612b1a5668ae0184ac4909738d (commit) via a85a684948248d5e127f109622026e3bbc4be53d (commit) from b0401d8ed43c643905c84b9a576df925d4ad06e1 (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 8e6e5e999ce3d9edb704e18bedf6bc0ebc6ecf79 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Wed Jun 22 16:09:57 2016 +0300 test: queue: do not dequeue from scheduled queue Correct queue validation test to dequeue from a plain queue. Dequeue from a scheduled queue is not permitted. Also cleaned up code by converting CU_ASSERT_EQUAL(foo, bar) to CU_ASSERT(foo == bar). This was the only validation test, which used CU_ASSERT_EQUAL. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> 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/validation/queue/queue.c b/test/validation/queue/queue.c index 7ef9adf..be9c0dc 100644 --- a/test/validation/queue/queue.c +++ b/test/validation/queue/queue.c @@ -147,9 +147,9 @@ void queue_test_param(void) int i, deq_ret, ret; int nr_deq_entries = 0; int max_iteration = CONFIG_MAX_ITERATION; - void *prtn = NULL; odp_queue_param_t qparams; + /* Schedule type queue */ odp_queue_param_init(&qparams); qparams.type = ODP_QUEUE_TYPE_SCHED; qparams.sched.prio = ODP_SCHED_PRIO_LOWEST; @@ -160,23 +160,29 @@ void queue_test_param(void) CU_ASSERT(ODP_QUEUE_INVALID != queue); CU_ASSERT(odp_queue_to_u64(queue) != odp_queue_to_u64(ODP_QUEUE_INVALID)); - - CU_ASSERT_EQUAL(ODP_QUEUE_TYPE_SCHED, - odp_queue_type(queue)); - CU_ASSERT(queue == odp_queue_lookup("test_queue")); - - CU_ASSERT_EQUAL(ODP_SCHED_GROUP_WORKER, - odp_queue_sched_group(queue)); - CU_ASSERT_EQUAL(ODP_SCHED_PRIO_LOWEST, odp_queue_sched_prio(queue)); - CU_ASSERT_EQUAL(ODP_SCHED_SYNC_PARALLEL, - odp_queue_sched_type(queue)); + CU_ASSERT(ODP_QUEUE_TYPE_SCHED == odp_queue_type(queue)); + CU_ASSERT(ODP_SCHED_PRIO_LOWEST == odp_queue_sched_prio(queue)); + CU_ASSERT(ODP_SCHED_SYNC_PARALLEL == odp_queue_sched_type(queue)); + CU_ASSERT(ODP_SCHED_GROUP_WORKER == odp_queue_sched_group(queue)); CU_ASSERT(0 == odp_queue_context_set(queue, &queue_context, sizeof(queue_context))); - prtn = odp_queue_context(queue); - CU_ASSERT(&queue_context == (int *)prtn); + CU_ASSERT(&queue_context == odp_queue_context(queue)); + CU_ASSERT(odp_queue_destroy(queue) == 0); + + /* Plain type queue */ + odp_queue_param_init(&qparams); + qparams.type = ODP_QUEUE_TYPE_PLAIN; + qparams.context = &queue_context; + qparams.context_len = sizeof(queue_context); + + queue = odp_queue_create("test_queue", &qparams); + CU_ASSERT(ODP_QUEUE_INVALID != queue); + CU_ASSERT(queue == odp_queue_lookup("test_queue")); + CU_ASSERT(ODP_QUEUE_TYPE_PLAIN == odp_queue_type(queue)); + CU_ASSERT(&queue_context == odp_queue_context(queue)); msg_pool = odp_pool_lookup("msg_pool"); buf = odp_buffer_alloc(msg_pool); @@ -186,7 +192,7 @@ void queue_test_param(void) if (!(CU_ASSERT(odp_queue_enq(queue, ev) == 0))) { odp_buffer_free(buf); } else { - CU_ASSERT_EQUAL(ev, odp_queue_deq(queue)); + CU_ASSERT(ev == odp_queue_deq(queue)); odp_buffer_free(buf); } @@ -218,7 +224,7 @@ void queue_test_param(void) for (i = 0; i < MAX_BUFFER_QUEUE; i++) { odp_buffer_t enbuf = odp_buffer_from_event(enev[i]); - CU_ASSERT_EQUAL(enev[i], deev[i]); + CU_ASSERT(enev[i] == deev[i]); odp_buffer_free(enbuf); } commit 1a6766a3b0b2befb065336d54fff735db62aa96f Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Wed Jun 22 16:09:56 2016 +0300 test: queue: cleanup variable naming Use single and short variable name for the queue. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> 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/validation/queue/queue.c b/test/validation/queue/queue.c index 0516469..7ef9adf 100644 --- a/test/validation/queue/queue.c +++ b/test/validation/queue/queue.c @@ -137,7 +137,7 @@ void queue_test_mode(void) void queue_test_param(void) { - odp_queue_t queue_creat_id, queue_id; + odp_queue_t queue; odp_event_t enev[MAX_BUFFER_QUEUE]; odp_event_t deev[MAX_BUFFER_QUEUE]; odp_buffer_t buf; @@ -156,27 +156,26 @@ void queue_test_param(void) qparams.sched.sync = ODP_SCHED_SYNC_PARALLEL; qparams.sched.group = ODP_SCHED_GROUP_WORKER; - queue_creat_id = odp_queue_create("test_queue", &qparams); - CU_ASSERT(ODP_QUEUE_INVALID != queue_creat_id); - CU_ASSERT(odp_queue_to_u64(queue_creat_id) != + queue = odp_queue_create("test_queue", &qparams); + CU_ASSERT(ODP_QUEUE_INVALID != queue); + CU_ASSERT(odp_queue_to_u64(queue) != odp_queue_to_u64(ODP_QUEUE_INVALID)); CU_ASSERT_EQUAL(ODP_QUEUE_TYPE_SCHED, - odp_queue_type(queue_creat_id)); + odp_queue_type(queue)); - queue_id = odp_queue_lookup("test_queue"); - CU_ASSERT_EQUAL(queue_creat_id, queue_id); + CU_ASSERT(queue == odp_queue_lookup("test_queue")); CU_ASSERT_EQUAL(ODP_SCHED_GROUP_WORKER, - odp_queue_sched_group(queue_id)); - CU_ASSERT_EQUAL(ODP_SCHED_PRIO_LOWEST, odp_queue_sched_prio(queue_id)); + odp_queue_sched_group(queue)); + CU_ASSERT_EQUAL(ODP_SCHED_PRIO_LOWEST, odp_queue_sched_prio(queue)); CU_ASSERT_EQUAL(ODP_SCHED_SYNC_PARALLEL, - odp_queue_sched_type(queue_id)); + odp_queue_sched_type(queue)); - CU_ASSERT(0 == odp_queue_context_set(queue_id, &queue_context, + CU_ASSERT(0 == odp_queue_context_set(queue, &queue_context, sizeof(queue_context))); - prtn = odp_queue_context(queue_id); + prtn = odp_queue_context(queue); CU_ASSERT(&queue_context == (int *)prtn); msg_pool = odp_pool_lookup("msg_pool"); @@ -184,10 +183,10 @@ void queue_test_param(void) CU_ASSERT_FATAL(buf != ODP_BUFFER_INVALID); ev = odp_buffer_to_event(buf); - if (!(CU_ASSERT(odp_queue_enq(queue_id, ev) == 0))) { + if (!(CU_ASSERT(odp_queue_enq(queue, ev) == 0))) { odp_buffer_free(buf); } else { - CU_ASSERT_EQUAL(ev, odp_queue_deq(queue_id)); + CU_ASSERT_EQUAL(ev, odp_queue_deq(queue)); odp_buffer_free(buf); } @@ -201,7 +200,7 @@ void queue_test_param(void) * constraints in the implementation at that given point of time. * But here we assume that we succeed in enqueuing all buffers. */ - ret = odp_queue_enq_multi(queue_id, enev, MAX_BUFFER_QUEUE); + ret = odp_queue_enq_multi(queue, enev, MAX_BUFFER_QUEUE); CU_ASSERT(MAX_BUFFER_QUEUE == ret); i = ret < 0 ? 0 : ret; for ( ; i < MAX_BUFFER_QUEUE; i++) @@ -209,7 +208,7 @@ void queue_test_param(void) pev_tmp = deev; do { - deq_ret = odp_queue_deq_multi(queue_id, pev_tmp, + deq_ret = odp_queue_deq_multi(queue, pev_tmp, MAX_BUFFER_QUEUE); nr_deq_entries += deq_ret; max_iteration--; @@ -223,7 +222,7 @@ void queue_test_param(void) odp_buffer_free(enbuf); } - CU_ASSERT(odp_queue_destroy(queue_id) == 0); + CU_ASSERT(odp_queue_destroy(queue) == 0); } void queue_test_info(void) commit f606e161748d68612b1a5668ae0184ac4909738d Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Wed Jun 22 16:09:55 2016 +0300 test: queue: add mode test Test different queue enqueue and dequeue mode combinations. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> 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/validation/queue/queue.c b/test/validation/queue/queue.c index b554aa3..0516469 100644 --- a/test/validation/queue/queue.c +++ b/test/validation/queue/queue.c @@ -95,6 +95,46 @@ void queue_test_capa(void) CU_ASSERT(odp_queue_destroy(queue[i]) == 0); } +void queue_test_mode(void) +{ + odp_queue_param_t qparams; + odp_queue_t queue; + int i, j; + odp_queue_op_mode_t mode[3] = { ODP_QUEUE_OP_MT, + ODP_QUEUE_OP_MT_UNSAFE, + ODP_QUEUE_OP_DISABLED }; + + odp_queue_param_init(&qparams); + + /* Plain queue modes */ + for (i = 0; i < 3; i++) { + for (j = 0; j < 3; j++) { + /* Should not disable both enq and deq */ + if (i == 2 && j == 2) + break; + + qparams.enq_mode = mode[i]; + qparams.deq_mode = mode[j]; + queue = odp_queue_create("test_queue", &qparams); + CU_ASSERT(queue != ODP_QUEUE_INVALID); + if (queue != ODP_QUEUE_INVALID) + CU_ASSERT(odp_queue_destroy(queue) == 0); + } + } + + odp_queue_param_init(&qparams); + qparams.type = ODP_QUEUE_TYPE_SCHED; + + /* Scheduled queue modes. Dequeue mode is fixed. */ + for (i = 0; i < 3; i++) { + qparams.enq_mode = mode[i]; + queue = odp_queue_create("test_queue", &qparams); + CU_ASSERT(queue != ODP_QUEUE_INVALID); + if (queue != ODP_QUEUE_INVALID) + CU_ASSERT(odp_queue_destroy(queue) == 0); + } +} + void queue_test_param(void) { odp_queue_t queue_creat_id, queue_id; @@ -247,6 +287,7 @@ void queue_test_info(void) odp_testinfo_t queue_suite[] = { ODP_TEST_INFO(queue_test_capa), + ODP_TEST_INFO(queue_test_mode), ODP_TEST_INFO(queue_test_param), ODP_TEST_INFO(queue_test_info), ODP_TEST_INFO_NULL, diff --git a/test/validation/queue/queue.h b/test/validation/queue/queue.h index 1d3164d..6b787b1 100644 --- a/test/validation/queue/queue.h +++ b/test/validation/queue/queue.h @@ -11,6 +11,7 @@ /* test functions: */ void queue_test_capa(void); +void queue_test_mode(void); void queue_test_param(void); void queue_test_info(void); commit a85a684948248d5e127f109622026e3bbc4be53d Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Wed Jun 22 16:09:54 2016 +0300 test: queue: add capability test Test queue capability API and create the maximum number of queues. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> 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_queue.c b/platform/linux-generic/odp_queue.c index f3e589e..1166a72 100644 --- a/platform/linux-generic/odp_queue.c +++ b/platform/linux-generic/odp_queue.c @@ -25,6 +25,8 @@ #include <odp/api/traffic_mngr.h> #include <odp_schedule_ordered_internal.h> +#define NUM_INTERNAL_QUEUES 64 + #ifdef USE_TICKETLOCK #include <odp/api/ticketlock.h> #define LOCK(a) odp_ticketlock_lock(a) @@ -184,7 +186,8 @@ int odp_queue_capability(odp_queue_capability_t *capa) { memset(capa, 0, sizeof(odp_queue_capability_t)); - capa->max_queues = ODP_CONFIG_QUEUES; + /* Reserve some queues for internal use */ + capa->max_queues = ODP_CONFIG_QUEUES - NUM_INTERNAL_QUEUES; capa->max_ordered_locks = SCHEDULE_ORDERED_LOCKS_PER_QUEUE; capa->max_sched_groups = sched_fn->num_grps(); capa->sched_prios = odp_schedule_num_prio(); diff --git a/test/validation/queue/queue.c b/test/validation/queue/queue.c index 1e60cd7..b554aa3 100644 --- a/test/validation/queue/queue.c +++ b/test/validation/queue/queue.c @@ -11,10 +11,22 @@ #define MAX_BUFFER_QUEUE (8) #define MSG_POOL_SIZE (4 * 1024 * 1024) #define CONFIG_MAX_ITERATION (100) +#define MAX_QUEUES (64 * 1024) static int queue_context = 0xff; static odp_pool_t pool; +static void generate_name(char *name, uint32_t index) +{ + /* Uniqueue name for up to 300M queues */ + name[0] = 'A' + ((index / (26 * 26 * 26 * 26 * 26)) % 26); + name[1] = 'A' + ((index / (26 * 26 * 26 * 26)) % 26); + name[2] = 'A' + ((index / (26 * 26 * 26)) % 26); + name[3] = 'A' + ((index / (26 * 26)) % 26); + name[4] = 'A' + ((index / 26) % 26); + name[5] = 'A' + (index % 26); +} + int queue_suite_init(void) { odp_pool_param_t params; @@ -38,7 +50,52 @@ int queue_suite_term(void) return odp_pool_destroy(pool); } -void queue_test_sunnydays(void) +void queue_test_capa(void) +{ + odp_queue_capability_t capa; + odp_queue_param_t qparams; + char name[ODP_QUEUE_NAME_LEN]; + odp_queue_t queue[MAX_QUEUES]; + uint32_t num_queues, i; + + memset(&capa, 0, sizeof(odp_queue_capability_t)); + CU_ASSERT(odp_queue_capability(&capa) == 0); + + CU_ASSERT(capa.max_queues != 0); + CU_ASSERT(capa.max_ordered_locks != 0); + CU_ASSERT(capa.max_sched_groups != 0); + CU_ASSERT(capa.sched_prios != 0); + + for (i = 0; i < ODP_QUEUE_NAME_LEN; i++) + name[i] = 'A' + (i % 26); + + name[ODP_QUEUE_NAME_LEN - 1] = 0; + + if (capa.max_queues > MAX_QUEUES) + num_queues = MAX_QUEUES; + else + num_queues = capa.max_queues; + + odp_queue_param_init(&qparams); + + for (i = 0; i < num_queues; i++) { + generate_name(name, i); + queue[i] = odp_queue_create(name, &qparams); + + if (queue[i] == ODP_QUEUE_INVALID) { + CU_FAIL("Queue create failed"); + num_queues = i - 1; + break; + } + + CU_ASSERT(odp_queue_lookup(name) != ODP_QUEUE_INVALID); + } + + for (i = 0; i < num_queues; i++) + CU_ASSERT(odp_queue_destroy(queue[i]) == 0); +} + +void queue_test_param(void) { odp_queue_t queue_creat_id, queue_id; odp_event_t enev[MAX_BUFFER_QUEUE]; @@ -189,7 +246,8 @@ void queue_test_info(void) } odp_testinfo_t queue_suite[] = { - ODP_TEST_INFO(queue_test_sunnydays), + ODP_TEST_INFO(queue_test_capa), + ODP_TEST_INFO(queue_test_param), ODP_TEST_INFO(queue_test_info), ODP_TEST_INFO_NULL, }; diff --git a/test/validation/queue/queue.h b/test/validation/queue/queue.h index 4ef52f5..1d3164d 100644 --- a/test/validation/queue/queue.h +++ b/test/validation/queue/queue.h @@ -10,7 +10,8 @@ #include <odp_cunit_common.h> /* test functions: */ -void queue_test_sunnydays(void); +void queue_test_capa(void); +void queue_test_param(void); void queue_test_info(void); /* test arrays: */ ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/odp_queue.c | 5 +- test/validation/queue/queue.c | 158 ++++++++++++++++++++++++++++++------- test/validation/queue/queue.h | 4 +- 3 files changed, 138 insertions(+), 29 deletions(-) hooks/post-receive --

8 years, 7 months

[COMMIT] branch master updated. v1.10.1.0-24-gb0401d8

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 b0401d8ed43c643905c84b9a576df925d4ad06e1 (commit) from 08487413ead04cb5fef8e813af06e5bc29207334 (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 b0401d8ed43c643905c84b9a576df925d4ad06e1 Author: Yi He <yi.he(a)linaro.org> Date: Tue Jun 21 04:52:40 2016 +0000 linux-gen: move platform tests into test suite Move platform tests from odp/platform/linux-generic/test into test suite at odp/test/platform/linux-generic. Signed-off-by: Yi He <yi.he(a)linaro.org> Reviewed-by: Christophe Milard <christophe.milard(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/Makefile.am b/Makefile.am index 2129472..625748a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,7 +9,6 @@ AM_DISTCHECK_CONFIGURE_FLAGS = --enable-test-cpp \ SUBDIRS = @platform_with_platform@ \ helper \ test \ - @platform_with_platform_test@ \ helper/test \ doc \ example \ diff --git a/configure.ac b/configure.ac index c87755b..f3952db 100644 --- a/configure.ac +++ b/configure.ac @@ -107,7 +107,6 @@ AC_ARG_WITH([platform], AC_SUBST([with_platform]) AC_SUBST([platform_with_platform], ["platform/${with_platform}"]) -AC_SUBST([platform_with_platform_test], ["platform/${with_platform}/test"]) ########################################################################## # Run platform specific checks and settings @@ -116,6 +115,7 @@ IMPLEMENTATION_NAME="" if test "${with_platform}" == "linux-generic"; then m4_include([./platform/linux-generic/m4/configure.m4]) + m4_include([./test/platform/linux-generic/m4/configure.m4]) IMPLEMENTATION_NAME="odp-linux" else echo "UNSUPPORTED PLATFORM: ${with_platform}" diff --git a/platform/linux-generic/m4/configure.m4 b/platform/linux-generic/m4/configure.m4 index 5380046..1b1b883 100644 --- a/platform/linux-generic/m4/configure.m4 +++ b/platform/linux-generic/m4/configure.m4 @@ -36,9 +36,4 @@ m4_include([platform/linux-generic/m4/odp_dpdk.m4]) m4_include([platform/linux-generic/m4/odp_ipc.m4]) m4_include([platform/linux-generic/m4/odp_schedule.m4]) -AC_CONFIG_FILES([platform/linux-generic/Makefile - platform/linux-generic/test/Makefile - platform/linux-generic/test/shmem/Makefile - platform/linux-generic/test/pktio/Makefile - platform/linux-generic/test/pktio_ipc/Makefile - platform/linux-generic/test/ring/Makefile]) +AC_CONFIG_FILES([platform/linux-generic/Makefile]) diff --git a/test/Makefile.am b/test/Makefile.am index 4a75364..8bab8fd 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1,5 +1,5 @@ SUBDIRS = performance miscellaneous if cunit_support - SUBDIRS += validation + SUBDIRS += validation @platform_with_platform@ endif diff --git a/test/performance/odp_l2fwd_run.sh b/test/performance/odp_l2fwd_run.sh index cab97a8..fc3d05d 100755 --- a/test/performance/odp_l2fwd_run.sh +++ b/test/performance/odp_l2fwd_run.sh @@ -37,8 +37,8 @@ elif [ "$ODP_PLATFORM" = "" ]; then echo "$0: error: ODP_PLATFORM must be defined" # not skipped as this should never happen via "make check" exit 1 -elif [ -f ${TEST_SRC_DIR}/../../platform/$ODP_PLATFORM/test/pktio/pktio_env ]; then - . ${TEST_SRC_DIR}/../../platform/$ODP_PLATFORM/test/pktio/pktio_env +elif [ -f ${TEST_SRC_DIR}/../platform/$ODP_PLATFORM/pktio/pktio_env ]; then + . ${TEST_SRC_DIR}/../platform/$ODP_PLATFORM/pktio/pktio_env else echo "BUG: unable to find pktio_env!" echo "pktio_env has to be in current directory or in platform/\$ODP_PLATFORM/test." diff --git a/platform/linux-generic/test/.gitignore b/test/platform/linux-generic/.gitignore similarity index 100% rename from platform/linux-generic/test/.gitignore rename to test/platform/linux-generic/.gitignore diff --git a/platform/linux-generic/test/Makefile.am b/test/platform/linux-generic/Makefile.am similarity index 100% rename from platform/linux-generic/test/Makefile.am rename to test/platform/linux-generic/Makefile.am diff --git a/platform/linux-generic/test/Makefile.inc b/test/platform/linux-generic/Makefile.inc similarity index 100% rename from platform/linux-generic/test/Makefile.inc rename to test/platform/linux-generic/Makefile.inc diff --git a/test/platform/linux-generic/m4/configure.m4 b/test/platform/linux-generic/m4/configure.m4 new file mode 100644 index 0000000..8c3db21 --- /dev/null +++ b/test/platform/linux-generic/m4/configure.m4 @@ -0,0 +1,5 @@ +AC_CONFIG_FILES([test/platform/linux-generic/Makefile + test/platform/linux-generic/shmem/Makefile + test/platform/linux-generic/pktio/Makefile + test/platform/linux-generic/pktio_ipc/Makefile + test/platform/linux-generic/ring/Makefile]) diff --git a/platform/linux-generic/test/pktio/.gitignore b/test/platform/linux-generic/pktio/.gitignore similarity index 100% rename from platform/linux-generic/test/pktio/.gitignore rename to test/platform/linux-generic/pktio/.gitignore diff --git a/platform/linux-generic/test/pktio/Makefile.am b/test/platform/linux-generic/pktio/Makefile.am similarity index 100% rename from platform/linux-generic/test/pktio/Makefile.am rename to test/platform/linux-generic/pktio/Makefile.am diff --git a/platform/linux-generic/test/pktio/pktio_env b/test/platform/linux-generic/pktio/pktio_env similarity index 100% rename from platform/linux-generic/test/pktio/pktio_env rename to test/platform/linux-generic/pktio/pktio_env diff --git a/platform/linux-generic/test/pktio/pktio_run.sh b/test/platform/linux-generic/pktio/pktio_run.sh similarity index 100% rename from platform/linux-generic/test/pktio/pktio_run.sh rename to test/platform/linux-generic/pktio/pktio_run.sh diff --git a/platform/linux-generic/test/pktio/pktio_run_dpdk.sh b/test/platform/linux-generic/pktio/pktio_run_dpdk.sh similarity index 100% rename from platform/linux-generic/test/pktio/pktio_run_dpdk.sh rename to test/platform/linux-generic/pktio/pktio_run_dpdk.sh diff --git a/platform/linux-generic/test/pktio/pktio_run_netmap.sh b/test/platform/linux-generic/pktio/pktio_run_netmap.sh similarity index 100% rename from platform/linux-generic/test/pktio/pktio_run_netmap.sh rename to test/platform/linux-generic/pktio/pktio_run_netmap.sh diff --git a/platform/linux-generic/test/pktio/pktio_run_pcap.sh b/test/platform/linux-generic/pktio/pktio_run_pcap.sh similarity index 100% rename from platform/linux-generic/test/pktio/pktio_run_pcap.sh rename to test/platform/linux-generic/pktio/pktio_run_pcap.sh diff --git a/platform/linux-generic/test/pktio/pktio_run_tap.sh b/test/platform/linux-generic/pktio/pktio_run_tap.sh similarity index 100% rename from platform/linux-generic/test/pktio/pktio_run_tap.sh rename to test/platform/linux-generic/pktio/pktio_run_tap.sh diff --git a/platform/linux-generic/test/pktio_ipc/.gitignore b/test/platform/linux-generic/pktio_ipc/.gitignore similarity index 100% rename from platform/linux-generic/test/pktio_ipc/.gitignore rename to test/platform/linux-generic/pktio_ipc/.gitignore diff --git a/platform/linux-generic/test/pktio_ipc/Makefile.am b/test/platform/linux-generic/pktio_ipc/Makefile.am similarity index 100% rename from platform/linux-generic/test/pktio_ipc/Makefile.am rename to test/platform/linux-generic/pktio_ipc/Makefile.am diff --git a/platform/linux-generic/test/pktio_ipc/ipc_common.c b/test/platform/linux-generic/pktio_ipc/ipc_common.c similarity index 100% rename from platform/linux-generic/test/pktio_ipc/ipc_common.c rename to test/platform/linux-generic/pktio_ipc/ipc_common.c diff --git a/platform/linux-generic/test/pktio_ipc/ipc_common.h b/test/platform/linux-generic/pktio_ipc/ipc_common.h similarity index 100% rename from platform/linux-generic/test/pktio_ipc/ipc_common.h rename to test/platform/linux-generic/pktio_ipc/ipc_common.h diff --git a/platform/linux-generic/test/pktio_ipc/pktio_ipc1.c b/test/platform/linux-generic/pktio_ipc/pktio_ipc1.c similarity index 100% rename from platform/linux-generic/test/pktio_ipc/pktio_ipc1.c rename to test/platform/linux-generic/pktio_ipc/pktio_ipc1.c diff --git a/platform/linux-generic/test/pktio_ipc/pktio_ipc2.c b/test/platform/linux-generic/pktio_ipc/pktio_ipc2.c similarity index 100% rename from platform/linux-generic/test/pktio_ipc/pktio_ipc2.c rename to test/platform/linux-generic/pktio_ipc/pktio_ipc2.c diff --git a/platform/linux-generic/test/pktio_ipc/pktio_ipc_run.sh b/test/platform/linux-generic/pktio_ipc/pktio_ipc_run.sh similarity index 100% rename from platform/linux-generic/test/pktio_ipc/pktio_ipc_run.sh rename to test/platform/linux-generic/pktio_ipc/pktio_ipc_run.sh diff --git a/platform/linux-generic/test/ring/.gitignore b/test/platform/linux-generic/ring/.gitignore similarity index 100% rename from platform/linux-generic/test/ring/.gitignore rename to test/platform/linux-generic/ring/.gitignore diff --git a/platform/linux-generic/test/ring/Makefile.am b/test/platform/linux-generic/ring/Makefile.am similarity index 100% rename from platform/linux-generic/test/ring/Makefile.am rename to test/platform/linux-generic/ring/Makefile.am diff --git a/platform/linux-generic/test/ring/ring_basic.c b/test/platform/linux-generic/ring/ring_basic.c similarity index 100% rename from platform/linux-generic/test/ring/ring_basic.c rename to test/platform/linux-generic/ring/ring_basic.c diff --git a/platform/linux-generic/test/ring/ring_main.c b/test/platform/linux-generic/ring/ring_main.c similarity index 100% rename from platform/linux-generic/test/ring/ring_main.c rename to test/platform/linux-generic/ring/ring_main.c diff --git a/platform/linux-generic/test/ring/ring_stress.c b/test/platform/linux-generic/ring/ring_stress.c similarity index 100% rename from platform/linux-generic/test/ring/ring_stress.c rename to test/platform/linux-generic/ring/ring_stress.c diff --git a/platform/linux-generic/test/ring/ring_suites.c b/test/platform/linux-generic/ring/ring_suites.c similarity index 100% rename from platform/linux-generic/test/ring/ring_suites.c rename to test/platform/linux-generic/ring/ring_suites.c diff --git a/platform/linux-generic/test/ring/ring_suites.h b/test/platform/linux-generic/ring/ring_suites.h similarity index 100% rename from platform/linux-generic/test/ring/ring_suites.h rename to test/platform/linux-generic/ring/ring_suites.h diff --git a/platform/linux-generic/test/run-test b/test/platform/linux-generic/run-test similarity index 100% rename from platform/linux-generic/test/run-test rename to test/platform/linux-generic/run-test diff --git a/platform/linux-generic/test/shmem/.gitignore b/test/platform/linux-generic/shmem/.gitignore similarity index 100% rename from platform/linux-generic/test/shmem/.gitignore rename to test/platform/linux-generic/shmem/.gitignore diff --git a/platform/linux-generic/test/shmem/Makefile.am b/test/platform/linux-generic/shmem/Makefile.am similarity index 100% rename from platform/linux-generic/test/shmem/Makefile.am rename to test/platform/linux-generic/shmem/Makefile.am diff --git a/platform/linux-generic/test/shmem/shmem.h b/test/platform/linux-generic/shmem/shmem.h similarity index 100% rename from platform/linux-generic/test/shmem/shmem.h rename to test/platform/linux-generic/shmem/shmem.h diff --git a/platform/linux-generic/test/shmem/shmem_common.h b/test/platform/linux-generic/shmem/shmem_common.h similarity index 100% rename from platform/linux-generic/test/shmem/shmem_common.h rename to test/platform/linux-generic/shmem/shmem_common.h diff --git a/platform/linux-generic/test/shmem/shmem_linux.c b/test/platform/linux-generic/shmem/shmem_linux.c similarity index 100% rename from platform/linux-generic/test/shmem/shmem_linux.c rename to test/platform/linux-generic/shmem/shmem_linux.c diff --git a/platform/linux-generic/test/shmem/shmem_linux.h b/test/platform/linux-generic/shmem/shmem_linux.h similarity index 100% rename from platform/linux-generic/test/shmem/shmem_linux.h rename to test/platform/linux-generic/shmem/shmem_linux.h diff --git a/platform/linux-generic/test/shmem/shmem_odp.c b/test/platform/linux-generic/shmem/shmem_odp.c similarity index 100% rename from platform/linux-generic/test/shmem/shmem_odp.c rename to test/platform/linux-generic/shmem/shmem_odp.c diff --git a/platform/linux-generic/test/shmem/shmem_odp.h b/test/platform/linux-generic/shmem/shmem_odp.h similarity index 100% rename from platform/linux-generic/test/shmem/shmem_odp.h rename to test/platform/linux-generic/shmem/shmem_odp.h ----------------------------------------------------------------------- Summary of changes: Makefile.am | 1 - configure.ac | 2 +- platform/linux-generic/m4/configure.m4 | 7 +------ test/Makefile.am | 2 +- test/performance/odp_l2fwd_run.sh | 4 ++-- .../linux-generic/test => test/platform/linux-generic}/.gitignore | 0 .../linux-generic/test => test/platform/linux-generic}/Makefile.am | 0 .../test => test/platform/linux-generic}/Makefile.inc | 0 test/platform/linux-generic/m4/configure.m4 | 5 +++++ .../test => test/platform/linux-generic}/pktio/.gitignore | 0 .../test => test/platform/linux-generic}/pktio/Makefile.am | 0 .../test => test/platform/linux-generic}/pktio/pktio_env | 0 .../test => test/platform/linux-generic}/pktio/pktio_run.sh | 0 .../test => test/platform/linux-generic}/pktio/pktio_run_dpdk.sh | 0 .../test => test/platform/linux-generic}/pktio/pktio_run_netmap.sh | 0 .../test => test/platform/linux-generic}/pktio/pktio_run_pcap.sh | 0 .../test => test/platform/linux-generic}/pktio/pktio_run_tap.sh | 0 .../test => test/platform/linux-generic}/pktio_ipc/.gitignore | 0 .../test => test/platform/linux-generic}/pktio_ipc/Makefile.am | 0 .../test => test/platform/linux-generic}/pktio_ipc/ipc_common.c | 0 .../test => test/platform/linux-generic}/pktio_ipc/ipc_common.h | 0 .../test => test/platform/linux-generic}/pktio_ipc/pktio_ipc1.c | 0 .../test => test/platform/linux-generic}/pktio_ipc/pktio_ipc2.c | 0 .../platform/linux-generic}/pktio_ipc/pktio_ipc_run.sh | 0 .../test => test/platform/linux-generic}/ring/.gitignore | 0 .../test => test/platform/linux-generic}/ring/Makefile.am | 0 .../test => test/platform/linux-generic}/ring/ring_basic.c | 0 .../test => test/platform/linux-generic}/ring/ring_main.c | 0 .../test => test/platform/linux-generic}/ring/ring_stress.c | 0 .../test => test/platform/linux-generic}/ring/ring_suites.c | 0 .../test => test/platform/linux-generic}/ring/ring_suites.h | 0 .../linux-generic/test => test/platform/linux-generic}/run-test | 0 .../test => test/platform/linux-generic}/shmem/.gitignore | 0 .../test => test/platform/linux-generic}/shmem/Makefile.am | 0 .../test => test/platform/linux-generic}/shmem/shmem.h | 0 .../test => test/platform/linux-generic}/shmem/shmem_common.h | 0 .../test => test/platform/linux-generic}/shmem/shmem_linux.c | 0 .../test => test/platform/linux-generic}/shmem/shmem_linux.h | 0 .../test => test/platform/linux-generic}/shmem/shmem_odp.c | 0 .../test => test/platform/linux-generic}/shmem/shmem_odp.h | 0 40 files changed, 10 insertions(+), 11 deletions(-) rename {platform/linux-generic/test => test/platform/linux-generic}/.gitignore (100%) rename {platform/linux-generic/test => test/platform/linux-generic}/Makefile.am (100%) rename {platform/linux-generic/test => test/platform/linux-generic}/Makefile.inc (100%) create mode 100644 test/platform/linux-generic/m4/configure.m4 rename {platform/linux-generic/test => test/platform/linux-generic}/pktio/.gitignore (100%) rename {platform/linux-generic/test => test/platform/linux-generic}/pktio/Makefile.am (100%) rename {platform/linux-generic/test => test/platform/linux-generic}/pktio/pktio_env (100%) rename {platform/linux-generic/test => test/platform/linux-generic}/pktio/pktio_run.sh (100%) rename {platform/linux-generic/test => test/platform/linux-generic}/pktio/pktio_run_dpdk.sh (100%) rename {platform/linux-generic/test => test/platform/linux-generic}/pktio/pktio_run_netmap.sh (100%) rename {platform/linux-generic/test => test/platform/linux-generic}/pktio/pktio_run_pcap.sh (100%) rename {platform/linux-generic/test => test/platform/linux-generic}/pktio/pktio_run_tap.sh (100%) rename {platform/linux-generic/test => test/platform/linux-generic}/pktio_ipc/.gitignore (100%) rename {platform/linux-generic/test => test/platform/linux-generic}/pktio_ipc/Makefile.am (100%) rename {platform/linux-generic/test => test/platform/linux-generic}/pktio_ipc/ipc_common.c (100%) rename {platform/linux-generic/test => test/platform/linux-generic}/pktio_ipc/ipc_common.h (100%) rename {platform/linux-generic/test => test/platform/linux-generic}/pktio_ipc/pktio_ipc1.c (100%) rename {platform/linux-generic/test => test/platform/linux-generic}/pktio_ipc/pktio_ipc2.c (100%) rename {platform/linux-generic/test => test/platform/linux-generic}/pktio_ipc/pktio_ipc_run.sh (100%) rename {platform/linux-generic/test => test/platform/linux-generic}/ring/.gitignore (100%) rename {platform/linux-generic/test => test/platform/linux-generic}/ring/Makefile.am (100%) rename {platform/linux-generic/test => test/platform/linux-generic}/ring/ring_basic.c (100%) rename {platform/linux-generic/test => test/platform/linux-generic}/ring/ring_main.c (100%) rename {platform/linux-generic/test => test/platform/linux-generic}/ring/ring_stress.c (100%) rename {platform/linux-generic/test => test/platform/linux-generic}/ring/ring_suites.c (100%) rename {platform/linux-generic/test => test/platform/linux-generic}/ring/ring_suites.h (100%) rename {platform/linux-generic/test => test/platform/linux-generic}/run-test (100%) rename {platform/linux-generic/test => test/platform/linux-generic}/shmem/.gitignore (100%) rename {platform/linux-generic/test => test/platform/linux-generic}/shmem/Makefile.am (100%) rename {platform/linux-generic/test => test/platform/linux-generic}/shmem/shmem.h (100%) rename {platform/linux-generic/test => test/platform/linux-generic}/shmem/shmem_common.h (100%) rename {platform/linux-generic/test => test/platform/linux-generic}/shmem/shmem_linux.c (100%) rename {platform/linux-generic/test => test/platform/linux-generic}/shmem/shmem_linux.h (100%) rename {platform/linux-generic/test => test/platform/linux-generic}/shmem/shmem_odp.c (100%) rename {platform/linux-generic/test => test/platform/linux-generic}/shmem/shmem_odp.h (100%) hooks/post-receive --

8 years, 7 months

[COMMIT] branch master updated. v1.10.1.0-23-g0848741

by git＠git-us.linaro.org

8 years, 7 months

[COMMIT] branch master updated. v1.10.1.0-22-gb018868

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 b018868aa429fd25dae1137490419784e8e569f9 (commit) via 8d020fe812be982564465c0812468ce6194a5025 (commit) via cb9b43cc218eb4304c508f577293d401180da0ae (commit) from 2b9f90dc54c5d699083970cbd359db4f137faa31 (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 b018868aa429fd25dae1137490419784e8e569f9 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Wed Jun 22 13:11:40 2016 +0300 linux-gen: tm: use directly ODP_PACKET_INVALID Removed INVALID_PKT define and used directly ODP_PACKET_INVALID, which makes it easier to e.g. grep for invalid packets over entire implementation. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/include/odp_traffic_mngr_internal.h b/platform/linux-generic/include/odp_traffic_mngr_internal.h index 8585b0a..85a31e9 100644 --- a/platform/linux-generic/include/odp_traffic_mngr_internal.h +++ b/platform/linux-generic/include/odp_traffic_mngr_internal.h @@ -38,8 +38,6 @@ typedef struct stat file_stat_t; #define INPUT_WORK_RING_SIZE (16 * 1024) -#define INVALID_PKT ODP_PACKET_INVALID - #define TM_QUEUE_MAGIC_NUM 0xBABEBABE #define TM_NODE_MAGIC_NUM 0xBEEFBEEF diff --git a/platform/linux-generic/odp_pkt_queue.c b/platform/linux-generic/odp_pkt_queue.c index cbaea64..cbe1e74 100644 --- a/platform/linux-generic/odp_pkt_queue.c +++ b/platform/linux-generic/odp_pkt_queue.c @@ -17,7 +17,6 @@ #define MAX(a, b) (((a) > (b)) ? (a) : (b)) #define MIN(a, b) (((a) < (b)) ? (a) : (b)) -#define INVALID_PKT ODP_PACKET_INVALID #define NUM_PKTS 7 typedef struct /* Must be exactly 64 bytes long AND cacheline aligned! */ { @@ -70,7 +69,7 @@ static inline void init_queue_blk(queue_blk_t *queue_blk) memset(queue_blk, 0, sizeof(queue_blk_t)); for (i = 0; i < NUM_PKTS; i++) - queue_blk->pkts[i] = INVALID_PKT; + queue_blk->pkts[i] = ODP_PACKET_INVALID; } static queue_blk_t *blk_idx_to_queue_blk(queue_pool_t *queue_pool, @@ -259,7 +258,7 @@ int _odp_pkt_queue_append(_odp_int_queue_pool_t queue_pool, if ((queue_num == 0) || (pool->max_queue_num < queue_num)) return -2; - if (pkt == INVALID_PKT) + if (pkt == ODP_PACKET_INVALID) return -3; pool->total_pkt_appends++; @@ -284,7 +283,7 @@ int _odp_pkt_queue_append(_odp_int_queue_pool_t queue_pool, /* Find first empty slot and insert pkt there. */ for (idx = 0; idx < NUM_PKTS; idx++) { - if (tail_blk->pkts[idx] == INVALID_PKT) { + if (tail_blk->pkts[idx] == ODP_PACKET_INVALID) { tail_blk->pkts[idx] = pkt; return 0; } @@ -323,13 +322,13 @@ int _odp_pkt_queue_remove(_odp_int_queue_pool_t queue_pool, /* Now remove the first valid odp_packet_t handle value we find. */ first_blk = blk_idx_to_queue_blk(pool, first_blk_idx); for (idx = 0; idx < NUM_PKTS; idx++) { - if (first_blk->pkts[idx] != INVALID_PKT) { + if (first_blk->pkts[idx] != ODP_PACKET_INVALID) { *pkt = first_blk->pkts[idx]; - first_blk->pkts[idx] = INVALID_PKT; + first_blk->pkts[idx] = ODP_PACKET_INVALID; /* Now see if there are any more pkts in this queue. */ if ((idx == 6) || - (first_blk->pkts[idx + 1] == INVALID_PKT)) { + (first_blk->pkts[idx + 1] == ODP_PACKET_INVALID)) { /* We have reached the end of this queue_blk. * Check to see if there is a following block * or not diff --git a/platform/linux-generic/odp_traffic_mngr.c b/platform/linux-generic/odp_traffic_mngr.c index 1fa2d27..681df00 100644 --- a/platform/linux-generic/odp_traffic_mngr.c +++ b/platform/linux-generic/odp_traffic_mngr.c @@ -2096,7 +2096,7 @@ static void tm_send_pkt(tm_system_t *tm_system, uint32_t max_sends) return; odp_pkt = tm_queue_obj->pkt; - if (odp_pkt == INVALID_PKT) { + if (odp_pkt == ODP_PACKET_INVALID) { tm_system->egress_pkt_desc = EMPTY_PKT_DESC; return; } @@ -2114,10 +2114,10 @@ static void tm_send_pkt(tm_system_t *tm_system, uint32_t max_sends) tm_queue_obj->sent_pkt = tm_queue_obj->pkt; tm_queue_obj->sent_pkt_desc = tm_queue_obj->in_pkt_desc; - tm_queue_obj->pkt = INVALID_PKT; + tm_queue_obj->pkt = ODP_PACKET_INVALID; tm_queue_obj->in_pkt_desc = EMPTY_PKT_DESC; tm_consume_sent_pkt(tm_system, &tm_queue_obj->sent_pkt_desc); - tm_queue_obj->sent_pkt = INVALID_PKT; + tm_queue_obj->sent_pkt = ODP_PACKET_INVALID; tm_queue_obj->sent_pkt_desc = EMPTY_PKT_DESC; if (tm_system->egress_pkt_desc.queue_num == 0) return; @@ -2152,7 +2152,7 @@ static int tm_process_input_work_queue(tm_system_t *tm_system, } tm_queue_obj->pkts_rcvd_cnt++; - if (tm_queue_obj->pkt != INVALID_PKT) { + if (tm_queue_obj->pkt != ODP_PACKET_INVALID) { /* If the tm_queue_obj already has a pkt to work with, * then just add this new pkt to the associated * _odp_int_pkt_queue. */ @@ -3674,7 +3674,7 @@ odp_tm_queue_t odp_tm_queue_create(odp_tm_t odp_tm, tm_queue_obj->queue_num = tm_system->next_queue_num++; tm_queue_obj->tm_wred_node = tm_wred_node; tm_queue_obj->_odp_int_pkt_queue = _odp_int_pkt_queue; - tm_queue_obj->pkt = INVALID_PKT; + tm_queue_obj->pkt = ODP_PACKET_INVALID; odp_ticketlock_init(&tm_wred_node->tm_wred_node_lock); tm_queue_obj->tm_qentry.s.type = ODP_QUEUE_TYPE_TM; @@ -3727,7 +3727,7 @@ int odp_tm_queue_destroy(odp_tm_queue_t tm_queue) * current pkt, otherwise the destroy fails. */ shaper_obj = &tm_queue_obj->shaper_obj; if ((shaper_obj->next_tm_node != NULL) || - (tm_queue_obj->pkt != INVALID_PKT)) + (tm_queue_obj->pkt != ODP_PACKET_INVALID)) return -1; /* Check that there is no shaper profile, threshold profile or wred commit 8d020fe812be982564465c0812468ce6194a5025 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Wed Jun 22 13:11:39 2016 +0300 linux-gen: sched: remove dummy pool from SP scheduler Dummy pool creation is not needed anymore since timer and TM bugs (zero as invalid handle) have been corrented. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-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 0973239..8c45123 100644 --- a/platform/linux-generic/odp_schedule_sp.c +++ b/platform/linux-generic/odp_schedule_sp.c @@ -14,9 +14,6 @@ #include <odp_align_internal.h> #include <odp_config_internal.h> -/* Dummy pool */ -#include <odp/api/pool.h> - #define NUM_QUEUE ODP_CONFIG_QUEUES #define NUM_PKTIO ODP_CONFIG_PKTIO_ENTRIES #define NUM_PRIO 3 @@ -95,13 +92,9 @@ typedef struct { static sched_global_t sched_global; static __thread sched_local_t sched_local; -/* Dummy pool */ -static odp_pool_t dummy_pool; - static int init_global(void) { int i; - odp_pool_param_t params; sched_group_t *sched_group = &sched_global.sched_group; ODP_DBG("Using SP scheduler\n"); @@ -139,16 +132,6 @@ static int init_global(void) odp_thrmask_zero(&sched_group->s.group[GROUP_CONTROL].mask); sched_group->s.group[GROUP_CONTROL].allocated = 1; - /* REMOVE dummy pool after a bug has been fixed in pool or timer code. - * If scheduler does not create a pool, timer validation test fails !!! - */ - odp_pool_param_init(&params); - params.buf.size = 48; - params.buf.align = 0; - params.buf.num = NUM_QUEUE + NUM_PKTIO; - params.type = ODP_POOL_BUFFER; - dummy_pool = odp_pool_create("dummy_sched_pool", &params); - return 0; } @@ -171,8 +154,6 @@ static int term_global(void) } } - odp_pool_destroy(dummy_pool); - return 0; } commit cb9b43cc218eb4304c508f577293d401180da0ae Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Wed Jun 22 13:11:38 2016 +0300 linux-gen: tm: correct invalid packet handle definitions TM code used zero as the invalid packet handle value. Use ODP_PACKET_INVALID instead, which currently has a non-zero value. This mismatch caused bugs when packet handle value was zero (first packet from pool 0). Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/include/odp_traffic_mngr_internal.h b/platform/linux-generic/include/odp_traffic_mngr_internal.h index 3586889..8585b0a 100644 --- a/platform/linux-generic/include/odp_traffic_mngr_internal.h +++ b/platform/linux-generic/include/odp_traffic_mngr_internal.h @@ -38,7 +38,7 @@ typedef struct stat file_stat_t; #define INPUT_WORK_RING_SIZE (16 * 1024) -#define INVALID_PKT 0 +#define INVALID_PKT ODP_PACKET_INVALID #define TM_QUEUE_MAGIC_NUM 0xBABEBABE #define TM_NODE_MAGIC_NUM 0xBEEFBEEF diff --git a/platform/linux-generic/odp_pkt_queue.c b/platform/linux-generic/odp_pkt_queue.c index 949cf74..cbaea64 100644 --- a/platform/linux-generic/odp_pkt_queue.c +++ b/platform/linux-generic/odp_pkt_queue.c @@ -17,12 +17,13 @@ #define MAX(a, b) (((a) > (b)) ? (a) : (b)) #define MIN(a, b) (((a) < (b)) ? (a) : (b)) -#define INVALID_PKT 0 +#define INVALID_PKT ODP_PACKET_INVALID +#define NUM_PKTS 7 typedef struct /* Must be exactly 64 bytes long AND cacheline aligned! */ { uint32_t next_queue_blk_idx; uint32_t tail_queue_blk_idx; - odp_packet_t pkts[7]; + odp_packet_t pkts[NUM_PKTS]; } ODP_ALIGNED_CACHE queue_blk_t; typedef struct { @@ -62,6 +63,16 @@ typedef struct { uint8_t all_regions_used; } queue_pool_t; +static inline void init_queue_blk(queue_blk_t *queue_blk) +{ + int i; + + memset(queue_blk, 0, sizeof(queue_blk_t)); + + for (i = 0; i < NUM_PKTS; i++) + queue_blk->pkts[i] = INVALID_PKT; +} + static queue_blk_t *blk_idx_to_queue_blk(queue_pool_t *queue_pool, uint32_t queue_blk_idx) { @@ -91,9 +102,13 @@ static int pkt_queue_free_list_add(queue_pool_t *pool, num_blks = region_desc->num_blks; queue_blks = region_desc->queue_blks; if (!queue_blks) { + uint32_t i; malloc_len = num_blks * sizeof(queue_blk_t); queue_blks = malloc(malloc_len); - memset(queue_blks, 0, malloc_len); + + for (i = 0; i < num_blks; i++) + init_queue_blk(&queue_blks->blks[i]); + region_desc->queue_blks = queue_blks; } @@ -146,7 +161,7 @@ static queue_blk_t *queue_blk_alloc(queue_pool_t *pool, if (pool->free_list_size < pool->min_free_list_size) pool->min_free_list_size = pool->free_list_size; - memset(head_queue_blk, 0, sizeof(queue_blk_t)); + init_queue_blk(head_queue_blk); return head_queue_blk; } @@ -255,7 +270,7 @@ int _odp_pkt_queue_append(_odp_int_queue_pool_t queue_pool, return -1; pool->queue_num_tbl[queue_num] = first_blk_idx; - memset(first_blk, 0, sizeof(queue_blk_t)); + init_queue_blk(first_blk); first_blk->pkts[0] = pkt; return 0; } @@ -268,7 +283,7 @@ int _odp_pkt_queue_append(_odp_int_queue_pool_t queue_pool, tail_blk = blk_idx_to_queue_blk(pool, tail_blk_idx); /* Find first empty slot and insert pkt there. */ - for (idx = 0; idx < 7; idx++) { + for (idx = 0; idx < NUM_PKTS; idx++) { if (tail_blk->pkts[idx] == INVALID_PKT) { tail_blk->pkts[idx] = pkt; return 0; @@ -282,7 +297,7 @@ int _odp_pkt_queue_append(_odp_int_queue_pool_t queue_pool, if (!new_tail_blk) return -1; - memset(new_tail_blk, 0, sizeof(queue_blk_t)); + init_queue_blk(new_tail_blk); new_tail_blk->pkts[0] = pkt; tail_blk->next_queue_blk_idx = new_tail_blk_idx; first_blk->tail_queue_blk_idx = new_tail_blk_idx; @@ -307,7 +322,7 @@ int _odp_pkt_queue_remove(_odp_int_queue_pool_t queue_pool, /* Now remove the first valid odp_packet_t handle value we find. */ first_blk = blk_idx_to_queue_blk(pool, first_blk_idx); - for (idx = 0; idx < 7; idx++) { + for (idx = 0; idx < NUM_PKTS; idx++) { if (first_blk->pkts[idx] != INVALID_PKT) { *pkt = first_blk->pkts[idx]; first_blk->pkts[idx] = INVALID_PKT; diff --git a/test/validation/traffic_mngr/traffic_mngr.c b/test/validation/traffic_mngr/traffic_mngr.c index 0645370..1c4e90b 100644 --- a/test/validation/traffic_mngr/traffic_mngr.c +++ b/test/validation/traffic_mngr/traffic_mngr.c @@ -2086,14 +2086,14 @@ int traffic_mngr_suite_term(void) /* Close the pktios and associated packet pools. */ free_rcvd_pkts(); for (iface = 0; iface < num_ifaces; iface++) { - if (odp_pool_destroy(pools[iface]) != 0) - return -1; - if (odp_pktio_stop(pktios[iface]) != 0) return -1; if (odp_pktio_close(pktios[iface]) != 0) return -1; + + if (odp_pool_destroy(pools[iface]) != 0) + return -1; } return 0; ----------------------------------------------------------------------- Summary of changes: .../include/odp_traffic_mngr_internal.h | 2 -- platform/linux-generic/odp_pkt_queue.c | 40 +++++++++++++++------- platform/linux-generic/odp_schedule_sp.c | 19 ---------- platform/linux-generic/odp_traffic_mngr.c | 12 +++---- test/validation/traffic_mngr/traffic_mngr.c | 6 ++-- 5 files changed, 36 insertions(+), 43 deletions(-) hooks/post-receive --

8 years, 7 months

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

git-lng-odp June 2016