git-lng-odp

git-lng-odp@lists.linaro.org

2 participants
1206 discussions

[COMMIT] branch master updated. v1.21.0.0-319-g3e3a20476

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 3e3a204764ee055acb3f0ff0feff39a653362c38 (commit) via f21fc80503c72ebbd0e3286f708c7019567f8a8b (commit) via c9e8517c4945acf2c5215e0872779f00357649cf (commit) from f1e216da9011444789da716bbc258e530897da6d (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 3e3a204764ee055acb3f0ff0feff39a653362c38 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Tue Nov 5 16:10:23 2019 +0200 linux-gen: event: inline odp_event_type_multi() Inline event_type_multi function. Event type functions are performance critical as those are typically used after every schedule call. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/platform/linux-generic/include/odp/api/plat/event_inlines.h b/platform/linux-generic/include/odp/api/plat/event_inlines.h index fbecd2c14..43ee5e09a 100644 --- a/platform/linux-generic/include/odp/api/plat/event_inlines.h +++ b/platform/linux-generic/include/odp/api/plat/event_inlines.h @@ -18,11 +18,12 @@ extern const _odp_buffer_inline_offset_t _odp_buffer_inline_offset; /* Inline functions by default */ #define _ODP_INLINE static inline #define odp_event_type __odp_event_type + #define odp_event_type_multi __odp_event_type_multi #else #define _ODP_INLINE #endif -_ODP_INLINE odp_event_type_t odp_event_type(odp_event_t event) +static inline odp_event_type_t __odp_event_type_get(odp_event_t event) { int8_t type; odp_buffer_t buf = (odp_buffer_t)event; @@ -32,6 +33,27 @@ _ODP_INLINE odp_event_type_t odp_event_type(odp_event_t event) return (odp_event_type_t)type; } +_ODP_INLINE odp_event_type_t odp_event_type(odp_event_t event) +{ + return __odp_event_type_get(event); +} + +_ODP_INLINE int odp_event_type_multi(const odp_event_t event[], int num, + odp_event_type_t *type_out) +{ + int i; + odp_event_type_t type = __odp_event_type_get(event[0]); + + for (i = 1; i < num; i++) { + if (__odp_event_type_get(event[i]) != type) + break; + } + + *type_out = type; + + return i; +} + /** @endcond */ #endif diff --git a/platform/linux-generic/odp_event.c b/platform/linux-generic/odp_event.c index 6f6b3aa0b..677cd0dde 100644 --- a/platform/linux-generic/odp_event.c +++ b/platform/linux-generic/odp_event.c @@ -41,22 +41,6 @@ odp_event_type_t odp_event_types(odp_event_t event, return event_type; } -int odp_event_type_multi(const odp_event_t event[], int num, - odp_event_type_t *type_out) -{ - int i; - odp_event_type_t type = odp_event_type(event[0]); - - for (i = 1; i < num; i++) { - if (odp_event_type(event[i]) != type) - break; - } - - *type_out = type; - - return i; -} - uint32_t odp_event_flow_id(odp_event_t event) { return event_flow_id(event); commit f21fc80503c72ebbd0e3286f708c7019567f8a8b Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Tue Nov 5 15:51:46 2019 +0200 linux-gen: buffer: inline odp_buffer_addr() Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/platform/linux-generic/include/odp/api/plat/buffer_inline_types.h b/platform/linux-generic/include/odp/api/plat/buffer_inline_types.h index 29f49f8db..f59df6705 100644 --- a/platform/linux-generic/include/odp/api/plat/buffer_inline_types.h +++ b/platform/linux-generic/include/odp/api/plat/buffer_inline_types.h @@ -23,6 +23,7 @@ extern "C" { /* Buffer header field offsets for inline functions */ typedef struct _odp_buffer_inline_offset_t { uint16_t event_type; + uint16_t base_data; } _odp_buffer_inline_offset_t; diff --git a/platform/linux-generic/include/odp/api/plat/buffer_inlines.h b/platform/linux-generic/include/odp/api/plat/buffer_inlines.h index 89920510c..632ba0e69 100644 --- a/platform/linux-generic/include/odp/api/plat/buffer_inlines.h +++ b/platform/linux-generic/include/odp/api/plat/buffer_inlines.h @@ -21,6 +21,7 @@ extern const _odp_buffer_inline_offset_t _odp_buffer_inline_offset; #define _ODP_INLINE static inline #define odp_buffer_from_event __odp_buffer_from_event #define odp_buffer_to_event __odp_buffer_to_event + #define odp_buffer_addr __odp_buffer_addr #else #define _ODP_INLINE #endif @@ -35,6 +36,11 @@ _ODP_INLINE odp_event_t odp_buffer_to_event(odp_buffer_t buf) return (odp_event_t)buf; } +_ODP_INLINE void *odp_buffer_addr(odp_buffer_t buf) +{ + return _odp_buf_hdr_field(buf, void *, base_data); +} + /** @endcond */ #endif diff --git a/platform/linux-generic/odp_buffer.c b/platform/linux-generic/odp_buffer.c index 0001e598b..4c5e72640 100644 --- a/platform/linux-generic/odp_buffer.c +++ b/platform/linux-generic/odp_buffer.c @@ -20,18 +20,12 @@ /* Fill in buffer header field offsets for inline functions */ const _odp_buffer_inline_offset_t ODP_ALIGNED_CACHE _odp_buffer_inline_offset = { - .event_type = offsetof(odp_buffer_hdr_t, event_type) + .event_type = offsetof(odp_buffer_hdr_t, event_type), + .base_data = offsetof(odp_buffer_hdr_t, base_data) }; #include <odp/visibility_end.h> -void *odp_buffer_addr(odp_buffer_t buf) -{ - odp_buffer_hdr_t *hdr = buf_hdl_to_hdr(buf); - - return hdr->base_data; -} - uint32_t odp_buffer_size(odp_buffer_t buf) { odp_buffer_hdr_t *hdr = buf_hdl_to_hdr(buf); commit c9e8517c4945acf2c5215e0872779f00357649cf Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Tue Nov 5 15:28:16 2019 +0200 linux-gen: buffer: inline event handle conversions Inlined API functions which convert buffer handle to/from event handle. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 0d15e53d9..58c3f4244 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -28,6 +28,7 @@ odpapiplatincludedir= $(includedir)/odp/api/plat odpapiplatinclude_HEADERS = \ include/odp/api/plat/atomic_inlines.h \ include/odp/api/plat/buffer_inline_types.h \ + include/odp/api/plat/buffer_inlines.h \ include/odp/api/plat/byteorder_inlines.h \ include/odp/api/plat/cpu_inlines.h \ include/odp/api/plat/event_inlines.h \ @@ -238,6 +239,7 @@ endif if ODP_ABI_COMPAT __LIB__libodp_linux_la_SOURCES += \ odp_atomic_api.c \ + odp_buffer_api.c \ odp_byteorder_api.c \ odp_cpu_api.c \ odp_event_api.c \ diff --git a/platform/linux-generic/include-abi/odp/api/abi/buffer.h b/platform/linux-generic/include-abi/odp/api/abi/buffer.h index 60292d502..8239e15da 100644 --- a/platform/linux-generic/include-abi/odp/api/abi/buffer.h +++ b/platform/linux-generic/include-abi/odp/api/abi/buffer.h @@ -28,6 +28,9 @@ typedef ODP_HANDLE_T(odp_buffer_t); #define ODP_BUFFER_INVALID _odp_cast_scalar(odp_buffer_t, 0) +/* Inlined functions for non-ABI compat mode */ +#include <odp/api/plat/buffer_inlines.h> + /** * @} */ diff --git a/platform/linux-generic/include/odp/api/plat/buffer_inlines.h b/platform/linux-generic/include/odp/api/plat/buffer_inlines.h new file mode 100644 index 000000000..89920510c --- /dev/null +++ b/platform/linux-generic/include/odp/api/plat/buffer_inlines.h @@ -0,0 +1,40 @@ +/* Copyright (c) 2019, Nokia + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#ifndef ODP_PLAT_BUFFER_INLINES_H_ +#define ODP_PLAT_BUFFER_INLINES_H_ + +#include <odp/api/abi/buffer.h> +#include <odp/api/abi/event.h> + +#include <odp/api/plat/buffer_inline_types.h> + +/** @cond _ODP_HIDE_FROM_DOXYGEN_ */ + +extern const _odp_buffer_inline_offset_t _odp_buffer_inline_offset; + +#ifndef _ODP_NO_INLINE + /* Inline functions by default */ + #define _ODP_INLINE static inline + #define odp_buffer_from_event __odp_buffer_from_event + #define odp_buffer_to_event __odp_buffer_to_event +#else + #define _ODP_INLINE +#endif + +_ODP_INLINE odp_buffer_t odp_buffer_from_event(odp_event_t ev) +{ + return (odp_buffer_t)ev; +} + +_ODP_INLINE odp_event_t odp_buffer_to_event(odp_buffer_t buf) +{ + return (odp_event_t)buf; +} + +/** @endcond */ + +#endif diff --git a/platform/linux-generic/odp_buffer.c b/platform/linux-generic/odp_buffer.c index f39f76a57..0001e598b 100644 --- a/platform/linux-generic/odp_buffer.c +++ b/platform/linux-generic/odp_buffer.c @@ -25,16 +25,6 @@ _odp_buffer_inline_offset = { #include <odp/visibility_end.h> -odp_buffer_t odp_buffer_from_event(odp_event_t ev) -{ - return (odp_buffer_t)ev; -} - -odp_event_t odp_buffer_to_event(odp_buffer_t buf) -{ - return (odp_event_t)buf; -} - void *odp_buffer_addr(odp_buffer_t buf) { odp_buffer_hdr_t *hdr = buf_hdl_to_hdr(buf); diff --git a/platform/linux-generic/odp_buffer_api.c b/platform/linux-generic/odp_buffer_api.c new file mode 100644 index 000000000..01f99b158 --- /dev/null +++ b/platform/linux-generic/odp_buffer_api.c @@ -0,0 +1,11 @@ +/* Copyright (c) 2019, Nokia + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/buffer.h> + +/* Non-inlined functions for ABI compat mode */ +#define _ODP_NO_INLINE +#include <odp/api/plat/buffer_inlines.h> ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/Makefile.am | 2 + .../linux-generic/include-abi/odp/api/abi/buffer.h | 3 ++ .../include/odp/api/plat/buffer_inline_types.h | 1 + .../include/odp/api/plat/buffer_inlines.h | 46 ++++++++++++++++++++++ .../include/odp/api/plat/event_inlines.h | 24 ++++++++++- platform/linux-generic/odp_buffer.c | 20 +--------- .../{odp_cpu_api.c => odp_buffer_api.c} | 6 +-- platform/linux-generic/odp_event.c | 16 -------- 8 files changed, 80 insertions(+), 38 deletions(-) create mode 100644 platform/linux-generic/include/odp/api/plat/buffer_inlines.h copy platform/linux-generic/{odp_cpu_api.c => odp_buffer_api.c} (59%) hooks/post-receive --

6 years, 3 months

[COMMIT] branch master updated. v1.21.0.0-316-gf1e216da9

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 f1e216da9011444789da716bbc258e530897da6d (commit) via f7caa49d2ba750d1fd29a12e288b441a6dac545f (commit) via f678476829f61a34d5d1e2b69b92c157786162e5 (commit) via c37655b8b74aa50825be8d58afa18d91b4a9a1fd (commit) via 642f27acf0c39ade24d6ea6551dde362206f4d4f (commit) via d2a9548017edaceec8cc682183690592c4c483b2 (commit) via 68e1cd81665c3b8deede1974d653593af85ec183 (commit) from b921639a9df6a0300ca1c50b5853a37241806366 (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 f1e216da9011444789da716bbc258e530897da6d Author: Matias Elo <matias.elo(a)nokia.com> Date: Fri Nov 1 12:00:41 2019 +0200 validation: scheduler: add scheduled and plain queue tests Add new validation tests to verify that packet order is maintained when events are enqueued and dequeued to/from a plain queue while maintaining atomic/ordered scheduling context. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> Tested-by: Jussi Kerttula <jussi.kerttula(a)nokia.com> diff --git a/test/validation/api/scheduler/scheduler.c b/test/validation/api/scheduler/scheduler.c index da87deaef..ca92a3cf8 100644 --- a/test/validation/api/scheduler/scheduler.c +++ b/test/validation/api/scheduler/scheduler.c @@ -55,6 +55,8 @@ #define WAIT_TOLERANCE (150 * ODP_TIME_MSEC_IN_NS) #define WAIT_1MS_RETRIES 1000 +#define SCHED_AND_PLAIN_ROUNDS 10000 + /* Test global variables */ typedef struct { int num_workers; @@ -72,6 +74,10 @@ typedef struct { odp_queue_t handle; char name[ODP_QUEUE_NAME_LEN]; } chaos_q[CHAOS_NUM_QUEUES]; + struct { + odp_queue_t sched; + odp_queue_t plain; + } sched_and_plain_q; } test_globals_t; typedef struct { @@ -1780,6 +1786,229 @@ static void scheduler_test_ordered_lock(void) CU_ASSERT(drain_queues() == 0); } +static int sched_and_plain_thread(void *arg) +{ + odp_event_t ev1, ev2; + thread_args_t *args = (thread_args_t *)arg; + test_globals_t *globals = args->globals; + odp_queue_t sched_queue = globals->sched_and_plain_q.sched; + odp_queue_t plain_queue = globals->sched_and_plain_q.plain; + odp_schedule_sync_t sync = odp_queue_sched_type(sched_queue); + uint64_t i, wait; + + /* Wait for all threads to start */ + odp_barrier_wait(&globals->barrier); + + /* Run the test */ + wait = odp_schedule_wait_time(10 * ODP_TIME_MSEC_IN_NS); + for (i = 0; i < SCHED_AND_PLAIN_ROUNDS; i++) { + uint32_t rand_val; + + /* Dequeue events from scheduled and plain queues */ + ev1 = odp_schedule(NULL, wait); + if (ev1 == ODP_EVENT_INVALID) + continue; + + if (sync == ODP_SCHED_SYNC_ORDERED) + odp_schedule_order_lock(0); + + ev2 = odp_queue_deq(plain_queue); + CU_ASSERT_FATAL(ev2 != ODP_EVENT_INVALID); + + /* Add random delay to stress scheduler implementation */ + odp_random_data((uint8_t *)&rand_val, sizeof(rand_val), + ODP_RANDOM_BASIC); + odp_time_wait_ns(rand_val % ODP_TIME_USEC_IN_NS); + + /* Enqueue events back to the end of the queues */ + CU_ASSERT_FATAL(!odp_queue_enq(plain_queue, ev2)); + + if (sync == ODP_SCHED_SYNC_ORDERED) + odp_schedule_order_unlock(0); + + CU_ASSERT_FATAL(!odp_queue_enq(sched_queue, ev1)); + } + + /* Make sure scheduling context is released */ + odp_schedule_pause(); + while ((ev1 = odp_schedule(NULL, wait)) != ODP_EVENT_INVALID) + CU_ASSERT_FATAL(!odp_queue_enq(sched_queue, ev1)); + + /* Don't resume scheduling until all threads have finished */ + odp_barrier_wait(&globals->barrier); + odp_schedule_resume(); + + return 0; +} + +static void scheduler_test_sched_and_plain(odp_schedule_sync_t sync) +{ + thread_args_t *args; + test_globals_t *globals; + odp_queue_t sched_queue; + odp_queue_t plain_queue; + odp_pool_t pool; + odp_queue_param_t queue_param; + odp_pool_param_t pool_param; + odp_queue_capability_t queue_capa; + odp_schedule_capability_t sched_capa; + odp_shm_t shm; + odp_event_t ev; + uint32_t *buf_data; + uint32_t seq; + uint64_t wait = odp_schedule_wait_time(100 * ODP_TIME_MSEC_IN_NS); + uint32_t events_per_queue = BUFS_PER_QUEUE / 2; + uint32_t prev_seq; + int first; + + CU_ASSERT_FATAL(!odp_schedule_capability(&sched_capa)); + CU_ASSERT_FATAL(!odp_queue_capability(&queue_capa)) + + if (sync == ODP_SCHED_SYNC_ORDERED && + sched_capa.max_ordered_locks == 0) { + printf("\n NO ORDERED LOCKS. scheduler_test_ordered_and_plain skipped.\n"); + return; + } + + /* Set up the scheduling environment */ + shm = odp_shm_lookup(GLOBALS_SHM_NAME); + CU_ASSERT_FATAL(shm != ODP_SHM_INVALID); + globals = odp_shm_addr(shm); + CU_ASSERT_PTR_NOT_NULL_FATAL(globals); + + shm = odp_shm_lookup(SHM_THR_ARGS_NAME); + CU_ASSERT_FATAL(shm != ODP_SHM_INVALID); + args = odp_shm_addr(shm); + CU_ASSERT_PTR_NOT_NULL_FATAL(args); + args->globals = globals; + + /* Make sure all events fit to queues */ + if (sched_capa.max_queue_size && + sched_capa.max_queue_size < events_per_queue) + events_per_queue = sched_capa.max_queue_size; + if (queue_capa.plain.max_size && + queue_capa.plain.max_size < events_per_queue) + events_per_queue = queue_capa.plain.max_size; + + odp_queue_param_init(&queue_param); + queue_param.type = ODP_QUEUE_TYPE_SCHED; + queue_param.sched.sync = sync; + queue_param.size = events_per_queue; + if (sync == ODP_SCHED_SYNC_ORDERED) + queue_param.sched.lock_count = 1; + + sched_queue = odp_queue_create(NULL, &queue_param); + CU_ASSERT_FATAL(sched_queue != ODP_QUEUE_INVALID); + globals->sched_and_plain_q.sched = sched_queue; + + odp_queue_param_init(&queue_param); + queue_param.type = ODP_QUEUE_TYPE_PLAIN; + queue_param.size = events_per_queue; + + plain_queue = odp_queue_create(NULL, &queue_param); + CU_ASSERT_FATAL(sched_queue != ODP_QUEUE_INVALID); + globals->sched_and_plain_q.plain = plain_queue; + + odp_pool_param_init(&pool_param); + pool_param.buf.size = 100; + pool_param.buf.num = 2 * events_per_queue; + pool_param.type = ODP_POOL_BUFFER; + + pool = odp_pool_create("sched_to_plain_pool", &pool_param); + CU_ASSERT_FATAL(pool != ODP_POOL_INVALID); + + /* Create and enq test events with sequential sequence numbers */ + for (seq = 0; seq < events_per_queue; seq++) { + odp_buffer_t buf1, buf2; + + buf1 = odp_buffer_alloc(pool); + if (buf1 == ODP_BUFFER_INVALID) + break; + buf2 = odp_buffer_alloc(pool); + if (buf2 == ODP_BUFFER_INVALID) { + odp_buffer_free(buf1); + break; + } + buf_data = odp_buffer_addr(buf1); + *buf_data = seq; + buf_data = odp_buffer_addr(buf2); + *buf_data = seq; + + /* Events flow id is 0 by default */ + CU_ASSERT_FATAL(!odp_queue_enq(sched_queue, + odp_buffer_to_event(buf1))); + CU_ASSERT_FATAL(!odp_queue_enq(plain_queue, + odp_buffer_to_event(buf2))); + } + CU_ASSERT_FATAL(seq > 2); + + /* Test runs also on the main thread */ + args->cu_thr.numthrds = globals->num_workers - 1; + if (args->cu_thr.numthrds > 0) + odp_cunit_thread_create(sched_and_plain_thread, &args->cu_thr); + + sched_and_plain_thread(args); + + if (args->cu_thr.numthrds > 0) + odp_cunit_thread_exit(&args->cu_thr); + + /* Check plain queue sequence numbers and free events */ + first = 1; + while (1) { + ev = odp_queue_deq(plain_queue); + if (ev == ODP_EVENT_INVALID) + break; + + buf_data = odp_buffer_addr(odp_buffer_from_event(ev)); + seq = *buf_data; + + if (first) { + first = 0; + prev_seq = seq; + continue; + } + + CU_ASSERT(seq == prev_seq + 1 || seq == 0) + prev_seq = seq; + odp_event_free(ev); + } + + /* Check scheduled queue sequence numbers and free events */ + first = 1; + while (1) { + ev = odp_schedule(NULL, wait); + if (ev == ODP_EVENT_INVALID) + break; + + buf_data = odp_buffer_addr(odp_buffer_from_event(ev)); + seq = *buf_data; + + if (first) { + first = 0; + prev_seq = seq; + continue; + } + + CU_ASSERT(seq == prev_seq + 1 || seq == 0) + prev_seq = seq; + odp_event_free(ev); + } + + CU_ASSERT(!odp_queue_destroy(sched_queue)); + CU_ASSERT(!odp_queue_destroy(plain_queue)); + CU_ASSERT(!odp_pool_destroy(pool)); +} + +static void scheduler_test_atomic_and_plain(void) +{ + scheduler_test_sched_and_plain(ODP_SCHED_SYNC_ATOMIC); +} + +static void scheduler_test_ordered_and_plain(void) +{ + scheduler_test_sched_and_plain(ODP_SCHED_SYNC_ORDERED); +} + static int create_queues(test_globals_t *globals) { int i, j, prios, rc; @@ -2278,6 +2507,8 @@ odp_testinfo_t scheduler_suite[] = { ODP_TEST_INFO(scheduler_test_parallel), ODP_TEST_INFO(scheduler_test_atomic), ODP_TEST_INFO(scheduler_test_ordered), + ODP_TEST_INFO(scheduler_test_atomic_and_plain), + ODP_TEST_INFO(scheduler_test_ordered_and_plain), ODP_TEST_INFO(scheduler_test_chaos), ODP_TEST_INFO(scheduler_test_1q_1t_n), ODP_TEST_INFO(scheduler_test_1q_1t_a), commit f7caa49d2ba750d1fd29a12e288b441a6dac545f Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Thu Oct 31 16:42:19 2019 +0200 test: timer_perf: add private timer pool support Added -s option to select between shared and private timer pools. Currently, private timer pools can be tested only with single CPU (the master thread runs the test). Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/test/performance/odp_timer_perf.c b/test/performance/odp_timer_perf.c index d0f936a8e..c49baf0bd 100644 --- a/test/performance/odp_timer_perf.c +++ b/test/performance/odp_timer_perf.c @@ -25,6 +25,7 @@ typedef struct test_options_t { uint32_t num_timer; uint64_t res_ns; uint64_t period_ns; + int shared; } test_options_t; @@ -87,6 +88,10 @@ static void print_usage(void) " -t, --num_timer Number of timers per timer pool. Default: 10\n" " -r, --res_ns Resolution in nsec. Default: 10000000\n" " -p, --period_ns Timeout period in nsec. Default: 100000000\n" + " -s, --shared Shared vs private timer pool. Currently, private pools can be\n" + " tested only with single CPU. Default: 1\n" + " 0: Private timer pools\n" + " 1: Shared timer pools\n" " -h, --help This help\n" "\n"); } @@ -103,17 +108,19 @@ static int parse_options(int argc, char *argv[], test_options_t *test_options) {"num_timer", required_argument, NULL, 't'}, {"res_ns", required_argument, NULL, 'r'}, {"period_ns", required_argument, NULL, 'p'}, + {"shared", required_argument, NULL, 's'}, {"help", no_argument, NULL, 'h'}, {NULL, 0, NULL, 0} }; - static const char *shortopts = "+c:n:t:r:p:h"; + static const char *shortopts = "+c:n:t:r:p:s:h"; test_options->num_cpu = 1; test_options->num_tp = 1; test_options->num_timer = 10; test_options->res_ns = 10 * ODP_TIME_MSEC_IN_NS; test_options->period_ns = 100 * ODP_TIME_MSEC_IN_NS; + test_options->shared = 1; while (1) { opt = getopt_long(argc, argv, shortopts, longopts, &long_index); @@ -137,6 +144,9 @@ static int parse_options(int argc, char *argv[], test_options_t *test_options) case 'p': test_options->period_ns = atoll(optarg); break; + case 's': + test_options->shared = atoi(optarg); + break; case 'h': /* fall through */ default: @@ -159,6 +169,7 @@ static int set_num_cpu(test_global_t *global) int ret; test_options_t *test_options = &global->test_options; int num_cpu = test_options->num_cpu; + int shared = test_options->shared; /* One thread used for the main thread */ if (num_cpu > ODP_THREAD_COUNT_MAX - 1) { @@ -174,14 +185,21 @@ static int set_num_cpu(test_global_t *global) return -1; } + if (shared == 0 && num_cpu != 1) { + printf("Error: Private pool test supports only single CPU\n."); + return -1; + } + /* Zero: all available workers */ if (num_cpu == 0) { num_cpu = ret; test_options->num_cpu = num_cpu; } - /* Main thread + all workers */ - odp_barrier_init(&global->barrier, num_cpu + 1); + if (shared) /* Main thread + all workers */ + odp_barrier_init(&global->barrier, num_cpu + 1); + else /* Only the main thread */ + odp_barrier_init(&global->barrier, 1); return 0; } @@ -204,11 +222,17 @@ static int create_timer_pools(test_global_t *global) uint32_t num_timer = test_options->num_timer; uint64_t res_ns = test_options->res_ns; uint64_t period_ns = test_options->period_ns; + int priv; max_tmo_ns = START_NS + (num_timer * period_ns); + priv = 0; + if (test_options->shared == 0) + priv = 1; + printf("\nTimer performance test\n"); printf(" num cpu %u\n", num_cpu); + printf(" private pool %i\n", priv); printf(" num timer pool %u\n", num_tp); printf(" num timer %u\n", num_timer); printf(" resolution %" PRIu64 " nsec\n", res_ns); @@ -266,7 +290,7 @@ static int create_timer_pools(test_global_t *global) timer_pool_param.min_tmo = START_NS; timer_pool_param.max_tmo = max_tmo_ns; timer_pool_param.num_timers = num_timer; - timer_pool_param.priv = 0; + timer_pool_param.priv = priv; timer_pool_param.clk_src = ODP_CLOCK_CPU; odp_pool_param_init(&pool_param); @@ -540,8 +564,6 @@ static int start_workers(test_global_t *global, odp_instance_t instance) thr_param[i].start = test_worker; thr_param[i].arg = &global->thread_arg[i]; thr_param[i].thr_type = ODP_THREAD_WORKER; - - global->thread_arg[i].global = global; } ret = odph_thread_create(global->thread_tbl, &thr_common, thr_param, @@ -644,16 +666,24 @@ int main(int argc, char **argv) odp_instance_t instance; odp_init_t init; test_global_t *global; + test_options_t *test_options; + int i, shared; global = &test_global; memset(global, 0, sizeof(test_global_t)); odp_atomic_init_u32(&global->exit_test, 0); + for (i = 0; i < ODP_THREAD_COUNT_MAX; i++) + global->thread_arg[i].global = global; + signal(SIGINT, sig_handler); if (parse_options(argc, argv, &global->test_options)) return -1; + test_options = &global->test_options; + shared = test_options->shared; + /* List features not to be used */ odp_init_param_init(&init); init.not_used.feat.cls = 1; @@ -681,22 +711,33 @@ int main(int argc, char **argv) if (create_timer_pools(global)) return -1; - /* Start worker threads */ - start_workers(global, instance); + if (shared) { + /* Start worker threads */ + start_workers(global, instance); - /* Wait until workers have started. - * Scheduler calls from workers may be needed to run timer pools in - * a software implementation. Wait 1 msec to ensure that timer pools - * are running before setting timers. */ - odp_barrier_wait(&global->barrier); - odp_time_wait_ns(ODP_TIME_MSEC_IN_NS); + /* Wait until workers have started. + * Scheduler calls from workers may be needed to run timer + * pools in a software implementation. Wait 1 msec to ensure + * that timer pools are running before setting timers. */ + odp_barrier_wait(&global->barrier); + odp_time_wait_ns(ODP_TIME_MSEC_IN_NS); + } /* Set timers. Force workers to exit on failure. */ if (set_timers(global)) odp_atomic_add_u32(&global->exit_test, MAX_TIMER_POOLS); - /* Wait workers to exit */ - odph_thread_join(global->thread_tbl, global->test_options.num_cpu); + if (!shared) { + /* Test private pools on the master thread */ + if (test_worker(&global->thread_arg[0])) { + printf("Error: test loop failed\n"); + return -1; + } + } else { + /* Wait workers to exit */ + odph_thread_join(global->thread_tbl, + global->test_options.num_cpu); + } print_stat(global); commit f678476829f61a34d5d1e2b69b92c157786162e5 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Thu Oct 31 10:27:02 2019 +0200 validation: timer: add private timer pool test Create timer pool with the 'priv' flag set. The same thread calls schedule / queue_deq that created the pool. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/test/validation/api/timer/timer.c b/test/validation/api/timer/timer.c index 376a1218b..c9a70205e 100644 --- a/test/validation/api/timer/timer.c +++ b/test/validation/api/timer/timer.c @@ -536,7 +536,7 @@ static void timer_test_pkt_event_sched(void) timer_test_event_type(ODP_QUEUE_TYPE_SCHED, ODP_EVENT_PACKET); } -static void timer_test_queue_type(odp_queue_type_t queue_type) +static void timer_test_queue_type(odp_queue_type_t queue_type, int priv) { odp_pool_t pool; const int num = 10; @@ -567,7 +567,7 @@ static void timer_test_queue_type(odp_queue_type_t queue_type) tparam.min_tmo = global_mem->param.min_tmo; tparam.max_tmo = global_mem->param.max_tmo; tparam.num_timers = num + 1; - tparam.priv = 0; + tparam.priv = priv; tparam.clk_src = ODP_CLOCK_CPU; ODPH_DBG("\nTimer pool parameters:\n"); @@ -665,8 +665,7 @@ static void timer_test_queue_type(odp_queue_type_t queue_type) CU_ASSERT(diff_test > (test_period - period_ns)); CU_ASSERT(diff_test < (test_period + period_ns)); - /* Scalable scheduler needs this pause sequence. Otherwise, it gets - * stuck on terminate. */ + /* Reset scheduler context for the next test case */ if (queue_type == ODP_QUEUE_TYPE_SCHED) { odp_schedule_pause(); while (1) { @@ -677,6 +676,7 @@ static void timer_test_queue_type(odp_queue_type_t queue_type) CU_FAIL("Drop extra event\n"); odp_event_free(ev); } + odp_schedule_resume(); } odp_timer_pool_destroy(tp); @@ -687,12 +687,22 @@ static void timer_test_queue_type(odp_queue_type_t queue_type) static void timer_test_plain_queue(void) { - timer_test_queue_type(ODP_QUEUE_TYPE_PLAIN); + timer_test_queue_type(ODP_QUEUE_TYPE_PLAIN, 0); } static void timer_test_sched_queue(void) { - timer_test_queue_type(ODP_QUEUE_TYPE_SCHED); + timer_test_queue_type(ODP_QUEUE_TYPE_SCHED, 0); +} + +static void timer_test_plain_queue_priv(void) +{ + timer_test_queue_type(ODP_QUEUE_TYPE_PLAIN, 1); +} + +static void timer_test_sched_queue_priv(void) +{ + timer_test_queue_type(ODP_QUEUE_TYPE_SCHED, 1); } static void timer_test_cancel(void) @@ -1451,6 +1461,8 @@ odp_testinfo_t timer_suite[] = { ODP_TEST_INFO(timer_test_max_tmo_max_tmo_sched), ODP_TEST_INFO(timer_test_plain_queue), ODP_TEST_INFO(timer_test_sched_queue), + ODP_TEST_INFO(timer_test_plain_queue_priv), + ODP_TEST_INFO(timer_test_sched_queue_priv), ODP_TEST_INFO(timer_test_all), ODP_TEST_INFO_NULL, }; commit c37655b8b74aa50825be8d58afa18d91b4a9a1fd Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Wed Oct 30 16:08:34 2019 +0200 linux-gen: timer: use thread type config option Use configure file option to select if control threads poll shared timer pools. Timer processing of control and worker threads may be separated completely, if control threads create private timer pools and do not process shared pools. This way, worker threads will not poll control thread pools and vice versa, but both can use timers. Implemented private timer pools with minimal effort. Implementation of private and shared pools could be separated in the future (for better performance), as private pools do not need data synchronization between other threads. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/platform/linux-generic/odp_timer.c b/platform/linux-generic/odp_timer.c index e82d29059..3a82ee84b 100644 --- a/platform/linux-generic/odp_timer.c +++ b/platform/linux-generic/odp_timer.c @@ -127,6 +127,7 @@ typedef struct timer_pool_s { odp_shm_t shm; timer_t timerid; int notify_overrun; + int owner; pthread_t thr_pthread; /* pthread_t of timer thread */ pid_t thr_pid; /* gettid() for timer thread */ int thr_warm_up; /* number of warm up rounds */ @@ -167,6 +168,7 @@ typedef struct timer_global_t { typedef struct timer_local_t { odp_time_t last_run; int run_cnt; + uint8_t poll_shared; } timer_local_t; @@ -353,6 +355,11 @@ static odp_timer_pool_t timer_pool_new(const char *name, odp_atomic_init_u32(&tp->high_wm, 0); tp->first_free = 0; tp->notify_overrun = 1; + tp->owner = -1; + + if (param->priv) + tp->owner = odp_thread_id(); + tp->tick_buf = (void *)((char *)odp_shm_addr(shm) + sz0); tp->timers = (void *)((char *)odp_shm_addr(shm) + sz0 + sz1); @@ -922,6 +929,17 @@ static inline void timer_pool_scan_inline(int num, odp_time_t now) if (tp == NULL) continue; + if (odp_likely(tp->owner < 0)) { + /* Skip shared pool, if this thread is not configured + * to process those */ + if (odp_unlikely(timer_local.poll_shared == 0)) + continue; + } else { + /* Skip private pool, if this thread is not the owner */ + if (tp->owner != odp_thread_id()) + continue; + } + nsec = time_nsec(tp, now); new_tick = nsec / tp->nsec_per_scan; old_tick = odp_atomic_load_u64(&tp->cur_tick); @@ -1557,8 +1575,27 @@ int _odp_timer_term_global(void) int _odp_timer_init_local(void) { + int conf_thr_type; + odp_thread_type_t thr_type; + timer_local.last_run = odp_time_global_from_ns(0); timer_local.run_cnt = 1; + timer_local.poll_shared = 0; + + /* Timer feature disabled */ + if (timer_global == NULL) + return 0; + + /* Check if this thread polls shared (non-private) timer pools */ + conf_thr_type = timer_global->thread_type; + thr_type = odp_thread_type(); + + if (conf_thr_type == 0) + timer_local.poll_shared = 1; + else if (conf_thr_type == 1 && thr_type == ODP_THREAD_WORKER) + timer_local.poll_shared = 1; + else if (conf_thr_type == 2 && thr_type == ODP_THREAD_CONTROL) + timer_local.poll_shared = 1; return 0; } commit 642f27acf0c39ade24d6ea6551dde362206f4d4f Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Wed Oct 30 13:57:23 2019 +0200 linux-gen: timer: move thread local variables into struct Moved type definition into beginning of the file and gathered thread local variables into timer_local_t struct. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/platform/linux-generic/odp_timer.c b/platform/linux-generic/odp_timer.c index 4af31bcc1..e82d29059 100644 --- a/platform/linux-generic/odp_timer.c +++ b/platform/linux-generic/odp_timer.c @@ -66,35 +66,12 @@ /* Max inline timer resolution */ #define MAX_INLINE_RES_NS 500 -/****************************************************************************** - * Mutual exclusion in the absence of CAS16 - *****************************************************************************/ - +/* Mutual exclusion in the absence of CAS16 */ #ifndef ODP_ATOMIC_U128 #define NUM_LOCKS 1024 #define IDX2LOCK(idx) (&timer_global->locks[(idx) % NUM_LOCKS]) #endif -/****************************************************************************** - * Translation between timeout buffer and timeout header - *****************************************************************************/ - -static odp_timeout_hdr_t *timeout_hdr_from_buf(odp_buffer_t buf) -{ - return (odp_timeout_hdr_t *)(void *)buf_hdl_to_hdr(buf); -} - -static odp_timeout_hdr_t *timeout_hdr(odp_timeout_t tmo) -{ - odp_buffer_t buf = odp_buffer_from_event(odp_timeout_to_event(tmo)); - - return timeout_hdr_from_buf(buf); -} - -/****************************************************************************** - * odp_timer abstract datatype - *****************************************************************************/ - typedef struct #ifdef ODP_ATOMIC_U128 ODP_ALIGNED(16) /* 16-byte atomic operations need properly aligned addresses */ @@ -128,55 +105,11 @@ ODP_STATIC_ASSERT(sizeof(tick_buf_t) == 16, "sizeof(tick_buf_t) == 16"); typedef struct { void *user_ptr; odp_queue_t queue;/* Used for free list when timer is free */ -} _odp_timer_t; - -static void timer_init(_odp_timer_t *tim, - tick_buf_t *tb, - odp_queue_t _q, - void *_up) -{ - tim->queue = _q; - tim->user_ptr = _up; - tb->tmo_u64 = 0; - tb->tmo_buf = ODP_BUFFER_INVALID; - /* Release the timer by setting timer state to inactive */ -#if __GCC_ATOMIC_LLONG_LOCK_FREE < 2 - tb->exp_tck.v = TMO_INACTIVE; -#else - _odp_atomic_u64_store_mm(&tb->exp_tck, TMO_INACTIVE, _ODP_MEMMODEL_RLS); -#endif -} - -/* Teardown when timer is freed */ -static void timer_fini(_odp_timer_t *tim, tick_buf_t *tb) -{ - ODP_ASSERT(tb->exp_tck.v == TMO_UNUSED); - ODP_ASSERT(tb->tmo_buf == ODP_BUFFER_INVALID); - tim->queue = ODP_QUEUE_INVALID; - tim->user_ptr = NULL; -} - -static inline uint32_t get_next_free(_odp_timer_t *tim) -{ - /* Reusing 'queue' for next free index */ - return _odp_typeval(tim->queue); -} - -static inline void set_next_free(_odp_timer_t *tim, uint32_t nf) -{ - ODP_ASSERT(tim->queue == ODP_QUEUE_INVALID); - /* Reusing 'queue' for next free index */ - tim->queue = _odp_cast_scalar(odp_queue_t, nf); -} - -/****************************************************************************** - * timer_pool_t abstract datatype - * Inludes alloc and free timer - *****************************************************************************/ +} _odp_timer_t; typedef struct timer_pool_s { -/* Put frequently accessed fields in the first cache line */ + /* Put frequently accessed fields in the first cache line */ uint64_t nsec_per_scan; odp_time_t start_time; odp_atomic_u64_t cur_tick;/* Current tick value */ @@ -199,6 +132,7 @@ typedef struct timer_pool_s { int thr_warm_up; /* number of warm up rounds */ odp_atomic_u32_t thr_ready; /* thread ready from warm up */ int thr_exit; /* request to exit for timer thread */ + } timer_pool_t; /* Timer pool index must fit into 8 bits with one index value reserved to @@ -230,8 +164,62 @@ typedef struct timer_global_t { } timer_global_t; +typedef struct timer_local_t { + odp_time_t last_run; + int run_cnt; + +} timer_local_t; + +/* Points to timer global data */ static timer_global_t *timer_global; +/* Timer thread local data */ +static __thread timer_local_t timer_local; + +/* Forward declarations */ +static void itimer_init(timer_pool_t *tp); +static void itimer_fini(timer_pool_t *tp); + +static void timer_init(_odp_timer_t *tim, + tick_buf_t *tb, + odp_queue_t _q, + void *_up) +{ + tim->queue = _q; + tim->user_ptr = _up; + tb->tmo_u64 = 0; + tb->tmo_buf = ODP_BUFFER_INVALID; + + /* Release the timer by setting timer state to inactive */ +#if __GCC_ATOMIC_LLONG_LOCK_FREE < 2 + tb->exp_tck.v = TMO_INACTIVE; +#else + _odp_atomic_u64_store_mm(&tb->exp_tck, TMO_INACTIVE, _ODP_MEMMODEL_RLS); +#endif +} + +/* Teardown when timer is freed */ +static void timer_fini(_odp_timer_t *tim, tick_buf_t *tb) +{ + ODP_ASSERT(tb->exp_tck.v == TMO_UNUSED); + ODP_ASSERT(tb->tmo_buf == ODP_BUFFER_INVALID); + tim->queue = ODP_QUEUE_INVALID; + tim->user_ptr = NULL; +} + +static inline uint32_t get_next_free(_odp_timer_t *tim) +{ + /* Reusing 'queue' for next free index */ + return _odp_typeval(tim->queue); +} + +static inline void set_next_free(_odp_timer_t *tim, uint32_t nf) +{ + ODP_ASSERT(tim->queue == ODP_QUEUE_INVALID); + /* Reusing 'queue' for next free index */ + tim->queue = _odp_cast_scalar(odp_queue_t, nf); +} + static inline timer_pool_t *timer_pool_from_hdl(odp_timer_pool_t hdl) { return (timer_pool_t *)(uintptr_t)hdl; @@ -274,9 +262,17 @@ static inline odp_timer_t tp_idx_to_handle(timer_pool_t *tp, (idx + 1)); } -/* Forward declarations */ -static void itimer_init(timer_pool_t *tp); -static void itimer_fini(timer_pool_t *tp); +static odp_timeout_hdr_t *timeout_hdr_from_buf(odp_buffer_t buf) +{ + return (odp_timeout_hdr_t *)(void *)buf_hdl_to_hdr(buf); +} + +static odp_timeout_hdr_t *timeout_hdr(odp_timeout_t tmo) +{ + odp_buffer_t buf = odp_buffer_from_event(odp_timeout_to_event(tmo)); + + return timeout_hdr_from_buf(buf); +} static odp_timer_pool_t timer_pool_new(const char *name, const odp_timer_pool_param_t *param) @@ -952,8 +948,6 @@ static inline void timer_pool_scan_inline(int num, odp_time_t now) void _timer_run_inline(int dec) { - static __thread odp_time_t last_timer_run; - static __thread int timer_run_cnt = 1; odp_time_t now; int num = timer_global->highest_tp_idx + 1; int poll_interval = timer_global->poll_interval; @@ -964,21 +958,21 @@ void _timer_run_inline(int dec) /* Rate limit how often this thread checks the timer pools. */ if (poll_interval > 1) { - timer_run_cnt -= dec; - if (timer_run_cnt > 0) + timer_local.run_cnt -= dec; + if (timer_local.run_cnt > 0) return; - timer_run_cnt = poll_interval; + timer_local.run_cnt = poll_interval; } now = odp_time_global(); if (poll_interval > 1) { - odp_time_t period = odp_time_diff(now, last_timer_run); + odp_time_t period = odp_time_diff(now, timer_local.last_run); if (odp_time_cmp(period, timer_global->poll_interval_time) < 0) return; - last_timer_run = now; + timer_local.last_run = now; } /* Check the timer pools. */ @@ -1563,6 +1557,9 @@ int _odp_timer_term_global(void) int _odp_timer_init_local(void) { + timer_local.last_run = odp_time_global_from_ns(0); + timer_local.run_cnt = 1; + return 0; } commit d2a9548017edaceec8cc682183690592c4c483b2 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Wed Oct 30 11:24:56 2019 +0200 linux-gen: timer: add inline_thread_type config file option Added option to control which thread types process (non-private) inline timer pools. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/config/odp-linux-generic.conf b/config/odp-linux-generic.conf index 4e24ef82d..b35089944 100644 --- a/config/odp-linux-generic.conf +++ b/config/odp-linux-generic.conf @@ -16,7 +16,7 @@ # Mandatory fields odp_implementation = "linux-generic" -config_file_version = "0.1.9" +config_file_version = "0.1.10" # Shared memory options shm: { @@ -148,18 +148,21 @@ timer: { # Use inline timer implementation # # By default, timer processing is done in background threads (thread per - # timer pool). With inline implementation timers are processed on worker - # cores instead. When using inline timers the application has to call - # odp_schedule() or odp_queue_deq() to actuate timer processing. + # timer pool). With inline implementation timers are processed by ODP + # application threads instead. When using inline timers the application + # has to call odp_schedule() or odp_queue_deq() regularly to actuate + # timer processing. # - # Set to 1 to enable + # 0: Use POSIX timer and background threads to process timers + # 1: Use inline timer implementation and application threads to process + # timers inline = 0 # Inline timer poll interval # # When set to 1 inline timers are polled during every schedule round. # Increasing the value reduces timer processing overhead while - # decreasing accuracy. Ignored when inline timer is not enabled. + # decreasing accuracy. Ignored when inline timer is not used. inline_poll_interval = 10 # Inline timer poll interval in nanoseconds @@ -168,6 +171,18 @@ timer: { # inline timer polling rate in nanoseconds. By default, this defines the # maximum rate a thread may poll timers. If a timer pool is created with # a higher resolution than this, the polling rate is increased - # accordingly. + # accordingly. Ignored when inline timer is not used. inline_poll_interval_nsec = 500000 + + # Inline timer use of threads + # + # Select which thread types process non-private timer pools in inline + # timer implementation. Thread type does not affect private timer + # pool procesessing, those are always processed by the thread which + # created the pool. Ignored when inline timer is not used. + # + # 0: Both control and worker threads process non-private timer pools + # 1: Only worker threads process non-private timer pools + # 2: Only control threads process non-private timer pools + inline_thread_type = 0 } diff --git a/platform/linux-generic/odp_timer.c b/platform/linux-generic/odp_timer.c index e21b29b0c..4af31bcc1 100644 --- a/platform/linux-generic/odp_timer.c +++ b/platform/linux-generic/odp_timer.c @@ -226,6 +226,7 @@ typedef struct timer_global_t { odp_bool_t use_inline_timers; int poll_interval; int highest_tp_idx; + uint8_t thread_type; } timer_global_t; @@ -1511,35 +1512,43 @@ int _odp_timer_init_global(const odp_init_t *params) conf_str = "timer.inline"; if (!_odp_libconfig_lookup_int(conf_str, &val)) { ODP_ERR("Config option '%s' not found.\n", conf_str); - odp_shm_free(shm); - return -1; + goto error; } timer_global->use_inline_timers = val; conf_str = "timer.inline_poll_interval"; if (!_odp_libconfig_lookup_int(conf_str, &val)) { ODP_ERR("Config option '%s' not found.\n", conf_str); - odp_shm_free(shm); - return -1; + goto error; } timer_global->poll_interval = val; conf_str = "timer.inline_poll_interval_nsec"; if (!_odp_libconfig_lookup_int(conf_str, &val)) { ODP_ERR("Config option '%s' not found.\n", conf_str); - odp_shm_free(shm); - return -1; + goto error; } timer_global->poll_interval_nsec = val; timer_global->poll_interval_time = odp_time_global_from_ns(timer_global->poll_interval_nsec); + conf_str = "timer.inline_thread_type"; + if (!_odp_libconfig_lookup_int(conf_str, &val)) { + ODP_ERR("Config option '%s' not found.\n", conf_str); + goto error; + } + timer_global->thread_type = val; + if (!timer_global->use_inline_timers) { timer_res_init(); block_sigalarm(); } return 0; + +error: + odp_shm_free(shm); + return -1; } int _odp_timer_term_global(void) diff --git a/platform/linux-generic/test/inline-timer.conf b/platform/linux-generic/test/inline-timer.conf index 435f51e6d..362ecd559 100644 --- a/platform/linux-generic/test/inline-timer.conf +++ b/platform/linux-generic/test/inline-timer.conf @@ -1,6 +1,6 @@ # Mandatory fields odp_implementation = "linux-generic" -config_file_version = "0.1.9" +config_file_version = "0.1.10" timer: { # Enable inline timer implementation diff --git a/platform/linux-generic/test/process-mode.conf b/platform/linux-generic/test/process-mode.conf index 708b9b4a8..6fb08aeaf 100644 --- a/platform/linux-generic/test/process-mode.conf +++ b/platform/linux-generic/test/process-mode.conf @@ -1,6 +1,6 @@ # Mandatory fields odp_implementation = "linux-generic" -config_file_version = "0.1.9" +config_file_version = "0.1.10" # Shared memory options shm: { commit 68e1cd81665c3b8deede1974d653593af85ec183 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Tue Oct 29 16:46:05 2019 +0200 linux-gen: timer: coding style fixes Fix most issues reported by the current checkpatch version. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/platform/linux-generic/odp_timer.c b/platform/linux-generic/odp_timer.c index 1ca61e179..e21b29b0c 100644 --- a/platform/linux-generic/odp_timer.c +++ b/platform/linux-generic/odp_timer.c @@ -87,6 +87,7 @@ static odp_timeout_hdr_t *timeout_hdr_from_buf(odp_buffer_t buf) static odp_timeout_hdr_t *timeout_hdr(odp_timeout_t tmo) { odp_buffer_t buf = odp_buffer_from_event(odp_timeout_to_event(tmo)); + return timeout_hdr_from_buf(buf); } @@ -243,8 +244,10 @@ static inline odp_timer_pool_t timer_pool_to_hdl(timer_pool_t *tp) static inline timer_pool_t *handle_to_tp(odp_timer_t hdl) { uint32_t tp_idx = _odp_typeval(hdl) >> INDEX_BITS; + if (odp_likely(tp_idx < MAX_TIMER_POOLS)) { timer_pool_t *tp = timer_global->timer_pool[tp_idx]; + if (odp_likely(tp != NULL)) return timer_global->timer_pool[tp_idx]; } @@ -255,6 +258,7 @@ static inline uint32_t handle_to_idx(odp_timer_t hdl, timer_pool_t *tp) { uint32_t idx = (_odp_typeval(hdl) & ((1U << INDEX_BITS) - 1U)) - 1; + __builtin_prefetch(&tp->tick_buf[idx], 0, 0); if (odp_likely(idx < odp_atomic_load_u32(&tp->high_wm))) return idx; @@ -471,6 +475,7 @@ static inline odp_timer_t timer_alloc(timer_pool_t *tp, void *user_ptr) { odp_timer_t hdl; + odp_spinlock_lock(&tp->lock); if (odp_likely(tp->num_alloc < tp->param.num_timers)) { tp->num_alloc++; @@ -478,6 +483,7 @@ static inline odp_timer_t timer_alloc(timer_pool_t *tp, ODP_ASSERT(tp->first_free != tp->param.num_timers); uint32_t idx = tp->first_free; _odp_timer_t *tim = &tp->timers[idx]; + tp->first_free = get_next_free(tim); /* Initialize timer */ timer_init(tim, &tp->tick_buf[idx], queue, user_ptr); @@ -532,10 +538,8 @@ static inline odp_buffer_t timer_free(timer_pool_t *tp, uint32_t idx) * expire/reset/cancel timer *****************************************************************************/ -static bool timer_reset(uint32_t idx, - uint64_t abs_tck, - odp_buffer_t *tmo_buf, - timer_pool_t *tp) +static bool timer_reset(uint32_t idx, uint64_t abs_tck, odp_buffer_t *tmo_buf, + timer_pool_t *tp) { bool success = true; tick_buf_t *tb = &tp->tick_buf[idx]; @@ -582,7 +586,7 @@ static bool timer_reset(uint32_t idx, /* Swap in new expiration tick, get back old tick which * will indicate active/inactive timer state */ old = _odp_atomic_u64_xchg_mm(&tb->exp_tck, abs_tck, - _ODP_MEMMODEL_RLX); + _ODP_MEMMODEL_RLX); if ((old & TMO_INACTIVE) != 0) { /* Timer was inactive (cancelled or expired), * we can't reset a timer without a timeout buffer. @@ -747,12 +751,11 @@ static odp_buffer_t timer_cancel(timer_pool_t *tp, /* Atomic CAS will fail if we experienced torn reads, * retry update sequence until CAS succeeds */ - } while (!_odp_atomic_u128_cmp_xchg_mm( - (_odp_atomic_u128_t *)tb, - (_uint128_t *)&old, - (_uint128_t *)&new, - _ODP_MEMMODEL_RLS, - _ODP_MEMMODEL_RLX)); + } while (!_odp_atomic_u128_cmp_xchg_mm((_odp_atomic_u128_t *)tb, + (_uint128_t *)&old, + (_uint128_t *)&new, + _ODP_MEMMODEL_RLS, + _ODP_MEMMODEL_RLX)); old_buf = old.tmo_buf; #else /* Take a related lock */ @@ -881,6 +884,7 @@ static inline void timer_pool_scan(timer_pool_t *tp, uint64_t tick) __builtin_prefetch(&array[i + 32], 0, 0); /* Non-atomic read for speed */ uint64_t exp_tck = array[i].exp_tck.v; + if (odp_unlikely(exp_tck <= tick)) { /* Attempt to expire timer */ timer_expire(tp, i, tick); @@ -1142,7 +1146,7 @@ static void itimer_init(timer_pool_t *tp) int ret; ODP_DBG("Creating POSIX timer for timer pool %s, period %" - PRIu64" ns\n", tp->name, tp->param.res_ns); + PRIu64 " ns\n", tp->name, tp->param.res_ns); res = tp->param.res_ns; sec = res / ODP_TIME_SEC_IN_NS; @@ -1341,6 +1345,7 @@ odp_event_t odp_timer_free(odp_timer_t hdl) timer_pool_t *tp = handle_to_tp(hdl); uint32_t idx = handle_to_idx(hdl, tp); odp_buffer_t old_buf = timer_free(tp, idx); + return odp_buffer_to_event(old_buf); } @@ -1387,6 +1392,7 @@ int odp_timer_cancel(odp_timer_t hdl, odp_event_t *tmo_ev) uint32_t idx = handle_to_idx(hdl, tp); /* Set the expiration tick of the timer to TMO_INACTIVE */ odp_buffer_t old_buf = timer_cancel(tp, idx); + if (old_buf != ODP_BUFFER_INVALID) { *tmo_ev = odp_buffer_to_event(old_buf); return 0; /* Active timer cancelled, timeout returned */ @@ -1453,6 +1459,7 @@ void *odp_timeout_user_ptr(odp_timeout_t tmo) odp_timeout_t odp_timeout_alloc(odp_pool_t pool) { odp_buffer_t buf = odp_buffer_alloc(pool); + if (odp_unlikely(buf == ODP_BUFFER_INVALID)) return ODP_TIMEOUT_INVALID; return odp_timeout_from_event(odp_buffer_to_event(buf)); @@ -1461,6 +1468,7 @@ odp_timeout_t odp_timeout_alloc(odp_pool_t pool) void odp_timeout_free(odp_timeout_t tmo) { odp_event_t ev = odp_timeout_to_event(tmo); + odp_buffer_free(odp_buffer_from_event(ev)); } @@ -1494,6 +1502,7 @@ int _odp_timer_init_global(const odp_init_t *params) #ifndef ODP_ATOMIC_U128 uint32_t i; + for (i = 0; i < NUM_LOCKS; i++) _odp_atomic_flag_clear(&timer_global->locks[i]); #else ----------------------------------------------------------------------- Summary of changes: config/odp-linux-generic.conf | 29 ++- platform/linux-generic/odp_timer.c | 246 ++++++++++++++++---------- platform/linux-generic/test/inline-timer.conf | 2 +- platform/linux-generic/test/process-mode.conf | 2 +- test/performance/odp_timer_perf.c | 73 ++++++-- test/validation/api/scheduler/scheduler.c | 231 ++++++++++++++++++++++++ test/validation/api/timer/timer.c | 24 ++- 7 files changed, 479 insertions(+), 128 deletions(-) hooks/post-receive --

6 years, 3 months

[COMMIT] branch master updated. v1.21.0.0-309-gb921639a9

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 b921639a9df6a0300ca1c50b5853a37241806366 (commit) via 6f367faae189144beeaafcd9850065b3f1b1098e (commit) via 4afa7da09edf07126573940fffed0784ef3080ff (commit) via 5db9a7a1c59d4eda436d896dce41a2c7aa8f79c4 (commit) via b89a5b77e92060c9343ab162526d05a8ee97f8b4 (commit) via fc07575511c3a5b79ccae80ca278b3daad4f101d (commit) via ff99ba52f99a608dc1a41f4d8a86ab5c2f8491ca (commit) via 426ee8c61835c8faa5df0873ecc4ec7c8667c691 (commit) via 559aec0db739c624652facd3b337d0430cba8c61 (commit) via 720d655c9161007b561bf033a4fbe0b31ab7fb6a (commit) from 1a8b32c758894b0d0a71ebbd86efb77fd9eb334c (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 b921639a9df6a0300ca1c50b5853a37241806366 Author: Matias Elo <matias.elo(a)nokia.com> Date: Mon Oct 28 17:39:52 2019 +0200 linux-gen: ipc: remove ipc_data_offset from buffer header Instead of storing IPC packet data offset in odp_buffer_hdr_t, calculate the offset on receive using odp_packet_hdr_t.seg_data pointer and remote pool base address. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/platform/linux-generic/include/odp_buffer_internal.h b/platform/linux-generic/include/odp_buffer_internal.h index 1c52b028f..6c6ec970d 100644 --- a/platform/linux-generic/include/odp_buffer_internal.h +++ b/platform/linux-generic/include/odp_buffer_internal.h @@ -68,10 +68,6 @@ struct ODP_ALIGNED_CACHE odp_buffer_hdr_t { /* User area pointer */ void *uarea_addr; - /* ipc mapped process can not walk over pointers, - * offset has to be used */ - uint64_t ipc_data_offset; - /* Combined pool and buffer index */ buffer_index_t index; diff --git a/platform/linux-generic/pktio/ipc.c b/platform/linux-generic/pktio/ipc.c index 7e3f95fb6..7575eb052 100644 --- a/platform/linux-generic/pktio/ipc.c +++ b/platform/linux-generic/pktio/ipc.c @@ -35,8 +35,9 @@ */ struct pktio_info { struct { + /* Pool base address */ + void *base_addr; /* number of buffer*/ - int num; char pool_name[ODP_POOL_NAME_LEN]; /* 1 if master finished creation of all shared objects */ int init_done; @@ -46,6 +47,7 @@ struct pktio_info { uint32_t ring_mask; } master; struct { + /* Pool base address */ void *base_addr; char pool_name[ODP_POOL_NAME_LEN]; /* pid of the slave process written to shm and @@ -78,8 +80,10 @@ typedef struct { /* local cache to keep packet order right */ ring_ptr_t *cache; } rx; /* slave */ - void *pool_base; /**< Remote pool base addr */ - void *pool_mdata_base; /**< Remote pool mdata base addr */ + /* Remote pool mdata base addr */ + void *pool_mdata_base; + /* Remote pool base address for offset calculation */ + void *remote_base_addr; odp_pool_t pool; /**< Pool of main process */ enum { PKTIO_TYPE_IPC_MASTER = 0, /**< Master is the process which @@ -212,7 +216,7 @@ static int _ipc_master_start(pktio_entry_t *pktio_entry) } pktio_ipc->remote_pool_shm = shm; - pktio_ipc->pool_base = odp_shm_addr(shm); + pktio_ipc->remote_base_addr = pinfo->slave.base_addr; pktio_ipc->pool_mdata_base = (char *)odp_shm_addr(shm); odp_atomic_store_u32(&pktio_ipc->ready, 1); @@ -328,6 +332,7 @@ static int _ipc_init_master(pktio_entry_t *pktio_entry, /* Export ring info for the slave process to use */ pinfo->master.ring_size = ring_size; pinfo->master.ring_mask = ring_mask; + pinfo->master.base_addr = odp_shm_addr(pool->shm); pinfo->slave.base_addr = 0; pinfo->slave.pid = 0; @@ -362,7 +367,7 @@ static void _ipc_export_pool(struct pktio_info *pinfo, snprintf(pinfo->slave.pool_name, ODP_POOL_NAME_LEN, "%s", _ipc_odp_buffer_pool_shm_name(pool_hdl)); pinfo->slave.pid = odp_global_ro.main_pid; - pinfo->slave.base_addr = pool->base_addr; + pinfo->slave.base_addr = odp_shm_addr(pool->shm); } static odp_shm_t _ipc_map_remote_pool(const char *name, int pid) @@ -494,6 +499,7 @@ static int _ipc_slave_start(pktio_entry_t *pktio_entry) pid); pktio_ipc->remote_pool_shm = shm; pktio_ipc->pool_mdata_base = (char *)odp_shm_addr(shm); + pktio_ipc->remote_base_addr = pinfo->master.base_addr; _ipc_export_pool(pinfo, pktio_ipc->pool); @@ -674,7 +680,8 @@ static int ipc_pktio_recv_lockless(pktio_entry_t *pktio_entry, if (odp_unlikely(pool == ODP_POOL_INVALID)) ODP_ABORT("invalid pool"); - data_pool_off = phdr->buf_hdr.ipc_data_offset; + data_pool_off = (uint8_t *)phdr->seg_data - + (uint8_t *)pktio_ipc->remote_base_addr; pkt = odp_packet_alloc(pool, phdr->frame_len); if (odp_unlikely(pkt == ODP_PACKET_INVALID)) { @@ -803,7 +810,6 @@ static int ipc_pktio_send_lockless(pktio_entry_t *pktio_entry, /* Set offset to phdr for outgoing packets */ for (i = 0; i < num; i++) { - uint64_t data_pool_off; odp_packet_t pkt = pkt_table_mapped[i]; odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); odp_pool_t pool_hdl = odp_packet_pool(pkt); @@ -811,17 +817,15 @@ static int ipc_pktio_send_lockless(pktio_entry_t *pktio_entry, offsets[i] = (uint8_t *)pkt_hdr - (uint8_t *)odp_shm_addr(pool->shm); - data_pool_off = (uint8_t *)pkt_hdr->seg_data - - (uint8_t *)odp_shm_addr(pool->shm); /* compile all function code even if ipc disabled with config */ - pkt_hdr->buf_hdr.ipc_data_offset = data_pool_off; IPC_ODP_DBG("%d/%d send packet %llx, pool %llx," - "phdr = %p, offset %x sendoff %x, addr %llx iaddr %llx\n", + "phdr = %p, offset %x, sendoff %x, addr %llx iaddr %llx\n", i, num, odp_packet_to_u64(pkt), odp_pool_to_u64(pool_hdl), - pkt_hdr, pkt_hdr->buf_hdr.ipc_data_offset, - offsets[i], odp_shm_addr(pool->shm), + pkt_hdr, (uint8_t *)pkt_hdr->seg_data - + (uint8_t *)odp_shm_addr(pool->shm), offsets[i], + odp_shm_addr(pool->shm), odp_shm_addr(ipc_pool->shm)); } commit 6f367faae189144beeaafcd9850065b3f1b1098e Author: Matias Elo <matias.elo(a)nokia.com> Date: Mon Oct 28 15:01:47 2019 +0200 linux-gen: ipc: add IPC_BURST_SIZE define for IPC internal burst size Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/platform/linux-generic/pktio/ipc.c b/platform/linux-generic/pktio/ipc.c index 572d02e74..7e3f95fb6 100644 --- a/platform/linux-generic/pktio/ipc.c +++ b/platform/linux-generic/pktio/ipc.c @@ -27,6 +27,9 @@ ODP_DBG(fmt, ##__VA_ARGS__);\ } while (0) +/* Burst size for IPC free operations */ +#define IPC_BURST_SIZE 32 + /* that struct is exported to shared memory, so that processes can find * each other. */ @@ -237,7 +240,12 @@ static int _ipc_init_master(pktio_entry_t *pktio_entry, /* Ring must be able to store all packets in the pool */ ring_size = ROUNDUP_POWER2_U32(pool->num + 1); + + /* Ring size has to larger than burst size */ + if (ring_size <= IPC_BURST_SIZE) + ring_size = ROUNDUP_POWER2_U32(IPC_BURST_SIZE + 1); ring_mask = ring_size - 1; + pktio_ipc->ring_size = ring_size; pktio_ipc->ring_mask = ring_mask; @@ -579,9 +587,7 @@ static void _ipc_free_ring_packets(pktio_entry_t *pktio_entry, ring_ptr_t *r, uint32_t r_mask) { pkt_ipc_t *pktio_ipc = pkt_priv(pktio_entry); - uint32_t ring_size = pktio_ipc->ring_size; - uint32_t ring_mask = pktio_ipc->ring_mask; - uintptr_t offsets[ring_size]; + uintptr_t offsets[IPC_BURST_SIZE]; int ret; void **rbuf_p; int i; @@ -597,7 +603,7 @@ static void _ipc_free_ring_packets(pktio_entry_t *pktio_entry, ring_ptr_t *r, rbuf_p = (void *)&offsets; while (1) { - ret = ring_ptr_deq_multi(r, r_mask, rbuf_p, ring_mask); + ret = ring_ptr_deq_multi(r, r_mask, rbuf_p, IPC_BURST_SIZE); if (ret <= 0) break; for (i = 0; i < ret; i++) { @@ -616,13 +622,12 @@ static int ipc_pktio_recv_lockless(pktio_entry_t *pktio_entry, odp_packet_t pkt_table[], int len) { pkt_ipc_t *pktio_ipc = pkt_priv(pktio_entry); - uint32_t ring_size = pktio_ipc->ring_size; uint32_t ring_mask = pktio_ipc->ring_mask; int pkts = 0; int i; ring_ptr_t *r; ring_ptr_t *r_p; - uintptr_t offsets[ring_size]; + uintptr_t offsets[len]; void **ipcbufs_p = (void *)&offsets[0]; uint32_t ready; commit 4afa7da09edf07126573940fffed0784ef3080ff Author: Matias Elo <matias.elo(a)nokia.com> Date: Mon Oct 28 10:52:38 2019 +0200 linux-gen: ipc: clean excessive pkt_priv() usage Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/platform/linux-generic/pktio/ipc.c b/platform/linux-generic/pktio/ipc.c index 065f70cc7..572d02e74 100644 --- a/platform/linux-generic/pktio/ipc.c +++ b/platform/linux-generic/pktio/ipc.c @@ -193,7 +193,8 @@ static const char *_ipc_odp_buffer_pool_shm_name(odp_pool_t pool_hdl) static int _ipc_master_start(pktio_entry_t *pktio_entry) { - struct pktio_info *pinfo = pkt_priv(pktio_entry)->pinfo; + pkt_ipc_t *pktio_ipc = pkt_priv(pktio_entry); + struct pktio_info *pinfo = pktio_ipc->pinfo; odp_shm_t shm; if (pinfo->slave.init_done == 0) @@ -207,11 +208,11 @@ static int _ipc_master_start(pktio_entry_t *pktio_entry) return -1; } - pkt_priv(pktio_entry)->remote_pool_shm = shm; - pkt_priv(pktio_entry)->pool_base = odp_shm_addr(shm); - pkt_priv(pktio_entry)->pool_mdata_base = (char *)odp_shm_addr(shm); + pktio_ipc->remote_pool_shm = shm; + pktio_ipc->pool_base = odp_shm_addr(shm); + pktio_ipc->pool_mdata_base = (char *)odp_shm_addr(shm); - odp_atomic_store_u32(&pkt_priv(pktio_entry)->ready, 1); + odp_atomic_store_u32(&pktio_ipc->ready, 1); IPC_ODP_DBG("%s started.\n", pktio_entry->s.name); return 0; @@ -221,6 +222,7 @@ static int _ipc_init_master(pktio_entry_t *pktio_entry, const char *dev, odp_pool_t pool_hdl) { + pkt_ipc_t *pktio_ipc = pkt_priv(pktio_entry); char ipc_shm_name[ODP_POOL_NAME_LEN + sizeof("_m_prod")]; struct pktio_info *pinfo; const char *pool_name; @@ -236,17 +238,16 @@ static int _ipc_init_master(pktio_entry_t *pktio_entry, /* Ring must be able to store all packets in the pool */ ring_size = ROUNDUP_POWER2_U32(pool->num + 1); ring_mask = ring_size - 1; - pkt_priv(pktio_entry)->ring_size = ring_size; - pkt_priv(pktio_entry)->ring_mask = ring_mask; + pktio_ipc->ring_size = ring_size; + pktio_ipc->ring_mask = ring_mask; if (strlen(dev) > (ODP_POOL_NAME_LEN - sizeof("_m_prod"))) { ODP_ERR("too big ipc name\n"); return -1; } - pkt_priv(pktio_entry)->rx.cache = _ring_create("ipc_rx_cache", - ring_size, 0); - if (!pkt_priv(pktio_entry)->rx.cache) { + pktio_ipc->rx.cache = _ring_create("ipc_rx_cache", ring_size, 0); + if (!pktio_ipc->rx.cache) { ODP_ERR("pid %d unable to create ipc rx cache\n", getpid()); return -1; } @@ -255,66 +256,58 @@ static int _ipc_init_master(pktio_entry_t *pktio_entry, * to be processed packets ring. */ snprintf(ipc_shm_name, sizeof(ipc_shm_name), "%s_m_prod", dev); - pkt_priv(pktio_entry)->tx.send = _ring_create(ipc_shm_name, ring_size, - ODP_SHM_PROC | - ODP_SHM_EXPORT); - if (!pkt_priv(pktio_entry)->tx.send) { + pktio_ipc->tx.send = _ring_create(ipc_shm_name, ring_size, + ODP_SHM_PROC | ODP_SHM_EXPORT); + if (!pktio_ipc->tx.send) { ODP_ERR("pid %d unable to create ipc ring %s name\n", getpid(), ipc_shm_name); return -1; } ODP_DBG("Created IPC ring: %s, count %d, free %d\n", - ipc_shm_name, _ring_count(pkt_priv(pktio_entry)->tx.send, - ring_mask), - _ring_free_count(pkt_priv(pktio_entry)->tx.send, ring_mask)); + ipc_shm_name, _ring_count(pktio_ipc->tx.send, ring_mask), + _ring_free_count(pktio_ipc->tx.send, ring_mask)); /* generate name in shm like ipc_pktio_p for * already processed packets */ snprintf(ipc_shm_name, sizeof(ipc_shm_name), "%s_m_cons", dev); - pkt_priv(pktio_entry)->tx.free = _ring_create(ipc_shm_name, ring_size, - ODP_SHM_PROC | - ODP_SHM_EXPORT); - if (!pkt_priv(pktio_entry)->tx.free) { + pktio_ipc->tx.free = _ring_create(ipc_shm_name, ring_size, + ODP_SHM_PROC | ODP_SHM_EXPORT); + if (!pktio_ipc->tx.free) { ODP_ERR("pid %d unable to create ipc ring %s name\n", getpid(), ipc_shm_name); goto free_m_prod; } ODP_DBG("Created IPC ring: %s, count %d, free %d\n", - ipc_shm_name, _ring_count(pkt_priv(pktio_entry)->tx.free, - ring_mask), - _ring_free_count(pkt_priv(pktio_entry)->tx.free, ring_mask)); + ipc_shm_name, _ring_count(pktio_ipc->tx.free, ring_mask), + _ring_free_count(pktio_ipc->tx.free, ring_mask)); snprintf(ipc_shm_name, sizeof(ipc_shm_name), "%s_s_prod", dev); - pkt_priv(pktio_entry)->rx.recv = _ring_create(ipc_shm_name, ring_size, - ODP_SHM_PROC | - ODP_SHM_EXPORT); - if (!pkt_priv(pktio_entry)->rx.recv) { + pktio_ipc->rx.recv = _ring_create(ipc_shm_name, ring_size, + ODP_SHM_PROC | ODP_SHM_EXPORT); + if (!pktio_ipc->rx.recv) { ODP_ERR("pid %d unable to create ipc ring %s name\n", getpid(), ipc_shm_name); goto free_m_cons; } ODP_DBG("Created IPC ring: %s, count %d, free %d\n", - ipc_shm_name, _ring_count(pkt_priv(pktio_entry)->rx.recv, - ring_mask), - _ring_free_count(pkt_priv(pktio_entry)->rx.recv, ring_mask)); + ipc_shm_name, _ring_count(pktio_ipc->rx.recv, ring_mask), + _ring_free_count(pktio_ipc->rx.recv, ring_mask)); snprintf(ipc_shm_name, sizeof(ipc_shm_name), "%s_s_cons", dev); - pkt_priv(pktio_entry)->rx.free = _ring_create(ipc_shm_name, ring_size, - ODP_SHM_PROC | - ODP_SHM_EXPORT); - if (!pkt_priv(pktio_entry)->rx.free) { + pktio_ipc->rx.free = _ring_create(ipc_shm_name, ring_size, + ODP_SHM_PROC | ODP_SHM_EXPORT); + if (!pktio_ipc->rx.free) { ODP_ERR("pid %d unable to create ipc ring %s name\n", getpid(), ipc_shm_name); goto free_s_prod; } ODP_DBG("Created IPC ring: %s, count %d, free %d\n", - ipc_shm_name, _ring_count(pkt_priv(pktio_entry)->rx.free, - ring_mask), - _ring_free_count(pkt_priv(pktio_entry)->rx.free, ring_mask)); + ipc_shm_name, _ring_count(pktio_ipc->rx.free, ring_mask), + _ring_free_count(pktio_ipc->rx.free, ring_mask)); /* Set up pool name for remote info */ - pinfo = pkt_priv(pktio_entry)->pinfo; + pinfo = pktio_ipc->pinfo; pool_name = _ipc_odp_buffer_pool_shm_name(pool_hdl); if (strlen(pool_name) > ODP_POOL_NAME_LEN) { ODP_ERR("pid %d ipc pool name %s is too big %d\n", @@ -332,7 +325,7 @@ static int _ipc_init_master(pktio_entry_t *pktio_entry, pinfo->slave.pid = 0; pinfo->slave.init_done = 0; - pkt_priv(pktio_entry)->pool = pool_hdl; + pktio_ipc->pool = pool_hdl; ODP_DBG("Pre init... DONE.\n"); pinfo->master.init_done = 1; @@ -426,13 +419,14 @@ static int _ipc_init_slave(const char *dev, pktio_entry_t *pktio_entry, static int _ipc_slave_start(pktio_entry_t *pktio_entry) { + pkt_ipc_t *pktio_ipc = pkt_priv(pktio_entry); char ipc_shm_name[ODP_POOL_NAME_LEN + sizeof("_slave_r")]; struct pktio_info *pinfo; odp_shm_t shm; char tail[ODP_POOL_NAME_LEN]; char dev[ODP_POOL_NAME_LEN]; int pid; - uint32_t ring_mask = pkt_priv(pktio_entry)->ring_mask; + uint32_t ring_mask = pktio_ipc->ring_mask; if (sscanf(pktio_entry->s.name, "ipc:%d:%s", &pid, tail) != 2) { ODP_ERR("wrong pktio name\n"); @@ -442,68 +436,60 @@ static int _ipc_slave_start(pktio_entry_t *pktio_entry) sprintf(dev, "ipc:%s", tail); snprintf(ipc_shm_name, sizeof(ipc_shm_name), "%s_m_prod", dev); - pkt_priv(pktio_entry)->rx.recv = _ipc_shm_map(ipc_shm_name, pid); - if (!pkt_priv(pktio_entry)->rx.recv) { + pktio_ipc->rx.recv = _ipc_shm_map(ipc_shm_name, pid); + if (!pktio_ipc->rx.recv) { ODP_DBG("pid %d unable to find ipc ring %s name\n", getpid(), dev); sleep(1); return -1; } ODP_DBG("Connected IPC ring: %s, count %d, free %d\n", - ipc_shm_name, _ring_count(pkt_priv(pktio_entry)->rx.recv, - ring_mask), - _ring_free_count(pkt_priv(pktio_entry)->rx.recv, - ring_mask)); + ipc_shm_name, _ring_count(pktio_ipc->rx.recv, ring_mask), + _ring_free_count(pktio_ipc->rx.recv, ring_mask)); snprintf(ipc_shm_name, sizeof(ipc_shm_name), "%s_m_cons", dev); - pkt_priv(pktio_entry)->rx.free = _ipc_shm_map(ipc_shm_name, pid); - if (!pkt_priv(pktio_entry)->rx.free) { + pktio_ipc->rx.free = _ipc_shm_map(ipc_shm_name, pid); + if (!pktio_ipc->rx.free) { ODP_ERR("pid %d unable to find ipc ring %s name\n", getpid(), dev); goto free_m_prod; } ODP_DBG("Connected IPC ring: %s, count %d, free %d\n", - ipc_shm_name, _ring_count(pkt_priv(pktio_entry)->rx.free, - ring_mask), - _ring_free_count(pkt_priv(pktio_entry)->rx.free, - ring_mask)); + ipc_shm_name, _ring_count(pktio_ipc->rx.free, ring_mask), + _ring_free_count(pktio_ipc->rx.free, ring_mask)); snprintf(ipc_shm_name, sizeof(ipc_shm_name), "%s_s_prod", dev); - pkt_priv(pktio_entry)->tx.send = _ipc_shm_map(ipc_shm_name, pid); - if (!pkt_priv(pktio_entry)->tx.send) { + pktio_ipc->tx.send = _ipc_shm_map(ipc_shm_name, pid); + if (!pktio_ipc->tx.send) { ODP_ERR("pid %d unable to find ipc ring %s name\n", getpid(), dev); goto free_m_cons; } ODP_DBG("Connected IPC ring: %s, count %d, free %d\n", - ipc_shm_name, _ring_count(pkt_priv(pktio_entry)->tx.send, - ring_mask), - _ring_free_count(pkt_priv(pktio_entry)->tx.send, - ring_mask)); + ipc_shm_name, _ring_count(pktio_ipc->tx.send, ring_mask), + _ring_free_count(pktio_ipc->tx.send, ring_mask)); snprintf(ipc_shm_name, sizeof(ipc_shm_name), "%s_s_cons", dev); - pkt_priv(pktio_entry)->tx.free = _ipc_shm_map(ipc_shm_name, pid); - if (!pkt_priv(pktio_entry)->tx.free) { + pktio_ipc->tx.free = _ipc_shm_map(ipc_shm_name, pid); + if (!pktio_ipc->tx.free) { ODP_ERR("pid %d unable to find ipc ring %s name\n", getpid(), dev); goto free_s_prod; } ODP_DBG("Connected IPC ring: %s, count %d, free %d\n", - ipc_shm_name, _ring_count(pkt_priv(pktio_entry)->tx.free, - ring_mask), - _ring_free_count(pkt_priv(pktio_entry)->tx.free, - ring_mask)); + ipc_shm_name, _ring_count(pktio_ipc->tx.free, ring_mask), + _ring_free_count(pktio_ipc->tx.free, ring_mask)); /* Get info about remote pool */ - pinfo = pkt_priv(pktio_entry)->pinfo; + pinfo = pktio_ipc->pinfo; shm = _ipc_map_remote_pool(pinfo->master.pool_name, pid); - pkt_priv(pktio_entry)->remote_pool_shm = shm; - pkt_priv(pktio_entry)->pool_mdata_base = (char *)odp_shm_addr(shm); + pktio_ipc->remote_pool_shm = shm; + pktio_ipc->pool_mdata_base = (char *)odp_shm_addr(shm); - _ipc_export_pool(pinfo, pkt_priv(pktio_entry)->pool); + _ipc_export_pool(pinfo, pktio_ipc->pool); - odp_atomic_store_u32(&pkt_priv(pktio_entry)->ready, 1); + odp_atomic_store_u32(&pktio_ipc->ready, 1); pinfo->slave.init_done = 1; ODP_DBG("%s started.\n", pktio_entry->s.name); @@ -871,14 +857,15 @@ static int ipc_mac_addr_get(pktio_entry_t *pktio_entry ODP_UNUSED, static int ipc_start(pktio_entry_t *pktio_entry) { - uint32_t ready = odp_atomic_load_u32(&pkt_priv(pktio_entry)->ready); + pkt_ipc_t *pktio_ipc = pkt_priv(pktio_entry); + uint32_t ready = odp_atomic_load_u32(&pktio_ipc->ready); if (ready) { ODP_ABORT("%s Already started\n", pktio_entry->s.name); return -1; } - if (pkt_priv(pktio_entry)->type == PKTIO_TYPE_IPC_MASTER) + if (pktio_ipc->type == PKTIO_TYPE_IPC_MASTER) return _ipc_master_start(pktio_entry); else return _ipc_slave_start(pktio_entry); @@ -906,6 +893,7 @@ static int ipc_stop(pktio_entry_t *pktio_entry) static int ipc_close(pktio_entry_t *pktio_entry) { + pkt_ipc_t *pktio_ipc = pkt_priv(pktio_entry); char ipc_shm_name[ODP_POOL_NAME_LEN + sizeof("_m_prod")]; char *dev = pktio_entry->s.name; char name[ODP_POOL_NAME_LEN]; @@ -914,7 +902,7 @@ static int ipc_close(pktio_entry_t *pktio_entry) ipc_stop(pktio_entry); - odp_shm_free(pkt_priv(pktio_entry)->remote_pool_shm); + odp_shm_free(pktio_ipc->remote_pool_shm); if (sscanf(dev, "ipc:%d:%s", &pid, tail) == 2) snprintf(name, sizeof(name), "ipc:%s", tail); @@ -922,7 +910,7 @@ static int ipc_close(pktio_entry_t *pktio_entry) snprintf(name, sizeof(name), "%s", dev); /* unlink this pktio info for both master and slave */ - odp_shm_free(pkt_priv(pktio_entry)->pinfo_shm); + odp_shm_free(pktio_ipc->pinfo_shm); /* destroy rings */ snprintf(ipc_shm_name, sizeof(ipc_shm_name), "%s_s_cons", name); commit 5db9a7a1c59d4eda436d896dce41a2c7aa8f79c4 Author: Matias Elo <matias.elo(a)nokia.com> Date: Mon Oct 28 10:40:42 2019 +0200 linux-gen: ipc: match ring size to used packet pools The ring_ptr_t implementation requires that ring size must be larger than the maximum number of data items that will be stored on it. Adjust ring size according to the used packet pools to guarantee this. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/platform/linux-generic/pktio/ipc.c b/platform/linux-generic/pktio/ipc.c index dec918e95..065f70cc7 100644 --- a/platform/linux-generic/pktio/ipc.c +++ b/platform/linux-generic/pktio/ipc.c @@ -27,11 +27,6 @@ ODP_DBG(fmt, ##__VA_ARGS__);\ } while (0) -/* number of odp buffers in odp ring queue */ -#define PKTIO_IPC_ENTRIES 4096 - -#define PKTIO_IPC_ENTRY_MASK (PKTIO_IPC_ENTRIES - 1) - /* that struct is exported to shared memory, so that processes can find * each other. */ @@ -42,6 +37,10 @@ struct pktio_info { char pool_name[ODP_POOL_NAME_LEN]; /* 1 if master finished creation of all shared objects */ int init_done; + /* IPC ring size */ + uint32_t ring_size; + /* IPC ring mask */ + uint32_t ring_mask; } master; struct { void *base_addr; @@ -87,7 +86,11 @@ typedef struct { } type; /**< define if it's master or slave process */ odp_atomic_u32_t ready; /**< 1 - pktio is ready and can recv/send packet, 0 - not yet ready */ - void *pinfo; + /* Local copy of IPC ring size */ + uint32_t ring_size; + /* Local copy IPC ring mask */ + uint32_t ring_mask; + struct pktio_info *pinfo; odp_shm_t pinfo_shm; odp_shm_t remote_pool_shm; /**< shm of remote pool get with _ipc_map_remote_pool() */ @@ -221,18 +224,38 @@ static int _ipc_init_master(pktio_entry_t *pktio_entry, char ipc_shm_name[ODP_POOL_NAME_LEN + sizeof("_m_prod")]; struct pktio_info *pinfo; const char *pool_name; + pool_t *pool = pool_entry_from_hdl(pool_hdl); + uint32_t ring_size; + uint32_t ring_mask; + + if ((uint64_t)ROUNDUP_POWER2_U32(pool->num + 1) > UINT32_MAX) { + ODP_ERR("Too large packet pool\n"); + return -1; + } + + /* Ring must be able to store all packets in the pool */ + ring_size = ROUNDUP_POWER2_U32(pool->num + 1); + ring_mask = ring_size - 1; + pkt_priv(pktio_entry)->ring_size = ring_size; + pkt_priv(pktio_entry)->ring_mask = ring_mask; if (strlen(dev) > (ODP_POOL_NAME_LEN - sizeof("_m_prod"))) { ODP_ERR("too big ipc name\n"); return -1; } + pkt_priv(pktio_entry)->rx.cache = _ring_create("ipc_rx_cache", + ring_size, 0); + if (!pkt_priv(pktio_entry)->rx.cache) { + ODP_ERR("pid %d unable to create ipc rx cache\n", getpid()); + return -1; + } + /* generate name in shm like ipc_pktio_r for * to be processed packets ring. */ snprintf(ipc_shm_name, sizeof(ipc_shm_name), "%s_m_prod", dev); - pkt_priv(pktio_entry)->tx.send = _ring_create(ipc_shm_name, - PKTIO_IPC_ENTRIES, + pkt_priv(pktio_entry)->tx.send = _ring_create(ipc_shm_name, ring_size, ODP_SHM_PROC | ODP_SHM_EXPORT); if (!pkt_priv(pktio_entry)->tx.send) { @@ -242,16 +265,14 @@ static int _ipc_init_master(pktio_entry_t *pktio_entry, } ODP_DBG("Created IPC ring: %s, count %d, free %d\n", ipc_shm_name, _ring_count(pkt_priv(pktio_entry)->tx.send, - PKTIO_IPC_ENTRY_MASK), - _ring_free_count(pkt_priv(pktio_entry)->tx.send, - PKTIO_IPC_ENTRY_MASK)); + ring_mask), + _ring_free_count(pkt_priv(pktio_entry)->tx.send, ring_mask)); /* generate name in shm like ipc_pktio_p for * already processed packets */ snprintf(ipc_shm_name, sizeof(ipc_shm_name), "%s_m_cons", dev); - pkt_priv(pktio_entry)->tx.free = _ring_create(ipc_shm_name, - PKTIO_IPC_ENTRIES, + pkt_priv(pktio_entry)->tx.free = _ring_create(ipc_shm_name, ring_size, ODP_SHM_PROC | ODP_SHM_EXPORT); if (!pkt_priv(pktio_entry)->tx.free) { @@ -261,13 +282,11 @@ static int _ipc_init_master(pktio_entry_t *pktio_entry, } ODP_DBG("Created IPC ring: %s, count %d, free %d\n", ipc_shm_name, _ring_count(pkt_priv(pktio_entry)->tx.free, - PKTIO_IPC_ENTRY_MASK), - _ring_free_count(pkt_priv(pktio_entry)->tx.free, - PKTIO_IPC_ENTRY_MASK)); + ring_mask), + _ring_free_count(pkt_priv(pktio_entry)->tx.free, ring_mask)); snprintf(ipc_shm_name, sizeof(ipc_shm_name), "%s_s_prod", dev); - pkt_priv(pktio_entry)->rx.recv = _ring_create(ipc_shm_name, - PKTIO_IPC_ENTRIES, + pkt_priv(pktio_entry)->rx.recv = _ring_create(ipc_shm_name, ring_size, ODP_SHM_PROC | ODP_SHM_EXPORT); if (!pkt_priv(pktio_entry)->rx.recv) { @@ -277,13 +296,11 @@ static int _ipc_init_master(pktio_entry_t *pktio_entry, } ODP_DBG("Created IPC ring: %s, count %d, free %d\n", ipc_shm_name, _ring_count(pkt_priv(pktio_entry)->rx.recv, - PKTIO_IPC_ENTRY_MASK), - _ring_free_count(pkt_priv(pktio_entry)->rx.recv, - PKTIO_IPC_ENTRY_MASK)); + ring_mask), + _ring_free_count(pkt_priv(pktio_entry)->rx.recv, ring_mask)); snprintf(ipc_shm_name, sizeof(ipc_shm_name), "%s_s_cons", dev); - pkt_priv(pktio_entry)->rx.free = _ring_create(ipc_shm_name, - PKTIO_IPC_ENTRIES, + pkt_priv(pktio_entry)->rx.free = _ring_create(ipc_shm_name, ring_size, ODP_SHM_PROC | ODP_SHM_EXPORT); if (!pkt_priv(pktio_entry)->rx.free) { @@ -293,9 +310,8 @@ static int _ipc_init_master(pktio_entry_t *pktio_entry, } ODP_DBG("Created IPC ring: %s, count %d, free %d\n", ipc_shm_name, _ring_count(pkt_priv(pktio_entry)->rx.free, - PKTIO_IPC_ENTRY_MASK), - _ring_free_count(pkt_priv(pktio_entry)->rx.free, - PKTIO_IPC_ENTRY_MASK)); + ring_mask), + _ring_free_count(pkt_priv(pktio_entry)->rx.free, ring_mask)); /* Set up pool name for remote info */ pinfo = pkt_priv(pktio_entry)->pinfo; @@ -307,6 +323,11 @@ static int _ipc_init_master(pktio_entry_t *pktio_entry, } memcpy(pinfo->master.pool_name, pool_name, strlen(pool_name)); + + /* Export ring info for the slave process to use */ + pinfo->master.ring_size = ring_size; + pinfo->master.ring_mask = ring_mask; + pinfo->slave.base_addr = 0; pinfo->slave.pid = 0; pinfo->slave.init_done = 0; @@ -372,14 +393,34 @@ static void *_ipc_shm_map(char *name, int pid) return odp_shm_addr(shm); } -static int _ipc_init_slave(const char *dev, - pktio_entry_t *pktio_entry, - odp_pool_t pool) +static int _ipc_init_slave(const char *dev, pktio_entry_t *pktio_entry, + odp_pool_t pool_hdl) { - if (strlen(dev) > (ODP_POOL_NAME_LEN - sizeof("_slave_r"))) - ODP_ABORT("too big ipc name\n"); + pkt_ipc_t *pktio_ipc = pkt_priv(pktio_entry); + pool_t *pool = pool_entry_from_hdl(pool_hdl); + uint32_t ring_size = pktio_ipc->pinfo->master.ring_size; + + if (strlen(dev) > (ODP_POOL_NAME_LEN - sizeof("_slave_r"))) { + ODP_ERR("Too big ipc name\n"); + return -1; + } + + /* Check that IPC rings are able to store all packets */ + if (pool->num >= ring_size) { + ODP_ERR("Slave process packet pool too large. Master process " + "packet pool has to be larger than slave pool.\n"); + return -1; + } + + pktio_ipc->rx.cache = _ring_create("ipc_rx_cache", ring_size, 0); + if (!pktio_ipc->rx.cache) { + ODP_ERR("Pid %d unable to create ipc rx cache\n", getpid()); + return -1; + } + pktio_ipc->ring_size = ring_size; + pktio_ipc->ring_mask = pktio_ipc->pinfo->master.ring_mask; + pktio_ipc->pool = pool_hdl; - pkt_priv(pktio_entry)->pool = pool; return 0; } @@ -391,6 +432,7 @@ static int _ipc_slave_start(pktio_entry_t *pktio_entry) char tail[ODP_POOL_NAME_LEN]; char dev[ODP_POOL_NAME_LEN]; int pid; + uint32_t ring_mask = pkt_priv(pktio_entry)->ring_mask; if (sscanf(pktio_entry->s.name, "ipc:%d:%s", &pid, tail) != 2) { ODP_ERR("wrong pktio name\n"); @@ -409,9 +451,9 @@ static int _ipc_slave_start(pktio_entry_t *pktio_entry) } ODP_DBG("Connected IPC ring: %s, count %d, free %d\n", ipc_shm_name, _ring_count(pkt_priv(pktio_entry)->rx.recv, - PKTIO_IPC_ENTRY_MASK), + ring_mask), _ring_free_count(pkt_priv(pktio_entry)->rx.recv, - PKTIO_IPC_ENTRY_MASK)); + ring_mask)); snprintf(ipc_shm_name, sizeof(ipc_shm_name), "%s_m_cons", dev); pkt_priv(pktio_entry)->rx.free = _ipc_shm_map(ipc_shm_name, pid); @@ -422,9 +464,9 @@ static int _ipc_slave_start(pktio_entry_t *pktio_entry) } ODP_DBG("Connected IPC ring: %s, count %d, free %d\n", ipc_shm_name, _ring_count(pkt_priv(pktio_entry)->rx.free, - PKTIO_IPC_ENTRY_MASK), + ring_mask), _ring_free_count(pkt_priv(pktio_entry)->rx.free, - PKTIO_IPC_ENTRY_MASK)); + ring_mask)); snprintf(ipc_shm_name, sizeof(ipc_shm_name), "%s_s_prod", dev); pkt_priv(pktio_entry)->tx.send = _ipc_shm_map(ipc_shm_name, pid); @@ -435,9 +477,9 @@ static int _ipc_slave_start(pktio_entry_t *pktio_entry) } ODP_DBG("Connected IPC ring: %s, count %d, free %d\n", ipc_shm_name, _ring_count(pkt_priv(pktio_entry)->tx.send, - PKTIO_IPC_ENTRY_MASK), + ring_mask), _ring_free_count(pkt_priv(pktio_entry)->tx.send, - PKTIO_IPC_ENTRY_MASK)); + ring_mask)); snprintf(ipc_shm_name, sizeof(ipc_shm_name), "%s_s_cons", dev); pkt_priv(pktio_entry)->tx.free = _ipc_shm_map(ipc_shm_name, pid); @@ -448,9 +490,9 @@ static int _ipc_slave_start(pktio_entry_t *pktio_entry) } ODP_DBG("Connected IPC ring: %s, count %d, free %d\n", ipc_shm_name, _ring_count(pkt_priv(pktio_entry)->tx.free, - PKTIO_IPC_ENTRY_MASK), + ring_mask), _ring_free_count(pkt_priv(pktio_entry)->tx.free, - PKTIO_IPC_ENTRY_MASK)); + ring_mask)); /* Get info about remote pool */ pinfo = pkt_priv(pktio_entry)->pinfo; @@ -487,7 +529,8 @@ static int ipc_pktio_open(odp_pktio_t id ODP_UNUSED, const char *dev, odp_pool_t pool) { - int ret = -1; + pkt_ipc_t *pktio_ipc = pkt_priv(pktio_entry); + int ret = 0; int pid; struct pktio_info *pinfo; char name[ODP_POOL_NAME_LEN + sizeof("_info")]; @@ -497,43 +540,35 @@ static int ipc_pktio_open(odp_pktio_t id ODP_UNUSED, if (strncmp(dev, "ipc", 3)) return -1; - odp_atomic_init_u32(&pkt_priv(pktio_entry)->ready, 0); - - pkt_priv(pktio_entry)->rx.cache = _ring_create("ipc_rx_cache", - PKTIO_IPC_ENTRIES, 0); - if (!pkt_priv(pktio_entry)->rx.cache) - return -1; + odp_atomic_init_u32(&pktio_ipc->ready, 0); /* Shared info about remote pktio */ if (sscanf(dev, "ipc:%d:%s", &pid, tail) == 2) { - pkt_priv(pktio_entry)->type = PKTIO_TYPE_IPC_SLAVE; + pktio_ipc->type = PKTIO_TYPE_IPC_SLAVE; snprintf(name, sizeof(name), "ipc:%s_info", tail); IPC_ODP_DBG("lookup for name %s for pid %d\n", name, pid); shm = odp_shm_import(name, pid, name); - if (ODP_SHM_INVALID == shm) { - _ring_destroy("ipc_rx_cache"); + if (ODP_SHM_INVALID == shm) return -1; - } + pinfo = odp_shm_addr(shm); if (!pinfo->master.init_done) { odp_shm_free(shm); - _ring_destroy("ipc_rx_cache"); return -1; } - pkt_priv(pktio_entry)->pinfo = pinfo; - pkt_priv(pktio_entry)->pinfo_shm = shm; + pktio_ipc->pinfo = pinfo; + pktio_ipc->pinfo_shm = shm; ODP_DBG("process %d is slave\n", getpid()); ret = _ipc_init_slave(name, pktio_entry, pool); } else { - pkt_priv(pktio_entry)->type = PKTIO_TYPE_IPC_MASTER; + pktio_ipc->type = PKTIO_TYPE_IPC_MASTER; snprintf(name, sizeof(name), "%s_info", dev); shm = odp_shm_reserve(name, sizeof(struct pktio_info), ODP_CACHE_LINE_SIZE, ODP_SHM_EXPORT | ODP_SHM_SINGLE_VA); if (ODP_SHM_INVALID == shm) { - _ring_destroy("ipc_rx_cache"); ODP_ERR("can not create shm %s\n", name); return -1; } @@ -541,19 +576,26 @@ static int ipc_pktio_open(odp_pktio_t id ODP_UNUSED, pinfo = odp_shm_addr(shm); pinfo->master.init_done = 0; pinfo->master.pool_name[0] = 0; - pkt_priv(pktio_entry)->pinfo = pinfo; - pkt_priv(pktio_entry)->pinfo_shm = shm; + + pktio_ipc->pinfo = pinfo; + pktio_ipc->pinfo_shm = shm; ODP_DBG("process %d is master\n", getpid()); ret = _ipc_init_master(pktio_entry, dev, pool); } + if (ret) + odp_shm_free(shm); + return ret; } static void _ipc_free_ring_packets(pktio_entry_t *pktio_entry, ring_ptr_t *r, uint32_t r_mask) { - uintptr_t offsets[PKTIO_IPC_ENTRIES]; + pkt_ipc_t *pktio_ipc = pkt_priv(pktio_entry); + uint32_t ring_size = pktio_ipc->ring_size; + uint32_t ring_mask = pktio_ipc->ring_mask; + uintptr_t offsets[ring_size]; int ret; void **rbuf_p; int i; @@ -563,14 +605,13 @@ static void _ipc_free_ring_packets(pktio_entry_t *pktio_entry, ring_ptr_t *r, if (!r) return; - pool = pool_entry_from_hdl(pkt_priv(pktio_entry)->pool); + pool = pool_entry_from_hdl(pktio_ipc->pool); addr = odp_shm_addr(pool->shm); rbuf_p = (void *)&offsets; while (1) { - ret = ring_ptr_deq_multi(r, r_mask, rbuf_p, - PKTIO_IPC_ENTRIES - 1); + ret = ring_ptr_deq_multi(r, r_mask, rbuf_p, ring_mask); if (ret <= 0) break; for (i = 0; i < ret; i++) { @@ -588,34 +629,36 @@ static void _ipc_free_ring_packets(pktio_entry_t *pktio_entry, ring_ptr_t *r, static int ipc_pktio_recv_lockless(pktio_entry_t *pktio_entry, odp_packet_t pkt_table[], int len) { + pkt_ipc_t *pktio_ipc = pkt_priv(pktio_entry); + uint32_t ring_size = pktio_ipc->ring_size; + uint32_t ring_mask = pktio_ipc->ring_mask; int pkts = 0; int i; ring_ptr_t *r; ring_ptr_t *r_p; - uintptr_t offsets[PKTIO_IPC_ENTRIES]; + uintptr_t offsets[ring_size]; void **ipcbufs_p = (void *)&offsets[0]; uint32_t ready; - ready = odp_atomic_load_u32(&pkt_priv(pktio_entry)->ready); + ready = odp_atomic_load_u32(&pktio_ipc->ready); if (odp_unlikely(!ready)) { IPC_ODP_DBG("start pktio is missing before usage?\n"); return 0; } - _ipc_free_ring_packets(pktio_entry, pkt_priv(pktio_entry)->tx.free, - PKTIO_IPC_ENTRY_MASK); + _ipc_free_ring_packets(pktio_entry, pktio_ipc->tx.free, ring_mask); /* rx from cache */ - r = pkt_priv(pktio_entry)->rx.cache; - pkts = ring_ptr_deq_multi(r, PKTIO_IPC_ENTRY_MASK, ipcbufs_p, len); + r = pktio_ipc->rx.cache; + pkts = ring_ptr_deq_multi(r, ring_mask, ipcbufs_p, len); if (odp_unlikely(pkts < 0)) ODP_ABORT("internal error dequeue\n"); /* rx from other app */ if (pkts == 0) { ipcbufs_p = (void *)&offsets[0]; - r = pkt_priv(pktio_entry)->rx.recv; - pkts = ring_ptr_deq_multi(r, PKTIO_IPC_ENTRY_MASK, ipcbufs_p, + r = pktio_ipc->rx.recv; + pkts = ring_ptr_deq_multi(r, ring_mask, ipcbufs_p, len); if (odp_unlikely(pkts < 0)) ODP_ABORT("internal error dequeue\n"); @@ -633,11 +676,10 @@ static int ipc_pktio_recv_lockless(pktio_entry_t *pktio_entry, uint64_t data_pool_off; void *rmt_data_ptr; - phdr = (void *)((uint8_t *)pkt_priv(pktio_entry)-> - pool_mdata_base + - offsets[i]); + phdr = (void *)((uint8_t *)pktio_ipc->pool_mdata_base + + offsets[i]); - pool = pkt_priv(pktio_entry)->pool; + pool = pktio_ipc->pool; if (odp_unlikely(pool == ODP_POOL_INVALID)) ODP_ABORT("invalid pool"); @@ -646,7 +688,7 @@ static int ipc_pktio_recv_lockless(pktio_entry_t *pktio_entry, pkt = odp_packet_alloc(pool, phdr->frame_len); if (odp_unlikely(pkt == ODP_PACKET_INVALID)) { /* Original pool might be smaller then - * PKTIO_IPC_ENTRIES. If packet can not be + * ring size. If packet can not be * allocated from pool at this time, * simple get in on next recv() call. To keep * packet ordering store such packets in local @@ -661,13 +703,11 @@ static int ipc_pktio_recv_lockless(pktio_entry_t *pktio_entry, pkt_data = odp_packet_data(pkt); if (odp_unlikely(!pkt_data)) ODP_ABORT("unable to map pkt_data ipc_slave %d\n", - (PKTIO_TYPE_IPC_SLAVE == - pkt_priv(pktio_entry)->type)); + (PKTIO_TYPE_IPC_SLAVE == pktio_ipc->type)); /* Copy packet data from shared pool to local pool. */ - rmt_data_ptr = (uint8_t *)pkt_priv(pktio_entry)-> - pool_mdata_base + - data_pool_off; + rmt_data_ptr = (uint8_t *)pktio_ipc->pool_mdata_base + + data_pool_off; memcpy(pkt_data, rmt_data_ptr, phdr->frame_len); /* Copy packets L2, L3 parsed offsets and size */ @@ -686,8 +726,8 @@ static int ipc_pktio_recv_lockless(pktio_entry_t *pktio_entry, /* put back to rx ring dequed but not processed packets*/ if (pkts != i) { ipcbufs_p = (void *)&offsets[i]; - r_p = pkt_priv(pktio_entry)->rx.cache; - ring_ptr_enq_multi(r_p, PKTIO_IPC_ENTRY_MASK, ipcbufs_p, + r_p = pktio_ipc->rx.cache; + ring_ptr_enq_multi(r_p, ring_mask, ipcbufs_p, pkts - i); if (i == 0) @@ -698,10 +738,10 @@ static int ipc_pktio_recv_lockless(pktio_entry_t *pktio_entry, pkts = i; /* Now tell other process that we no longer need that buffers.*/ - r_p = pkt_priv(pktio_entry)->rx.free; + r_p = pktio_ipc->rx.free; ipcbufs_p = (void *)&offsets[0]; - ring_ptr_enq_multi(r_p, PKTIO_IPC_ENTRY_MASK, ipcbufs_p, pkts); + ring_ptr_enq_multi(r_p, ring_mask, ipcbufs_p, pkts); for (i = 0; i < pkts; i++) { IPC_ODP_DBG("%d/%d send to be free packet offset %x\n", @@ -728,11 +768,13 @@ static int ipc_pktio_recv(pktio_entry_t *pktio_entry, int index ODP_UNUSED, static int ipc_pktio_send_lockless(pktio_entry_t *pktio_entry, const odp_packet_t pkt_table[], int num) { + pkt_ipc_t *pktio_ipc = pkt_priv(pktio_entry); + uint32_t ring_mask = pktio_ipc->ring_mask; ring_ptr_t *r; void **rbuf_p; int i; - uint32_t ready = odp_atomic_load_u32(&pkt_priv(pktio_entry)->ready); - pool_t *ipc_pool = pool_entry_from_hdl(pkt_priv(pktio_entry)->pool); + uint32_t ready = odp_atomic_load_u32(&pktio_ipc->ready); + pool_t *ipc_pool = pool_entry_from_hdl(pktio_ipc->pool); odp_packet_t pkt_table_mapped[num]; /**< Ready to send packet has to be * in memory mapped pool. */ uintptr_t offsets[num]; @@ -740,8 +782,7 @@ static int ipc_pktio_send_lockless(pktio_entry_t *pktio_entry, if (odp_unlikely(!ready)) return 0; - _ipc_free_ring_packets(pktio_entry, pkt_priv(pktio_entry)->tx.free, - PKTIO_IPC_ENTRY_MASK); + _ipc_free_ring_packets(pktio_entry, pktio_ipc->tx.free, ring_mask); /* Copy packets to shm shared pool if they are in different * pool, or if they are references (we can't share across IPC). @@ -758,8 +799,7 @@ static int ipc_pktio_send_lockless(pktio_entry_t *pktio_entry, odp_packet_has_ref(pkt)) { odp_packet_t newpkt; - newpkt = odp_packet_copy(pkt, - pkt_priv(pktio_entry)->pool); + newpkt = odp_packet_copy(pkt, pktio_ipc->pool); if (newpkt == ODP_PACKET_INVALID) ODP_ABORT("Unable to copy packet\n"); @@ -791,14 +831,13 @@ static int ipc_pktio_send_lockless(pktio_entry_t *pktio_entry, odp_packet_to_u64(pkt), odp_pool_to_u64(pool_hdl), pkt_hdr, pkt_hdr->buf_hdr.ipc_data_offset, offsets[i], odp_shm_addr(pool->shm), - odp_shm_addr(pool_entry_from_hdl( - pkt_priv(pktio_entry)->pool)->shm)); + odp_shm_addr(ipc_pool->shm)); } /* Put packets to ring to be processed by other process. */ rbuf_p = (void *)&offsets[0]; - r = pkt_priv(pktio_entry)->tx.send; - ring_ptr_enq_multi(r, PKTIO_IPC_ENTRY_MASK, rbuf_p, num); + r = pktio_ipc->tx.send; + ring_ptr_enq_multi(r, ring_mask, rbuf_p, num); return num; } @@ -847,19 +886,20 @@ static int ipc_start(pktio_entry_t *pktio_entry) static int ipc_stop(pktio_entry_t *pktio_entry) { - odp_atomic_store_u32(&pkt_priv(pktio_entry)->ready, 0); + pkt_ipc_t *pktio_ipc = pkt_priv(pktio_entry); + uint32_t ring_mask = pktio_ipc->ring_mask; + + odp_atomic_store_u32(&pktio_ipc->ready, 0); - if (pkt_priv(pktio_entry)->tx.send) - _ipc_free_ring_packets(pktio_entry, - pkt_priv(pktio_entry)->tx.send, - PKTIO_IPC_ENTRY_MASK); + if (pktio_ipc->tx.send) + _ipc_free_ring_packets(pktio_entry, pktio_ipc->tx.send, + ring_mask); /* other process can transfer packets from one ring to * other, use delay here to free that packets. */ sleep(1); - if (pkt_priv(pktio_entry)->tx.free) - _ipc_free_ring_packets(pktio_entry, - pkt_priv(pktio_entry)->tx.free, - PKTIO_IPC_ENTRY_MASK); + if (pktio_ipc->tx.free) + _ipc_free_ring_packets(pktio_entry, pktio_ipc->tx.free, + ring_mask); return 0; } commit b89a5b77e92060c9343ab162526d05a8ee97f8b4 Author: Matias Elo <matias.elo(a)nokia.com> Date: Fri Oct 25 13:59:58 2019 +0300 linux-gen: ipc: clean up code Reorder code and remove unused variables and defines. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/platform/linux-generic/pktio/ipc.c b/platform/linux-generic/pktio/ipc.c index 00edcdb7e..dec918e95 100644 --- a/platform/linux-generic/pktio/ipc.c +++ b/platform/linux-generic/pktio/ipc.c @@ -11,6 +11,7 @@ #include <odp/api/system_info.h> #include <odp_shm_internal.h> #include <odp_ring_ptr_internal.h> +#include <odp_global_data.h> #include <errno.h> #include <fcntl.h> @@ -38,15 +39,12 @@ struct pktio_info { struct { /* number of buffer*/ int num; - /* size of packet/segment in remote pool */ - uint32_t block_size; char pool_name[ODP_POOL_NAME_LEN]; /* 1 if master finished creation of all shared objects */ int init_done; } master; struct { void *base_addr; - uint32_t block_size; char pool_name[ODP_POOL_NAME_LEN]; /* pid of the slave process written to shm and * used by master to look up memory created by @@ -57,46 +55,79 @@ struct pktio_info { } slave; } ODP_PACKED; -/* The maximum length of a ring name. */ -#define _RING_NAMESIZE 32 -/* If set - ring is visible from different processes. - * Default is thread visible.*/ -#define _RING_SHM_PROC (1 << 2) -/* Ring size mask */ -#define _RING_SZ_MASK (unsigned)(0x0fffffff) +typedef struct { + /* TX */ + struct { + /* ODP ring for IPC msg packets indexes transmitted to shared + * memory */ + ring_ptr_t *send; + /* ODP ring for IPC msg packets indexes already processed by + * remote process */ + ring_ptr_t *free; + } tx; + /* RX */ + struct { + /* ODP ring for IPC msg packets indexes received from shared + * memory (from remote process) */ + ring_ptr_t *recv; + /* odp ring for ipc msg packets indexes already processed by + * current process */ + ring_ptr_t *free; + /* local cache to keep packet order right */ + ring_ptr_t *cache; + } rx; /* slave */ + void *pool_base; /**< Remote pool base addr */ + void *pool_mdata_base; /**< Remote pool mdata base addr */ + odp_pool_t pool; /**< Pool of main process */ + enum { + PKTIO_TYPE_IPC_MASTER = 0, /**< Master is the process which + creates shm */ + PKTIO_TYPE_IPC_SLAVE /**< Slave is the process which + connects to shm */ + } type; /**< define if it's master or slave process */ + odp_atomic_u32_t ready; /**< 1 - pktio is ready and can recv/send + packet, 0 - not yet ready */ + void *pinfo; + odp_shm_t pinfo_shm; + odp_shm_t remote_pool_shm; /**< shm of remote pool get with + _ipc_map_remote_pool() */ +} pkt_ipc_t; + +ODP_STATIC_ASSERT(PKTIO_PRIVATE_SIZE >= sizeof(pkt_ipc_t), + "PKTIO_PRIVATE_SIZE too small"); + +static inline pkt_ipc_t *pkt_priv(pktio_entry_t *pktio_entry) +{ + return (pkt_ipc_t *)(uintptr_t)(pktio_entry->s.pkt_priv); +} + +/* MAC address for the "ipc" interface */ +static const char pktio_ipc_mac[] = {0x12, 0x12, 0x12, 0x12, 0x12, 0x12}; + +static odp_shm_t _ipc_map_remote_pool(const char *name, int pid); /* create the ring */ -static ring_ptr_t * -_ring_create(const char *name, unsigned count, unsigned flags) +static ring_ptr_t *_ring_create(const char *name, uint32_t count, + uint32_t shm_flags) { - char ring_name[_RING_NAMESIZE]; ring_ptr_t *r; size_t ring_size; - uint32_t shm_flag; odp_shm_t shm; - if (flags & _RING_SHM_PROC) - shm_flag = ODP_SHM_PROC | ODP_SHM_EXPORT; - else - shm_flag = 0; if (odp_global_ro.shm_single_va) - shm_flag |= ODP_SHM_SINGLE_VA; + shm_flags |= ODP_SHM_SINGLE_VA; /* count must be a power of 2 */ if (!CHECK_IS_POWER2(count)) { - ODP_ERR("Requested size is invalid, must be power of 2," - "and do not exceed the size limit %u\n", - _RING_SZ_MASK); + ODP_ERR("Requested size is invalid, must be a power of 2\n"); __odp_errno = EINVAL; return NULL; } - snprintf(ring_name, sizeof(ring_name), "%s", name); ring_size = sizeof(ring_ptr_t) + count * sizeof(void *); /* reserve a memory zone for this ring.*/ - shm = odp_shm_reserve(ring_name, ring_size, ODP_CACHE_LINE_SIZE, - shm_flag); + shm = odp_shm_reserve(name, ring_size, ODP_CACHE_LINE_SIZE, shm_flags); r = odp_shm_addr(shm); if (r != NULL) { @@ -124,7 +155,7 @@ static int _ring_destroy(const char *name) /** * Return the number of entries in a ring. */ -static unsigned _ring_count(ring_ptr_t *r, uint32_t mask) +static uint32_t _ring_count(ring_ptr_t *r, uint32_t mask) { uint32_t prod_tail = odp_atomic_load_u32(&r->r.w_tail); uint32_t cons_tail = odp_atomic_load_u32(&r->r.r_tail); @@ -135,7 +166,7 @@ static unsigned _ring_count(ring_ptr_t *r, uint32_t mask) /** * Return the number of free entries in a ring. */ -static unsigned _ring_free_count(ring_ptr_t *r, uint32_t mask) +static uint32_t _ring_free_count(ring_ptr_t *r, uint32_t mask) { uint32_t prod_tail = odp_atomic_load_u32(&r->r.w_tail); uint32_t cons_tail = odp_atomic_load_u32(&r->r.r_tail); @@ -143,58 +174,6 @@ static unsigned _ring_free_count(ring_ptr_t *r, uint32_t mask) return (cons_tail - prod_tail - 1) & mask; } -typedef struct { - /* TX */ - struct { - /* ODP ring for IPC msg packets indexes transmitted to shared - * memory */ - ring_ptr_t *send; - /* ODP ring for IPC msg packets indexes already processed by - * remote process */ - ring_ptr_t *free; - } tx; - /* RX */ - struct { - /* ODP ring for IPC msg packets indexes received from shared - * memory (from remote process) */ - ring_ptr_t *recv; - /* odp ring for ipc msg packets indexes already processed by - * current process */ - ring_ptr_t *free; - /* local cache to keep packet order right */ - ring_ptr_t *cache; - } rx; /* slave */ - void *pool_base; /**< Remote pool base addr */ - void *pool_mdata_base; /**< Remote pool mdata base addr */ - uint64_t pkt_size; /**< Packet size in remote pool */ - odp_pool_t pool; /**< Pool of main process */ - enum { - PKTIO_TYPE_IPC_MASTER = 0, /**< Master is the process which - creates shm */ - PKTIO_TYPE_IPC_SLAVE /**< Slave is the process which - connects to shm */ - } type; /**< define if it's master or slave process */ - odp_atomic_u32_t ready; /**< 1 - pktio is ready and can recv/send - packet, 0 - not yet ready */ - void *pinfo; - odp_shm_t pinfo_shm; - odp_shm_t remote_pool_shm; /**< shm of remote pool get with - _ipc_map_remote_pool() */ -} pkt_ipc_t; - -ODP_STATIC_ASSERT(PKTIO_PRIVATE_SIZE >= sizeof(pkt_ipc_t), - "PKTIO_PRIVATE_SIZE too small"); - -static inline pkt_ipc_t *pkt_priv(pktio_entry_t *pktio_entry) -{ - return (pkt_ipc_t *)(uintptr_t)(pktio_entry->s.pkt_priv); -} - -/* MAC address for the "ipc" interface */ -static const char pktio_ipc_mac[] = {0x12, 0x12, 0x12, 0x12, 0x12, 0x12}; - -static odp_shm_t _ipc_map_remote_pool(const char *name, int pid); - static const char *_ipc_odp_buffer_pool_shm_name(odp_pool_t pool_hdl) { pool_t *pool; @@ -240,13 +219,9 @@ static int _ipc_init_master(pktio_entry_t *pktio_entry, odp_pool_t pool_hdl) { char ipc_shm_name[ODP_POOL_NAME_LEN + sizeof("_m_prod")]; - pool_t *pool; struct pktio_info *pinfo; const char *pool_name; - pool = pool_entry_from_hdl(pool_hdl); - (void)pool; - if (strlen(dev) > (ODP_POOL_NAME_LEN - sizeof("_m_prod"))) { ODP_ERR("too big ipc name\n"); return -1; @@ -258,7 +233,8 @@ static int _ipc_init_master(pktio_entry_t *pktio_entry, snprintf(ipc_shm_name, sizeof(ipc_shm_name), "%s_m_prod", dev); pkt_priv(pktio_entry)->tx.send = _ring_create(ipc_shm_name, PKTIO_IPC_ENTRIES, - _RING_SHM_PROC); + ODP_SHM_PROC | + ODP_SHM_EXPORT); if (!pkt_priv(pktio_entry)->tx.send) { ODP_ERR("pid %d unable to create ipc ring %s name\n", getpid(), ipc_shm_name); @@ -276,7 +252,8 @@ static int _ipc_init_master(pktio_entry_t *pktio_entry, snprintf(ipc_shm_name, sizeof(ipc_shm_name), "%s_m_cons", dev); pkt_priv(pktio_entry)->tx.free = _ring_create(ipc_shm_name, PKTIO_IPC_ENTRIES, - _RING_SHM_PROC); + ODP_SHM_PROC | + ODP_SHM_EXPORT); if (!pkt_priv(pktio_entry)->tx.free) { ODP_ERR("pid %d unable to create ipc ring %s name\n", getpid(), ipc_shm_name); @@ -291,7 +268,8 @@ static int _ipc_init_master(pktio_entry_t *pktio_entry, snprintf(ipc_shm_name, sizeof(ipc_shm_name), "%s_s_prod", dev); pkt_priv(pktio_entry)->rx.recv = _ring_create(ipc_shm_name, PKTIO_IPC_ENTRIES, - _RING_SHM_PROC); + ODP_SHM_PROC | + ODP_SHM_EXPORT); if (!pkt_priv(pktio_entry)->rx.recv) { ODP_ERR("pid %d unable to create ipc ring %s name\n", getpid(), ipc_shm_name); @@ -306,7 +284,8 @@ static int _ipc_init_master(pktio_entry_t *pktio_entry, snprintf(ipc_shm_name, sizeof(ipc_shm_name), "%s_s_cons", dev); pkt_priv(pktio_entry)->rx.free = _ring_create(ipc_shm_name, PKTIO_IPC_ENTRIES, - _RING_SHM_PROC); + ODP_SHM_PROC | + ODP_SHM_EXPORT); if (!pkt_priv(pktio_entry)->rx.free) { ODP_ERR("pid %d unable to create ipc ring %s name\n", getpid(), ipc_shm_name); @@ -361,7 +340,6 @@ static void _ipc_export_pool(struct pktio_info *pinfo, snprintf(pinfo->slave.pool_name, ODP_POOL_NAME_LEN, "%s", _ipc_odp_buffer_pool_shm_name(pool_hdl)); pinfo->slave.pid = odp_global_ro.main_pid; - pinfo->slave.block_size = pool->block_size; pinfo->slave.base_addr = pool->base_addr; } @@ -480,7 +458,6 @@ static int _ipc_slave_start(pktio_entry_t *pktio_entry) pid); pkt_priv(pktio_entry)->remote_pool_shm = shm; pkt_priv(pktio_entry)->pool_mdata_base = (char *)odp_shm_addr(shm); - pkt_priv(pktio_entry)->pkt_size = pinfo->master.block_size; _ipc_export_pool(pinfo, pkt_priv(pktio_entry)->pool); @@ -517,9 +494,6 @@ static int ipc_pktio_open(odp_pktio_t id ODP_UNUSED, char tail[ODP_POOL_NAME_LEN]; odp_shm_t shm; - ODP_STATIC_ASSERT(ODP_POOL_NAME_LEN == _RING_NAMESIZE, - "mismatch pool and ring name arrays"); - if (strncmp(dev, "ipc", 3)) return -1; commit fc07575511c3a5b79ccae80ca278b3daad4f101d Author: Matias Elo <matias.elo(a)nokia.com> Date: Fri Oct 25 13:01:00 2019 +0300 linux-gen: ipc: remove now unnecessary init/term functions Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/platform/linux-generic/pktio/ipc.c b/platform/linux-generic/pktio/ipc.c index faabe8a51..00edcdb7e 100644 --- a/platform/linux-generic/pktio/ipc.c +++ b/platform/linux-generic/pktio/ipc.c @@ -65,43 +65,6 @@ struct pktio_info { /* Ring size mask */ #define _RING_SZ_MASK (unsigned)(0x0fffffff) -typedef struct { - /* Rings tailq lock */ - odp_rwlock_t qlock; - odp_shm_t shm; -} global_data_t; - -static global_data_t *global; - -/* Initialize tailq_ring */ -static int _ring_global_init(void) -{ - odp_shm_t shm; - - /* Allocate globally shared memory */ - shm = odp_shm_reserve("_odp_ring_global", sizeof(global_data_t), - ODP_CACHE_LINE_SIZE, 0); - if (ODP_SHM_INVALID == shm) { - ODP_ERR("Shm reserve failed for pktio ring\n"); - return -1; - } - - global = odp_shm_addr(shm); - memset(global, 0, sizeof(global_data_t)); - global->shm = shm; - - return 0; -} - -static int _ring_global_term(void) -{ - if (odp_shm_free(global->shm)) { - ODP_ERR("Shm free failed for pktio ring\n"); - return -1; - } - return 0; -} - /* create the ring */ static ring_ptr_t * _ring_create(const char *name, unsigned count, unsigned flags) @@ -961,23 +924,12 @@ static int ipc_close(pktio_entry_t *pktio_entry) return 0; } -static int ipc_pktio_init_global(void) -{ - ODP_DBG("PKTIO: initializing ipc interface.\n"); - return _ring_global_init(); -} - -static int ipc_pktio_term_global(void) -{ - return _ring_global_term(); -} - const pktio_if_ops_t ipc_pktio_ops = { .name = "ipc", .print = NULL, - .init_global = ipc_pktio_init_global, + .init_global = NULL, .init_local = NULL, - .term = ipc_pktio_term_global, + .term = NULL, .open = ipc_pktio_open, .close = ipc_close, .recv = ipc_pktio_recv, commit ff99ba52f99a608dc1a41f4d8a86ab5c2f8491ca Author: Matias Elo <matias.elo(a)nokia.com> Date: Fri Oct 25 11:13:59 2019 +0300 linux-gen: ipc: remove unnecessary odp_packet_io_ipc_internal.h header Copy the remaining necessary code from odp_packet_io_ipc_internal.h to ipc.c. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index a3ec92af6..0d15e53d9 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -108,7 +108,6 @@ noinst_HEADERS = \ include/odp_packet_dpdk.h \ include/odp_packet_internal.h \ include/odp_packet_io_internal.h \ - include/odp_packet_io_ipc_internal.h \ include/odp_socket_common.h \ include/odp_packet_io_stats_common.h \ include/odp_packet_io_stats.h \ diff --git a/platform/linux-generic/include/odp_packet_io_ipc_internal.h b/platform/linux-generic/include/odp_packet_io_ipc_internal.h deleted file mode 100644 index 8962f8936..000000000 --- a/platform/linux-generic/include/odp_packet_io_ipc_internal.h +++ /dev/null @@ -1,46 +0,0 @@ -/* Copyright (c) 2015-2018, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#include <odp/api/packet_io.h> -#include <odp_packet_io_internal.h> -#include <odp/api/packet.h> -#include <odp_packet_internal.h> -#include <odp/api/shared_memory.h> - -#include <string.h> -#include <unistd.h> -#include <stdlib.h> - -/* number of odp buffers in odp ring queue */ -#define PKTIO_IPC_ENTRIES 4096 - -#define PKTIO_IPC_ENTRY_MASK (PKTIO_IPC_ENTRIES - 1) - -/* that struct is exported to shared memory, so that processes can find - * each other. - */ -struct pktio_info { - struct { - /* number of buffer*/ - int num; - /* size of packet/segment in remote pool */ - uint32_t block_size; - char pool_name[ODP_POOL_NAME_LEN]; - /* 1 if master finished creation of all shared objects */ - int init_done; - } master; - struct { - void *base_addr; - uint32_t block_size; - char pool_name[ODP_POOL_NAME_LEN]; - /* pid of the slave process written to shm and - * used by master to look up memory created by - * slave - */ - int pid; - int init_done; - } slave; -} ODP_PACKED; diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c index 6e4f36569..33ba8fdb4 100644 --- a/platform/linux-generic/odp_packet_io.c +++ b/platform/linux-generic/odp_packet_io.c @@ -24,7 +24,6 @@ #include <odp_schedule_if.h> #include <odp_classification_internal.h> #include <odp_debug_internal.h> -#include <odp_packet_io_ipc_internal.h> #include <odp/api/time.h> #include <odp/api/plat/time_inlines.h> #include <odp_pcapng.h> diff --git a/platform/linux-generic/pktio/ipc.c b/platform/linux-generic/pktio/ipc.c index 680bfa392..faabe8a51 100644 --- a/platform/linux-generic/pktio/ipc.c +++ b/platform/linux-generic/pktio/ipc.c @@ -5,7 +5,6 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <odp_packet_io_ipc_internal.h> #include <odp_debug_internal.h> #include <odp_packet_io_internal.h> #include <odp_errno_define.h> @@ -17,6 +16,7 @@ #include <fcntl.h> #include <sys/mman.h> #include <sys/stat.h> +#include <unistd.h> #define IPC_ODP_DEBUG_PRINT 0 @@ -26,6 +26,37 @@ ODP_DBG(fmt, ##__VA_ARGS__);\ } while (0) +/* number of odp buffers in odp ring queue */ +#define PKTIO_IPC_ENTRIES 4096 + +#define PKTIO_IPC_ENTRY_MASK (PKTIO_IPC_ENTRIES - 1) + +/* that struct is exported to shared memory, so that processes can find + * each other. + */ +struct pktio_info { + struct { + /* number of buffer*/ + int num; + /* size of packet/segment in remote pool */ + uint32_t block_size; + char pool_name[ODP_POOL_NAME_LEN]; + /* 1 if master finished creation of all shared objects */ + int init_done; + } master; + struct { + void *base_addr; + uint32_t block_size; + char pool_name[ODP_POOL_NAME_LEN]; + /* pid of the slave process written to shm and + * used by master to look up memory created by + * slave + */ + int pid; + int init_done; + } slave; +} ODP_PACKED; + /* The maximum length of a ring name. */ #define _RING_NAMESIZE 32 /* If set - ring is visible from different processes. commit 426ee8c61835c8faa5df0873ecc4ec7c8667c691 Author: Matias Elo <matias.elo(a)nokia.com> Date: Fri Oct 25 11:08:52 2019 +0300 linux-gen: ipc: move remaining ring helper functions to ipc source file The remaining ring helper functions are only used by the IPC pktio, so move them to ipc.c. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 0d4d905f9..a3ec92af6 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -109,7 +109,6 @@ noinst_HEADERS = \ include/odp_packet_internal.h \ include/odp_packet_io_internal.h \ include/odp_packet_io_ipc_internal.h \ - include/odp_packet_io_ring_internal.h \ include/odp_socket_common.h \ include/odp_packet_io_stats_common.h \ include/odp_packet_io_stats.h \ @@ -224,7 +223,6 @@ __LIB__libodp_linux_la_SOURCES = \ pktio/netmap.c \ pktio/null.c \ pktio/pktio_common.c \ - pktio/ring.c \ pktio/socket.c \ pktio/socket_mmap.c \ pktio/tap.c diff --git a/platform/linux-generic/include/odp_packet_io_internal.h b/platform/linux-generic/include/odp_packet_io_internal.h index d12db8339..ba2e7c6bc 100644 --- a/platform/linux-generic/include/odp_packet_io_internal.h +++ b/platform/linux-generic/include/odp_packet_io_internal.h @@ -27,7 +27,6 @@ extern "C" { #include <odp_classification_datamodel.h> #include <odp_align_internal.h> #include <odp_debug_internal.h> -#include <odp_packet_io_ring_internal.h> #include <odp_packet_io_stats_common.h> #include <odp_queue_if.h> diff --git a/platform/linux-generic/include/odp_packet_io_ipc_internal.h b/platform/linux-generic/include/odp_packet_io_ipc_internal.h index 59c268cb9..8962f8936 100644 --- a/platform/linux-generic/include/odp_packet_io_ipc_internal.h +++ b/platform/linux-generic/include/odp_packet_io_ipc_internal.h @@ -14,9 +14,6 @@ #include <unistd.h> #include <stdlib.h> -/* IPC packet I/O over shared memory ring */ -#include <odp_packet_io_ring_internal.h> - /* number of odp buffers in odp ring queue */ #define PKTIO_IPC_ENTRIES 4096 diff --git a/platform/linux-generic/include/odp_packet_io_ring_internal.h b/platform/linux-generic/include/odp_packet_io_ring_internal.h deleted file mode 100644 index 22f1ae017..000000000 --- a/platform/linux-generic/include/odp_packet_io_ring_internal.h +++ /dev/null @@ -1,413 +0,0 @@ -/* Copyright (c) 2014-2018, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -/*- - * BSD LICENSE - * - * Copyright(c) 2010-2013 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. - */ - -/* - * Derived from FreeBSD's bufring.c - * - ************************************************************************** - * - * Copyright (c) 2007,2008 Kip Macy kmacy(a)freebsd.org - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * - * 2. The name of Kip Macy nor the names of other - * 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. - * - ***************************************************************************/ - -/** - * ODP Ring - * - * The Ring Manager is a fixed-size queue, implemented as a table of - * pointers. Head and tail pointers are modified atomically, allowing - * concurrent access to it. It has the following features: - * - * - FIFO (First In First Out) - * - Maximum size is fixed; the pointers are stored in a table. - * - Lockless implementation. - * - Multi- or single-consumer dequeue. - * - Multi- or single-producer enqueue. - * - Bulk dequeue. - * - Bulk enqueue. - * - * Note: the ring implementation is not preemptable. A lcore must not - * be interrupted by another task that uses the same ring. - * - */ - -#ifndef _RING_H_ -#define _RING_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -#include <odp/api/std_types.h> -#include <odp/api/hints.h> -#include <odp/api/atomic.h> -#include <errno.h> -#include <sys/queue.h> -#include <odp_debug_internal.h> - -#include <odp_ring_ptr_internal.h> - -enum _ring_queue_behavior { - _RING_QUEUE_FIXED = 0, /**< Enq/Deq a fixed number - of items from a ring */ - _RING_QUEUE_VARIABLE /**< Enq/Deq as many items - a possible from ring */ -}; - -#define _RING_NAMESIZE 32 /**< The maximum length of a ring name. */ - -/** - * An ODP ring structure. - * - * The producer and the consumer have a head and a tail index. The particularity - * of these index is that they are not between 0 and size(ring). These indexes - * are between 0 and 2^32, and we mask their value when we access the ring[] - * field. Thanks to this assumption, we can do subtractions between 2 index - * values in a modulo-32bit base: that's why the overflow of the indexes is not - * a problem. - */ -typedef struct _ring { - /** @private Next in list. */ - TAILQ_ENTRY(_ring) next; - - /** @private Name of the ring. */ - char name[_RING_NAMESIZE]; - /** @private Flags supplied at creation. */ - int flags; - - /** @private Producer */ - struct ODP_ALIGNED_CACHE _prod { - uint32_t size; /* Size of ring. */ - uint32_t mask; /* Mask (size-1) of ring. */ - volatile uint32_t head; /* Producer head. */ - volatile uint32_t tail; /* Producer tail. */ - } prod; - - /** @private Consumer */ - struct ODP_ALIGNED_CACHE _cons { - uint32_t size; /* Size of the ring. */ - uint32_t mask; /* Mask (size-1) of ring. */ - volatile uint32_t head; /* Consumer head. */ - volatile uint32_t tail; /* Consumer tail. */ - } cons; - - /** @private Memory space of ring starts here. */ - void ODP_ALIGNED_CACHE *ring[0]; -} _ring_t; - -/* The default enqueue is "single-producer".*/ -#define _RING_F_SP_ENQ (1 << 0) -/* The default dequeue is "single-consumer".*/ -#define _RING_F_SC_DEQ (1 << 1) -/* If set - ring is visible from different processes. - * Default is thread visible.*/ -#define _RING_SHM_PROC (1 << 2) -/* Ring size mask */ -#define _RING_SZ_MASK (unsigned)(0x0fffffff) - -/** - * Create a new ring named *name* in memory. - * - * This function uses odp_shm_reserve() to allocate memory. Its size is - * set to *count*, which must be a power of two. Note that the real usable - * ring size is count-1 instead of count. - * - * @param name - * The name of the ring. - * @param count - * The size of the ring (must be a power of 2). - * @param flags - * An OR of the following: - * - RING_F_SP_ENQ: If this flag is set, the default behavior when - * using ``odph_ring_enqueue()`` or ``odph_ring_enqueue_bulk()`` - * is "single-producer". Otherwise, it is "multi-producers". - * - RING_F_SC_DEQ: If this flag is set, the default behavior when - * using ``odph_ring_dequeue()`` or ``odph_ring_dequeue_bulk()`` - * is "single-consumer". Otherwise, it is "multi-consumers". - * @return - * On success, the pointer to the new allocated ring. NULL on error with - * odp_errno set appropriately. Possible errno values include: - * - EINVAL - count provided is not a power of 2 - * - ENOSPC - the maximum number of memzones has already been allocated - * - EEXIST - a memzone with the same name already exists - * - ENOMEM - no appropriate memory area found in which to create memzone - */ -ring_ptr_t *_ring_create(const char *name, unsigned count, unsigned flags); - -/** - * Destroy the ring created with *name*. - * - * @param name name of the ring to be destroyed. - * @return 0 on success and negative value on error. - */ -int _ring_destroy(const char *name); - -/** - * Dump the status of the ring to the console. - * - * @param r A pointer to the ring structure. - */ -void _ring_dump(ring_ptr_t *r, uint32_t mask); - -/** - * Enqueue several objects on the ring (multi-producers safe). - * - * This function uses a "compare and set" instruction to move the - * producer index atomically. - * - * @param r - * A pointer to the ring structure. - * @param obj_table - * A pointer to a table of void * pointers (objects). - * @param n - * The number of objects to add in the ring from the obj_table. - * @param behavior - * ODPH_RING_QUEUE_FIXED: Enqueue a fixed number of items from a ring - * ODPH_RING_QUEUE_VARIABLE: Enqueue as many items a possible from ring - * @return - * Depend on the behavior value - * if behavior = ODPH_RING_QUEUE_FIXED - * - 0: Success; objects enqueue. - * - -ENOBUFS: Not enough room in the ring to enqueue, no object is enqueued. - * if behavior = ODPH_RING_QUEUE_VARIABLE - * - n: Actual number of objects enqueued. - */ -int ___ring_mp_do_enqueue(ring_ptr_t *r, void * const *obj_table, - unsigned n, - enum _ring_queue_behavior behavior); - -/** - * Dequeue several objects from a ring (multi-consumers safe). When - * the request objects are more than the available objects, only dequeue the - * actual number of objects - * - * This function uses a "compare and set" instruction to move the - * consumer index atomically. - * - * @param r - * A pointer to the ring structure. - * @param obj_table - * A pointer to a table of void * pointers (objects) that will be filled. - * @param n - * The number of objects to dequeue from the ring to the obj_table. - * @param behavior - * ODPH_RING_QUEUE_FIXED: Dequeue a fixed number of items from a ring - * ODPH_RING_QUEUE_VARIABLE: Dequeue as many items a possible from ring - * @return - * Depend on the behavior value - * if behavior = ODPH_RING_QUEUE_FIXED - * - 0: Success; objects dequeued. - * - -ENOENT: Not enough entries in the ring to dequeue; no object is - * dequeued. - * if behavior = ODPH_RING_QUEUE_VARIABLE - * - n: Actual number of objects dequeued. - */ - -int ___ring_mc_do_dequeue(ring_ptr_t *r, void **obj_table, - unsigned n, - enum _ring_queue_behavior behavior); - -/** - * Enqueue several objects on the ring (multi-producers safe). - * - * This function uses a "compare and set" instruction to move the - * producer index atomically. - * - * @param r - * A pointer to the ring structure. - * @param obj_table - * A pointer to a table of void * pointers (objects). - * @param n - * The number of objects to add in the ring from the obj_table. - * @return - * - 0: Success; objects enqueue. - * - -EDQUOT: Quota exceeded. The objects have been enqueued, but the - * high water mark is exceeded. - * - -ENOBUFS: Not enough room in the ring to enqueue, no object is enqueued. - */ -int _ring_mp_enqueue_bulk(ring_ptr_t *r, void * const *obj_table, - unsigned n); - -/** - * Dequeue several objects from a ring (multi-consumers safe). - * - * This function uses a "compare and set" instruction to move the - * consumer index atomically. - * - * @param r - * A pointer to the ring structure. - * @param obj_table - * A pointer to a table of void * pointers (objects) that will be filled. - * @param n - * The number of objects to dequeue from the ring to the obj_table. - * @return - * - 0: Success; objects dequeued. - * - -ENOENT: Not enough entries in the ring to dequeue; no object is - * dequeued. - */ -int _ring_mc_dequeue_bulk(ring_ptr_t *r, void **obj_table, unsigned n); - -/** - * Test if a ring is full. - * - * @param r - * A pointer to the ring structure. - * @return - * - 1: The ring is full. - * - 0: The ring is not full. - */ -int _ring_full(ring_ptr_t *r, uint32_t mask); - -/** - * Test if a ring is empty. - * - * @param r - * A pointer to the ring structure. - * @return - * - 1: The ring is empty. - * - 0: The ring is not empty. - */ -int _ring_empty(ring_ptr_t *r, uint32_t mask); - -/** - * Return the number of entries in a ring. - * - * @param r - * A pointer to the ring structure. - * @return - * The number of entries in the ring. - */ -unsigned _ring_count(ring_ptr_t *r, uint32_t mask); - -/** - * Return the number of free entries in a ring. - * - * @param r - * A pointer to the ring structure. - * @return - * The number of free entries in the ring. - */ -unsigned _ring_free_count(ring_ptr_t *r, uint32_t mask); - -/** - * search ring by name - * @param name ring name to search - * @return pointer to ring otherwise NULL - */ -ring_ptr_t *_ring_lookup(const char *name); - -/** - * Enqueue several objects on the ring (multi-producers safe). - * - * This function uses a "compare and set" instruction to move the - * producer index atomically. - * - * @param r - * A pointer to the ring structure. - * @param obj_table - * A pointer to a table of void * pointers (objects). - * @param n - * The number of objects to add in the ring from the obj_table. - * @return - * - n: Actual number of objects enqueued. - */ -int _ring_mp_enqueue_burst(ring_ptr_t *r, void * const *obj_table, - unsigned n); - -/** - * Dequeue several objects from a ring (multi-consumers safe). When the request - * objects are more than the available objects, only dequeue the actual number - * of objects - * - * This function uses a "compare and set" instruction to move the - * consumer index atomically. - * - * @param r - * A pointer to the ring structure. - * @param obj_table - * A pointer to a table of void * pointers (objects) that will be filled. - * @param n - * The number of objects to dequeue from the ring to the obj_table. - * @return - * - n: Actual number of objects dequeued, 0 if ring is empty - */ -int _ring_mc_dequeue_burst(ring_ptr_t *r, void **obj_table, unsigned n); - -/** - * dump the status of all rings on the console - */ -void _ring_list_dump(void); - -/** - * Initialize ring tailq - */ -int _ring_global_init(void); - -/** - * Terminate ring tailq - */ -int _ring_global_term(void); - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/platform/linux-generic/pktio/ipc.c b/platform/linux-generic/pktio/ipc.c index a7678f261..680bfa392 100644 --- a/platform/linux-generic/pktio/ipc.c +++ b/platform/linux-generic/pktio/ipc.c @@ -1,4 +1,5 @@ /* Copyright (c) 2015-2018, Linaro Limited + * Copyright (c) 2019, Nokia * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause @@ -7,13 +8,15 @@ #include <odp_packet_io_ipc_internal.h> #include <odp_debug_internal.h> #include <odp_packet_io_internal.h> +#include <odp_errno_define.h> #include <odp/api/system_info.h> #include <odp_shm_internal.h> #include <odp_ring_ptr_internal.h> +#include <errno.h> +#include <fcntl.h> #include <sys/mman.h> #include <sys/stat.h> -#include <fcntl.h> #define IPC_ODP_DEBUG_PRINT 0 @@ -23,6 +26,129 @@ ODP_DBG(fmt, ##__VA_ARGS__);\ } while (0) +/* The maximum length of a ring name. */ +#define _RING_NAMESIZE 32 +/* If set - ring is visible from different processes. + * Default is thread visible.*/ +#define _RING_SHM_PROC (1 << 2) +/* Ring size mask */ +#define _RING_SZ_MASK (unsigned)(0x0fffffff) + +typedef struct { + /* Rings tailq lock */ + odp_rwlock_t qlock; + odp_shm_t shm; +} global_data_t; + +static global_data_t *global; + +/* Initialize tailq_ring */ +static int _ring_global_init(void) +{ + odp_shm_t shm; + + /* Allocate globally shared memory */ + shm = odp_shm_reserve("_odp_ring_global", sizeof(global_data_t), + ODP_CACHE_LINE_SIZE, 0); + if (ODP_SHM_INVALID == shm) { + ODP_ERR("Shm reserve failed for pktio ring\n"); + return -1; + } + + global = odp_shm_addr(shm); + memset(global, 0, sizeof(global_data_t)); + global->shm = shm; + + return 0; +} + +static int _ring_global_term(void) +{ + if (odp_shm_free(global->shm)) { + ODP_ERR("Shm free failed for pktio ring\n"); + return -1; + } + return 0; +} + +/* create the ring */ +static ring_ptr_t * +_ring_create(const char *name, unsigned count, unsigned flags) +{ + char ring_name[_RING_NAMESIZE]; + ring_ptr_t *r; + size_t ring_size; + uint32_t shm_flag; + odp_shm_t shm; + + if (flags & _RING_SHM_PROC) + shm_flag = ODP_SHM_PROC | ODP_SHM_EXPORT; + else + shm_flag = 0; + if (odp_global_ro.shm_single_va) + shm_flag |= ODP_SHM_SINGLE_VA; + + /* count must be a power of 2 */ + if (!CHECK_IS_POWER2(count)) { + ODP_ERR("Requested size is invalid, must be power of 2," + "and do not exceed the size limit %u\n", + _RING_SZ_MASK); + __odp_errno = EINVAL; + return NULL; + } + + snprintf(ring_name, sizeof(ring_name), "%s", name); + ring_size = sizeof(ring_ptr_t) + count * sizeof(void *); + + /* reserve a memory zone for this ring.*/ + shm = odp_shm_reserve(ring_name, ring_size, ODP_CACHE_LINE_SIZE, + shm_flag); + + r = odp_shm_addr(shm); + if (r != NULL) { + /* init the ring structure */ + ring_ptr_init(r); + + } else { + __odp_errno = ENOMEM; + ODP_ERR("Cannot reserve memory\n"); + } + + return r; +} + +static int _ring_destroy(const char *name) +{ + odp_shm_t shm = odp_shm_lookup(name); + + if (shm != ODP_SHM_INVALID) + return odp_shm_free(shm); + + return 0; +} + +/** + * Return the number of entries in a ring. + */ +static unsigned _ring_count(ring_ptr_t *r, uint32_t mask) +{ + uint32_t prod_tail = odp_atomic_load_u32(&r->r.w_tail); + uint32_t cons_tail = odp_atomic_load_u32(&r->r.r_tail); + + return (prod_tail - cons_tail) & mask; +} + +/** + * Return the number of free entries in a ring. + */ +static unsigned _ring_free_count(ring_ptr_t *r, uint32_t mask) +{ + uint32_t prod_tail = odp_atomic_load_u32(&r->r.w_tail); + uint32_t cons_tail = odp_atomic_load_u32(&r->r.r_tail); + + return (cons_tail - prod_tail - 1) & mask; +} + typedef struct { /* TX */ struct { diff --git a/platform/linux-generic/pktio/ring.c b/platform/linux-generic/pktio/ring.c deleted file mode 100644 index 8b3d2b26e..000000000 --- a/platform/linux-generic/pktio/ring.c +++ /dev/null @@ -1,199 +0,0 @@ -/* Copyright (c) 2014-2018, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -/*- - * BSD LICENSE - * - * Copyright(c) 2010-2013 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. - */ - -/* - * Derived from FreeBSD's bufring.c - * - ************************************************************************** - * - * Copyright (c) 2007,2008 Kip Macy kmacy(a)freebsd.org - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * - * 2. The name of Kip Macy nor the names of other - * 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 <odp_api.h> -#include <fcntl.h> -#include <stdio.h> -#include <string.h> -#include <stdbool.h> -#include <inttypes.h> -#include <odp_packet_io_ring_internal.h> -#include <odp_errno_define.h> -#include <odp_global_data.h> -#include <odp_align_internal.h> - -#include <odp_ring_ptr_internal.h> - -#include <odp/api/plat/cpu_inlines.h> - -typedef struct { - /* Rings tailq lock */ - odp_rwlock_t qlock; - odp_shm_t shm; -} global_data_t; - -static global_data_t *global; - -/* Initialize tailq_ring */ -int _ring_global_init(void) -{ odp_shm_t shm; - - /* Allocate globally shared memory */ - shm = odp_shm_reserve("_odp_ring_global", sizeof(global_data_t), - ODP_CACHE_LINE_SIZE, 0); - if (ODP_SHM_INVALID == shm) { - ODP_ERR("Shm reserve failed for pktio ring\n"); - return -1; - } - - global = odp_shm_addr(shm); - memset(global, 0, sizeof(global_data_t)); - global->shm = shm; - - return 0; -} - -int _ring_global_term(void) -{ - if (odp_shm_free(global->shm)) { - ODP_ERR("Shm free failed for pktio ring\n"); - return -1; - } - return 0; -} - -/* create the ring */ -ring_ptr_t * -_ring_create(const char *name, unsigned count, unsigned flags) -{ - char ring_name[_RING_NAMESIZE]; - ring_ptr_t *r; - size_t ring_size; - uint32_t shm_flag; - odp_shm_t shm; - - if (flags & _RING_SHM_PROC) - shm_flag = ODP_SHM_PROC | ODP_SHM_EXPORT; - else - shm_flag = 0; - if (odp_global_ro.shm_single_va) - shm_flag |= ODP_SHM_SINGLE_VA; - - /* count must be a power of 2 */ - if (!CHECK_IS_POWER2(count)) { - ODP_ERR("Requested size is invalid, must be power of 2," - "and do not exceed the size limit %u\n", - _RING_SZ_MASK); - __odp_errno = EINVAL; - return NULL; - } - - snprintf(ring_name, sizeof(ring_name), "%s", name); - ring_size = sizeof(ring_ptr_t) + count * sizeof(void *); - - /* reserve a memory zone for this ring.*/ - shm = odp_shm_reserve(ring_name, ring_size, ODP_CACHE_LINE_SIZE, - shm_flag); - - r = odp_shm_addr(shm); - if (r != NULL) { - /* init the ring structure */ - ring_ptr_init(r); - - } else { - __odp_errno = ENOMEM; - ODP_ERR("Cannot reserve memory\n"); - } - - return r; -} - -int _ring_destroy(const char *name) -{ - odp_shm_t shm = odp_shm_lookup(name); - - if (shm != ODP_SHM_INVALID) - return odp_shm_free(shm); - - return 0; -} - -/** - * Return the number of entries in a ring. - */ -unsigned _ring_count(ring_ptr_t *r, uint32_t mask) -{ - uint32_t prod_tail = odp_atomic_load_u32(&r->r.w_tail); - uint32_t cons_tail = odp_atomic_load_u32(&r->r.r_tail); - - return (prod_tail - cons_tail) & mask; -} - -/** - * Return the number of free entries in a ring. - */ -unsigned _ring_free_count(ring_ptr_t *r, uint32_t mask) -{ - uint32_t prod_tail = odp_atomic_load_u32(&r->r.w_tail); - uint32_t cons_tail = odp_atomic_load_u32(&r->r.r_tail); - - return (cons_tail - prod_tail - 1) & mask; -} commit 559aec0db739c624652facd3b337d0430cba8c61 Author: Matias Elo <matias.elo(a)nokia.com> Date: Thu Oct 24 15:51:47 2019 +0300 linux-gen: ipc: use standard ring_ptr_t implementation Use standard ODP internal ring_ptr_t rings as IPC rings. This enables removing the duplicate _ring_t implementation. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/platform/linux-generic/include/odp_packet_io_ipc_internal.h b/platform/linux-generic/include/odp_packet_io_ipc_internal.h index 01410dab1..59c268cb9 100644 --- a/platform/linux-generic/include/odp_packet_io_ipc_internal.h +++ b/platform/linux-generic/include/odp_packet_io_ipc_internal.h @@ -20,6 +20,8 @@ /* number of odp buffers in odp ring queue */ #define PKTIO_IPC_ENTRIES 4096 +#define PKTIO_IPC_ENTRY_MASK (PKTIO_IPC_ENTRIES - 1) + /* that struct is exported to shared memory, so that processes can find * each other. */ diff --git a/platform/linux-generic/include/odp_packet_io_ring_internal.h b/platform/linux-generic/include/odp_packet_io_ring_internal.h index 6b4e06a42..22f1ae017 100644 --- a/platform/linux-generic/include/odp_packet_io_ring_internal.h +++ b/platform/linux-generic/include/odp_packet_io_ring_internal.h @@ -103,6 +103,8 @@ extern "C" { #include <sys/queue.h> #include <odp_debug_internal.h> +#include <odp_ring_ptr_internal.h> + enum _ring_queue_behavior { _RING_QUEUE_FIXED = 0, /**< Enq/Deq a fixed number of items from a ring */ @@ -158,8 +160,6 @@ typedef struct _ring { /* If set - ring is visible from different processes. * Default is thread visible.*/ #define _RING_SHM_PROC (1 << 2) - /* Do not link ring to linked list. */ -#define _RING_NO_LIST (1 << 3) /* Ring size mask */ #define _RING_SZ_MASK (unsigned)(0x0fffffff) @@ -190,8 +190,7 @@ typedef struct _ring { * - EEXIST - a memzone with the same name already exists * - ENOMEM - no appropriate memory area found in which to create memzone */ -_ring_t *_ring_create(const char *name, unsigned count, - unsigned flags); +ring_ptr_t *_ring_create(const char *name, unsigned count, unsigned flags); /** * Destroy the ring created with *name*. @@ -206,7 +205,7 @@ int _ring_destroy(const char *name); * * @param r A pointer to the ring structure. */ -void _ring_dump(const _ring_t *r); +void _ring_dump(ring_ptr_t *r, uint32_t mask); /** * Enqueue several objects on the ring (multi-producers safe). @@ -231,7 +230,7 @@ void _ring_dump(const _ring_t *r); * if behavior = ODPH_RING_QUEUE_VARIABLE * - n: Actual number of objects enqueued. */ -int ___ring_mp_do_enqueue(_ring_t *r, void * const *obj_table, +int ___ring_mp_do_enqueue(ring_ptr_t *r, void * const *obj_table, unsigned n, enum _ring_queue_behavior behavior); @@ -262,7 +261,7 @@ int ___ring_mp_do_enqueue(_ring_t *r, void * const *obj_table, * - n: Actual number of objects dequeued. */ -int ___ring_mc_do_dequeue(_ring_t *r, void **obj_table, +int ___ring_mc_do_dequeue(ring_ptr_t *r, void **obj_table, unsigned n, enum _ring_queue_behavior behavior); @@ -284,7 +283,7 @@ int ___ring_mc_do_dequeue(_ring_t *r, void **obj_table, * high water mark is exceeded. * - -ENOBUFS: Not enough room in the ring to enqueue, no object is enqueued. */ -int _ring_mp_enqueue_bulk(_ring_t *r, void * const *obj_table, +int _ring_mp_enqueue_bulk(ring_ptr_t *r, void * const *obj_table, unsigned n); /** @@ -304,7 +303,7 @@ int _ring_mp_enqueue_bulk(_ring_t *r, void * const *obj_table, * - -ENOENT: Not enough entries in the ring to dequeue; no object is * dequeued. */ -int _ring_mc_dequeue_bulk(_ring_t *r, void **obj_table, unsigned n); +int _ring_mc_dequeue_bulk(ring_ptr_t *r, void **obj_table, unsigned n); /** * Test if a ring is full. @@ -315,7 +314,7 @@ int _ring_mc_dequeue_bulk(_ring_t *r, void **obj_table, unsigned n); * - 1: The ring is full. * - 0: The ring is not full. */ -int _ring_full(const _ring_t *r); +int _ring_full(ring_ptr_t *r, uint32_t mask); /** * Test if a ring is empty. @@ -326,7 +325,7 @@ int _ring_full(const _ring_t *r); * - 1: The ring is empty. * - 0: The ring is not empty. */ -int _ring_empty(const _ring_t *r); +int _ring_empty(ring_ptr_t *r, uint32_t mask); /** * Return the number of entries in a ring. @@ -336,7 +335,7 @@ int _ring_empty(const _ring_t *r); * @return * The number of entries in the ring. */ -unsigned _ring_count(const _ring_t *r); +unsigned _ring_count(ring_ptr_t *r, uint32_t mask); /** * Return the number of free entries in a ring. @@ -346,14 +345,14 @@ unsigned _ring_count(const _ring_t *r); * @return * The number of free entries in the ring. */ -unsigned _ring_free_count(const _ring_t *r); +unsigned _ring_free_count(ring_ptr_t *r, uint32_t mask); /** * search ring by name * @param name ring name to search * @return pointer to ring otherwise NULL */ -_ring_t *_ring_lookup(const char *name); +ring_ptr_t *_ring_lookup(const char *name); /** * Enqueue several objects on the ring (multi-producers safe). @@ -370,7 +369,7 @@ _ring_t *_ring_lookup(const char *name); * @return * - n: Actual number of objects enqueued. */ -int _ring_mp_enqueue_burst(_ring_t *r, void * const *obj_table, +int _ring_mp_enqueue_burst(ring_ptr_t *r, void * const *obj_table, unsigned n); /** @@ -390,7 +389,7 @@ int _ring_mp_enqueue_burst(_ring_t *r, void * const *obj_table, * @return * - n: Actual number of objects dequeued, 0 if ring is empty */ -int _ring_mc_dequeue_burst(_ring_t *r, void **obj_table, unsigned n); +int _ring_mc_dequeue_burst(ring_ptr_t *r, void **obj_table, unsigned n); /** * dump the status of all rings on the console @@ -400,12 +399,12 @@ void _ring_list_dump(void); /** * Initialize ring tailq */ -int _ring_tailq_init(void); +int _ring_global_init(void); /** * Terminate ring tailq */ -int _ring_tailq_term(void); +int _ring_global_term(void); #ifdef __cplusplus } diff --git a/platform/linux-generic/pktio/ipc.c b/platform/linux-generic/pktio/ipc.c index 1090d760c..a7678f261 100644 --- a/platform/linux-generic/pktio/ipc.c +++ b/platform/linux-generic/pktio/ipc.c @@ -9,7 +9,7 @@ #include <odp_packet_io_internal.h> #include <odp/api/system_info.h> #include <odp_shm_internal.h> -#include <odp_shm_internal.h> +#include <odp_ring_ptr_internal.h> #include <sys/mman.h> #include <sys/stat.h> @@ -26,22 +26,23 @@ typedef struct { /* TX */ struct { - _ring_t *send; /**< ODP ring for IPC msg packets - indexes transmitted to shared - memory */ - _ring_t *free; /**< ODP ring for IPC msg packets - indexes already processed by remote - process */ + /* ODP ring for IPC msg packets indexes transmitted to shared + * memory */ + ring_ptr_t *send; + /* ODP ring for IPC msg packets indexes already processed by + * remote process */ + ring_ptr_t *free; } tx; /* RX */ struct { - _ring_t *recv; /**< ODP ring for IPC msg packets - indexes received from shared - memory (from remote process) */ - _ring_t *free; /**< odp ring for ipc msg packets - indexes already processed by - current process */ - _ring_t *cache; /**< local cache to keep packet order right */ + /* ODP ring for IPC msg packets indexes received from shared + * memory (from remote process) */ + ring_ptr_t *recv; + /* odp ring for ipc msg packets indexes already processed by + * current process */ + ring_ptr_t *free; + /* local cache to keep packet order right */ + ring_ptr_t *cache; } rx; /* slave */ void *pool_base; /**< Remote pool base addr */ void *pool_mdata_base; /**< Remote pool mdata base addr */ @@ -136,58 +137,66 @@ static int _ipc_init_master(pktio_entry_t *pktio_entry, */ snprintf(ipc_shm_name, sizeof(ipc_shm_name), "%s_m_prod", dev); pkt_priv(pktio_entry)->tx.send = _ring_create(ipc_shm_name, - PKTIO_IPC_ENTRIES, - _RING_SHM_PROC | _RING_NO_LIST); + PKTIO_IPC_ENTRIES, + _RING_SHM_PROC); if (!pkt_priv(pktio_entry)->tx.send) { ODP_ERR("pid %d unable to create ipc ring %s name\n", getpid(), ipc_shm_name); return -1; } ODP_DBG("Created IPC ring: %s, count %d, free %d\n", - ipc_shm_name, _ring_count(pkt_priv(pktio_entry)->tx.send), - _ring_free_count(pkt_priv(pktio_entry)->tx.send)); + ipc_shm_name, _ring_count(pkt_priv(pktio_entry)->tx.send, + PKTIO_IPC_ENTRY_MASK), + _ring_free_count(pkt_priv(pktio_entry)->tx.send, + PKTIO_IPC_ENTRY_MASK)); /* generate name in shm like ipc_pktio_p for * already processed packets */ snprintf(ipc_shm_name, sizeof(ipc_shm_name), "%s_m_cons", dev); pkt_priv(pktio_entry)->tx.free = _ring_create(ipc_shm_name, - PKTIO_IPC_ENTRIES, - _RING_SHM_PROC | _RING_NO_LIST); + PKTIO_IPC_ENTRIES, + _RING_SHM_PROC); if (!pkt_priv(pktio_entry)->tx.free) { ODP_ERR("pid %d unable to create ipc ring %s name\n", getpid(), ipc_shm_name); goto free_m_prod; } ODP_DBG("Created IPC ring: %s, count %d, free %d\n", - ipc_shm_name, _ring_count(pkt_priv(pktio_entry)->tx.free), - _ring_free_count(pkt_priv(pktio_entry)->tx.free)); + ipc_shm_name, _ring_count(pkt_priv(pktio_entry)->tx.free, + PKTIO_IPC_ENTRY_MASK), + _ring_free_count(pkt_priv(pktio_entry)->tx.free, + PKTIO_IPC_ENTRY_MASK)); snprintf(ipc_shm_name, sizeof(ipc_shm_name), "%s_s_prod", dev); pkt_priv(pktio_entry)->rx.recv = _ring_create(ipc_shm_name, - PKTIO_IPC_ENTRIES, - _RING_SHM_PROC | _RING_NO_LIST); + PKTIO_IPC_ENTRIES, + _RING_SHM_PROC); if (!pkt_priv(pktio_entry)->rx.recv) { ODP_ERR("pid %d unable to create ipc ring %s name\n", getpid(), ipc_shm_name); goto free_m_cons; } ODP_DBG("Created IPC ring: %s, count %d, free %d\n", - ipc_shm_name, _ring_count(pkt_priv(pktio_entry)->rx.recv), - _ring_free_count(pkt_priv(pktio_entry)->rx.recv)); + ipc_shm_name, _ring_count(pkt_priv(pktio_entry)->rx.recv, + PKTIO_IPC_ENTRY_MASK), + _ring_free_count(pkt_priv(pktio_entry)->rx.recv, + PKTIO_IPC_ENTRY_MASK)); snprintf(ipc_shm_name, sizeof(ipc_shm_name), "%s_s_cons", dev); pkt_priv(pktio_entry)->rx.free = _ring_create(ipc_shm_name, - PKTIO_IPC_ENTRIES, - _RING_SHM_PROC | _RING_NO_LIST); + PKTIO_IPC_ENTRIES, + _RING_SHM_PROC); if (!pkt_priv(pktio_entry)->rx.free) { ODP_ERR("pid %d unable to create ipc ring %s name\n", getpid(), ipc_shm_name); goto free_s_prod; } ODP_DBG("Created IPC ring: %s, count %d, free %d\n", - ipc_shm_name, _ring_count(pkt_priv(pktio_entry)->rx.free), - _ring_free_count(pkt_priv(pktio_entry)->rx.free)); + ipc_shm_name, _ring_count(pkt_priv(pktio_entry)->rx.free, + PKTIO_IPC_ENTRY_MASK), + _ring_free_count(pkt_priv(pktio_entry)->rx.free, + PKTIO_IPC_ENTRY_MASK)); /* Set up pool name for remote info */ pinfo = pkt_priv(pktio_entry)->pinfo; @@ -301,8 +310,10 @@ static int _ipc_slave_start(pktio_entry_t *pktio_entry) return -1; } ODP_DBG("Connected IPC ring: %s, count %d, free %d\n", - ipc_shm_name, _ring_count(pkt_priv(pktio_entry)->rx.recv), - _ring_free_count(pkt_priv(pktio_entry)->rx.recv)); + ipc_shm_name, _ring_count(pkt_priv(pktio_entry)->rx.recv, + PKTIO_IPC_ENTRY_MASK), + _ring_free_count(pkt_priv(pktio_entry)->rx.recv, + PKTIO_IPC_ENTRY_MASK)); snprintf(ipc_shm_name, sizeof(ipc_shm_name), "%s_m_cons", dev); pkt_priv(pktio_entry)->rx.free = _ipc_shm_map(ipc_shm_name, pid); @@ -312,8 +323,10 @@ static int _ipc_slave_start(pktio_entry_t *pktio_entry) goto free_m_prod; } ODP_DBG("Connected IPC ring: %s, count %d, free %d\n", - ipc_shm_name, _ring_count(pkt_priv(pktio_entry)->rx.free), - _ring_free_count(pkt_priv(pktio_entry)->rx.free)); + ipc_shm_name, _ring_count(pkt_priv(pktio_entry)->rx.free, + PKTIO_IPC_ENTRY_MASK), + _ring_free_count(pkt_priv(pktio_entry)->rx.free, + PKTIO_IPC_ENTRY_MASK)); snprintf(ipc_shm_name, sizeof(ipc_shm_name), "%s_s_prod", dev); pkt_priv(pktio_entry)->tx.send = _ipc_shm_map(ipc_shm_name, pid); @@ -323,8 +336,10 @@ static int _ipc_slave_start(pktio_entry_t *pktio_entry) goto free_m_cons; } ODP_DBG("Connected IPC ring: %s, count %d, free %d\n", - ipc_shm_name, _ring_count(pkt_priv(pktio_entry)->tx.send), - _ring_free_count(pkt_priv(pktio_entry)->tx.send)); + ipc_shm_name, _ring_count(pkt_priv(pktio_entry)->tx.send, + PKTIO_IPC_ENTRY_MASK), + _ring_free_count(pkt_priv(pktio_entry)->tx.send, + PKTIO_IPC_ENTRY_MASK)); snprintf(ipc_shm_name, sizeof(ipc_shm_name), "%s_s_cons", dev); pkt_priv(pktio_entry)->tx.free = _ipc_shm_map(ipc_shm_name, pid); @@ -334,8 +349,10 @@ static int _ipc_slave_start(pktio_entry_t *pktio_entry) goto free_s_prod; } ODP_DBG("Connected IPC ring: %s, count %d, free %d\n", - ipc_shm_name, _ring_count(pkt_priv(pktio_entry)->tx.free), - _ring_free_count(pkt_priv(pktio_entry)->tx.free)); + ipc_shm_name, _ring_count(pkt_priv(pktio_entry)->tx.free, + PKTIO_IPC_ENTRY_MASK), + _ring_free_count(pkt_priv(pktio_entry)->tx.free, + PKTIO_IPC_ENTRY_MASK)); /* Get info about remote pool */ pinfo = pkt_priv(pktio_entry)->pinfo; @@ -374,7 +391,7 @@ static int ipc_pktio_open(odp_pktio_t id ODP_UNUSED, odp_pool_t pool) { int ret = -1; - int pid ODP_UNUSED; + int pid; struct pktio_info *pinfo; char name[ODP_POOL_NAME_LEN + sizeof("_info")]; char tail[ODP_POOL_NAME_LEN]; @@ -389,8 +406,7 @@ static int ipc_pktio_open(odp_pktio_t id ODP_UNUSED, odp_atomic_init_u32(&pkt_priv(pktio_entry)->ready, 0); pkt_priv(pktio_entry)->rx.cache = _ring_create("ipc_rx_cache", - PKTIO_IPC_ENTRIES, - _RING_NO_LIST); + PKTIO_IPC_ENTRIES, 0); if (!pkt_priv(pktio_entry)->rx.cache) return -1; @@ -440,7 +456,8 @@ static int ipc_pktio_open(odp_pktio_t id ODP_UNUSED, return ret; } -static void _ipc_free_ring_packets(pktio_entry_t *pktio_entry, _ring_t *r) +static void _ipc_free_ring_packets(pktio_entry_t *pktio_entry, ring_ptr_t *r, + uint32_t r_mask) { uintptr_t offsets[PKTIO_IPC_ENTRIES]; int ret; @@ -458,8 +475,8 @@ static void _ipc_free_ring_packets(pktio_entry_t *pktio_entry, _ring_t *r) rbuf_p = (void *)&offsets; while (1) { - ret = _ring_mc_dequeue_burst(r, rbuf_p, - PKTIO_IPC_ENTRIES); + ret = ring_ptr_deq_multi(r, r_mask, rbuf_p, + PKTIO_IPC_ENTRIES - 1); if (ret <= 0) break; for (i = 0; i < ret; i++) { @@ -479,12 +496,11 @@ static int ipc_pktio_recv_lockless(pktio_entry_t *pktio_entry, { int pkts = 0; int i; - _ring_t *r; - _ring_t *r_p; + ring_ptr_t *r; + ring_ptr_t *r_p; uintptr_t offsets[PKTIO_IPC_ENTRIES]; void **ipcbufs_p = (void *)&offsets[0]; uint32_t ready; - int pkts_ring; ready = odp_atomic_load_u32(&pkt_priv(pktio_entry)->ready); if (odp_unlikely(!ready)) { @@ -492,11 +508,12 @@ static int ipc_pktio_recv_lockless(pktio_entry_t *pktio_entry, return 0; } - _ipc_free_ring_packets(pktio_entry, pkt_priv(pktio_entry)->tx.free); + _ipc_free_ring_packets(pktio_entry, pkt_priv(pktio_entry)->tx.free, + PKTIO_IPC_ENTRY_MASK); /* rx from cache */ r = pkt_priv(pktio_entry)->rx.cache; - pkts = _ring_mc_dequeue_burst(r, ipcbufs_p, len); + pkts = ring_ptr_deq_multi(r, PKTIO_IPC_ENTRY_MASK, ipcbufs_p, len); if (odp_unlikely(pkts < 0)) ODP_ABORT("internal error dequeue\n"); @@ -504,7 +521,8 @@ static int ipc_pktio_recv_lockless(pktio_entry_t *pktio_entry, if (pkts == 0) { ipcbufs_p = (void *)&offsets[0]; r = pkt_priv(pktio_entry)->rx.recv; - pkts = _ring_mc_dequeue_burst(r, ipcbufs_p, len); + pkts = ring_ptr_deq_multi(r, PKTIO_IPC_ENTRY_MASK, ipcbufs_p, + len); if (odp_unlikely(pkts < 0)) ODP_ABORT("internal error dequeue\n"); } @@ -575,14 +593,11 @@ static int ipc_pktio_recv_lockless(pktio_entry_t *pktio_entry, if (pkts != i) { ipcbufs_p = (void *)&offsets[i]; r_p = pkt_priv(pktio_entry)->rx.cache; - pkts_ring = _ring_mp_enqueue_burst(r_p, ipcbufs_p, pkts - i); - - if (pkts_ring != (pkts - i)) - ODP_ABORT("bug to enqueue packets\n"); + ring_ptr_enq_multi(r_p, PKTIO_IPC_ENTRY_MASK, ipcbufs_p, + pkts - i); if (i == 0) return 0; - } /*num of actually received packets*/ @@ -591,28 +606,14 @@ static int ipc_pktio_recv_lockless(pktio_entry_t *pktio_entry, /* Now tell other process that we no longer need that buffers.*/ r_p = pkt_priv(pktio_entry)->rx.free; -repeat: - ipcbufs_p = (void *)&offsets[0]; - pkts_ring = _ring_mp_enqueue_burst(r_p, ipcbufs_p, pkts); - if (odp_unlikely(pkts_ring < 0)) - ODP_ABORT("ipc: odp_ring_mp_enqueue_bulk r_p fail\n"); + ring_ptr_enq_multi(r_p, PKTIO_IPC_ENTRY_MASK, ipcbufs_p, pkts); for (i = 0; i < pkts; i++) { IPC_ODP_DBG("%d/%d send to be free packet offset %x\n", i, pkts, offsets[i]); } - if (odp_unlikely(pkts != pkts_ring)) { - IPC_ODP_DBG("odp_ring_full: %d, odp_ring_count %d," - " _ring_free_count %d\n", - _ring_full(r_p), _ring_count(r_p), - _ring_free_count(r_p)); - ipcbufs_p = (void *)&offsets[pkts_ring - 1]; - pkts = pkts - pkts_ring; - goto repeat; - } - return pkts; } @@ -633,9 +634,8 @@ static int ipc_pktio_recv(pktio_entry_t *pktio_entry, int index ODP_UNUSED, static int ipc_pktio_send_lockless(pktio_entry_t *pktio_entry, const odp_packet_t pkt_table[], int num) { - _ring_t *r; + ring_ptr_t *r; void **rbuf_p; - int ret; int i; uint32_t ready = odp_atomic_load_u32(&pkt_priv(pktio_entry)->ready); pool_t *ipc_pool = pool_entry_from_hdl(pkt_priv(pktio_entry)->pool); @@ -646,7 +646,8 @@ static int ipc_pktio_send_lockless(pktio_entry_t *pktio_entry, if (odp_unlikely(!ready)) return 0; - _ipc_free_ring_packets(pktio_entry, pkt_priv(pktio_entry)->tx.free); + _ipc_free_ring_packets(pktio_entry, pkt_priv(pktio_entry)->tx.free, + PKTIO_IPC_ENTRY_MASK); /* Copy packets to shm shared pool if they are in different * pool, or if they are references (we can't share across IPC). @@ -703,17 +704,7 @@ static int ipc_pktio_send_lockless(pktio_entry_t *pktio_entry, /* Put packets to ring to be processed by other process. */ rbuf_p = (void *)&offsets[0]; r = pkt_priv(pktio_entry)->tx.send; - ret = _ring_mp_enqueue_burst(r, rbuf_p, num); - if (odp_unlikely(ret < 0)) { - ODP_ERR("pid %d odp_ring_mp_enqueue_bulk fail, ipc_slave %d, ret %d\n", - getpid(), - (PKTIO_TYPE_IPC_SLAVE == pkt_priv(pktio_entry)->type), - ret); - ODP_ERR("odp_ring_full: %d, odp_ring_count %d, _ring_free_count %d\n", - _ring_full(r), _ring_count(r), - _ring_free_count(r)); - ODP_ABORT("Unexpected!\n"); - } + ring_ptr_enq_multi(r, PKTIO_IPC_ENTRY_MASK, rbuf_p, num); return num; } @@ -762,28 +753,19 @@ static int ipc_start(pktio_entry_t *pktio_entry) static int ipc_stop(pktio_entry_t *pktio_entry) { - unsigned tx_send = 0, tx_free = 0; - odp_atomic_store_u32(&pkt_priv(pktio_entry)->ready, 0); if (pkt_priv(pktio_entry)->tx.send) _ipc_free_ring_packets(pktio_entry, - pkt_priv(pktio_entry)->tx.send); + pkt_priv(pktio_entry)->tx.send, + PKTIO_IPC_ENTRY_MASK); /* other process can transfer packets from one ring to * other, use delay here to free that packets. */ sleep(1); if (pkt_priv(pktio_entry)->tx.free) _ipc_free_ring_packets(pktio_entry, - pkt_priv(pktio_entry)->tx.free); - - if (pkt_priv(pktio_entry)->tx.send) - tx_send = _ring_count(pkt_priv(pktio_entry)->tx.send); - if (pkt_priv(pktio_entry)->tx.free) - tx_free = _ring_count(pkt_priv(pktio_entry)->tx.free); - if (tx_send | tx_free) { - ODP_DBG("IPC rings: tx send %d tx free %d\n", - tx_send, tx_free); - } + pkt_priv(pktio_entry)->tx.free, + PKTIO_IPC_ENTRY_MASK); return 0; } @@ -825,12 +807,12 @@ static int ipc_close(pktio_entry_t *pktio_entry) static int ipc_pktio_init_global(void) { ODP_DBG("PKTIO: initializing ipc interface.\n"); - return _ring_tailq_init(); + return _ring_global_init(); } static int ipc_pktio_term_global(void) { - return _ring_tailq_term(); + return _ring_global_term(); } const pktio_if_ops_t ipc_pktio_ops = { diff --git a/platform/linux-generic/pktio/ring.c b/platform/linux-generic/pktio/ring.c index 903e2c9f1..8b3d2b26e 100644 --- a/platform/linux-generic/pktio/ring.c +++ b/platform/linux-generic/pktio/ring.c @@ -78,13 +78,13 @@ #include <odp_packet_io_ring_internal.h> #include <odp_errno_define.h> #include <odp_global_data.h> +#include <odp_align_internal.h> -#include <odp/api/plat/cpu_inlines.h> +#include <odp_ring_ptr_internal.h> -#define RING_VAL_IS_POWER_2(x) ((((x) - 1) & (x)) == 0) +#include <odp/api/plat/cpu_inlines.h> typedef struct { - TAILQ_HEAD(, _ring) ring_list; /* Rings tailq lock */ odp_rwlock_t qlock; odp_shm_t shm; @@ -92,71 +92,8 @@ typedef struct { static global_data_t *global; -/* - * the enqueue of pointers on the ring. - */ -#define ENQUEUE_PTRS() do { \ - const uint32_t size = r->prod.size; \ - uint32_t idx = prod_head & mask; \ - if (odp_likely(idx + n < size)) { \ - for (i = 0; i < (n & ((~(unsigned)0x3))); i += 4, idx += 4) { \ - r->ring[idx] = obj_table[i]; \ - r->ring[idx + 1] = obj_table[i + 1]; \ - r->ring[idx + 2] = obj_table[i + 2]; \ - r->ring[idx + 3] = obj_table[i + 3]; \ - } \ - switch (n & 0x3) { \ - case 3: \ - r->ring[idx++] = obj_table[i++]; \ - /* fallthrough */ \ - case 2: \ - r->ring[idx++] = obj_table[i++]; \ - /* fallthrough */ \ - case 1: \ - r->ring[idx++] = obj_table[i++]; \ - } \ - } else { \ - for (i = 0; idx < size; i++, idx++)\ - r->ring[idx] = obj_table[i]; \ - for (idx = 0; i < n; i++, idx++) \ - r->ring[idx] = obj_table[i]; \ - } \ -} while (0) - -/* - * the actual copy of pointers on the ring to obj_table. - */ -#define DEQUEUE_PTRS() do { \ - uint32_t idx = cons_head & mask; \ - const uint32_t size = r->cons.size; \ - if (odp_likely(idx + n < size)) { \ - for (i = 0; i < (n & (~(unsigned)0x3)); i += 4, idx += 4) {\ - obj_table[i] = r->ring[idx]; \ - obj_table[i + 1] = r->ring[idx + 1]; \ - obj_table[i + 2] = r->ring[idx + 2]; \ - obj_table[i + 3] = r->ring[idx + 3]; \ - } \ - switch (n & 0x3) { \ - case 3: \ - obj_table[i++] = r->ring[idx++]; \ - /* fallthrough */ \ - case 2: \ - obj_table[i++] = r->ring[idx++]; \ - /* fallthrough */ \ - case 1: \ - obj_table[i++] = r->ring[idx++]; \ - } \ - } else { \ - for (i = 0; idx < size; i++, idx++) \ - obj_table[i] = r->ring[idx]; \ - for (idx = 0; i < n; i++, idx++) \ - obj_table[i] = r->ring[idx]; \ - } \ -} while (0) - - /* Initialize tailq_ring */ -int _ring_tailq_init(void) +int _ring_global_init(void) { odp_shm_t shm; /* Allocate globally shared memory */ @@ -171,14 +108,10 @@ int _ring_tailq_init(void) memset(global, 0, sizeof(global_data_t)); global->shm = shm; - TAILQ_INIT(&global->ring_list); - odp_rwlock_init(&global->qlock); - return 0; } -/* Terminate tailq_ring */ -int _ring_tailq_term(void) +int _ring_global_term(void) { if (odp_shm_free(global->shm)) { ODP_ERR("Shm free failed for pktio ring\n"); @@ -188,11 +121,11 @@ int _ring_tailq_term(void) } /* create the ring */ -_ring_t * +ring_ptr_t * _ring_create(const char *name, unsigned count, unsigned flags) { char ring_name[_RING_NAMESIZE]; - _ring_t *r; + ring_ptr_t *r; size_t ring_size; uint32_t shm_flag; odp_shm_t shm; @@ -205,7 +138,7 @@ _ring_create(const char *name, unsigned count, unsigned flags) shm_flag |= ODP_SHM_SINGLE_VA; /* count must be a power of 2 */ - if (!RING_VAL_IS_POWER_2(count) || (count > _RING_SZ_MASK)) { + if (!CHECK_IS_POWER2(count)) { ODP_ERR("Requested size is invalid, must be power of 2," "and do not exceed the size limit %u\n", _RING_SZ_MASK); @@ -214,36 +147,22 @@ _ring_create(const char *name, unsigned count, unsigned flags) } snprintf(ring_name, sizeof(ring_name), "%s", name); - ring_size = count * sizeof(void *) + sizeof(_ring_t); + ring_size = sizeof(ring_ptr_t) + count * sizeof(void *); - odp_rwlock_write_lock(&global->qlock); /* reserve a memory zone for this ring.*/ shm = odp_shm_reserve(ring_name, ring_size, ODP_CACHE_LINE_SIZE, shm_flag); r = odp_shm_addr(shm); - if (r != NULL) { /* init the ring structure */ - snprintf(r->name, sizeof(r->name), "%s", name); - r->flags = flags; - r->prod.size = count; - r->cons.size = count; - r->prod.mask = count - 1; - r->cons.mask = count - 1; - r->prod.head = 0; - r->cons.head = 0; - r->prod.tail = 0; - r->cons.tail = 0; + ring_ptr_init(r); - if (!(flags & _RING_NO_LIST)) - TAILQ_INSERT_TAIL(&global->ring_list, r, next); } else { __odp_errno = ENOMEM; ODP_ERR("Cannot reserve memory\n"); } - odp_rwlock_write_unlock(&global->qlock); return r; } @@ -251,265 +170,30 @@ int _ring_destroy(const char *name) { odp_shm_t shm = odp_shm_lookup(name); - if (shm != ODP_SHM_INVALID) { - _ring_t *r = odp_shm_addr(shm); - - odp_rwlock_write_lock(&global->qlock); - if (!(r->flags & _RING_NO_LIST)) - TAILQ_REMOVE(&global->ring_list, r, next); - odp_rwlock_write_unlock(&global->qlock); - + if (shm != ODP_SHM_INVALID) return odp_shm_free(shm); - } - return 0; -} - -/** - * Enqueue several objects on the ring (multi-producers safe). - */ -int ___ring_mp_do_enqueue(_ring_t *r, void * const *obj_table, - unsigned n, enum _ring_queue_behavior behavior) -{ - uint32_t prod_head, prod_next; - uint32_t cons_tail, free_entries; - const unsigned max = n; - int success; - unsigned i; - uint32_t mask = r->prod.mask; - - /* move prod.head atomically */ - do { - /* Reset n to the initial burst count */ - n = max; - - prod_head = __atomic_load_n(&r->prod.head, __ATOMIC_ACQUIRE); - cons_tail = __atomic_load_n(&r->cons.tail, __ATOMIC_ACQUIRE); - /* The subtraction is done between two unsigned 32bits value - * (the result is always modulo 32 bits even if we have - * prod_head > cons_tail). So 'free_entries' is always between 0 - * and size(ring)-1. */ - free_entries = (mask + cons_tail - prod_head); - - /* check that we have enough room in ring */ - if (odp_unlikely(n > free_entries)) { - if (behavior == _RING_QUEUE_FIXED) - return -ENOBUFS; - /* No free entry available */ - if (odp_unlikely(free_entries == 0)) - return 0; - - n = free_entries; - } - - prod_next = prod_head + n; - success = __atomic_compare_exchange_n(&r->prod.head, - &prod_head, - prod_next, - false/*strong*/, - __ATOMIC_ACQUIRE, - __ATOMIC_RELAXED); - } while (odp_unlikely(success == 0)); - - /* write entries in ring */ - ENQUEUE_PTRS(); - - /* - * If there are other enqueues in progress that preceded us, - * we need to wait for them to complete - */ - while (odp_unlikely(__atomic_load_n(&r->prod.tail, __ATOMIC_RELAXED) != - prod_head)) - odp_cpu_pause(); - - /* Release our entries and the memory they refer to */ - __atomic_store_n(&r->prod.tail, prod_next, __ATOMIC_RELEASE); - return (behavior == _RING_QUEUE_FIXED) ? 0 : n; -} - -/** - * Dequeue several objects from a ring (multi-consumers safe). - */ - -int ___ring_mc_do_dequeue(_ring_t *r, void **obj_table, - unsigned n, enum _ring_queue_behavior behavior) -{ - uint32_t cons_head, prod_tail; - uint32_t cons_next, entries; - const unsigned max = n; - int success; - unsigned i; - uint32_t mask = r->prod.mask; - - /* move cons.head atomically */ - do { - /* Restore n as it may change every loop */ - n = max; - - cons_head = __atomic_load_n(&r->cons.head, __ATOMIC_ACQUIRE); - prod_tail = __atomic_load_n(&r->prod.tail, __ATOMIC_ACQUIRE); - /* The subtraction is done between two unsigned 32bits value - * (the result is always modulo 32 bits even if we have - * cons_head > prod_tail). So 'entries' is always between 0 - * and size(ring)-1. */ - entries = (prod_tail - cons_head); - - /* Set the actual entries for dequeue */ - if (n > entries) { - if (behavior == _RING_QUEUE_FIXED) - return -ENOENT; - if (odp_unlikely(entries == 0)) - return 0; - - n = entries; - } - - cons_next = cons_head + n; - success = __atomic_compare_exchange_n(&r->cons.head, - &cons_head, - cons_next, - false/*strong*/, - __ATOMIC_ACQUIRE, - __ATOMIC_RELAXED); - } while (odp_unlikely(success == 0)); - - /* copy in table */ - DEQUEUE_PTRS(); - - /* - * If there are other dequeues in progress that preceded us, - * we need to wait for them to complete - */ - while (odp_unlikely(__atomic_load_n(&r->cons.tail, __ATOMIC_RELAXED) != - cons_head)) - odp_cpu_pause(); - - /* Release our entries and the memory they refer to */ - __atomic_store_n(&r->cons.tail, cons_next, __ATOMIC_RELEASE); - - return behavior == _RING_QUEUE_FIXED ? 0 : n; -} - -/** - * Enqueue several objects on the ring (multi-producers safe). - */ -int _ring_mp_enqueue_bulk(_ring_t *r, void * const *obj_table, - unsigned n) -{ - return ___ring_mp_do_enqueue(r, obj_table, n, - _RING_QUEUE_FIXED); -} - -/** - * Dequeue several objects from a ring (multi-consumers safe). - */ -int _ring_mc_dequeue_bulk(_ring_t *r, void **obj_table, unsigned n) -{ - return ___ring_mc_do_dequeue(r, obj_table, n, - _RING_QUEUE_FIXED); -} - -/** - * Test if a ring is full. - */ -int _ring_full(const _ring_t *r) -{ - uint32_t prod_tail = r->prod.tail; - uint32_t cons_tail = r->cons.tail; - return (((cons_tail - prod_tail - 1) & r->prod.mask) == 0); -} - -/** - * Test if a ring is empty. - */ -int _ring_empty(const _ring_t *r) -{ - uint32_t prod_tail = r->prod.tail; - uint32_t cons_tail = r->cons.tail; - - return !!(cons_tail == prod_tail); + return 0; } /** * Return the number of entries in a ring. */ -unsigned _ring_count(const _ring_t *r) +unsigned _ring_count(ring_ptr_t *r, uint32_t mask) { - uint32_t prod_tail = r->prod.tail; - uint32_t cons_tail = r->cons.tail; + uint32_t prod_tail = odp_atomic_load_u32(&r->r.w_tail); + uint32_t cons_tail = odp_atomic_load_u32(&r->r.r_tail); - return (prod_tail - cons_tail) & r->prod.mask; + return (prod_tail - cons_tail) & mask; } /** * Return the number of free entries in a ring. */ -unsigned _ring_free_count(const _ring_t *r) -{ - uint32_t prod_tail = r->prod.tail; - uint32_t cons_tail = r->cons.tail; - - return (cons_tail - prod_tail - 1) & r->prod.mask; -} - -/* dump the status of the ring on the console */ -void _ring_dump(const _ring_t *r) -{ - ODP_DBG("ring <%s>@%p\n", r->name, r); - ODP_DBG(" flags=%x\n", r->flags); - ODP_DBG(" size=%" PRIu32 "\n", r->prod.size); - ODP_DBG(" ct=%" PRIu32 "\n", r->cons.tail); - ODP_DBG(" ch=%" PRIu32 "\n", r->cons.head); - ODP_DBG(" pt=%" PRIu32 "\n", r->prod.tail); - ODP_DBG(" ph=%" PRIu32 "\n", r->prod.head); - ODP_DBG(" used=%u\n", _ring_count(r)); - ODP_DBG(" avail=%u\n", _ring_free_count(r)); -} - -/* dump the status of all rings on the console */ -void _ring_list_dump(void) -{ - const _ring_t *mp = NULL; - - odp_rwlock_read_lock(&global->qlock); - - TAILQ_FOREACH(mp, &global->ring_list, next) { - _ring_dump(mp); - } - - odp_rwlock_read_unlock(&global->qlock); -} - -/* search a ring from its name */ -_ring_t *_ring_lookup(const char *name) -{ - _ring_t *r; - - odp_rwlock_read_lock(&global->qlock); - TAILQ_FOREACH(r, &global->ring_list, next) { - if (strncmp(name, r->name, _RING_NAMESIZE) == 0) - break; - } - odp_rwlock_read_unlock(&global->qlock); - - return r; -} - -/** - * Enqueue several objects on the ring (multi-producers safe). - */ -int _ring_mp_enqueue_burst(_ring_t *r, void * const *obj_table, - unsigned n) +unsigned _ring_free_count(ring_ptr_t *r, uint32_t mask) { - return ___ring_mp_do_enqueue(r, obj_table, n, - _RING_QUEUE_VARIABLE); -} + uint32_t prod_tail = odp_atomic_load_u32(&r->r.w_tail); + uint32_t cons_tail = odp_atomic_load_u32(&r->r.r_tail); -/** - * Dequeue several objects from a ring (multi-consumers safe). - */ -int _ring_mc_dequeue_burst(_ring_t *r, void **obj_table, unsigned n) -{ - return ___ring_mc_do_dequeue(r, obj_table, n, - _RING_QUEUE_VARIABLE); + return (cons_tail - prod_tail - 1) & mask; } commit 720d655c9161007b561bf033a4fbe0b31ab7fb6a Author: Matias Elo <matias.elo(a)nokia.com> Date: Thu Oct 24 15:58:33 2019 +0300 linux-gen: ring: remove internal ring test Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/platform/linux-generic/m4/configure.m4 b/platform/linux-generic/m4/configure.m4 index 461dfc0fb..82fe6fe9c 100644 --- a/platform/linux-generic/m4/configure.m4 +++ b/platform/linux-generic/m4/configure.m4 @@ -38,6 +38,5 @@ AC_CONFIG_FILES([platform/linux-generic/Makefile platform/linux-generic/test/Makefile platform/linux-generic/test/validation/api/shmem/Makefile platform/linux-generic/test/validation/api/pktio/Makefile - platform/linux-generic/test/pktio_ipc/Makefile - platform/linux-generic/test/ring/Makefile]) + platform/linux-generic/test/pktio_ipc/Makefile]) ]) diff --git a/platform/linux-generic/test/Makefile.am b/platform/linux-generic/test/Makefile.am index d3193b5e9..870336fd2 100644 --- a/platform/linux-generic/test/Makefile.am +++ b/platform/linux-generic/test/Makefile.am @@ -23,8 +23,7 @@ test_SCRIPTS = $(dist_check_SCRIPTS) SUBDIRS += validation/api/pktio\ validation/api/shmem\ - pktio_ipc\ - ring + pktio_ipc if HAVE_PCAP TESTS += validation/api/pktio/pktio_run_pcap.sh diff --git a/platform/linux-generic/test/ring/.gitignore b/platform/linux-generic/test/ring/.gitignore deleted file mode 100644 index 7341a340c..000000000 --- a/platform/linux-generic/test/ring/.gitignore +++ /dev/null @@ -1 +0,0 @@ -ring_main diff --git a/platform/linux-generic/test/ring/Makefile.am b/platform/linux-generic/test/ring/Makefile.am deleted file mode 100644 index 999beed4f..000000000 --- a/platform/linux-generic/test/ring/Makefile.am +++ /dev/null @@ -1,38 +0,0 @@ -# ring test uses internal symbols from libodp-linux which are not available -# when linking test with libodp-linux.so -if STATIC_APPS - -include $(top_srcdir)/test/Makefile.inc - -test_PROGRAMS = ring_main -ring_main_SOURCES = \ - ring_main.c \ - ring_suites.c ring_suites.h \ - ring_basic.c ring_stress.c - -TESTS = ring_main$(EXEEXT) - -PRELDADD += $(LIBCUNIT_COMMON) - -AM_CPPFLAGS += -I$(top_srcdir)/platform/linux-generic/include - -AM_CFLAGS += $(LIBCONFIG_CFLAGS) - -TESTNAME = linux-generic-ring - -TESTENV = tests-$(TESTNAME).env - -test_DATA = $(TESTENV) - -DISTCLEANFILES = $(TESTENV) -.PHONY: $(TESTENV) -$(TESTENV): - echo "TESTS=\"$(TESTS)\"" > $@ - echo "$(TESTS_ENVIRONMENT)" >> $@ - echo "$(LOG_COMPILER)" >> $@ - -if test_installdir -installcheck-local: - $(DESTDIR)/$(testdir)/run-test.sh $(TESTNAME) -endif -endif diff --git a/platform/linux-generic/test/ring/ring_basic.c b/platform/linux-generic/test/ring/ring_basic.c deleted file mode 100644 index dc76fd6b3..000000000 --- a/platform/linux-generic/test/ring/ring_basic.c +++ /dev/null @@ -1,280 +0,0 @@ -/* Copyright (c) 2016-2018, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -/** - * @file - * - * ODP ring basic test - */ - -#include <stdlib.h> -#include <stdio.h> -#include <string.h> - -#include <odp_cunit_common.h> -#include <odp_packet_io_ring_internal.h> -#include <odp_errno_define.h> - -#include <odp/helper/odph_api.h> - -#include "ring_suites.h" - -/* labor functions declaration */ -static void __do_basic_burst(_ring_t *r); -static void __do_basic_bulk(_ring_t *r); - -/* dummy object pointers for enqueue and dequeue testing */ -static void **test_enq_data; -static void **test_deq_data; - -/* create multiple thread test ring */ -static const char *mt_ring_name = "MT basic ring"; -static _ring_t *mt_ring; - -int ring_test_basic_start(void) -{ - int i = 0; - - /* alloc dummy object pointers for enqueue testing */ - test_enq_data = malloc(RING_SIZE * 2 * sizeof(void *)); - if (NULL == test_enq_data) { - ODPH_ERR("failed to allocate basic test enqeue data\n"); - return -1; - } - - for (i = 0; i < RING_SIZE * 2; i++) - test_enq_data[i] = (void *)(unsigned long)i; - - /* alloc dummy object pointers for dequeue testing */ - test_deq_data = malloc(RING_SIZE * 2 * sizeof(void *)); - if (NULL == test_deq_data) { - ODPH_ERR("failed to allocate basic test dequeue data\n"); - free(test_enq_data); test_enq_data = NULL; - return -1; - } - - memset(test_deq_data, 0, RING_SIZE * 2 * sizeof(void *)); - return 0; -} - -int ring_test_basic_end(void) -{ - _ring_destroy(mt_ring_name); - - free(test_enq_data); - free(test_deq_data); - return 0; -} - -/* basic test cases */ -void ring_test_basic_create(void) -{ - /* prove illegal size shall fail */ - mt_ring = _ring_create(mt_ring_name, ILLEGAL_SIZE, 0); - CU_ASSERT(NULL == mt_ring); - CU_ASSERT(EINVAL == __odp_errno); - - /* create ring for multiple thread usage scenario */ - mt_ring = _ring_create(mt_ring_name, RING_SIZE, - _RING_SHM_PROC); - - CU_ASSERT(NULL != mt_ring); - CU_ASSERT(_ring_lookup(mt_ring_name) == mt_ring); -} - -void ring_test_basic_burst(void) -{ - __do_basic_burst(mt_ring); -} - -void ring_test_basic_bulk(void) -{ - __do_basic_bulk(mt_ring); -} - -/* labor functions definition */ -static void __do_basic_burst(_ring_t *r) -{ - int result = 0; - unsigned int count = 0; - void * const *source = test_enq_data; - void * const *dest = test_deq_data; - void **enq = NULL, **deq = NULL; - - enq = test_enq_data; deq = test_deq_data; - - /* ring is empty */ - CU_ASSERT(1 == _ring_empty(r)); - - /* enqueue 1 object */ - result = _ring_mp_enqueue_burst(r, enq, 1); - enq += 1; - CU_ASSERT(1 == (result & _RING_SZ_MASK)); - - /* enqueue 2 objects */ - result = _ring_mp_enqueue_burst(r, enq, 2); - enq += 2; - CU_ASSERT(2 == (result & _RING_SZ_MASK)); - - /* enqueue HALF_BULK objects */ - result = _ring_mp_enqueue_burst(r, enq, HALF_BULK); - enq += HALF_BULK; - CU_ASSERT(HALF_BULK == (result & _RING_SZ_MASK)); - - /* ring is neither empty nor full */ - CU_ASSERT(0 == _ring_full(r)); - CU_ASSERT(0 == _ring_empty(r)); - - /* _ring_count() equals enqueued */ - count = (1 + 2 + HALF_BULK); - CU_ASSERT(count == _ring_count(r)); - /* _ring_free_count() equals rooms left */ - count = (RING_SIZE - 1) - count; - CU_ASSERT(count == _ring_free_count(r)); - - /* exceed the size, enquene as many as possible */ - result = _ring_mp_enqueue_burst(r, enq, HALF_BULK); - enq += count; - CU_ASSERT(count == (result & _RING_SZ_MASK)); - CU_ASSERT(1 == _ring_full(r)); - - /* dequeue 1 object */ - result = _ring_mc_dequeue_burst(r, deq, 1); - deq += 1; - CU_ASSERT(1 == (result & _RING_SZ_MASK)); - - /* dequeue 2 objects */ - result = _ring_mc_dequeue_burst(r, deq, 2); - deq += 2; - CU_ASSERT(2 == (result & _RING_SZ_MASK)); - - /* dequeue HALF_BULK objects */ - result = _ring_mc_dequeue_burst(r, deq, HALF_BULK); - deq += HALF_BULK; - CU_ASSERT(HALF_BULK == (result & _RING_SZ_MASK)); - - /* _ring_free_count() equals dequeued */ - count = (1 + 2 + HALF_BULK); - CU_ASSERT(count == _ring_free_count(r)); - /* _ring_count() equals remained left */ - count = (RING_SIZE - 1) - count; - CU_ASSERT(count == _ring_count(r)); - - /* underrun the size, dequeue as many as possible */ - result = _ring_mc_dequeue_burst(r, deq, HALF_BULK); - deq += count; - CU_ASSERT(count == (result & _RING_SZ_MASK)); - CU_ASSERT(1 == _ring_empty(r)); - - /* check data */ - CU_ASSERT(0 == memcmp(source, dest, deq - dest)); - - /* reset dequeue data */ - memset(test_deq_data, 0, RING_SIZE * 2 * sizeof(void *)); -} - -/* incomplete ring API set: strange! - * complement _ring_enqueue/dequeue_bulk to improve coverage - */ -static inline int __ring_enqueue_bulk( - _ring_t *r, void * const *objects, unsigned bulk) -{ - return _ring_mp_enqueue_bulk(r, objects, bulk); -} - -static inline int __ring_dequeue_bulk( - _ring_t *r, void **objects, unsigned bulk) -{ - return _ring_mc_dequeue_bulk(r, objects, bulk); -} - -static void __do_basic_bulk(_ring_t *r) -{ - int result = 0; - unsigned int count = 0; - void * const *source = test_enq_data; - void * const *dest = test_deq_data; - void **enq = NULL, **deq = NULL; - - enq = test_enq_data; deq = test_deq_data; - - /* ring is empty */ - CU_ASSERT(1 == _ring_empty(r)); - - /* enqueue 1 object */ - result = __ring_enqueue_bulk(r, enq, 1); - enq += 1; - CU_ASSERT(0 == result); - - /* enqueue 2 objects */ - result = __ring_enqueue_bulk(r, enq, 2); - enq += 2; - CU_ASSERT(0 == result); - - /* enqueue HALF_BULK objects */ - result = __ring_enqueue_bulk(r, enq, HALF_BULK); - enq += HALF_BULK; - CU_ASSERT(0 == result); - - /* ring is neither empty nor full */ - CU_ASSERT(0 == _ring_full(r)); - CU_ASSERT(0 == _ring_empty(r)); - - /* _ring_count() equals enqueued */ - count = (1 + 2 + HALF_BULK); - CU_ASSERT(count == _ring_count(r)); - /* _ring_free_count() equals rooms left */ - count = (RING_SIZE - 1) - count; - CU_ASSERT(count == _ring_free_count(r)); - - /* exceed the size, enquene shall fail with -ENOBUFS */ - result = __ring_enqueue_bulk(r, enq, HALF_BULK); - CU_ASSERT(-ENOBUFS == result); - - /* fullful the ring */ - result = __ring_enqueue_bulk(r, enq, count); - enq += count; - CU_ASSERT(0 == result); - CU_ASSERT(1 == _ring_full(r)); - - /* dequeue 1 object */ - result = __ring_dequeue_bulk(r, deq, 1); - deq += 1; - CU_ASSERT(0 == result); - - /* dequeue 2 objects */ - result = __ring_dequeue_bulk(r, deq, 2); - deq += 2; - CU_ASSERT(0 == result); - - /* dequeue HALF_BULK objects */ - result = __ring_dequeue_bulk(r, deq, HALF_BULK); - deq += HALF_BULK; - CU_ASSERT(0 == result); - - /* _ring_free_count() equals dequeued */ - count = (1 + 2 + HALF_BULK); - CU_ASSERT(count == _ring_free_count(r)); - /* _ring_count() equals remained left */ - count = (RING_SIZE - 1) - count; - CU_ASSERT(count == _ring_count(r)); - - /* underrun the size, dequeue shall fail with -ENOENT */ - result = __ring_dequeue_bulk(r, deq, HALF_BULK); - CU_ASSERT(-ENOENT == result); - - /* empty the queue */ - result = __ring_dequeue_bulk(r, deq, count); - deq += count; - CU_ASSERT(0 == result); - CU_ASSERT(1 == _ring_empty(r)); - - /* check data */ - CU_ASSERT(0 == memcmp(source, dest, deq - dest)); - - /* reset dequeue data */ - memset(test_deq_data, 0, RING_SIZE * 2 * sizeof(void *)); -} diff --git a/platform/linux-generic/test/ring/ring_main.c b/platform/linux-generic/test/ring/ring_main.c deleted file mode 100644 index 8d0f07527..000000000 --- a/platform/linux-generic/test/ring/ring_main.c +++ /dev/null @@ -1,12 +0,0 @@ -/* Copyright (c) 2016-2018, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#include "ring_suites.h" - -int main(int argc, char *argv[]) -{ - return ring_suites_main(argc, argv); -} diff --git a/platform/linux-generic/test/ring/ring_stress.c b/platform/linux-generic/test/ring/ring_stress.c deleted file mode 100644 index b0b996789..000000000 --- a/platform/linux-generic/test/ring/ring_stress.c +++ /dev/null @@ -1,270 +0,0 @@ -/* Copyright (c) 2016-2018, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -/** - * @file - * - * ODP ring stress test - */ - -#ifndef _GNU_SOURCE -#define _GNU_SOURCE -#endif - -#include <stdlib.h> -#include <stdio.h> -#include <string.h> -#include <unistd.h> - -#include <odp_api.h> -#include <odp/helper/odph_api.h> -#include <odp_packet_io_ring_internal.h> -#include <odp_cunit_common.h> - -#include "ring_suites.h" - -/* There's even number of producer and consumer threads and each thread does - * this many successful enq or deq operations */ -#define NUM_BULK_OP ((RING_SIZE / PIECE_BULK) * 100) - -/* - * Note : make sure that both enqueue and dequeue - * operation starts at same time so to avoid data corruption - * Its because atomic lock will protect only indexes, but if order of - * read or write operation incorrect then data mismatch will happen - * So its resposibility of application develop to take care of order of - * data read or write. - */ -typedef enum { - STRESS_1_1_PRODUCER_CONSUMER, - STRESS_1_N_PRODUCER_CONSUMER, - STRESS_N_1_PRODUCER_CONSUMER, - STRESS_N_M_PRODUCER_CONSUMER -} stress_case_t; - -#define GLOBAL_SHM_NAME "RingGlobalShm" - -/* worker function declarations */ -static int stress_worker(void *_data); - -/* global name for later look up in workers' context */ -static const char *ring_name = "stress_ring"; - -typedef struct { - odp_shm_t shm; - /* Barrier to run threads at the same time */ - odp_barrier_t barrier; - /* - * Since cunit framework cannot work with multi-threading, ask workers - * to save their results for delayed assertion after thread collection. - */ - int worker_results[MAX_WORKERS]; -} global_shared_mem_t; - -static global_shared_mem_t *global_mem; - -int ring_test_stress_start(void) -{ - _ring_t *r_stress = NULL; - odp_shm_t shm; - - shm = odp_shm_reserve(GLOBAL_SHM_NAME, sizeof(global_shared_mem_t), 64, - ODP_SHM_SW_ONLY); - if (shm == ODP_SHM_INVALID) { - fprintf(stderr, "Unable reserve memory for global_shm\n"); - return -1; - } - - global_mem = odp_shm_addr(shm); - memset(global_mem, 0, sizeof(global_shared_mem_t)); - global_mem->shm = shm; - - /* multiple thread usage scenario, thread or process sharable */ - r_stress = _ring_create(ring_name, RING_SIZE, _RING_SHM_PROC); - if (r_stress == NULL) { - ODPH_ERR("create ring failed for stress.\n"); - return -1; - } - - return 0; -} - -int ring_test_stress_end(void) -{ - if (odp_shm_free(global_mem->shm)) { - fprintf(stderr, "error: odp_shm_free() failed.\n"); - return -1; - } - - return 0; -} - -void ring_test_stress_1_1_producer_consumer(void) -{ - int i = 0; - odp_cpumask_t cpus; - pthrd_arg worker_param; - - /* reset results for delayed assertion */ - memset(global_mem->worker_results, 0, - sizeof(global_mem->worker_results)); - - /* request 2 threads to run 1:1 stress */ - worker_param.numthrds = odp_cpumask_default_worker(&cpus, 2); - worker_param.testcase = STRESS_1_1_PRODUCER_CONSUMER; - - /* not failure, insufficient resource */ - if (worker_param.numthrds < 2) { - ODPH_ERR("insufficient cpu for 1:1 " - "producer/consumer stress.\n"); - return; - } - - odp_barrier_init(&global_mem->barrier, 2); - - /* kick the workers */ - odp_cunit_thread_create(stress_worker, &worker_param); - - /* collect the results */ - odp_cunit_thread_exit(&worker_param); - - /* delayed assertion due to cunit limitation */ - for (i = 0; i < worker_param.numthrds; i++) - CU_ASSERT(0 == global_mem->worker_results[i]); -} - -void ring_test_stress_N_M_producer_consumer(void) -{ - int i = 0; - odp_cpumask_t cpus; - pthrd_arg worker_param; - - /* reset results for delayed assertion */ - memset(global_mem->worker_results, 0, - sizeof(global_mem->worker_results)); - - /* request MAX_WORKERS threads to run N:M stress */ - worker_param.numthrds = - odp_cpumask_default_worker(&cpus, MAX_WORKERS); - worker_param.testcase = STRESS_N_M_PRODUCER_CONSUMER; - - /* not failure, insufficient resource */ - if (worker_param.numthrds < 3) { - ODPH_ERR("insufficient cpu for N:M " - "producer/consumer stress.\n"); - return; - } - - /* force even number of threads */ - if (worker_param.numthrds & 0x1) - worker_param.numthrds -= 1; - - odp_barrier_init(&global_mem->barrier, worker_param.numthrds); - - /* kick the workers */ - odp_cunit_thread_create(stress_worker, &worker_param); - - /* collect the results */ - odp_cunit_thread_exit(&worker_param); - - /* delayed assertion due to cunit limitation */ - for (i = 0; i < worker_param.numthrds; i++) - CU_ASSERT(0 == global_mem->worker_results[i]); -} - -void ring_test_stress_1_N_producer_consumer(void) -{ -} - -void ring_test_stress_N_1_producer_consumer(void) -{ -} - -void ring_test_stress_ring_list_dump(void) -{ - /* improve code coverage */ - _ring_list_dump(); -} - -/* worker function for multiple producer instances */ -static int do_producer(_ring_t *r) -{ - void *enq[PIECE_BULK]; - int i; - int num = NUM_BULK_OP; - - /* data pattern to be evaluated later in consumer */ - for (i = 0; i < PIECE_BULK; i++) - enq[i] = (void *)(uintptr_t)i; - - while (num) - if (_ring_mp_enqueue_bulk(r, enq, PIECE_BULK) == 0) - num--; - - return 0; -} - -/* worker function for multiple consumer instances */ -static int do_consumer(_ring_t *r) -{ - void *deq[PIECE_BULK]; - int i; - int num = NUM_BULK_OP; - - while (num) { - if (_ring_mc_dequeue_bulk(r, deq, PIECE_BULK) == 0) { - num--; - - /* evaluate the data pattern */ - for (i = 0; i < PIECE_BULK; i++) - CU_ASSERT(deq[i] == (void *)(uintptr_t)i); - } - } - - return 0; -} - -static int stress_worker(void *_data) -{ - pthrd_arg *worker_param = (pthrd_arg *)_data; - _ring_t *r_stress = NULL; - int *result = NULL; - int worker_id = odp_thread_id(); - - /* save the worker result for delayed assertion */ - result = &global_mem->worker_results[(worker_id % - worker_param->numthrds)]; - - /* verify ring lookup in worker context */ - r_stress = _ring_lookup(ring_name); - if (NULL == r_stress) { - ODPH_ERR("ring lookup %s not found\n", ring_name); - return (*result = -1); - } - - odp_barrier_wait(&global_mem->barrier); - - switch (worker_param->testcase) { - case STRESS_1_1_PRODUCER_CONSUMER: - case STRESS_N_M_PRODUCER_CONSUMER: - /* interleaved producer/consumer */ - if (0 == (worker_id % 2)) - *result = do_producer(r_stress); - else if (1 == (worker_id % 2)) - *result = do_consumer(r_stress); - break; - case STRESS_1_N_PRODUCER_CONSUMER: - case STRESS_N_1_PRODUCER_CONSUMER: - default: - ODPH_ERR("invalid or not-implemented stress type (%d)\n", - worker_param->testcase); - break; - } - - odp_barrier_wait(&global_mem->barrier); - - return 0; -} diff --git a/platform/linux-generic/test/ring/ring_suites.c b/platform/linux-generic/test/ring/ring_suites.c deleted file mode 100644 index a6b3376ce..000000000 --- a/platform/linux-generic/test/ring/ring_suites.c +++ /dev/null @@ -1,74 +0,0 @@ -/* Copyright (c) 2016-2018, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#include <stdlib.h> -#include <stdio.h> -#include <string.h> - -#include <odp_api.h> -#include <odp/helper/odph_api.h> - -#include <odp_cunit_common.h> -#include <odp_packet_io_ring_internal.h> - -#include "ring_suites.h" - -static int ring_suites_init(odp_instance_t *inst) -{ - if (0 != odp_init_global(inst, NULL, NULL)) { - ODPH_ERR("error: odp_init_global() failed.\n"); - return -1; - } - if (0 != odp_init_local(*inst, ODP_THREAD_CONTROL)) { - ODPH_ERR("error: odp_init_local() failed.\n"); - return -1; - } - - _ring_tailq_init(); - return 0; -} - -static odp_testinfo_t ring_suite_basic[] = { - ODP_TEST_INFO(ring_test_basic_create), - ODP_TEST_INFO(ring_test_basic_burst), - ODP_TEST_INFO(ring_test_basic_bulk), - ODP_TEST_INFO_NULL, -}; - -static odp_testinfo_t ring_suite_stress[] = { - ODP_TEST_INFO(ring_test_stress_1_1_producer_consumer), - ODP_TEST_INFO(ring_test_stress_1_N_producer_consumer), - ODP_TEST_INFO(ring_test_stress_N_1_producer_consumer), - ODP_TEST_INFO(ring_test_stress_N_M_producer_consumer), - ODP_TEST_INFO(ring_test_stress_ring_list_dump), - ODP_TEST_INFO_NULL, -}; - -static odp_suiteinfo_t ring_suites[] = { - {"ring basic", ring_test_basic_start, - ring_test_basic_end, ring_suite_basic}, - {"ring stress", ring_test_stress_start, - ring_test_stress_end, ring_suite_stress}, - ODP_SUITE_INFO_NULL -}; - -int ring_suites_main(int argc, char *argv[]) -{ - int ret; - - /* let helper collect its own arguments (e.g. --odph_proc) */ - if (odp_cunit_parse_options(argc, argv)) - return -1; - - odp_cunit_register_global_init(ring_suites_init); - - ret = odp_cunit_register(ring_suites); - - if (ret == 0) - ret = odp_cunit_run(); - - return ret; -} diff --git a/platform/linux-generic/test/ring/ring_suites.h b/platform/linux-generic/test/ring/ring_suites.h deleted file mode 100644 index d56ab7845..000000000 --- a/platform/linux-generic/test/ring/ring_suites.h +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright (c) 2016-2018, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#define RING_SIZE 4096 -#define PIECE_BULK 32 - -#define HALF_BULK (RING_SIZE >> 1) -#define ILLEGAL_SIZE (RING_SIZE | 0x3) - -/* test suite start and stop */ -int ring_test_basic_start(void); -int ring_test_basic_end(void); - -/* basic test cases */ -void ring_test_basic_create(void); -void ring_test_basic_burst(void); -void ring_test_basic_bulk(void); - -/* test suite start and stop */ -int ring_test_stress_start(void); -int ring_test_stress_end(void); - -/* stress test cases */ -void ring_test_stress_1_1_producer_consumer(void); -void ring_test_stress_1_N_producer_consumer(void); -void ring_test_stress_N_1_producer_consumer(void); -void ring_test_stress_N_M_producer_consumer(void); -void ring_test_stress_ring_list_dump(void); - -int ring_suites_main(int argc, char *argv[]); ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/Makefile.am | 3 - .../linux-generic/include/odp_buffer_internal.h | 4 - .../linux-generic/include/odp_packet_io_internal.h | 1 - .../include/odp_packet_io_ipc_internal.h | 47 -- .../include/odp_packet_io_ring_internal.h | 414 ---------------- platform/linux-generic/m4/configure.m4 | 3 +- platform/linux-generic/odp_packet_io.c | 1 - platform/linux-generic/pktio/ipc.c | 536 ++++++++++++--------- platform/linux-generic/pktio/ring.c | 515 -------------------- platform/linux-generic/test/Makefile.am | 3 +- platform/linux-generic/test/ring/.gitignore | 1 - platform/linux-generic/test/ring/Makefile.am | 38 -- platform/linux-generic/test/ring/ring_basic.c | 280 ----------- platform/linux-generic/test/ring/ring_main.c | 12 - platform/linux-generic/test/ring/ring_stress.c | 270 ----------- platform/linux-generic/test/ring/ring_suites.c | 74 --- platform/linux-generic/test/ring/ring_suites.h | 33 -- 17 files changed, 321 insertions(+), 1914 deletions(-) delete mode 100644 platform/linux-generic/include/odp_packet_io_ipc_internal.h delete mode 100644 platform/linux-generic/include/odp_packet_io_ring_internal.h delete mode 100644 platform/linux-generic/pktio/ring.c delete mode 100644 platform/linux-generic/test/ring/.gitignore delete mode 100644 platform/linux-generic/test/ring/Makefile.am delete mode 100644 platform/linux-generic/test/ring/ring_basic.c delete mode 100644 platform/linux-generic/test/ring/ring_main.c delete mode 100644 platform/linux-generic/test/ring/ring_stress.c delete mode 100644 platform/linux-generic/test/ring/ring_suites.c delete mode 100644 platform/linux-generic/test/ring/ring_suites.h hooks/post-receive --

6 years, 3 months

[COMMIT] branch master updated. v1.21.0.0-299-g1a8b32c75

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 1a8b32c758894b0d0a71ebbd86efb77fd9eb334c (commit) via d3dd92949a71783f54530e06e5afa15ec9f507c2 (commit) via 61af8e3ac83e75e66a404edbbac9718ce99d95c0 (commit) via da423931fe6b6f4532bc05a71c7323bf28f7be2a (commit) via 5ae87b8706ae7d85a1c14a63359c737c6988abce (commit) from 5930362eaf96ea150987c4e4e69b17f09a8a8f3a (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 1a8b32c758894b0d0a71ebbd86efb77fd9eb334c Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Mon Nov 4 14:11:56 2019 +0200 example: cls: add support for UDP/TCP ports Added support for UDP/TCP port PMR terms, and others with a 16 bit value. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/example/classifier/odp_classifier.c b/example/classifier/odp_classifier.c index 3af418704..f0cab8c05 100644 --- a/example/classifier/odp_classifier.c +++ b/example/classifier/odp_classifier.c @@ -37,7 +37,7 @@ /** @def MAX_PMR_COUNT * @brief Maximum number of Classification Policy */ -#define MAX_PMR_COUNT 8 +#define MAX_PMR_COUNT 32 /** @def DISPLAY_STRING_LEN * @brief Length of string used to display term value @@ -757,9 +757,27 @@ static int convert_str_to_pmr_enum(char *token, odp_cls_pmr_term_t *term) if (strcasecmp(token, "ODP_PMR_ETHTYPE_0") == 0) { *term = ODP_PMR_ETHTYPE_0; return 0; + } else if (strcasecmp(token, "ODP_PMR_ETHTYPE_X") == 0) { + *term = ODP_PMR_ETHTYPE_X; + return 0; } else if (strcasecmp(token, "ODP_PMR_VLAN_ID_0") == 0) { *term = ODP_PMR_VLAN_ID_0; return 0; + } else if (strcasecmp(token, "ODP_PMR_VLAN_ID_X") == 0) { + *term = ODP_PMR_VLAN_ID_X; + return 0; + } else if (strcasecmp(token, "ODP_PMR_UDP_DPORT") == 0) { + *term = ODP_PMR_UDP_DPORT; + return 0; + } else if (strcasecmp(token, "ODP_PMR_TCP_DPORT") == 0) { + *term = ODP_PMR_TCP_DPORT; + return 0; + } else if (strcasecmp(token, "ODP_PMR_UDP_SPORT") == 0) { + *term = ODP_PMR_UDP_SPORT; + return 0; + } else if (strcasecmp(token, "ODP_PMR_TCP_SPORT") == 0) { + *term = ODP_PMR_TCP_SPORT; + return 0; } else if (strcasecmp(token, "ODP_PMR_SIP_ADDR") == 0) { *term = ODP_PMR_SIP_ADDR; return 0; @@ -792,7 +810,8 @@ static int parse_pmr_policy(appl_args_t *appl_args, char *optarg) /* last array index is needed for default queue */ if (policy_count >= MAX_PMR_COUNT - 1) { - ODPH_ERR("Maximum allowed PMR reached\n"); + ODPH_ERR("Too many policies. Max count is %i.\n", + MAX_PMR_COUNT - 1); return -1; } @@ -814,10 +833,23 @@ static int parse_pmr_policy(appl_args_t *appl_args, char *optarg) /* PMR value */ switch (term) { case ODP_PMR_ETHTYPE_0: - /* :<type>:<mask> */ /* Fall through */ + case ODP_PMR_ETHTYPE_X: + /* Fall through */ + /* :<type>:<mask> */ case ODP_PMR_VLAN_ID_0: + /* Fall through */ + case ODP_PMR_VLAN_ID_X: + /* Fall through */ /* :<vlan_id>:<mask> */ + case ODP_PMR_UDP_DPORT: + /* Fall through */ + case ODP_PMR_TCP_DPORT: + /* Fall through */ + case ODP_PMR_UDP_SPORT: + /* Fall through */ + case ODP_PMR_TCP_SPORT: + /* :<port>:<mask> */ token = strtok(NULL, ":"); strncpy(stats[policy_count].value, token, DISPLAY_STRING_LEN - 1); @@ -951,7 +983,7 @@ static int parse_args(int argc, char *argv[], appl_args_t *appl_args) appl_args->cpu_count = 1; /* Use one worker by default */ appl_args->verbose = 0; - while (1) { + while (ret == 0) { opt = getopt_long(argc, argv, shortopts, longopts, &long_index); @@ -963,8 +995,10 @@ static int parse_args(int argc, char *argv[], appl_args_t *appl_args) appl_args->cpu_count = atoi(optarg); break; case 'p': - if (0 > parse_pmr_policy(appl_args, optarg)) - continue; + if (parse_pmr_policy(appl_args, optarg)) { + ret = -1; + break; + } policy = 1; break; case 't': commit d3dd92949a71783f54530e06e5afa15ec9f507c2 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Fri Nov 1 14:14:45 2019 +0200 validation: cls: add parallel PMR test Test serial and parallel PMR and CoS: - from default CoS to dest IPv4 CoS - from dest IPv4 CoS to a parallel UDP CoS per destination port number Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/test/validation/api/classification/odp_classification_test_pmr.c b/test/validation/api/classification/odp_classification_test_pmr.c index 62f8a7425..7cbeca586 100644 --- a/test/validation/api/classification/odp_classification_test_pmr.c +++ b/test/validation/api/classification/odp_classification_test_pmr.c @@ -2367,6 +2367,11 @@ static void classification_test_pmr_serial(void) test_pmr_series(1); } +static void classification_test_pmr_parallel(void) +{ + test_pmr_series(4); +} + static void classification_test_pmr_term_custom_frame(void) { test_pmr_term_custom(0); @@ -2511,6 +2516,8 @@ odp_testinfo_t classification_suite_pmr[] = { check_capa_custom_l3), ODP_TEST_INFO_CONDITIONAL(classification_test_pmr_serial, check_capa_pmr_series), + ODP_TEST_INFO_CONDITIONAL(classification_test_pmr_parallel, + check_capa_pmr_series), ODP_TEST_INFO(classification_test_pktin_classifier_flag), ODP_TEST_INFO(classification_test_pmr_term_tcp_dport_multi), ODP_TEST_INFO_NULL, commit 61af8e3ac83e75e66a404edbbac9718ce99d95c0 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Fri Nov 1 14:10:19 2019 +0200 validation: cls: add serial PMR test Test series of PMR and CoS: - from default CoS to dest IPv4 CoS - from dest IPv4 CoS to dest UDP CoS Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/test/validation/api/classification/odp_classification_test_pmr.c b/test/validation/api/classification/odp_classification_test_pmr.c index d4a3110e3..62f8a7425 100644 --- a/test/validation/api/classification/odp_classification_test_pmr.c +++ b/test/validation/api/classification/odp_classification_test_pmr.c @@ -2168,6 +2168,205 @@ static void test_pmr_term_custom(int custom_l3) odp_pktio_close(pktio); } +/* + * Test a series of PMR rules and CoS. When num_udp is 1, test is serial + * from IP CoS to UDP CoS. When num_udp is larger than 1, a set of parallel + * UDP CoS are tested. + * + * dst IP dst UDP[0 ... 3] + * default_cos -> cos_ip -> cos_udp[0 ... 3] + */ +static void test_pmr_series(const int num_udp) +{ + odp_packet_t pkt; + uint32_t seqno; + int i, retval; + cls_packet_info_t pkt_info; + odp_pktio_t pktio; + odp_pool_t pool; + odp_queue_t default_queue; + odp_pool_t default_pool; + odp_cos_t default_cos; + odp_queue_t retqueue; + odp_pmr_t pmr_ip; + odp_queue_t queue_ip; + odp_cos_t cos_ip; + uint32_t dst_addr; + uint32_t dst_addr_be, ip_mask_be; + uint32_t dst_mask; + odp_pmr_param_t pmr_param; + odp_cls_cos_param_t cls_param; + odph_ethhdr_t *eth; + odph_ipv4hdr_t *ip; + odph_udphdr_t *udp; + odp_cos_t cos_udp[num_udp]; + odp_queue_t queue_udp[num_udp]; + odp_pmr_t pmr_udp[num_udp]; + uint16_t dst_port = 1000; + + pktio = create_pktio(ODP_QUEUE_TYPE_SCHED, pkt_pool, true); + retval = start_pktio(pktio); + CU_ASSERT(retval == 0); + + configure_default_cos(pktio, &default_cos, + &default_queue, &default_pool); + + pool = pool_create("pmr_series"); + CU_ASSERT_FATAL(pool != ODP_POOL_INVALID); + + /* Dest IP address */ + queue_ip = queue_create("queue_ip", true); + CU_ASSERT_FATAL(queue_ip != ODP_QUEUE_INVALID); + + odp_cls_cos_param_init(&cls_param); + cls_param.pool = pool; + cls_param.queue = queue_ip; + cls_param.drop_policy = ODP_COS_DROP_POOL; + + cos_ip = odp_cls_cos_create("cos_ip", &cls_param); + CU_ASSERT_FATAL(cos_ip != ODP_COS_INVALID); + + parse_ipv4_string("10.0.9.99/32", &dst_addr, &dst_mask); + dst_addr_be = odp_cpu_to_be_32(dst_addr); + ip_mask_be = odp_cpu_to_be_32(dst_mask); + + odp_cls_pmr_param_init(&pmr_param); + pmr_param.term = ODP_PMR_DIP_ADDR; + pmr_param.match.value = &dst_addr_be; + pmr_param.match.mask = &ip_mask_be; + pmr_param.val_sz = sizeof(dst_addr_be); + pmr_param.offset = 0; + + pmr_ip = odp_cls_pmr_create(&pmr_param, 1, default_cos, cos_ip); + CU_ASSERT_FATAL(pmr_ip != ODP_PMR_INVALID); + + /* Dest UDP port */ + for (i = 0; i < num_udp; i++) { + uint16_t dst_port_be = odp_cpu_to_be_16(dst_port + i); + uint16_t port_mask_be = odp_cpu_to_be_16(0xffff); + char name[] = "udp_0"; + + name[4] += i; + queue_udp[i] = queue_create(name, true); + CU_ASSERT_FATAL(queue_udp[i] != ODP_QUEUE_INVALID); + + odp_cls_cos_param_init(&cls_param); + cls_param.pool = pool; + cls_param.queue = queue_udp[i]; + cls_param.drop_policy = ODP_COS_DROP_POOL; + + cos_udp[i] = odp_cls_cos_create(name, &cls_param); + CU_ASSERT_FATAL(cos_udp[i] != ODP_COS_INVALID); + + odp_cls_pmr_param_init(&pmr_param); + pmr_param.term = ODP_PMR_UDP_DPORT; + pmr_param.match.value = &dst_port_be; + pmr_param.match.mask = &port_mask_be; + pmr_param.val_sz = 2; + pmr_param.offset = 0; + + pmr_udp[i] = odp_cls_pmr_create(&pmr_param, 1, + cos_ip, cos_udp[i]); + CU_ASSERT_FATAL(pmr_udp[i] != ODP_PMR_INVALID); + } + + /* Matching TCP/IP packet */ + pkt_info = default_pkt_info; + pkt_info.udp = false; + + pkt = create_packet(pkt_info); + CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID); + + eth = (odph_ethhdr_t *)odp_packet_l2_ptr(pkt, NULL); + ip = (odph_ipv4hdr_t *)odp_packet_l3_ptr(pkt, NULL); + + odp_pktio_mac_addr(pktio, eth->src.addr, ODPH_ETHADDR_LEN); + odp_pktio_mac_addr(pktio, eth->dst.addr, ODPH_ETHADDR_LEN); + ip->dst_addr = dst_addr_be; + + seqno = cls_pkt_get_seq(pkt); + CU_ASSERT(seqno != TEST_SEQ_INVALID); + + enqueue_pktio_interface(pkt, pktio); + + pkt = receive_packet(&retqueue, ODP_TIME_SEC_IN_NS); + CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID); + CU_ASSERT(seqno == cls_pkt_get_seq(pkt)); + CU_ASSERT(retqueue == queue_ip); + odp_packet_free(pkt); + + /* Matching UDP/IP packets */ + pkt_info = default_pkt_info; + pkt_info.udp = true; + + for (i = 0; i < num_udp; i++) { + pkt = create_packet(pkt_info); + CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID); + + eth = (odph_ethhdr_t *)odp_packet_l2_ptr(pkt, NULL); + ip = (odph_ipv4hdr_t *)odp_packet_l3_ptr(pkt, NULL); + udp = (odph_udphdr_t *)odp_packet_l4_ptr(pkt, NULL); + + odp_pktio_mac_addr(pktio, eth->src.addr, ODPH_ETHADDR_LEN); + odp_pktio_mac_addr(pktio, eth->dst.addr, ODPH_ETHADDR_LEN); + ip->dst_addr = dst_addr_be; + udp->dst_port = odp_cpu_to_be_16(dst_port + i); + + seqno = cls_pkt_get_seq(pkt); + CU_ASSERT(seqno != TEST_SEQ_INVALID); + + enqueue_pktio_interface(pkt, pktio); + + pkt = receive_packet(&retqueue, ODP_TIME_SEC_IN_NS); + CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID); + CU_ASSERT(seqno == cls_pkt_get_seq(pkt)); + CU_ASSERT(retqueue == queue_udp[i]); + odp_packet_free(pkt); + } + + /* Other packets delivered to default queue */ + pkt = create_packet(default_pkt_info); + CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID); + seqno = cls_pkt_get_seq(pkt); + CU_ASSERT(seqno != TEST_SEQ_INVALID); + eth = (odph_ethhdr_t *)odp_packet_l2_ptr(pkt, NULL); + odp_pktio_mac_addr(pktio, eth->src.addr, ODPH_ETHADDR_LEN); + odp_pktio_mac_addr(pktio, eth->dst.addr, ODPH_ETHADDR_LEN); + + enqueue_pktio_interface(pkt, pktio); + + pkt = receive_packet(&retqueue, ODP_TIME_SEC_IN_NS); + CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID); + CU_ASSERT(seqno == cls_pkt_get_seq(pkt)); + CU_ASSERT(retqueue == default_queue); + odp_packet_free(pkt); + + for (i = 0; i < num_udp; i++) { + odp_cos_destroy(cos_udp[i]); + odp_cls_pmr_destroy(pmr_udp[i]); + } + + odp_cos_destroy(cos_ip); + odp_cls_pmr_destroy(pmr_ip); + + odp_cos_destroy(default_cos); + stop_pktio(pktio); + odp_pool_destroy(default_pool); + odp_pool_destroy(pool); + + for (i = 0; i < num_udp; i++) + odp_queue_destroy(queue_udp[i]); + + odp_queue_destroy(queue_ip); + odp_queue_destroy(default_queue); + odp_pktio_close(pktio); +} + +static void classification_test_pmr_serial(void) +{ + test_pmr_series(1); +} + static void classification_test_pmr_term_custom_frame(void) { test_pmr_term_custom(0); @@ -2263,6 +2462,16 @@ static int check_capa_custom_l3(void) return cls_capa.supported_terms.bit.custom_l3; } +static int check_capa_pmr_series(void) +{ + uint64_t support; + + support = cls_capa.supported_terms.bit.dip_addr && + cls_capa.supported_terms.bit.udp_dport; + + return support; +} + odp_testinfo_t classification_suite_pmr[] = { ODP_TEST_INFO_CONDITIONAL(classification_test_pmr_term_tcp_dport, check_capa_tcp_dport), @@ -2300,6 +2509,8 @@ odp_testinfo_t classification_suite_pmr[] = { check_capa_custom_frame), ODP_TEST_INFO_CONDITIONAL(classification_test_pmr_term_custom_l3, check_capa_custom_l3), + ODP_TEST_INFO_CONDITIONAL(classification_test_pmr_serial, + check_capa_pmr_series), ODP_TEST_INFO(classification_test_pktin_classifier_flag), ODP_TEST_INFO(classification_test_pmr_term_tcp_dport_multi), ODP_TEST_INFO_NULL, commit da423931fe6b6f4532bc05a71c7323bf28f7be2a Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Fri Nov 1 16:17:01 2019 +0200 linux-gen: cls: fix PMR match recursion Parallel PMR rules (leafs in classification tree) were not correctly checked. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/platform/linux-generic/odp_classification.c b/platform/linux-generic/odp_classification.c index a803b52b2..23069b662 100644 --- a/platform/linux-generic/odp_classification.c +++ b/platform/linux-generic/odp_classification.c @@ -1275,10 +1275,10 @@ static int verify_pmr(pmr_t *pmr, const uint8_t *pkt_addr, } if (pmr_failure) - return false; + return 0; } odp_atomic_inc_u32(&pmr->s.count); - return true; + return 1; } /* @@ -1286,14 +1286,10 @@ static int verify_pmr(pmr_t *pmr, const uint8_t *pkt_addr, * This function gets called recursively to check the chained PMR Term value * with the packet. */ -static -cos_t *match_pmr_cos(cos_t *cos, const uint8_t *pkt_addr, pmr_t *pmr, - odp_packet_hdr_t *hdr) +static cos_t *match_pmr_cos(cos_t *cos, const uint8_t *pkt_addr, pmr_t *pmr, + odp_packet_hdr_t *hdr) { - cos_t *retcos; - uint32_t i; - - retcos = NULL; + uint32_t i, num_rule; if (cos == NULL || pmr == NULL) return NULL; @@ -1302,19 +1298,29 @@ cos_t *match_pmr_cos(cos_t *cos, const uint8_t *pkt_addr, pmr_t *pmr, return NULL; if (verify_pmr(pmr, pkt_addr, hdr)) { - /** This gets called recursively to check all the PMRs in - * a PMR chain */ - if (0 == odp_atomic_load_u32(&cos->s.num_rule)) + /* This gets called recursively. First matching leaf or branch + * is returned. */ + num_rule = odp_atomic_load_u32(&cos->s.num_rule); + + /* No more rules. This is the best match. */ + if (num_rule == 0) return cos; - for (i = 0; i < odp_atomic_load_u32(&cos->s.num_rule); i++) { - retcos = match_pmr_cos(cos->s.linked_cos[i], pkt_addr, - cos->s.pmr[i], hdr); - if (!retcos) - return cos; + for (i = 0; i < num_rule; i++) { + cos_t *retcos = match_pmr_cos(cos->s.linked_cos[i], + pkt_addr, cos->s.pmr[i], + hdr); + + /* Found a matching leaf */ + if (retcos) + return retcos; } + + /* Current CoS was the best match */ + return cos; } - return retcos; + + return NULL; } int pktio_classifier_init(pktio_entry_t *entry) commit 5ae87b8706ae7d85a1c14a63359c737c6988abce Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Fri Nov 1 11:31:19 2019 +0200 linux-gen: cls: enable custom L3 protocols with CUSTOM_L3 Input flag for L3 is set only for known L3 protocols. Allow custom L3 protocols by checking L2 flag and L3 offset only. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/platform/linux-generic/odp_classification.c b/platform/linux-generic/odp_classification.c index 1b5337ff6..a803b52b2 100644 --- a/platform/linux-generic/odp_classification.c +++ b/platform/linux-generic/odp_classification.c @@ -1087,7 +1087,8 @@ static inline int verify_pmr_custom_l3(const uint8_t *pkt_addr, ODP_ASSERT(val_sz <= MAX_PMR_TERM_SIZE); - if (!pkt_hdr->p.input_flags.l3) + if (pkt_hdr->p.input_flags.l2 == 0 || + l3_offset == ODP_PACKET_OFFSET_INVALID) return 0; if (packet_len(pkt_hdr) <= offset + val_sz) ----------------------------------------------------------------------- Summary of changes: example/classifier/odp_classifier.c | 46 ++++- platform/linux-generic/odp_classification.c | 45 +++-- .../classification/odp_classification_test_pmr.c | 218 +++++++++++++++++++++ 3 files changed, 284 insertions(+), 25 deletions(-) hooks/post-receive --

6 years, 3 months

[COMMIT] branch master updated. v1.21.0.0-294-g5930362ea

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 5930362eaf96ea150987c4e4e69b17f09a8a8f3a (commit) from 810bc2ee9b5285e1692a6b0c7457ca503f381e1e (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 5930362eaf96ea150987c4e4e69b17f09a8a8f3a Author: Matias Elo <matias.elo(a)nokia.com> Date: Fri Nov 1 15:22:59 2019 +0200 linux-gen: shm: improve memory allocation error messages Include page type (normal/huge) and filename in error messages. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/platform/linux-generic/odp_ishm.c b/platform/linux-generic/odp_ishm.c index cd483d146..41f3979bf 100644 --- a/platform/linux-generic/odp_ishm.c +++ b/platform/linux-generic/odp_ishm.c @@ -681,8 +681,8 @@ static int create_file(int block_index, huge_flag_t huge, uint64_t len, fd = open(filename, oflag, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); if (fd < 0) { if (huge != HUGE) - ODP_ERR("open failed for %s: %s.\n", - filename, strerror(errno)); + ODP_ERR("Normal page open failed: file=%s, " + "err=\"%s\"\n", filename, strerror(errno)); return -1; } @@ -694,8 +694,9 @@ static int create_file(int block_index, huge_flag_t huge, uint64_t len, } if (ret == -1) { - ODP_ERR("memory allocation failed: fd=%d, err=%s.\n", - fd, strerror(errno)); + ODP_ERR("%s memory allocation failed: fd=%d, file=%s, " + "err=\"%s\"\n", (huge == HUGE) ? "Huge page" : + "Normal page", fd, filename, strerror(errno)); close(fd); unlink(filename); return -1; ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/odp_ishm.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) hooks/post-receive --

6 years, 3 months

[COMMIT] branch master updated. v1.21.0.0-293-g810bc2ee9

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 810bc2ee9b5285e1692a6b0c7457ca503f381e1e (commit) via bd2aea3186fd4e2d3ba6ec91f2a6ba72f0443941 (commit) via b904314ec95e4e680a739a5f98b6fd814b9a6fef (commit) via 2376fa5b4b5f5b7b9d2c11cb08438f11883bfe50 (commit) via 55ea0298a7cf917b466d2154d79d00fd86f3c936 (commit) via d688a269562ff9efc2ff03411c385a2bd1228d2c (commit) via 13b478eaa76ee8461341b114d447835e3906748d (commit) via 4c4145f8c9c73665c9f834f8ca639b9f0525e30f (commit) via 4c58ce0cd530c59907164f2fa7ae78800c494151 (commit) via 65891255eec4884e941aece9808ad684155feac8 (commit) via d4eb0481e1dd40a0d0b70486cdf8f9b676862b2f (commit) via f15da1c0ee13dd0e342944dccdd9014c16d4d5be (commit) via 6f855d843b1d87013908998a050e16c435b89e07 (commit) via 35a6b2e5c369e81196f6c288085990eaaf83f360 (commit) via 0e2ee113fcc0e7383d9e465c11a8495a65f7a171 (commit) via 0cfdb2c5a6b3afe0e4b0eee2b3749a0cfca3917d (commit) via b7a8fd47362a3853db8cc3ea56fe1d268defa574 (commit) via 0df7a38e2b9be4ad72528d43551e56ac4d152b96 (commit) via 139b28399d3bd1f53624908c9fd99c1f14283cdd (commit) from 86745e999aa2bf644fd72775df55042289e07b2b (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 810bc2ee9b5285e1692a6b0c7457ca503f381e1e Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Mon Oct 28 14:49:26 2019 +0200 api: increment version to 1.23 Increment API version number to reflect API changes: * cls: PMR values for protocol fields are defined in big endian * cls: ODP_PMR_CUSTOM_L3 term has been added * coding style: use 'unsigned int' instead of 'unsigned' Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> diff --git a/configure.ac b/configure.ac index 81123cbc6..4cff42913 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ([2.5]) # ODP API version ########################################################################## m4_define([odpapi_generation_version], [1]) -m4_define([odpapi_major_version], [22]) +m4_define([odpapi_major_version], [23]) m4_define([odpapi_minor_version], [0]) m4_define([odpapi_point_version], [0]) m4_define([odpapi_version], commit bd2aea3186fd4e2d3ba6ec91f2a6ba72f0443941 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Mon Oct 28 15:33:05 2019 +0200 api: clean up coding style warnings Clean checkpatch warnings on include/odp/api/spec files. Current checkpatch version warns about 'unsigned' type name usage. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> diff --git a/include/odp/api/spec/classification.h b/include/odp/api/spec/classification.h index eadcaa2d8..1db85e8b7 100644 --- a/include/odp/api/spec/classification.h +++ b/include/odp/api/spec/classification.h @@ -175,17 +175,17 @@ typedef struct odp_cls_capability_t { odp_cls_pmr_terms_t supported_terms; /** Maximum number of PMR terms */ - unsigned max_pmr_terms; + unsigned int max_pmr_terms; /** Number of PMR terms available for use now */ - unsigned available_pmr_terms; + unsigned int available_pmr_terms; /** Maximum number of CoS supported */ - unsigned max_cos; + unsigned int max_cos; /** Maximun number of queue supported per CoS * if the value is 1, then hashing is not supported*/ - unsigned max_hash_queues; + unsigned int max_hash_queues; /** Protocol header combination supported for Hashing */ odp_pktin_hash_proto_t hash_protocols; diff --git a/include/odp/api/spec/packet_io.h b/include/odp/api/spec/packet_io.h index 5d5ca2bc4..cddacecc5 100644 --- a/include/odp/api/spec/packet_io.h +++ b/include/odp/api/spec/packet_io.h @@ -201,7 +201,7 @@ typedef struct odp_pktin_queue_param_t { * More than one input queues require flow hashing configured. * The maximum value is defined by pktio capability 'max_input_queues'. * Queue type is defined by the input mode. The default value is 1. */ - unsigned num_queues; + unsigned int num_queues; /** Queue parameters * @@ -243,7 +243,7 @@ typedef struct odp_pktout_queue_param_t { /** Number of output queues to be created. The value must be between * 1 and interface capability. The default value is 1. */ - unsigned num_queues; + unsigned int num_queues; } odp_pktout_queue_param_t; @@ -551,10 +551,10 @@ typedef union odp_pktio_set_op_t { */ typedef struct odp_pktio_capability_t { /** Maximum number of input queues */ - unsigned max_input_queues; + unsigned int max_input_queues; /** Maximum number of output queues */ - unsigned max_output_queues; + unsigned int max_output_queues; /** Supported pktio configuration options */ odp_pktio_config_t config; @@ -650,7 +650,7 @@ int odp_pktio_capability(odp_pktio_t pktio, odp_pktio_capability_t *capa); * * @return Maximum packet IO interface index */ -unsigned odp_pktio_max_index(void); +unsigned int odp_pktio_max_index(void); /** * Configure packet IO interface options @@ -947,8 +947,8 @@ int odp_pktin_recv_tmo(odp_pktin_queue_t queue, odp_packet_t packets[], * @return Number of packets received * @retval <0 on failure */ -int odp_pktin_recv_mq_tmo(const odp_pktin_queue_t queues[], unsigned num_q, - unsigned *from, odp_packet_t packets[], int num, +int odp_pktin_recv_mq_tmo(const odp_pktin_queue_t queues[], unsigned int num_q, + unsigned int *from, odp_packet_t packets[], int num, uint64_t wait); /** diff --git a/include/odp/api/spec/pool.h b/include/odp/api/spec/pool.h index d4cf088f1..69e99605c 100644 --- a/include/odp/api/spec/pool.h +++ b/include/odp/api/spec/pool.h @@ -48,12 +48,12 @@ extern "C" { */ typedef struct odp_pool_capability_t { /** Maximum number of pools of any type */ - unsigned max_pools; + unsigned int max_pools; /** Buffer pool capabilities */ struct { /** Maximum number of buffer pools */ - unsigned max_pools; + unsigned int max_pools; /** Maximum buffer data alignment in bytes */ uint32_t max_align; @@ -74,7 +74,7 @@ typedef struct odp_pool_capability_t { /** Packet pool capabilities */ struct { /** Maximum number of packet pools */ - unsigned max_pools; + unsigned int max_pools; /** Maximum packet data length in bytes * @@ -147,7 +147,7 @@ typedef struct odp_pool_capability_t { /** Timeout pool capabilities */ struct { /** Maximum number of timeout pools */ - unsigned max_pools; + unsigned int max_pools; /** Maximum number of timeout events in a pool * diff --git a/include/odp/api/spec/shared_memory.h b/include/odp/api/spec/shared_memory.h index 0882c4a1c..425e6c77a 100644 --- a/include/odp/api/spec/shared_memory.h +++ b/include/odp/api/spec/shared_memory.h @@ -106,7 +106,7 @@ typedef struct odp_shm_capability_t { * * This number of separate shared memory blocks can be * reserved concurrently. */ - unsigned max_blocks; + unsigned int max_blocks; /** Maximum memory block size in bytes * diff --git a/include/odp/api/spec/version.h.in b/include/odp/api/spec/version.h.in index 35df9ba26..4c3cbfee8 100644 --- a/include/odp/api/spec/version.h.in +++ b/include/odp/api/spec/version.h.in @@ -4,7 +4,6 @@ * SPDX-License-Identifier: BSD-3-Clause */ - /** * @file * commit b904314ec95e4e680a739a5f98b6fd814b9a6fef Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Mon Oct 28 14:36:13 2019 +0200 example: cls: update help text Updated help text with changes to application options. Also, avoid shm memory leak when command line options have errors, or when --help option is used. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> diff --git a/example/classifier/odp_classifier.c b/example/classifier/odp_classifier.c index ecfa732a9..3af418704 100644 --- a/example/classifier/odp_classifier.c +++ b/example/classifier/odp_classifier.c @@ -95,9 +95,9 @@ static appl_args_t *appl_args_gbl; static int drop_err_pkts(odp_packet_t pkt_tbl[], unsigned len); static void swap_pkt_addrs(odp_packet_t pkt_tbl[], unsigned len); -static void parse_args(int argc, char *argv[], appl_args_t *appl_args); +static int parse_args(int argc, char *argv[], appl_args_t *appl_args); static void print_info(char *progname, appl_args_t *appl_args); -static void usage(char *progname); +static void usage(void); static inline void print_cls_statistics(appl_args_t *args) { @@ -568,7 +568,8 @@ int main(int argc, char *argv[]) appl_args_gbl = args; memset(args, 0, sizeof(*args)); /* Parse and store the application arguments */ - parse_args(argc, argv, args); + if (parse_args(argc, argv, args)) + goto args_error; /* Print both system and application information */ print_info(NO_PATH(argv[0]), args); @@ -662,13 +663,14 @@ int main(int argc, char *argv[]) ODPH_ERR("err: odp_pool_destroy for %d\n", i); } - free(args->if_name); - odp_shm_free(shm); if (odp_pktio_close(pktio)) ODPH_ERR("err: close pktio error\n"); if (odp_pool_destroy(pool)) ODPH_ERR("err: odp_pool_destroy error\n"); +args_error: + odp_shm_free(shm); + ret = odp_term_local(); if (ret) ODPH_ERR("odp_term_local error %d\n", ret); @@ -772,7 +774,7 @@ static int convert_str_to_pmr_enum(char *token, odp_cls_pmr_term_t *term) return -1; } -static int parse_pmr_policy(appl_args_t *appl_args, char *argv[], char *optarg) +static int parse_pmr_policy(appl_args_t *appl_args, char *optarg) { int policy_count; char *token, *cos0, *cos1; @@ -889,7 +891,7 @@ static int parse_pmr_policy(appl_args_t *appl_args, char *argv[], char *optarg) return -1; break; default: - usage(argv[0]); + usage(); exit(EXIT_FAILURE); } @@ -923,7 +925,7 @@ static int parse_pmr_policy(appl_args_t *appl_args, char *argv[], char *optarg) * @param argv[] argument vector * @param appl_args Store application arguments here */ -static void parse_args(int argc, char *argv[], appl_args_t *appl_args) +static int parse_args(int argc, char *argv[], appl_args_t *appl_args) { int opt; int long_index; @@ -931,6 +933,7 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args) int i; int interface = 0; int policy = 0; + int ret = 0; static const struct option longopts[] = { {"count", required_argument, NULL, 'c'}, @@ -960,7 +963,7 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args) appl_args->cpu_count = atoi(optarg); break; case 'p': - if (0 > parse_pmr_policy(appl_args, argv, optarg)) + if (0 > parse_pmr_policy(appl_args, optarg)) continue; policy = 1; break; @@ -970,15 +973,15 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args) case 'i': len = strlen(optarg); if (len == 0) { - usage(argv[0]); - exit(EXIT_FAILURE); + ret = -1; + break; } len += 1; /* add room for '\0' */ appl_args->if_name = malloc(len); if (appl_args->if_name == NULL) { - usage(argv[0]); - exit(EXIT_FAILURE); + ret = -1; + break; } strcpy(appl_args->if_name, optarg); @@ -995,24 +998,30 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args) appl_args->verbose = 1; break; case 'h': - usage(argv[0]); - exit(EXIT_SUCCESS); + ret = -1; break; default: break; } } - if (!interface || !policy) { - usage(argv[0]); - exit(EXIT_FAILURE); - } - if (appl_args->if_name == NULL) { - usage(argv[0]); - exit(EXIT_FAILURE); + if (!interface || !policy) + ret = -1; + + if (appl_args->if_name == NULL) + ret = -1; + + if (ret) { + usage(); + + if (appl_args->if_name) + free(appl_args->if_name); } - optind = 1; /* reset 'extern optind' from the getopt lib */ + /* reset optind from the getopt lib */ + optind = 1; + + return ret; } /** @@ -1033,45 +1042,44 @@ static void print_info(char *progname, appl_args_t *appl_args) /** * Prinf usage information */ -static void usage(char *progname) +static void usage(void) { printf("\n" - "OpenDataPlane Classifier example.\n" - "Usage: %s OPTIONS\n" - " E.g. %s -i eth1 -m 0 -p \"ODP_PMR_SIP_ADDR:10.10.10.5:FFFFFFFF:queue1\" \\\n" - "\t\t\t-p \"ODP_PMR_SIP_ADDR:10.10.10.7:000000FF:queue2\" \\\n" - "\t\t\t-p \"ODP_PMR_SIP_ADDR:10.5.5.10:FFFFFF00:queue3\"\n" - "\n" - "For the above example configuration the following will be the packet distribution\n" - "queue1\t\tPackets with source ip address 10.10.10.5\n" - "queue2\t\tPackets with source ip address whose last 8 bits match 7\n" - "queue3\t\tPackets with source ip address in the subnet 10.5.5.0\n" - "\n" - "Mandatory OPTIONS:\n" - " -i, --interface Eth interface\n" - " -p, --policy [<odp_cls_pmr_term_t>|<offset>]:<value>:<mask bits>:<queue name>\n" - "\n" - "<odp_cls_pmr_term_t> Packet Matching Rule defined with odp_cls_pmr_term_t " - "for the policy\n" - "<offset> Absolute offset in bytes from frame start to define a " - "ODP_PMR_CUSTOM_FRAME Packet Matching Rule for the policy\n" - "\n" - "<value> PMR value to be matched.\n" - "\n" - "<mask bits> PMR mask bits to be applied on the PMR term value\n" - "\n" - "Optional OPTIONS\n" - " -c, --count <number> CPU count, 0=all available, default=1\n" - "\n" - " -m, --mode 0: Packet Drop mode. Received packets will be dropped\n" - " !0: Packet ICMP mode. Received packets will be sent back\n" - " default: Packet Drop mode\n" - "\n" - " -t, --timeout !0: Time for which the classifier will be run in seconds\n" - " 0: Runs in infinite loop\n" - " default: Runs in infinite loop\n" - "\n" - " -h, --help Display help and exit.\n" - "\n", NO_PATH(progname), NO_PATH(progname) - ); + "ODP Classifier example.\n" + "Usage: odp_classifier OPTIONS\n" + " E.g. odp_classifier -i eth1 -m 0 -p \"ODP_PMR_SIP_ADDR:10.10.10.0:0xFFFFFF00:queue1\" \\\n" + " -p \"ODP_PMR_SIP_ADDR:10.10.10.10:0xFFFFFFFF:queue1:queue2\"\n" + "\n" + "The above example would classify:\n" + " 1) Packets from source IP address 10.10.10.0/24 to queue1, except ...\n" + " 2) Packets from source IP address 10.10.10.10 to queue2\n" + " 3) All other packets to DefaultCos\n" + "\n" + "Mandatory OPTIONS:\n" + " -i, --interface <interface name>\n" + " -p, --policy <PMR term>:<offset>:<value>:<mask>:<src queue>:<dst queue>\n" + "\n" + " <PMR term> PMR term name defined in odp_cls_pmr_term_t\n" + " <offset> If term is ODP_PMR_CUSTOM_FRAME or _CUSTOM_L3, offset in bytes is used\n" + " <value> PMR value to be matched\n" + " <mask> PMR mask bits to be applied on the PMR value.\n" + " CUSTOM PMR terms accept plain hex string, other PMR terms require\n" + " hex string with '0x' prefix.\n" + " <src queue> Optional name of the source queue (CoS). The default CoS is used when\n" + " this is not defined.\n" + " <dst queue> Name of the destination queue (CoS).\n" + "\n" + "Optional OPTIONS\n" + " -c, --count <num> CPU count, 0=all available, default=1\n" + "\n" + " -m, --mode <mode> 0: Packet Drop mode. Received packets will be dropped\n" + " !0: Packet ICMP mode. Received packets will be sent back\n" + " default: Packet Drop mode\n" + "\n" + " -t, --timeout <sec> !0: Time for which the classifier will be run in seconds\n" + " 0: Runs in infinite loop\n" + " default: Runs in infinite loop\n" + "\n" + " -h, --help Display help and exit.\n" + "\n"); } commit 2376fa5b4b5f5b7b9d2c11cb08438f11883bfe50 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Mon Oct 28 11:04:59 2019 +0200 example: cls: add ODP_PMR_CUSTOM_L3 support Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> diff --git a/example/classifier/odp_classifier.c b/example/classifier/odp_classifier.c index 47c689f6e..ecfa732a9 100644 --- a/example/classifier/odp_classifier.c +++ b/example/classifier/odp_classifier.c @@ -764,6 +764,9 @@ static int convert_str_to_pmr_enum(char *token, odp_cls_pmr_term_t *term) } else if (strcasecmp(token, "ODP_PMR_CUSTOM_FRAME") == 0) { *term = ODP_PMR_CUSTOM_FRAME; return 0; + } else if (strcasecmp(token, "ODP_PMR_CUSTOM_L3") == 0) { + *term = ODP_PMR_CUSTOM_L3; + return 0; } return -1; @@ -856,6 +859,8 @@ static int parse_pmr_policy(appl_args_t *appl_args, char *argv[], char *optarg) stats[policy_count].rule.val_sz = 4; break; case ODP_PMR_CUSTOM_FRAME: + /* Fall through */ + case ODP_PMR_CUSTOM_L3: /* :<offset>:<value>:<mask> */ token = strtok(NULL, ":"); errno = 0; commit 55ea0298a7cf917b466d2154d79d00fd86f3c936 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Mon Oct 28 10:20:43 2019 +0200 linux-gen: cls: add ODP_PMR_CUSTOM_L3 support Added support for ODP_PMR_CUSTOM_L3 PMR term. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> diff --git a/platform/linux-generic/odp_classification.c b/platform/linux-generic/odp_classification.c index 60171cc5e..1b5337ff6 100644 --- a/platform/linux-generic/odp_classification.c +++ b/platform/linux-generic/odp_classification.c @@ -174,6 +174,7 @@ int odp_cls_capability(odp_cls_capability_t *capability) capability->supported_terms.bit.sip6_addr = 1; capability->supported_terms.bit.dip6_addr = 1; capability->supported_terms.bit.custom_frame = 1; + capability->supported_terms.bit.custom_l3 = 1; capability->random_early_detection = ODP_SUPPORT_NO; capability->back_pressure = ODP_SUPPORT_NO; capability->threshold_red.all_bits = 0; @@ -631,6 +632,8 @@ static int pmr_create_term(pmr_term_value_t *value, break; case ODP_PMR_CUSTOM_FRAME: + /* Fall through */ + case ODP_PMR_CUSTOM_L3: custom = 1; size = MAX_PMR_TERM_SIZE; break; @@ -1050,7 +1053,8 @@ static inline int verify_pmr_custom_frame(const uint8_t *pkt_addr, odp_packet_hdr_t *pkt_hdr, pmr_term_value_t *term_value) { - uint64_t val = 0; + uint32_t i; + uint8_t val; uint32_t offset = term_value->offset; uint32_t val_sz = term_value->val_sz; @@ -1059,11 +1063,46 @@ static inline int verify_pmr_custom_frame(const uint8_t *pkt_addr, if (packet_len(pkt_hdr) <= offset + val_sz) return 0; - memcpy(&val, pkt_addr + offset, val_sz); - if (term_value->match.value == (val & term_value->match.mask)) - return 1; + pkt_addr += offset; - return 0; + for (i = 0; i < val_sz; i++) { + val = pkt_addr[i] & term_value->match.mask_u8[i]; + + if (val != term_value->match.value_u8[i]) + return 0; + } + + return 1; +} + +static inline int verify_pmr_custom_l3(const uint8_t *pkt_addr, + odp_packet_hdr_t *pkt_hdr, + pmr_term_value_t *term_value) +{ + uint32_t i; + uint8_t val; + uint32_t l3_offset = pkt_hdr->p.l3_offset; + uint32_t offset = l3_offset + term_value->offset; + uint32_t val_sz = term_value->val_sz; + + ODP_ASSERT(val_sz <= MAX_PMR_TERM_SIZE); + + if (!pkt_hdr->p.input_flags.l3) + return 0; + + if (packet_len(pkt_hdr) <= offset + val_sz) + return 0; + + pkt_addr += offset; + + for (i = 0; i < val_sz; i++) { + val = pkt_addr[i] & term_value->match.mask_u8[i]; + + if (val != term_value->match.value_u8[i]) + return 0; + } + + return 1; } static inline int verify_pmr_eth_type_0(const uint8_t *pkt_addr, @@ -1222,6 +1261,11 @@ static int verify_pmr(pmr_t *pmr, const uint8_t *pkt_addr, term_value)) pmr_failure = 1; break; + case ODP_PMR_CUSTOM_L3: + if (!verify_pmr_custom_l3(pkt_addr, pkt_hdr, + term_value)) + pmr_failure = 1; + break; case ODP_PMR_INNER_HDR_OFF: break; default: commit d688a269562ff9efc2ff03411c385a2bd1228d2c Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Mon Oct 14 14:13:33 2019 +0300 linux-gen: cls: add custom frame PMR capability Mark custom frame as a supported PMR. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> diff --git a/platform/linux-generic/odp_classification.c b/platform/linux-generic/odp_classification.c index 164daf3fc..60171cc5e 100644 --- a/platform/linux-generic/odp_classification.c +++ b/platform/linux-generic/odp_classification.c @@ -173,6 +173,7 @@ int odp_cls_capability(odp_cls_capability_t *capability) capability->supported_terms.bit.dip_addr = 1; capability->supported_terms.bit.sip6_addr = 1; capability->supported_terms.bit.dip6_addr = 1; + capability->supported_terms.bit.custom_frame = 1; capability->random_early_detection = ODP_SUPPORT_NO; capability->back_pressure = ODP_SUPPORT_NO; capability->threshold_red.all_bits = 0; commit 13b478eaa76ee8461341b114d447835e3906748d Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Mon Oct 14 14:12:42 2019 +0300 validation: cls: add custom PMR test cases Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> diff --git a/test/validation/api/classification/odp_classification_test_pmr.c b/test/validation/api/classification/odp_classification_test_pmr.c index 46bbdf4b1..d4a3110e3 100644 --- a/test/validation/api/classification/odp_classification_test_pmr.c +++ b/test/validation/api/classification/odp_classification_test_pmr.c @@ -2037,6 +2037,147 @@ static void classification_test_pmr_term_tcp_dport_multi(void) _classification_test_pmr_term_tcp_dport(SHM_PKT_NUM_BUFS / 4); } +static void test_pmr_term_custom(int custom_l3) +{ + odp_packet_t pkt; + uint32_t seqno; + int retval; + odp_pktio_t pktio; + odp_queue_t queue; + odp_queue_t retqueue; + odp_queue_t default_queue; + odp_pool_t pool; + odp_pool_t default_pool; + odp_pmr_t pmr; + odp_cos_t cos; + odp_cos_t default_cos; + uint32_t dst_addr, src_addr; + uint32_t addr_be, mask_be; + uint32_t dst_mask, src_mask; + char cosname[ODP_QUEUE_NAME_LEN]; + odp_pmr_param_t pmr_param; + odp_cls_cos_param_t cls_param; + odph_ipv4hdr_t *ip; + odph_ethhdr_t *eth; + const char *pmr_src_str = "10.0.8.0/24"; + const char *pmr_dst_str = "10.0.9.0/24"; + const char *pkt_src_str = "10.0.8.88/32"; + const char *pkt_dst_str = "10.0.9.99/32"; + + pktio = create_pktio(ODP_QUEUE_TYPE_SCHED, pkt_pool, true); + retval = start_pktio(pktio); + CU_ASSERT(retval == 0); + + configure_default_cos(pktio, &default_cos, + &default_queue, &default_pool); + + queue = queue_create("ipv4 addr", true); + CU_ASSERT_FATAL(queue != ODP_QUEUE_INVALID); + + pool = pool_create("ipv4 addr"); + CU_ASSERT_FATAL(pool != ODP_POOL_INVALID); + + sprintf(cosname, "ipv4 addr"); + odp_cls_cos_param_init(&cls_param); + cls_param.pool = pool; + cls_param.queue = queue; + cls_param.drop_policy = ODP_COS_DROP_POOL; + + cos = odp_cls_cos_create(cosname, &cls_param); + CU_ASSERT_FATAL(cos != ODP_COS_INVALID); + + /* Match values for custom PRM rules are passed in network endian */ + parse_ipv4_string(pmr_src_str, &src_addr, &src_mask); + parse_ipv4_string(pmr_dst_str, &dst_addr, &dst_mask); + + odp_cls_pmr_param_init(&pmr_param); + + if (custom_l3) { + addr_be = odp_cpu_to_be_32(dst_addr); + mask_be = odp_cpu_to_be_32(dst_mask); + pmr_param.term = ODP_PMR_CUSTOM_L3; + pmr_param.match.value = &addr_be; + pmr_param.match.mask = &mask_be; + pmr_param.val_sz = sizeof(addr_be); + /* Offset from start of L3 to IPv4 dst address */ + pmr_param.offset = 16; + } else { + addr_be = odp_cpu_to_be_32(src_addr); + mask_be = odp_cpu_to_be_32(src_mask); + pmr_param.term = ODP_PMR_CUSTOM_FRAME; + pmr_param.match.value = &addr_be; + pmr_param.match.mask = &mask_be; + pmr_param.val_sz = sizeof(addr_be); + /* Offset from start of ethernet/IPv4 frame to IPv4 + * src address */ + pmr_param.offset = 26; + } + + pmr = odp_cls_pmr_create(&pmr_param, 1, default_cos, cos); + CU_ASSERT_FATAL(pmr != ODP_PMR_INVALID); + + /* IPv4 packet with matching addresses */ + parse_ipv4_string(pkt_src_str, &src_addr, NULL); + parse_ipv4_string(pkt_dst_str, &dst_addr, NULL); + pkt = create_packet(default_pkt_info); + CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID); + eth = (odph_ethhdr_t *)odp_packet_l2_ptr(pkt, NULL); + odp_pktio_mac_addr(pktio, eth->src.addr, ODPH_ETHADDR_LEN); + odp_pktio_mac_addr(pktio, eth->dst.addr, ODPH_ETHADDR_LEN); + ip = (odph_ipv4hdr_t *)odp_packet_l3_ptr(pkt, NULL); + ip->src_addr = odp_cpu_to_be_32(src_addr); + ip->dst_addr = odp_cpu_to_be_32(dst_addr); + odph_ipv4_csum_update(pkt); + + seqno = cls_pkt_get_seq(pkt); + CU_ASSERT(seqno != TEST_SEQ_INVALID); + + enqueue_pktio_interface(pkt, pktio); + + pkt = receive_packet(&retqueue, ODP_TIME_SEC_IN_NS); + CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID); + CU_ASSERT(seqno == cls_pkt_get_seq(pkt)); + CU_ASSERT(retqueue == queue); + odp_packet_free(pkt); + + /* Other packets delivered to default queue */ + pkt = create_packet(default_pkt_info); + CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID); + seqno = cls_pkt_get_seq(pkt); + CU_ASSERT(seqno != TEST_SEQ_INVALID); + eth = (odph_ethhdr_t *)odp_packet_l2_ptr(pkt, NULL); + odp_pktio_mac_addr(pktio, eth->src.addr, ODPH_ETHADDR_LEN); + odp_pktio_mac_addr(pktio, eth->dst.addr, ODPH_ETHADDR_LEN); + + enqueue_pktio_interface(pkt, pktio); + + pkt = receive_packet(&retqueue, ODP_TIME_SEC_IN_NS); + CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID); + CU_ASSERT(seqno == cls_pkt_get_seq(pkt)); + CU_ASSERT(retqueue == default_queue); + + odp_cos_destroy(cos); + odp_cos_destroy(default_cos); + odp_cls_pmr_destroy(pmr); + odp_packet_free(pkt); + stop_pktio(pktio); + odp_pool_destroy(default_pool); + odp_pool_destroy(pool); + odp_queue_destroy(queue); + odp_queue_destroy(default_queue); + odp_pktio_close(pktio); +} + +static void classification_test_pmr_term_custom_frame(void) +{ + test_pmr_term_custom(0); +} + +static void classification_test_pmr_term_custom_l3(void) +{ + test_pmr_term_custom(1); +} + static int check_capa_tcp_dport(void) { return cls_capa.supported_terms.bit.tcp_dport; @@ -2112,6 +2253,16 @@ static int check_capa_ethtype_x(void) return cls_capa.supported_terms.bit.ethtype_x; } +static int check_capa_custom_frame(void) +{ + return cls_capa.supported_terms.bit.custom_frame; +} + +static int check_capa_custom_l3(void) +{ + return cls_capa.supported_terms.bit.custom_l3; +} + odp_testinfo_t classification_suite_pmr[] = { ODP_TEST_INFO_CONDITIONAL(classification_test_pmr_term_tcp_dport, check_capa_tcp_dport), @@ -2145,6 +2296,10 @@ odp_testinfo_t classification_suite_pmr[] = { check_capa_ethtype_0), ODP_TEST_INFO_CONDITIONAL(classification_test_pmr_term_eth_type_x, check_capa_ethtype_x), + ODP_TEST_INFO_CONDITIONAL(classification_test_pmr_term_custom_frame, + check_capa_custom_frame), + ODP_TEST_INFO_CONDITIONAL(classification_test_pmr_term_custom_l3, + check_capa_custom_l3), ODP_TEST_INFO(classification_test_pktin_classifier_flag), ODP_TEST_INFO(classification_test_pmr_term_tcp_dport_multi), ODP_TEST_INFO_NULL, commit 4c4145f8c9c73665c9f834f8ca639b9f0525e30f Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Fri Oct 25 15:07:25 2019 +0300 api: cls: add ODP_PMR_CUSTOM_L3 term Added new term to match custom layer 3 protocol fields. PMR offset refers to the start of layer 3 in the packet. Other PMR rules (e.g. L2 classification rules) may precede custom L3 rules. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> diff --git a/include/odp/api/spec/classification.h b/include/odp/api/spec/classification.h index 67fdd20aa..eadcaa2d8 100644 --- a/include/odp/api/spec/classification.h +++ b/include/odp/api/spec/classification.h @@ -97,11 +97,12 @@ typedef union odp_cls_pmr_terms_t { uint64_t ipsec_spi:1; /** NVGRE/VXLAN network identifier */ uint64_t ld_vni:1; - /** Custom match rule, offset from start of - * frame. The match is defined by the offset, the - * expected value, and its size. - */ - uint64_t custom_frame:1; + /** Custom frame match rule. PMR offset is counted from + * the start of the packet. */ + uint64_t custom_frame:1; + /** Custom layer 3 match rule. PMR offset is counted from + * the start of layer 3 in the packet. */ + uint64_t custom_l3:1; } bit; /** All bits of the bit field structure */ @@ -535,6 +536,15 @@ typedef enum { */ ODP_PMR_CUSTOM_FRAME, + /** + * Custom layer 3 match rule + * + * PMR offset is counted from the start of layer 3 in the packet. + * The match is defined by the offset, the expected value, and its size. + * Custom L3 rules may be combined with other PMRs. + */ + ODP_PMR_CUSTOM_L3, + /** Inner header may repeat above values with this offset */ ODP_PMR_INNER_HDR_OFF = 32 @@ -578,11 +588,18 @@ typedef struct odp_pmr_param_t { const void *val_end; } range; }; - uint32_t val_sz; /**< Size of the term value */ - uint32_t offset; /**< User-defined offset in packet - Used if term == ODP_PMR_CUSTOM_FRAME only, - ignored otherwise */ + /** Size of the value to be matched */ + uint32_t val_sz; + + /** Offset to the value + * + * Byte offset to the value to be matched in a packet. PMR term defines + * starting point for the offset. Used only with custom PMR terms, + * ignored with other terms. + */ + uint32_t offset; + } odp_pmr_param_t; /** commit 4c58ce0cd530c59907164f2fa7ae78800c494151 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Fri Oct 25 14:36:08 2019 +0300 example: cls: change PMR values and masks to big endian Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> diff --git a/example/classifier/odp_classifier.c b/example/classifier/odp_classifier.c index 691fec297..47c689f6e 100644 --- a/example/classifier/odp_classifier.c +++ b/example/classifier/odp_classifier.c @@ -44,6 +44,9 @@ */ #define DISPLAY_STRING_LEN 32 +/** Maximum PMR value size */ +#define MAX_VAL_SIZE 16 + /** Get rid of path in filename - only for unix-type paths using '/' */ #define NO_PATH(file_name) (strrchr((file_name), '/') ? \ strrchr((file_name), '/') + 1 : (file_name)) @@ -59,8 +62,8 @@ typedef struct { char src_cos_name[ODP_COS_NAME_LEN]; /**< source cos name */ struct { odp_cls_pmr_term_t term; /**< odp pmr term value */ - uint64_t val; /**< pmr term value */ - uint64_t mask; /**< pmr term mask */ + uint8_t value_be[MAX_VAL_SIZE]; /**< value in big endian */ + uint8_t mask_be[MAX_VAL_SIZE]; /**< mask in big endian */ uint32_t val_sz; /**< size of the pmr term */ uint32_t offset; /**< pmr term offset */ } rule; @@ -166,39 +169,20 @@ static inline void print_cls_statistics(appl_args_t *args) printf("\n"); } -static inline int parse_mask(const char *str, uint64_t *mask) -{ - uint64_t b; - int ret; - - ret = sscanf(str, "%" SCNx64, &b); - *mask = b; - return ret != 1; -} - -static int parse_value(const char *str, uint64_t *val, uint32_t *val_sz) +static int parse_custom(const char *str, uint8_t *buf_be, int max_size) { - size_t len; - size_t i; - int converted; - union { - uint64_t u64; - uint8_t u8[8]; - } buf = {.u64 = 0}; + int i, len; + /* hex string without 0x prefix */ len = strlen(str); - if (len > 2 * sizeof(buf)) + if (len > 2 * max_size) return -1; - for (i = 0; i < len; i += 2) { - converted = sscanf(&str[i], "%2" SCNx8, &buf.u8[i / 2]); - if (1 != converted) + for (i = 0; i < len; i += 2) + if (sscanf(&str[i], "%2" SCNx8, &buf_be[i / 2]) != 1) return -1; - } - *val = buf.u64; - *val_sz = len / 2; - return 0; + return len / 2; } /** @@ -494,8 +478,8 @@ static void configure_cos(odp_cos_t default_cos, appl_args_t *args) odp_cls_pmr_param_init(&pmr_param); pmr_param.term = stats->rule.term; - pmr_param.match.value = &stats->rule.val; - pmr_param.match.mask = &stats->rule.mask; + pmr_param.match.value = stats->rule.value_be; + pmr_param.match.mask = stats->rule.mask_be; pmr_param.val_sz = stats->rule.val_sz; pmr_param.offset = stats->rule.offset; @@ -793,9 +777,10 @@ static int parse_pmr_policy(appl_args_t *appl_args, char *argv[], char *optarg) odp_cls_pmr_term_t term; global_statistics *stats; char *pmr_str; - uint32_t offset; - uint32_t ip_addr; - unsigned long int value; + uint32_t offset, ip_addr, u32; + unsigned long int value, mask; + uint16_t u16; + int val_sz, mask_sz; policy_count = appl_args->policy_count; stats = appl_args->stats; @@ -832,12 +817,18 @@ static int parse_pmr_policy(appl_args_t *appl_args, char *argv[], char *optarg) strncpy(stats[policy_count].value, token, DISPLAY_STRING_LEN - 1); value = strtoul(token, NULL, 0); - stats[policy_count].rule.val = value; + u16 = value; + u16 = odp_cpu_to_be_16(u16); + memcpy(stats[policy_count].rule.value_be, &u16, sizeof(u16)); token = strtok(NULL, ":"); strncpy(stats[policy_count].mask, token, DISPLAY_STRING_LEN - 1); - parse_mask(token, &stats[policy_count].rule.mask); + mask = strtoul(token, NULL, 0); + u16 = mask; + u16 = odp_cpu_to_be_16(u16); + memcpy(stats[policy_count].rule.mask_be, &u16, sizeof(u16)); + stats[policy_count].rule.val_sz = 2; break; case ODP_PMR_SIP_ADDR: @@ -851,12 +842,17 @@ static int parse_pmr_policy(appl_args_t *appl_args, char *argv[], char *optarg) exit(EXIT_FAILURE); } - stats[policy_count].rule.val = ip_addr; + u32 = odp_cpu_to_be_32(ip_addr); + memcpy(stats[policy_count].rule.value_be, &u32, sizeof(u32)); token = strtok(NULL, ":"); strncpy(stats[policy_count].mask, token, DISPLAY_STRING_LEN - 1); - parse_mask(token, &stats[policy_count].rule.mask); + mask = strtoul(token, NULL, 0); + u32 = mask; + u32 = odp_cpu_to_be_32(u32); + memcpy(stats[policy_count].rule.mask_be, &u32, sizeof(u32)); + stats[policy_count].rule.val_sz = 4; break; case ODP_PMR_CUSTOM_FRAME: @@ -864,19 +860,28 @@ static int parse_pmr_policy(appl_args_t *appl_args, char *argv[], char *optarg) token = strtok(NULL, ":"); errno = 0; offset = strtoul(token, NULL, 0); + stats[policy_count].rule.offset = offset; if (errno) return -1; token = strtok(NULL, ":"); strncpy(stats[policy_count].value, token, DISPLAY_STRING_LEN - 1); - parse_value(token, &stats[policy_count].rule.val, - &stats[policy_count].rule.val_sz); + val_sz = parse_custom(token, + stats[policy_count].rule.value_be, + MAX_VAL_SIZE); + stats[policy_count].rule.val_sz = val_sz; + if (val_sz <= 0) + return -1; + token = strtok(NULL, ":"); strncpy(stats[policy_count].mask, token, DISPLAY_STRING_LEN - 1); - parse_mask(token, &stats[policy_count].rule.mask); - stats[policy_count].rule.offset = offset; + mask_sz = parse_custom(token, + stats[policy_count].rule.mask_be, + MAX_VAL_SIZE); + if (mask_sz != val_sz) + return -1; break; default: usage(argv[0]); commit 65891255eec4884e941aece9808ad684155feac8 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Fri Oct 25 11:08:03 2019 +0300 linux-gen: cls: clean up IPv6 match implementation Use the same range data structure for all terms (removed IPv6 specific fields). Range terms are not currently supported. Return failure on PMR create if range is used. Removed other range related code as has not been tested and is not needed currently. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> diff --git a/platform/linux-generic/include/odp_classification_datamodel.h b/platform/linux-generic/include/odp_classification_datamodel.h index 1032a1c0b..9ebb2a509 100644 --- a/platform/linux-generic/include/odp_classification_datamodel.h +++ b/platform/linux-generic/include/odp_classification_datamodel.h @@ -42,8 +42,8 @@ extern "C" { #define CLS_COS_L3_QOS_BITS 6 /* Max L3 QoS Value */ #define CLS_COS_MAX_L3_QOS (1 << CLS_COS_L3_QOS_BITS) -/* Max PMR Term bits */ -#define CLS_PMR_TERM_BYTES_MAX 16 +/* Max PMR Term size */ +#define MAX_PMR_TERM_SIZE 16 /* Max queue per Class of service */ #define CLS_COS_QUEUE_MAX 32 /* Max number of implementation created queues */ @@ -61,39 +61,62 @@ typedef union { }; } odp_cls_hash_proto_t; -/** -Packet Matching Rule Term Value - -Stores the Term and Value mapping for a PMR. -The maximum size of value currently supported in 64 bits -**/ +/* + * Term and value mapping for a PMR + */ typedef struct pmr_term_value { - odp_cls_pmr_term_t term; /* PMR Term */ - odp_bool_t range_term; /* True if range, false if match */ + /* PMR Term */ + odp_cls_pmr_term_t term; + + /* True if range, false if match */ + odp_bool_t range_term; + union { + /* Match value and mask */ struct { - /** Value to be matched */ - uint64_t value; - /** Masked set of bits to be matched */ - uint64_t mask; + /* Value to be matched. Arrays are used with custom and + * IPv6 address terms. */ + union { + uint64_t value; + uint8_t value_u8[MAX_PMR_TERM_SIZE]; + uint64_t value_u64[2]; + }; + + /* Mask for the data to be matched */ + union { + uint64_t mask; + uint8_t mask_u8[MAX_PMR_TERM_SIZE]; + uint64_t mask_u64[2]; + }; + } match; + + /* Range values */ struct { - /** Start value of the range */ - uint64_t val_start; - /** End value of the range */ - uint64_t val_end; + /* Start value of the range */ + union { + uint64_t start; + uint8_t start_u8[MAX_PMR_TERM_SIZE]; + uint64_t start_u64[2]; + }; + + /* End value of the range */ + union { + uint64_t end; + uint8_t end_u8[MAX_PMR_TERM_SIZE]; + uint64_t end_u64[2]; + }; + } range; - struct { - _odp_ipv6_addr_t addr; - _odp_ipv6_addr_t mask; - } match_ipv6; - struct { - _odp_ipv6_addr_t addr_start; - _odp_ipv6_addr_t addr_end; - } range_ipv6; + }; - uint32_t offset; /**< Offset if term == ODP_PMR_CUSTOM_FRAME */ - uint32_t val_sz; /**< Size of the value to be matched */ + + /* Offset used with custom PMR */ + uint32_t offset; + + /* Size of the value to be matched */ + uint32_t val_sz; + } pmr_term_value_t; /* diff --git a/platform/linux-generic/odp_classification.c b/platform/linux-generic/odp_classification.c index e85e8d00c..164daf3fc 100644 --- a/platform/linux-generic/odp_classification.c +++ b/platform/linux-generic/odp_classification.c @@ -576,6 +576,11 @@ static int pmr_create_term(pmr_term_value_t *value, int custom = 0; odp_cls_pmr_term_t term = param->term; + if (param->range_term) { + ODP_ERR("PRM value range not supported\n"); + return -1; + } + value->term = term; value->range_term = param->range_term; @@ -626,7 +631,7 @@ static int pmr_create_term(pmr_term_value_t *value, case ODP_PMR_CUSTOM_FRAME: custom = 1; - size = CLS_PMR_TERM_BYTES_MAX; + size = MAX_PMR_TERM_SIZE; break; default: @@ -640,45 +645,14 @@ static int pmr_create_term(pmr_term_value_t *value, return -1; } - switch (value->term) { - case ODP_PMR_SIP6_ADDR: - case ODP_PMR_DIP6_ADDR: - if (!value->range_term) { - memset(value->match_ipv6.addr.u8, 0, 16); - memset(value->match_ipv6.mask.u8, 0, 16); - memcpy(&value->match_ipv6.addr.u8, param->match.value, - param->val_sz); - memcpy(&value->match_ipv6.mask.u8, param->match.mask, - param->val_sz); - for (i = 0; i < 2; i++) - value->match_ipv6.addr.u64[i] &= - value->match_ipv6.mask.u64[i]; - } else { - memset(value->range_ipv6.addr_start.u8, 0, 16); - memset(value->range_ipv6.addr_end.u8, 0, 16); - memcpy(&value->range_ipv6.addr_start.u8, param->range.val_start, - param->val_sz); - memcpy(&value->range_ipv6.addr_end.u8, param->range.val_end, - param->val_sz); - } + memset(&value->match.value, 0, MAX_PMR_TERM_SIZE); + memset(&value->match.mask, 0, MAX_PMR_TERM_SIZE); + memcpy(&value->match.value, param->match.value, param->val_sz); + memcpy(&value->match.mask, param->match.mask, param->val_sz); + + for (i = 0; i < param->val_sz; i++) + value->match.value_u8[i] &= value->match.mask_u8[i]; - break; - default: - if (!value->range_term) { - value->match.value = 0; - value->match.mask = 0; - memcpy(&value->match.value, param->match.value, param->val_sz); - memcpy(&value->match.mask, param->match.mask, param->val_sz); - value->match.value &= value->match.mask; - } else { - value->range.val_start = 0; - value->range.val_end = 0; - memcpy(&value->range.val_start, param->range.val_start, - param->val_sz); - memcpy(&value->range.val_end, param->range.val_end, - param->val_sz); - } - } value->offset = param->offset; value->val_sz = param->val_sz; return 0; @@ -952,16 +926,13 @@ static inline int verify_pmr_ipv6_saddr(const uint8_t *pkt_addr, return 0; ipv6 = (const _odp_ipv6hdr_t *)(pkt_addr + pkt_hdr->p.l3_offset); + memcpy(addr, ipv6->src_addr.u64, _ODP_IPV6ADDR_LEN); - addr[0] = ipv6->src_addr.u64[0]; - addr[1] = ipv6->src_addr.u64[1]; - - /* 128 bit address is processed as two 64 bit value - * for bitwise AND operation */ - addr[0] = addr[0] & term_value->match_ipv6.mask.u64[0]; - addr[1] = addr[1] & term_value->match_ipv6.mask.u64[1]; + addr[0] = addr[0] & term_value->match.mask_u64[0]; + addr[1] = addr[1] & term_value->match.mask_u64[1]; - if (!memcmp(addr, term_value->match_ipv6.addr.u8, _ODP_IPV6ADDR_LEN)) + if (addr[0] == term_value->match.value_u64[0] && + addr[1] == term_value->match.value_u64[1]) return 1; return 0; @@ -976,16 +947,15 @@ static inline int verify_pmr_ipv6_daddr(const uint8_t *pkt_addr, if (!packet_hdr_has_ipv6(pkt_hdr)) return 0; + ipv6 = (const _odp_ipv6hdr_t *)(pkt_addr + pkt_hdr->p.l3_offset); - addr[0] = ipv6->dst_addr.u64[0]; - addr[1] = ipv6->dst_addr.u64[1]; + memcpy(addr, ipv6->dst_addr.u64, _ODP_IPV6ADDR_LEN); - /* 128 bit address is processed as two 64 bit value - * for bitwise AND operation */ - addr[0] = addr[0] & term_value->match_ipv6.mask.u64[0]; - addr[1] = addr[1] & term_value->match_ipv6.mask.u64[1]; + addr[0] = addr[0] & term_value->match.mask_u64[0]; + addr[1] = addr[1] & term_value->match.mask_u64[1]; - if (!memcmp(addr, term_value->match_ipv6.addr.u8, _ODP_IPV6ADDR_LEN)) + if (addr[0] == term_value->match.value_u64[0] && + addr[1] == term_value->match.value_u64[1]) return 1; return 0; @@ -1083,7 +1053,7 @@ static inline int verify_pmr_custom_frame(const uint8_t *pkt_addr, uint32_t offset = term_value->offset; uint32_t val_sz = term_value->val_sz; - ODP_ASSERT(val_sz <= CLS_PMR_TERM_BYTES_MAX); + ODP_ASSERT(val_sz <= MAX_PMR_TERM_SIZE); if (packet_len(pkt_hdr) <= offset + val_sz) return 0; commit d4eb0481e1dd40a0d0b70486cdf8f9b676862b2f Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Thu Oct 24 16:16:12 2019 +0300 linux-gen: cls: change ODP_PMR_ IPv4 addresses to big endian Change ODP_PMR_SIP_ADDR and ODP_PMR_DIP_ADDR to big endian. Both are changed simultaneously as some tests use both terms. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> diff --git a/platform/linux-generic/odp_classification.c b/platform/linux-generic/odp_classification.c index ae90ee82a..e85e8d00c 100644 --- a/platform/linux-generic/odp_classification.c +++ b/platform/linux-generic/odp_classification.c @@ -825,7 +825,7 @@ static inline int verify_pmr_ipv4_saddr(const uint8_t *pkt_addr, if (!pkt_hdr->p.input_flags.ipv4) return 0; ip = (const _odp_ipv4hdr_t *)(pkt_addr + pkt_hdr->p.l3_offset); - ipaddr = odp_be_to_cpu_32(ip->src_addr); + ipaddr = ip->src_addr; if (term_value->match.value == (ipaddr & term_value->match.mask)) return 1; @@ -842,7 +842,7 @@ static inline int verify_pmr_ipv4_daddr(const uint8_t *pkt_addr, if (!pkt_hdr->p.input_flags.ipv4) return 0; ip = (const _odp_ipv4hdr_t *)(pkt_addr + pkt_hdr->p.l3_offset); - ipaddr = odp_be_to_cpu_32(ip->dst_addr); + ipaddr = ip->dst_addr; if (term_value->match.value == (ipaddr & term_value->match.mask)) return 1; diff --git a/test/validation/api/classification/odp_classification_test_pmr.c b/test/validation/api/classification/odp_classification_test_pmr.c index a939bdbee..46bbdf4b1 100644 --- a/test/validation/api/classification/odp_classification_test_pmr.c +++ b/test/validation/api/classification/odp_classification_test_pmr.c @@ -1722,6 +1722,10 @@ static void test_pmr_term_ipv4_addr(int dst) parse_ipv4_string(src_str, &src_addr, &src_mask); parse_ipv4_string(dst_str, &dst_addr, &dst_mask); + src_addr = odp_cpu_to_be_32(src_addr); + src_mask = odp_cpu_to_be_32(src_mask); + dst_addr = odp_cpu_to_be_32(dst_addr); + dst_mask = odp_cpu_to_be_32(dst_mask); odp_cls_pmr_param_init(&pmr_param); @@ -1748,8 +1752,8 @@ static void test_pmr_term_ipv4_addr(int dst) odp_pktio_mac_addr(pktio, eth->src.addr, ODPH_ETHADDR_LEN); odp_pktio_mac_addr(pktio, eth->dst.addr, ODPH_ETHADDR_LEN); ip = (odph_ipv4hdr_t *)odp_packet_l3_ptr(pkt, NULL); - ip->src_addr = odp_cpu_to_be_32(src_addr); - ip->dst_addr = odp_cpu_to_be_32(dst_addr); + ip->src_addr = src_addr; + ip->dst_addr = dst_addr; odph_ipv4_csum_update(pkt); seqno = cls_pkt_get_seq(pkt); diff --git a/test/validation/api/classification/odp_classification_tests.c b/test/validation/api/classification/odp_classification_tests.c index 3a97023cf..b86bfe272 100644 --- a/test/validation/api/classification/odp_classification_tests.c +++ b/test/validation/api/classification/odp_classification_tests.c @@ -213,6 +213,9 @@ void configure_cls_pmr_chain(void) CU_ASSERT_FATAL(cos_list[CLS_PMR_CHAIN_DST] != ODP_COS_INVALID); parse_ipv4_string(CLS_PMR_CHAIN_SADDR, &addr, &mask); + addr = odp_cpu_to_be_32(addr); + mask = odp_cpu_to_be_32(mask); + odp_cls_pmr_param_init(&pmr_param); pmr_param.term = ODP_PMR_SIP_ADDR; pmr_param.match.value = &addr; @@ -649,6 +652,9 @@ void configure_pktio_pmr_composite(void) CU_ASSERT_FATAL(cos_list[CLS_PMR_SET] != ODP_COS_INVALID); parse_ipv4_string(CLS_PMR_SET_SADDR, &addr, &mask); + addr = odp_cpu_to_be_32(addr); + mask = odp_cpu_to_be_32(mask); + odp_cls_pmr_param_init(&pmr_params[0]); pmr_params[0].term = ODP_PMR_SIP_ADDR; pmr_params[0].match.value = &addr; commit f15da1c0ee13dd0e342944dccdd9014c16d4d5be Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Thu Oct 24 15:22:38 2019 +0300 linux-gen: cls: change ODP_PMR_UDP/TCP ports to big endian Change ODP_PMR_UDP_DPORT, ODP_PMR_TCP_DPORT, ODP_PMR_UDP_SPORT and ODP_PMR_TCP_SPORT terms to big endian. All four needs to be changed simultaneously in order not to break some validation tests. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> diff --git a/platform/linux-generic/odp_classification.c b/platform/linux-generic/odp_classification.c index 9ad3380e5..ae90ee82a 100644 --- a/platform/linux-generic/odp_classification.c +++ b/platform/linux-generic/odp_classification.c @@ -859,7 +859,7 @@ static inline int verify_pmr_tcp_sport(const uint8_t *pkt_addr, if (!pkt_hdr->p.input_flags.tcp) return 0; tcp = (const _odp_tcphdr_t *)(pkt_addr + pkt_hdr->p.l4_offset); - sport = odp_be_to_cpu_16(tcp->src_port); + sport = tcp->src_port; if (term_value->match.value == (sport & term_value->match.mask)) return 1; @@ -876,7 +876,7 @@ static inline int verify_pmr_tcp_dport(const uint8_t *pkt_addr, if (!pkt_hdr->p.input_flags.tcp) return 0; tcp = (const _odp_tcphdr_t *)(pkt_addr + pkt_hdr->p.l4_offset); - dport = odp_be_to_cpu_16(tcp->dst_port); + dport = tcp->dst_port; if (term_value->match.value == (dport & term_value->match.mask)) return 1; @@ -893,7 +893,7 @@ static inline int verify_pmr_udp_dport(const uint8_t *pkt_addr, if (!pkt_hdr->p.input_flags.udp) return 0; udp = (const _odp_udphdr_t *)(pkt_addr + pkt_hdr->p.l4_offset); - dport = odp_be_to_cpu_16(udp->dst_port); + dport = udp->dst_port; if (term_value->match.value == (dport & term_value->match.mask)) return 1; @@ -910,7 +910,7 @@ static inline int verify_pmr_udp_sport(const uint8_t *pkt_addr, if (!pkt_hdr->p.input_flags.udp) return 0; udp = (const _odp_udphdr_t *)(pkt_addr + pkt_hdr->p.l4_offset); - sport = odp_be_to_cpu_16(udp->src_port); + sport = udp->src_port; if (term_value->match.value == (sport & term_value->match.mask)) return 1; diff --git a/test/validation/api/classification/odp_classification_test_pmr.c b/test/validation/api/classification/odp_classification_test_pmr.c index 9ac735020..a939bdbee 100644 --- a/test/validation/api/classification/odp_classification_test_pmr.c +++ b/test/validation/api/classification/odp_classification_test_pmr.c @@ -121,8 +121,8 @@ static void classification_test_pktin_classifier_flag(void) odp_pmr_param_t pmr_param; odph_ethhdr_t *eth; - val = CLS_DEFAULT_DPORT; - mask = 0xffff; + val = odp_cpu_to_be_16(CLS_DEFAULT_DPORT); + mask = odp_cpu_to_be_16(0xffff); seqno = 0; /* classifier is disabled in pktin queue configuration */ @@ -167,7 +167,7 @@ static void classification_test_pktin_classifier_flag(void) odp_pktio_mac_addr(pktio, eth->dst.addr, ODPH_ETHADDR_LEN); tcp = (odph_tcphdr_t *)odp_packet_l4_ptr(pkt, NULL); - tcp->dst_port = odp_cpu_to_be_16(CLS_DEFAULT_DPORT); + tcp->dst_port = val; enqueue_pktio_interface(pkt, pktio); @@ -217,8 +217,8 @@ static void _classification_test_pmr_term_tcp_dport(int num_pkt) odp_pool_t pool_recv; odp_pmr_param_t pmr_param; odph_ethhdr_t *eth; - val = CLS_DEFAULT_DPORT; - mask = 0xffff; + val = odp_cpu_to_be_16(CLS_DEFAULT_DPORT); + mask = odp_cpu_to_be_16(0xffff); pktio = create_pktio(ODP_QUEUE_TYPE_SCHED, pkt_pool, true); CU_ASSERT_FATAL(pktio != ODP_PKTIO_INVALID); @@ -262,7 +262,7 @@ static void _classification_test_pmr_term_tcp_dport(int num_pkt) odp_pktio_mac_addr(pktio, eth->dst.addr, ODPH_ETHADDR_LEN); tcp = (odph_tcphdr_t *)odp_packet_l4_ptr(pkt, NULL); - tcp->dst_port = odp_cpu_to_be_16(CLS_DEFAULT_DPORT); + tcp->dst_port = val; enqueue_pktio_interface(pkt, pktio); } @@ -320,7 +320,7 @@ static void _classification_test_pmr_term_tcp_dport(int num_pkt) if ((i % 5) < 2) { sent_queue++; - tcp->dst_port = odp_cpu_to_be_16(CLS_DEFAULT_DPORT); + tcp->dst_port = val; } else { sent_default++; tcp->dst_port = odp_cpu_to_be_16(CLS_DEFAULT_DPORT + 1); @@ -341,8 +341,7 @@ static void _classification_test_pmr_term_tcp_dport(int num_pkt) if (retqueue == queue) { recv_queue++; - CU_ASSERT(tcp->dst_port == - odp_cpu_to_be_16(CLS_DEFAULT_DPORT)); + CU_ASSERT(tcp->dst_port == val); } else if (retqueue == default_queue) { recv_default++; CU_ASSERT(tcp->dst_port == @@ -388,8 +387,8 @@ static void classification_test_pmr_term_tcp_sport(void) odp_pmr_param_t pmr_param; odph_ethhdr_t *eth; - val = CLS_DEFAULT_SPORT; - mask = 0xffff; + val = odp_cpu_to_be_16(CLS_DEFAULT_SPORT); + mask = odp_cpu_to_be_16(0xffff); seqno = 0; pktio = create_pktio(ODP_QUEUE_TYPE_SCHED, pkt_pool, true); @@ -433,7 +432,7 @@ static void classification_test_pmr_term_tcp_sport(void) odp_pktio_mac_addr(pktio, eth->dst.addr, ODPH_ETHADDR_LEN); tcp = (odph_tcphdr_t *)odp_packet_l4_ptr(pkt, NULL); - tcp->src_port = odp_cpu_to_be_16(CLS_DEFAULT_SPORT); + tcp->src_port = val; enqueue_pktio_interface(pkt, pktio); @@ -501,8 +500,8 @@ static void classification_test_pmr_term_udp_dport(void) odph_ethhdr_t *eth; cls_packet_info_t pkt_info; - val = CLS_DEFAULT_DPORT; - mask = 0xffff; + val = odp_cpu_to_be_16(CLS_DEFAULT_DPORT); + mask = odp_cpu_to_be_16(0xffff); seqno = 0; pktio = create_pktio(ODP_QUEUE_TYPE_SCHED, pkt_pool, true); @@ -548,7 +547,7 @@ static void classification_test_pmr_term_udp_dport(void) odp_pktio_mac_addr(pktio, eth->dst.addr, ODPH_ETHADDR_LEN); udp = (odph_udphdr_t *)odp_packet_l4_ptr(pkt, NULL); - udp->dst_port = odp_cpu_to_be_16(CLS_DEFAULT_DPORT); + udp->dst_port = val; enqueue_pktio_interface(pkt, pktio); @@ -617,8 +616,8 @@ static void classification_test_pmr_term_udp_sport(void) odph_ethhdr_t *eth; cls_packet_info_t pkt_info; - val = CLS_DEFAULT_SPORT; - mask = 0xffff; + val = odp_cpu_to_be_16(CLS_DEFAULT_SPORT); + mask = odp_cpu_to_be_16(0xffff); seqno = 0; pktio = create_pktio(ODP_QUEUE_TYPE_SCHED, pkt_pool, true); @@ -664,7 +663,7 @@ static void classification_test_pmr_term_udp_sport(void) odp_pktio_mac_addr(pktio, eth->dst.addr, ODPH_ETHADDR_LEN); udp = (odph_udphdr_t *)odp_packet_l4_ptr(pkt, NULL); - udp->src_port = odp_cpu_to_be_16(CLS_DEFAULT_SPORT); + udp->src_port = val; enqueue_pktio_interface(pkt, pktio); diff --git a/test/validation/api/classification/odp_classification_tests.c b/test/validation/api/classification/odp_classification_tests.c index 9df869ece..3a97023cf 100644 --- a/test/validation/api/classification/odp_classification_tests.c +++ b/test/validation/api/classification/odp_classification_tests.c @@ -223,8 +223,8 @@ void configure_cls_pmr_chain(void) cos_list[CLS_PMR_CHAIN_SRC]); CU_ASSERT_FATAL(pmr_list[CLS_PMR_CHAIN_SRC] != ODP_PMR_INVALID); - val = CLS_PMR_CHAIN_PORT; - maskport = 0xffff; + val = odp_cpu_to_be_16(CLS_PMR_CHAIN_PORT); + maskport = odp_cpu_to_be_16(0xffff); odp_cls_pmr_param_init(&pmr_param); pmr_param.term = find_first_supported_l3_pmr(); pmr_param.match.value = &val; @@ -573,8 +573,8 @@ void configure_pmr_cos(void) cos_list[CLS_PMR] = odp_cls_cos_create(cosname, &cls_param); CU_ASSERT_FATAL(cos_list[CLS_PMR] != ODP_COS_INVALID); - val = CLS_PMR_PORT; - mask = 0xffff; + val = odp_cpu_to_be_16(CLS_PMR_PORT); + mask = odp_cpu_to_be_16(0xffff); odp_cls_pmr_param_init(&pmr_param); pmr_param.term = find_first_supported_l3_pmr(); pmr_param.match.value = &val; @@ -655,8 +655,8 @@ void configure_pktio_pmr_composite(void) pmr_params[0].match.mask = &mask; pmr_params[0].val_sz = sizeof(addr); - val = CLS_PMR_SET_PORT; - maskport = 0xffff; + val = odp_cpu_to_be_16(CLS_PMR_SET_PORT); + maskport = odp_cpu_to_be_16(0xffff); odp_cls_pmr_param_init(&pmr_params[1]); pmr_params[1].term = find_first_supported_l3_pmr(); pmr_params[1].match.value = &val; commit 6f855d843b1d87013908998a050e16c435b89e07 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Thu Oct 24 15:10:01 2019 +0300 linux-gen: cls: change ODP_PMR_DMAC to big endian Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> diff --git a/platform/linux-generic/odp_classification.c b/platform/linux-generic/odp_classification.c index 1d717f413..9ad3380e5 100644 --- a/platform/linux-generic/odp_classification.c +++ b/platform/linux-generic/odp_classification.c @@ -921,24 +921,23 @@ static inline int verify_pmr_dmac(const uint8_t *pkt_addr, odp_packet_hdr_t *pkt_hdr, pmr_term_value_t *term_value) { - uint64_t dmac = 0; - uint64_t dmac_be = 0; const _odp_ethhdr_t *eth; + uint16_t dmac[3]; + uint16_t *mask = (uint16_t *)&term_value->match.mask; + uint16_t *value = (uint16_t *)&term_value->match.value; if (!packet_hdr_has_eth(pkt_hdr)) return 0; eth = (const _odp_ethhdr_t *)(pkt_addr + pkt_hdr->p.l2_offset); - memcpy(&dmac_be, eth->dst.addr, _ODP_ETHADDR_LEN); - dmac = odp_be_to_cpu_64(dmac_be); - /* since we are converting a 48 bit ethernet address from BE to cpu - format using odp_be_to_cpu_64() the last 16 bits needs to be right - shifted */ - if (dmac_be != dmac) - dmac = dmac >> (64 - (_ODP_ETHADDR_LEN * 8)); - - if (term_value->match.value == (dmac & term_value->match.mask)) + memcpy(dmac, eth->dst.addr, _ODP_ETHADDR_LEN); + dmac[0] &= mask[0]; + dmac[1] &= mask[1]; + dmac[2] &= mask[2]; + + if (value[0] == dmac[0] && value[1] == dmac[1] && value[2] == dmac[2]) return 1; + return 0; } diff --git a/test/validation/api/classification/classification.h b/test/validation/api/classification/classification.h index ae8d57221..c16b340c9 100644 --- a/test/validation/api/classification/classification.h +++ b/test/validation/api/classification/classification.h @@ -19,8 +19,8 @@ #define CLS_DEFAULT_DADDR "10.0.0.100/32" #define CLS_DEFAULT_SPORT 1024 #define CLS_DEFAULT_DPORT 2048 -#define CLS_DEFAULT_DMAC 0x010203040506 -#define CLS_DEFAULT_SMAC 0x060504030201 +#define CLS_DEFAULT_DMAC {0x01, 0x02, 0x03, 0x04, 0x05, 0x06} +#define CLS_DEFAULT_SMAC {0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c} /* Config values for Error CoS */ #define TEST_ERROR 1 diff --git a/test/validation/api/classification/odp_classification_common.c b/test/validation/api/classification/odp_classification_common.c index ad64b9d4a..851f949cc 100644 --- a/test/validation/api/classification/odp_classification_common.c +++ b/test/validation/api/classification/odp_classification_common.c @@ -240,9 +240,6 @@ odp_packet_t create_packet(cls_packet_info_t pkt_info) odph_ipv4hdr_t *ip; odph_ipv6hdr_t *ipv6; uint16_t payload_len; - uint64_t src_mac = CLS_DEFAULT_SMAC; - uint64_t dst_mac = CLS_DEFAULT_DMAC; - uint64_t dst_mac_be; uint32_t addr = 0; uint32_t mask; odp_packet_t pkt; @@ -257,12 +254,8 @@ odp_packet_t create_packet(cls_packet_info_t pkt_info) uint16_t eth_type; odp_u16be_t *vlan_type; odph_vlanhdr_t *vlan_hdr; - - /* 48 bit ethernet address needs to be left shifted for proper - value after changing to be*/ - dst_mac_be = odp_cpu_to_be_64(dst_mac); - if (dst_mac != dst_mac_be) - dst_mac_be = dst_mac_be >> (64 - 8 * ODPH_ETHADDR_LEN); + uint8_t src_mac[] = CLS_DEFAULT_SMAC; + uint8_t dst_mac[] = CLS_DEFAULT_DMAC; payload_len = sizeof(cls_test_packet_t) + pkt_info.len; seqno = odp_atomic_fetch_inc_u32(pkt_info.seq); @@ -287,7 +280,7 @@ odp_packet_t create_packet(cls_packet_info_t pkt_info) odp_packet_l2_offset_set(pkt, 0); ethhdr = (odph_ethhdr_t *)odp_packet_l2_ptr(pkt, NULL); memcpy(ethhdr->src.addr, &src_mac, ODPH_ETHADDR_LEN); - memcpy(ethhdr->dst.addr, &dst_mac_be, ODPH_ETHADDR_LEN); + memcpy(ethhdr->dst.addr, &dst_mac, ODPH_ETHADDR_LEN); vlan_type = (odp_u16be_t *)(void *)&ethhdr->type; vlan_hdr = (odph_vlanhdr_t *)(ethhdr + 1); diff --git a/test/validation/api/classification/odp_classification_test_pmr.c b/test/validation/api/classification/odp_classification_test_pmr.c index abb1a743b..9ac735020 100644 --- a/test/validation/api/classification/odp_classification_test_pmr.c +++ b/test/validation/api/classification/odp_classification_test_pmr.c @@ -821,8 +821,6 @@ static void classification_test_pmr_term_dmac(void) { odp_packet_t pkt; uint32_t seqno; - uint64_t val; - uint64_t mask; int retval; odp_pktio_t pktio; odp_queue_t queue; @@ -839,9 +837,8 @@ static void classification_test_pmr_term_dmac(void) odp_pmr_param_t pmr_param; odph_ethhdr_t *eth; cls_packet_info_t pkt_info; - - val = CLS_DEFAULT_DMAC; /* 48 bit Ethernet Mac address */ - mask = 0xffffffffffff; + uint8_t val[] = {0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee}; + uint8_t mask[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; seqno = 0; pktio = create_pktio(ODP_QUEUE_TYPE_SCHED, pkt_pool, true); @@ -880,6 +877,8 @@ static void classification_test_pmr_term_dmac(void) pkt_info.udp = true; pkt = create_packet(pkt_info); CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID); + eth = (odph_ethhdr_t *)odp_packet_l2_ptr(pkt, NULL); + memcpy(eth->dst.addr, val, ODPH_ETHADDR_LEN); seqno = cls_pkt_get_seq(pkt); CU_ASSERT(seqno != TEST_SEQ_INVALID); @@ -896,9 +895,6 @@ static void classification_test_pmr_term_dmac(void) /* Other packets delivered to default queue */ pkt = create_packet(default_pkt_info); CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID); - eth = (odph_ethhdr_t *)odp_packet_l2_ptr(pkt, NULL); - memset(eth->dst.addr, 0, ODPH_ETHADDR_LEN); - CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID); seqno = cls_pkt_get_seq(pkt); CU_ASSERT(seqno != TEST_SEQ_INVALID); commit 35a6b2e5c369e81196f6c288085990eaaf83f360 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Thu Oct 24 14:41:59 2019 +0300 linux-gen: cls: change ODP_PMR_VLAN_ID_X to big endian Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> diff --git a/platform/linux-generic/odp_classification.c b/platform/linux-generic/odp_classification.c index 308f060b1..1d717f413 100644 --- a/platform/linux-generic/odp_classification.c +++ b/platform/linux-generic/odp_classification.c @@ -1033,8 +1033,8 @@ static inline int verify_pmr_vlan_id_x(const uint8_t *pkt_addr, if (pkt_hdr->p.input_flags.vlan_qinq) vlan++; - tci = odp_be_to_cpu_16(vlan->tci); - vlan_id = tci & 0x0fff; + tci = vlan->tci; + vlan_id = tci & odp_cpu_to_be_16(0x0fff); if (term_value->match.value == (vlan_id & term_value->match.mask)) return 1; diff --git a/test/validation/api/classification/odp_classification_test_pmr.c b/test/validation/api/classification/odp_classification_test_pmr.c index 7111595c5..abb1a743b 100644 --- a/test/validation/api/classification/odp_classification_test_pmr.c +++ b/test/validation/api/classification/odp_classification_test_pmr.c @@ -1170,8 +1170,8 @@ static void classification_test_pmr_term_vlan_id_x(void) odph_vlanhdr_t *vlan_x; cls_packet_info_t pkt_info; - val = 0x345; - mask = 0xfff; + val = odp_cpu_to_be_16(0x345); + mask = odp_cpu_to_be_16(0xfff); seqno = 0; pktio = create_pktio(ODP_QUEUE_TYPE_SCHED, pkt_pool, true); @@ -1218,7 +1218,7 @@ static void classification_test_pmr_term_vlan_id_x(void) odp_pktio_mac_addr(pktio, eth->dst.addr, ODPH_ETHADDR_LEN); vlan_x = (odph_vlanhdr_t *)(eth + 1); vlan_x++; - vlan_x->tci = odp_cpu_to_be_16(val); + vlan_x->tci = val; enqueue_pktio_interface(pkt, pktio); pkt = receive_packet(&retqueue, ODP_TIME_SEC_IN_NS); commit 0e2ee113fcc0e7383d9e465c11a8495a65f7a171 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Thu Oct 24 14:38:47 2019 +0300 linux-gen: cls: change ODP_PMR_VLAN_ID_0 to big endian Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> diff --git a/platform/linux-generic/odp_classification.c b/platform/linux-generic/odp_classification.c index 91d04640f..308f060b1 100644 --- a/platform/linux-generic/odp_classification.c +++ b/platform/linux-generic/odp_classification.c @@ -1006,8 +1006,8 @@ static inline int verify_pmr_vlan_id_0(const uint8_t *pkt_addr, eth = (const _odp_ethhdr_t *)(pkt_addr + pkt_hdr->p.l2_offset); vlan = (const _odp_vlanhdr_t *)(eth + 1); - tci = odp_be_to_cpu_16(vlan->tci); - vlan_id = tci & 0x0fff; + tci = vlan->tci; + vlan_id = tci & odp_cpu_to_be_16(0x0fff); if (term_value->match.value == (vlan_id & term_value->match.mask)) return 1; diff --git a/test/validation/api/classification/odp_classification_test_pmr.c b/test/validation/api/classification/odp_classification_test_pmr.c index 5dd16c321..7111595c5 100644 --- a/test/validation/api/classification/odp_classification_test_pmr.c +++ b/test/validation/api/classification/odp_classification_test_pmr.c @@ -1059,8 +1059,8 @@ static void classification_test_pmr_term_vlan_id_0(void) odph_vlanhdr_t *vlan_0; cls_packet_info_t pkt_info; - val = 0x123; - mask = 0xfff; + val = odp_cpu_to_be_16(0x123); + mask = odp_cpu_to_be_16(0xfff); seqno = 0; pktio = create_pktio(ODP_QUEUE_TYPE_SCHED, pkt_pool, true); @@ -1105,7 +1105,7 @@ static void classification_test_pmr_term_vlan_id_0(void) odp_pktio_mac_addr(pktio, eth->src.addr, ODPH_ETHADDR_LEN); odp_pktio_mac_addr(pktio, eth->dst.addr, ODPH_ETHADDR_LEN); vlan_0 = (odph_vlanhdr_t *)(eth + 1); - vlan_0->tci = odp_cpu_to_be_16(val); + vlan_0->tci = val; enqueue_pktio_interface(pkt, pktio); pkt = receive_packet(&retqueue, ODP_TIME_SEC_IN_NS); commit 0cfdb2c5a6b3afe0e4b0eee2b3749a0cfca3917d Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Thu Oct 24 14:27:09 2019 +0300 linux-gen: cls: change ODP_PMR_ETHTYPE_X to big endian Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> diff --git a/platform/linux-generic/odp_classification.c b/platform/linux-generic/odp_classification.c index e640ede2e..91d04640f 100644 --- a/platform/linux-generic/odp_classification.c +++ b/platform/linux-generic/odp_classification.c @@ -1132,7 +1132,7 @@ static inline int verify_pmr_eth_type_x(const uint8_t *pkt_addr, if (pkt_hdr->p.input_flags.vlan_qinq) vlan++; - ethtype = odp_be_to_cpu_16(vlan->type); + ethtype = vlan->type; if (term_value->match.value == (ethtype & term_value->match.mask)) return 1; diff --git a/test/validation/api/classification/odp_classification_test_pmr.c b/test/validation/api/classification/odp_classification_test_pmr.c index abcc73e07..5dd16c321 100644 --- a/test/validation/api/classification/odp_classification_test_pmr.c +++ b/test/validation/api/classification/odp_classification_test_pmr.c @@ -1391,8 +1391,8 @@ static void classification_test_pmr_term_eth_type_x(void) odph_vlanhdr_t *vlan_x; cls_packet_info_t pkt_info; - val = 0x0800; - mask = 0xffff; + val = odp_cpu_to_be_16(0x0800); + mask = odp_cpu_to_be_16(0xffff); seqno = 0; pktio = create_pktio(ODP_QUEUE_TYPE_SCHED, pkt_pool, true); @@ -1440,7 +1440,7 @@ static void classification_test_pmr_term_eth_type_x(void) vlan_x = (odph_vlanhdr_t *)(eth + 1); vlan_x++; vlan_x->tci = odp_cpu_to_be_16(0x123); - vlan_x->type = odp_cpu_to_be_16(val); + vlan_x->type = val; enqueue_pktio_interface(pkt, pktio); commit b7a8fd47362a3853db8cc3ea56fe1d268defa574 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Thu Oct 24 13:55:29 2019 +0300 linux-gen: cls: change ODP_PMR_ETHTYPE_0 to big endian Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> diff --git a/platform/linux-generic/odp_classification.c b/platform/linux-generic/odp_classification.c index 0119f7537..e640ede2e 100644 --- a/platform/linux-generic/odp_classification.c +++ b/platform/linux-generic/odp_classification.c @@ -1107,7 +1107,7 @@ static inline int verify_pmr_eth_type_0(const uint8_t *pkt_addr, return 0; eth = (const _odp_ethhdr_t *)(pkt_addr + pkt_hdr->p.l2_offset); - ethtype = odp_be_to_cpu_16(eth->type); + ethtype = eth->type; if (term_value->match.value == (ethtype & term_value->match.mask)) return 1; diff --git a/test/validation/api/classification/odp_classification_test_pmr.c b/test/validation/api/classification/odp_classification_test_pmr.c index 44942de98..abcc73e07 100644 --- a/test/validation/api/classification/odp_classification_test_pmr.c +++ b/test/validation/api/classification/odp_classification_test_pmr.c @@ -1282,8 +1282,8 @@ static void classification_test_pmr_term_eth_type_0(void) odph_ethhdr_t *eth; cls_packet_info_t pkt_info; - val = ODPH_ETHTYPE_IPV6; - mask = 0xffff; + val = odp_cpu_to_be_16(ODPH_ETHTYPE_IPV6); + mask = odp_cpu_to_be_16(0xffff); seqno = 0; pktio = create_pktio(ODP_QUEUE_TYPE_SCHED, pkt_pool, true); commit 0df7a38e2b9be4ad72528d43551e56ac4d152b96 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Wed Oct 23 17:21:13 2019 +0300 linux-gen: cls: check PMR value size Check that PMR value size matches API specification. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> diff --git a/platform/linux-generic/odp_classification.c b/platform/linux-generic/odp_classification.c index 907d68481..0119f7537 100644 --- a/platform/linux-generic/odp_classification.c +++ b/platform/linux-generic/odp_classification.c @@ -568,12 +568,77 @@ int odp_cos_with_l3_qos(odp_pktio_t pktio_in, return 0; } -static int odp_pmr_create_term(pmr_term_value_t *value, - const odp_pmr_param_t *param) +static int pmr_create_term(pmr_term_value_t *value, + const odp_pmr_param_t *param) { - value->term = param->term; - value->range_term = param->range_term; + uint32_t size; uint8_t i; + int custom = 0; + odp_cls_pmr_term_t term = param->term; + + value->term = term; + value->range_term = param->range_term; + + switch (term) { + case ODP_PMR_IPPROTO: + size = 1; + break; + + case ODP_PMR_ETHTYPE_0: + /* Fall through */ + case ODP_PMR_ETHTYPE_X: + /* Fall through */ + case ODP_PMR_VLAN_ID_0: + /* Fall through */ + case ODP_PMR_VLAN_ID_X: + /* Fall through */ + case ODP_PMR_UDP_DPORT: + /* Fall through */ + case ODP_PMR_TCP_DPORT: + /* Fall through */ + case ODP_PMR_UDP_SPORT: + /* Fall through */ + case ODP_PMR_TCP_SPORT: + size = 2; + break; + + case ODP_PMR_LEN: + /* Fall through */ + case ODP_PMR_SIP_ADDR: + /* Fall through */ + case ODP_PMR_DIP_ADDR: + /* Fall through */ + case ODP_PMR_IPSEC_SPI: + /* Fall through */ + case ODP_PMR_LD_VNI: + size = 4; + break; + + case ODP_PMR_DMAC: + size = 6; + break; + + case ODP_PMR_SIP6_ADDR: + /* Fall through */ + case ODP_PMR_DIP6_ADDR: + size = 16; + break; + + case ODP_PMR_CUSTOM_FRAME: + custom = 1; + size = CLS_PMR_TERM_BYTES_MAX; + break; + + default: + ODP_ERR("Bad PRM term\n"); + return -1; + } + + if ((!custom && param->val_sz != size) || + (custom && param->val_sz > size)) { + ODP_ERR("Bad PMR value size: %u\n", param->val_sz); + return -1; + } switch (value->term) { case ODP_PMR_SIP6_ADDR: @@ -655,7 +720,6 @@ odp_pmr_t odp_cls_pmr_create(const odp_pmr_param_t *terms, int num_terms, pmr_t *pmr; int i; odp_pmr_t id; - int val_sz; uint32_t loc; cos_t *cos_src = get_cos_entry(src_cos); cos_t *cos_dst = get_cos_entry(dst_cos); @@ -680,13 +744,8 @@ odp_pmr_t odp_cls_pmr_create(const odp_pmr_param_t *terms, int num_terms, pmr->s.num_pmr = num_terms; for (i = 0; i < num_terms; i++) { - val_sz = terms[i].val_sz; - if (val_sz > CLS_PMR_TERM_BYTES_MAX) { + if (pmr_create_term(&pmr->s.pmr_term_value[i], &terms[i])) { pmr->s.valid = 0; - return ODP_PMR_INVALID; - } - if (0 > odp_pmr_create_term(&pmr->s.pmr_term_value[i], - &terms[i])) { UNLOCK(&pmr->s.lock); return ODP_PMR_INVALID; } diff --git a/test/validation/api/classification/odp_classification_test_pmr.c b/test/validation/api/classification/odp_classification_test_pmr.c index a01c0a403..44942de98 100644 --- a/test/validation/api/classification/odp_classification_test_pmr.c +++ b/test/validation/api/classification/odp_classification_test_pmr.c @@ -927,8 +927,8 @@ static void classification_test_pmr_term_packet_len(void) { odp_packet_t pkt; uint32_t seqno; - uint16_t val; - uint16_t mask; + uint32_t val; + uint32_t mask; int retval; odp_pktio_t pktio; odp_queue_t queue; commit 139b28399d3bd1f53624908c9fd99c1f14283cdd Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Wed Oct 23 16:36:40 2019 +0300 api: cls: PMR value in big endian format PMR term documentation was not explicit about endianness of value and mask fields. Most terms assumed CPU endian, but terms with larger data sizes assumed big endian (MAC, IPv6 address and custom). Harmonize term specification so that all terms expect value/mask data to be in big endian format, have fixed size and allow free memory alignment. Packet length term is an exception to this as it does not represent a field in a packet. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> diff --git a/include/odp/api/spec/classification.h b/include/odp/api/spec/classification.h index 043059fa1..67fdd20aa 100644 --- a/include/odp/api/spec/classification.h +++ b/include/odp/api/spec/classification.h @@ -461,44 +461,92 @@ int odp_cos_with_l3_qos(odp_pktio_t pktio_in, */ /** - * Packet Matching Rule field enumeration - * for fields that may be used to calculate - * the PMR, if present in a packet. + * Packet Matching Rule terms + * + * This enumeration selects the protocol field that is matched against PMR + * value/mask or value range. Protocol field values and masks are passed in big + * endian (network endian) format. However, ODP_PMR_LEN value and range are + * passed in CPU native endian (uint32_t words), as the term does not represent + * a protocol field. + * + * PMR value/mask data size is term specific. This size must be set into val_sz + * field of odp_pmr_param_t. There is no alignment requirement for PMR + * value/mask data. */ typedef enum { - ODP_PMR_LEN, /**< Total length of received packet*/ - ODP_PMR_ETHTYPE_0, /**< Initial (outer) - Ethertype only (*val=uint16_t)*/ - ODP_PMR_ETHTYPE_X, /**< Ethertype of most inner VLAN tag - (*val=uint16_t)*/ - ODP_PMR_VLAN_ID_0, /**< First VLAN ID (outer) (*val=uint16_t) */ - ODP_PMR_VLAN_ID_X, /**< Last VLAN ID (inner) (*val=uint16_t) */ - ODP_PMR_DMAC, /**< destination MAC address (*val=uint64_t)*/ - ODP_PMR_IPPROTO, /**< IP Protocol or IPv6 Next Header - (*val=uint8_t) */ - ODP_PMR_UDP_DPORT, /**< Destination UDP port, implies IPPROTO=17*/ - ODP_PMR_TCP_DPORT, /**< Destination TCP port implies IPPROTO=6*/ - ODP_PMR_UDP_SPORT, /**< Source UDP Port (*val=uint16_t)*/ - ODP_PMR_TCP_SPORT, /**< Source TCP port (*val=uint16_t)*/ - ODP_PMR_SIP_ADDR, /**< Source IP address (uint32_t)*/ - ODP_PMR_DIP_ADDR, /**< Destination IP address (uint32_t)*/ - ODP_PMR_SIP6_ADDR, /**< Source IP address (uint8_t[16])*/ - ODP_PMR_DIP6_ADDR, /**< Destination IP address (uint8_t[16])*/ - ODP_PMR_IPSEC_SPI, /**< IPsec session identifier(*val=uint32_t)*/ - ODP_PMR_LD_VNI, /**< NVGRE/VXLAN network identifier - (*val=uint32_t)*/ - ODP_PMR_CUSTOM_FRAME, /**< Custom match rule, offset from start of - frame. The match is defined by the offset, the - expected value, and its size. They must be - applied before any other PMR. - (*val=uint8_t[val_sz])*/ + /** Total length of received packet. Exceptionally, value and mask are + * uint32_t (val_sz = 4) in CPU endian. */ + ODP_PMR_LEN, + + /** Initial (outer) Ethertype only (val_sz = 2) */ + ODP_PMR_ETHTYPE_0, + + /** Ethertype of most inner VLAN tag (val_sz = 2) */ + ODP_PMR_ETHTYPE_X, + + /** First (outer) VLAN ID (val_sz = 2) */ + ODP_PMR_VLAN_ID_0, + + /** Last (most inner) VLAN ID (val_sz = 2) */ + ODP_PMR_VLAN_ID_X, + + /** Destination MAC address (val_sz = 6) */ + ODP_PMR_DMAC, + + /** IPv4 Protocol or IPv6 Next Header (val_sz = 1) */ + ODP_PMR_IPPROTO, + + /** Destination UDP port (val_sz = 2) */ + ODP_PMR_UDP_DPORT, + + /** Destination TCP port (val_sz = 2) */ + ODP_PMR_TCP_DPORT, + + /** Source UDP port (val_sz = 2) */ + ODP_PMR_UDP_SPORT, + + /** Source TCP port (val_sz = 2) */ + ODP_PMR_TCP_SPORT, + + /** Source IPv4 address (val_sz = 4) */ + ODP_PMR_SIP_ADDR, + + /** Destination IPv4 address (val_sz = 4) */ + ODP_PMR_DIP_ADDR, + + /** Source IPv6 address (val_sz = 16) */ + ODP_PMR_SIP6_ADDR, + + /** Destination IPv6 address (val_sz = 16) */ + ODP_PMR_DIP6_ADDR, + + /** IPsec session identifier (val_sz = 4)*/ + ODP_PMR_IPSEC_SPI, + + /** NVGRE/VXLAN network identifier (val_sz = 4) */ + ODP_PMR_LD_VNI, + + /** + * Custom frame match rule + * + * PMR offset is counted from the start of the packet. The match is + * defined by the offset, the expected value, and its size. Custom frame + * rules must be applied before any other PMR. + */ + ODP_PMR_CUSTOM_FRAME, /** Inner header may repeat above values with this offset */ ODP_PMR_INNER_HDR_OFF = 32 + } odp_cls_pmr_term_t; /** * Packet Matching Rule parameter structure + * + * Match value/mask size and endianness are defined in PMR term documentation + * (@see odp_cls_pmr_term_t). Most values and masks are passed in big + * endian format without data alignment requirement. ODP_PMR_LEN is + * an exception to this (uint32_t in CPU endian). */ typedef struct odp_pmr_param_t { odp_cls_pmr_term_t term; /**< Packet Matching Rule term */ @@ -510,21 +558,24 @@ typedef struct odp_pmr_param_t { union { /** Parameters for single-valued matches */ struct { - /** Value to be matched */ - const void *value; - - /** Masked set of bits to be matched */ - const void *mask; + /** Points to the value to be matched. Value size and + * endianness are defined by the term used. Values of + * protocol fields are defined in big endian format. + */ + const void *value; + + /** Mask of the bits to be matched. The same size and + * endianness is used than with the value. */ + const void *mask; } match; /** Parameter for range value matches */ struct { - /** Start and End values are included in the range */ - /** start value of range */ - const void *val_start; + /** Start value of the range */ + const void *val_start; - /** End value of range */ - const void *val_end; + /** End value of the range */ + const void *val_end; } range; }; uint32_t val_sz; /**< Size of the term value */ ----------------------------------------------------------------------- Summary of changes: configure.ac | 2 +- example/classifier/odp_classifier.c | 224 +++++++++--------- include/odp/api/spec/classification.h | 172 +++++++++----- include/odp/api/spec/packet_io.h | 14 +- include/odp/api/spec/pool.h | 8 +- include/odp/api/spec/shared_memory.h | 2 +- include/odp/api/spec/version.h.in | 1 - .../include/odp_classification_datamodel.h | 79 ++++--- platform/linux-generic/odp_classification.c | 249 +++++++++++++-------- .../validation/api/classification/classification.h | 4 +- .../api/classification/odp_classification_common.c | 13 +- .../classification/odp_classification_test_pmr.c | 236 +++++++++++++++---- .../api/classification/odp_classification_tests.c | 18 +- 13 files changed, 678 insertions(+), 344 deletions(-) hooks/post-receive --

6 years, 3 months

[COMMIT] branch master updated. v1.21.0.0-274-g86745e999

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 86745e999aa2bf644fd72775df55042289e07b2b (commit) via b11ca4c8889eef7444253003eec531377c7167f6 (commit) via f4b03adaf872f8c2e593d94a8619aa23bfecd51f (commit) via c723055094546df3890efb0f6a5f02b59cb4cb34 (commit) via 7610aab45d2a307d883c62ee56fbc0430fabf2b2 (commit) via 11353856ea2c1add12ec941bdb2a2e5854bdeb6d (commit) via 77dbff3c7054c607ff0c3371f62b226742f08aec (commit) via cc4e3434ca806736fd0c586ed36bc34f3d3b2bd4 (commit) via 916bfae5098242dd7e5121c789b1dbe20c8453ea (commit) via 65e5ee3c37c28a9365385516e5279f917a6ff41a (commit) from f0f83828a483f90edcf320ec2cf0107cb1e9362e (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 86745e999aa2bf644fd72775df55042289e07b2b Author: Matias Elo <matias.elo(a)nokia.com> Date: Wed Oct 9 10:38:15 2019 +0300 linux-gen: packet: clean up internal naming Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index adaf877ca..e491d2512 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -383,20 +383,18 @@ static inline void init_segments(odp_packet_hdr_t *pkt_hdr[], int num) link_segments(pkt_hdr, num); } -static inline void reset_seg(odp_packet_hdr_t *pkt_hdr, int num) +static inline void reset_segments(odp_packet_hdr_t *pkt_hdr) { - odp_packet_hdr_t *hdr = pkt_hdr; void *base; - int i; - uint32_t seg_len = ((pool_t *)(hdr->buf_hdr.pool_ptr))->seg_len; + uint32_t seg_len = ((pool_t *)(pkt_hdr->buf_hdr.pool_ptr))->seg_len; - for (i = 0; i < num; i++) { - base = hdr->buf_hdr.base_data; + while (pkt_hdr != NULL) { + base = pkt_hdr->buf_hdr.base_data; - hdr->seg_len = seg_len; - hdr->seg_data = base; + pkt_hdr->seg_len = seg_len; + pkt_hdr->seg_data = base; - hdr = hdr->seg_next; + pkt_hdr = pkt_hdr->seg_next; } } @@ -559,11 +557,11 @@ static inline void free_all_segments(odp_packet_hdr_t *pkt_hdr, int num) { int i; odp_buffer_hdr_t *buf_hdr[num]; - odp_packet_hdr_t *seg = pkt_hdr; + odp_packet_hdr_t *seg_hdr = pkt_hdr; for (i = 0; i < num; i++) { - buf_hdr[i] = &seg->buf_hdr; - seg = seg->seg_next; + buf_hdr[i] = &seg_hdr->buf_hdr; + seg_hdr = seg_hdr->seg_next; } packet_free_multi(buf_hdr, num); @@ -573,7 +571,7 @@ static inline odp_packet_hdr_t *free_segments(odp_packet_hdr_t *pkt_hdr, int num, uint32_t free_len, uint32_t pull_len, int head) { - odp_packet_hdr_t *seg; + odp_packet_hdr_t *seg_hdr; int i; int num_remain = pkt_hdr->seg_count - num; odp_packet_hdr_t *hdr = pkt_hdr; @@ -584,8 +582,8 @@ static inline odp_packet_hdr_t *free_segments(odp_packet_hdr_t *pkt_hdr, odp_packet_hdr_t *new_hdr; for (i = 0; i < num; i++) { - seg = packet_seg_step(&hdr); - buf_hdr[i] = &seg->buf_hdr; + seg_hdr = packet_seg_step(&hdr); + buf_hdr[i] = &seg_hdr->buf_hdr; } /* The first remaining header is the new packet descriptor. @@ -619,8 +617,8 @@ static inline odp_packet_hdr_t *free_segments(odp_packet_hdr_t *pkt_hdr, packet_seg_step(&hdr); for (i = 0; i < num; i++) { - seg = packet_seg_step(&hdr); - buf_hdr[i] = &seg->buf_hdr; + seg_hdr = packet_seg_step(&hdr); + buf_hdr[i] = &seg_hdr->buf_hdr; } packet_free_multi(buf_hdr, num); @@ -770,9 +768,7 @@ void odp_packet_free(odp_packet_t pkt) void odp_packet_free_multi(const odp_packet_t pkt[], int num) { odp_buffer_hdr_t *buf_hdr[num]; - odp_buffer_hdr_t *buf_hdr2[num]; int i; - int links = 0; int num_freed = 0; for (i = 0; i < num; i++) { @@ -790,9 +786,6 @@ void odp_packet_free_multi(const odp_packet_t pkt[], int num) buf_hdr[i - num_freed] = &pkt_hdr->buf_hdr; } - if (odp_unlikely(links)) - packet_free_multi(buf_hdr2, links); - if (odp_likely(num - num_freed)) packet_free_multi(buf_hdr, num - num_freed); } @@ -816,7 +809,7 @@ int odp_packet_reset(odp_packet_t pkt, uint32_t len) num_req = num_segments(len, pool->seg_len); if (odp_unlikely(num_req < num)) free_segments(pkt_hdr, num - num_req, 0, 0, 0); - reset_seg(pkt_hdr, num_req); + reset_segments(pkt_hdr); packet_init(pkt_hdr, len); commit b11ca4c8889eef7444253003eec531377c7167f6 Author: Matias Elo <matias.elo(a)nokia.com> Date: Wed Oct 9 10:11:05 2019 +0300 linux-gen: packet: make sure max segment count is not exceeded Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index bdff0875b..adaf877ca 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -894,6 +894,9 @@ int odp_packet_extend_head(odp_packet_t *pkt, uint32_t len, return -1; num = num_segments(len - headroom, pool->seg_len); + if (odp_unlikely(pkt_hdr->seg_count + num > PKT_MAX_SEGS)) + return -1; + push_head(pkt_hdr, headroom); ptr = add_segments(pkt_hdr, pool, len - headroom, num, 1); @@ -1000,6 +1003,9 @@ int odp_packet_extend_tail(odp_packet_t *pkt, uint32_t len, return -1; num = num_segments(len - tailroom, pool->seg_len); + if (odp_unlikely(pkt_hdr->seg_count + num > PKT_MAX_SEGS)) + return -1; + push_tail(pkt_hdr, tailroom); ptr = add_segments(pkt_hdr, pool, len - tailroom, num, 0); @@ -1356,6 +1362,10 @@ int odp_packet_concat(odp_packet_t *dst, odp_packet_t src) return -1; } + if (odp_unlikely(dst_hdr->seg_count + src_hdr->seg_count > + PKT_MAX_SEGS)) + return -1; + add_all_segs(dst_hdr, src_hdr); dst_hdr->frame_len = dst_len + src_len; commit f4b03adaf872f8c2e593d94a8619aa23bfecd51f Author: Matias Elo <matias.elo(a)nokia.com> Date: Wed Oct 9 09:00:27 2019 +0300 linux-gen: dpdk: optimize performance Minor performance tweaks. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c index 93cec349d..039c38d36 100644 --- a/platform/linux-generic/pktio/dpdk.c +++ b/platform/linux-generic/pktio/dpdk.c @@ -804,7 +804,7 @@ static inline void prefetch_pkt(struct rte_mbuf *mbuf) void *data = rte_pktmbuf_mtod(mbuf, char *); odp_prefetch(pkt_hdr); - odp_prefetch(&pkt_hdr->p); + odp_prefetch_store((uint8_t *)pkt_hdr + ODP_CACHE_LINE_SIZE); odp_prefetch(data); } @@ -920,6 +920,7 @@ static inline int pkt_to_mbuf_zero(pktio_entry_t *pktio_entry, odp_pktout_config_opt_t *pktout_cfg = &pktio_entry->s.config.pktout; odp_pktout_config_opt_t *pktout_capa = &pktio_entry->s.capa.config.pktout; + uint16_t mtu = pkt_dpdk->mtu; int i; *copy_count = 0; @@ -929,7 +930,7 @@ static inline int pkt_to_mbuf_zero(pktio_entry_t *pktio_entry, struct rte_mbuf *mbuf = mbuf_from_pkt_hdr(pkt_hdr); uint16_t pkt_len = odp_packet_len(pkt); - if (odp_unlikely(pkt_len > pkt_dpdk->mtu)) + if (odp_unlikely(pkt_len > mtu)) goto fail; if (odp_likely(pkt_hdr->seg_count == 1)) { commit c723055094546df3890efb0f6a5f02b59cb4cb34 Author: Matias Elo <matias.elo(a)nokia.com> Date: Tue Oct 8 13:38:21 2019 +0300 linux-gen: dpdk: make storing packet flow hash configurable Make saving RX RSS hash as ODP flow hash optional (disabled by default). This improves performance by removing a write operation to an additional cache line. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/config/odp-linux-generic.conf b/config/odp-linux-generic.conf index 4fec05047..4e24ef82d 100644 --- a/config/odp-linux-generic.conf +++ b/config/odp-linux-generic.conf @@ -16,7 +16,7 @@ # Mandatory fields odp_implementation = "linux-generic" -config_file_version = "0.1.8" +config_file_version = "0.1.9" # Shared memory options shm: { @@ -70,6 +70,9 @@ pktio_dpdk: { num_tx_desc = 512 rx_drop_en = 0 + # Store RX RSS hash result as ODP flow hash + set_flow_hash = 0 + # Driver specific options (use PMD names from DPDK) net_ixgbe: { rx_drop_en = 1 diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c index cc0a4368c..93cec349d 100644 --- a/platform/linux-generic/pktio/dpdk.c +++ b/platform/linux-generic/pktio/dpdk.c @@ -92,7 +92,8 @@ ODP_STATIC_ASSERT((DPDK_NB_MBUF % DPDK_MEMPOOL_CACHE_SIZE == 0) && typedef struct { int num_rx_desc; int num_tx_desc; - int rx_drop_en; + uint8_t rx_drop_en; + uint8_t set_flow_hash; } dpdk_opt_t; struct pkt_cache_t { @@ -169,6 +170,7 @@ static int init_options(pktio_entry_t *pktio_entry, const struct rte_eth_dev_info *dev_info) { dpdk_opt_t *opt = &pkt_priv(pktio_entry)->opt; + int val; if (!lookup_opt("num_rx_desc", dev_info->driver_name, &opt->num_rx_desc)) @@ -190,10 +192,13 @@ static int init_options(pktio_entry_t *pktio_entry, return -1; } - if (!lookup_opt("rx_drop_en", dev_info->driver_name, - &opt->rx_drop_en)) + if (!lookup_opt("rx_drop_en", dev_info->driver_name, &val)) return -1; - opt->rx_drop_en = !!opt->rx_drop_en; + opt->rx_drop_en = !!val; + + if (!lookup_opt("set_flow_hash", NULL, &val)) + return -1; + opt->set_flow_hash = !!val; ODP_PRINT("DPDK interface (%s): %" PRIu16 "\n", dev_info->driver_name, pkt_priv(pktio_entry)->port_id); @@ -810,6 +815,7 @@ static inline int mbuf_to_pkt_zero(pktio_entry_t *pktio_entry, { odp_packet_hdr_t *pkt_hdr; uint16_t pkt_len; + uint8_t set_flow_hash; struct rte_mbuf *mbuf; void *data; int i, nb_pkts; @@ -824,6 +830,7 @@ static inline int mbuf_to_pkt_zero(pktio_entry_t *pktio_entry, pkt_dpdk = pkt_priv(pktio_entry); nb_pkts = 0; pool = pkt_dpdk->pool; + set_flow_hash = pkt_dpdk->opt.set_flow_hash; pktin_cfg = pktio_entry->s.config.pktin; parse_layer = pktio_entry->s.config.parser.layer; input = pktio_entry->s.handle; @@ -893,8 +900,7 @@ static inline int mbuf_to_pkt_zero(pktio_entry_t *pktio_entry, continue; } } - - if (mbuf->ol_flags & PKT_RX_RSS_HASH) + if (set_flow_hash && (mbuf->ol_flags & PKT_RX_RSS_HASH)) packet_set_flow_hash(pkt_hdr, mbuf->hash.rss); packet_set_ts(pkt_hdr, ts); diff --git a/platform/linux-generic/test/inline-timer.conf b/platform/linux-generic/test/inline-timer.conf index 03998f5f5..435f51e6d 100644 --- a/platform/linux-generic/test/inline-timer.conf +++ b/platform/linux-generic/test/inline-timer.conf @@ -1,6 +1,6 @@ # Mandatory fields odp_implementation = "linux-generic" -config_file_version = "0.1.8" +config_file_version = "0.1.9" timer: { # Enable inline timer implementation diff --git a/platform/linux-generic/test/process-mode.conf b/platform/linux-generic/test/process-mode.conf index dbf2acb81..708b9b4a8 100644 --- a/platform/linux-generic/test/process-mode.conf +++ b/platform/linux-generic/test/process-mode.conf @@ -1,6 +1,6 @@ # Mandatory fields odp_implementation = "linux-generic" -config_file_version = "0.1.8" +config_file_version = "0.1.9" # Shared memory options shm: { commit 7610aab45d2a307d883c62ee56fbc0430fabf2b2 Author: Matias Elo <matias.elo(a)nokia.com> Date: Tue Oct 1 14:40:36 2019 +0300 linux-gen: packet: prefetch packet metadata in packet_alloc() Improve packet alloc performance by prefetching required metadata. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index 8d06e8fcc..bdff0875b 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -646,6 +646,8 @@ static inline int packet_alloc(pool_t *pool, uint32_t len, int max_pkt, int num = max_pkt; int max_buf = max_pkt * num_seg; odp_packet_hdr_t *pkt_hdr[max_buf]; + odp_packet_hdr_t *hdr_next; + odp_packet_hdr_t *hdr; num_buf = buffer_alloc_multi(pool, (odp_buffer_hdr_t **)pkt_hdr, max_buf); @@ -668,17 +670,29 @@ static inline int packet_alloc(pool_t *pool, uint32_t len, int max_pkt, return 0; } - for (i = 0; i < num; i++) { - odp_packet_hdr_t *hdr; + hdr_next = pkt_hdr[0]; + odp_prefetch(hdr_next); + odp_prefetch((uint8_t *)hdr_next + ODP_CACHE_LINE_SIZE); + + for (i = 0; i < num - 1; i++) { + hdr = hdr_next; + hdr_next = pkt_hdr[(i + 1) * num_seg]; + + odp_prefetch(hdr_next); + odp_prefetch((uint8_t *)hdr_next + ODP_CACHE_LINE_SIZE); /* First buffer is the packet descriptor */ - hdr = pkt_hdr[i * num_seg]; pkt[i] = packet_handle(hdr); init_segments(&pkt_hdr[i * num_seg], num_seg); packet_init(hdr, len); } + /* Last packet */ + pkt[i] = packet_handle(hdr_next); + init_segments(&pkt_hdr[i * num_seg], num_seg); + packet_init(hdr_next, len); + return num; } commit 11353856ea2c1add12ec941bdb2a2e5854bdeb6d Author: Matias Elo <matias.elo(a)nokia.com> Date: Fri Sep 27 12:24:54 2019 +0300 linux-gen: packet: inline packet segment functions Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/platform/linux-generic/include/odp/api/plat/packet_inline_types.h b/platform/linux-generic/include/odp/api/plat/packet_inline_types.h index 0f9dea38b..fd18488fd 100644 --- a/platform/linux-generic/include/odp/api/plat/packet_inline_types.h +++ b/platform/linux-generic/include/odp/api/plat/packet_inline_types.h @@ -31,6 +31,7 @@ extern "C" { typedef struct _odp_packet_inline_offset_t { uint16_t seg_data; uint16_t seg_len; + uint16_t seg_next; uint16_t frame_len; uint16_t headroom; uint16_t tailroom; diff --git a/platform/linux-generic/include/odp/api/plat/packet_inlines.h b/platform/linux-generic/include/odp/api/plat/packet_inlines.h index 5232fb1e3..08048a993 100644 --- a/platform/linux-generic/include/odp/api/plat/packet_inlines.h +++ b/platform/linux-generic/include/odp/api/plat/packet_inlines.h @@ -57,6 +57,9 @@ #define odp_packet_head __odp_packet_head #define odp_packet_is_segmented __odp_packet_is_segmented #define odp_packet_first_seg __odp_packet_first_seg + #define odp_packet_seg_data __odp_packet_seg_data + #define odp_packet_seg_data_len __odp_packet_seg_data_len + #define odp_packet_next_seg __odp_packet_next_seg #define odp_packet_prefetch __odp_packet_prefetch #define odp_packet_copy_from_mem __odp_packet_copy_from_mem #define odp_packet_copy_to_mem __odp_packet_copy_to_mem @@ -256,6 +259,29 @@ _ODP_INLINE odp_packet_seg_t odp_packet_first_seg(odp_packet_t pkt) return (odp_packet_seg_t)pkt; } +_ODP_INLINE void *odp_packet_seg_data(odp_packet_t pkt ODP_UNUSED, + odp_packet_seg_t seg) +{ + return _odp_pkt_get((odp_packet_t)seg, void *, seg_data); +} + +_ODP_INLINE uint32_t odp_packet_seg_data_len(odp_packet_t pkt ODP_UNUSED, + odp_packet_seg_t seg) +{ + return _odp_pkt_get((odp_packet_t)seg, uint32_t, seg_len); +} + +_ODP_INLINE odp_packet_seg_t odp_packet_next_seg(odp_packet_t pkt ODP_UNUSED, + odp_packet_seg_t seg) +{ + void *next_seg = _odp_pkt_get((odp_packet_t)seg, void *, seg_next); + + if (odp_unlikely(next_seg == NULL)) + return ODP_PACKET_SEG_INVALID; + + return (odp_packet_seg_t)next_seg; +} + _ODP_INLINE void odp_packet_prefetch(odp_packet_t pkt, uint32_t offset, uint32_t len) { diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index 4b0a4d8d3..8d06e8fcc 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -38,6 +38,7 @@ const _odp_packet_inline_offset_t ODP_ALIGNED_CACHE _odp_packet_inline = { .seg_data = offsetof(odp_packet_hdr_t, seg_data), .seg_len = offsetof(odp_packet_hdr_t, seg_len), + .seg_next = offsetof(odp_packet_hdr_t, seg_next), .frame_len = offsetof(odp_packet_hdr_t, frame_len), .headroom = offsetof(odp_packet_hdr_t, headroom), .tailroom = offsetof(odp_packet_hdr_t, tailroom), @@ -1194,37 +1195,11 @@ void odp_packet_ts_set(odp_packet_t pkt, odp_time_t timestamp) * */ -void *odp_packet_seg_data(odp_packet_t pkt ODP_UNUSED, odp_packet_seg_t seg) -{ - odp_packet_hdr_t *seg_hdr = packet_seg_to_hdr(seg); - - return seg_hdr->seg_data; -} - -uint32_t odp_packet_seg_data_len(odp_packet_t pkt ODP_UNUSED, - odp_packet_seg_t seg) -{ - odp_packet_hdr_t *seg_hdr = packet_seg_to_hdr(seg); - - return seg_hdr->seg_len; -} - odp_packet_seg_t odp_packet_last_seg(odp_packet_t pkt) { return (odp_packet_seg_t)packet_last_seg(packet_hdr(pkt)); } -odp_packet_seg_t odp_packet_next_seg(odp_packet_t pkt ODP_UNUSED, - odp_packet_seg_t seg) -{ - odp_packet_hdr_t *pkt_hdr = packet_seg_to_hdr(seg); - - if (odp_unlikely(pkt_hdr->seg_next == NULL)) - return ODP_PACKET_SEG_INVALID; - - return (odp_packet_seg_t)pkt_hdr->seg_next; -} - /* * * Manipulation commit 77dbff3c7054c607ff0c3371f62b226742f08aec Author: Matias Elo <matias.elo(a)nokia.com> Date: Thu Sep 26 16:30:58 2019 +0300 linux-gen: packet: free possible extra segments in odp_packet_reset() Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index e2d768a23..4b0a4d8d3 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -792,11 +792,16 @@ int odp_packet_reset(odp_packet_t pkt, uint32_t len) odp_packet_hdr_t *const pkt_hdr = packet_hdr(pkt); pool_t *pool = pkt_hdr->buf_hdr.pool_ptr; int num = pkt_hdr->seg_count; + int num_req; if (odp_unlikely(len > (pool->seg_len * num))) return -1; - reset_seg(pkt_hdr, num); + /* Free possible extra segments */ + num_req = num_segments(len, pool->seg_len); + if (odp_unlikely(num_req < num)) + free_segments(pkt_hdr, num - num_req, 0, 0, 0); + reset_seg(pkt_hdr, num_req); packet_init(pkt_hdr, len); commit cc4e3434ca806736fd0c586ed36bc34f3d3b2bd4 Author: Matias Elo <matias.elo(a)nokia.com> Date: Tue Sep 17 14:58:07 2019 +0300 linux-gen: packet: reimplement segmentation using linked list Packet segmentation has been reimplemented using a linked list. The new implementation is more simple and has the added benefit of reducing packet and buffer header sizes: odp_packet_hdr_t: 384B -> 256B odp_buffer_hdr_t: 256B -> 64B The dynamic packet reference implementation has been temporarily downgraded to a simple packet copy. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/platform/linux-generic/include-abi/odp/api/abi/packet.h b/platform/linux-generic/include-abi/odp/api/abi/packet.h index e11aed978..0967f1ec6 100644 --- a/platform/linux-generic/include-abi/odp/api/abi/packet.h +++ b/platform/linux-generic/include-abi/odp/api/abi/packet.h @@ -1,4 +1,5 @@ /* Copyright (c) 2015-2018, Linaro Limited + * Copyright (c) 2019, Nokia * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause @@ -30,22 +31,11 @@ typedef ODP_HANDLE_T(odp_packet_t); #define ODP_PACKET_OFFSET_INVALID 0xffff -typedef uint8_t odp_packet_seg_t; +typedef ODP_HANDLE_T(odp_packet_seg_t); -/* or it will be provided by packet_inlines.h */ -#define _ODP_HAVE_PACKET_SEG_NDX 1 +#define ODP_PACKET_SEG_INVALID _odp_cast_scalar(odp_packet_seg_t, 0) -static inline uint8_t _odp_packet_seg_to_ndx(odp_packet_seg_t seg) -{ - return (uint8_t)seg; -} - -static inline odp_packet_seg_t _odp_packet_seg_from_ndx(uint8_t ndx) -{ - return (odp_packet_seg_t)ndx; -} - -#define ODP_PACKET_SEG_INVALID ((odp_packet_seg_t)-1) +#define ODP_PACKET_OFFSET_INVALID 0xffff typedef uint8_t odp_proto_l2_type_t; diff --git a/platform/linux-generic/include/odp/api/plat/packet_inline_types.h b/platform/linux-generic/include/odp/api/plat/packet_inline_types.h index 71065172d..0f9dea38b 100644 --- a/platform/linux-generic/include/odp/api/plat/packet_inline_types.h +++ b/platform/linux-generic/include/odp/api/plat/packet_inline_types.h @@ -1,4 +1,5 @@ /* Copyright (c) 2015-2018, Linaro Limited + * Copyright (c) 2019, Nokia * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause @@ -28,14 +29,14 @@ extern "C" { /* Packet header field offsets for inline functions */ typedef struct _odp_packet_inline_offset_t { - uint16_t data; + uint16_t seg_data; uint16_t seg_len; uint16_t frame_len; uint16_t headroom; uint16_t tailroom; uint16_t pool; uint16_t input; - uint16_t segcount; + uint16_t seg_count; uint16_t user_ptr; uint16_t user_area; uint16_t l2_offset; diff --git a/platform/linux-generic/include/odp/api/plat/packet_inlines.h b/platform/linux-generic/include/odp/api/plat/packet_inlines.h index 3851af4c7..5232fb1e3 100644 --- a/platform/linux-generic/include/odp/api/plat/packet_inlines.h +++ b/platform/linux-generic/include/odp/api/plat/packet_inlines.h @@ -1,4 +1,5 @@ /* Copyright (c) 2017-2018, Linaro Limited + * Copyright (c) 2019, Nokia * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause @@ -56,8 +57,6 @@ #define odp_packet_head __odp_packet_head #define odp_packet_is_segmented __odp_packet_is_segmented #define odp_packet_first_seg __odp_packet_first_seg - #define odp_packet_last_seg __odp_packet_last_seg - #define odp_packet_next_seg __odp_packet_next_seg #define odp_packet_prefetch __odp_packet_prefetch #define odp_packet_copy_from_mem __odp_packet_copy_from_mem #define odp_packet_copy_to_mem __odp_packet_copy_to_mem @@ -72,7 +71,7 @@ #endif void *_odp_packet_map(void *pkt_ptr, uint32_t offset, uint32_t *seg_len, - int *seg_idx); + odp_packet_seg_t *seg); int _odp_packet_copy_from_mem_seg(odp_packet_t pkt, uint32_t offset, uint32_t len, const void *src); @@ -83,22 +82,9 @@ int _odp_packet_copy_to_mem_seg(odp_packet_t pkt, uint32_t offset, extern const _odp_packet_inline_offset_t _odp_packet_inline; extern const _odp_pool_inline_offset_t _odp_pool_inline; -#ifndef _ODP_HAVE_PACKET_SEG_NDX -#include <odp/api/plat/strong_types.h> -static inline uint32_t _odp_packet_seg_to_ndx(odp_packet_seg_t seg) -{ - return _odp_typeval(seg) - 1; -} - -static inline odp_packet_seg_t _odp_packet_seg_from_ndx(uint32_t ndx) -{ - return _odp_cast_scalar(odp_packet_seg_t, ndx + 1); -} -#endif - _ODP_INLINE void *odp_packet_data(odp_packet_t pkt) { - return _odp_pkt_get(pkt, void *, data); + return _odp_pkt_get(pkt, void *, seg_data); } _ODP_INLINE uint32_t odp_packet_seg_len(odp_packet_t pkt) @@ -149,7 +135,7 @@ _ODP_INLINE int odp_packet_input_index(odp_packet_t pkt) _ODP_INLINE int odp_packet_num_segs(odp_packet_t pkt) { - return _odp_pkt_get(pkt, uint8_t, segcount); + return _odp_pkt_get(pkt, uint8_t, seg_count); } _ODP_INLINE void *odp_packet_user_ptr(odp_packet_t pkt) @@ -262,29 +248,12 @@ _ODP_INLINE void *odp_packet_head(odp_packet_t pkt) _ODP_INLINE int odp_packet_is_segmented(odp_packet_t pkt) { - return _odp_pkt_get(pkt, uint8_t, segcount) > 1; + return _odp_pkt_get(pkt, uint8_t, seg_count) > 1; } _ODP_INLINE odp_packet_seg_t odp_packet_first_seg(odp_packet_t pkt) { - (void)pkt; - - return _odp_packet_seg_from_ndx(0); -} - -_ODP_INLINE odp_packet_seg_t odp_packet_last_seg(odp_packet_t pkt) -{ - return _odp_packet_seg_from_ndx(odp_packet_num_segs(pkt) - 1); -} - -_ODP_INLINE odp_packet_seg_t odp_packet_next_seg(odp_packet_t pkt, - odp_packet_seg_t seg) -{ - if (odp_unlikely(_odp_packet_seg_to_ndx(seg) >= - _odp_packet_seg_to_ndx(odp_packet_last_seg(pkt)))) - return ODP_PACKET_SEG_INVALID; - - return seg + 1; + return (odp_packet_seg_t)pkt; } _ODP_INLINE void odp_packet_prefetch(odp_packet_t pkt, uint32_t offset, diff --git a/platform/linux-generic/include/odp_buffer_internal.h b/platform/linux-generic/include/odp_buffer_internal.h index f759aac35..1c52b028f 100644 --- a/platform/linux-generic/include/odp_buffer_internal.h +++ b/platform/linux-generic/include/odp_buffer_internal.h @@ -1,4 +1,5 @@ /* Copyright (c) 2013-2018, Linaro Limited + * Copyright (c) 2019, Nokia * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause @@ -32,12 +33,6 @@ extern "C" { #include <odp_schedule_if.h> #include <stddef.h> -typedef struct seg_entry_t { - void *hdr; - uint8_t *data; - uint32_t len; -} seg_entry_t; - typedef union buffer_index_t { uint32_t u32; @@ -58,47 +53,15 @@ ODP_STATIC_ASSERT(CONFIG_POOL_MAX_NUM <= (0xFFFFFF + 1), "TOO_LARGE_POOL"); /* Common buffer header */ struct ODP_ALIGNED_CACHE odp_buffer_hdr_t { - /* Combined pool and buffer index */ - buffer_index_t index; - - /* Total segment count */ - uint16_t segcount; - - /* Pool type */ - int8_t type; - - /* Number of seg[] entries used */ - uint8_t num_seg; - - /* Next header which continues the segment list */ - void *next_seg; - - /* Last header of the segment list */ - void *last_seg; - /* Initial buffer data pointer */ uint8_t *base_data; /* Pool pointer */ - void *pool_ptr; - - /* --- 40 bytes --- */ - - /* Segments */ - seg_entry_t seg[CONFIG_PACKET_SEGS_PER_HDR]; + void *pool_ptr; /* --- Mostly read only data --- */ const void *user_ptr; - /* Reference count */ - odp_atomic_u32_t ref_cnt; - - /* Event type. Maybe different than pool type (crypto compl event) */ - int8_t event_type; - - /* Event flow id */ - uint8_t flow_id; - /* Initial buffer tail pointer */ uint8_t *buf_end; @@ -109,13 +72,25 @@ struct ODP_ALIGNED_CACHE odp_buffer_hdr_t { * offset has to be used */ uint64_t ipc_data_offset; + /* Combined pool and buffer index */ + buffer_index_t index; + + /* Reference count */ + odp_atomic_u32_t ref_cnt; + + /* Pool type */ + int8_t type; + + /* Event type. Maybe different than pool type (crypto compl event) */ + int8_t event_type; + + /* Event flow id */ + uint8_t flow_id; + /* Data or next header */ uint8_t data[0]; }; -ODP_STATIC_ASSERT(CONFIG_PACKET_SEGS_PER_HDR < 256, - "CONFIG_PACKET_SEGS_PER_HDR_TOO_LARGE"); - odp_event_type_t _odp_buffer_event_type(odp_buffer_t buf); void _odp_buffer_event_type_set(odp_buffer_t buf, int ev); int odp_buffer_snprint(char *str, uint32_t n, odp_buffer_t buf); diff --git a/platform/linux-generic/include/odp_config_internal.h b/platform/linux-generic/include/odp_config_internal.h index 2e1d61d36..e283472a0 100644 --- a/platform/linux-generic/include/odp_config_internal.h +++ b/platform/linux-generic/include/odp_config_internal.h @@ -1,4 +1,5 @@ /* Copyright (c) 2016-2018, Linaro Limited + * Copyright (c) 2019, Nokia * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause @@ -88,21 +89,6 @@ extern "C" { */ #define CONFIG_PACKET_TAILROOM 0 -/* - * Maximum number of segments per packet - */ -#define CONFIG_PACKET_MAX_SEGS 255 - -/* - * Packet segmentation disabled - */ -#define CONFIG_PACKET_SEG_DISABLED (CONFIG_PACKET_MAX_SEGS == 1) - -/* - * Number of segments stored in a packet header - */ -#define CONFIG_PACKET_SEGS_PER_HDR 6 - /* * Maximum packet data length in bytes */ diff --git a/platform/linux-generic/include/odp_packet_dpdk.h b/platform/linux-generic/include/odp_packet_dpdk.h index 2b6b859c4..970b97fca 100644 --- a/platform/linux-generic/include/odp_packet_dpdk.h +++ b/platform/linux-generic/include/odp_packet_dpdk.h @@ -1,4 +1,5 @@ /* Copyright (c) 2016-2018, Linaro Limited + * Copyright (c) 2019, Nokia * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause @@ -51,8 +52,8 @@ static inline int _odp_dpdk_packet_parse_layer(odp_packet_hdr_t *pkt_hdr, uint32_t supported_ptypes, odp_pktin_config_opt_t pktin_cfg) { - uint32_t seg_len = pkt_hdr->buf_hdr.seg[0].len; - void *base = pkt_hdr->buf_hdr.seg[0].data; + uint32_t seg_len = pkt_hdr->seg_len; + void *base = pkt_hdr->seg_data; return _odp_dpdk_packet_parse_common(&pkt_hdr->p, base, pkt_hdr->frame_len, seg_len, mbuf, diff --git a/platform/linux-generic/include/odp_packet_internal.h b/platform/linux-generic/include/odp_packet_internal.h index 2e5ef30b8..a0e33222e 100644 --- a/platform/linux-generic/include/odp_packet_internal.h +++ b/platform/linux-generic/include/odp_packet_internal.h @@ -1,4 +1,5 @@ /* Copyright (c) 2013-2018, Linaro Limited + * Copyright (c) 2019, Nokia * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause @@ -30,6 +31,8 @@ extern "C" { #include <odp/api/abi/packet.h> #include <odp_queue_if.h> +#include <stdint.h> + /** Minimum segment length expected by packet_parse_common() */ #define PACKET_PARSE_SEG_LEN 96 @@ -65,6 +68,11 @@ typedef struct { /* Packet extra data types */ #define PKT_EXTRA_TYPE_DPDK 1 +/* Maximum number of segments per packet */ +#define PKT_MAX_SEGS 255 + +ODP_STATIC_ASSERT(PKT_MAX_SEGS < UINT16_MAX, "PACKET_MAX_SEGS_ERROR"); + /** * Internal Packet header * @@ -72,32 +80,39 @@ typedef struct { * packet_init(). Because of this any new fields added must be reviewed for * initialization requirements. */ -typedef struct { - /* common buffer header */ +typedef struct odp_packet_hdr_t { + /* Common buffer header */ odp_buffer_hdr_t buf_hdr; - /* - * Following members are initialized by packet_init() - */ + /* --- 64 bytes --- */ + + /* Segment data start */ + uint8_t *seg_data; packet_parser_t p; odp_pktio_t input; + /* Next header which continues the segment list */ + struct odp_packet_hdr_t *seg_next; + + /* Total packet length */ uint32_t frame_len; + /* Segment data length */ + uint32_t seg_len; + + /* Total segment count */ + uint16_t seg_count; + uint16_t headroom; + uint16_t tailroom; /* Event subtype */ - int8_t subtype; + int8_t subtype; - /* - * Members below are not initialized by packet_init() - */ - - /* Flow hash value */ - uint32_t flow_hash; + /* --- 128 bytes --- */ /* Timestamp value */ odp_time_t timestamp; @@ -105,6 +120,9 @@ typedef struct { /* Classifier destination queue */ odp_queue_t dst_queue; + /* Flow hash value */ + uint32_t flow_hash; + union { struct { /* Result for crypto packet op */ @@ -145,14 +163,12 @@ static inline odp_packet_t packet_from_buf_hdr(odp_buffer_hdr_t *buf_hdr) return (odp_packet_t)(odp_packet_hdr_t *)buf_hdr; } -static inline seg_entry_t *seg_entry_last(odp_packet_hdr_t *hdr) +static inline odp_packet_hdr_t *packet_last_seg(odp_packet_hdr_t *hdr) { - odp_packet_hdr_t *last; - uint8_t last_seg; + while (hdr->seg_next != NULL) + hdr = hdr->seg_next; - last = hdr->buf_hdr.last_seg; - last_seg = last->buf_hdr.num_seg - 1; - return &last->buf_hdr.seg[last_seg]; + return hdr; } static inline void packet_subtype_set(odp_packet_t pkt, int ev) @@ -167,19 +183,19 @@ static inline void packet_init(odp_packet_hdr_t *pkt_hdr, uint32_t len) { pool_t *pool = pkt_hdr->buf_hdr.pool_ptr; uint32_t seg_len; - int num = pkt_hdr->buf_hdr.segcount; + int num = pkt_hdr->seg_count; - if (odp_likely(CONFIG_PACKET_SEG_DISABLED || num == 1)) { + if (odp_likely(num == 1)) { seg_len = len; - pkt_hdr->buf_hdr.seg[0].len = len; + pkt_hdr->seg_len = len; } else { - seg_entry_t *last; + odp_packet_hdr_t *last; seg_len = len - ((num - 1) * pool->seg_len); /* Last segment data length */ - last = seg_entry_last(pkt_hdr); - last->len = seg_len; + last = packet_last_seg(pkt_hdr); + last->seg_len = seg_len; } pkt_hdr->p.input_flags.all = 0; @@ -221,11 +237,11 @@ static inline void copy_packet_cls_metadata(odp_packet_hdr_t *src_hdr, static inline void pull_tail(odp_packet_hdr_t *pkt_hdr, uint32_t len) { - seg_entry_t *last = seg_entry_last(pkt_hdr); + odp_packet_hdr_t *last = packet_last_seg(pkt_hdr); pkt_hdr->tailroom += len; pkt_hdr->frame_len -= len; - last->len -= len; + last->seg_len -= len; } static inline uint32_t packet_len(odp_packet_hdr_t *pkt_hdr) diff --git a/platform/linux-generic/odp_buffer.c b/platform/linux-generic/odp_buffer.c index 67f0d4e26..f39f76a57 100644 --- a/platform/linux-generic/odp_buffer.c +++ b/platform/linux-generic/odp_buffer.c @@ -1,4 +1,5 @@ /* Copyright (c) 2013-2018, Linaro Limited + * Copyright (c) 2019, Nokia * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause @@ -38,7 +39,7 @@ void *odp_buffer_addr(odp_buffer_t buf) { odp_buffer_hdr_t *hdr = buf_hdl_to_hdr(buf); - return hdr->seg[0].data; + return hdr->base_data; } uint32_t odp_buffer_size(odp_buffer_t buf) @@ -69,7 +70,7 @@ int odp_buffer_snprint(char *str, uint32_t n, odp_buffer_t buf) " pool %" PRIu64 "\n", odp_pool_to_u64(pool->pool_hdl)); len += snprintf(&str[len], n - len, - " addr %p\n", hdr->seg[0].data); + " addr %p\n", hdr->base_data); len += snprintf(&str[len], n - len, " size %" PRIu32 "\n", odp_buffer_size(buf)); len += snprintf(&str[len], n - len, diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index a785ecef9..e2d768a23 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -1,4 +1,5 @@ /* Copyright (c) 2013-2018, Linaro Limited + * Copyright (c) 2019, Nokia * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause @@ -35,14 +36,14 @@ /* Fill in packet header field offsets for inline functions */ const _odp_packet_inline_offset_t ODP_ALIGNED_CACHE _odp_packet_inline = { - .data = offsetof(odp_packet_hdr_t, buf_hdr.seg[0].data), - .seg_len = offsetof(odp_packet_hdr_t, buf_hdr.seg[0].len), + .seg_data = offsetof(odp_packet_hdr_t, seg_data), + .seg_len = offsetof(odp_packet_hdr_t, seg_len), .frame_len = offsetof(odp_packet_hdr_t, frame_len), .headroom = offsetof(odp_packet_hdr_t, headroom), .tailroom = offsetof(odp_packet_hdr_t, tailroom), .pool = offsetof(odp_packet_hdr_t, buf_hdr.pool_ptr), .input = offsetof(odp_packet_hdr_t, input), - .segcount = offsetof(odp_packet_hdr_t, buf_hdr.segcount), + .seg_count = offsetof(odp_packet_hdr_t, seg_count), .user_ptr = offsetof(odp_packet_hdr_t, buf_hdr.user_ptr), .user_area = offsetof(odp_packet_hdr_t, buf_hdr.uarea_addr), .l2_offset = offsetof(odp_packet_hdr_t, p.l2_offset), @@ -72,155 +73,80 @@ static inline odp_buffer_t packet_to_buffer(odp_packet_t pkt) return (odp_buffer_t)pkt; } -static inline seg_entry_t *seg_entry(odp_packet_hdr_t *hdr, - uint32_t seg_idx) +static inline odp_packet_hdr_t *packet_seg_to_hdr(odp_packet_seg_t seg) { - uint32_t idx = 0; - uint8_t num_seg = hdr->buf_hdr.num_seg; - - while (odp_unlikely(idx + num_seg - 1 < seg_idx)) { - idx += num_seg; - hdr = hdr->buf_hdr.next_seg; - num_seg = hdr->buf_hdr.num_seg; - } - - idx = seg_idx - idx; - - return &hdr->buf_hdr.seg[idx]; + return (odp_packet_hdr_t *)(uintptr_t)seg; } -static inline void seg_entry_find_idx(odp_packet_hdr_t **p_hdr, - uint8_t *p_idx, - uint32_t find_idx) +static inline odp_packet_seg_t packet_hdr_to_seg(odp_packet_hdr_t *pkt_hdr) { - odp_packet_hdr_t *hdr = *p_hdr; - uint32_t idx = 0; - uint8_t num_seg = hdr->buf_hdr.num_seg; - - while (odp_unlikely(idx + num_seg - 1 < find_idx)) { - idx += num_seg; - hdr = hdr->buf_hdr.next_seg; - num_seg = hdr->buf_hdr.num_seg; - } - - idx = find_idx - idx; - *p_hdr = hdr; - *p_idx = idx; + return (odp_packet_seg_t)pkt_hdr; } -/* Return pointer to the current segment entry and step cur_hdr / cur_idx - * forward. +/* + * Return pointer to the current segment and step cur_hdr forward. */ -static inline seg_entry_t *seg_entry_next(odp_packet_hdr_t **cur_hdr, - uint8_t *cur_idx) +static inline odp_packet_hdr_t *packet_seg_step(odp_packet_hdr_t **cur_hdr) { odp_packet_hdr_t *hdr = *cur_hdr; - uint8_t idx = *cur_idx; - uint8_t num_seg = hdr->buf_hdr.num_seg; - if (idx == num_seg - 1) { - *cur_hdr = hdr->buf_hdr.next_seg; - *cur_idx = 0; - } else { - *cur_idx = idx + 1; - } + *cur_hdr = hdr->seg_next; - return &hdr->buf_hdr.seg[idx]; + return hdr; } -static inline void seg_entry_find_offset(odp_packet_hdr_t **p_hdr, - uint8_t *p_idx, - uint32_t *seg_offset, - uint32_t *seg_idx, - uint32_t offset) +static inline void packet_seg_find_idx(odp_packet_hdr_t **pkt_hdr, + uint32_t find_idx) { - int i; - odp_packet_hdr_t *hdr, *cur_hdr; - uint8_t idx, cur_idx; - seg_entry_t *seg = NULL; - uint32_t seg_start = 0, seg_end = 0; - int seg_count; - - hdr = *p_hdr; - cur_hdr = hdr; - idx = 0; - cur_idx = 0; - seg_count = hdr->buf_hdr.segcount; - - for (i = 0; i < seg_count; i++) { - cur_hdr = hdr; - cur_idx = idx; - seg = seg_entry_next(&hdr, &idx); - seg_end += seg->len; - - if (odp_likely(offset < seg_end)) - break; + odp_packet_hdr_t *hdr = *pkt_hdr; + uint32_t idx = 0; - seg_start = seg_end; + while (odp_unlikely(idx < find_idx)) { + idx++; + hdr = hdr->seg_next; } - *p_hdr = cur_hdr; - *p_idx = cur_idx; - *seg_offset = offset - seg_start; - *seg_idx = i; + *pkt_hdr = hdr; } static inline uint32_t packet_seg_len(odp_packet_hdr_t *pkt_hdr, uint32_t seg_idx) { - seg_entry_t *seg = seg_entry(pkt_hdr, seg_idx); - - return seg->len; -} - -static inline void *packet_seg_data(odp_packet_hdr_t *pkt_hdr, uint32_t seg_idx) -{ - seg_entry_t *seg = seg_entry(pkt_hdr, seg_idx); - - return seg->data; -} + packet_seg_find_idx(&pkt_hdr, seg_idx); -static inline uint16_t packet_last_seg(odp_packet_hdr_t *pkt_hdr) -{ - if (CONFIG_PACKET_SEG_DISABLED) - return 0; - else - return pkt_hdr->buf_hdr.segcount - 1; + return pkt_hdr->seg_len; } static inline uint32_t packet_first_seg_len(odp_packet_hdr_t *pkt_hdr) { - return pkt_hdr->buf_hdr.seg[0].len; + return pkt_hdr->seg_len; } static inline void *packet_data(odp_packet_hdr_t *pkt_hdr) { - return pkt_hdr->buf_hdr.seg[0].data; + return pkt_hdr->seg_data; } static inline void *packet_tail(odp_packet_hdr_t *pkt_hdr) { - seg_entry_t *last_seg = seg_entry_last(pkt_hdr); + odp_packet_hdr_t *last_seg = packet_last_seg(pkt_hdr); - return last_seg->data + last_seg->len; + return last_seg->seg_data + last_seg->seg_len; } -static inline uint32_t seg_headroom(odp_packet_hdr_t *pkt_hdr, int seg_idx) +static inline uint32_t seg_headroom(odp_packet_hdr_t *pkt_seg) { - seg_entry_t *seg = seg_entry(pkt_hdr, seg_idx); - odp_buffer_hdr_t *hdr = seg->hdr; + odp_buffer_hdr_t *hdr = &pkt_seg->buf_hdr; uint8_t *base = hdr->base_data; - uint8_t *head = seg->data; + uint8_t *head = pkt_seg->seg_data; return CONFIG_PACKET_HEADROOM + (head - base); } -static inline uint32_t seg_tailroom(odp_packet_hdr_t *pkt_hdr, int seg_idx) +static inline uint32_t seg_tailroom(odp_packet_hdr_t *pkt_seg) { - seg_entry_t *seg = seg_entry(pkt_hdr, seg_idx); - - odp_buffer_hdr_t *hdr = seg->hdr; - uint8_t *tail = seg->data + seg->len; + odp_buffer_hdr_t *hdr = &pkt_seg->buf_hdr; + uint8_t *tail = pkt_seg->seg_data + pkt_seg->seg_len; return hdr->buf_end - tail; } @@ -229,25 +155,25 @@ static inline void push_head(odp_packet_hdr_t *pkt_hdr, uint32_t len) { pkt_hdr->headroom -= len; pkt_hdr->frame_len += len; - pkt_hdr->buf_hdr.seg[0].data -= len; - pkt_hdr->buf_hdr.seg[0].len += len; + pkt_hdr->seg_data -= len; + pkt_hdr->seg_len += len; } static inline void pull_head(odp_packet_hdr_t *pkt_hdr, uint32_t len) { pkt_hdr->headroom += len; pkt_hdr->frame_len -= len; - pkt_hdr->buf_hdr.seg[0].data += len; - pkt_hdr->buf_hdr.seg[0].len -= len; + pkt_hdr->seg_data += len; + pkt_hdr->seg_len -= len; } static inline void push_tail(odp_packet_hdr_t *pkt_hdr, uint32_t len) { - seg_entry_t *last_seg = seg_entry_last(pkt_hdr); + odp_packet_hdr_t *last_seg = packet_last_seg(pkt_hdr); pkt_hdr->tailroom -= len; pkt_hdr->frame_len += len; - last_seg->len += len; + last_seg->seg_len += len; } /* Copy all metadata for segmentation modification. Segment data and lengths @@ -273,39 +199,34 @@ static inline void packet_seg_copy_md(odp_packet_hdr_t *dst, dst->buf_hdr.uarea_addr = src->buf_hdr.uarea_addr; /* segmentation data is not copied: - * buf_hdr.seg[] - * buf_hdr.segcount - * buf_hdr.num_seg - * buf_hdr.next_seg - * buf_hdr.last_seg + * seg_next + * seg_data + * seg_len + * seg_count */ } static inline void *packet_map(void *pkt_ptr, uint32_t offset, - uint32_t *seg_len, int *seg_idx) + uint32_t *seg_len, odp_packet_seg_t *seg) { void *addr; uint32_t len; odp_packet_hdr_t *pkt_hdr = pkt_ptr; - int seg_id = 0; - int seg_count = pkt_hdr->buf_hdr.segcount; + int seg_count = pkt_hdr->seg_count; if (odp_unlikely(offset >= pkt_hdr->frame_len)) return NULL; - if (odp_likely(CONFIG_PACKET_SEG_DISABLED || seg_count == 1)) { - addr = pkt_hdr->buf_hdr.seg[0].data + offset; - len = pkt_hdr->buf_hdr.seg[0].len - offset; + if (odp_likely(seg_count == 1)) { + addr = pkt_hdr->seg_data + offset; + len = pkt_hdr->seg_len - offset; } else { - int i; - seg_entry_t *seg = NULL; + odp_packet_hdr_t *next_hdr = pkt_hdr; uint32_t seg_start = 0, seg_end = 0; - odp_packet_hdr_t *hdr = pkt_hdr; - uint8_t idx = 0; - for (i = 0; i < seg_count; i++) { - seg = seg_entry_next(&hdr, &idx); - seg_end += seg->len; + while (next_hdr != NULL) { + pkt_hdr = packet_seg_step(&next_hdr); + seg_end += pkt_hdr->seg_len; if (odp_likely(offset < seg_end)) break; @@ -313,16 +234,15 @@ static inline void *packet_map(void *pkt_ptr, uint32_t offset, seg_start = seg_end; } - addr = seg->data + (offset - seg_start); - len = seg->len - (offset - seg_start); - seg_id = i; + addr = pkt_hdr->seg_data + (offset - seg_start); + len = pkt_hdr->seg_len - (offset - seg_start); } if (seg_len) *seg_len = len; - if (seg_idx) - *seg_idx = seg_id; + if (seg) + *seg = packet_hdr_to_seg(pkt_hdr); return addr; } @@ -332,9 +252,9 @@ static inline void *packet_map(void *pkt_ptr, uint32_t offset, /* This file uses the inlined version directly. Inlined API calls use this when * offset does not point to the first segment. */ void *_odp_packet_map(void *pkt_ptr, uint32_t offset, uint32_t *seg_len, - int *seg_idx) + odp_packet_seg_t *seg) { - return packet_map(pkt_ptr, offset, seg_len, seg_idx); + return packet_map(pkt_ptr, offset, seg_len, seg); } int _odp_packet_copy_from_mem_seg(odp_packet_t pkt, uint32_t offset, @@ -399,46 +319,38 @@ void packet_parse_reset(odp_packet_hdr_t *pkt_hdr) static inline void link_segments(odp_packet_hdr_t *pkt_hdr[], int num) { - int cur, i; + int cur = 0; odp_packet_hdr_t *hdr; odp_packet_hdr_t *head = pkt_hdr[0]; uint32_t seg_len = ((pool_t *)(head->buf_hdr.pool_ptr))->seg_len; - cur = 0; - while (1) { - hdr = pkt_hdr[cur]; + odp_buffer_hdr_t *buf_hdr = &pkt_hdr[cur]->buf_hdr; - for (i = 0; i < CONFIG_PACKET_SEGS_PER_HDR; i++) { - odp_buffer_hdr_t *buf_hdr; + hdr = pkt_hdr[cur]; + hdr->seg_data = buf_hdr->base_data; + hdr->seg_len = seg_len; - buf_hdr = &pkt_hdr[cur]->buf_hdr; - hdr->buf_hdr.seg[i].hdr = buf_hdr; - hdr->buf_hdr.seg[i].data = buf_hdr->base_data; - hdr->buf_hdr.seg[i].len = seg_len; + /* init_segments() handles first seg ref_cnt init */ + if (ODP_DEBUG == 1 && cur > 0) { + uint32_t prev_ref; + odp_atomic_u32_t *ref_cnt; - /* init_segments() handles first seg ref_cnt init */ - if (ODP_DEBUG == 1 && cur > 0) { - uint32_t prev_ref = - odp_atomic_fetch_inc_u32( - &pkt_hdr[cur]->buf_hdr.ref_cnt); + ref_cnt = &pkt_hdr[cur]->buf_hdr.ref_cnt; + prev_ref = odp_atomic_fetch_inc_u32(ref_cnt); - ODP_ASSERT(prev_ref == 0); - } + ODP_ASSERT(prev_ref == 0); + } - cur++; + cur++; - if (cur == num) { - /* Last segment */ - hdr->buf_hdr.num_seg = i + 1; - hdr->buf_hdr.next_seg = NULL; - head->buf_hdr.last_seg = &hdr->buf_hdr; - return; - } + if (cur == num) { + /* Last segment */ + hdr->seg_next = NULL; + return; } - hdr->buf_hdr.num_seg = CONFIG_PACKET_SEGS_PER_HDR; - hdr->buf_hdr.next_seg = pkt_hdr[cur]; + hdr->seg_next = pkt_hdr[cur]; } } @@ -452,8 +364,11 @@ static inline void init_segments(odp_packet_hdr_t *pkt_hdr[], int num) seg_len = ((pool_t *)(hdr->buf_hdr.pool_ptr))->seg_len; /* Defaults for single segment packet */ - hdr->buf_hdr.seg[0].data = hdr->buf_hdr.base_data; - hdr->buf_hdr.seg[0].len = seg_len; + hdr->seg_data = hdr->buf_hdr.base_data; + hdr->seg_len = seg_len; + hdr->seg_next = NULL; + + hdr->seg_count = num; if (ODP_DEBUG == 1) { uint32_t prev_ref = @@ -462,46 +377,32 @@ static inline void init_segments(odp_packet_hdr_t *pkt_hdr[], int num) ODP_ASSERT(prev_ref == 0); } - if (!CONFIG_PACKET_SEG_DISABLED) { - hdr->buf_hdr.segcount = num; - hdr->buf_hdr.num_seg = 1; - hdr->buf_hdr.next_seg = NULL; - hdr->buf_hdr.last_seg = &hdr->buf_hdr; - - /* Link segments */ - if (odp_unlikely(num > 1)) - link_segments(pkt_hdr, num); - } + /* Link segments */ + if (odp_unlikely(num > 1)) + link_segments(pkt_hdr, num); } -static inline void reset_seg(odp_packet_hdr_t *pkt_hdr, int first, int num) +static inline void reset_seg(odp_packet_hdr_t *pkt_hdr, int num) { odp_packet_hdr_t *hdr = pkt_hdr; void *base; int i; - seg_entry_t *seg; uint32_t seg_len = ((pool_t *)(hdr->buf_hdr.pool_ptr))->seg_len; - uint8_t idx; - - seg_entry_find_idx(&hdr, &idx, first); for (i = 0; i < num; i++) { base = hdr->buf_hdr.base_data; - seg = seg_entry_next(&hdr, &idx); - seg->len = seg_len; - seg->data = base; + + hdr->seg_len = seg_len; + hdr->seg_data = base; + + hdr = hdr->seg_next; } } /* Calculate the number of segments */ static inline int num_segments(uint32_t len, uint32_t seg_len) { - int num; - - if (CONFIG_PACKET_SEG_DISABLED) - return 1; - - num = 1; + int num = 1; if (odp_unlikely(len > seg_len)) { num = len / seg_len; @@ -515,11 +416,10 @@ static inline int num_segments(uint32_t len, uint32_t seg_len) static inline void add_all_segs(odp_packet_hdr_t *to, odp_packet_hdr_t *from) { - odp_packet_hdr_t *last = to->buf_hdr.last_seg; + odp_packet_hdr_t *last = packet_last_seg(to); - last->buf_hdr.next_seg = from; - to->buf_hdr.last_seg = from->buf_hdr.last_seg; - to->buf_hdr.segcount += from->buf_hdr.segcount; + last->seg_next = from; + to->seg_count += from->seg_count; } static inline odp_packet_hdr_t *alloc_segments(pool_t *pool, int num) @@ -561,8 +461,8 @@ static inline odp_packet_hdr_t *add_segments(odp_packet_hdr_t *pkt_hdr, add_all_segs(new_hdr, pkt_hdr); /* adjust first segment length */ - new_hdr->buf_hdr.seg[0].data += offset; - new_hdr->buf_hdr.seg[0].len = seg_len; + new_hdr->seg_data += offset; + new_hdr->seg_len = seg_len; packet_seg_copy_md(new_hdr, pkt_hdr); new_hdr->frame_len = pkt_hdr->frame_len + len; @@ -571,14 +471,14 @@ static inline odp_packet_hdr_t *add_segments(odp_packet_hdr_t *pkt_hdr, pkt_hdr = new_hdr; } else { - seg_entry_t *last_seg; + odp_packet_hdr_t *last_seg; /* add into the tail */ add_all_segs(pkt_hdr, new_hdr); /* adjust last segment length */ - last_seg = seg_entry_last(pkt_hdr); - last_seg->len = seg_len; + last_seg = packet_last_seg(pkt_hdr); + last_seg->seg_len = seg_len; pkt_hdr->frame_len += len; pkt_hdr->tailroom = pool->tailroom + offset; @@ -587,13 +487,6 @@ static inline odp_packet_hdr_t *add_segments(odp_packet_hdr_t *pkt_hdr, return pkt_hdr; } -static inline int seg_is_link(void *hdr) -{ - odp_packet_hdr_t *pkt_hdr = hdr; - - return pkt_hdr != pkt_hdr->buf_hdr.seg[0].hdr; -} - static inline void buffer_ref_inc(odp_buffer_hdr_t *buf_hdr) { uint32_t ref_cnt = odp_atomic_load_u32(&buf_hdr->ref_cnt); @@ -622,15 +515,11 @@ static inline int is_multi_ref(uint32_t ref_cnt) static inline void packet_ref_inc(odp_packet_hdr_t *pkt_hdr) { - seg_entry_t *seg; - int i; - int seg_count = pkt_hdr->buf_hdr.segcount; odp_packet_hdr_t *hdr = pkt_hdr; - uint8_t idx = 0; - for (i = 0; i < seg_count; i++) { - seg = seg_entry_next(&hdr, &idx); - buffer_ref_inc(seg->hdr); + while (hdr != NULL) { + buffer_ref_inc(&hdr->buf_hdr); + hdr = hdr->seg_next; } } @@ -653,10 +542,6 @@ static inline void packet_free_multi(odp_buffer_hdr_t *hdr[], int num) } } - /* Reset link header back to normal header */ - if (odp_unlikely(seg_is_link(hdr[i]))) - hdr[i]->seg[0].hdr = hdr[i]; - /* Skip references and pack to be freed headers to array head */ if (odp_unlikely(num_ref)) hdr[i - num_ref] = hdr[i]; @@ -672,35 +557,12 @@ static inline void packet_free_multi(odp_buffer_hdr_t *hdr[], int num) static inline void free_all_segments(odp_packet_hdr_t *pkt_hdr, int num) { int i; - odp_buffer_hdr_t *buf_hdr[num + 1]; - - if (odp_likely(pkt_hdr->buf_hdr.num_seg == num)) { - for (i = 0; i < num; i++) - buf_hdr[i] = pkt_hdr->buf_hdr.seg[i].hdr; - - if (odp_unlikely(seg_is_link(pkt_hdr))) { - buf_hdr[num] = &pkt_hdr->buf_hdr; - num++; - } - } else { - seg_entry_t *seg; - odp_buffer_hdr_t *link_hdr[num]; - uint8_t idx = 0; - int links = 0; - - for (i = 0; i < num; i++) { - /* Free also link headers */ - if (odp_unlikely(idx == 0 && seg_is_link(pkt_hdr))) { - link_hdr[links] = &pkt_hdr->buf_hdr; - links++; - } - - seg = seg_entry_next(&pkt_hdr, &idx); - buf_hdr[i] = seg->hdr; - } + odp_buffer_hdr_t *buf_hdr[num]; + odp_packet_hdr_t *seg = pkt_hdr; - if (odp_unlikely(links)) - packet_free_multi(link_hdr, links); + for (i = 0; i < num; i++) { + buf_hdr[i] = &seg->buf_hdr; + seg = seg->seg_next; } packet_free_multi(buf_hdr, num); @@ -710,65 +572,35 @@ static inline odp_packet_hdr_t *free_segments(odp_packet_hdr_t *pkt_hdr, int num, uint32_t free_len, uint32_t pull_len, int head) { - seg_entry_t *seg; + odp_packet_hdr_t *seg; int i; - int num_remain = pkt_hdr->buf_hdr.segcount - num; + int num_remain = pkt_hdr->seg_count - num; odp_packet_hdr_t *hdr = pkt_hdr; - odp_packet_hdr_t *last_hdr = pkt_hdr->buf_hdr.last_seg; - uint8_t idx; - uint8_t num_seg; + odp_packet_hdr_t *last_hdr = packet_last_seg(pkt_hdr); odp_buffer_hdr_t *buf_hdr[num]; - odp_buffer_hdr_t *link_hdr[num]; - odp_packet_hdr_t *tmp_hdr; - int links = 0; if (head) { odp_packet_hdr_t *new_hdr; - idx = 0; for (i = 0; i < num; i++) { - tmp_hdr = hdr; - seg = seg_entry_next(&hdr, &idx); - buf_hdr[i] = seg->hdr; - - /* Free link headers, if those become empty */ - if (odp_unlikely(idx == 0 && seg_is_link(tmp_hdr))) { - link_hdr[links] = &tmp_hdr->buf_hdr; - links++; - } + seg = packet_seg_step(&hdr); + buf_hdr[i] = &seg->buf_hdr; } /* The first remaining header is the new packet descriptor. * Copy remaining segments from the last to-be-removed header * to the new header. */ - new_hdr = hdr->buf_hdr.seg[idx].hdr; - num_seg = hdr->buf_hdr.num_seg - idx; - - new_hdr->buf_hdr.next_seg = hdr->buf_hdr.next_seg; - - if (hdr == last_hdr) - new_hdr->buf_hdr.last_seg = new_hdr; - else - new_hdr->buf_hdr.last_seg = last_hdr; - - new_hdr->buf_hdr.num_seg = num_seg; - new_hdr->buf_hdr.segcount = num_remain; + new_hdr = hdr; - for (i = 0; i < num_seg; i++) { - seg = seg_entry_next(&hdr, &idx); - new_hdr->buf_hdr.seg[i] = *seg; - } + new_hdr->seg_next = hdr->seg_next; + new_hdr->seg_count = num_remain; packet_seg_copy_md(new_hdr, pkt_hdr); /* Tailroom not changed */ new_hdr->tailroom = pkt_hdr->tailroom; - /* Link header does not have headroom */ - if (seg_is_link(new_hdr)) - new_hdr->headroom = 0; - else - new_hdr->headroom = seg_headroom(new_hdr, 0); + new_hdr->headroom = seg_headroom(new_hdr); new_hdr->frame_len = pkt_hdr->frame_len - free_len; @@ -776,45 +608,29 @@ static inline odp_packet_hdr_t *free_segments(odp_packet_hdr_t *pkt_hdr, pkt_hdr = new_hdr; - if (odp_unlikely(links)) - packet_free_multi(link_hdr, links); - packet_free_multi(buf_hdr, num); } else { /* Free last 'num' bufs. * First, find the last remaining header. */ - seg_entry_find_idx(&hdr, &idx, num_remain - 1); + packet_seg_find_idx(&hdr, num_remain - 1); last_hdr = hdr; - num_seg = idx + 1; - seg_entry_next(&hdr, &idx); + packet_seg_step(&hdr); for (i = 0; i < num; i++) { - tmp_hdr = hdr; - seg = seg_entry_next(&hdr, &idx); - buf_hdr[i] = seg->hdr; - - /* Free link headers, if those become empty */ - if (odp_unlikely(idx == 0 && seg_is_link(tmp_hdr))) { - link_hdr[links] = &tmp_hdr->buf_hdr; - links++; - } + seg = packet_seg_step(&hdr); + buf_hdr[i] = &seg->buf_hdr; } - if (odp_unlikely(links)) - packet_free_multi(link_hdr, links); - packet_free_multi(buf_hdr, num); /* Head segment remains, no need to copy or update majority * of the metadata. */ - last_hdr->buf_hdr.num_seg = num_seg; - last_hdr->buf_hdr.next_seg = NULL; + last_hdr->seg_next = NULL; - pkt_hdr->buf_hdr.last_seg = last_hdr; - pkt_hdr->buf_hdr.segcount = num_remain; + pkt_hdr->seg_count = num_remain; pkt_hdr->frame_len -= free_len; - pkt_hdr->tailroom = seg_tailroom(pkt_hdr, num_remain - 1); + pkt_hdr->tailroom = seg_tailroom(pkt_hdr); pull_tail(pkt_hdr, pull_len); } @@ -923,22 +739,14 @@ int odp_packet_alloc_multi(odp_pool_t pool_hdl, uint32_t len, void odp_packet_free(odp_packet_t pkt) { odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); - int num_seg = pkt_hdr->buf_hdr.segcount; + int num_seg = pkt_hdr->seg_count; ODP_ASSERT(buffer_ref(&pkt_hdr->buf_hdr) > 0); - if (odp_likely(CONFIG_PACKET_SEG_DISABLED || num_seg == 1)) { - odp_buffer_hdr_t *buf_hdr[2]; - int num = 1; - - buf_hdr[0] = &pkt_hdr->buf_hdr; + if (odp_likely(num_seg == 1)) { + odp_buffer_hdr_t *buf_hdr = &pkt_hdr->buf_hdr; - if (odp_unlikely(seg_is_link(pkt_hdr))) { - num = 2; - buf_hdr[1] = pkt_hdr->buf_hdr.seg[0].hdr; - } - - packet_free_multi(buf_hdr, num); + packet_free_multi(&buf_hdr, 1); } else { free_all_segments(pkt_hdr, num_seg); } @@ -954,7 +762,7 @@ void odp_packet_free_multi(const odp_packet_t pkt[], int num) for (i = 0; i < num; i++) { odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt[i]); - int num_seg = pkt_hdr->buf_hdr.segcount; + int num_seg = pkt_hdr->seg_count; ODP_ASSERT(buffer_ref(&pkt_hdr->buf_hdr) > 0); @@ -964,11 +772,6 @@ void odp_packet_free_multi(const odp_packet_t pkt[], int num) continue; } - if (odp_unlikely(seg_is_link(pkt_hdr))) { - buf_hdr2[links] = pkt_hdr->buf_hdr.seg[0].hdr; - links++; - } - buf_hdr[i - num_freed] = &pkt_hdr->buf_hdr; } @@ -988,12 +791,12 @@ int odp_packet_reset(odp_packet_t pkt, uint32_t len) { odp_packet_hdr_t *const pkt_hdr = packet_hdr(pkt); pool_t *pool = pkt_hdr->buf_hdr.pool_ptr; - int num = pkt_hdr->buf_hdr.segcount; + int num = pkt_hdr->seg_count; if (odp_unlikely(len > (pool->seg_len * num))) return -1; - reset_seg(pkt_hdr, 0, num); + reset_seg(pkt_hdr, num); packet_init(pkt_hdr, len); @@ -1033,7 +836,7 @@ uint32_t odp_packet_buf_len(odp_packet_t pkt) odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); pool_t *pool = pkt_hdr->buf_hdr.pool_ptr; - return pool->max_seg_len * pkt_hdr->buf_hdr.segcount; + return pool->max_seg_len * pkt_hdr->seg_count; } void *odp_packet_tail(odp_packet_t pkt) @@ -1117,7 +920,7 @@ int odp_packet_trunc_head(odp_packet_t *pkt, uint32_t len, if (len < seg_len) { pull_head(pkt_hdr, len); - } else if (!CONFIG_PACKET_SEG_DISABLED) { + } else { int num = 0; uint32_t pull_len = 0; @@ -1198,11 +1001,11 @@ int odp_packet_extend_tail(odp_packet_t *pkt, uint32_t len, void *odp_packet_pull_tail(odp_packet_t pkt, uint32_t len) { odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); - seg_entry_t *last_seg = seg_entry_last(pkt_hdr); + odp_packet_hdr_t *last_seg = packet_last_seg(pkt_hdr); ODP_ASSERT(odp_packet_has_ref(pkt) == 0); - if (len > last_seg->len) + if (len > last_seg->seg_len) return NULL; pull_tail(pkt_hdr, len); @@ -1215,7 +1018,7 @@ int odp_packet_trunc_tail(odp_packet_t *pkt, uint32_t len, { int last; uint32_t seg_len; - seg_entry_t *last_seg; + odp_packet_hdr_t *last_seg; odp_packet_hdr_t *pkt_hdr = packet_hdr(*pkt); if (len > pkt_hdr->frame_len) @@ -1223,16 +1026,17 @@ int odp_packet_trunc_tail(odp_packet_t *pkt, uint32_t len, ODP_ASSERT(odp_packet_has_ref(*pkt) == 0); - last = packet_last_seg(pkt_hdr); - last_seg = seg_entry_last(pkt_hdr); - seg_len = last_seg->len; + last = pkt_hdr->seg_count - 1; + last_seg = packet_last_seg(pkt_hdr); + seg_len = last_seg->seg_len; if (len < seg_len) { pull_tail(pkt_hdr, len); - } else if (!CONFIG_PACKET_SEG_DISABLED) { + } else { int num = 0; uint32_t pull_len = 0; + /* Reverse order */ while (seg_len <= len) { pull_len = len - seg_len; num++; @@ -1253,12 +1057,9 @@ int odp_packet_trunc_tail(odp_packet_t *pkt, uint32_t len, void *odp_packet_offset(odp_packet_t pkt, uint32_t offset, uint32_t *len, odp_packet_seg_t *seg) { - int seg_idx; odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); - void *addr = packet_map(pkt_hdr, offset, len, &seg_idx); - if (addr != NULL && seg != NULL) - *seg = _odp_packet_seg_from_ndx(seg_idx); + void *addr = packet_map(pkt_hdr, offset, len, seg); return addr; } @@ -1388,26 +1189,35 @@ void odp_packet_ts_set(odp_packet_t pkt, odp_time_t timestamp) * */ -void *odp_packet_seg_data(odp_packet_t pkt, odp_packet_seg_t seg) +void *odp_packet_seg_data(odp_packet_t pkt ODP_UNUSED, odp_packet_seg_t seg) { - odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); + odp_packet_hdr_t *seg_hdr = packet_seg_to_hdr(seg); - if (odp_unlikely(_odp_packet_seg_to_ndx(seg) >= - pkt_hdr->buf_hdr.segcount)) - return NULL; + return seg_hdr->seg_data; +} - return packet_seg_data(pkt_hdr, _odp_packet_seg_to_ndx(seg)); +uint32_t odp_packet_seg_data_len(odp_packet_t pkt ODP_UNUSED, + odp_packet_seg_t seg) +{ + odp_packet_hdr_t *seg_hdr = packet_seg_to_hdr(seg); + + return seg_hdr->seg_len; } -uint32_t odp_packet_seg_data_len(odp_packet_t pkt, odp_packet_seg_t seg) +odp_packet_seg_t odp_packet_last_seg(odp_packet_t pkt) { - odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); + return (odp_packet_seg_t)packet_last_seg(packet_hdr(pkt)); +} - if (odp_unlikely(_odp_packet_seg_to_ndx(seg) >= - pkt_hdr->buf_hdr.segcount)) - return 0; +odp_packet_seg_t odp_packet_next_seg(odp_packet_t pkt ODP_UNUSED, + odp_packet_seg_t seg) +{ + odp_packet_hdr_t *pkt_hdr = packet_seg_to_hdr(seg); + + if (odp_unlikely(pkt_hdr->seg_next == NULL)) + return ODP_PACKET_SEG_INVALID; - return packet_seg_len(pkt_hdr, _odp_packet_seg_to_ndx(seg)); + return (odp_packet_seg_t)pkt_hdr->seg_next; } /* @@ -1778,10 +1588,7 @@ static int packet_print_input_flags(odp_packet_hdr_t *hdr, char *str, int max) void odp_packet_print(odp_packet_t pkt) { odp_packet_seg_t seg; - seg_entry_t *seg_entry; - odp_packet_hdr_t *seg_hdr; - uint8_t idx; - int max_len = 1024; + int max_len = 4096; char str[max_len]; int len = 0; int n = max_len - 1; @@ -1819,32 +1626,27 @@ void odp_packet_print(odp_packet_t pkt) len += snprintf(&str[len], n - len, " num_segs %i\n", odp_packet_num_segs(pkt)); - seg_hdr = hdr; - idx = 0; seg = odp_packet_first_seg(pkt); while (seg != ODP_PACKET_SEG_INVALID) { - odp_buffer_hdr_t *buf_hdr; - odp_packet_hdr_t *tmp_hdr; - - tmp_hdr = seg_hdr; - seg_entry = seg_entry_next(&seg_hdr, &idx); - buf_hdr = seg_entry->hdr; - - len += snprintf(&str[len], n - len, - " seg_len %-4" PRIu32 " seg_data %p ", - odp_packet_seg_data_len(pkt, seg), - odp_packet_seg_data(pkt, seg)); - len += snprintf(&str[len], n - len, "ref_cnt %u", - buffer_ref(buf_hdr)); - if (seg_is_link(tmp_hdr)) { - uint32_t ref; - - ref = buffer_ref(&tmp_hdr->buf_hdr); - len += snprintf(&str[len], n - len, "L(%u)\n", ref); - } else { - len += snprintf(&str[len], n - len, "\n"); + odp_packet_hdr_t *seg_hdr = packet_seg_to_hdr(seg); + odp_buffer_hdr_t *buf_hdr = &seg_hdr->buf_hdr; + char seg_str[max_len]; + int str_len; + + str_len = snprintf(&seg_str[0], max_len, + " seg_len %-4" PRIu32 " seg_data %p " + "ref_cnt %u\n", + odp_packet_seg_data_len(pkt, seg), + odp_packet_seg_data(pkt, seg), + buffer_ref(buf_hdr)); + + /* Prevent print buffer overflow */ + if (n - len - str_len < 10) { + len += snprintf(&str[len], n - len, " ...\n"); + break; } + len += snprintf(&str[len], n - len, "%s", seg_str); seg = odp_packet_next_seg(pkt, seg); } @@ -1872,7 +1674,7 @@ void odp_packet_print_data(odp_packet_t pkt, uint32_t offset, " buf index %" PRIu32 "\n", hdr->buf_hdr.index.buffer); len += snprintf(&str[len], n - len, - " segcount %" PRIu16 "\n", hdr->buf_hdr.segcount); + " seg_count %" PRIu16 "\n", hdr->seg_count); len += snprintf(&str[len], n - len, " data len %" PRIu32 "\n", data_len); len += snprintf(&str[len], n - len, @@ -2953,90 +2755,25 @@ odp_packet_t odp_packet_ref_static(odp_packet_t pkt) odp_packet_t odp_packet_ref(odp_packet_t pkt, uint32_t offset) { - odp_packet_t ref; - odp_packet_hdr_t *link_hdr; - odp_packet_hdr_t *next_hdr; - odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); - odp_packet_hdr_t *hdr = pkt_hdr; - seg_entry_t *seg; - uint32_t seg_idx = 0; - uint8_t idx = 0; - uint32_t seg_offset = 0; - int i, num_copy, segcount; - uint32_t len; + odp_packet_t new; + int ret; - if (offset >= pkt_hdr->frame_len) { - ODP_DBG("offset too large\n"); - return ODP_PACKET_INVALID; - } + new = odp_packet_copy(pkt, odp_packet_pool(pkt)); - /* Allocate link segment */ - if (packet_alloc(pkt_hdr->buf_hdr.pool_ptr, 0, 1, 1, &ref) != 1) { - ODP_DBG("segment alloc failed\n"); + if (new == ODP_PACKET_INVALID) { + ODP_ERR("copy failed\n"); return ODP_PACKET_INVALID; } - link_hdr = packet_hdr(ref); - - seg_entry_find_offset(&hdr, &idx, &seg_offset, &seg_idx, offset); - num_copy = hdr->buf_hdr.num_seg - idx; - segcount = pkt_hdr->buf_hdr.segcount; - - /* In addition to segments, update reference count of - * an existing link header. */ - if (seg_is_link(hdr)) - buffer_ref_inc((odp_buffer_hdr_t *)hdr); - - seg = seg_entry_next(&hdr, &idx); - link_hdr->buf_hdr.num_seg = 1; - link_hdr->buf_hdr.seg[0].hdr = seg->hdr; - link_hdr->buf_hdr.seg[0].data = seg->data + seg_offset; - link_hdr->buf_hdr.seg[0].len = seg->len - seg_offset; - buffer_ref_inc(seg->hdr); + ret = odp_packet_trunc_head(&new, offset, NULL, NULL); - /* The 'CONFIG_PACKET_SEGS_PER_HDR > 1' condition is required to fix an - * invalid error ('array subscript is above array bounds') thrown by - * gcc (5.4.0). */ - for (i = 1; CONFIG_PACKET_SEGS_PER_HDR > 1 && i < num_copy; i++) { - /* Update link header reference count */ - if (idx == 0 && seg_is_link(hdr)) - buffer_ref_inc((odp_buffer_hdr_t *)hdr); - - seg = seg_entry_next(&hdr, &idx); - - link_hdr->buf_hdr.num_seg++; - link_hdr->buf_hdr.seg[i].hdr = seg->hdr; - link_hdr->buf_hdr.seg[i].data = seg->data; - link_hdr->buf_hdr.seg[i].len = seg->len; - buffer_ref_inc(seg->hdr); - } - - next_hdr = hdr; - - /* Increment ref count for remaining segments */ - for (i = seg_idx + num_copy; i < segcount; i++) { - /* Update link header reference count */ - if (idx == 0 && seg_is_link(hdr)) - buffer_ref_inc((odp_buffer_hdr_t *)hdr); - - seg = seg_entry_next(&hdr, &idx); - buffer_ref_inc(seg->hdr); + if (ret < 0) { + ODP_ERR("trunk_head failed\n"); + odp_packet_free(new); + return ODP_PACKET_INVALID; } - len = pkt_hdr->frame_len - offset; - link_hdr->buf_hdr.next_seg = next_hdr; - link_hdr->buf_hdr.last_seg = pkt_hdr->buf_hdr.last_seg; - link_hdr->buf_hdr.segcount = segcount - seg_idx; - link_hdr->frame_len = len; - link_hdr->tailroom = pkt_hdr->tailroom; - - /* Link header does not have headroom, it just points to other - * buffers. Zero length headroom ensures that head of the other buffer - * is not pushed through a reference. */ - link_hdr->headroom = 0; - - return ref; - + return new; } odp_packet_t odp_packet_ref_pkt(odp_packet_t pkt, uint32_t offset, @@ -3066,21 +2803,18 @@ odp_packet_t odp_packet_ref_pkt(odp_packet_t pkt, uint32_t offset, int odp_packet_has_ref(odp_packet_t pkt) { odp_buffer_hdr_t *buf_hdr; - seg_entry_t *seg; - int i; - uint32_t ref_cnt; odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); - int seg_count = pkt_hdr->buf_hdr.segcount; - odp_packet_hdr_t *hdr = pkt_hdr; - uint8_t idx = 0; + uint32_t ref_cnt; + + while (pkt_hdr != NULL) { + buf_hdr = &pkt_hdr->buf_hdr; - for (i = 0; i < seg_count; i++) { - seg = seg_entry_next(&hdr, &idx); - buf_hdr = seg->hdr; ref_cnt = buffer_ref(buf_hdr); if (is_multi_ref(ref_cnt)) return 1; + + pkt_hdr = pkt_hdr->seg_next; } return 0; diff --git a/platform/linux-generic/odp_pool.c b/platform/linux-generic/odp_pool.c index 17504a2a7..e98027eb6 100644 --- a/platform/linux-generic/odp_pool.c +++ b/platform/linux-generic/odp_pool.c @@ -1,5 +1,5 @@ -/* Copyright (c) 2019, Nokia - * Copyright (c) 2013-2018, Linaro Limited +/* Copyright (c) 2013-2018, Linaro Limited + * Copyright (c) 2019, Nokia * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause @@ -410,20 +410,19 @@ static void init_buffers(pool_t *pool) buf_hdr->event_type = type; buf_hdr->pool_ptr = pool; buf_hdr->uarea_addr = uarea; - buf_hdr->segcount = 1; - buf_hdr->num_seg = 1; - buf_hdr->next_seg = NULL; - buf_hdr->last_seg = buf_hdr; - /* Pointer to data start (of the first segment) */ - buf_hdr->seg[0].hdr = buf_hdr; - buf_hdr->seg[0].data = &data[offset]; - buf_hdr->seg[0].len = pool->seg_len; + /* Initialize segmentation metadata */ + if (type == ODP_POOL_PACKET) { + pkt_hdr->seg_data = &data[offset]; + pkt_hdr->seg_len = pool->seg_len; + pkt_hdr->seg_count = 1; + pkt_hdr->seg_next = NULL; + } odp_atomic_init_u32(&buf_hdr->ref_cnt, 0); /* Store base values for fast init */ - buf_hdr->base_data = buf_hdr->seg[0].data; + buf_hdr->base_data = &data[offset]; buf_hdr->buf_end = &data[offset + pool->seg_len + pool->tailroom]; @@ -512,9 +511,8 @@ static odp_pool_t pool_create(const char *name, odp_pool_param_t *params, * pool. */ if (params->pkt.max_len != 0) max_len = params->pkt.max_len; - if ((max_len + seg_len - 1) / seg_len > CONFIG_PACKET_MAX_SEGS) - seg_len = (max_len + CONFIG_PACKET_MAX_SEGS - 1) / - CONFIG_PACKET_MAX_SEGS; + if ((max_len + seg_len - 1) / seg_len > PKT_MAX_SEGS) + seg_len = (max_len + PKT_MAX_SEGS - 1) / PKT_MAX_SEGS; if (seg_len > CONFIG_PACKET_MAX_SEG_LEN) { ODP_ERR("Pool unable to store 'max_len' packet"); return ODP_POOL_INVALID; @@ -1068,7 +1066,7 @@ int odp_pool_capability(odp_pool_capability_t *capa) capa->pkt.min_headroom = CONFIG_PACKET_HEADROOM; capa->pkt.max_headroom = CONFIG_PACKET_HEADROOM; capa->pkt.min_tailroom = CONFIG_PACKET_TAILROOM; - capa->pkt.max_segs_per_pkt = CONFIG_PACKET_MAX_SEGS; + capa->pkt.max_segs_per_pkt = PKT_MAX_SEGS; capa->pkt.min_seg_len = CONFIG_PACKET_SEG_LEN_MIN; capa->pkt.max_seg_len = max_seg_len; capa->pkt.max_uarea_size = MAX_SIZE; diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c index c38747d3c..cc0a4368c 100644 --- a/platform/linux-generic/pktio/dpdk.c +++ b/platform/linux-generic/pktio/dpdk.c @@ -1,4 +1,5 @@ /* Copyright (c) 2016-2018, Linaro Limited + * Copyright (c) 2019, Nokia * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause @@ -233,8 +234,7 @@ static unsigned cache_size(uint32_t num) static inline uint16_t mbuf_data_off(struct rte_mbuf *mbuf, odp_packet_hdr_t *pkt_hdr) { - return (uintptr_t)pkt_hdr->buf_hdr.seg[0].data - - (uintptr_t)mbuf->buf_addr; + return (uintptr_t)pkt_hdr->seg_data - (uintptr_t)mbuf->buf_addr; } /** @@ -250,8 +250,7 @@ static inline void mbuf_update(struct rte_mbuf *mbuf, odp_packet_hdr_t *pkt_hdr, mbuf->refcnt = 1; mbuf->ol_flags = 0; - if (odp_unlikely(pkt_hdr->buf_hdr.base_data != - pkt_hdr->buf_hdr.seg[0].data)) + if (odp_unlikely(pkt_hdr->buf_hdr.base_data != pkt_hdr->seg_data)) mbuf->data_off = mbuf_data_off(mbuf, pkt_hdr); } @@ -876,7 +875,7 @@ static inline int mbuf_to_pkt_zero(pktio_entry_t *pktio_entry, /* Init buffer segments. Currently, only single segment packets * are supported. */ - pkt_hdr->buf_hdr.seg[0].data = data; + pkt_hdr->seg_data = data; packet_init(pkt_hdr, pkt_len); pkt_hdr->input = input; @@ -927,7 +926,7 @@ static inline int pkt_to_mbuf_zero(pktio_entry_t *pktio_entry, if (odp_unlikely(pkt_len > pkt_dpdk->mtu)) goto fail; - if (odp_likely(pkt_hdr->buf_hdr.segcount == 1)) { + if (odp_likely(pkt_hdr->seg_count == 1)) { mbuf_update(mbuf, pkt_hdr, pkt_len); if (odp_unlikely(pktio_entry->s.chksum_insert_ena)) @@ -1919,7 +1918,7 @@ static int dpdk_send(pktio_entry_t *pktio_entry, int index, odp_packet_t pkt = pkt_table[i]; odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); - if (pkt_hdr->buf_hdr.segcount > 1) { + if (pkt_hdr->seg_count > 1) { if (odp_likely(i < tx_pkts)) odp_packet_free(pkt); else diff --git a/platform/linux-generic/pktio/ipc.c b/platform/linux-generic/pktio/ipc.c index 45d95bc11..1090d760c 100644 --- a/platform/linux-generic/pktio/ipc.c +++ b/platform/linux-generic/pktio/ipc.c @@ -685,7 +685,7 @@ static int ipc_pktio_send_lockless(pktio_entry_t *pktio_entry, offsets[i] = (uint8_t *)pkt_hdr - (uint8_t *)odp_shm_addr(pool->shm); - data_pool_off = (uint8_t *)pkt_hdr->buf_hdr.seg[0].data - + data_pool_off = (uint8_t *)pkt_hdr->seg_data - (uint8_t *)odp_shm_addr(pool->shm); /* compile all function code even if ipc disabled with config */ diff --git a/platform/linux-generic/pktio/socket.c b/platform/linux-generic/pktio/socket.c index a6b399b50..76fee0ad7 100644 --- a/platform/linux-generic/pktio/socket.c +++ b/platform/linux-generic/pktio/socket.c @@ -216,7 +216,7 @@ static int sock_mmsg_recv(pktio_entry_t *pktio_entry, int index ODP_UNUSED, odp_time_t *ts = NULL; const int sockfd = pkt_sock->sockfd; struct mmsghdr msgvec[num]; - struct iovec iovecs[num][CONFIG_PACKET_MAX_SEGS]; + struct iovec iovecs[num][PKT_MAX_SEGS]; int nb_rx = 0; int nb_pkts; int recv_msgs; @@ -421,7 +421,7 @@ static int sock_mmsg_send(pktio_entry_t *pktio_entry, int index ODP_UNUSED, { pkt_sock_t *pkt_sock = pkt_priv(pktio_entry); struct mmsghdr msgvec[num]; - struct iovec iovecs[num][CONFIG_PACKET_MAX_SEGS]; + struct iovec iovecs[num][PKT_MAX_SEGS]; int ret; int sockfd = pkt_sock->sockfd; int i; commit 916bfae5098242dd7e5121c789b1dbe20c8453ea Author: Matias Elo <matias.elo(a)nokia.com> Date: Wed Sep 25 14:57:24 2019 +0300 linux-gen: packet: check resulting packet length in odp_packet_concat() Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index 4518706f0..a785ecef9 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -1533,6 +1533,11 @@ int odp_packet_concat(odp_packet_t *dst, odp_packet_t src) ODP_ASSERT(odp_packet_has_ref(*dst) == 0); + if (odp_unlikely(dst_len + src_len > dst_pool->max_len)) { + ODP_ERR("concat would result oversized packet\n"); + return -1; + } + /* Do a copy if packets are from different pools. */ if (odp_unlikely(dst_pool != src_pool)) { if (odp_packet_extend_tail(dst, src_len, NULL, NULL) >= 0) { commit 65e5ee3c37c28a9365385516e5279f917a6ff41a Author: Matias Elo <matias.elo(a)nokia.com> Date: Wed Sep 25 17:04:06 2019 +0300 validation: packet: initialize output variable of odp_packet_offset() Fixes invalid variable may be used uninitialized error. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/test/validation/api/packet/packet.c b/test/validation/api/packet/packet.c index a12ad13eb..b3001693c 100644 --- a/test/validation/api/packet/packet.c +++ b/test/validation/api/packet/packet.c @@ -1,4 +1,5 @@ /* Copyright (c) 2014-2018, Linaro Limited + * Copyright (c) 2019, Nokia * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause @@ -1383,7 +1384,8 @@ static void packet_test_copy(void) odp_packet_t pkt; odp_packet_t pkt_copy, pkt_part; odp_pool_t pool; - uint32_t i, plen, seg_len, src_offset, dst_offset; + uint32_t i, plen, src_offset, dst_offset; + uint32_t seg_len = 0; void *pkt_data; pkt = odp_packet_copy(test_packet, packet_pool_no_uarea); @@ -1462,7 +1464,7 @@ static void packet_test_copy(void) /* Test segment crossing if we support segments */ pkt_data = odp_packet_offset(pkt, 0, &seg_len, NULL); - CU_ASSERT(pkt_data != NULL); + CU_ASSERT_FATAL(pkt_data != NULL); if (seg_len < plen) { src_offset = seg_len - 15; @@ -2166,7 +2168,8 @@ static void packet_test_extend_ref(void) static void packet_test_align(void) { odp_packet_t pkt; - uint32_t pkt_len, seg_len, offset, aligned_seglen; + uint32_t pkt_len, offset; + uint32_t seg_len = 0, aligned_seglen = 0; void *pkt_data, *aligned_data; const uint32_t max_align = 32; @@ -2224,7 +2227,8 @@ static void packet_test_align(void) static void packet_test_offset(void) { odp_packet_t pkt = test_packet; - uint32_t seg_len, full_seg_len; + uint32_t seg_len = 0; + uint32_t full_seg_len; uint8_t *ptr, *start_ptr; uint32_t offset; odp_packet_seg_t seg = ODP_PACKET_SEG_INVALID; ----------------------------------------------------------------------- Summary of changes: config/odp-linux-generic.conf | 5 +- .../linux-generic/include-abi/odp/api/abi/packet.h | 18 +- .../include/odp/api/plat/packet_inline_types.h | 6 +- .../include/odp/api/plat/packet_inlines.h | 49 +- .../linux-generic/include/odp_buffer_internal.h | 59 +- .../linux-generic/include/odp_config_internal.h | 16 +- platform/linux-generic/include/odp_packet_dpdk.h | 5 +- .../linux-generic/include/odp_packet_internal.h | 68 +- platform/linux-generic/odp_buffer.c | 5 +- platform/linux-generic/odp_packet.c | 704 +++++++-------------- platform/linux-generic/odp_pool.c | 28 +- platform/linux-generic/pktio/dpdk.c | 36 +- platform/linux-generic/pktio/ipc.c | 2 +- platform/linux-generic/pktio/socket.c | 4 +- platform/linux-generic/test/inline-timer.conf | 2 +- platform/linux-generic/test/process-mode.conf | 2 +- test/validation/api/packet/packet.c | 12 +- 17 files changed, 367 insertions(+), 654 deletions(-) hooks/post-receive --

6 years, 3 months

[COMMIT] branch master updated. v1.21.0.0-264-gf0f83828a

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 f0f83828a483f90edcf320ec2cf0107cb1e9362e (commit) via 446476b61b1b747cd1e78bcbc2ce8a8a1949a41b (commit) via e47683d428084f9cacf72f1691d30b96c53804c1 (commit) via ce35815639996bb2832c298c7d5d40eff6c175d0 (commit) via 66e459c9f841932818acd423ddeda65f2ad1c2de (commit) via 0b63c8154a779ba20010bcd9ae7ee6bf610d755b (commit) via e7117fb0ecc8440dd1b8ef5845b14c82cd2f2ace (commit) via 95eb732efd42e889e280120f504c4c3e50348cab (commit) from e30d10a42db4083b53c5a85ee91d3bcda1bb80db (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 f0f83828a483f90edcf320ec2cf0107cb1e9362e Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Mon Oct 21 16:55:28 2019 +0300 linux-gen: cls: fix vlan match bugs and tests Vlan_id_0, vlan_id_x and ethtype_x implementation required packets to be VLAN qinq, while those could be also single VLAN packets. Vlan_id_x matched always against outter VLAN, while it should match against the inner most VLAN. PMR test code generated always VLAN qinq packets, also when not needed. Ethtype_x test did set wrong inner most ethernet type. Corrected mask sizes in VLAN and ethtype_x tests (0xfff for VLAN ID, 0xffff for ethernet type). Removed erroneous comments about packet length. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/platform/linux-generic/odp_classification.c b/platform/linux-generic/odp_classification.c index 93e086e84..907d68481 100644 --- a/platform/linux-generic/odp_classification.c +++ b/platform/linux-generic/odp_classification.c @@ -942,7 +942,7 @@ static inline int verify_pmr_vlan_id_0(const uint8_t *pkt_addr, uint16_t tci; uint16_t vlan_id; - if (!pkt_hdr->p.input_flags.vlan_qinq) + if (!packet_hdr_has_eth(pkt_hdr) || !pkt_hdr->p.input_flags.vlan) return 0; eth = (const _odp_ethhdr_t *)(pkt_addr + pkt_hdr->p.l2_offset); @@ -956,21 +956,24 @@ static inline int verify_pmr_vlan_id_0(const uint8_t *pkt_addr, return 0; } -static inline int verify_pmr_vlan_id_x(const uint8_t *pkt_addr ODP_UNUSED, - odp_packet_hdr_t *pkt_hdr ODP_UNUSED, - pmr_term_value_t *term_value ODP_UNUSED) +static inline int verify_pmr_vlan_id_x(const uint8_t *pkt_addr, + odp_packet_hdr_t *pkt_hdr, + pmr_term_value_t *term_value) { const _odp_ethhdr_t *eth; const _odp_vlanhdr_t *vlan; uint16_t tci; uint16_t vlan_id; - if (!pkt_hdr->p.input_flags.vlan_qinq) + if (!pkt_hdr->p.input_flags.vlan && !pkt_hdr->p.input_flags.vlan_qinq) return 0; eth = (const _odp_ethhdr_t *)(pkt_addr + pkt_hdr->p.l2_offset); vlan = (const _odp_vlanhdr_t *)(eth + 1); - vlan++; + + if (pkt_hdr->p.input_flags.vlan_qinq) + vlan++; + tci = odp_be_to_cpu_16(vlan->tci); vlan_id = tci & 0x0fff; @@ -1061,11 +1064,15 @@ static inline int verify_pmr_eth_type_x(const uint8_t *pkt_addr, uint16_t ethtype; const _odp_vlanhdr_t *vlan; - if (!pkt_hdr->p.input_flags.vlan_qinq) + if (!pkt_hdr->p.input_flags.vlan && !pkt_hdr->p.input_flags.vlan_qinq) return 0; eth = (const _odp_ethhdr_t *)(pkt_addr + pkt_hdr->p.l2_offset); vlan = (const _odp_vlanhdr_t *)(eth + 1); + + if (pkt_hdr->p.input_flags.vlan_qinq) + vlan++; + ethtype = odp_be_to_cpu_16(vlan->type); if (term_value->match.value == (ethtype & term_value->match.mask)) diff --git a/test/validation/api/classification/odp_classification_test_pmr.c b/test/validation/api/classification/odp_classification_test_pmr.c index c8cf0077d..a01c0a403 100644 --- a/test/validation/api/classification/odp_classification_test_pmr.c +++ b/test/validation/api/classification/odp_classification_test_pmr.c @@ -1059,8 +1059,8 @@ static void classification_test_pmr_term_vlan_id_0(void) odph_vlanhdr_t *vlan_0; cls_packet_info_t pkt_info; - val = 1024; - mask = 0xff00; + val = 0x123; + mask = 0xfff; seqno = 0; pktio = create_pktio(ODP_QUEUE_TYPE_SCHED, pkt_pool, true); @@ -1095,10 +1095,8 @@ static void classification_test_pmr_term_vlan_id_0(void) pmr = odp_cls_pmr_create(&pmr_param, 1, default_cos, cos); CU_ASSERT(pmr != ODP_PMR_INVALID); - /* create packet of payload length 1024 */ pkt_info = default_pkt_info; pkt_info.vlan = true; - pkt_info.vlan_qinq = true; pkt = create_packet(pkt_info); CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID); seqno = cls_pkt_get_seq(pkt); @@ -1107,7 +1105,7 @@ static void classification_test_pmr_term_vlan_id_0(void) odp_pktio_mac_addr(pktio, eth->src.addr, ODPH_ETHADDR_LEN); odp_pktio_mac_addr(pktio, eth->dst.addr, ODPH_ETHADDR_LEN); vlan_0 = (odph_vlanhdr_t *)(eth + 1); - vlan_0->tci = odp_cpu_to_be_16(1024); + vlan_0->tci = odp_cpu_to_be_16(val); enqueue_pktio_interface(pkt, pktio); pkt = receive_packet(&retqueue, ODP_TIME_SEC_IN_NS); @@ -1172,8 +1170,8 @@ static void classification_test_pmr_term_vlan_id_x(void) odph_vlanhdr_t *vlan_x; cls_packet_info_t pkt_info; - val = 1024; - mask = 0xff00; + val = 0x345; + mask = 0xfff; seqno = 0; pktio = create_pktio(ODP_QUEUE_TYPE_SCHED, pkt_pool, true); @@ -1208,7 +1206,6 @@ static void classification_test_pmr_term_vlan_id_x(void) pmr = odp_cls_pmr_create(&pmr_param, 1, default_cos, cos); CU_ASSERT(pmr != ODP_PMR_INVALID); - /* create packet of payload length 1024 */ pkt_info = default_pkt_info; pkt_info.vlan = true; pkt_info.vlan_qinq = true; @@ -1221,7 +1218,7 @@ static void classification_test_pmr_term_vlan_id_x(void) odp_pktio_mac_addr(pktio, eth->dst.addr, ODPH_ETHADDR_LEN); vlan_x = (odph_vlanhdr_t *)(eth + 1); vlan_x++; - vlan_x->tci = odp_cpu_to_be_16(1024); + vlan_x->tci = odp_cpu_to_be_16(val); enqueue_pktio_interface(pkt, pktio); pkt = receive_packet(&retqueue, ODP_TIME_SEC_IN_NS); @@ -1394,8 +1391,8 @@ static void classification_test_pmr_term_eth_type_x(void) odph_vlanhdr_t *vlan_x; cls_packet_info_t pkt_info; - val = 0x8100; - mask = 0xff00; + val = 0x0800; + mask = 0xffff; seqno = 0; pktio = create_pktio(ODP_QUEUE_TYPE_SCHED, pkt_pool, true); @@ -1430,7 +1427,6 @@ static void classification_test_pmr_term_eth_type_x(void) pmr = odp_cls_pmr_create(&pmr_param, 1, default_cos, cos); CU_ASSERT(pmr != ODP_PMR_INVALID); - /* create packet of payload length 1024 */ pkt_info = default_pkt_info; pkt_info.vlan = true; pkt_info.vlan_qinq = true; @@ -1442,7 +1438,10 @@ static void classification_test_pmr_term_eth_type_x(void) odp_pktio_mac_addr(pktio, eth->src.addr, ODPH_ETHADDR_LEN); odp_pktio_mac_addr(pktio, eth->dst.addr, ODPH_ETHADDR_LEN); vlan_x = (odph_vlanhdr_t *)(eth + 1); - vlan_x->tci = odp_cpu_to_be_16(1024); + vlan_x++; + vlan_x->tci = odp_cpu_to_be_16(0x123); + vlan_x->type = odp_cpu_to_be_16(val); + enqueue_pktio_interface(pkt, pktio); pkt = receive_packet(&retqueue, ODP_TIME_SEC_IN_NS); commit 446476b61b1b747cd1e78bcbc2ce8a8a1949a41b Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Mon Oct 21 14:32:51 2019 +0300 linux-gen: dpdk: check supported ptypes in L2 parse DPDK ethernet devices do not support all ptype flags, but usually only a subset (e.g. i40e does not support RTE_PTYPE_L2_ETHER_VLAN by default). Save supported ptypes of L2 and trust only those types that are supported. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/platform/linux-generic/include/odp_packet_dpdk.h b/platform/linux-generic/include/odp_packet_dpdk.h index 1b660babf..2b6b859c4 100644 --- a/platform/linux-generic/include/odp_packet_dpdk.h +++ b/platform/linux-generic/include/odp_packet_dpdk.h @@ -16,6 +16,15 @@ struct rte_mbuf; +/* Flags for pkt_dpdk_t.supported_ptypes */ +#define PTYPE_VLAN 0x01 +#define PTYPE_VLAN_QINQ 0x02 +#define PTYPE_ARP 0x04 +#define PTYPE_IPV4 0x08 +#define PTYPE_IPV6 0x10 +#define PTYPE_UDP 0x20 +#define PTYPE_TCP 0x40 + /** * Calculate size of zero-copy DPDK packet pool object */ @@ -33,11 +42,13 @@ int _odp_dpdk_packet_parse_common(packet_parser_t *pkt_hdr, uint32_t seg_len, struct rte_mbuf *mbuf, int layer, + uint32_t supported_ptypes, odp_pktin_config_opt_t pktin_cfg); static inline int _odp_dpdk_packet_parse_layer(odp_packet_hdr_t *pkt_hdr, struct rte_mbuf *mbuf, odp_pktio_parser_layer_t layer, + uint32_t supported_ptypes, odp_pktin_config_opt_t pktin_cfg) { uint32_t seg_len = pkt_hdr->buf_hdr.seg[0].len; @@ -45,6 +56,7 @@ static inline int _odp_dpdk_packet_parse_layer(odp_packet_hdr_t *pkt_hdr, return _odp_dpdk_packet_parse_common(&pkt_hdr->p, base, pkt_hdr->frame_len, seg_len, mbuf, - layer, pktin_cfg); + layer, supported_ptypes, + pktin_cfg); } #endif diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c index 593f02813..c38747d3c 100644 --- a/platform/linux-generic/pktio/dpdk.c +++ b/platform/linux-generic/pktio/dpdk.c @@ -113,6 +113,8 @@ typedef struct ODP_ALIGNED_CACHE { uint32_t data_room; /**< maximum packet length */ unsigned int min_rx_burst; /**< minimum RX burst size */ odp_pktin_hash_proto_t hash; /**< Packet input hash protocol */ + /* Supported RTE_PTYPE_XXX flags in a mask */ + uint32_t supported_ptypes; uint16_t mtu; /**< maximum transmission unit */ uint16_t port_id; /**< DPDK port identifier */ /** Use system call to get/set vdev promisc mode */ @@ -533,15 +535,16 @@ static inline int mbuf_to_pkt(pktio_entry_t *pktio_entry, struct rte_mbuf *mbuf; void *data; int i, j; - int nb_pkts = 0; int alloc_len, num; - odp_pool_t pool = pkt_priv(pktio_entry)->pool; + int nb_pkts = 0; + pkt_dpdk_t *pkt_dpdk = pkt_priv(pktio_entry); + odp_pool_t pool = pkt_dpdk->pool; odp_pktin_config_opt_t pktin_cfg = pktio_entry->s.config.pktin; odp_proto_layer_t parse_layer = pktio_entry->s.config.parser.layer; odp_pktio_t input = pktio_entry->s.handle; /* Allocate maximum sized packets */ - alloc_len = pkt_priv(pktio_entry)->data_room; + alloc_len = pkt_dpdk->data_room; num = packet_alloc_multi(pool, alloc_len, pkt_table, mbuf_num); if (num != mbuf_num) { @@ -566,12 +569,15 @@ static inline int mbuf_to_pkt(pktio_entry_t *pktio_entry, pkt_len = rte_pktmbuf_pkt_len(mbuf); if (pktio_cls_enabled(pktio_entry)) { + uint32_t supported_ptypes = pkt_dpdk->supported_ptypes; + packet_parse_reset(&parsed_hdr); packet_set_len(&parsed_hdr, pkt_len); if (_odp_dpdk_packet_parse_common(&parsed_hdr.p, data, pkt_len, pkt_len, mbuf, ODP_PROTO_LAYER_ALL, + supported_ptypes, pktin_cfg)) { odp_packet_free(pkt_table[i]); rte_pktmbuf_free(mbuf); @@ -593,16 +599,20 @@ static inline int mbuf_to_pkt(pktio_entry_t *pktio_entry, pkt_hdr->input = input; - if (pktio_cls_enabled(pktio_entry)) + if (pktio_cls_enabled(pktio_entry)) { copy_packet_cls_metadata(&parsed_hdr, pkt_hdr); - else if (parse_layer != ODP_PROTO_LAYER_NONE) + } else if (parse_layer != ODP_PROTO_LAYER_NONE) { + uint32_t supported_ptypes = pkt_dpdk->supported_ptypes; + if (_odp_dpdk_packet_parse_layer(pkt_hdr, mbuf, parse_layer, + supported_ptypes, pktin_cfg)) { odp_packet_free(pkt); rte_pktmbuf_free(mbuf); continue; } + } if (mbuf->ol_flags & PKT_RX_RSS_HASH) packet_set_flow_hash(pkt_hdr, mbuf->hash.rss); @@ -808,11 +818,13 @@ static inline int mbuf_to_pkt_zero(pktio_entry_t *pktio_entry, odp_pktin_config_opt_t pktin_cfg; odp_proto_layer_t parse_layer; odp_pktio_t input; + pkt_dpdk_t *pkt_dpdk; prefetch_pkt(mbuf_table[0]); + pkt_dpdk = pkt_priv(pktio_entry); nb_pkts = 0; - pool = pkt_priv(pktio_entry)->pool; + pool = pkt_dpdk->pool; pktin_cfg = pktio_entry->s.config.pktin; parse_layer = pktio_entry->s.config.parser.layer; input = pktio_entry->s.handle; @@ -839,12 +851,15 @@ static inline int mbuf_to_pkt_zero(pktio_entry_t *pktio_entry, pkt_hdr = pkt_hdr_from_mbuf(mbuf); if (pktio_cls_enabled(pktio_entry)) { + uint32_t supported_ptypes = pkt_dpdk->supported_ptypes; + packet_parse_reset(&parsed_hdr); packet_set_len(&parsed_hdr, pkt_len); if (_odp_dpdk_packet_parse_common(&parsed_hdr.p, data, pkt_len, pkt_len, mbuf, ODP_PROTO_LAYER_ALL, + supported_ptypes, pktin_cfg)) { rte_pktmbuf_free(mbuf); continue; @@ -866,15 +881,19 @@ static inline int mbuf_to_pkt_zero(pktio_entry_t *pktio_entry, packet_init(pkt_hdr, pkt_len); pkt_hdr->input = input; - if (pktio_cls_enabled(pktio_entry)) + if (pktio_cls_enabled(pktio_entry)) { copy_packet_cls_metadata(&parsed_hdr, pkt_hdr); - else if (parse_layer != ODP_PROTO_LAYER_NONE) + } else if (parse_layer != ODP_PROTO_LAYER_NONE) { + uint32_t supported_ptypes = pkt_dpdk->supported_ptypes; + if (_odp_dpdk_packet_parse_layer(pkt_hdr, mbuf, parse_layer, + supported_ptypes, pktin_cfg)) { rte_pktmbuf_free(mbuf); continue; } + } if (mbuf->ol_flags & PKT_RX_RSS_HASH) packet_set_flow_hash(pkt_hdr, mbuf->hash.rss); @@ -1696,6 +1715,49 @@ static int dpdk_setup_eth_rx(const pktio_entry_t *pktio_entry, return 0; } +static void dpdk_ptype_support_set(pktio_entry_t *pktio_entry, uint16_t port_id) +{ + int max_num, num, i; + pkt_dpdk_t *pkt_dpdk = pkt_priv(pktio_entry); + uint32_t mask = RTE_PTYPE_L2_MASK | RTE_PTYPE_L3_MASK | + RTE_PTYPE_L4_MASK; + + pkt_dpdk->supported_ptypes = 0; + + max_num = rte_eth_dev_get_supported_ptypes(port_id, mask, NULL, 0); + if (max_num <= 0) { + ODP_ERR("Device does not support any ptype flags\n"); + return; + } + + uint32_t ptype[max_num]; + + num = rte_eth_dev_get_supported_ptypes(port_id, mask, ptype, max_num); + if (num <= 0) { + ODP_ERR("Device does not support any ptype flags\n"); + return; + } + + for (i = 0; i < num; i++) { + ODP_DBG(" supported ptype: 0x%x\n", ptype[i]); + + if (ptype[i] == RTE_PTYPE_L2_ETHER_VLAN) + pkt_dpdk->supported_ptypes |= PTYPE_VLAN; + else if (ptype[i] == RTE_PTYPE_L2_ETHER_QINQ) + pkt_dpdk->supported_ptypes |= PTYPE_VLAN_QINQ; + else if (ptype[i] == RTE_PTYPE_L2_ETHER_ARP) + pkt_dpdk->supported_ptypes |= PTYPE_ARP; + else if (RTE_ETH_IS_IPV4_HDR(ptype[i])) + pkt_dpdk->supported_ptypes |= PTYPE_IPV4; + else if (RTE_ETH_IS_IPV6_HDR(ptype[i])) + pkt_dpdk->supported_ptypes |= PTYPE_IPV6; + else if (ptype[i] == RTE_PTYPE_L4_UDP) + pkt_dpdk->supported_ptypes |= PTYPE_UDP; + else if (ptype[i] == RTE_PTYPE_L4_TCP) + pkt_dpdk->supported_ptypes |= PTYPE_TCP; + } +} + static int dpdk_start(pktio_entry_t *pktio_entry) { struct rte_eth_dev_info dev_info; @@ -1733,6 +1795,9 @@ static int dpdk_start(pktio_entry_t *pktio_entry) return -1; } + /* Record supported parser ptype flags */ + dpdk_ptype_support_set(pktio_entry, port_id); + return 0; } diff --git a/platform/linux-generic/pktio/dpdk_parse.c b/platform/linux-generic/pktio/dpdk_parse.c index ef3065df7..9dad1a7ae 100644 --- a/platform/linux-generic/pktio/dpdk_parse.c +++ b/platform/linux-generic/pktio/dpdk_parse.c @@ -27,14 +27,18 @@ static inline uint16_t dpdk_parse_eth(packet_parser_t *prs, const uint8_t **parseptr, uint32_t *offset, uint32_t frame_len, - uint32_t mbuf_packet_type) + uint32_t mbuf_packet_type, + uint32_t supported_ptypes) { uint16_t ethtype; const _odp_ethhdr_t *eth; uint16_t macaddr0, macaddr2, macaddr4; const _odp_vlanhdr_t *vlan; _odp_packet_input_flags_t input_flags; - uint32_t l2_packet_type; + uint32_t l2_ptype; + int vlan_supported = supported_ptypes & PTYPE_VLAN; + int qinq_supported = supported_ptypes & PTYPE_VLAN_QINQ; + int arp_supported = supported_ptypes & PTYPE_ARP; input_flags.all = 0; input_flags.l2 = 1; @@ -64,22 +68,19 @@ static inline uint16_t dpdk_parse_eth(packet_parser_t *prs, } /* Get Ethertype */ - l2_packet_type = mbuf_packet_type & RTE_PTYPE_L2_MASK; - switch (l2_packet_type) { - case RTE_PTYPE_L2_ETHER: - if (RTE_ETH_IS_IPV4_HDR(mbuf_packet_type)) - ethtype = _ODP_ETHTYPE_IPV4; - else if (RTE_ETH_IS_IPV6_HDR(mbuf_packet_type)) - ethtype = _ODP_ETHTYPE_IPV6; - else - ethtype = odp_be_to_cpu_16(eth->type); - break; - case RTE_PTYPE_L2_ETHER_VLAN: + l2_ptype = mbuf_packet_type & RTE_PTYPE_L2_MASK; + + /* RTE_PTYPE_L2_ETHER type cannot be trusted when some L2 types are + * not supported. E.g. if VLAN is not supported, both VLAN and non-VLAN + * packets are marked as RTE_PTYPE_L2_ETHER. */ + ethtype = odp_be_to_cpu_16(eth->type); + + if (vlan_supported && l2_ptype == RTE_PTYPE_L2_ETHER_VLAN) ethtype = _ODP_ETHTYPE_VLAN; - break; - default: - ethtype = odp_be_to_cpu_16(eth->type); - } + else if (qinq_supported && l2_ptype == RTE_PTYPE_L2_ETHER_QINQ) + ethtype = _ODP_ETHTYPE_VLAN_OUTER; + else if (arp_supported && l2_ptype == RTE_PTYPE_L2_ETHER_ARP) + ethtype = _ODP_ETHTYPE_ARP; *offset += sizeof(*eth); *parseptr += sizeof(*eth); @@ -460,6 +461,7 @@ int dpdk_packet_parse_common_l3_l4(packet_parser_t *prs, int _odp_dpdk_packet_parse_common(packet_parser_t *prs, const uint8_t *ptr, uint32_t frame_len, uint32_t seg_len, struct rte_mbuf *mbuf, int layer, + uint32_t supported_ptype, odp_pktin_config_opt_t pktin_cfg) { uint32_t offset; @@ -481,7 +483,7 @@ int _odp_dpdk_packet_parse_common(packet_parser_t *prs, const uint8_t *ptr, prs->l2_offset = offset; ethtype = dpdk_parse_eth(prs, &parseptr, &offset, frame_len, - mbuf_packet_type); + mbuf_packet_type, supported_ptype); return dpdk_packet_parse_common_l3_l4(prs, parseptr, offset, frame_len, seg_len, layer, ethtype, commit e47683d428084f9cacf72f1691d30b96c53804c1 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Fri Oct 18 15:14:26 2019 +0300 example: cls: add support for ODP_PMR_VLAN_ID_0 Added support for ODP_PMR_VLAN_ID_0 term. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/example/classifier/odp_classifier.c b/example/classifier/odp_classifier.c index 8cbc5a289..691fec297 100644 --- a/example/classifier/odp_classifier.c +++ b/example/classifier/odp_classifier.c @@ -771,6 +771,9 @@ static int convert_str_to_pmr_enum(char *token, odp_cls_pmr_term_t *term) if (strcasecmp(token, "ODP_PMR_ETHTYPE_0") == 0) { *term = ODP_PMR_ETHTYPE_0; return 0; + } else if (strcasecmp(token, "ODP_PMR_VLAN_ID_0") == 0) { + *term = ODP_PMR_VLAN_ID_0; + return 0; } else if (strcasecmp(token, "ODP_PMR_SIP_ADDR") == 0) { *term = ODP_PMR_SIP_ADDR; return 0; @@ -822,6 +825,9 @@ static int parse_pmr_policy(appl_args_t *appl_args, char *argv[], char *optarg) switch (term) { case ODP_PMR_ETHTYPE_0: /* :<type>:<mask> */ + /* Fall through */ + case ODP_PMR_VLAN_ID_0: + /* :<vlan_id>:<mask> */ token = strtok(NULL, ":"); strncpy(stats[policy_count].value, token, DISPLAY_STRING_LEN - 1); commit ce35815639996bb2832c298c7d5d40eff6c175d0 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Thu Oct 17 09:26:36 2019 +0300 example: cls: add support for ODP_PMR_ETHTYPE_0 Added support for ODP_PMR_ETHTYPE_0 term. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/example/classifier/odp_classifier.c b/example/classifier/odp_classifier.c index 578109e6c..8cbc5a289 100644 --- a/example/classifier/odp_classifier.c +++ b/example/classifier/odp_classifier.c @@ -768,7 +768,10 @@ static int convert_str_to_pmr_enum(char *token, odp_cls_pmr_term_t *term) if (NULL == token) return -1; - if (strcasecmp(token, "ODP_PMR_SIP_ADDR") == 0) { + if (strcasecmp(token, "ODP_PMR_ETHTYPE_0") == 0) { + *term = ODP_PMR_ETHTYPE_0; + return 0; + } else if (strcasecmp(token, "ODP_PMR_SIP_ADDR") == 0) { *term = ODP_PMR_SIP_ADDR; return 0; } else if (strcasecmp(token, "ODP_PMR_CUSTOM_FRAME") == 0) { @@ -789,6 +792,7 @@ static int parse_pmr_policy(appl_args_t *appl_args, char *argv[], char *optarg) char *pmr_str; uint32_t offset; uint32_t ip_addr; + unsigned long int value; policy_count = appl_args->policy_count; stats = appl_args->stats; @@ -812,9 +816,24 @@ static int parse_pmr_policy(appl_args_t *appl_args, char *argv[], char *optarg) exit(EXIT_FAILURE); } stats[policy_count].rule.term = term; + stats[policy_count].rule.offset = 0; /* PMR value */ - switch (term) { + switch (term) { + case ODP_PMR_ETHTYPE_0: + /* :<type>:<mask> */ + token = strtok(NULL, ":"); + strncpy(stats[policy_count].value, token, + DISPLAY_STRING_LEN - 1); + value = strtoul(token, NULL, 0); + stats[policy_count].rule.val = value; + + token = strtok(NULL, ":"); + strncpy(stats[policy_count].mask, token, + DISPLAY_STRING_LEN - 1); + parse_mask(token, &stats[policy_count].rule.mask); + stats[policy_count].rule.val_sz = 2; + break; case ODP_PMR_SIP_ADDR: /* :<IP addr>:<mask> */ token = strtok(NULL, ":"); @@ -833,7 +852,6 @@ static int parse_pmr_policy(appl_args_t *appl_args, char *argv[], char *optarg) DISPLAY_STRING_LEN - 1); parse_mask(token, &stats[policy_count].rule.mask); stats[policy_count].rule.val_sz = 4; - stats[policy_count].rule.offset = 0; break; case ODP_PMR_CUSTOM_FRAME: /* :<offset>:<value>:<mask> */ commit 66e459c9f841932818acd423ddeda65f2ad1c2de Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Wed Oct 16 15:58:42 2019 +0300 example: cls: add source cos parameter Add source CoS name into the parameter list of -p option. This enables linking classification rules together. When a source CoS is not defined, the default CoS is used as the source CoS. Option -p parameter list format is now: <term>:<xxx>:<yyy>:<src_cos>:<dst_cos> Where <src_cos> is optional and number of "xxx", "yyy", etc parameters is term depend. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/example/classifier/odp_classifier.c b/example/classifier/odp_classifier.c index 3ee1cde76..578109e6c 100644 --- a/example/classifier/odp_classifier.c +++ b/example/classifier/odp_classifier.c @@ -56,6 +56,7 @@ typedef struct { odp_atomic_u64_t queue_pkt_count; /**< count of received packets */ odp_atomic_u64_t pool_pkt_count; /**< count of received packets */ char cos_name[ODP_COS_NAME_LEN]; /**< cos name */ + char src_cos_name[ODP_COS_NAME_LEN]; /**< source cos name */ struct { odp_cls_pmr_term_t term; /**< odp pmr term value */ uint64_t val; /**< pmr term value */ @@ -65,6 +66,8 @@ typedef struct { } rule; char value[DISPLAY_STRING_LEN]; /**< Display string for value */ char mask[DISPLAY_STRING_LEN]; /**< Display string for mask */ + int has_src_cos; + } global_statistics; typedef struct { @@ -87,17 +90,11 @@ enum packet_mode { static appl_args_t *appl_args_gbl; -/* helper funcs */ static int drop_err_pkts(odp_packet_t pkt_tbl[], unsigned len); static void swap_pkt_addrs(odp_packet_t pkt_tbl[], unsigned len); static void parse_args(int argc, char *argv[], appl_args_t *appl_args); static void print_info(char *progname, appl_args_t *appl_args); static void usage(char *progname); -static void configure_cos(odp_cos_t default_cos, appl_args_t *args); -static odp_cos_t configure_default_cos(odp_pktio_t pktio, appl_args_t *args); -static int convert_str_to_pmr_enum(char *token, odp_cls_pmr_term_t *term, - uint32_t *offset); -static int parse_pmr_policy(appl_args_t *appl_args, char *argv[], char *optarg); static inline void print_cls_statistics(appl_args_t *args) { @@ -410,6 +407,23 @@ static odp_cos_t configure_default_cos(odp_pktio_t pktio, appl_args_t *args) return cos_default; } +static int find_cos(appl_args_t *args, const char *name, odp_cos_t *cos) +{ + global_statistics *stats; + int i; + + for (i = 0; i < args->policy_count - 1; i++) { + stats = &args->stats[i]; + + if (strcmp(stats->cos_name, name) == 0) { + *cos = stats->cos; + return 0; + } + } + + return -1; +} + static void configure_cos(odp_cos_t default_cos, appl_args_t *args) { char cos_name[ODP_COS_NAME_LEN]; @@ -417,7 +431,6 @@ static void configure_cos(odp_cos_t default_cos, appl_args_t *args) const char *queue_name; odp_pool_param_t pool_params; odp_cls_cos_param_t cls_param; - odp_pmr_param_t pmr_param; int i; global_statistics *stats; odp_queue_param_t qparam; @@ -462,6 +475,23 @@ static void configure_cos(odp_cos_t default_cos, appl_args_t *args) cls_param.drop_policy = ODP_COS_DROP_POOL; stats->cos = odp_cls_cos_create(cos_name, &cls_param); + odp_atomic_init_u64(&stats->queue_pkt_count, 0); + odp_atomic_init_u64(&stats->pool_pkt_count, 0); + } + + for (i = 0; i < args->policy_count - 1; i++) { + odp_pmr_param_t pmr_param; + odp_cos_t src_cos = default_cos; + + stats = &args->stats[i]; + + if (stats->has_src_cos) { + if (find_cos(args, stats->src_cos_name, &src_cos)) { + ODPH_ERR("find_cos failed\n"); + exit(EXIT_FAILURE); + } + } + odp_cls_pmr_param_init(&pmr_param); pmr_param.term = stats->rule.term; pmr_param.match.value = &stats->rule.val; @@ -469,16 +499,14 @@ static void configure_cos(odp_cos_t default_cos, appl_args_t *args) pmr_param.val_sz = stats->rule.val_sz; pmr_param.offset = stats->rule.offset; - stats->pmr = odp_cls_pmr_create(&pmr_param, 1, default_cos, + stats->pmr = odp_cls_pmr_create(&pmr_param, 1, src_cos, stats->cos); if (stats->pmr == ODP_PMR_INVALID) { ODPH_ERR("odp_pktio_pmr_cos failed\n"); exit(EXIT_FAILURE); } - - odp_atomic_init_u64(&stats->queue_pkt_count, 0); - odp_atomic_init_u64(&stats->pool_pkt_count, 0); } + } static void sig_handler(int signo) @@ -735,30 +763,26 @@ static void swap_pkt_addrs(odp_packet_t pkt_tbl[], unsigned len) } } -static int convert_str_to_pmr_enum(char *token, odp_cls_pmr_term_t *term, - uint32_t *offset) +static int convert_str_to_pmr_enum(char *token, odp_cls_pmr_term_t *term) { if (NULL == token) return -1; - if (0 == strcasecmp(token, "ODP_PMR_SIP_ADDR")) { + if (strcasecmp(token, "ODP_PMR_SIP_ADDR") == 0) { *term = ODP_PMR_SIP_ADDR; return 0; - } else { - errno = 0; - *offset = strtoul(token, NULL, 0); - if (errno) - return -1; + } else if (strcasecmp(token, "ODP_PMR_CUSTOM_FRAME") == 0) { *term = ODP_PMR_CUSTOM_FRAME; return 0; } + return -1; } static int parse_pmr_policy(appl_args_t *appl_args, char *argv[], char *optarg) { int policy_count; - char *token; + char *token, *cos0, *cos1; size_t len; odp_cls_pmr_term_t term; global_statistics *stats; @@ -781,8 +805,9 @@ static int parse_pmr_policy(appl_args_t *appl_args, char *argv[], char *optarg) strcpy(pmr_str, optarg); /* PMR TERM */ + /* <term>:<xxx>:<yyy>:<src_cos>:<dst_cos> */ token = strtok(pmr_str, ":"); - if (convert_str_to_pmr_enum(token, &term, &offset)) { + if (convert_str_to_pmr_enum(token, &term)) { ODPH_ERR("Invalid ODP_PMR_TERM string\n"); exit(EXIT_FAILURE); } @@ -791,6 +816,7 @@ static int parse_pmr_policy(appl_args_t *appl_args, char *argv[], char *optarg) /* PMR value */ switch (term) { case ODP_PMR_SIP_ADDR: + /* :<IP addr>:<mask> */ token = strtok(NULL, ":"); strncpy(stats[policy_count].value, token, DISPLAY_STRING_LEN - 1); @@ -810,6 +836,13 @@ static int parse_pmr_policy(appl_args_t *appl_args, char *argv[], char *optarg) stats[policy_count].rule.offset = 0; break; case ODP_PMR_CUSTOM_FRAME: + /* :<offset>:<value>:<mask> */ + token = strtok(NULL, ":"); + errno = 0; + offset = strtoul(token, NULL, 0); + if (errno) + return -1; + token = strtok(NULL, ":"); strncpy(stats[policy_count].value, token, DISPLAY_STRING_LEN - 1); @@ -826,10 +859,24 @@ static int parse_pmr_policy(appl_args_t *appl_args, char *argv[], char *optarg) exit(EXIT_FAILURE); } - /* Queue Name */ - token = strtok(NULL, ":"); + /* Optional source CoS name and name of this CoS + * :<src_cos>:<cos> */ + cos0 = strtok(NULL, ":"); + cos1 = strtok(NULL, ":"); + if (cos0 == NULL) + return -1; + + if (cos1) { + stats[policy_count].has_src_cos = 1; + strncpy(stats[policy_count].src_cos_name, cos0, + ODP_COS_NAME_LEN - 1); + strncpy(stats[policy_count].cos_name, cos1, + ODP_COS_NAME_LEN - 1); + } else { + strncpy(stats[policy_count].cos_name, cos0, + ODP_COS_NAME_LEN - 1); + } - strncpy(stats[policy_count].cos_name, token, ODP_QUEUE_NAME_LEN - 1); appl_args->policy_count++; free(pmr_str); return 0; commit 0b63c8154a779ba20010bcd9ae7ee6bf610d755b Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Wed Oct 16 11:16:50 2019 +0300 example: cls: add verbose option Added -v option which prints received packet with CoS queue name. This can be used for debugging classification rules. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/example/classifier/odp_classifier.c b/example/classifier/odp_classifier.c index c38c6dfd8..3ee1cde76 100644 --- a/example/classifier/odp_classifier.c +++ b/example/classifier/odp_classifier.c @@ -1,4 +1,5 @@ /* Copyright (c) 2015-2018, Linaro Limited + * Copyright (c) 2019, Nokia * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause @@ -9,6 +10,7 @@ #include <getopt.h> #include <unistd.h> #include <inttypes.h> +#include <signal.h> #include <odp_api.h> #include <odp/helper/odph_api.h> @@ -74,6 +76,8 @@ typedef struct { uint32_t time; /**< Number of seconds to run */ char *if_name; /**< pointer to interface names */ int shutdown; /**< Shutdown threads if !0 */ + int shutdown_sig; + int verbose; } appl_args_t; enum packet_mode { @@ -81,6 +85,8 @@ enum packet_mode { APPL_MODE_REPLY /**< Packet is sent back */ }; +static appl_args_t *appl_args_gbl; + /* helper funcs */ static int drop_err_pkts(odp_packet_t pkt_tbl[], unsigned len); static void swap_pkt_addrs(odp_packet_t pkt_tbl[], unsigned len); @@ -93,8 +99,7 @@ static int convert_str_to_pmr_enum(char *token, odp_cls_pmr_term_t *term, uint32_t *offset); static int parse_pmr_policy(appl_args_t *appl_args, char *argv[], char *optarg); -static inline -void print_cls_statistics(appl_args_t *args) +static inline void print_cls_statistics(appl_args_t *args) { int i; uint32_t timeout; @@ -153,6 +158,9 @@ void print_cls_statistics(appl_args_t *args) printf("%-" PRIu64, odp_atomic_load_u64(&args-> total_packets)); + if (args->shutdown_sig) + break; + sleep(1); printf("\r"); fflush(stdout); @@ -161,8 +169,7 @@ void print_cls_statistics(appl_args_t *args) printf("\n"); } -static inline -int parse_mask(const char *str, uint64_t *mask) +static inline int parse_mask(const char *str, uint64_t *mask) { uint64_t b; int ret; @@ -172,8 +179,7 @@ int parse_mask(const char *str, uint64_t *mask) return ret != 1; } -static -int parse_value(const char *str, uint64_t *val, uint32_t *val_sz) +static int parse_value(const char *str, uint64_t *val, uint32_t *val_sz) { size_t len; size_t i; @@ -260,12 +266,13 @@ static int pktio_receive_thread(void *arg) odp_packet_t pkt; odp_pool_t pool; odp_event_t ev; - unsigned long err_cnt = 0; odp_queue_t queue; int i; + global_statistics *stats; + unsigned long err_cnt = 0; thr = odp_thread_id(); appl_args_t *appl = (appl_args_t *)arg; - global_statistics *stats; + uint64_t wait_time = odp_schedule_wait_time(100 * ODP_TIME_MSEC_IN_NS); /* Loop packets */ for (;;) { @@ -275,8 +282,7 @@ static int pktio_receive_thread(void *arg) break; /* Use schedule to get buf from any input queue */ - ev = odp_schedule(&queue, - odp_schedule_wait_time(ODP_TIME_SEC_IN_NS)); + ev = odp_schedule(&queue, wait_time); /* Loop back to receive packets incase of invalid event */ if (odp_unlikely(ev == ODP_EVENT_INVALID)) @@ -284,6 +290,19 @@ static int pktio_receive_thread(void *arg) pkt = odp_packet_from_event(ev); + if (appl->verbose) { + odp_queue_info_t info; + uint32_t len = odp_packet_len(pkt); + + if (odp_queue_info(queue, &info) == 0) + printf("Queue: %s\n", info.name); + + if (len > 96) + len = 96; + + odp_packet_print_data(pkt, 0, len); + } + /* Total packets received */ odp_atomic_inc_u64(&appl->total_packets); @@ -394,8 +413,8 @@ static odp_cos_t configure_default_cos(odp_pktio_t pktio, appl_args_t *args) static void configure_cos(odp_cos_t default_cos, appl_args_t *args) { char cos_name[ODP_COS_NAME_LEN]; - char queue_name[ODP_QUEUE_NAME_LEN]; char pool_name[ODP_POOL_NAME_LEN]; + const char *queue_name; odp_pool_param_t pool_params; odp_cls_cos_param_t cls_param; odp_pmr_param_t pmr_param; @@ -412,8 +431,7 @@ static void configure_cos(odp_cos_t default_cos, appl_args_t *args) qparam.sched.sync = ODP_SCHED_SYNC_PARALLEL; qparam.sched.group = ODP_SCHED_GROUP_ALL; - snprintf(queue_name, sizeof(queue_name), "%sQueue%d", - args->stats[i].cos_name, i); + queue_name = args->stats[i].cos_name; stats->queue = odp_queue_create(queue_name, &qparam); if (ODP_QUEUE_INVALID == stats->queue) { ODPH_ERR("odp_queue_create failed\n"); @@ -463,6 +481,15 @@ static void configure_cos(odp_cos_t default_cos, appl_args_t *args) } } +static void sig_handler(int signo) +{ + (void)signo; + + if (appl_args_gbl == NULL) + return; + appl_args_gbl->shutdown_sig = 1; +} + /** * ODP Classifier example main function */ @@ -486,6 +513,8 @@ int main(int argc, char *argv[]) odph_thread_common_param_t thr_common; odph_thread_param_t thr_param; + signal(SIGINT, sig_handler); + /* Let helper collect its own arguments (e.g. --odph_proc) */ argc = odph_parse_options(argc, argv); if (odph_options(&helper_options)) { @@ -524,6 +553,7 @@ int main(int argc, char *argv[]) exit(EXIT_FAILURE); } + appl_args_gbl = args; memset(args, 0, sizeof(*args)); /* Parse and store the application arguments */ parse_args(argc, argv, args); @@ -591,7 +621,18 @@ int main(int argc, char *argv[]) odph_thread_create(thread_tbl, &thr_common, &thr_param, num_workers); - print_cls_statistics(args); + if (args->verbose == 0) { + print_cls_statistics(args); + } else { + int timeout = args->time; + + for (i = 0; timeout == 0 || i < timeout; i++) { + if (args->shutdown_sig) + break; + + sleep(1); + } + } odp_pktio_stop(pktio); args->shutdown = 1; @@ -714,7 +755,6 @@ static int convert_str_to_pmr_enum(char *token, odp_cls_pmr_term_t *term, return -1; } - static int parse_pmr_policy(appl_args_t *appl_args, char *argv[], char *optarg) { int policy_count; @@ -813,17 +853,19 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args) static const struct option longopts[] = { {"count", required_argument, NULL, 'c'}, - {"interface", required_argument, NULL, 'i'}, /* return 'i' */ - {"policy", required_argument, NULL, 'p'}, /* return 'p' */ - {"mode", required_argument, NULL, 'm'}, /* return 'm' */ - {"time", required_argument, NULL, 't'}, /* return 't' */ - {"help", no_argument, NULL, 'h'}, /* return 'h' */ + {"interface", required_argument, NULL, 'i'}, + {"policy", required_argument, NULL, 'p'}, + {"mode", required_argument, NULL, 'm'}, + {"time", required_argument, NULL, 't'}, + {"verbose", no_argument, NULL, 'v'}, + {"help", no_argument, NULL, 'h'}, {NULL, 0, NULL, 0} }; - static const char *shortopts = "+c:t:i:p:m:t:h"; + static const char *shortopts = "+c:t:i:p:m:t:vh"; appl_args->cpu_count = 1; /* Use one worker by default */ + appl_args->verbose = 0; while (1) { opt = getopt_long(argc, argv, shortopts, @@ -861,11 +903,6 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args) strcpy(appl_args->if_name, optarg); interface = 1; break; - - case 'h': - usage(argv[0]); - exit(EXIT_SUCCESS); - break; case 'm': i = atoi(optarg); if (i == 0) @@ -873,7 +910,13 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args) else appl_args->appl_mode = APPL_MODE_REPLY; break; - + case 'v': + appl_args->verbose = 1; + break; + case 'h': + usage(argv[0]); + exit(EXIT_SUCCESS); + break; default: break; } commit e7117fb0ecc8440dd1b8ef5845b14c82cd2f2ace Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Fri Oct 11 17:28:39 2019 +0300 linux-gen: cls: fix eth_type_0 match bug Eth_type_0 match required packet to be a VLAN qinq frame, when packet needs to be just ethernet. Also, eth_type_0 test case produced a VLAN qinq frame. Use an IPv6 packet instead. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/platform/linux-generic/odp_classification.c b/platform/linux-generic/odp_classification.c index 6f4b02c2f..93e086e84 100644 --- a/platform/linux-generic/odp_classification.c +++ b/platform/linux-generic/odp_classification.c @@ -1041,7 +1041,7 @@ static inline int verify_pmr_eth_type_0(const uint8_t *pkt_addr, const _odp_ethhdr_t *eth; uint16_t ethtype; - if (!pkt_hdr->p.input_flags.vlan_qinq) + if (!packet_hdr_has_eth(pkt_hdr)) return 0; eth = (const _odp_ethhdr_t *)(pkt_addr + pkt_hdr->p.l2_offset); diff --git a/test/validation/api/classification/odp_classification_test_pmr.c b/test/validation/api/classification/odp_classification_test_pmr.c index 47cdeaa76..c8cf0077d 100644 --- a/test/validation/api/classification/odp_classification_test_pmr.c +++ b/test/validation/api/classification/odp_classification_test_pmr.c @@ -1285,7 +1285,7 @@ static void classification_test_pmr_term_eth_type_0(void) odph_ethhdr_t *eth; cls_packet_info_t pkt_info; - val = 0x88A8; + val = ODPH_ETHTYPE_IPV6; mask = 0xffff; seqno = 0; @@ -1322,8 +1322,7 @@ static void classification_test_pmr_term_eth_type_0(void) CU_ASSERT(pmr != ODP_PMR_INVALID); pkt_info = default_pkt_info; - pkt_info.vlan = true; - pkt_info.vlan_qinq = true; + pkt_info.ipv6 = true; pkt = create_packet(pkt_info); CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID); seqno = cls_pkt_get_seq(pkt); commit 95eb732efd42e889e280120f504c4c3e50348cab Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Fri Oct 11 17:02:58 2019 +0300 linux-gen: cls: remove odp_classification_inlines.h Content of this header is needed only in odp_classification.c file. Copy content there and remove the header file. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 9f24bc829..0d4d905f9 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -90,7 +90,6 @@ noinst_HEADERS = \ include/odp_bitset.h \ include/odp_buffer_internal.h \ include/odp_classification_datamodel.h \ - include/odp_classification_inlines.h \ include/odp_classification_internal.h \ include/odp_config_internal.h \ include/odp_debug_internal.h \ diff --git a/platform/linux-generic/include/odp_classification_inlines.h b/platform/linux-generic/include/odp_classification_inlines.h deleted file mode 100644 index 36fffc1dc..000000000 --- a/platform/linux-generic/include/odp_classification_inlines.h +++ /dev/null @@ -1,385 +0,0 @@ -/* Copyright (c) 2014-2018, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -/** - * @file - * - * ODP Classification Inlines - * Classification Inlines Functions - */ -#ifndef __ODP_CLASSIFICATION_INLINES_H_ -#define __ODP_CLASSIFICATION_INLINES_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -#include <odp/api/debug.h> -#include <odp/api/byteorder.h> -#include <odp/api/plat/byteorder_inlines.h> -#include <protocols/eth.h> -#include <protocols/ip.h> -#include <protocols/ipsec.h> -#include <protocols/udp.h> -#include <protocols/tcp.h> -#include <odp_packet_internal.h> -#include <stdio.h> -#include <inttypes.h> - -/* PMR term value verification function -These functions verify the given PMR term value with the value in the packet -These following functions return 1 on success and 0 on failure -*/ - -static inline int verify_pmr_packet_len(odp_packet_hdr_t *pkt_hdr, - pmr_term_value_t *term_value) -{ - if (term_value->match.value == (packet_len(pkt_hdr) & - term_value->match.mask)) - return 1; - - return 0; -} - -static inline int verify_pmr_ip_proto(const uint8_t *pkt_addr, - odp_packet_hdr_t *pkt_hdr, - pmr_term_value_t *term_value) -{ - const _odp_ipv4hdr_t *ip; - uint8_t proto; - - if (!pkt_hdr->p.input_flags.ipv4) - return 0; - ip = (const _odp_ipv4hdr_t *)(pkt_addr + pkt_hdr->p.l3_offset); - proto = ip->proto; - if (term_value->match.value == (proto & term_value->match.mask)) - return 1; - - return 0; -} - -static inline int verify_pmr_ipv4_saddr(const uint8_t *pkt_addr, - odp_packet_hdr_t *pkt_hdr, - pmr_term_value_t *term_value) -{ - const _odp_ipv4hdr_t *ip; - uint32_t ipaddr; - - if (!pkt_hdr->p.input_flags.ipv4) - return 0; - ip = (const _odp_ipv4hdr_t *)(pkt_addr + pkt_hdr->p.l3_offset); - ipaddr = odp_be_to_cpu_32(ip->src_addr); - if (term_value->match.value == (ipaddr & term_value->match.mask)) - return 1; - - return 0; -} - -static inline int verify_pmr_ipv4_daddr(const uint8_t *pkt_addr, - odp_packet_hdr_t *pkt_hdr, - pmr_term_value_t *term_value) -{ - const _odp_ipv4hdr_t *ip; - uint32_t ipaddr; - - if (!pkt_hdr->p.input_flags.ipv4) - return 0; - ip = (const _odp_ipv4hdr_t *)(pkt_addr + pkt_hdr->p.l3_offset); - ipaddr = odp_be_to_cpu_32(ip->dst_addr); - if (term_value->match.value == (ipaddr & term_value->match.mask)) - return 1; - - return 0; -} - -static inline int verify_pmr_tcp_sport(const uint8_t *pkt_addr, - odp_packet_hdr_t *pkt_hdr, - pmr_term_value_t *term_value) -{ - uint16_t sport; - const _odp_tcphdr_t *tcp; - - if (!pkt_hdr->p.input_flags.tcp) - return 0; - tcp = (const _odp_tcphdr_t *)(pkt_addr + pkt_hdr->p.l4_offset); - sport = odp_be_to_cpu_16(tcp->src_port); - if (term_value->match.value == (sport & term_value->match.mask)) - return 1; - - return 0; -} - -static inline int verify_pmr_tcp_dport(const uint8_t *pkt_addr, - odp_packet_hdr_t *pkt_hdr, - pmr_term_value_t *term_value) -{ - uint16_t dport; - const _odp_tcphdr_t *tcp; - - if (!pkt_hdr->p.input_flags.tcp) - return 0; - tcp = (const _odp_tcphdr_t *)(pkt_addr + pkt_hdr->p.l4_offset); - dport = odp_be_to_cpu_16(tcp->dst_port); - if (term_value->match.value == (dport & term_value->match.mask)) - return 1; - - return 0; -} - -static inline int verify_pmr_udp_dport(const uint8_t *pkt_addr, - odp_packet_hdr_t *pkt_hdr, - pmr_term_value_t *term_value) -{ - uint16_t dport; - const _odp_udphdr_t *udp; - - if (!pkt_hdr->p.input_flags.udp) - return 0; - udp = (const _odp_udphdr_t *)(pkt_addr + pkt_hdr->p.l4_offset); - dport = odp_be_to_cpu_16(udp->dst_port); - if (term_value->match.value == (dport & term_value->match.mask)) - return 1; - - return 0; -} - -static inline int verify_pmr_udp_sport(const uint8_t *pkt_addr, - odp_packet_hdr_t *pkt_hdr, - pmr_term_value_t *term_value) -{ - uint16_t sport; - const _odp_udphdr_t *udp; - - if (!pkt_hdr->p.input_flags.udp) - return 0; - udp = (const _odp_udphdr_t *)(pkt_addr + pkt_hdr->p.l4_offset); - sport = odp_be_to_cpu_16(udp->src_port); - if (term_value->match.value == (sport & term_value->match.mask)) - return 1; - - return 0; -} - -static inline int verify_pmr_dmac(const uint8_t *pkt_addr, - odp_packet_hdr_t *pkt_hdr, - pmr_term_value_t *term_value) -{ - uint64_t dmac = 0; - uint64_t dmac_be = 0; - const _odp_ethhdr_t *eth; - - if (!packet_hdr_has_eth(pkt_hdr)) - return 0; - - eth = (const _odp_ethhdr_t *)(pkt_addr + pkt_hdr->p.l2_offset); - memcpy(&dmac_be, eth->dst.addr, _ODP_ETHADDR_LEN); - dmac = odp_be_to_cpu_64(dmac_be); - /* since we are converting a 48 bit ethernet address from BE to cpu - format using odp_be_to_cpu_64() the last 16 bits needs to be right - shifted */ - if (dmac_be != dmac) - dmac = dmac >> (64 - (_ODP_ETHADDR_LEN * 8)); - - if (term_value->match.value == (dmac & term_value->match.mask)) - return 1; - return 0; -} - -static inline int verify_pmr_ipv6_saddr(const uint8_t *pkt_addr, - odp_packet_hdr_t *pkt_hdr, - pmr_term_value_t *term_value) -{ - const _odp_ipv6hdr_t *ipv6; - uint64_t addr[2]; - - if (!packet_hdr_has_ipv6(pkt_hdr)) - return 0; - - ipv6 = (const _odp_ipv6hdr_t *)(pkt_addr + pkt_hdr->p.l3_offset); - - addr[0] = ipv6->src_addr.u64[0]; - addr[1] = ipv6->src_addr.u64[1]; - - /* 128 bit address is processed as two 64 bit value - * for bitwise AND operation */ - addr[0] = addr[0] & term_value->match_ipv6.mask.u64[0]; - addr[1] = addr[1] & term_value->match_ipv6.mask.u64[1]; - - if (!memcmp(addr, term_value->match_ipv6.addr.u8, _ODP_IPV6ADDR_LEN)) - return 1; - - return 0; -} - -static inline int verify_pmr_ipv6_daddr(const uint8_t *pkt_addr, - odp_packet_hdr_t *pkt_hdr, - pmr_term_value_t *term_value) -{ - const _odp_ipv6hdr_t *ipv6; - uint64_t addr[2]; - - if (!packet_hdr_has_ipv6(pkt_hdr)) - return 0; - ipv6 = (const _odp_ipv6hdr_t *)(pkt_addr + pkt_hdr->p.l3_offset); - addr[0] = ipv6->dst_addr.u64[0]; - addr[1] = ipv6->dst_addr.u64[1]; - - /* 128 bit address is processed as two 64 bit value - * for bitwise AND operation */ - addr[0] = addr[0] & term_value->match_ipv6.mask.u64[0]; - addr[1] = addr[1] & term_value->match_ipv6.mask.u64[1]; - - if (!memcmp(addr, term_value->match_ipv6.addr.u8, _ODP_IPV6ADDR_LEN)) - return 1; - - return 0; -} - -static inline int verify_pmr_vlan_id_0(const uint8_t *pkt_addr, - odp_packet_hdr_t *pkt_hdr, - pmr_term_value_t *term_value) -{ - const _odp_ethhdr_t *eth; - const _odp_vlanhdr_t *vlan; - uint16_t tci; - uint16_t vlan_id; - - if (!pkt_hdr->p.input_flags.vlan_qinq) - return 0; - - eth = (const _odp_ethhdr_t *)(pkt_addr + pkt_hdr->p.l2_offset); - vlan = (const _odp_vlanhdr_t *)(eth + 1); - tci = odp_be_to_cpu_16(vlan->tci); - vlan_id = tci & 0x0fff; - - if (term_value->match.value == (vlan_id & term_value->match.mask)) - return 1; - - return 0; -} - -static inline int verify_pmr_vlan_id_x(const uint8_t *pkt_addr ODP_UNUSED, - odp_packet_hdr_t *pkt_hdr ODP_UNUSED, - pmr_term_value_t *term_value ODP_UNUSED) -{ - const _odp_ethhdr_t *eth; - const _odp_vlanhdr_t *vlan; - uint16_t tci; - uint16_t vlan_id; - - if (!pkt_hdr->p.input_flags.vlan_qinq) - return 0; - - eth = (const _odp_ethhdr_t *)(pkt_addr + pkt_hdr->p.l2_offset); - vlan = (const _odp_vlanhdr_t *)(eth + 1); - vlan++; - tci = odp_be_to_cpu_16(vlan->tci); - vlan_id = tci & 0x0fff; - - if (term_value->match.value == (vlan_id & term_value->match.mask)) - return 1; - - return 0; -} - -static inline int verify_pmr_ipsec_spi(const uint8_t *pkt_addr, - odp_packet_hdr_t *pkt_hdr, - pmr_term_value_t *term_value) -{ - uint32_t spi; - - pkt_addr += pkt_hdr->p.l4_offset; - - if (pkt_hdr->p.input_flags.ipsec_ah) { - const _odp_ahhdr_t *ahhdr = (const _odp_ahhdr_t *)pkt_addr; - - spi = odp_be_to_cpu_32(ahhdr->spi); - } else if (pkt_hdr->p.input_flags.ipsec_esp) { - const _odp_esphdr_t *esphdr = (const _odp_esphdr_t *)pkt_addr; - - spi = odp_be_to_cpu_32(esphdr->spi); - } else { - return 0; - } - - if (term_value->match.value == (spi & term_value->match.mask)) - return 1; - - return 0; -} - -static inline int verify_pmr_ld_vni(const uint8_t *pkt_addr ODP_UNUSED, - odp_packet_hdr_t *pkt_hdr ODP_UNUSED, - pmr_term_value_t *term_value ODP_UNUSED) -{ - ODP_UNIMPLEMENTED(); - return 0; -} - -static inline int verify_pmr_custom_frame(const uint8_t *pkt_addr, - odp_packet_hdr_t *pkt_hdr, - pmr_term_value_t *term_value) -{ - uint64_t val = 0; - uint32_t offset = term_value->offset; - uint32_t val_sz = term_value->val_sz; - - ODP_ASSERT(val_sz <= CLS_PMR_TERM_BYTES_MAX); - - if (packet_len(pkt_hdr) <= offset + val_sz) - return 0; - - memcpy(&val, pkt_addr + offset, val_sz); - if (term_value->match.value == (val & term_value->match.mask)) - return 1; - - return 0; -} - -static inline int verify_pmr_eth_type_0(const uint8_t *pkt_addr, - odp_packet_hdr_t *pkt_hdr, - pmr_term_value_t *term_value) -{ - const _odp_ethhdr_t *eth; - uint16_t ethtype; - - if (!pkt_hdr->p.input_flags.vlan_qinq) - return 0; - - eth = (const _odp_ethhdr_t *)(pkt_addr + pkt_hdr->p.l2_offset); - ethtype = odp_be_to_cpu_16(eth->type); - - if (term_value->match.value == (ethtype & term_value->match.mask)) - return 1; - - return 0; -} - -static inline int verify_pmr_eth_type_x(const uint8_t *pkt_addr, - odp_packet_hdr_t *pkt_hdr, - pmr_term_value_t *term_value) -{ - const _odp_ethhdr_t *eth; - uint16_t ethtype; - const _odp_vlanhdr_t *vlan; - - if (!pkt_hdr->p.input_flags.vlan_qinq) - return 0; - - eth = (const _odp_ethhdr_t *)(pkt_addr + pkt_hdr->p.l2_offset); - vlan = (const _odp_vlanhdr_t *)(eth + 1); - ethtype = odp_be_to_cpu_16(vlan->type); - - if (term_value->match.value == (ethtype & term_value->match.mask)) - return 1; - - return 0; -} - -#ifdef __cplusplus -} -#endif -#endif diff --git a/platform/linux-generic/odp_classification.c b/platform/linux-generic/odp_classification.c index b3d91b3fe..6f4b02c2f 100644 --- a/platform/linux-generic/odp_classification.c +++ b/platform/linux-generic/odp_classification.c @@ -15,12 +15,14 @@ #include <odp/api/packet_io.h> #include <odp_packet_io_internal.h> #include <odp_classification_datamodel.h> -#include <odp_classification_inlines.h> #include <odp_classification_internal.h> #include <odp/api/shared_memory.h> -#include <protocols/thash.h> #include <protocols/eth.h> #include <protocols/ip.h> +#include <protocols/ipsec.h> +#include <protocols/udp.h> +#include <protocols/tcp.h> +#include <protocols/thash.h> #include <string.h> #include <errno.h> #include <stdbool.h> @@ -727,12 +729,357 @@ odp_pool_t odp_cls_cos_pool(odp_cos_t cos_id) return cos->s.pool; } +static inline int verify_pmr_packet_len(odp_packet_hdr_t *pkt_hdr, + pmr_term_value_t *term_value) +{ + if (term_value->match.value == (packet_len(pkt_hdr) & + term_value->match.mask)) + return 1; + + return 0; +} + +static inline int verify_pmr_ip_proto(const uint8_t *pkt_addr, + odp_packet_hdr_t *pkt_hdr, + pmr_term_value_t *term_value) +{ + const _odp_ipv4hdr_t *ip; + uint8_t proto; + + if (!pkt_hdr->p.input_flags.ipv4) + return 0; + ip = (const _odp_ipv4hdr_t *)(pkt_addr + pkt_hdr->p.l3_offset); + proto = ip->proto; + if (term_value->match.value == (proto & term_value->match.mask)) + return 1; + + return 0; +} + +static inline int verify_pmr_ipv4_saddr(const uint8_t *pkt_addr, + odp_packet_hdr_t *pkt_hdr, + pmr_term_value_t *term_value) +{ + const _odp_ipv4hdr_t *ip; + uint32_t ipaddr; + + if (!pkt_hdr->p.input_flags.ipv4) + return 0; + ip = (const _odp_ipv4hdr_t *)(pkt_addr + pkt_hdr->p.l3_offset); + ipaddr = odp_be_to_cpu_32(ip->src_addr); + if (term_value->match.value == (ipaddr & term_value->match.mask)) + return 1; + + return 0; +} + +static inline int verify_pmr_ipv4_daddr(const uint8_t *pkt_addr, + odp_packet_hdr_t *pkt_hdr, + pmr_term_value_t *term_value) +{ + const _odp_ipv4hdr_t *ip; + uint32_t ipaddr; + + if (!pkt_hdr->p.input_flags.ipv4) + return 0; + ip = (const _odp_ipv4hdr_t *)(pkt_addr + pkt_hdr->p.l3_offset); + ipaddr = odp_be_to_cpu_32(ip->dst_addr); + if (term_value->match.value == (ipaddr & term_value->match.mask)) + return 1; + + return 0; +} + +static inline int verify_pmr_tcp_sport(const uint8_t *pkt_addr, + odp_packet_hdr_t *pkt_hdr, + pmr_term_value_t *term_value) +{ + uint16_t sport; + const _odp_tcphdr_t *tcp; + + if (!pkt_hdr->p.input_flags.tcp) + return 0; + tcp = (const _odp_tcphdr_t *)(pkt_addr + pkt_hdr->p.l4_offset); + sport = odp_be_to_cpu_16(tcp->src_port); + if (term_value->match.value == (sport & term_value->match.mask)) + return 1; + + return 0; +} + +static inline int verify_pmr_tcp_dport(const uint8_t *pkt_addr, + odp_packet_hdr_t *pkt_hdr, + pmr_term_value_t *term_value) +{ + uint16_t dport; + const _odp_tcphdr_t *tcp; + + if (!pkt_hdr->p.input_flags.tcp) + return 0; + tcp = (const _odp_tcphdr_t *)(pkt_addr + pkt_hdr->p.l4_offset); + dport = odp_be_to_cpu_16(tcp->dst_port); + if (term_value->match.value == (dport & term_value->match.mask)) + return 1; + + return 0; +} + +static inline int verify_pmr_udp_dport(const uint8_t *pkt_addr, + odp_packet_hdr_t *pkt_hdr, + pmr_term_value_t *term_value) +{ + uint16_t dport; + const _odp_udphdr_t *udp; + + if (!pkt_hdr->p.input_flags.udp) + return 0; + udp = (const _odp_udphdr_t *)(pkt_addr + pkt_hdr->p.l4_offset); + dport = odp_be_to_cpu_16(udp->dst_port); + if (term_value->match.value == (dport & term_value->match.mask)) + return 1; + + return 0; +} + +static inline int verify_pmr_udp_sport(const uint8_t *pkt_addr, + odp_packet_hdr_t *pkt_hdr, + pmr_term_value_t *term_value) +{ + uint16_t sport; + const _odp_udphdr_t *udp; + + if (!pkt_hdr->p.input_flags.udp) + return 0; + udp = (const _odp_udphdr_t *)(pkt_addr + pkt_hdr->p.l4_offset); + sport = odp_be_to_cpu_16(udp->src_port); + if (term_value->match.value == (sport & term_value->match.mask)) + return 1; + + return 0; +} + +static inline int verify_pmr_dmac(const uint8_t *pkt_addr, + odp_packet_hdr_t *pkt_hdr, + pmr_term_value_t *term_value) +{ + uint64_t dmac = 0; + uint64_t dmac_be = 0; + const _odp_ethhdr_t *eth; + + if (!packet_hdr_has_eth(pkt_hdr)) + return 0; + + eth = (const _odp_ethhdr_t *)(pkt_addr + pkt_hdr->p.l2_offset); + memcpy(&dmac_be, eth->dst.addr, _ODP_ETHADDR_LEN); + dmac = odp_be_to_cpu_64(dmac_be); + /* since we are converting a 48 bit ethernet address from BE to cpu + format using odp_be_to_cpu_64() the last 16 bits needs to be right + shifted */ + if (dmac_be != dmac) + dmac = dmac >> (64 - (_ODP_ETHADDR_LEN * 8)); + + if (term_value->match.value == (dmac & term_value->match.mask)) + return 1; + return 0; +} + +static inline int verify_pmr_ipv6_saddr(const uint8_t *pkt_addr, + odp_packet_hdr_t *pkt_hdr, + pmr_term_value_t *term_value) +{ + const _odp_ipv6hdr_t *ipv6; + uint64_t addr[2]; + + if (!packet_hdr_has_ipv6(pkt_hdr)) + return 0; + + ipv6 = (const _odp_ipv6hdr_t *)(pkt_addr + pkt_hdr->p.l3_offset); + + addr[0] = ipv6->src_addr.u64[0]; + addr[1] = ipv6->src_addr.u64[1]; + + /* 128 bit address is processed as two 64 bit value + * for bitwise AND operation */ + addr[0] = addr[0] & term_value->match_ipv6.mask.u64[0]; + addr[1] = addr[1] & term_value->match_ipv6.mask.u64[1]; + + if (!memcmp(addr, term_value->match_ipv6.addr.u8, _ODP_IPV6ADDR_LEN)) + return 1; + + return 0; +} + +static inline int verify_pmr_ipv6_daddr(const uint8_t *pkt_addr, + odp_packet_hdr_t *pkt_hdr, + pmr_term_value_t *term_value) +{ + const _odp_ipv6hdr_t *ipv6; + uint64_t addr[2]; + + if (!packet_hdr_has_ipv6(pkt_hdr)) + return 0; + ipv6 = (const _odp_ipv6hdr_t *)(pkt_addr + pkt_hdr->p.l3_offset); + addr[0] = ipv6->dst_addr.u64[0]; + addr[1] = ipv6->dst_addr.u64[1]; + + /* 128 bit address is processed as two 64 bit value + * for bitwise AND operation */ + addr[0] = addr[0] & term_value->match_ipv6.mask.u64[0]; + addr[1] = addr[1] & term_value->match_ipv6.mask.u64[1]; + + if (!memcmp(addr, term_value->match_ipv6.addr.u8, _ODP_IPV6ADDR_LEN)) + return 1; + + return 0; +} + +static inline int verify_pmr_vlan_id_0(const uint8_t *pkt_addr, + odp_packet_hdr_t *pkt_hdr, + pmr_term_value_t *term_value) +{ + const _odp_ethhdr_t *eth; + const _odp_vlanhdr_t *vlan; + uint16_t tci; + uint16_t vlan_id; + + if (!pkt_hdr->p.input_flags.vlan_qinq) + return 0; + + eth = (const _odp_ethhdr_t *)(pkt_addr + pkt_hdr->p.l2_offset); + vlan = (const _odp_vlanhdr_t *)(eth + 1); + tci = odp_be_to_cpu_16(vlan->tci); + vlan_id = tci & 0x0fff; + + if (term_value->match.value == (vlan_id & term_value->match.mask)) + return 1; + + return 0; +} + +static inline int verify_pmr_vlan_id_x(const uint8_t *pkt_addr ODP_UNUSED, + odp_packet_hdr_t *pkt_hdr ODP_UNUSED, + pmr_term_value_t *term_value ODP_UNUSED) +{ + const _odp_ethhdr_t *eth; + const _odp_vlanhdr_t *vlan; + uint16_t tci; + uint16_t vlan_id; + + if (!pkt_hdr->p.input_flags.vlan_qinq) + return 0; + + eth = (const _odp_ethhdr_t *)(pkt_addr + pkt_hdr->p.l2_offset); + vlan = (const _odp_vlanhdr_t *)(eth + 1); + vlan++; + tci = odp_be_to_cpu_16(vlan->tci); + vlan_id = tci & 0x0fff; + + if (term_value->match.value == (vlan_id & term_value->match.mask)) + return 1; + + return 0; +} + +static inline int verify_pmr_ipsec_spi(const uint8_t *pkt_addr, + odp_packet_hdr_t *pkt_hdr, + pmr_term_value_t *term_value) +{ + uint32_t spi; + + pkt_addr += pkt_hdr->p.l4_offset; + + if (pkt_hdr->p.input_flags.ipsec_ah) { + const _odp_ahhdr_t *ahhdr = (const _odp_ahhdr_t *)pkt_addr; + + spi = odp_be_to_cpu_32(ahhdr->spi); + } else if (pkt_hdr->p.input_flags.ipsec_esp) { + const _odp_esphdr_t *esphdr = (const _odp_esphdr_t *)pkt_addr; + + spi = odp_be_to_cpu_32(esphdr->spi); + } else { + return 0; + } + + if (term_value->match.value == (spi & term_value->match.mask)) + return 1; + + return 0; +} + +static inline int verify_pmr_ld_vni(const uint8_t *pkt_addr ODP_UNUSED, + odp_packet_hdr_t *pkt_hdr ODP_UNUSED, + pmr_term_value_t *term_value ODP_UNUSED) +{ + ODP_UNIMPLEMENTED(); + return 0; +} + +static inline int verify_pmr_custom_frame(const uint8_t *pkt_addr, + odp_packet_hdr_t *pkt_hdr, + pmr_term_value_t *term_value) +{ + uint64_t val = 0; + uint32_t offset = term_value->offset; + uint32_t val_sz = term_value->val_sz; + + ODP_ASSERT(val_sz <= CLS_PMR_TERM_BYTES_MAX); + + if (packet_len(pkt_hdr) <= offset + val_sz) + return 0; + + memcpy(&val, pkt_addr + offset, val_sz); + if (term_value->match.value == (val & term_value->match.mask)) + return 1; + + return 0; +} + +static inline int verify_pmr_eth_type_0(const uint8_t *pkt_addr, + odp_packet_hdr_t *pkt_hdr, + pmr_term_value_t *term_value) +{ + const _odp_ethhdr_t *eth; + uint16_t ethtype; + + if (!pkt_hdr->p.input_flags.vlan_qinq) + return 0; + + eth = (const _odp_ethhdr_t *)(pkt_addr + pkt_hdr->p.l2_offset); + ethtype = odp_be_to_cpu_16(eth->type); + + if (term_value->match.value == (ethtype & term_value->match.mask)) + return 1; + + return 0; +} + +static inline int verify_pmr_eth_type_x(const uint8_t *pkt_addr, + odp_packet_hdr_t *pkt_hdr, + pmr_term_value_t *term_value) +{ + const _odp_ethhdr_t *eth; + uint16_t ethtype; + const _odp_vlanhdr_t *vlan; + + if (!pkt_hdr->p.input_flags.vlan_qinq) + return 0; + + eth = (const _odp_ethhdr_t *)(pkt_addr + pkt_hdr->p.l2_offset); + vlan = (const _odp_vlanhdr_t *)(eth + 1); + ethtype = odp_be_to_cpu_16(vlan->type); + + if (term_value->match.value == (ethtype & term_value->match.mask)) + return 1; + + return 0; +} + /* * This function goes through each PMR_TERM value in pmr_t structure and calls * verification function for each term.Returns 1 if PMR matches or 0 otherwise. */ -static -int verify_pmr(pmr_t *pmr, const uint8_t *pkt_addr, odp_packet_hdr_t *pkt_hdr) +static int verify_pmr(pmr_t *pmr, const uint8_t *pkt_addr, + odp_packet_hdr_t *pkt_hdr) { int pmr_failure = 0; int num_pmr; diff --git a/platform/linux-generic/pktio/netmap.c b/platform/linux-generic/pktio/netmap.c index 230a9a76b..313ebd5ec 100644 --- a/platform/linux-generic/pktio/netmap.c +++ b/platform/linux-generic/pktio/netmap.c @@ -31,7 +31,6 @@ #include <linux/ethtool.h> #include <linux/sockios.h> #include <odp_classification_datamodel.h> -#include <odp_classification_inlines.h> #include <odp_classification_internal.h> #include <odp_libconfig_internal.h> diff --git a/platform/linux-generic/pktio/socket_mmap.c b/platform/linux-generic/pktio/socket_mmap.c index 17bebe9a0..6ae0e295f 100644 --- a/platform/linux-generic/pktio/socket_mmap.c +++ b/platform/linux-generic/pktio/socket_mmap.c @@ -34,7 +34,6 @@ #include <odp_debug_internal.h> #include <odp_errno_define.h> #include <odp_classification_datamodel.h> -#include <odp_classification_inlines.h> #include <odp_classification_internal.h> #include <odp/api/hints.h> #include <odp_global_data.h> ----------------------------------------------------------------------- Summary of changes: example/classifier/odp_classifier.c | 222 +++++++++--- platform/linux-generic/Makefile.am | 1 - .../include/odp_classification_inlines.h | 385 --------------------- platform/linux-generic/include/odp_packet_dpdk.h | 14 +- platform/linux-generic/odp_classification.c | 362 ++++++++++++++++++- platform/linux-generic/pktio/dpdk.c | 81 ++++- platform/linux-generic/pktio/dpdk_parse.c | 38 +- platform/linux-generic/pktio/netmap.c | 1 - platform/linux-generic/pktio/socket_mmap.c | 1 - .../classification/odp_classification_test_pmr.c | 30 +- 10 files changed, 646 insertions(+), 489 deletions(-) delete mode 100644 platform/linux-generic/include/odp_classification_inlines.h hooks/post-receive --

6 years, 3 months

[COMMIT] branch master updated. v1.21.0.0-256-ge30d10a42

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 e30d10a42db4083b53c5a85ee91d3bcda1bb80db (commit) via 8dcebe1c93786641649b1a1957fa4b54cf1e4d55 (commit) via 3cbc1462e8c79f7c0ce21c33ffa0365538f672e5 (commit) from dda80b5e5e143ff05ed0f8b0ce0f502be71eaa8b (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 e30d10a42db4083b53c5a85ee91d3bcda1bb80db Author: Matias Elo <matias.elo(a)nokia.com> Date: Mon Oct 21 16:28:52 2019 +0300 linux-gen: timer: add placeholder functions for local init/term Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/platform/linux-generic/include/odp_init_internal.h b/platform/linux-generic/include/odp_init_internal.h index 853ef1064..7a6a8bcaa 100644 --- a/platform/linux-generic/include/odp_init_internal.h +++ b/platform/linux-generic/include/odp_init_internal.h @@ -61,7 +61,9 @@ int _odp_comp_init_global(void); int _odp_comp_term_global(void); int _odp_timer_init_global(const odp_init_t *params); +int _odp_timer_init_local(void); int _odp_timer_term_global(void); +int _odp_timer_term_local(void); int _odp_time_init_global(void); int _odp_time_term_global(void); diff --git a/platform/linux-generic/odp_init.c b/platform/linux-generic/odp_init.c index e09b2879c..8a5b884b5 100644 --- a/platform/linux-generic/odp_init.c +++ b/platform/linux-generic/odp_init.c @@ -487,6 +487,13 @@ static int term_local(enum init_stage stage) } /* Fall through */ + case TIMER_INIT: + if (_odp_timer_term_local()) { + ODP_ERR("ODP timer local term failed.\n"); + rc = -1; + } + /* Fall through */ + case THREAD_INIT: rc_thd = _odp_thread_term_local(); if (rc_thd < 0) { @@ -539,6 +546,12 @@ int odp_init_local(odp_instance_t instance, odp_thread_type_t thr_type) } stage = PKTIO_INIT; + if (_odp_timer_init_local()) { + ODP_ERR("ODP timer local init failed.\n"); + goto init_fail; + } + stage = TIMER_INIT; + if (_odp_random_init_local()) { ODP_ERR("ODP random local init failed.\n"); goto init_fail; diff --git a/platform/linux-generic/odp_timer.c b/platform/linux-generic/odp_timer.c index 6966726e4..1ca61e179 100644 --- a/platform/linux-generic/odp_timer.c +++ b/platform/linux-generic/odp_timer.c @@ -1542,3 +1542,13 @@ int _odp_timer_term_global(void) return 0; } + +int _odp_timer_init_local(void) +{ + return 0; +} + +int _odp_timer_term_local(void) +{ + return 0; +} commit 8dcebe1c93786641649b1a1957fa4b54cf1e4d55 Author: Matias Elo <matias.elo(a)nokia.com> Date: Mon Oct 21 16:26:35 2019 +0300 linux-gen: init: fix local terminate function call order Local terminate functions should be called in reverse order compared to local init functions. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/platform/linux-generic/odp_init.c b/platform/linux-generic/odp_init.c index 8e0994734..e09b2879c 100644 --- a/platform/linux-generic/odp_init.c +++ b/platform/linux-generic/odp_init.c @@ -466,6 +466,13 @@ static int term_local(enum init_stage stage) } /* Fall through */ + case POOL_INIT: + if (_odp_pool_term_local()) { + ODP_ERR("ODP buffer pool local term failed.\n"); + rc = -1; + } + /* Fall through */ + case CRYPTO_INIT: if (_odp_crypto_term_local()) { ODP_ERR("ODP crypto local term failed.\n"); @@ -480,13 +487,6 @@ static int term_local(enum init_stage stage) } /* Fall through */ - case POOL_INIT: - if (_odp_pool_term_local()) { - ODP_ERR("ODP buffer pool local term failed.\n"); - rc = -1; - } - /* Fall through */ - case THREAD_INIT: rc_thd = _odp_thread_term_local(); if (rc_thd < 0) { commit 3cbc1462e8c79f7c0ce21c33ffa0365538f672e5 Author: Matias Elo <matias.elo(a)nokia.com> Date: Mon Oct 21 15:44:46 2019 +0300 linux-gen: init: prefix internal init/term functions with underscore Prefix internal init/term functions with underscore to improve code readability. Unused odp_timer_disarm_all() function declaration is removed. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/platform/linux-generic/include/odp_init_internal.h b/platform/linux-generic/include/odp_init_internal.h index 204f44838..853ef1064 100644 --- a/platform/linux-generic/include/odp_init_internal.h +++ b/platform/linux-generic/include/odp_init_internal.h @@ -14,24 +14,24 @@ extern "C" { #include <odp/api/init.h> #include <odp/api/thread.h> -int odp_cpumask_init_global(const odp_init_t *params); -int odp_cpumask_term_global(void); +int _odp_cpumask_init_global(const odp_init_t *params); +int _odp_cpumask_term_global(void); -int odp_system_info_init(void); -int odp_system_info_term(void); +int _odp_system_info_init(void); +int _odp_system_info_term(void); -int odp_thread_init_global(void); -int odp_thread_init_local(odp_thread_type_t type); -int odp_thread_term_local(void); -int odp_thread_term_global(void); +int _odp_thread_init_global(void); +int _odp_thread_init_local(odp_thread_type_t type); +int _odp_thread_term_local(void); +int _odp_thread_term_global(void); int _odp_pcapng_init_global(void); int _odp_pcapng_term_global(void); -int odp_pool_init_global(void); -int odp_pool_init_local(void); -int odp_pool_term_global(void); -int odp_pool_term_local(void); +int _odp_pool_init_global(void); +int _odp_pool_init_local(void); +int _odp_pool_term_global(void); +int _odp_pool_term_local(void); int _odp_queue_init_global(void); int _odp_queue_term_global(void); @@ -39,36 +39,35 @@ int _odp_queue_term_global(void); int _odp_schedule_init_global(void); int _odp_schedule_term_global(void); -int odp_pktio_init_global(void); -int odp_pktio_term_global(void); -int odp_pktio_init_local(void); +int _odp_pktio_init_global(void); +int _odp_pktio_term_global(void); +int _odp_pktio_init_local(void); -int odp_classification_init_global(void); -int odp_classification_term_global(void); +int _odp_classification_init_global(void); +int _odp_classification_term_global(void); -int odp_queue_init_global(void); -int odp_queue_term_global(void); +int _odp_queue_init_global(void); +int _odp_queue_term_global(void); int _odp_random_init_local(void); int _odp_random_term_local(void); -int odp_crypto_init_global(void); -int odp_crypto_term_global(void); +int _odp_crypto_init_global(void); +int _odp_crypto_term_global(void); int _odp_crypto_init_local(void); int _odp_crypto_term_local(void); int _odp_comp_init_global(void); int _odp_comp_term_global(void); -int odp_timer_init_global(const odp_init_t *params); -int odp_timer_term_global(void); -int odp_timer_disarm_all(void); +int _odp_timer_init_global(const odp_init_t *params); +int _odp_timer_term_global(void); -int odp_time_init_global(void); -int odp_time_term_global(void); +int _odp_time_init_global(void); +int _odp_time_term_global(void); -int odp_tm_init_global(void); -int odp_tm_term_global(void); +int _odp_tm_init_global(void); +int _odp_tm_term_global(void); int _odp_int_name_tbl_init_global(void); int _odp_int_name_tbl_term_global(void); diff --git a/platform/linux-generic/odp_classification.c b/platform/linux-generic/odp_classification.c index 9a299f51b..b3d91b3fe 100644 --- a/platform/linux-generic/odp_classification.c +++ b/platform/linux-generic/odp_classification.c @@ -86,7 +86,7 @@ pmr_t *get_pmr_entry_internal(odp_pmr_t pmr) return &pmr_tbl->pmr[_odp_pmr_to_ndx(pmr)]; } -int odp_classification_init_global(void) +int _odp_classification_init_global(void) { odp_shm_t shm; int i; @@ -119,7 +119,7 @@ int odp_classification_init_global(void) return 0; } -int odp_classification_term_global(void) +int _odp_classification_term_global(void) { if (cls_global && odp_shm_free(cls_global->shm)) { ODP_ERR("shm free failed\n"); diff --git a/platform/linux-generic/odp_cpumask.c b/platform/linux-generic/odp_cpumask.c index b8b9f325c..193e1a252 100644 --- a/platform/linux-generic/odp_cpumask.c +++ b/platform/linux-generic/odp_cpumask.c @@ -382,7 +382,7 @@ static void init_default_worker_cpumask(int control_cpus_default) * It also allows the default cpumasks to be overridden by * externally specified cpumasks passed in as initialization parameters. */ -int odp_cpumask_init_global(const odp_init_t *params) +int _odp_cpumask_init_global(const odp_init_t *params) { odp_cpumask_t *control_mask = &odp_global_ro.control_cpus; odp_cpumask_t *worker_mask = &odp_global_ro.worker_cpus; @@ -451,7 +451,7 @@ int odp_cpumask_init_global(const odp_init_t *params) } } -int odp_cpumask_term_global(void) +int _odp_cpumask_term_global(void) { return 0; } diff --git a/platform/linux-generic/odp_crypto_null.c b/platform/linux-generic/odp_crypto_null.c index c19cb6824..633cf4751 100644 --- a/platform/linux-generic/odp_crypto_null.c +++ b/platform/linux-generic/odp_crypto_null.c @@ -304,7 +304,7 @@ odp_crypto_operation(odp_crypto_op_param_t *param, } int -odp_crypto_init_global(void) +_odp_crypto_init_global(void) { size_t mem_size; odp_shm_t shm; @@ -337,7 +337,7 @@ odp_crypto_init_global(void) return 0; } -int odp_crypto_term_global(void) +int _odp_crypto_term_global(void) { int rc = 0; int ret; diff --git a/platform/linux-generic/odp_crypto_openssl.c b/platform/linux-generic/odp_crypto_openssl.c index 3911b8f4a..29cd22c2f 100644 --- a/platform/linux-generic/odp_crypto_openssl.c +++ b/platform/linux-generic/odp_crypto_openssl.c @@ -2487,8 +2487,7 @@ static void ODP_UNUSED openssl_lock(int mode, int n, } #endif -int -odp_crypto_init_global(void) +int _odp_crypto_init_global(void) { size_t mem_size; odp_shm_t shm; @@ -2533,7 +2532,7 @@ odp_crypto_init_global(void) return 0; } -int odp_crypto_term_global(void) +int _odp_crypto_term_global(void) { int rc = 0; int ret; diff --git a/platform/linux-generic/odp_init.c b/platform/linux-generic/odp_init.c index 7d2477b0b..8e0994734 100644 --- a/platform/linux-generic/odp_init.c +++ b/platform/linux-generic/odp_init.c @@ -125,14 +125,14 @@ static int term_global(enum init_stage stage) /* Fall through */ case TRAFFIC_MNGR_INIT: - if (odp_tm_term_global()) { + if (_odp_tm_term_global()) { ODP_ERR("TM term failed.\n"); rc = -1; } /* Fall through */ case CLASSIFICATION_INIT: - if (odp_classification_term_global()) { + if (_odp_classification_term_global()) { ODP_ERR("ODP classification term failed.\n"); rc = -1; } @@ -146,7 +146,7 @@ static int term_global(enum init_stage stage) /* Fall through */ case CRYPTO_INIT: - if (odp_crypto_term_global()) { + if (_odp_crypto_term_global()) { ODP_ERR("ODP crypto term failed.\n"); rc = -1; } @@ -156,14 +156,14 @@ static int term_global(enum init_stage stage) /* Fall through */ case TIMER_INIT: - if (odp_timer_term_global()) { + if (_odp_timer_term_global()) { ODP_ERR("ODP timer term failed.\n"); rc = -1; } /* Fall through */ case PKTIO_INIT: - if (odp_pktio_term_global()) { + if (_odp_pktio_term_global()) { ODP_ERR("ODP pktio term failed.\n"); rc = -1; } @@ -184,14 +184,14 @@ static int term_global(enum init_stage stage) /* Fall through */ case POOL_INIT: - if (odp_pool_term_global()) { + if (_odp_pool_term_global()) { ODP_ERR("ODP buffer pool term failed.\n"); rc = -1; } /* Fall through */ case THREAD_INIT: - if (odp_thread_term_global()) { + if (_odp_thread_term_global()) { ODP_ERR("ODP thread term failed.\n"); rc = -1; } @@ -226,14 +226,14 @@ static int term_global(enum init_stage stage) /* Fall through */ case SYSINFO_INIT: - if (odp_system_info_term()) { + if (_odp_system_info_term()) { ODP_ERR("ODP system info term failed.\n"); rc = -1; } /* Fall through */ case TIME_INIT: - if (odp_time_term_global()) { + if (_odp_time_term_global()) { ODP_ERR("ODP time term failed.\n"); rc = -1; } @@ -242,7 +242,7 @@ static int term_global(enum init_stage stage) case CPU_CYCLES_INIT: /* Fall through */ case CPUMASK_INIT: - if (odp_cpumask_term_global()) { + if (_odp_cpumask_term_global()) { ODP_ERR("ODP cpumask term failed.\n"); rc = -1; } @@ -291,7 +291,7 @@ int odp_init_global(odp_instance_t *instance, } stage = LIBCONFIG_INIT; - if (odp_cpumask_init_global(params)) { + if (_odp_cpumask_init_global(params)) { ODP_ERR("ODP cpumask init failed.\n"); goto init_failed; } @@ -303,13 +303,13 @@ int odp_init_global(odp_instance_t *instance, } stage = CPU_CYCLES_INIT; - if (odp_time_init_global()) { + if (_odp_time_init_global()) { ODP_ERR("ODP time init failed.\n"); goto init_failed; } stage = TIME_INIT; - if (odp_system_info_init()) { + if (_odp_system_info_init()) { ODP_ERR("ODP system_info init failed.\n"); goto init_failed; } @@ -339,13 +339,13 @@ int odp_init_global(odp_instance_t *instance, } stage = HASH_INIT; - if (odp_thread_init_global()) { + if (_odp_thread_init_global()) { ODP_ERR("ODP thread init failed.\n"); goto init_failed; } stage = THREAD_INIT; - if (odp_pool_init_global()) { + if (_odp_pool_init_global()) { ODP_ERR("ODP pool init failed.\n"); goto init_failed; } @@ -363,13 +363,13 @@ int odp_init_global(odp_instance_t *instance, } stage = SCHED_INIT; - if (odp_pktio_init_global()) { + if (_odp_pktio_init_global()) { ODP_ERR("ODP packet io init failed.\n"); goto init_failed; } stage = PKTIO_INIT; - if (odp_timer_init_global(params)) { + if (_odp_timer_init_global(params)) { ODP_ERR("ODP timer init failed.\n"); goto init_failed; } @@ -378,7 +378,7 @@ int odp_init_global(odp_instance_t *instance, /* No init neeeded */ stage = RANDOM_INIT; - if (odp_crypto_init_global()) { + if (_odp_crypto_init_global()) { ODP_ERR("ODP crypto init failed.\n"); goto init_failed; } @@ -390,13 +390,13 @@ int odp_init_global(odp_instance_t *instance, } stage = COMP_INIT; - if (odp_classification_init_global()) { + if (_odp_classification_init_global()) { ODP_ERR("ODP classification init failed.\n"); goto init_failed; } stage = CLASSIFICATION_INIT; - if (odp_tm_init_global()) { + if (_odp_tm_init_global()) { ODP_ERR("ODP traffic manager init failed\n"); goto init_failed; } @@ -481,14 +481,14 @@ static int term_local(enum init_stage stage) /* Fall through */ case POOL_INIT: - if (odp_pool_term_local()) { + if (_odp_pool_term_local()) { ODP_ERR("ODP buffer pool local term failed.\n"); rc = -1; } /* Fall through */ case THREAD_INIT: - rc_thd = odp_thread_term_local(); + rc_thd = _odp_thread_term_local(); if (rc_thd < 0) { ODP_ERR("ODP thread local term failed.\n"); rc = -1; @@ -527,13 +527,13 @@ int odp_init_local(odp_instance_t instance, odp_thread_type_t thr_type) } stage = ISHM_INIT; - if (odp_thread_init_local(thr_type)) { + if (_odp_thread_init_local(thr_type)) { ODP_ERR("ODP thread local init failed.\n"); goto init_fail; } stage = THREAD_INIT; - if (odp_pktio_init_local()) { + if (_odp_pktio_init_local()) { ODP_ERR("ODP packet io local init failed.\n"); goto init_fail; } @@ -551,7 +551,7 @@ int odp_init_local(odp_instance_t instance, odp_thread_type_t thr_type) } stage = CRYPTO_INIT; - if (odp_pool_init_local()) { + if (_odp_pool_init_local()) { ODP_ERR("ODP pool local init failed.\n"); goto init_fail; } diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c index 22e9c1b21..6e4f36569 100644 --- a/platform/linux-generic/odp_packet_io.c +++ b/platform/linux-generic/odp_packet_io.c @@ -58,7 +58,7 @@ static inline pktio_entry_t *pktio_entry_by_index(int index) return pktio_entry_ptr[index]; } -int odp_pktio_init_global(void) +int _odp_pktio_init_global(void) { pktio_entry_t *pktio_entry; int i; @@ -107,7 +107,7 @@ int odp_pktio_init_global(void) return 0; } -int odp_pktio_init_local(void) +int _odp_pktio_init_local(void) { int pktio_if; @@ -1311,7 +1311,7 @@ void odp_pktio_print(odp_pktio_t hdl) ODP_PRINT("\n"); } -int odp_pktio_term_global(void) +int _odp_pktio_term_global(void) { int ret = 0; int i; diff --git a/platform/linux-generic/odp_pool.c b/platform/linux-generic/odp_pool.c index 67b1e7fb9..17504a2a7 100644 --- a/platform/linux-generic/odp_pool.c +++ b/platform/linux-generic/odp_pool.c @@ -208,7 +208,7 @@ static int read_config_file(pool_table_t *pool_tbl) return 0; } -int odp_pool_init_global(void) +int _odp_pool_init_global(void) { uint32_t i; odp_shm_t shm; @@ -246,7 +246,7 @@ int odp_pool_init_global(void) return 0; } -int odp_pool_term_global(void) +int _odp_pool_term_global(void) { int i; pool_t *pool; @@ -273,7 +273,7 @@ int odp_pool_term_global(void) return rc; } -int odp_pool_init_local(void) +int _odp_pool_init_local(void) { pool_t *pool; int i; @@ -291,7 +291,7 @@ int odp_pool_init_local(void) return 0; } -int odp_pool_term_local(void) +int _odp_pool_term_local(void) { int i; diff --git a/platform/linux-generic/odp_system_info.c b/platform/linux-generic/odp_system_info.c index 028ef8668..599e21db2 100644 --- a/platform/linux-generic/odp_system_info.c +++ b/platform/linux-generic/odp_system_info.c @@ -334,7 +334,7 @@ static int system_hp(hugepage_info_t *hugeinfo) /* * System info initialisation */ -int odp_system_info_init(void) +int _odp_system_info_init(void) { int i; FILE *file; @@ -374,7 +374,7 @@ int odp_system_info_init(void) /* * System info termination */ -int odp_system_info_term(void) +int _odp_system_info_term(void) { free(odp_global_ro.hugepage_info.default_huge_page_dir); diff --git a/platform/linux-generic/odp_thread.c b/platform/linux-generic/odp_thread.c index 0ff0dc821..d88e6da5c 100644 --- a/platform/linux-generic/odp_thread.c +++ b/platform/linux-generic/odp_thread.c @@ -48,7 +48,7 @@ __thread _odp_thread_state_t *_odp_this_thread; #include <odp/visibility_end.h> -int odp_thread_init_global(void) +int _odp_thread_init_global(void) { odp_shm_t shm; @@ -67,7 +67,7 @@ int odp_thread_init_global(void) return 0; } -int odp_thread_term_global(void) +int _odp_thread_term_global(void) { int ret; @@ -130,7 +130,7 @@ static int free_id(int thr) return thread_globals->num; } -int odp_thread_init_local(odp_thread_type_t type) +int _odp_thread_init_local(odp_thread_type_t type) { int id; int cpu; @@ -183,7 +183,7 @@ int odp_thread_init_local(odp_thread_type_t type) return 0; } -int odp_thread_term_local(void) +int _odp_thread_term_local(void) { int num; int group_all, group_worker, group_control; diff --git a/platform/linux-generic/odp_time.c b/platform/linux-generic/odp_time.c index 87ee6adc9..b033a733c 100644 --- a/platform/linux-generic/odp_time.c +++ b/platform/linux-generic/odp_time.c @@ -223,7 +223,7 @@ void odp_time_wait_until(odp_time_t time) return time_wait_until(time); } -int odp_time_init_global(void) +int _odp_time_init_global(void) { struct timespec *timespec; int ret = 0; @@ -254,7 +254,7 @@ int odp_time_init_global(void) return ret; } -int odp_time_term_global(void) +int _odp_time_term_global(void) { return 0; } diff --git a/platform/linux-generic/odp_timer.c b/platform/linux-generic/odp_timer.c index bd35e5b42..6966726e4 100644 --- a/platform/linux-generic/odp_timer.c +++ b/platform/linux-generic/odp_timer.c @@ -1464,7 +1464,7 @@ void odp_timeout_free(odp_timeout_t tmo) odp_buffer_free(odp_buffer_from_event(ev)); } -int odp_timer_init_global(const odp_init_t *params) +int _odp_timer_init_global(const odp_init_t *params) { odp_shm_t shm; const char *conf_str; @@ -1533,7 +1533,7 @@ int odp_timer_init_global(const odp_init_t *params) return 0; } -int odp_timer_term_global(void) +int _odp_timer_term_global(void) { if (timer_global && odp_shm_free(timer_global->shm)) { ODP_ERR("Shm free failed for odp_timer\n"); diff --git a/platform/linux-generic/odp_traffic_mngr.c b/platform/linux-generic/odp_traffic_mngr.c index 9d19ac3c2..9a40d0716 100644 --- a/platform/linux-generic/odp_traffic_mngr.c +++ b/platform/linux-generic/odp_traffic_mngr.c @@ -4720,7 +4720,7 @@ void odp_tm_stats_print(odp_tm_t odp_tm) } } -int odp_tm_init_global(void) +int _odp_tm_init_global(void) { odp_shm_t shm; @@ -4756,7 +4756,7 @@ int odp_tm_init_global(void) return 0; } -int odp_tm_term_global(void) +int _odp_tm_term_global(void) { if (odp_global_ro.init_param.not_used.feat.tm) return 0; ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/include/odp_init_internal.h | 57 +++++++++--------- platform/linux-generic/odp_classification.c | 4 +- platform/linux-generic/odp_cpumask.c | 4 +- platform/linux-generic/odp_crypto_null.c | 4 +- platform/linux-generic/odp_crypto_openssl.c | 5 +- platform/linux-generic/odp_init.c | 67 +++++++++++++--------- platform/linux-generic/odp_packet_io.c | 6 +- platform/linux-generic/odp_pool.c | 8 +-- platform/linux-generic/odp_system_info.c | 4 +- platform/linux-generic/odp_thread.c | 8 +-- platform/linux-generic/odp_time.c | 4 +- platform/linux-generic/odp_timer.c | 14 ++++- platform/linux-generic/odp_traffic_mngr.c | 4 +- 13 files changed, 106 insertions(+), 83 deletions(-) hooks/post-receive --

6 years, 3 months

[COMMIT] branch master updated. v1.21.0.0-253-gdda80b5e5

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 dda80b5e5e143ff05ed0f8b0ce0f502be71eaa8b (commit) from 50c2f41996707fb112feff9f044feddbbe762b78 (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 dda80b5e5e143ff05ed0f8b0ce0f502be71eaa8b Author: Matias Elo <matias.elo(a)nokia.com> Date: Fri Oct 18 10:24:05 2019 +0300 configure: disable static test applications without static odp lib Trying to build static test applications without static ODP library would fail. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/configure.ac b/configure.ac index 76e736c50..81123cbc6 100644 --- a/configure.ac +++ b/configure.ac @@ -294,6 +294,9 @@ AC_ARG_ENABLE([static-applications], [disable static linking of examples and tests] [ with ODP])], [], [enable_static_applications=yes]) +AS_IF([test "x$enable_static" != "xno" -a "x$enable_static_applications" != "xno"], + [enable_static_applications=yes], [enable_static_applications=no]) + AM_CONDITIONAL([STATIC_APPS], [test "x$enable_static_applications" != "xno"]) if test "x$DPDK_SHARED" = "xyes" -a "x$enable_static_applications" != "xno" ; then ----------------------------------------------------------------------- Summary of changes: configure.ac | 3 +++ 1 file changed, 3 insertions(+) hooks/post-receive --

6 years, 3 months

← Newer
1
2
3
4
5
6
7
...
121
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

git-lng-odp