git-lng-odp

git-lng-odp@lists.linaro.org

1 participants
1207 discussions

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

by git＠git-us.linaro.org

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

9 years, 8 months

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

by git＠git-us.linaro.org

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

9 years, 8 months

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

by git＠git-us.linaro.org

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

9 years, 8 months

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

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 08487413ead04cb5fef8e813af06e5bc29207334 (commit) from b018868aa429fd25dae1137490419784e8e569f9 (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 08487413ead04cb5fef8e813af06e5bc29207334 Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Mon Jun 20 19:18:38 2016 +0300 test: pktio: correct mac addr len check Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> diff --git a/test/validation/pktio/pktio.c b/test/validation/pktio/pktio.c index 5922ba5..d53a419 100644 --- a/test/validation/pktio/pktio.c +++ b/test/validation/pktio/pktio.c @@ -143,11 +143,13 @@ static void pktio_pkt_set_macs(odp_packet_t pkt, odph_ethhdr_t *eth = (odph_ethhdr_t *)odp_packet_l2_ptr(pkt, &len); int ret; - ret = odp_pktio_mac_addr(src, &eth->src, sizeof(eth->src)); + ret = odp_pktio_mac_addr(src, &eth->src, ODP_PKTIO_MACADDR_MAXSIZE); CU_ASSERT(ret == ODPH_ETHADDR_LEN); + CU_ASSERT(ret <= ODP_PKTIO_MACADDR_MAXSIZE); - ret = odp_pktio_mac_addr(dst, &eth->dst, sizeof(eth->dst)); + ret = odp_pktio_mac_addr(dst, &eth->dst, ODP_PKTIO_MACADDR_MAXSIZE); CU_ASSERT(ret == ODPH_ETHADDR_LEN); + CU_ASSERT(ret <= ODP_PKTIO_MACADDR_MAXSIZE); } static uint32_t pktio_pkt_set_seq(odp_packet_t pkt) @@ -239,7 +241,7 @@ static uint32_t pktio_init_packet(odp_packet_t pkt) odph_udphdr_t *udp; char *buf; uint16_t seq; - uint8_t mac[ODPH_ETHADDR_LEN] = {0}; + uint8_t mac[ODP_PKTIO_MACADDR_MAXSIZE] = {0}; int pkt_len = odp_packet_len(pkt); buf = odp_packet_data(pkt); @@ -1036,7 +1038,7 @@ void pktio_test_promisc(void) void pktio_test_mac(void) { - unsigned char mac_addr[ODPH_ETHADDR_LEN]; + unsigned char mac_addr[ODP_PKTIO_MACADDR_MAXSIZE]; int mac_len; int ret; odp_pktio_t pktio; @@ -1047,8 +1049,10 @@ void pktio_test_mac(void) printf("testing mac for %s\n", iface_name[0]); - mac_len = odp_pktio_mac_addr(pktio, mac_addr, sizeof(mac_addr)); + mac_len = odp_pktio_mac_addr(pktio, mac_addr, + ODP_PKTIO_MACADDR_MAXSIZE); CU_ASSERT(ODPH_ETHADDR_LEN == mac_len); + CU_ASSERT(ODP_PKTIO_MACADDR_MAXSIZE >= mac_len); printf(" %X:%X:%X:%X:%X:%X ", mac_addr[0], mac_addr[1], mac_addr[2], ----------------------------------------------------------------------- Summary of changes: test/validation/pktio/pktio.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) hooks/post-receive --

9 years, 8 months

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

by git＠git-us.linaro.org

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

9 years, 8 months

[COMMIT] branch api-next updated. v1.10.1.0-31-g093fb17

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, api-next has been updated via 093fb17ce654532dc1e6c379aa13a3dbab9407d6 (commit) via 2b9f90dc54c5d699083970cbd359db4f137faa31 (commit) via 072b5ca9ad3f17d70c20bb7d03020ec7a219f698 (commit) via aa7a1822660eaeecd6f69c525abdc4a21d428716 (commit) via 2fc98f7ba2fdcf7df0f04b171bc4bdd65b8cf980 (commit) via 39738abf195e2d3af75133f4ec418614b86e770c (commit) via c3f73eadd8eafb8e8167d5403d69527b896f9de6 (commit) via 7da43047a614ce4c030878ee8bef31725c7b71ef (commit) via bde29f1382ed76fa6b8450b67a249ab2c8c83323 (commit) via 41ab23c89799de4db4de5c3910b70e80f3a7d8f9 (commit) via 4cf18bb4f799e6601c20e54fafbdb58da538de89 (commit) via 793c4b15275fd7e6c30bf348f236e778b9bfee02 (commit) via 46684cc1f1cdc33b7b223687e063f458b6c7bf02 (commit) via 8ab5804ea8bd430fd7cd0bd0edae316918b976d7 (commit) via 33bd749de8128afbb6b5bcad5ef6bea5a2667178 (commit) via 99b863c804fe38bd919d3b9c2f6dad5ddabf1aaa (commit) via 8d10e64603e67620084cb92648707550110d7bbe (commit) via 72634d86988e33ac38dd1ecda2cc4e8a156307ed (commit) via 341d3029f797ebb2bcf0fa6089c3463eea73e1cc (commit) via 69717806018f61af84645ff458e3dc69a13d747e (commit) via b78d235b8fe23b423bf6e7a3c65abbfb7efa4af8 (commit) via 193bbc8eafa14932f342476a44687237be512148 (commit) via 165897bfd094d824e2dd83c968ad9fde28146ef9 (commit) via 4e4ae44b527a9a0635a219eb19e1ffa425c2186a (commit) via 72b2a7212b6afb2d011e537202611e5566584aea (commit) via 5567e30f8eabcfe32497b0ed858a5f76f9d764a4 (commit) via 50029e34c284559b942e6b6b8c56f230eca4f01f (commit) via aded65c62d9ad5e65c6181588d90d1b99f5c8726 (commit) via cea088594ea8f951d8716ab071c4052b018f2c19 (commit) via 1d0d1a1e1b98ebbe2c6dbdb1aae23a704c1dac47 (commit) via 28026f1ddee3f33da7935055a3f87bcc053035fb (commit) via 4f621a5acb7e6657e8eb4d17a6fe664e30fda714 (commit) from 5db841fb0b0b3e705c3a10345df3d2c41bc0ef5b (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 093fb17ce654532dc1e6c379aa13a3dbab9407d6 Merge: 5db841f 2b9f90d Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Thu Jun 16 22:42:38 2016 +0300 Merge branch 'master' into api-next ----------------------------------------------------------------------- Summary of changes: CHANGELOG | 165 +++++ configure.ac | 6 +- doc/{helper-guide/Doxyfile => Doxyfile_common} | 13 - doc/Makefile.am | 8 +- doc/application-api-guide/Doxyfile | 50 +- doc/m4/configure.m4 | 1 + .../.gitignore | 0 doc/platform-api-guide/Doxyfile | 19 + .../Makefile.am | 1 - doc/process-guide/.gitignore | 1 + doc/process-guide/Makefile.am | 27 +- doc/users-guide/Makefile.am | 3 +- example/timer/.gitignore | 3 + example/timer/Makefile.am | 14 +- example/timer/odp_timer_simple.c | 157 +++++ helper/include/odp/helper/chksum.h | 2 +- helper/linux.c | 15 +- helper/test/thread.c | 2 +- include/odp/api/spec/version.h | 2 +- .../include/odp/api/plat/timer_types.h | 2 +- .../include/odp_classification_inlines.h | 36 +- .../include/odp_classification_internal.h | 5 +- .../linux-generic/include/odp_packet_internal.h | 72 ++- .../linux-generic/include/odp_packet_io_internal.h | 23 +- platform/linux-generic/include/odp_schedule_if.h | 12 +- .../include/odp_schedule_ordered_internal.h | 5 +- platform/linux-generic/odp_classification.c | 28 +- platform/linux-generic/odp_packet.c | 241 +++---- platform/linux-generic/odp_packet_flags.c | 53 +- platform/linux-generic/odp_packet_io.c | 147 +++-- platform/linux-generic/odp_queue.c | 32 +- platform/linux-generic/odp_schedule.c | 80 ++- platform/linux-generic/odp_schedule_ordered.c | 18 +- platform/linux-generic/odp_schedule_sp.c | 707 ++++++++++++++++++++- platform/linux-generic/pktio/dpdk.c | 13 +- platform/linux-generic/pktio/ipc.c | 2 +- platform/linux-generic/pktio/loop.c | 33 +- platform/linux-generic/pktio/netmap.c | 10 +- platform/linux-generic/pktio/pcap.c | 6 +- platform/linux-generic/pktio/socket.c | 6 +- platform/linux-generic/pktio/socket_mmap.c | 6 +- platform/linux-generic/pktio/tap.c | 2 +- test/validation/pktio/pktio.c | 23 +- test/validation/scheduler/scheduler.c | 267 ++++---- test/validation/timer/timer.c | 33 +- test/validation/traffic_mngr/traffic_mngr.c | 16 + 46 files changed, 1771 insertions(+), 596 deletions(-) copy doc/{helper-guide/Doxyfile => Doxyfile_common} (64%) copy doc/{application-api-guide => platform-api-guide}/.gitignore (100%) create mode 100644 doc/platform-api-guide/Doxyfile copy doc/{helper-guide => platform-api-guide}/Makefile.am (78%) create mode 100644 example/timer/odp_timer_simple.c hooks/post-receive --

9 years, 9 months

[COMMIT] branch master updated. v1.10.1.0-19-g2b9f90d

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 2b9f90dc54c5d699083970cbd359db4f137faa31 (commit) via 072b5ca9ad3f17d70c20bb7d03020ec7a219f698 (commit) via aa7a1822660eaeecd6f69c525abdc4a21d428716 (commit) from 2fc98f7ba2fdcf7df0f04b171bc4bdd65b8cf980 (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 2b9f90dc54c5d699083970cbd359db4f137faa31 Author: Matias Elo <matias.elo(a)nokia.com> Date: Thu Jun 16 16:07:31 2016 +0300 linux-gen: pktio loop: improve classifying segmented packets Make sure there is enough data for the packet parser in the case of a segmented packet. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-and-tested-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/pktio/loop.c b/platform/linux-generic/pktio/loop.c index 645521a..dce33e5 100644 --- a/platform/linux-generic/pktio/loop.c +++ b/platform/linux-generic/pktio/loop.c @@ -87,12 +87,24 @@ static int loopback_recv(pktio_entry_t *pktio_entry, int index ODP_UNUSED, odp_packet_t new_pkt; odp_pool_t new_pool; uint8_t *pkt_addr; + uint8_t buf[PACKET_PARSE_SEG_LEN]; int ret; - - pkt_addr = odp_packet_data(pkt); + uint32_t seg_len = odp_packet_seg_len(pkt); + + /* Make sure there is enough data for the packet + * parser in the case of a segmented packet. */ + if (odp_unlikely(seg_len < PACKET_PARSE_SEG_LEN && + pkt_len > PACKET_PARSE_SEG_LEN)) { + odp_packet_copy_to_mem(pkt, 0, + PACKET_PARSE_SEG_LEN, + buf); + seg_len = PACKET_PARSE_SEG_LEN; + pkt_addr = buf; + } else { + pkt_addr = odp_packet_data(pkt); + } ret = cls_classify_packet(pktio_entry, pkt_addr, - pkt_len, - odp_packet_seg_len(pkt), + pkt_len, seg_len, &new_pool, &parsed_hdr); if (ret) { failed++; commit 072b5ca9ad3f17d70c20bb7d03020ec7a219f698 Author: Matias Elo <matias.elo(a)nokia.com> Date: Thu Jun 16 16:07:30 2016 +0300 linux-gen: packet: use packet_parser_t type argument with parser functions Modify packet parser functions to utilize new packet_parser_t structure. Renamed the main parser function _odp_parse_common() to packet_parse_common(). packet_parse_common() now takes also segment length as argument. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-and-tested-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/include/odp_classification_internal.h b/platform/linux-generic/include/odp_classification_internal.h index d6d6904..78eaac9 100644 --- a/platform/linux-generic/include/odp_classification_internal.h +++ b/platform/linux-generic/include/odp_classification_internal.h @@ -47,8 +47,9 @@ Start function for Packet Classifier This function calls Classifier module internal functions for a given packet and selects destination queue and packet pool based on selected PMR and CoS. **/ -int cls_classify_packet(pktio_entry_t *entry, const uint8_t *base, uint16_t len, - odp_pool_t *pool, odp_packet_hdr_t *pkt_hdr); +int cls_classify_packet(pktio_entry_t *entry, const uint8_t *base, + uint16_t pkt_len, uint32_t seg_len, odp_pool_t *pool, + odp_packet_hdr_t *pkt_hdr); /** Packet IO classifier init diff --git a/platform/linux-generic/include/odp_packet_internal.h b/platform/linux-generic/include/odp_packet_internal.h index 71a2ab1..eedb416 100644 --- a/platform/linux-generic/include/odp_packet_internal.h +++ b/platform/linux-generic/include/odp_packet_internal.h @@ -29,6 +29,9 @@ extern "C" { #define PACKET_JUMBO_LEN (9 * 1024) +/** Minimum segment length expected by packet_parse_common() */ +#define PACKET_PARSE_SEG_LEN 96 + /** * Packet input & protocol flags */ @@ -287,9 +290,9 @@ static inline void packet_set_len(odp_packet_hdr_t *pkt_hdr, uint32_t len) pkt_hdr->frame_len = len; } -static inline int packet_parse_l2_not_done(odp_packet_hdr_t *pkt_hdr) +static inline int packet_parse_l2_not_done(packet_parser_t *prs) { - return !pkt_hdr->p.input_flags.parsed_l2; + return !prs->input_flags.parsed_l2; } static inline int packet_parse_not_complete(odp_packet_hdr_t *pkt_hdr) @@ -303,7 +306,7 @@ void _odp_packet_copy_md_to_packet(odp_packet_t srcpkt, odp_packet_t dstpkt); odp_packet_t packet_alloc(odp_pool_t pool_hdl, uint32_t len, int parse); /* Fill in parser metadata for L2 */ -void packet_parse_l2(odp_packet_hdr_t *pkt_hdr); +void packet_parse_l2(packet_parser_t *prs, uint32_t frame_len); /* Perform full packet parse */ int packet_parse_full(odp_packet_hdr_t *pkt_hdr); @@ -340,7 +343,8 @@ static inline void packet_set_ts(odp_packet_hdr_t *pkt_hdr, odp_time_t *ts) } } -int _odp_parse_common(odp_packet_hdr_t *pkt_hdr, const uint8_t *parseptr); +int packet_parse_common(packet_parser_t *pkt_hdr, const uint8_t *ptr, + uint32_t pkt_len, uint32_t seg_len); int _odp_cls_parse(odp_packet_hdr_t *pkt_hdr, const uint8_t *parseptr); diff --git a/platform/linux-generic/odp_classification.c b/platform/linux-generic/odp_classification.c index 752348c..0602a62 100644 --- a/platform/linux-generic/odp_classification.c +++ b/platform/linux-generic/odp_classification.c @@ -799,7 +799,8 @@ static inline cos_t *cls_select_cos(pktio_entry_t *entry, * * @param pktio_entry Ingress pktio * @param base Packet data - * @param len Packet length + * @param pkt_len Packet length + * @param seg_leg Segment length * @param pool[out] Packet pool * @param pkt_hdr[out] Packet header * @@ -809,15 +810,16 @@ static inline cos_t *cls_select_cos(pktio_entry_t *entry, * * @note *base is not released */ -int cls_classify_packet(pktio_entry_t *entry, const uint8_t *base, uint16_t len, - odp_pool_t *pool, odp_packet_hdr_t *pkt_hdr) +int cls_classify_packet(pktio_entry_t *entry, const uint8_t *base, + uint16_t pkt_len, uint32_t seg_len, odp_pool_t *pool, + odp_packet_hdr_t *pkt_hdr) { cos_t *cos; packet_parse_reset(pkt_hdr); - packet_set_len(pkt_hdr, len); + packet_set_len(pkt_hdr, pkt_len); - _odp_parse_common(pkt_hdr, base); + packet_parse_common(&pkt_hdr->p, base, pkt_len, seg_len); cos = cls_select_cos(entry, base, pkt_hdr); if (cos == NULL) diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index 991a648..c319833 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -992,8 +992,8 @@ void _odp_packet_copy_md_to_packet(odp_packet_t srcpkt, odp_packet_t dstpkt) /** * Parser helper function for IPv4 */ -static inline uint8_t parse_ipv4(odp_packet_hdr_t *pkt_hdr, - const uint8_t **parseptr, uint32_t *offset) +static inline uint8_t parse_ipv4(packet_parser_t *prs, const uint8_t **parseptr, + uint32_t *offset, uint32_t frame_len) { const odph_ipv4hdr_t *ipv4 = (const odph_ipv4hdr_t *)*parseptr; uint8_t ver = ODPH_IPV4HDR_VER(ipv4->ver_ihl); @@ -1001,12 +1001,12 @@ static inline uint8_t parse_ipv4(odp_packet_hdr_t *pkt_hdr, uint16_t frag_offset; uint32_t dstaddr = odp_be_to_cpu_32(ipv4->dst_addr); - pkt_hdr->p.l3_len = odp_be_to_cpu_16(ipv4->tot_len); + prs->l3_len = odp_be_to_cpu_16(ipv4->tot_len); if (odp_unlikely(ihl < ODPH_IPV4HDR_IHL_MIN) || odp_unlikely(ver != 4) || - (pkt_hdr->p.l3_len > pkt_hdr->frame_len - *offset)) { - pkt_hdr->p.error_flags.ip_err = 1; + (prs->l3_len > frame_len - *offset)) { + prs->error_flags.ip_err = 1; return 0; } @@ -1014,7 +1014,7 @@ static inline uint8_t parse_ipv4(odp_packet_hdr_t *pkt_hdr, *parseptr += ihl * 4; if (odp_unlikely(ihl > ODPH_IPV4HDR_IHL_MIN)) - pkt_hdr->p.input_flags.ipopt = 1; + prs->input_flags.ipopt = 1; /* A packet is a fragment if: * "more fragments" flag is set (all fragments except the last) @@ -1023,11 +1023,11 @@ static inline uint8_t parse_ipv4(odp_packet_hdr_t *pkt_hdr, */ frag_offset = odp_be_to_cpu_16(ipv4->frag_offset); if (odp_unlikely(ODPH_IPV4HDR_IS_FRAGMENT(frag_offset))) - pkt_hdr->p.input_flags.ipfrag = 1; + prs->input_flags.ipfrag = 1; /* Handle IPv4 broadcast / multicast */ - pkt_hdr->p.input_flags.ip_bcast = (dstaddr == 0xffffffff); - pkt_hdr->p.input_flags.ip_mcast = (dstaddr >> 28) == 0xd; + prs->input_flags.ip_bcast = (dstaddr == 0xffffffff); + prs->input_flags.ip_mcast = (dstaddr >> 28) == 0xd; return ipv4->proto; } @@ -1035,26 +1035,27 @@ static inline uint8_t parse_ipv4(odp_packet_hdr_t *pkt_hdr, /** * Parser helper function for IPv6 */ -static inline uint8_t parse_ipv6(odp_packet_hdr_t *pkt_hdr, - const uint8_t **parseptr, uint32_t *offset) +static inline uint8_t parse_ipv6(packet_parser_t *prs, const uint8_t **parseptr, + uint32_t *offset, uint32_t frame_len, + uint32_t seg_len) { const odph_ipv6hdr_t *ipv6 = (const odph_ipv6hdr_t *)*parseptr; const odph_ipv6hdr_ext_t *ipv6ext; uint32_t dstaddr0 = odp_be_to_cpu_32(ipv6->dst_addr[0]); - pkt_hdr->p.l3_len = odp_be_to_cpu_16(ipv6->payload_len) + + prs->l3_len = odp_be_to_cpu_16(ipv6->payload_len) + ODPH_IPV6HDR_LEN; /* Basic sanity checks on IPv6 header */ if ((odp_be_to_cpu_32(ipv6->ver_tc_flow) >> 28) != 6 || - pkt_hdr->p.l3_len > pkt_hdr->frame_len - *offset) { - pkt_hdr->p.error_flags.ip_err = 1; + prs->l3_len > frame_len - *offset) { + prs->error_flags.ip_err = 1; return 0; } /* IPv6 broadcast / multicast flags */ - pkt_hdr->p.input_flags.ip_mcast = (dstaddr0 & 0xff000000) == 0xff000000; - pkt_hdr->p.input_flags.ip_bcast = 0; + prs->input_flags.ip_mcast = (dstaddr0 & 0xff000000) == 0xff000000; + prs->input_flags.ip_bcast = 0; /* Skip past IPv6 header */ *offset += sizeof(odph_ipv6hdr_t); @@ -1063,7 +1064,7 @@ static inline uint8_t parse_ipv6(odp_packet_hdr_t *pkt_hdr, /* Skip past any IPv6 extension headers */ if (ipv6->next_hdr == ODPH_IPPROTO_HOPOPTS || ipv6->next_hdr == ODPH_IPPROTO_ROUTE) { - pkt_hdr->p.input_flags.ipopt = 1; + prs->input_flags.ipopt = 1; do { ipv6ext = (const odph_ipv6hdr_ext_t *)*parseptr; @@ -1073,23 +1074,23 @@ static inline uint8_t parse_ipv6(odp_packet_hdr_t *pkt_hdr, *parseptr += extlen; } while ((ipv6ext->next_hdr == ODPH_IPPROTO_HOPOPTS || ipv6ext->next_hdr == ODPH_IPPROTO_ROUTE) && - *offset < pkt_hdr->frame_len); + *offset < seg_len); - if (*offset >= pkt_hdr->p.l3_offset + + if (*offset >= prs->l3_offset + odp_be_to_cpu_16(ipv6->payload_len)) { - pkt_hdr->p.error_flags.ip_err = 1; + prs->error_flags.ip_err = 1; return 0; } if (ipv6ext->next_hdr == ODPH_IPPROTO_FRAG) - pkt_hdr->p.input_flags.ipfrag = 1; + prs->input_flags.ipfrag = 1; return ipv6ext->next_hdr; } if (odp_unlikely(ipv6->next_hdr == ODPH_IPPROTO_FRAG)) { - pkt_hdr->p.input_flags.ipopt = 1; - pkt_hdr->p.input_flags.ipfrag = 1; + prs->input_flags.ipopt = 1; + prs->input_flags.ipfrag = 1; } return ipv6->next_hdr; @@ -1098,18 +1099,18 @@ static inline uint8_t parse_ipv6(odp_packet_hdr_t *pkt_hdr, /** * Parser helper function for TCP */ -static inline void parse_tcp(odp_packet_hdr_t *pkt_hdr, +static inline void parse_tcp(packet_parser_t *prs, const uint8_t **parseptr, uint32_t *offset) { const odph_tcphdr_t *tcp = (const odph_tcphdr_t *)*parseptr; if (tcp->hl < sizeof(odph_tcphdr_t) / sizeof(uint32_t)) - pkt_hdr->p.error_flags.tcp_err = 1; + prs->error_flags.tcp_err = 1; else if ((uint32_t)tcp->hl * 4 > sizeof(odph_tcphdr_t)) - pkt_hdr->p.input_flags.tcpopt = 1; + prs->input_flags.tcpopt = 1; - pkt_hdr->p.l4_len = pkt_hdr->p.l3_len + - pkt_hdr->p.l3_offset - pkt_hdr->p.l4_offset; + prs->l4_len = prs->l3_len + + prs->l3_offset - prs->l4_offset; if (offset) *offset += (uint32_t)tcp->hl * 4; @@ -1119,19 +1120,19 @@ static inline void parse_tcp(odp_packet_hdr_t *pkt_hdr, /** * Parser helper function for UDP */ -static inline void parse_udp(odp_packet_hdr_t *pkt_hdr, +static inline void parse_udp(packet_parser_t *prs, const uint8_t **parseptr, uint32_t *offset) { const odph_udphdr_t *udp = (const odph_udphdr_t *)*parseptr; uint32_t udplen = odp_be_to_cpu_16(udp->length); if (udplen < sizeof(odph_udphdr_t) || - udplen > (pkt_hdr->p.l3_len + - pkt_hdr->p.l4_offset - pkt_hdr->p.l3_offset)) { - pkt_hdr->p.error_flags.udp_err = 1; + udplen > (prs->l3_len + + prs->l4_offset - prs->l3_offset)) { + prs->error_flags.udp_err = 1; } - pkt_hdr->p.l4_len = udplen; + prs->l4_len = udplen; if (offset) *offset += sizeof(odph_udphdr_t); @@ -1141,43 +1142,49 @@ static inline void parse_udp(odp_packet_hdr_t *pkt_hdr, /** * Initialize L2 related parser flags and metadata */ -void packet_parse_l2(odp_packet_hdr_t *pkt_hdr) +void packet_parse_l2(packet_parser_t *prs, uint32_t frame_len) { /* Packet alloc or reset have already init other offsets and flags */ /* We only support Ethernet for now */ - pkt_hdr->p.input_flags.eth = 1; + prs->input_flags.eth = 1; /* Detect jumbo frames */ - if (pkt_hdr->frame_len > ODPH_ETH_LEN_MAX) - pkt_hdr->p.input_flags.jumbo = 1; + if (frame_len > ODPH_ETH_LEN_MAX) + prs->input_flags.jumbo = 1; /* Assume valid L2 header, no CRC/FCS check in SW */ - pkt_hdr->p.input_flags.l2 = 1; + prs->input_flags.l2 = 1; - pkt_hdr->p.input_flags.parsed_l2 = 1; + prs->input_flags.parsed_l2 = 1; } -int _odp_parse_common(odp_packet_hdr_t *pkt_hdr, const uint8_t *ptr) +/** + * Parse common packet headers + * + * The function expects at least PACKET_PARSE_SEG_LEN bytes of data to be + * available from the ptr. + */ +int packet_parse_common(packet_parser_t *prs, const uint8_t *ptr, + uint32_t frame_len, uint32_t seg_len) { const odph_ethhdr_t *eth; const odph_vlanhdr_t *vlan; uint16_t ethtype; - uint32_t offset, seglen; + uint32_t offset; uint8_t ip_proto = 0; const uint8_t *parseptr; uint16_t macaddr0, macaddr2, macaddr4; offset = sizeof(odph_ethhdr_t); - if (packet_parse_l2_not_done(pkt_hdr)) - packet_parse_l2(pkt_hdr); + if (packet_parse_l2_not_done(prs)) + packet_parse_l2(prs, frame_len); - eth = ptr ? (const odph_ethhdr_t *)ptr : - (odph_ethhdr_t *)packet_map(pkt_hdr, 0, &seglen); + eth = (const odph_ethhdr_t *)ptr; /* Handle Ethernet broadcast/multicast addresses */ macaddr0 = odp_be_to_cpu_16(*((const uint16_t *)(const void *)eth)); - pkt_hdr->p.input_flags.eth_mcast = (macaddr0 & 0x0100) == 0x0100; + prs->input_flags.eth_mcast = (macaddr0 & 0x0100) == 0x0100; if (macaddr0 == 0xffff) { macaddr2 = @@ -1186,10 +1193,10 @@ int _odp_parse_common(odp_packet_hdr_t *pkt_hdr, const uint8_t *ptr) macaddr4 = odp_be_to_cpu_16(*((const uint16_t *) (const void *)eth + 2)); - pkt_hdr->p.input_flags.eth_bcast = + prs->input_flags.eth_bcast = (macaddr2 == 0xffff) && (macaddr4 == 0xffff); } else { - pkt_hdr->p.input_flags.eth_bcast = 0; + prs->input_flags.eth_bcast = 0; } /* Get Ethertype */ @@ -1198,9 +1205,9 @@ int _odp_parse_common(odp_packet_hdr_t *pkt_hdr, const uint8_t *ptr) /* Check for SNAP vs. DIX */ if (ethtype < ODPH_ETH_LEN_MAX) { - pkt_hdr->p.input_flags.snap = 1; - if (ethtype > pkt_hdr->frame_len - offset) { - pkt_hdr->p.error_flags.snap_len = 1; + prs->input_flags.snap = 1; + if (ethtype > frame_len - offset) { + prs->error_flags.snap_len = 1; goto parse_exit; } ethtype = odp_be_to_cpu_16(*((const uint16_t *) @@ -1211,8 +1218,8 @@ int _odp_parse_common(odp_packet_hdr_t *pkt_hdr, const uint8_t *ptr) /* Parse the VLAN header(s), if present */ if (ethtype == ODPH_ETHTYPE_VLAN_OUTER) { - pkt_hdr->p.input_flags.vlan_qinq = 1; - pkt_hdr->p.input_flags.vlan = 1; + prs->input_flags.vlan_qinq = 1; + prs->input_flags.vlan = 1; vlan = (const odph_vlanhdr_t *)parseptr; ethtype = odp_be_to_cpu_16(vlan->type); @@ -1221,7 +1228,7 @@ int _odp_parse_common(odp_packet_hdr_t *pkt_hdr, const uint8_t *ptr) } if (ethtype == ODPH_ETHTYPE_VLAN) { - pkt_hdr->p.input_flags.vlan = 1; + prs->input_flags.vlan = 1; vlan = (const odph_vlanhdr_t *)parseptr; ethtype = odp_be_to_cpu_16(vlan->type); offset += sizeof(odph_vlanhdr_t); @@ -1229,71 +1236,76 @@ int _odp_parse_common(odp_packet_hdr_t *pkt_hdr, const uint8_t *ptr) } /* Set l3_offset+flag only for known ethtypes */ - pkt_hdr->p.input_flags.l3 = 1; - pkt_hdr->p.l3_offset = offset; + prs->input_flags.l3 = 1; + prs->l3_offset = offset; /* Parse Layer 3 headers */ switch (ethtype) { case ODPH_ETHTYPE_IPV4: - pkt_hdr->p.input_flags.ipv4 = 1; - ip_proto = parse_ipv4(pkt_hdr, &parseptr, &offset); + prs->input_flags.ipv4 = 1; + ip_proto = parse_ipv4(prs, &parseptr, &offset, frame_len); break; case ODPH_ETHTYPE_IPV6: - pkt_hdr->p.input_flags.ipv6 = 1; - ip_proto = parse_ipv6(pkt_hdr, &parseptr, &offset); + prs->input_flags.ipv6 = 1; + ip_proto = parse_ipv6(prs, &parseptr, &offset, frame_len, + seg_len); break; case ODPH_ETHTYPE_ARP: - pkt_hdr->p.input_flags.arp = 1; + prs->input_flags.arp = 1; ip_proto = 255; /* Reserved invalid by IANA */ break; default: - pkt_hdr->p.input_flags.l3 = 0; - pkt_hdr->p.l3_offset = ODP_PACKET_OFFSET_INVALID; + prs->input_flags.l3 = 0; + prs->l3_offset = ODP_PACKET_OFFSET_INVALID; ip_proto = 255; /* Reserved invalid by IANA */ } /* Set l4_offset+flag only for known ip_proto */ - pkt_hdr->p.input_flags.l4 = 1; - pkt_hdr->p.l4_offset = offset; + prs->input_flags.l4 = 1; + prs->l4_offset = offset; /* Parse Layer 4 headers */ switch (ip_proto) { case ODPH_IPPROTO_ICMP: - pkt_hdr->p.input_flags.icmp = 1; + prs->input_flags.icmp = 1; break; case ODPH_IPPROTO_TCP: - pkt_hdr->p.input_flags.tcp = 1; - parse_tcp(pkt_hdr, &parseptr, NULL); + if (odp_unlikely(offset + ODPH_TCPHDR_LEN > seg_len)) + return -1; + prs->input_flags.tcp = 1; + parse_tcp(prs, &parseptr, NULL); break; case ODPH_IPPROTO_UDP: - pkt_hdr->p.input_flags.udp = 1; - parse_udp(pkt_hdr, &parseptr, NULL); + if (odp_unlikely(offset + ODPH_UDPHDR_LEN > seg_len)) + return -1; + prs->input_flags.udp = 1; + parse_udp(prs, &parseptr, NULL); break; case ODPH_IPPROTO_AH: - pkt_hdr->p.input_flags.ipsec = 1; - pkt_hdr->p.input_flags.ipsec_ah = 1; + prs->input_flags.ipsec = 1; + prs->input_flags.ipsec_ah = 1; break; case ODPH_IPPROTO_ESP: - pkt_hdr->p.input_flags.ipsec = 1; - pkt_hdr->p.input_flags.ipsec_esp = 1; + prs->input_flags.ipsec = 1; + prs->input_flags.ipsec_esp = 1; break; default: - pkt_hdr->p.input_flags.l4 = 0; - pkt_hdr->p.l4_offset = ODP_PACKET_OFFSET_INVALID; + prs->input_flags.l4 = 0; + prs->l4_offset = ODP_PACKET_OFFSET_INVALID; break; } parse_exit: - pkt_hdr->p.input_flags.parsed_all = 1; - return pkt_hdr->p.error_flags.all != 0; + prs->input_flags.parsed_all = 1; + return prs->error_flags.all != 0; } /** @@ -1301,5 +1313,9 @@ parse_exit: */ int packet_parse_full(odp_packet_hdr_t *pkt_hdr) { - return _odp_parse_common(pkt_hdr, NULL); + uint32_t seg_len; + void *base = packet_map(pkt_hdr, 0, &seg_len); + + return packet_parse_common(&pkt_hdr->p, base, pkt_hdr->frame_len, + seg_len); } diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c index e9d7aa4..245ff7b 100644 --- a/platform/linux-generic/pktio/dpdk.c +++ b/platform/linux-generic/pktio/dpdk.c @@ -724,7 +724,8 @@ static inline int mbuf_to_pkt(pktio_entry_t *pktio_entry, if (pktio_cls_enabled(pktio_entry)) { if (cls_classify_packet(pktio_entry, (const uint8_t *)buf, - pkt_len, &pool, &parsed_hdr)) + pkt_len, pkt_len, &pool, + &parsed_hdr)) goto fail; } pkt = packet_alloc(pool, pkt_len, 1); @@ -744,7 +745,7 @@ static inline int mbuf_to_pkt(pktio_entry_t *pktio_entry, if (pktio_cls_enabled(pktio_entry)) copy_packet_cls_metadata(&parsed_hdr, pkt_hdr); else - packet_parse_l2(pkt_hdr); + packet_parse_l2(&pkt_hdr->p, pkt_len); if (mbuf->ol_flags & PKT_RX_RSS_HASH) odp_packet_flow_hash_set(pkt, mbuf->hash.rss); diff --git a/platform/linux-generic/pktio/loop.c b/platform/linux-generic/pktio/loop.c index a19c2dd..645521a 100644 --- a/platform/linux-generic/pktio/loop.c +++ b/platform/linux-generic/pktio/loop.c @@ -77,7 +77,11 @@ static int loopback_recv(pktio_entry_t *pktio_entry, int index ODP_UNUSED, } for (i = 0; i < nbr; i++) { + uint32_t pkt_len; + pkt = _odp_packet_from_buffer(odp_hdr_to_buf(hdr_tbl[i])); + pkt_len = odp_packet_len(pkt); + if (pktio_cls_enabled(pktio_entry)) { odp_packet_t new_pkt; @@ -87,7 +91,8 @@ static int loopback_recv(pktio_entry_t *pktio_entry, int index ODP_UNUSED, pkt_addr = odp_packet_data(pkt); ret = cls_classify_packet(pktio_entry, pkt_addr, - odp_packet_len(pkt), + pkt_len, + odp_packet_seg_len(pkt), &new_pool, &parsed_hdr); if (ret) { failed++; @@ -113,11 +118,11 @@ static int loopback_recv(pktio_entry_t *pktio_entry, int index ODP_UNUSED, if (pktio_cls_enabled(pktio_entry)) copy_packet_cls_metadata(&parsed_hdr, pkt_hdr); else - packet_parse_l2(pkt_hdr); + packet_parse_l2(&pkt_hdr->p, pkt_len); packet_set_ts(pkt_hdr, ts); - pktio_entry->s.stats.in_octets += odp_packet_len(pkt); + pktio_entry->s.stats.in_octets += pkt_len; pkts[num_rx++] = pkt; } diff --git a/platform/linux-generic/pktio/netmap.c b/platform/linux-generic/pktio/netmap.c index 6bfbe84..847250b 100644 --- a/platform/linux-generic/pktio/netmap.c +++ b/platform/linux-generic/pktio/netmap.c @@ -610,7 +610,7 @@ static inline int netmap_pkt_to_odp(pktio_entry_t *pktio_entry, if (pktio_cls_enabled(pktio_entry)) { if (cls_classify_packet(pktio_entry, (const uint8_t *)buf, len, - &pool, &parsed_hdr)) + len, &pool, &parsed_hdr)) return -1; } pkt = packet_alloc(pool, len, 1); @@ -630,7 +630,7 @@ static inline int netmap_pkt_to_odp(pktio_entry_t *pktio_entry, if (pktio_cls_enabled(pktio_entry)) copy_packet_cls_metadata(&parsed_hdr, pkt_hdr); else - packet_parse_l2(pkt_hdr); + packet_parse_l2(&pkt_hdr->p, len); packet_set_ts(pkt_hdr, ts); diff --git a/platform/linux-generic/pktio/pcap.c b/platform/linux-generic/pktio/pcap.c index c967e70..2fb2a5b 100644 --- a/platform/linux-generic/pktio/pcap.c +++ b/platform/linux-generic/pktio/pcap.c @@ -262,7 +262,7 @@ static int pcapif_recv_pkt(pktio_entry_t *pktio_entry, int index ODP_UNUSED, break; } - packet_parse_l2(pkt_hdr); + packet_parse_l2(&pkt_hdr->p, pkt_len); pktio_entry->s.stats.in_octets += pkt_hdr->frame_len; packet_set_ts(pkt_hdr, ts); diff --git a/platform/linux-generic/pktio/socket.c b/platform/linux-generic/pktio/socket.c index b116145..8f86dda 100644 --- a/platform/linux-generic/pktio/socket.c +++ b/platform/linux-generic/pktio/socket.c @@ -664,7 +664,7 @@ static int sock_mmsg_recv(pktio_entry_t *pktio_entry, int index ODP_UNUSED, continue; if (cls_classify_packet(pktio_entry, base, pkt_len, - &pool, &parsed_hdr)) + pkt_len, &pool, &parsed_hdr)) continue; pkt = packet_alloc(pool, pkt_len, 1); if (pkt == ODP_PACKET_INVALID) @@ -724,7 +724,7 @@ static int sock_mmsg_recv(pktio_entry_t *pktio_entry, int index ODP_UNUSED, odp_packet_pull_tail(pkt_table[i], odp_packet_len(pkt_table[i]) - msgvec[i].msg_len); - packet_parse_l2(pkt_hdr); + packet_parse_l2(&pkt_hdr->p, pkt_hdr->frame_len); packet_set_ts(pkt_hdr, ts); pkt_hdr->input = pktio_entry->s.handle; diff --git a/platform/linux-generic/pktio/socket_mmap.c b/platform/linux-generic/pktio/socket_mmap.c index 30c44e9..420cd26 100644 --- a/platform/linux-generic/pktio/socket_mmap.c +++ b/platform/linux-generic/pktio/socket_mmap.c @@ -199,7 +199,7 @@ static inline unsigned pkt_mmap_v2_rx(pktio_entry_t *pktio_entry, if (pktio_cls_enabled(pktio_entry)) { if (cls_classify_packet(pktio_entry, pkt_buf, pkt_len, - &pool, &parsed_hdr)) { + pkt_len, &pool, &parsed_hdr)) { mmap_rx_user_ready(ppd.raw); /* drop */ frame_num = next_frame_num; continue; @@ -226,7 +226,7 @@ static inline unsigned pkt_mmap_v2_rx(pktio_entry_t *pktio_entry, if (pktio_cls_enabled(pktio_entry)) copy_packet_cls_metadata(&parsed_hdr, hdr); else - packet_parse_l2(hdr); + packet_parse_l2(&hdr->p, pkt_len); packet_set_ts(hdr, ts); diff --git a/platform/linux-generic/pktio/tap.c b/platform/linux-generic/pktio/tap.c index 975ad25..8ba7bed 100644 --- a/platform/linux-generic/pktio/tap.c +++ b/platform/linux-generic/pktio/tap.c @@ -197,7 +197,7 @@ static odp_packet_t pack_odp_pkt(pktio_entry_t *pktio_entry, const void *data, } pkt_hdr = odp_packet_hdr(pkt); - packet_parse_l2(pkt_hdr); + packet_parse_l2(&pkt_hdr->p, len); packet_set_ts(pkt_hdr, ts); pkt_hdr->input = pktio_entry->s.handle; commit aa7a1822660eaeecd6f69c525abdc4a21d428716 Author: Matias Elo <matias.elo(a)nokia.com> Date: Thu Jun 16 16:07:29 2016 +0300 linux-gen: packet: add packet parser structure Collect odp_packet_hdr_t members set by the packet parser inside a common structure packet_parser_t. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-and-tested-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/include/odp_classification_inlines.h b/platform/linux-generic/include/odp_classification_inlines.h index 08300f5..611d706 100644 --- a/platform/linux-generic/include/odp_classification_inlines.h +++ b/platform/linux-generic/include/odp_classification_inlines.h @@ -47,9 +47,9 @@ static inline int verify_pmr_ip_proto(const uint8_t *pkt_addr, { const odph_ipv4hdr_t *ip; uint8_t proto; - if (!pkt_hdr->input_flags.ipv4) + if (!pkt_hdr->p.input_flags.ipv4) return 0; - ip = (const odph_ipv4hdr_t *)(pkt_addr + pkt_hdr->l3_offset); + ip = (const odph_ipv4hdr_t *)(pkt_addr + pkt_hdr->p.l3_offset); proto = ip->proto; if (term_value->match.value == (proto & term_value->match.mask)) return 1; @@ -63,9 +63,9 @@ static inline int verify_pmr_ipv4_saddr(const uint8_t *pkt_addr, { const odph_ipv4hdr_t *ip; uint32_t ipaddr; - if (!pkt_hdr->input_flags.ipv4) + if (!pkt_hdr->p.input_flags.ipv4) return 0; - ip = (const odph_ipv4hdr_t *)(pkt_addr + pkt_hdr->l3_offset); + ip = (const odph_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; @@ -79,9 +79,9 @@ static inline int verify_pmr_ipv4_daddr(const uint8_t *pkt_addr, { const odph_ipv4hdr_t *ip; uint32_t ipaddr; - if (!pkt_hdr->input_flags.ipv4) + if (!pkt_hdr->p.input_flags.ipv4) return 0; - ip = (const odph_ipv4hdr_t *)(pkt_addr + pkt_hdr->l3_offset); + ip = (const odph_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; @@ -95,9 +95,9 @@ static inline int verify_pmr_tcp_sport(const uint8_t *pkt_addr, { uint16_t sport; const odph_tcphdr_t *tcp; - if (!pkt_hdr->input_flags.tcp) + if (!pkt_hdr->p.input_flags.tcp) return 0; - tcp = (const odph_tcphdr_t *)(pkt_addr + pkt_hdr->l4_offset); + tcp = (const odph_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; @@ -111,9 +111,9 @@ static inline int verify_pmr_tcp_dport(const uint8_t *pkt_addr, { uint16_t dport; const odph_tcphdr_t *tcp; - if (!pkt_hdr->input_flags.tcp) + if (!pkt_hdr->p.input_flags.tcp) return 0; - tcp = (const odph_tcphdr_t *)(pkt_addr + pkt_hdr->l4_offset); + tcp = (const odph_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; @@ -127,9 +127,9 @@ static inline int verify_pmr_udp_dport(const uint8_t *pkt_addr, { uint16_t dport; const odph_udphdr_t *udp; - if (!pkt_hdr->input_flags.udp) + if (!pkt_hdr->p.input_flags.udp) return 0; - udp = (const odph_udphdr_t *)(pkt_addr + pkt_hdr->l4_offset); + udp = (const odph_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; @@ -144,9 +144,9 @@ static inline int verify_pmr_udp_sport(const uint8_t *pkt_addr, uint16_t sport; const odph_udphdr_t *udp; - if (!pkt_hdr->input_flags.udp) + if (!pkt_hdr->p.input_flags.udp) return 0; - udp = (const odph_udphdr_t *)(pkt_addr + pkt_hdr->l4_offset); + udp = (const odph_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; @@ -165,7 +165,7 @@ static inline int verify_pmr_dmac(const uint8_t *pkt_addr, if (!packet_hdr_has_eth(pkt_hdr)) return 0; - eth = (const odph_ethhdr_t *)(pkt_addr + pkt_hdr->l2_offset); + eth = (const odph_ethhdr_t *)(pkt_addr + pkt_hdr->p.l2_offset); memcpy(&dmac_be, eth->dst.addr, ODPH_ETHADDR_LEN); dmac = odp_be_to_cpu_64(dmac_be); /* since we are converting a 48 bit ethernet address from BE to cpu @@ -217,13 +217,13 @@ static inline int verify_pmr_ipsec_spi(const uint8_t *pkt_addr, { uint32_t spi; - pkt_addr += pkt_hdr->l4_offset; + pkt_addr += pkt_hdr->p.l4_offset; - if (pkt_hdr->input_flags.ipsec_ah) { + if (pkt_hdr->p.input_flags.ipsec_ah) { const odph_ahhdr_t *ahhdr = (const odph_ahhdr_t *)pkt_addr; spi = odp_be_to_cpu_32(ahhdr->spi); - } else if (pkt_hdr->input_flags.ipsec_esp) { + } else if (pkt_hdr->p.input_flags.ipsec_esp) { const odph_esphdr_t *esphdr = (const odph_esphdr_t *)pkt_addr; spi = odp_be_to_cpu_32(esphdr->spi); diff --git a/platform/linux-generic/include/odp_packet_internal.h b/platform/linux-generic/include/odp_packet_internal.h index a84a6f8..71a2ab1 100644 --- a/platform/linux-generic/include/odp_packet_internal.h +++ b/platform/linux-generic/include/odp_packet_internal.h @@ -128,6 +128,23 @@ ODP_STATIC_ASSERT(sizeof(output_flags_t) == sizeof(uint32_t), "OUTPUT_FLAGS_SIZE_ERROR"); /** + * Packet parser metadata + */ +typedef struct { + input_flags_t input_flags; + error_flags_t error_flags; + output_flags_t output_flags; + + uint32_t l2_offset; /**< offset to L2 hdr, e.g. Eth */ + uint32_t l3_offset; /**< offset to L3 hdr, e.g. IPv4, IPv6 */ + uint32_t l4_offset; /**< offset to L4 hdr (TCP, UDP, SCTP, also ICMP) */ + + uint32_t l3_len; /**< Layer 3 length */ + uint32_t l4_len; /**< Layer 4 length */ + +} packet_parser_t; + +/** * Internal Packet header * * To optimize fast path performance this struct is not initialized to zero in @@ -139,13 +156,7 @@ typedef struct { odp_buffer_hdr_t buf_hdr; /* Following members are initialized by packet_init() */ - input_flags_t input_flags; - error_flags_t error_flags; - output_flags_t output_flags; - - uint32_t l2_offset; /**< offset to L2 hdr, e.g. Eth */ - uint32_t l3_offset; /**< offset to L3 hdr, e.g. IPv4, IPv6 */ - uint32_t l4_offset; /**< offset to L4 hdr (TCP, UDP, SCTP, also ICMP) */ + packet_parser_t p; uint32_t frame_len; uint32_t headroom; @@ -154,9 +165,6 @@ typedef struct { odp_pktio_t input; /* Members below are not initialized by packet_init() */ - uint32_t l3_len; /**< Layer 3 length */ - uint32_t l4_len; /**< Layer 4 length */ - odp_queue_t dst_queue; /**< Classifier destination queue */ uint32_t flow_hash; /**< Flow hash value */ @@ -180,18 +188,14 @@ static inline odp_packet_hdr_t *odp_packet_hdr(odp_packet_t pkt) static inline void copy_packet_parser_metadata(odp_packet_hdr_t *src_hdr, odp_packet_hdr_t *dst_hdr) { - dst_hdr->input_flags = src_hdr->input_flags; - dst_hdr->error_flags = src_hdr->error_flags; - dst_hdr->output_flags = src_hdr->output_flags; - - dst_hdr->l2_offset = src_hdr->l2_offset; - dst_hdr->l3_offset = src_hdr->l3_offset; - dst_hdr->l4_offset = src_hdr->l4_offset; - - dst_hdr->l3_len = src_hdr->l3_len; - dst_hdr->l4_len = src_hdr->l4_len; + dst_hdr->p = src_hdr->p; +} - dst_hdr->dst_queue = src_hdr->dst_queue; +static inline void copy_packet_cls_metadata(odp_packet_hdr_t *src_hdr, + odp_packet_hdr_t *dst_hdr) +{ + dst_hdr->p = src_hdr->p; + dst_hdr->dst_queue = src_hdr->dst_queue; } static inline void *packet_map(odp_packet_hdr_t *pkt_hdr, @@ -285,12 +289,12 @@ static inline void packet_set_len(odp_packet_hdr_t *pkt_hdr, uint32_t len) static inline int packet_parse_l2_not_done(odp_packet_hdr_t *pkt_hdr) { - return !pkt_hdr->input_flags.parsed_l2; + return !pkt_hdr->p.input_flags.parsed_l2; } static inline int packet_parse_not_complete(odp_packet_hdr_t *pkt_hdr) { - return !pkt_hdr->input_flags.parsed_all; + return !pkt_hdr->p.input_flags.parsed_all; } /* Forward declarations */ @@ -315,24 +319,24 @@ odp_packet_t _odp_packet_from_buffer(odp_buffer_t buf); static inline int packet_hdr_has_l2(odp_packet_hdr_t *pkt_hdr) { - return pkt_hdr->input_flags.l2; + return pkt_hdr->p.input_flags.l2; } static inline void packet_hdr_has_l2_set(odp_packet_hdr_t *pkt_hdr, int val) { - pkt_hdr->input_flags.l2 = val; + pkt_hdr->p.input_flags.l2 = val; } static inline int packet_hdr_has_eth(odp_packet_hdr_t *pkt_hdr) { - return pkt_hdr->input_flags.eth; + return pkt_hdr->p.input_flags.eth; } static inline void packet_set_ts(odp_packet_hdr_t *pkt_hdr, odp_time_t *ts) { if (ts != NULL) { pkt_hdr->timestamp = *ts; - pkt_hdr->input_flags.timestamp = 1; + pkt_hdr->p.input_flags.timestamp = 1; } } diff --git a/platform/linux-generic/odp_classification.c b/platform/linux-generic/odp_classification.c index d2cc081..752348c 100644 --- a/platform/linux-generic/odp_classification.c +++ b/platform/linux-generic/odp_classification.c @@ -776,7 +776,7 @@ static inline cos_t *cls_select_cos(pktio_entry_t *entry, packet_parse_full(pkt_hdr); /* Return error cos for error packet */ - if (pkt_hdr->error_flags.all) + if (pkt_hdr->p.error_flags.all) return cls->error_cos; /* Calls all the PMRs attached at the PKTIO level*/ for (i = 0; i < odp_atomic_load_u32(&default_cos->s.num_rule); i++) { @@ -827,7 +827,7 @@ int cls_classify_packet(pktio_entry_t *entry, const uint8_t *base, uint16_t len, return -EFAULT; *pool = cos->s.pool->s.pool_hdl; - pkt_hdr->input_flags.dst_queue = 1; + pkt_hdr->p.input_flags.dst_queue = 1; pkt_hdr->dst_queue = cos->s.queue->s.handle; return 0; @@ -841,12 +841,12 @@ cos_t *match_qos_l3_cos(pmr_l3_cos_t *l3_cos, const uint8_t *pkt_addr, const odph_ipv4hdr_t *ipv4; const odph_ipv6hdr_t *ipv6; - if (hdr->input_flags.l3 && hdr->input_flags.ipv4) { - ipv4 = (const odph_ipv4hdr_t *)(pkt_addr + hdr->l3_offset); + if (hdr->p.input_flags.l3 && hdr->p.input_flags.ipv4) { + ipv4 = (const odph_ipv4hdr_t *)(pkt_addr + hdr->p.l3_offset); dscp = ODPH_IPV4HDR_DSCP(ipv4->tos); cos = l3_cos->cos[dscp]; - } else if (hdr->input_flags.l3 && hdr->input_flags.ipv6) { - ipv6 = (const odph_ipv6hdr_t *)(pkt_addr + hdr->l3_offset); + } else if (hdr->p.input_flags.l3 && hdr->p.input_flags.ipv6) { + ipv6 = (const odph_ipv6hdr_t *)(pkt_addr + hdr->p.l3_offset); dscp = ODPH_IPV6HDR_DSCP(ipv6->ver_tc_flow); cos = l3_cos->cos[dscp]; } @@ -862,9 +862,9 @@ cos_t *match_qos_l2_cos(pmr_l2_cos_t *l2_cos, const uint8_t *pkt_addr, const odph_vlanhdr_t *vlan; uint16_t qos; - if (packet_hdr_has_l2(hdr) && hdr->input_flags.vlan && + if (packet_hdr_has_l2(hdr) && hdr->p.input_flags.vlan && packet_hdr_has_eth(hdr)) { - eth = (const odph_ethhdr_t *)(pkt_addr + hdr->l2_offset); + eth = (const odph_ethhdr_t *)(pkt_addr + hdr->p.l2_offset); vlan = (const odph_vlanhdr_t *)(eth + 1); qos = odp_be_to_cpu_16(vlan->tci); qos = ((qos >> 13) & 0x07); diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index 2868736..991a648 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -28,19 +28,19 @@ static inline void packet_parse_disable(odp_packet_hdr_t *pkt_hdr) { - pkt_hdr->input_flags.parsed_l2 = 1; - pkt_hdr->input_flags.parsed_all = 1; + pkt_hdr->p.input_flags.parsed_l2 = 1; + pkt_hdr->p.input_flags.parsed_all = 1; } void packet_parse_reset(odp_packet_hdr_t *pkt_hdr) { /* Reset parser metadata before new parse */ - pkt_hdr->error_flags.all = 0; - pkt_hdr->input_flags.all = 0; - pkt_hdr->output_flags.all = 0; - pkt_hdr->l2_offset = 0; - pkt_hdr->l3_offset = ODP_PACKET_OFFSET_INVALID; - pkt_hdr->l4_offset = ODP_PACKET_OFFSET_INVALID; + pkt_hdr->p.error_flags.all = 0; + pkt_hdr->p.input_flags.all = 0; + pkt_hdr->p.output_flags.all = 0; + pkt_hdr->p.l2_offset = 0; + pkt_hdr->p.l3_offset = ODP_PACKET_OFFSET_INVALID; + pkt_hdr->p.l4_offset = ODP_PACKET_OFFSET_INVALID; } /** @@ -49,13 +49,13 @@ void packet_parse_reset(odp_packet_hdr_t *pkt_hdr) static void packet_init(pool_entry_t *pool, odp_packet_hdr_t *pkt_hdr, size_t size, int parse) { - pkt_hdr->input_flags.all = 0; - pkt_hdr->output_flags.all = 0; - pkt_hdr->error_flags.all = 0; + pkt_hdr->p.input_flags.all = 0; + pkt_hdr->p.output_flags.all = 0; + pkt_hdr->p.error_flags.all = 0; - pkt_hdr->l2_offset = 0; - pkt_hdr->l3_offset = ODP_PACKET_OFFSET_INVALID; - pkt_hdr->l4_offset = ODP_PACKET_OFFSET_INVALID; + pkt_hdr->p.l2_offset = 0; + pkt_hdr->p.l3_offset = ODP_PACKET_OFFSET_INVALID; + pkt_hdr->p.l4_offset = ODP_PACKET_OFFSET_INVALID; /* Disable lazy parsing on user allocated packets */ if (!parse) @@ -431,7 +431,7 @@ void *odp_packet_l2_ptr(odp_packet_t pkt, uint32_t *len) if (!packet_hdr_has_l2(pkt_hdr)) return NULL; - return packet_map(pkt_hdr, pkt_hdr->l2_offset, len); + return packet_map(pkt_hdr, pkt_hdr->p.l2_offset, len); } uint32_t odp_packet_l2_offset(odp_packet_t pkt) @@ -440,7 +440,7 @@ uint32_t odp_packet_l2_offset(odp_packet_t pkt) if (!packet_hdr_has_l2(pkt_hdr)) return ODP_PACKET_OFFSET_INVALID; - return pkt_hdr->l2_offset; + return pkt_hdr->p.l2_offset; } int odp_packet_l2_offset_set(odp_packet_t pkt, uint32_t offset) @@ -451,7 +451,7 @@ int odp_packet_l2_offset_set(odp_packet_t pkt, uint32_t offset) return -1; packet_hdr_has_l2_set(pkt_hdr, 1); - pkt_hdr->l2_offset = offset; + pkt_hdr->p.l2_offset = offset; return 0; } @@ -461,7 +461,7 @@ void *odp_packet_l3_ptr(odp_packet_t pkt, uint32_t *len) if (packet_parse_not_complete(pkt_hdr)) packet_parse_full(pkt_hdr); - return packet_map(pkt_hdr, pkt_hdr->l3_offset, len); + return packet_map(pkt_hdr, pkt_hdr->p.l3_offset, len); } uint32_t odp_packet_l3_offset(odp_packet_t pkt) @@ -470,7 +470,7 @@ uint32_t odp_packet_l3_offset(odp_packet_t pkt) if (packet_parse_not_complete(pkt_hdr)) packet_parse_full(pkt_hdr); - return pkt_hdr->l3_offset; + return pkt_hdr->p.l3_offset; } int odp_packet_l3_offset_set(odp_packet_t pkt, uint32_t offset) @@ -482,7 +482,7 @@ int odp_packet_l3_offset_set(odp_packet_t pkt, uint32_t offset) if (packet_parse_not_complete(pkt_hdr)) packet_parse_full(pkt_hdr); - pkt_hdr->l3_offset = offset; + pkt_hdr->p.l3_offset = offset; return 0; } @@ -492,7 +492,7 @@ void *odp_packet_l4_ptr(odp_packet_t pkt, uint32_t *len) if (packet_parse_not_complete(pkt_hdr)) packet_parse_full(pkt_hdr); - return packet_map(pkt_hdr, pkt_hdr->l4_offset, len); + return packet_map(pkt_hdr, pkt_hdr->p.l4_offset, len); } uint32_t odp_packet_l4_offset(odp_packet_t pkt) @@ -501,7 +501,7 @@ uint32_t odp_packet_l4_offset(odp_packet_t pkt) if (packet_parse_not_complete(pkt_hdr)) packet_parse_full(pkt_hdr); - return pkt_hdr->l4_offset; + return pkt_hdr->p.l4_offset; } int odp_packet_l4_offset_set(odp_packet_t pkt, uint32_t offset) @@ -513,7 +513,7 @@ int odp_packet_l4_offset_set(odp_packet_t pkt, uint32_t offset) if (packet_parse_not_complete(pkt_hdr)) packet_parse_full(pkt_hdr); - pkt_hdr->l4_offset = offset; + pkt_hdr->p.l4_offset = offset; return 0; } @@ -529,7 +529,7 @@ void odp_packet_flow_hash_set(odp_packet_t pkt, uint32_t flow_hash) odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt); pkt_hdr->flow_hash = flow_hash; - pkt_hdr->input_flags.flow_hash = 1; + pkt_hdr->p.input_flags.flow_hash = 1; } odp_time_t odp_packet_ts(odp_packet_t pkt) @@ -544,7 +544,7 @@ void odp_packet_ts_set(odp_packet_t pkt, odp_time_t timestamp) odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt); pkt_hdr->timestamp = timestamp; - pkt_hdr->input_flags.timestamp = 1; + pkt_hdr->p.input_flags.timestamp = 1; } int odp_packet_is_segmented(odp_packet_t pkt) @@ -929,19 +929,19 @@ void odp_packet_print(odp_packet_t pkt) len += snprintf(&str[len], n - len, "Packet "); len += odp_buffer_snprint(&str[len], n - len, (odp_buffer_t)pkt); - len += snprintf(&str[len], n - len, - " input_flags 0x%" PRIx64 "\n", hdr->input_flags.all); - len += snprintf(&str[len], n - len, - " error_flags 0x%" PRIx32 "\n", hdr->error_flags.all); + len += snprintf(&str[len], n - len, " input_flags 0x%" PRIx64 "\n", + hdr->p.input_flags.all); + len += snprintf(&str[len], n - len, " error_flags 0x%" PRIx32 "\n", + hdr->p.error_flags.all); len += snprintf(&str[len], n - len, " output_flags 0x%" PRIx32 "\n", - hdr->output_flags.all); + hdr->p.output_flags.all); len += snprintf(&str[len], n - len, - " l2_offset %" PRIu32 "\n", hdr->l2_offset); + " l2_offset %" PRIu32 "\n", hdr->p.l2_offset); len += snprintf(&str[len], n - len, - " l3_offset %" PRIu32 "\n", hdr->l3_offset); + " l3_offset %" PRIu32 "\n", hdr->p.l3_offset); len += snprintf(&str[len], n - len, - " l4_offset %" PRIu32 "\n", hdr->l4_offset); + " l4_offset %" PRIu32 "\n", hdr->p.l4_offset); len += snprintf(&str[len], n - len, " frame_len %" PRIu32 "\n", hdr->frame_len); len += snprintf(&str[len], n - len, @@ -972,6 +972,7 @@ void _odp_packet_copy_md_to_packet(odp_packet_t srcpkt, odp_packet_t dstpkt) odp_packet_hdr_t *dsthdr = odp_packet_hdr(dstpkt); dsthdr->input = srchdr->input; + dsthdr->dst_queue = srchdr->dst_queue; dsthdr->buf_hdr.buf_u64 = srchdr->buf_hdr.buf_u64; if (dsthdr->buf_hdr.uarea_addr != NULL && srchdr->buf_hdr.uarea_addr != NULL) @@ -1000,12 +1001,12 @@ static inline uint8_t parse_ipv4(odp_packet_hdr_t *pkt_hdr, uint16_t frag_offset; uint32_t dstaddr = odp_be_to_cpu_32(ipv4->dst_addr); - pkt_hdr->l3_len = odp_be_to_cpu_16(ipv4->tot_len); + pkt_hdr->p.l3_len = odp_be_to_cpu_16(ipv4->tot_len); if (odp_unlikely(ihl < ODPH_IPV4HDR_IHL_MIN) || odp_unlikely(ver != 4) || - (pkt_hdr->l3_len > pkt_hdr->frame_len - *offset)) { - pkt_hdr->error_flags.ip_err = 1; + (pkt_hdr->p.l3_len > pkt_hdr->frame_len - *offset)) { + pkt_hdr->p.error_flags.ip_err = 1; return 0; } @@ -1013,7 +1014,7 @@ static inline uint8_t parse_ipv4(odp_packet_hdr_t *pkt_hdr, *parseptr += ihl * 4; if (odp_unlikely(ihl > ODPH_IPV4HDR_IHL_MIN)) - pkt_hdr->input_flags.ipopt = 1; + pkt_hdr->p.input_flags.ipopt = 1; /* A packet is a fragment if: * "more fragments" flag is set (all fragments except the last) @@ -1022,11 +1023,11 @@ static inline uint8_t parse_ipv4(odp_packet_hdr_t *pkt_hdr, */ frag_offset = odp_be_to_cpu_16(ipv4->frag_offset); if (odp_unlikely(ODPH_IPV4HDR_IS_FRAGMENT(frag_offset))) - pkt_hdr->input_flags.ipfrag = 1; + pkt_hdr->p.input_flags.ipfrag = 1; /* Handle IPv4 broadcast / multicast */ - pkt_hdr->input_flags.ip_bcast = (dstaddr == 0xffffffff); - pkt_hdr->input_flags.ip_mcast = (dstaddr >> 28) == 0xd; + pkt_hdr->p.input_flags.ip_bcast = (dstaddr == 0xffffffff); + pkt_hdr->p.input_flags.ip_mcast = (dstaddr >> 28) == 0xd; return ipv4->proto; } @@ -1041,19 +1042,19 @@ static inline uint8_t parse_ipv6(odp_packet_hdr_t *pkt_hdr, const odph_ipv6hdr_ext_t *ipv6ext; uint32_t dstaddr0 = odp_be_to_cpu_32(ipv6->dst_addr[0]); - pkt_hdr->l3_len = odp_be_to_cpu_16(ipv6->payload_len) + + pkt_hdr->p.l3_len = odp_be_to_cpu_16(ipv6->payload_len) + ODPH_IPV6HDR_LEN; /* Basic sanity checks on IPv6 header */ if ((odp_be_to_cpu_32(ipv6->ver_tc_flow) >> 28) != 6 || - pkt_hdr->l3_len > pkt_hdr->frame_len - *offset) { - pkt_hdr->error_flags.ip_err = 1; + pkt_hdr->p.l3_len > pkt_hdr->frame_len - *offset) { + pkt_hdr->p.error_flags.ip_err = 1; return 0; } /* IPv6 broadcast / multicast flags */ - pkt_hdr->input_flags.ip_mcast = (dstaddr0 & 0xff000000) == 0xff000000; - pkt_hdr->input_flags.ip_bcast = 0; + pkt_hdr->p.input_flags.ip_mcast = (dstaddr0 & 0xff000000) == 0xff000000; + pkt_hdr->p.input_flags.ip_bcast = 0; /* Skip past IPv6 header */ *offset += sizeof(odph_ipv6hdr_t); @@ -1062,7 +1063,7 @@ static inline uint8_t parse_ipv6(odp_packet_hdr_t *pkt_hdr, /* Skip past any IPv6 extension headers */ if (ipv6->next_hdr == ODPH_IPPROTO_HOPOPTS || ipv6->next_hdr == ODPH_IPPROTO_ROUTE) { - pkt_hdr->input_flags.ipopt = 1; + pkt_hdr->p.input_flags.ipopt = 1; do { ipv6ext = (const odph_ipv6hdr_ext_t *)*parseptr; @@ -1074,21 +1075,21 @@ static inline uint8_t parse_ipv6(odp_packet_hdr_t *pkt_hdr, ipv6ext->next_hdr == ODPH_IPPROTO_ROUTE) && *offset < pkt_hdr->frame_len); - if (*offset >= pkt_hdr->l3_offset + + if (*offset >= pkt_hdr->p.l3_offset + odp_be_to_cpu_16(ipv6->payload_len)) { - pkt_hdr->error_flags.ip_err = 1; + pkt_hdr->p.error_flags.ip_err = 1; return 0; } if (ipv6ext->next_hdr == ODPH_IPPROTO_FRAG) - pkt_hdr->input_flags.ipfrag = 1; + pkt_hdr->p.input_flags.ipfrag = 1; return ipv6ext->next_hdr; } if (odp_unlikely(ipv6->next_hdr == ODPH_IPPROTO_FRAG)) { - pkt_hdr->input_flags.ipopt = 1; - pkt_hdr->input_flags.ipfrag = 1; + pkt_hdr->p.input_flags.ipopt = 1; + pkt_hdr->p.input_flags.ipfrag = 1; } return ipv6->next_hdr; @@ -1103,12 +1104,12 @@ static inline void parse_tcp(odp_packet_hdr_t *pkt_hdr, const odph_tcphdr_t *tcp = (const odph_tcphdr_t *)*parseptr; if (tcp->hl < sizeof(odph_tcphdr_t) / sizeof(uint32_t)) - pkt_hdr->error_flags.tcp_err = 1; + pkt_hdr->p.error_flags.tcp_err = 1; else if ((uint32_t)tcp->hl * 4 > sizeof(odph_tcphdr_t)) - pkt_hdr->input_flags.tcpopt = 1; + pkt_hdr->p.input_flags.tcpopt = 1; - pkt_hdr->l4_len = pkt_hdr->l3_len + - pkt_hdr->l3_offset - pkt_hdr->l4_offset; + pkt_hdr->p.l4_len = pkt_hdr->p.l3_len + + pkt_hdr->p.l3_offset - pkt_hdr->p.l4_offset; if (offset) *offset += (uint32_t)tcp->hl * 4; @@ -1125,12 +1126,12 @@ static inline void parse_udp(odp_packet_hdr_t *pkt_hdr, uint32_t udplen = odp_be_to_cpu_16(udp->length); if (udplen < sizeof(odph_udphdr_t) || - udplen > (pkt_hdr->l3_len + - pkt_hdr->l4_offset - pkt_hdr->l3_offset)) { - pkt_hdr->error_flags.udp_err = 1; + udplen > (pkt_hdr->p.l3_len + + pkt_hdr->p.l4_offset - pkt_hdr->p.l3_offset)) { + pkt_hdr->p.error_flags.udp_err = 1; } - pkt_hdr->l4_len = udplen; + pkt_hdr->p.l4_len = udplen; if (offset) *offset += sizeof(odph_udphdr_t); @@ -1145,16 +1146,16 @@ void packet_parse_l2(odp_packet_hdr_t *pkt_hdr) /* Packet alloc or reset have already init other offsets and flags */ /* We only support Ethernet for now */ - pkt_hdr->input_flags.eth = 1; + pkt_hdr->p.input_flags.eth = 1; /* Detect jumbo frames */ if (pkt_hdr->frame_len > ODPH_ETH_LEN_MAX) - pkt_hdr->input_flags.jumbo = 1; + pkt_hdr->p.input_flags.jumbo = 1; /* Assume valid L2 header, no CRC/FCS check in SW */ - pkt_hdr->input_flags.l2 = 1; + pkt_hdr->p.input_flags.l2 = 1; - pkt_hdr->input_flags.parsed_l2 = 1; + pkt_hdr->p.input_flags.parsed_l2 = 1; } int _odp_parse_common(odp_packet_hdr_t *pkt_hdr, const uint8_t *ptr) @@ -1176,7 +1177,7 @@ int _odp_parse_common(odp_packet_hdr_t *pkt_hdr, const uint8_t *ptr) /* Handle Ethernet broadcast/multicast addresses */ macaddr0 = odp_be_to_cpu_16(*((const uint16_t *)(const void *)eth)); - pkt_hdr->input_flags.eth_mcast = (macaddr0 & 0x0100) == 0x0100; + pkt_hdr->p.input_flags.eth_mcast = (macaddr0 & 0x0100) == 0x0100; if (macaddr0 == 0xffff) { macaddr2 = @@ -1185,10 +1186,10 @@ int _odp_parse_common(odp_packet_hdr_t *pkt_hdr, const uint8_t *ptr) macaddr4 = odp_be_to_cpu_16(*((const uint16_t *) (const void *)eth + 2)); - pkt_hdr->input_flags.eth_bcast = + pkt_hdr->p.input_flags.eth_bcast = (macaddr2 == 0xffff) && (macaddr4 == 0xffff); } else { - pkt_hdr->input_flags.eth_bcast = 0; + pkt_hdr->p.input_flags.eth_bcast = 0; } /* Get Ethertype */ @@ -1197,9 +1198,9 @@ int _odp_parse_common(odp_packet_hdr_t *pkt_hdr, const uint8_t *ptr) /* Check for SNAP vs. DIX */ if (ethtype < ODPH_ETH_LEN_MAX) { - pkt_hdr->input_flags.snap = 1; + pkt_hdr->p.input_flags.snap = 1; if (ethtype > pkt_hdr->frame_len - offset) { - pkt_hdr->error_flags.snap_len = 1; + pkt_hdr->p.error_flags.snap_len = 1; goto parse_exit; } ethtype = odp_be_to_cpu_16(*((const uint16_t *) @@ -1210,8 +1211,8 @@ int _odp_parse_common(odp_packet_hdr_t *pkt_hdr, const uint8_t *ptr) /* Parse the VLAN header(s), if present */ if (ethtype == ODPH_ETHTYPE_VLAN_OUTER) { - pkt_hdr->input_flags.vlan_qinq = 1; - pkt_hdr->input_flags.vlan = 1; + pkt_hdr->p.input_flags.vlan_qinq = 1; + pkt_hdr->p.input_flags.vlan = 1; vlan = (const odph_vlanhdr_t *)parseptr; ethtype = odp_be_to_cpu_16(vlan->type); @@ -1220,7 +1221,7 @@ int _odp_parse_common(odp_packet_hdr_t *pkt_hdr, const uint8_t *ptr) } if (ethtype == ODPH_ETHTYPE_VLAN) { - pkt_hdr->input_flags.vlan = 1; + pkt_hdr->p.input_flags.vlan = 1; vlan = (const odph_vlanhdr_t *)parseptr; ethtype = odp_be_to_cpu_16(vlan->type); offset += sizeof(odph_vlanhdr_t); @@ -1228,71 +1229,71 @@ int _odp_parse_common(odp_packet_hdr_t *pkt_hdr, const uint8_t *ptr) } /* Set l3_offset+flag only for known ethtypes */ - pkt_hdr->input_flags.l3 = 1; - pkt_hdr->l3_offset = offset; + pkt_hdr->p.input_flags.l3 = 1; + pkt_hdr->p.l3_offset = offset; /* Parse Layer 3 headers */ switch (ethtype) { case ODPH_ETHTYPE_IPV4: - pkt_hdr->input_flags.ipv4 = 1; + pkt_hdr->p.input_flags.ipv4 = 1; ip_proto = parse_ipv4(pkt_hdr, &parseptr, &offset); break; case ODPH_ETHTYPE_IPV6: - pkt_hdr->input_flags.ipv6 = 1; + pkt_hdr->p.input_flags.ipv6 = 1; ip_proto = parse_ipv6(pkt_hdr, &parseptr, &offset); break; case ODPH_ETHTYPE_ARP: - pkt_hdr->input_flags.arp = 1; + pkt_hdr->p.input_flags.arp = 1; ip_proto = 255; /* Reserved invalid by IANA */ break; default: - pkt_hdr->input_flags.l3 = 0; - pkt_hdr->l3_offset = ODP_PACKET_OFFSET_INVALID; + pkt_hdr->p.input_flags.l3 = 0; + pkt_hdr->p.l3_offset = ODP_PACKET_OFFSET_INVALID; ip_proto = 255; /* Reserved invalid by IANA */ } /* Set l4_offset+flag only for known ip_proto */ - pkt_hdr->input_flags.l4 = 1; - pkt_hdr->l4_offset = offset; + pkt_hdr->p.input_flags.l4 = 1; + pkt_hdr->p.l4_offset = offset; /* Parse Layer 4 headers */ switch (ip_proto) { case ODPH_IPPROTO_ICMP: - pkt_hdr->input_flags.icmp = 1; + pkt_hdr->p.input_flags.icmp = 1; break; case ODPH_IPPROTO_TCP: - pkt_hdr->input_flags.tcp = 1; + pkt_hdr->p.input_flags.tcp = 1; parse_tcp(pkt_hdr, &parseptr, NULL); break; case ODPH_IPPROTO_UDP: - pkt_hdr->input_flags.udp = 1; + pkt_hdr->p.input_flags.udp = 1; parse_udp(pkt_hdr, &parseptr, NULL); break; case ODPH_IPPROTO_AH: - pkt_hdr->input_flags.ipsec = 1; - pkt_hdr->input_flags.ipsec_ah = 1; + pkt_hdr->p.input_flags.ipsec = 1; + pkt_hdr->p.input_flags.ipsec_ah = 1; break; case ODPH_IPPROTO_ESP: - pkt_hdr->input_flags.ipsec = 1; - pkt_hdr->input_flags.ipsec_esp = 1; + pkt_hdr->p.input_flags.ipsec = 1; + pkt_hdr->p.input_flags.ipsec_esp = 1; break; default: - pkt_hdr->input_flags.l4 = 0; - pkt_hdr->l4_offset = ODP_PACKET_OFFSET_INVALID; + pkt_hdr->p.input_flags.l4 = 0; + pkt_hdr->p.l4_offset = ODP_PACKET_OFFSET_INVALID; break; } parse_exit: - pkt_hdr->input_flags.parsed_all = 1; - return pkt_hdr->error_flags.all != 0; + pkt_hdr->p.input_flags.parsed_all = 1; + return pkt_hdr->p.error_flags.all != 0; } /** diff --git a/platform/linux-generic/odp_packet_flags.c b/platform/linux-generic/odp_packet_flags.c index 3acdc53..b88324c 100644 --- a/platform/linux-generic/odp_packet_flags.c +++ b/platform/linux-generic/odp_packet_flags.c @@ -7,26 +7,27 @@ #include <odp/api/packet_flags.h> #include <odp_packet_internal.h> -#define retflag(p, x) do { \ - odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(p); \ - if (packet_parse_not_complete(pkt_hdr)) \ - packet_parse_full(pkt_hdr); \ - return pkt_hdr->x; \ +#define retflag(pkt, x) do { \ + odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt); \ + if (packet_parse_not_complete(pkt_hdr)) \ + packet_parse_full(pkt_hdr); \ + return pkt_hdr->p.x; \ } while (0) -#define setflag(p, x, v) do { \ - odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(p); \ - if (packet_parse_not_complete(pkt_hdr)) \ - packet_parse_full(pkt_hdr); \ - pkt_hdr->x = v & 1; \ +#define setflag(pkt, x, v) do { \ + odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt); \ + if (packet_parse_not_complete(pkt_hdr)) \ + packet_parse_full(pkt_hdr); \ + pkt_hdr->p.x = v & 1; \ } while (0) int odp_packet_has_error(odp_packet_t pkt) { odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt); + if (packet_parse_not_complete(pkt_hdr)) packet_parse_full(pkt_hdr); - return odp_packet_hdr(pkt)->error_flags.all != 0; + return odp_packet_hdr(pkt)->p.error_flags.all != 0; } /* Get Input Flags */ @@ -35,7 +36,7 @@ int odp_packet_has_l2(odp_packet_t pkt) { odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt); - return pkt_hdr->input_flags.l2; + return pkt_hdr->p.input_flags.l2; } int odp_packet_has_l2_error(odp_packet_t pkt) @@ -43,9 +44,9 @@ int odp_packet_has_l2_error(odp_packet_t pkt) odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt); /* L2 parsing is always done by default and hence no additional check is required */ - return pkt_hdr->error_flags.frame_len - | pkt_hdr->error_flags.snap_len - | pkt_hdr->error_flags.l2_chksum; + return pkt_hdr->p.error_flags.frame_len + | pkt_hdr->p.error_flags.snap_len + | pkt_hdr->p.error_flags.l2_chksum; } int odp_packet_has_l3(odp_packet_t pkt) @@ -60,7 +61,7 @@ int odp_packet_has_l3_error(odp_packet_t pkt) if (packet_parse_not_complete(pkt_hdr)) packet_parse_full(pkt_hdr); - return pkt_hdr->error_flags.ip_err; + return pkt_hdr->p.error_flags.ip_err; } int odp_packet_has_l4(odp_packet_t pkt) @@ -75,14 +76,14 @@ int odp_packet_has_l4_error(odp_packet_t pkt) if (packet_parse_not_complete(pkt_hdr)) packet_parse_full(pkt_hdr); - return pkt_hdr->error_flags.tcp_err | pkt_hdr->error_flags.udp_err; + return pkt_hdr->p.error_flags.tcp_err | pkt_hdr->p.error_flags.udp_err; } int odp_packet_has_eth(odp_packet_t pkt) { odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt); - return pkt_hdr->input_flags.eth; + return pkt_hdr->p.input_flags.eth; } int odp_packet_has_eth_bcast(odp_packet_t pkt) @@ -99,7 +100,7 @@ int odp_packet_has_jumbo(odp_packet_t pkt) { odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt); - return pkt_hdr->input_flags.jumbo; + return pkt_hdr->p.input_flags.jumbo; } int odp_packet_has_vlan(odp_packet_t pkt) @@ -176,14 +177,14 @@ int odp_packet_has_flow_hash(odp_packet_t pkt) { odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt); - return pkt_hdr->input_flags.flow_hash; + return pkt_hdr->p.input_flags.flow_hash; } int odp_packet_has_ts(odp_packet_t pkt) { odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt); - return pkt_hdr->input_flags.timestamp; + return pkt_hdr->p.input_flags.timestamp; } odp_packet_color_t odp_packet_color(odp_packet_t pkt) @@ -198,7 +199,7 @@ void odp_packet_color_set(odp_packet_t pkt, odp_packet_color_t color) if (packet_parse_not_complete(pkt_hdr)) packet_parse_full(pkt_hdr); - pkt_hdr->input_flags.color = color; + pkt_hdr->p.input_flags.color = color; } odp_bool_t odp_packet_drop_eligible(odp_packet_t pkt) @@ -208,7 +209,7 @@ odp_bool_t odp_packet_drop_eligible(odp_packet_t pkt) if (packet_parse_not_complete(pkt_hdr)) packet_parse_full(pkt_hdr); - return !pkt_hdr->input_flags.nodrop; + return !pkt_hdr->p.input_flags.nodrop; } void odp_packet_drop_eligible_set(odp_packet_t pkt, odp_bool_t drop) @@ -228,7 +229,7 @@ void odp_packet_shaper_len_adjust_set(odp_packet_t pkt, int8_t adj) if (packet_parse_not_complete(pkt_hdr)) packet_parse_full(pkt_hdr); - pkt_hdr->output_flags.shaper_len_adj = adj; + pkt_hdr->p.output_flags.shaper_len_adj = adj; } /* Set Input Flags */ @@ -342,12 +343,12 @@ void odp_packet_has_flow_hash_clr(odp_packet_t pkt) { odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt); - pkt_hdr->input_flags.flow_hash = 0; + pkt_hdr->p.input_flags.flow_hash = 0; } void odp_packet_has_ts_clr(odp_packet_t pkt) { odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt); - pkt_hdr->input_flags.timestamp = 0; + pkt_hdr->p.input_flags.timestamp = 0; } diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c index 90ecdac..5b202e7 100644 --- a/platform/linux-generic/odp_packet_io.c +++ b/platform/linux-generic/odp_packet_io.c @@ -564,7 +564,7 @@ static inline int pktin_recv_buf(odp_pktin_queue_t queue, buf = _odp_packet_to_buffer(pkt); buf_hdr = odp_buf_to_hdr(buf); - if (pkt_hdr->input_flags.dst_queue) { + if (pkt_hdr->p.input_flags.dst_queue) { queue_entry_t *dst_queue; int ret; diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c index 85bb07c..e9d7aa4 100644 --- a/platform/linux-generic/pktio/dpdk.c +++ b/platform/linux-generic/pktio/dpdk.c @@ -742,7 +742,7 @@ static inline int mbuf_to_pkt(pktio_entry_t *pktio_entry, pkt_hdr->input = pktio_entry->s.handle; if (pktio_cls_enabled(pktio_entry)) - copy_packet_parser_metadata(&parsed_hdr, pkt_hdr); + copy_packet_cls_metadata(&parsed_hdr, pkt_hdr); else packet_parse_l2(pkt_hdr); diff --git a/platform/linux-generic/pktio/ipc.c b/platform/linux-generic/pktio/ipc.c index bd74f11..e0d4ab9 100644 --- a/platform/linux-generic/pktio/ipc.c +++ b/platform/linux-generic/pktio/ipc.c @@ -571,7 +571,7 @@ static int ipc_pktio_recv_lockless(pktio_entry_t *pktio_entry, memcpy(pkt_data, remote_pkt_data, phdr.frame_len); /* Copy packets L2, L3 parsed offsets and size */ - copy_packet_parser_metadata(&phdr, odp_packet_hdr(pkt)); + copy_packet_cls_metadata(&phdr, odp_packet_hdr(pkt)); odp_packet_hdr(pkt)->frame_len = phdr.frame_len; odp_packet_hdr(pkt)->headroom = phdr.headroom; diff --git a/platform/linux-generic/pktio/loop.c b/platform/linux-generic/pktio/loop.c index effad9a..a19c2dd 100644 --- a/platform/linux-generic/pktio/loop.c +++ b/platform/linux-generic/pktio/loop.c @@ -111,7 +111,7 @@ static int loopback_recv(pktio_entry_t *pktio_entry, int index ODP_UNUSED, pkt_hdr->input = pktio_entry->s.handle; if (pktio_cls_enabled(pktio_entry)) - copy_packet_parser_metadata(&parsed_hdr, pkt_hdr); + copy_packet_cls_metadata(&parsed_hdr, pkt_hdr); else packet_parse_l2(pkt_hdr); diff --git a/platform/linux-generic/pktio/netmap.c b/platform/linux-generic/pktio/netmap.c index 457ea53..6bfbe84 100644 --- a/platform/linux-generic/pktio/netmap.c +++ b/platform/linux-generic/pktio/netmap.c @@ -628,7 +628,7 @@ static inline int netmap_pkt_to_odp(pktio_entry_t *pktio_entry, pkt_hdr->input = pktio_entry->s.handle; if (pktio_cls_enabled(pktio_entry)) - copy_packet_parser_metadata(&parsed_hdr, pkt_hdr); + copy_packet_cls_metadata(&parsed_hdr, pkt_hdr); else packet_parse_l2(pkt_hdr); diff --git a/platform/linux-generic/pktio/socket.c b/platform/linux-generic/pktio/socket.c index e07b6ad..b116145 100644 --- a/platform/linux-generic/pktio/socket.c +++ b/platform/linux-generic/pktio/socket.c @@ -678,7 +678,7 @@ static int sock_mmsg_recv(pktio_entry_t *pktio_entry, int index ODP_UNUSED, continue; } pkt_hdr->input = pktio_entry->s.handle; - copy_packet_parser_metadata(&parsed_hdr, pkt_hdr); + copy_packet_cls_metadata(&parsed_hdr, pkt_hdr); packet_set_ts(pkt_hdr, ts); pkt_table[nb_rx++] = pkt; diff --git a/platform/linux-generic/pktio/socket_mmap.c b/platform/linux-generic/pktio/socket_mmap.c index 720004c..30c44e9 100644 --- a/platform/linux-generic/pktio/socket_mmap.c +++ b/platform/linux-generic/pktio/socket_mmap.c @@ -224,7 +224,7 @@ static inline unsigned pkt_mmap_v2_rx(pktio_entry_t *pktio_entry, hdr->input = pktio_entry->s.handle; if (pktio_cls_enabled(pktio_entry)) - copy_packet_parser_metadata(&parsed_hdr, hdr); + copy_packet_cls_metadata(&parsed_hdr, hdr); else packet_parse_l2(hdr); ----------------------------------------------------------------------- Summary of changes: .../include/odp_classification_inlines.h | 36 +-- .../include/odp_classification_internal.h | 5 +- .../linux-generic/include/odp_packet_internal.h | 68 +++--- platform/linux-generic/odp_classification.c | 28 +-- platform/linux-generic/odp_packet.c | 241 +++++++++++---------- platform/linux-generic/odp_packet_flags.c | 53 ++--- platform/linux-generic/odp_packet_io.c | 2 +- platform/linux-generic/pktio/dpdk.c | 7 +- platform/linux-generic/pktio/ipc.c | 2 +- platform/linux-generic/pktio/loop.c | 29 ++- platform/linux-generic/pktio/netmap.c | 6 +- platform/linux-generic/pktio/pcap.c | 2 +- platform/linux-generic/pktio/socket.c | 6 +- platform/linux-generic/pktio/socket_mmap.c | 6 +- platform/linux-generic/pktio/tap.c | 2 +- 15 files changed, 270 insertions(+), 223 deletions(-) hooks/post-receive --

9 years, 9 months

[COMMIT] branch master updated. v1.10.1.0-16-g2fc98f7

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 2fc98f7ba2fdcf7df0f04b171bc4bdd65b8cf980 (commit) via 39738abf195e2d3af75133f4ec418614b86e770c (commit) via c3f73eadd8eafb8e8167d5403d69527b896f9de6 (commit) via 7da43047a614ce4c030878ee8bef31725c7b71ef (commit) via bde29f1382ed76fa6b8450b67a249ab2c8c83323 (commit) via 41ab23c89799de4db4de5c3910b70e80f3a7d8f9 (commit) from 4cf18bb4f799e6601c20e54fafbdb58da538de89 (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 2fc98f7ba2fdcf7df0f04b171bc4bdd65b8cf980 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Wed Jun 15 13:44:20 2016 +0300 linux-gen: sched: add pktio_stop_finalize to scheduler interface Added pktio_stop_finalize() and related STOP_PENDING and CLOSE_PENDING pktio states. When a scheduled pktio interface is stopped, it's moved into STOP_PENDING state until the scheduler responses with a stop_finalize call. While stop is pending, interface may be closed and thus moved into CLOSE_PENDING state. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/include/odp_packet_io_internal.h b/platform/linux-generic/include/odp_packet_io_internal.h index 28610c1..bdf6316 100644 --- a/platform/linux-generic/include/odp_packet_io_internal.h +++ b/platform/linux-generic/include/odp_packet_io_internal.h @@ -125,11 +125,22 @@ struct pktio_entry { _ipc_pktio_t ipc; /**< IPC pktio data */ }; enum { - PKTIO_STATE_FREE = 0, /**< Not allocated */ - PKTIO_STATE_ALLOCATED, /**< Allocated, open in progress */ - PKTIO_STATE_OPENED, /**< Open completed */ - PKTIO_STATE_STARTED, /**< Start completed */ - PKTIO_STATE_STOPPED /**< Stop completed */ + /* Not allocated */ + PKTIO_STATE_FREE = 0, + /* Close pending on scheduler response. Next state after this + * is PKTIO_STATE_FREE. */ + PKTIO_STATE_CLOSE_PENDING, + /* Open in progress. + Marker for all active states following under. */ + PKTIO_STATE_ACTIVE, + /* Open completed */ + PKTIO_STATE_OPENED, + /* Start completed */ + PKTIO_STATE_STARTED, + /* Stop pending on scheduler response */ + PKTIO_STATE_STOP_PENDING, + /* Stop completed */ + PKTIO_STATE_STOPPED } state; odp_pktio_config_t config; /**< Device configuration */ classifier_t cls; /**< classifier linked with this pktio*/ diff --git a/platform/linux-generic/include/odp_schedule_if.h b/platform/linux-generic/include/odp_schedule_if.h index 029a767..13cdfb3 100644 --- a/platform/linux-generic/include/odp_schedule_if.h +++ b/platform/linux-generic/include/odp_schedule_if.h @@ -61,6 +61,7 @@ extern const schedule_fn_t *sched_fn; /* Interface for the scheduler */ int sched_cb_pktin_poll(int pktio_index, int num_queue, int index[]); +void sched_cb_pktio_stop_finalize(int pktio_index); int sched_cb_num_pktio(void); int sched_cb_num_queues(void); int sched_cb_queue_prio(uint32_t queue_index); diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c index 518b53e..90ecdac 100644 --- a/platform/linux-generic/odp_packet_io.c +++ b/platform/linux-generic/odp_packet_io.c @@ -163,7 +163,7 @@ static odp_pktio_t alloc_lock_pktio_entry(void) if (is_free(entry)) { odp_pktio_t hdl; - entry->s.state = PKTIO_STATE_ALLOCATED; + entry->s.state = PKTIO_STATE_ACTIVE; init_pktio_entry(entry); hdl = _odp_cast_scalar(odp_pktio_t, i + 1); return hdl; /* return with entry locked! */ @@ -275,12 +275,22 @@ odp_pktio_t odp_pktio_open(const char *name, odp_pool_t pool, static int _pktio_close(pktio_entry_t *entry) { int ret; + int state = entry->s.state; + + if (state != PKTIO_STATE_OPENED && + state != PKTIO_STATE_STOPPED && + state != PKTIO_STATE_STOP_PENDING) + return -1; ret = entry->s.ops->close(entry); if (ret) return -1; - entry->s.state = PKTIO_STATE_FREE; + if (state == PKTIO_STATE_STOP_PENDING) + entry->s.state = PKTIO_STATE_CLOSE_PENDING; + else + entry->s.state = PKTIO_STATE_FREE; + return 0; } @@ -346,6 +356,11 @@ int odp_pktio_close(odp_pktio_t hdl) if (entry == NULL) return -1; + if (entry->s.state == PKTIO_STATE_STARTED) { + ODP_DBG("Missing odp_pktio_stop() before close.\n"); + return -1; + } + if (entry->s.state == PKTIO_STATE_STOPPED) flush_in_queues(entry); @@ -357,11 +372,10 @@ int odp_pktio_close(odp_pktio_t hdl) entry->s.num_in_queue = 0; entry->s.num_out_queue = 0; - if (!is_free(entry)) { - res = _pktio_close(entry); - if (res) - ODP_ABORT("unable to close pktio\n"); - } + res = _pktio_close(entry); + if (res) + ODP_ABORT("unable to close pktio\n"); + unlock_entry(entry); return 0; @@ -465,13 +479,20 @@ int odp_pktio_start(odp_pktio_t hdl) static int _pktio_stop(pktio_entry_t *entry) { int res = 0; + odp_pktin_mode_t mode = entry->s.param.in_mode; if (entry->s.state != PKTIO_STATE_STARTED) return -1; if (entry->s.ops->stop) res = entry->s.ops->stop(entry); - if (!res) + + if (res) + return -1; + + if (mode == ODP_PKTIN_MODE_SCHED) + entry->s.state = PKTIO_STATE_STOP_PENDING; + else entry->s.state = PKTIO_STATE_STOPPED; return res; @@ -508,7 +529,7 @@ odp_pktio_t odp_pktio_lookup(const char *name) lock_entry(entry); - if (!is_free(entry) && + if (entry->s.state >= PKTIO_STATE_ACTIVE && strncmp(entry->s.name, name, sizeof(entry->s.name)) == 0) hdl = _odp_cast_scalar(odp_pktio_t, i + 1); @@ -670,17 +691,13 @@ int sched_cb_pktin_poll(int pktio_index, int num_queue, int index[]) int num, idx; pktio_entry_t *entry; entry = pktio_entry_by_index(pktio_index); + int state = entry->s.state; - if (odp_unlikely(is_free(entry))) { - ODP_ERR("Bad pktio entry\n"); - return -1; - } - - /* Temporarely needed for odp_pktio_inq_remdef() */ - if (odp_unlikely(entry->s.num_in_queue == 0)) - return -1; + if (odp_unlikely(state != PKTIO_STATE_STARTED)) { + if (state < PKTIO_STATE_ACTIVE || + state == PKTIO_STATE_STOP_PENDING) + return -1; - if (entry->s.state != PKTIO_STATE_STARTED) { ODP_DBG("interface not started\n"); return 0; } @@ -708,6 +725,30 @@ int sched_cb_pktin_poll(int pktio_index, int num_queue, int index[]) return 0; } +void sched_cb_pktio_stop_finalize(int pktio_index) +{ + int state; + pktio_entry_t *entry = pktio_entry_by_index(pktio_index); + + lock_entry(entry); + + state = entry->s.state; + + if (state != PKTIO_STATE_STOP_PENDING && + state != PKTIO_STATE_CLOSE_PENDING) { + unlock_entry(entry); + ODP_ERR("Not in a pending state %i\n", state); + return; + } + + if (state == PKTIO_STATE_STOP_PENDING) + entry->s.state = PKTIO_STATE_STOPPED; + else + entry->s.state = PKTIO_STATE_FREE; + + unlock_entry(entry); +} + int sched_cb_num_pktio(void) { return ODP_CONFIG_PKTIO_ENTRIES; @@ -977,8 +1018,10 @@ void odp_pktio_print(odp_pktio_t hdl) " state %s\n", entry->s.state == PKTIO_STATE_STARTED ? "start" : (entry->s.state == PKTIO_STATE_STOPPED ? "stop" : + (entry->s.state == PKTIO_STATE_STOP_PENDING ? + "stop pending" : (entry->s.state == PKTIO_STATE_OPENED ? "opened" : - "unknown"))); + "unknown")))); memset(addr, 0, sizeof(addr)); odp_pktio_mac_addr(hdl, addr, ETH_ALEN); len += snprintf(&str[len], n - len, diff --git a/platform/linux-generic/odp_schedule.c b/platform/linux-generic/odp_schedule.c index 3aaf696..8765f48 100644 --- a/platform/linux-generic/odp_schedule.c +++ b/platform/linux-generic/odp_schedule.c @@ -49,6 +49,9 @@ ODP_STATIC_ASSERT((ODP_SCHED_PRIO_NORMAL > 0) && /* Maximum number of packet input queues per command */ #define MAX_PKTIN 8 +/* Maximum number of packet IO interfaces */ +#define NUM_PKTIO ODP_CONFIG_PKTIO_ENTRIES + /* Mask of queues per priority */ typedef uint8_t pri_mask_t; @@ -86,6 +89,10 @@ typedef struct { int prio; } queue[ODP_CONFIG_QUEUES]; + struct { + int num; + } pktio[NUM_PKTIO]; + } sched_global_t; /* Schedule command */ @@ -419,6 +426,8 @@ static void schedule_pktio_start(int pktio_index, int num_in_queue, if (num_in_queue > MAX_PKTIN) ODP_ABORT("Too many input queues for scheduler\n"); + sched->pktio[pktio_index].num = num_in_queue; + /* Create a pktio poll command per queue */ for (i = 0; i < num_in_queue; i++) { buf = odp_buffer_alloc(sched->pool); @@ -445,14 +454,19 @@ static void schedule_pktio_start(int pktio_index, int num_in_queue, } } -static void schedule_pktio_stop(sched_cmd_t *sched_cmd) +static int schedule_pktio_stop(sched_cmd_t *sched_cmd) { - int idx = poll_cmd_queue_idx(sched_cmd->pktio_index, - sched_cmd->index[0]); + int num; + int pktio_index = sched_cmd->pktio_index; + int idx = poll_cmd_queue_idx(pktio_index, sched_cmd->index[0]); odp_spinlock_lock(&sched->poll_cmd_lock); sched->poll_cmd[idx].num--; + sched->pktio[pktio_index].num--; + num = sched->pktio[pktio_index].num; odp_spinlock_unlock(&sched->poll_cmd_lock); + + return num; } static void schedule_release_atomic(void) @@ -643,6 +657,7 @@ static int do_schedule(odp_queue_t *out_queue, odp_event_t out_ev[], for (i = 0; i < POLL_CMD_QUEUES; i++, id++) { odp_queue_t cmd_queue; + int pktio_index; if (id == POLL_CMD_QUEUES) id = 0; @@ -662,12 +677,18 @@ static int do_schedule(odp_queue_t *out_queue, odp_event_t out_ev[], if (sched_cmd->cmd != SCHED_CMD_POLL_PKTIN) ODP_ABORT("Bad poll command\n"); + pktio_index = sched_cmd->pktio_index; + /* Poll packet input */ - if (sched_cb_pktin_poll(sched_cmd->pktio_index, + if (sched_cb_pktin_poll(pktio_index, sched_cmd->num, sched_cmd->index)) { - /* Stop scheduling the pktio */ - schedule_pktio_stop(sched_cmd); + /* Pktio stopped or closed. Remove poll command and call + * stop_finalize when all commands of the pktio has + * been removed. */ + if (schedule_pktio_stop(sched_cmd) == 0) + sched_cb_pktio_stop_finalize(pktio_index); + odp_buffer_free(buf); } else { /* Continue scheduling the pktio */ diff --git a/platform/linux-generic/odp_schedule_sp.c b/platform/linux-generic/odp_schedule_sp.c index 0a21b2c..0973239 100644 --- a/platform/linux-generic/odp_schedule_sp.c +++ b/platform/linux-generic/odp_schedule_sp.c @@ -408,10 +408,15 @@ static int schedule_multi(odp_queue_t *from, uint64_t wait, cmd = sched_cmd(NUM_PRIO); if (cmd && cmd->s.type == CMD_PKTIO) { - sched_cb_pktin_poll(cmd->s.index, cmd->s.num_pktin, - cmd->s.pktin_idx); + if (sched_cb_pktin_poll(cmd->s.index, cmd->s.num_pktin, + cmd->s.pktin_idx)) { + /* Pktio stopped or closed. */ + sched_cb_pktio_stop_finalize(cmd->s.index); + } else { + /* Continue polling pktio. */ + add_tail(cmd); + } - add_tail(cmd); /* run wait parameter checks under */ cmd = NULL; } commit 39738abf195e2d3af75133f4ec418614b86e770c Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Wed Jun 15 13:44:19 2016 +0300 test: pktio: improve start_stop test Added schedule call after pktio_stop/close to expose potential errors in a pending stop/close in scheduler. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/pktio/pktio.c b/test/validation/pktio/pktio.c index 4fa8b6f..5922ba5 100644 --- a/test/validation/pktio/pktio.c +++ b/test/validation/pktio/pktio.c @@ -336,7 +336,7 @@ static odp_pktio_t create_pktio(int iface_idx, odp_pktin_mode_t imode, pktio_param.out_mode = omode; pktio = odp_pktio_open(iface, pool[iface_idx], &pktio_param); - CU_ASSERT(pktio != ODP_PKTIO_INVALID); + CU_ASSERT_FATAL(pktio != ODP_PKTIO_INVALID); CU_ASSERT(odp_pktio_to_u64(pktio) != odp_pktio_to_u64(ODP_PKTIO_INVALID)); @@ -1510,6 +1510,7 @@ void pktio_test_statistics_counters(void) void pktio_test_start_stop(void) { odp_pktio_t pktio[MAX_NUM_IFACES]; + odp_pktio_t pktio_in; odp_packet_t pkt; odp_packet_t tx_pkt[1000]; uint32_t pkt_seq[1000]; @@ -1588,11 +1589,11 @@ void pktio_test_start_stop(void) if (num_ifaces > 1) - alloc = create_packets(tx_pkt, pkt_seq, 1000, pktio[0], - pktio[1]); + pktio_in = pktio[1]; else - alloc = create_packets(tx_pkt, pkt_seq, 1000, pktio[0], - pktio[0]); + pktio_in = pktio[0]; + + alloc = create_packets(tx_pkt, pkt_seq, 1000, pktio[0], pktio_in); /* send */ for (pkts = 0; pkts != alloc; ) { @@ -1622,6 +1623,13 @@ void pktio_test_start_stop(void) CU_ASSERT(odp_pktio_stop(pktio[i]) == 0); CU_ASSERT(odp_pktio_close(pktio[i]) == 0); } + + /* Verify that a schedule call after stop and close does not generate + errors. */ + ev = odp_schedule(NULL, wait); + CU_ASSERT(ev == ODP_EVENT_INVALID); + if (ev != ODP_EVENT_INVALID) + odp_event_free(ev); } /* commit c3f73eadd8eafb8e8167d5403d69527b896f9de6 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Wed Jun 15 13:44:18 2016 +0300 test: validation: add missing pktio_stop calls When pktio_start has been called, pktio_stop must be called before pktio_close. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/pktio/pktio.c b/test/validation/pktio/pktio.c index 8f66880..4fa8b6f 100644 --- a/test/validation/pktio/pktio.c +++ b/test/validation/pktio/pktio.c @@ -1801,8 +1801,11 @@ void pktio_test_send_failure(void) odp_packet_free(pkt_tbl[i]); } - if (pktio_rx != pktio_tx) + if (pktio_rx != pktio_tx) { + CU_ASSERT(odp_pktio_stop(pktio_rx) == 0); CU_ASSERT(odp_pktio_close(pktio_rx) == 0); + } + CU_ASSERT(odp_pktio_stop(pktio_tx) == 0); CU_ASSERT(odp_pktio_close(pktio_tx) == 0); CU_ASSERT(odp_pool_destroy(pkt_pool) == 0); } diff --git a/test/validation/traffic_mngr/traffic_mngr.c b/test/validation/traffic_mngr/traffic_mngr.c index ce9d038..0645370 100644 --- a/test/validation/traffic_mngr/traffic_mngr.c +++ b/test/validation/traffic_mngr/traffic_mngr.c @@ -2089,6 +2089,9 @@ int traffic_mngr_suite_term(void) if (odp_pool_destroy(pools[iface]) != 0) return -1; + if (odp_pktio_stop(pktios[iface]) != 0) + return -1; + if (odp_pktio_close(pktios[iface]) != 0) return -1; } commit 7da43047a614ce4c030878ee8bef31725c7b71ef Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Wed Jun 15 13:44:17 2016 +0300 linux-gen: sched: use pktio index in scheduler interface Replaced pktio handle with pktio index in scheduler interface. Indexes are used in implementation internal interfaces for performance reasons. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/include/odp_schedule_if.h b/platform/linux-generic/include/odp_schedule_if.h index 86a117f..029a767 100644 --- a/platform/linux-generic/include/odp_schedule_if.h +++ b/platform/linux-generic/include/odp_schedule_if.h @@ -12,7 +12,6 @@ extern "C" { #endif #include <odp/api/queue.h> -#include <odp/api/packet_io.h> #include <odp/api/schedule.h> /* Constants defined by the scheduler. These should be converted into interface @@ -21,7 +20,7 @@ extern "C" { /* Number of ordered locks per queue */ #define SCHEDULE_ORDERED_LOCKS_PER_QUEUE 2 -typedef void (*schedule_pktio_start_fn_t)(odp_pktio_t pktio, int num_in_queue, +typedef void (*schedule_pktio_start_fn_t)(int pktio_index, int num_in_queue, int in_queue_idx[]); typedef int (*schedule_thr_add_fn_t)(odp_schedule_group_t group, int thr); typedef int (*schedule_thr_rem_fn_t)(odp_schedule_group_t group, int thr); diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c index 9dff9f6..518b53e 100644 --- a/platform/linux-generic/odp_packet_io.c +++ b/platform/linux-generic/odp_packet_io.c @@ -456,7 +456,7 @@ int odp_pktio_start(odp_pktio_t hdl) } } - sched_fn->pktio_start(hdl, num, index); + sched_fn->pktio_start(pktio_to_id(hdl), num, index); } return res; diff --git a/platform/linux-generic/odp_schedule.c b/platform/linux-generic/odp_schedule.c index f572468..3aaf696 100644 --- a/platform/linux-generic/odp_schedule.c +++ b/platform/linux-generic/odp_schedule.c @@ -98,7 +98,6 @@ typedef struct { }; struct { - odp_pktio_t pktio; int pktio_index; int num; int index[MAX_PKTIN]; @@ -404,12 +403,12 @@ static void schedule_destroy_queue(uint32_t queue_index) sched->queue[queue_index].prio = 0; } -static int poll_cmd_queue_idx(odp_pktio_t pktio, int in_queue_idx) +static int poll_cmd_queue_idx(int pktio_index, int in_queue_idx) { - return (POLL_CMD_QUEUES - 1) & (odp_pktio_index(pktio) ^ in_queue_idx); + return (POLL_CMD_QUEUES - 1) & (pktio_index ^ in_queue_idx); } -static void schedule_pktio_start(odp_pktio_t pktio, int num_in_queue, +static void schedule_pktio_start(int pktio_index, int num_in_queue, int in_queue_idx[]) { odp_buffer_t buf; @@ -429,12 +428,11 @@ static void schedule_pktio_start(odp_pktio_t pktio, int num_in_queue, sched_cmd = odp_buffer_addr(buf); sched_cmd->cmd = SCHED_CMD_POLL_PKTIN; - sched_cmd->pktio = pktio; - sched_cmd->pktio_index = odp_pktio_index(pktio); + sched_cmd->pktio_index = pktio_index; sched_cmd->num = 1; sched_cmd->index[0] = in_queue_idx[i]; - idx = poll_cmd_queue_idx(pktio, in_queue_idx[i]); + idx = poll_cmd_queue_idx(pktio_index, in_queue_idx[i]); odp_spinlock_lock(&sched->poll_cmd_lock); sched->poll_cmd[idx].num++; @@ -449,7 +447,8 @@ static void schedule_pktio_start(odp_pktio_t pktio, int num_in_queue, static void schedule_pktio_stop(sched_cmd_t *sched_cmd) { - int idx = poll_cmd_queue_idx(sched_cmd->pktio, sched_cmd->index[0]); + int idx = poll_cmd_queue_idx(sched_cmd->pktio_index, + sched_cmd->index[0]); odp_spinlock_lock(&sched->poll_cmd_lock); sched->poll_cmd[idx].num--; diff --git a/platform/linux-generic/odp_schedule_sp.c b/platform/linux-generic/odp_schedule_sp.c index 7162c7b..0a21b2c 100644 --- a/platform/linux-generic/odp_schedule_sp.c +++ b/platform/linux-generic/odp_schedule_sp.c @@ -7,6 +7,7 @@ #include <string.h> #include <odp/api/ticketlock.h> #include <odp/api/thread.h> +#include <odp/api/time.h> #include <odp/api/schedule.h> #include <odp_schedule_if.h> #include <odp_debug_internal.h> @@ -340,16 +341,15 @@ static int ord_enq_multi(uint32_t queue_index, void *buf_hdr[], int num, return 0; } -static void pktio_start(odp_pktio_t pktio, int num, int pktin_idx[]) +static void pktio_start(int pktio_index, int num, int pktin_idx[]) { - int pi, i; + int i; sched_cmd_t *cmd; - ODP_DBG("pktio:%" PRIu64 ", %i pktin queues %i\n", - odp_pktio_to_u64(pktio), num, pktin_idx[0]); + ODP_DBG("pktio index: %i, %i pktin queues %i\n", + pktio_index, num, pktin_idx[0]); - pi = odp_pktio_index(pktio); - cmd = &sched_global.pktio_cmd[pi]; + cmd = &sched_global.pktio_cmd[pktio_index]; if (num > NUM_PKTIN) ODP_ABORT("Supports only %i pktin queues per interface\n", commit bde29f1382ed76fa6b8450b67a249ab2c8c83323 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Wed Jun 15 13:44:16 2016 +0300 linux-gen: sched: call pktio_start only once Pktio calls the scheduler interface function pktio_start once per odp_pktio_start(). Scheduler handles internally creation of multiple poll commands. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c index 0e47533..9dff9f6 100644 --- a/platform/linux-generic/odp_packet_io.c +++ b/platform/linux-generic/odp_packet_io.c @@ -444,17 +444,19 @@ int odp_pktio_start(odp_pktio_t hdl) if (mode == ODP_PKTIN_MODE_SCHED) { unsigned i; + unsigned num = entry->s.num_in_queue; + int index[num]; - for (i = 0; i < entry->s.num_in_queue; i++) { - int index = i; + for (i = 0; i < num; i++) { + index[i] = i; if (entry->s.in_queue[i].queue == ODP_QUEUE_INVALID) { ODP_ERR("No input queue\n"); return -1; } - - sched_fn->pktio_start(hdl, 1, &index); } + + sched_fn->pktio_start(hdl, num, index); } return res; diff --git a/platform/linux-generic/odp_schedule.c b/platform/linux-generic/odp_schedule.c index 3b97909..f572468 100644 --- a/platform/linux-generic/odp_schedule.c +++ b/platform/linux-generic/odp_schedule.c @@ -417,33 +417,34 @@ static void schedule_pktio_start(odp_pktio_t pktio, int num_in_queue, odp_queue_t queue; int i, idx; - buf = odp_buffer_alloc(sched->pool); - - if (buf == ODP_BUFFER_INVALID) - ODP_ABORT("Sched pool empty\n"); - - sched_cmd = odp_buffer_addr(buf); - sched_cmd->cmd = SCHED_CMD_POLL_PKTIN; - sched_cmd->pktio = pktio; - sched_cmd->pktio_index = odp_pktio_index(pktio); - sched_cmd->num = num_in_queue; - if (num_in_queue > MAX_PKTIN) ODP_ABORT("Too many input queues for scheduler\n"); - for (i = 0; i < num_in_queue; i++) - sched_cmd->index[i] = in_queue_idx[i]; + /* Create a pktio poll command per queue */ + for (i = 0; i < num_in_queue; i++) { + buf = odp_buffer_alloc(sched->pool); - idx = poll_cmd_queue_idx(pktio, in_queue_idx[0]); + if (buf == ODP_BUFFER_INVALID) + ODP_ABORT("Sched pool empty\n"); - odp_spinlock_lock(&sched->poll_cmd_lock); - sched->poll_cmd[idx].num++; - odp_spinlock_unlock(&sched->poll_cmd_lock); + sched_cmd = odp_buffer_addr(buf); + sched_cmd->cmd = SCHED_CMD_POLL_PKTIN; + sched_cmd->pktio = pktio; + sched_cmd->pktio_index = odp_pktio_index(pktio); + sched_cmd->num = 1; + sched_cmd->index[0] = in_queue_idx[i]; + + idx = poll_cmd_queue_idx(pktio, in_queue_idx[i]); - queue = sched->poll_cmd[idx].queue; + odp_spinlock_lock(&sched->poll_cmd_lock); + sched->poll_cmd[idx].num++; + odp_spinlock_unlock(&sched->poll_cmd_lock); - if (odp_queue_enq(queue, odp_buffer_to_event(buf))) - ODP_ABORT("schedule_pktio_start failed\n"); + queue = sched->poll_cmd[idx].queue; + + if (odp_queue_enq(queue, odp_buffer_to_event(buf))) + ODP_ABORT("schedule_pktio_start failed\n"); + } } static void schedule_pktio_stop(sched_cmd_t *sched_cmd) commit 41ab23c89799de4db4de5c3910b70e80f3a7d8f9 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Wed Jun 15 13:44:15 2016 +0300 linux-gen: pktio: simplify state handling Removed 'int taken', so that 'enum state' is the only variable which holds pktio entry state. Added PKTIO_ prefix for better name space protection and code readability. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/include/odp_packet_io_internal.h b/platform/linux-generic/include/odp_packet_io_internal.h index 53683b3..28610c1 100644 --- a/platform/linux-generic/include/odp_packet_io_internal.h +++ b/platform/linux-generic/include/odp_packet_io_internal.h @@ -109,7 +109,6 @@ struct pktio_entry { /* These two locks together lock the whole pktio device */ odp_ticketlock_t rxl; /**< RX ticketlock */ odp_ticketlock_t txl; /**< TX ticketlock */ - int taken; /**< is entry taken(1) or free(0) */ int cls_enabled; /**< is classifier enabled */ odp_pktio_t handle; /**< pktio handle */ union { @@ -126,10 +125,11 @@ struct pktio_entry { _ipc_pktio_t ipc; /**< IPC pktio data */ }; enum { - STATE_OPENED = 0, /**< After open() */ - STATE_STARTED, /**< After start() */ - STATE_STOPPED /**< Same as OPENED, but only happens - after STARTED */ + PKTIO_STATE_FREE = 0, /**< Not allocated */ + PKTIO_STATE_ALLOCATED, /**< Allocated, open in progress */ + PKTIO_STATE_OPENED, /**< Open completed */ + PKTIO_STATE_STARTED, /**< Start completed */ + PKTIO_STATE_STOPPED /**< Stop completed */ } state; odp_pktio_config_t config; /**< Device configuration */ classifier_t cls; /**< classifier linked with this pktio*/ @@ -171,8 +171,6 @@ typedef struct { pktio_entry_t entries[ODP_CONFIG_PKTIO_ENTRIES]; } pktio_table_t; -int is_free(pktio_entry_t *entry); - typedef struct pktio_if_ops { const char *name; void (*print)(pktio_entry_t *pktio_entry); diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c index 8d88aa3..0e47533 100644 --- a/platform/linux-generic/odp_packet_io.c +++ b/platform/linux-generic/odp_packet_io.c @@ -104,19 +104,9 @@ int odp_pktio_init_local(void) return 0; } -int is_free(pktio_entry_t *entry) +static inline int is_free(pktio_entry_t *entry) { - return (entry->s.taken == 0); -} - -static void set_free(pktio_entry_t *entry) -{ - entry->s.taken = 0; -} - -static void set_taken(pktio_entry_t *entry) -{ - entry->s.taken = 1; + return (entry->s.state == PKTIO_STATE_FREE); } static void lock_entry(pktio_entry_t *entry) @@ -153,7 +143,6 @@ static void init_out_queues(pktio_entry_t *entry) static void init_pktio_entry(pktio_entry_t *entry) { - set_taken(entry); pktio_cls_enabled_set(entry, 0); init_in_queues(entry); @@ -174,6 +163,7 @@ static odp_pktio_t alloc_lock_pktio_entry(void) if (is_free(entry)) { odp_pktio_t hdl; + entry->s.state = PKTIO_STATE_ALLOCATED; init_pktio_entry(entry); hdl = _odp_cast_scalar(odp_pktio_t, i + 1); return hdl; /* return with entry locked! */ @@ -228,13 +218,13 @@ static odp_pktio_t setup_pktio_entry(const char *name, odp_pool_t pool, } if (ret != 0) { - set_free(pktio_entry); + pktio_entry->s.state = PKTIO_STATE_FREE; hdl = ODP_PKTIO_INVALID; ODP_ERR("Unable to init any I/O type.\n"); } else { snprintf(pktio_entry->s.name, sizeof(pktio_entry->s.name), "%s", name); - pktio_entry->s.state = STATE_OPENED; + pktio_entry->s.state = PKTIO_STATE_OPENED; } unlock_entry(pktio_entry); @@ -290,7 +280,7 @@ static int _pktio_close(pktio_entry_t *entry) if (ret) return -1; - set_free(entry); + entry->s.state = PKTIO_STATE_FREE; return 0; } @@ -356,7 +346,7 @@ int odp_pktio_close(odp_pktio_t hdl) if (entry == NULL) return -1; - if (entry->s.state == STATE_STOPPED) + if (entry->s.state == PKTIO_STATE_STOPPED) flush_in_queues(entry); lock_entry(entry); @@ -412,7 +402,7 @@ int odp_pktio_config(odp_pktio_t hdl, const odp_pktio_config_t *config) } lock_entry(entry); - if (entry->s.state == STATE_STARTED) { + if (entry->s.state == PKTIO_STATE_STARTED) { unlock_entry(entry); ODP_DBG("pktio %s: not stopped\n", entry->s.name); return -1; @@ -439,14 +429,14 @@ int odp_pktio_start(odp_pktio_t hdl) return -1; lock_entry(entry); - if (entry->s.state == STATE_STARTED) { + if (entry->s.state == PKTIO_STATE_STARTED) { unlock_entry(entry); return -1; } if (entry->s.ops->start) res = entry->s.ops->start(entry); if (!res) - entry->s.state = STATE_STARTED; + entry->s.state = PKTIO_STATE_STARTED; unlock_entry(entry); @@ -474,13 +464,13 @@ static int _pktio_stop(pktio_entry_t *entry) { int res = 0; - if (entry->s.state != STATE_STARTED) + if (entry->s.state != PKTIO_STATE_STARTED) return -1; if (entry->s.ops->stop) res = entry->s.ops->stop(entry); if (!res) - entry->s.state = STATE_STOPPED; + entry->s.state = PKTIO_STATE_STOPPED; return res; } @@ -688,7 +678,7 @@ int sched_cb_pktin_poll(int pktio_index, int num_queue, int index[]) if (odp_unlikely(entry->s.num_in_queue == 0)) return -1; - if (entry->s.state != STATE_STARTED) { + if (entry->s.state != PKTIO_STATE_STARTED) { ODP_DBG("interface not started\n"); return 0; } @@ -765,7 +755,7 @@ int odp_pktio_promisc_mode_set(odp_pktio_t hdl, odp_bool_t enable) ODP_DBG("already freed pktio\n"); return -1; } - if (entry->s.state == STATE_STARTED) { + if (entry->s.state == PKTIO_STATE_STARTED) { unlock_entry(entry); return -1; } @@ -983,10 +973,10 @@ void odp_pktio_print(odp_pktio_t hdl) " type %s\n", entry->s.ops->name); len += snprintf(&str[len], n - len, " state %s\n", - entry->s.state == STATE_STARTED ? "start" : - (entry->s.state == STATE_STOPPED ? "stop" : - (entry->s.state == STATE_OPENED ? "opened" : - "unknown"))); + entry->s.state == PKTIO_STATE_STARTED ? "start" : + (entry->s.state == PKTIO_STATE_STOPPED ? "stop" : + (entry->s.state == PKTIO_STATE_OPENED ? "opened" : + "unknown"))); memset(addr, 0, sizeof(addr)); odp_pktio_mac_addr(hdl, addr, ETH_ALEN); len += snprintf(&str[len], n - len, @@ -1031,7 +1021,7 @@ int odp_pktio_term_global(void) continue; lock_entry(pktio_entry); - if (pktio_entry->s.state == STATE_STARTED) { + if (pktio_entry->s.state == PKTIO_STATE_STARTED) { ret = _pktio_stop(pktio_entry); if (ret) ODP_ABORT("unable to stop pktio %s\n", @@ -1155,7 +1145,7 @@ int odp_pktin_queue_config(odp_pktio_t pktio, return -1; } - if (entry->s.state == STATE_STARTED) { + if (entry->s.state == PKTIO_STATE_STARTED) { ODP_DBG("pktio %s: not stopped\n", entry->s.name); return -1; } @@ -1268,7 +1258,7 @@ int odp_pktout_queue_config(odp_pktio_t pktio, return -1; } - if (entry->s.state == STATE_STARTED) { + if (entry->s.state == PKTIO_STATE_STARTED) { ODP_DBG("pktio %s: not stopped\n", entry->s.name); return -1; } diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c index 2225dfe..85bb07c 100644 --- a/platform/linux-generic/pktio/dpdk.c +++ b/platform/linux-generic/pktio/dpdk.c @@ -349,7 +349,7 @@ static int dpdk_close(pktio_entry_t *pktio_entry) rte_pktmbuf_free(pkt_dpdk->rx_cache[i].s.pkt[idx++]); } - if (pktio_entry->s.state != STATE_OPENED) + if (pktio_entry->s.state != PKTIO_STATE_OPENED) rte_eth_dev_close(pkt_dpdk->port_id); return 0; @@ -814,7 +814,7 @@ static int dpdk_recv(pktio_entry_t *pktio_entry, int index, int i; unsigned cache_idx; - if (odp_unlikely(pktio_entry->s.state != STATE_STARTED)) + if (odp_unlikely(pktio_entry->s.state != PKTIO_STATE_STARTED)) return 0; if (!pkt_dpdk->lockless_rx) @@ -881,7 +881,7 @@ static int dpdk_send(pktio_entry_t *pktio_entry, int index, int i; int mbufs; - if (odp_unlikely(pktio_entry->s.state != STATE_STARTED)) + if (odp_unlikely(pktio_entry->s.state != PKTIO_STATE_STARTED)) return 0; if (!pktio_entry->s.pkt_dpdk.lockless_tx) diff --git a/platform/linux-generic/pktio/netmap.c b/platform/linux-generic/pktio/netmap.c index 4ea0d4a..457ea53 100644 --- a/platform/linux-generic/pktio/netmap.c +++ b/platform/linux-generic/pktio/netmap.c @@ -703,7 +703,7 @@ static int netmap_recv(pktio_entry_t *pktio_entry, int index, int max_fd = 0; fd_set empty_rings; - if (odp_unlikely(pktio_entry->s.state != STATE_STARTED)) + if (odp_unlikely(pktio_entry->s.state != PKTIO_STATE_STARTED)) return 0; FD_ZERO(&empty_rings); @@ -758,7 +758,7 @@ static int netmap_send(pktio_entry_t *pktio_entry, int index, unsigned slot_id; char *buf; - if (odp_unlikely(pktio_entry->s.state != STATE_STARTED)) + if (odp_unlikely(pktio_entry->s.state != PKTIO_STATE_STARTED)) return 0; /* Only one netmap tx ring per pktout queue */ diff --git a/platform/linux-generic/pktio/pcap.c b/platform/linux-generic/pktio/pcap.c index b719849..c967e70 100644 --- a/platform/linux-generic/pktio/pcap.c +++ b/platform/linux-generic/pktio/pcap.c @@ -216,7 +216,7 @@ static int pcapif_recv_pkt(pktio_entry_t *pktio_entry, int index ODP_UNUSED, odp_ticketlock_lock(&pktio_entry->s.rxl); - if (pktio_entry->s.state != STATE_STARTED || !pcap->rx) { + if (pktio_entry->s.state != PKTIO_STATE_STARTED || !pcap->rx) { odp_ticketlock_unlock(&pktio_entry->s.rxl); return 0; } @@ -311,7 +311,7 @@ static int pcapif_send_pkt(pktio_entry_t *pktio_entry, int index ODP_UNUSED, odp_ticketlock_lock(&pktio_entry->s.txl); - if (pktio_entry->s.state != STATE_STARTED) { + if (pktio_entry->s.state != PKTIO_STATE_STARTED) { odp_ticketlock_unlock(&pktio_entry->s.txl); return 0; } ----------------------------------------------------------------------- Summary of changes: .../linux-generic/include/odp_packet_io_internal.h | 23 ++-- platform/linux-generic/include/odp_schedule_if.h | 4 +- platform/linux-generic/odp_packet_io.c | 135 +++++++++++++-------- platform/linux-generic/odp_schedule.c | 77 +++++++----- platform/linux-generic/odp_schedule_sp.c | 23 ++-- platform/linux-generic/pktio/dpdk.c | 6 +- platform/linux-generic/pktio/netmap.c | 4 +- platform/linux-generic/pktio/pcap.c | 4 +- test/validation/pktio/pktio.c | 23 +++- test/validation/traffic_mngr/traffic_mngr.c | 3 + 10 files changed, 193 insertions(+), 109 deletions(-) hooks/post-receive --

9 years, 9 months

[COMMIT] branch master updated. v1.10.1.0-10-g4cf18bb

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 4cf18bb4f799e6601c20e54fafbdb58da538de89 (commit) from 793c4b15275fd7e6c30bf348f236e778b9bfee02 (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 4cf18bb4f799e6601c20e54fafbdb58da538de89 Author: Bill Fischofer <bill.fischofer(a)linaro.org> Date: Thu Jun 9 19:09:28 2016 -0500 linux-generic: timer: correct definition of ODP_TIMEOUT_INVALID Resolve bug https://bugs.linaro.org/show_bug.cgi?id=2316 by changing the typedef of ODP_TIMEOUT_INVALID to be 0xffffffff to be consistent with other buffer types. This enables pool 0 to be used as a timeout pool. Signed-off-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/include/odp/api/plat/timer_types.h b/platform/linux-generic/include/odp/api/plat/timer_types.h index 93ea162..68d6f6f 100644 --- a/platform/linux-generic/include/odp/api/plat/timer_types.h +++ b/platform/linux-generic/include/odp/api/plat/timer_types.h @@ -36,7 +36,7 @@ typedef ODP_HANDLE_T(odp_timer_t); typedef ODP_HANDLE_T(odp_timeout_t); -#define ODP_TIMEOUT_INVALID _odp_cast_scalar(odp_timeout_t, 0) +#define ODP_TIMEOUT_INVALID _odp_cast_scalar(odp_timeout_t, 0xffffffff) /** * @} ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/include/odp/api/plat/timer_types.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive --

9 years, 9 months

[COMMIT] branch master updated. v1.10.1.0-9-g793c4b1

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 793c4b15275fd7e6c30bf348f236e778b9bfee02 (commit) via 46684cc1f1cdc33b7b223687e063f458b6c7bf02 (commit) from 8ab5804ea8bd430fd7cd0bd0edae316918b976d7 (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 793c4b15275fd7e6c30bf348f236e778b9bfee02 Author: Mike Holmes <mike.holmes(a)linaro.org> Date: Mon Jun 13 15:37:34 2016 -0400 doc: separate pure API guide and implementation guide It should be possible to generate the pure API specification guide, this patch achieves that Copy the application guide to form a platform specific guide. The application guide is now ONLY the public specification. The new platform guide includes the additional definitions specific to odp-linux and it can contain platform specific notes and other documentation as needed Signed-off-by: Mike Holmes <mike.holmes(a)linaro.org> Reviewed-and-tested-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/configure.ac b/configure.ac index 3851ebd..c87755b 100644 --- a/configure.ac +++ b/configure.ac @@ -183,7 +183,9 @@ DX_INIT_DOXYGEN($PACKAGE_NAME, ${srcdir}/doc/application-api-guide/Doxyfile, ${builddir}/doc/application-api-guide/output, ${srcdir}/doc/helper-guide/Doxyfile, - ${builddir}/doc/helper-guide/output) + ${builddir}/doc/helper-guide/output, + ${srcdir}/doc/platform-api-guide/Doxyfile, + ${builddir}/doc/platform-api-guide/output) ########################################################################## # Enable/disable ODP_DEBUG_PRINT diff --git a/doc/application-api-guide/Doxyfile b/doc/Doxyfile_common similarity index 56% copy from doc/application-api-guide/Doxyfile copy to doc/Doxyfile_common index 97731b2..5955853 100644 --- a/doc/application-api-guide/Doxyfile +++ b/doc/Doxyfile_common @@ -1,6 +1,3 @@ -PROJECT_NAME = "API Reference Manual for $(WITH_PLATFORM)" -PROJECT_NUMBER = $(VERSION) -PROJECT_LOGO = $(SRCDIR)/doc/images/ODP-Logo-HQ.svg QUIET = YES OUTPUT_DIRECTORY = $(DOCDIR) FULL_PATH_NAMES = NO @@ -10,10 +7,6 @@ TYPEDEF_HIDES_STRUCT = NO EXTRACT_STATIC = YES SORT_MEMBER_DOCS = NO WARN_NO_PARAMDOC = YES -INPUT = $(SRCDIR)/doc/application-api-guide \ - $(SRCDIR)/include \ - $(SRCDIR)/platform/$(WITH_PLATFORM)/include/odp \ - $(SRCDIR)/platform/$(WITH_PLATFORM)/arch/$(WITH_ARCH) FILE_PATTERNS = *.h odp*.c *.dox RECURSIVE = YES SOURCE_BROWSER = YES @@ -27,7 +20,6 @@ CLASS_DIAGRAMS = NO HAVE_DOT = YES CALL_GRAPH = YES DOT_MULTI_TARGETS = NO -EXAMPLE_PATH = $(SRCDIR)/example $(SRCDIR)/platform $(SRCDIR) EXAMPLE_PATTERNS = *.c EXAMPLE_RECURSIVE = YES IMAGE_PATH = $(SRCDIR)/doc/images @@ -36,13 +28,5 @@ LAYOUT_FILE = $(SRCDIR)/doc/doxygenlayout.xml ENABLE_PREPROCESSING = YES MACRO_EXPANSION = YES EXPAND_ONLY_PREDEF = YES -PREDEFINED = __GNUC__ \ - __attribute__(x)= \ - ODP_ALIGNED(x)= \ - __BIG_ENDIAN_BITFIELD \ - __LITTLE_ENDIAN_BITFIELD \ - __x86_64__ \ - ODP_PACKED \ - "ODP_HANDLE_T(type)=odp_handle_t type" INTERNAL_DOCS = YES DOT_IMAGE_FORMAT = svg diff --git a/doc/Makefile.am b/doc/Makefile.am index cf67c42..d49d84b 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = application-api-guide helper-guide +SUBDIRS = application-api-guide helper-guide platform-api-guide if user_guide SUBDIRS += implementers-guide users-guide process-guide @@ -7,4 +7,5 @@ endif EXTRA_DIST = \ $(top_srcdir)/doc/doxygenlayout.xml \ $(top_srcdir)/doc/odpdoxygen.css \ - $(top_srcdir)/doc/glossary.adoc + $(top_srcdir)/doc/glossary.adoc \ + $(top_srcdir)/doc/Doxyfile_common diff --git a/doc/application-api-guide/Doxyfile b/doc/application-api-guide/Doxyfile index 97731b2..9cb183c 100644 --- a/doc/application-api-guide/Doxyfile +++ b/doc/application-api-guide/Doxyfile @@ -1,48 +1,12 @@ -PROJECT_NAME = "API Reference Manual for $(WITH_PLATFORM)" +@INCLUDE = $(SRCDIR)/doc/Doxyfile_common + +PROJECT_NAME = "API Reference Manual" PROJECT_NUMBER = $(VERSION) PROJECT_LOGO = $(SRCDIR)/doc/images/ODP-Logo-HQ.svg -QUIET = YES -OUTPUT_DIRECTORY = $(DOCDIR) -FULL_PATH_NAMES = NO -JAVADOC_AUTOBRIEF = YES -OPTIMIZE_OUTPUT_FOR_C = YES -TYPEDEF_HIDES_STRUCT = NO -EXTRACT_STATIC = YES -SORT_MEMBER_DOCS = NO -WARN_NO_PARAMDOC = YES INPUT = $(SRCDIR)/doc/application-api-guide \ - $(SRCDIR)/include \ - $(SRCDIR)/platform/$(WITH_PLATFORM)/include/odp \ - $(SRCDIR)/platform/$(WITH_PLATFORM)/arch/$(WITH_ARCH) -FILE_PATTERNS = *.h odp*.c *.dox -RECURSIVE = YES -SOURCE_BROWSER = YES -REFERENCED_BY_RELATION = YES -REFERENCES_RELATION = YES -ALPHABETICAL_INDEX = NO -QHP_NAMESPACE = -GENERATE_TREEVIEW = YES -PAPER_TYPE = a4wide -CLASS_DIAGRAMS = NO -HAVE_DOT = YES -CALL_GRAPH = YES -DOT_MULTI_TARGETS = NO -EXAMPLE_PATH = $(SRCDIR)/example $(SRCDIR)/platform $(SRCDIR) -EXAMPLE_PATTERNS = *.c -EXAMPLE_RECURSIVE = YES -IMAGE_PATH = $(SRCDIR)/doc/images -HTML_EXTRA_STYLESHEET = $(SRCDIR)/doc/odpdoxygen.css -LAYOUT_FILE = $(SRCDIR)/doc/doxygenlayout.xml -ENABLE_PREPROCESSING = YES -MACRO_EXPANSION = YES -EXPAND_ONLY_PREDEF = YES + $(SRCDIR)/include +EXCLUDE_PATTERNS = drv* odp_drv.h +EXAMPLE_PATH = $(SRCDIR)/example $(SRCDIR) PREDEFINED = __GNUC__ \ - __attribute__(x)= \ - ODP_ALIGNED(x)= \ - __BIG_ENDIAN_BITFIELD \ - __LITTLE_ENDIAN_BITFIELD \ - __x86_64__ \ - ODP_PACKED \ "ODP_HANDLE_T(type)=odp_handle_t type" -INTERNAL_DOCS = YES -DOT_IMAGE_FORMAT = svg +WARNINGS = NO diff --git a/doc/m4/configure.m4 b/doc/m4/configure.m4 index 183c929..ed9451d 100644 --- a/doc/m4/configure.m4 +++ b/doc/m4/configure.m4 @@ -40,5 +40,6 @@ AC_CONFIG_FILES([doc/application-api-guide/Makefile doc/helper-guide/Makefile doc/implementers-guide/Makefile doc/Makefile + doc/platform-api-guide/Makefile doc/process-guide/Makefile doc/users-guide/Makefile]) diff --git a/doc/platform-api-guide/.gitignore b/doc/platform-api-guide/.gitignore new file mode 100644 index 0000000..53752db --- /dev/null +++ b/doc/platform-api-guide/.gitignore @@ -0,0 +1 @@ +output diff --git a/doc/platform-api-guide/Doxyfile b/doc/platform-api-guide/Doxyfile new file mode 100644 index 0000000..b87b7b2 --- /dev/null +++ b/doc/platform-api-guide/Doxyfile @@ -0,0 +1,19 @@ +@INCLUDE = $(SRCDIR)/doc/Doxyfile_common + +PROJECT_NAME = "API Reference Manual for $(WITH_PLATFORM)" +PROJECT_NUMBER = $(VERSION) +PROJECT_LOGO = $(SRCDIR)/doc/images/ODP-Logo-HQ.svg +INPUT = $(SRCDIR)/doc/application-api-guide \ + $(SRCDIR)/doc/platform-api-guide \ + $(SRCDIR)/include \ + $(SRCDIR)/platform/$(WITH_PLATFORM)/include/odp \ + $(SRCDIR)/platform/$(WITH_PLATFORM)/arch/$(WITH_ARCH) +EXAMPLE_PATH = $(SRCDIR)/example $(SRCDIR)/platform $(SRCDIR) +PREDEFINED = __GNUC__ \ + __attribute__(x)= \ + ODP_ALIGNED(x)= \ + __BIG_ENDIAN_BITFIELD \ + __LITTLE_ENDIAN_BITFIELD \ + __x86_64__ \ + ODP_PACKED \ + "ODP_HANDLE_T(type)=odp_handle_t type" diff --git a/doc/platform-api-guide/Makefile.am b/doc/platform-api-guide/Makefile.am new file mode 100644 index 0000000..a04c254 --- /dev/null +++ b/doc/platform-api-guide/Makefile.am @@ -0,0 +1,5 @@ +EXTRA_DIST = \ + Doxyfile + +clean-local: + rm -rf output commit 46684cc1f1cdc33b7b223687e063f458b6c7bf02 Author: Mike Holmes <mike.holmes(a)linaro.org> Date: Mon Jun 13 15:37:33 2016 -0400 doc: fix distribution build cases Signed-off-by: Mike Holmes <mike.holmes(a)linaro.org> Reviewed-and-tested-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/doc/Makefile.am b/doc/Makefile.am index 7e312e0..cf67c42 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -6,4 +6,5 @@ endif EXTRA_DIST = \ $(top_srcdir)/doc/doxygenlayout.xml \ - $(top_srcdir)/doc/odpdoxygen.css + $(top_srcdir)/doc/odpdoxygen.css \ + $(top_srcdir)/doc/glossary.adoc diff --git a/doc/users-guide/Makefile.am b/doc/users-guide/Makefile.am index 00a07d7..a01c717 100644 --- a/doc/users-guide/Makefile.am +++ b/doc/users-guide/Makefile.am @@ -35,7 +35,8 @@ IMAGES = $(top_srcdir)/doc/images/overview.svg \ $(top_srcdir)/doc/images/timeout_fsm.svg \ $(top_srcdir)/doc/images/timer_fsm.svg \ $(top_srcdir)/doc/images/tm_hierarchy.svg \ - $(top_srcdir)/doc/images/tm_node.svg + $(top_srcdir)/doc/images/tm_node.svg \ + $(top_srcdir)/doc/images/pktin_sched_cls.svg if HAVE_MSCGEN IMAGES += $(top_srcdir)/doc/images/resource_management.svg ----------------------------------------------------------------------- Summary of changes: configure.ac | 4 +- doc/{helper-guide/Doxyfile => Doxyfile_common} | 13 ------ doc/Makefile.am | 6 ++- doc/application-api-guide/Doxyfile | 50 +++------------------- doc/m4/configure.m4 | 1 + .../.gitignore | 0 doc/platform-api-guide/Doxyfile | 19 ++++++++ .../Makefile.am | 1 - doc/users-guide/Makefile.am | 3 +- 9 files changed, 36 insertions(+), 61 deletions(-) copy doc/{helper-guide/Doxyfile => Doxyfile_common} (64%) copy doc/{application-api-guide => platform-api-guide}/.gitignore (100%) create mode 100644 doc/platform-api-guide/Doxyfile copy doc/{helper-guide => platform-api-guide}/Makefile.am (78%) hooks/post-receive --

9 years, 9 months

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

git-lng-odp