git-lng-odp

git-lng-odp@lists.linaro.org

2 participants
1206 discussions

[COMMIT] branch api-next updated. v1.15.0.0-545-g2394317a

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 2394317ab247fa14b4e239aec512afee7eac4524 (commit) from 09ce9406e09eacadf8f739ae8499323ad1401d36 (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 2394317ab247fa14b4e239aec512afee7eac4524 Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Mon Aug 7 16:07:58 2017 +0300 Revert "api: schedule: add thread removal correction" This reverts commit 09ce9406 api: schedule: add thread removal correction Needed some more discussion before merging this. Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/include/odp/api/spec/schedule.h b/include/odp/api/spec/schedule.h index f1671462..8244746d 100644 --- a/include/odp/api/spec/schedule.h +++ b/include/odp/api/spec/schedule.h @@ -234,9 +234,8 @@ odp_schedule_group_t odp_schedule_group_create(const char *name, * Schedule group destroy * * Destroys a schedule group. All queues belonging to the schedule group must - * be destroyed before destroying the group. All threads that have joined - * the group must leave before destroying the group. Other operations on this - * group must not be invoked in parallel. + * be destroyed before destroying the group. Other operations on this group + * must not be invoked in parallel. * * @param group Schedule group handle * ----------------------------------------------------------------------- Summary of changes: include/odp/api/spec/schedule.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) hooks/post-receive --

8 years, 6 months

[COMMIT] branch api-next updated. v1.15.0.0-544-g09ce9406

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 09ce9406e09eacadf8f739ae8499323ad1401d36 (commit) from a165ff4093f666e5481ae5113f70b41e3354520d (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 09ce9406e09eacadf8f739ae8499323ad1401d36 Author: Honnappa Nagarahalli <honnappa.nagarahalli(a)arm.com> Date: Wed Jun 14 16:48:24 2017 -0500 api: schedule: add thread removal correction Clarify thread removal status from scheduler group before calling odp_schedule_group_destroy. Signed-off-by: Honnappa Nagarahalli <honnappa.nagarahalli(a)arm.com> Reviewed-by: Brian Brooks <brian.brooks(a)arm.com> Reviewed-by: Ola Liljedahl <ola.liljedahl(a)arm.com> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/include/odp/api/spec/schedule.h b/include/odp/api/spec/schedule.h index 8244746d..f1671462 100644 --- a/include/odp/api/spec/schedule.h +++ b/include/odp/api/spec/schedule.h @@ -234,8 +234,9 @@ odp_schedule_group_t odp_schedule_group_create(const char *name, * Schedule group destroy * * Destroys a schedule group. All queues belonging to the schedule group must - * be destroyed before destroying the group. Other operations on this group - * must not be invoked in parallel. + * be destroyed before destroying the group. All threads that have joined + * the group must leave before destroying the group. Other operations on this + * group must not be invoked in parallel. * * @param group Schedule group handle * ----------------------------------------------------------------------- Summary of changes: include/odp/api/spec/schedule.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) hooks/post-receive --

8 years, 6 months

[COMMIT] branch api-next updated. v1.15.0.0-543-ga165ff40

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 a165ff4093f666e5481ae5113f70b41e3354520d (commit) via 41abc837a5c25d8df3429398bcb51c72b83999e5 (commit) via e76b25aa5cafbf96133fcbd83b856090b0e95f33 (commit) via ab62d19d4811e2699ac0614bf4ba1d481bb3b2b1 (commit) via 641717bac482831a8f9702af7f941cfc349ada91 (commit) via c5436c447df98e0ec78de3620c7fe48141fef760 (commit) via 2fff8b0247a0da108c45c9febc1029bc8e12d347 (commit) from 8390f890d4bd2babb63a24f7b15d2f4763e44050 (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 a165ff4093f666e5481ae5113f70b41e3354520d Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Mon Jul 24 16:57:30 2017 +0300 api: crypto: clarify compl_queue queue in crypto_session_param Properly mention odp_crypto_operation() in the compl_queue param description. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/include/odp/api/spec/crypto.h b/include/odp/api/spec/crypto.h index 6d4807c4..3b8e9ddb 100644 --- a/include/odp/api/spec/crypto.h +++ b/include/odp/api/spec/crypto.h @@ -312,8 +312,9 @@ typedef struct odp_crypto_session_param_t { /** Async mode completion event queue * - * The completion queue is used to return odp_crypto_op_enq() - * results to the application. + * The completion queue is used to return completions from + * odp_crypto_operation() or odp_crypto_op_enq() results to the + * application. */ odp_queue_t compl_queue; commit 41abc837a5c25d8df3429398bcb51c72b83999e5 Merge: 8390f890 e76b25aa Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Fri Aug 4 19:56:42 2017 +0300 Merge branch 'master' into api-next Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> ----------------------------------------------------------------------- Summary of changes: include/odp/api/spec/crypto.h | 5 +- platform/linux-generic/odp_classification.c | 3 - platform/linux-generic/odp_packet_io.c | 2 + platform/linux-generic/odp_pkt_queue.c | 39 +++++- .../validation/api/classification/classification.h | 1 + .../api/classification/odp_classification_basic.c | 4 +- .../api/classification/odp_classification_common.c | 5 +- .../classification/odp_classification_test_pmr.c | 131 ++++++++++++++++++--- .../api/classification/odp_classification_tests.c | 2 + .../classification/odp_classification_testsuites.h | 3 +- 10 files changed, 164 insertions(+), 31 deletions(-) hooks/post-receive --

8 years, 6 months

[COMMIT] branch master updated. v1.15.0.0-103-ge76b25aa

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 e76b25aa5cafbf96133fcbd83b856090b0e95f33 (commit) via ab62d19d4811e2699ac0614bf4ba1d481bb3b2b1 (commit) from 641717bac482831a8f9702af7f941cfc349ada91 (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 e76b25aa5cafbf96133fcbd83b856090b0e95f33 Author: Ilias Apalodimas <ilias.apalodimas(a)linaro.org> Date: Thu Aug 3 21:16:34 2017 +0300 linux-gen: queue: added additional missing free Added 2 additional missing frees in _odp_queue_pool_create() as requested on review. Signed-off-by: Ilias Apalodimas <ilias.apalodimas(a)linaro.org> 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_pkt_queue.c b/platform/linux-generic/odp_pkt_queue.c index 06420a96..f1086096 100644 --- a/platform/linux-generic/odp_pkt_queue.c +++ b/platform/linux-generic/odp_pkt_queue.c @@ -241,8 +241,11 @@ _odp_int_queue_pool_t _odp_queue_pool_create(uint32_t max_num_queues, */ initial_free_list_size = MIN(64 * 1024, max_queued_pkts / 4); rc = pkt_queue_free_list_add(pool, initial_free_list_size); - if (rc < 0) + if (rc < 0) { + free(pool->queue_num_tbl); + free(pool); return _ODP_INT_QUEUE_POOL_INVALID; + } /* Discard the first queue blk with idx 0 */ queue_blk_alloc(pool, &first_queue_blk_idx); commit ab62d19d4811e2699ac0614bf4ba1d481bb3b2b1 Author: Ilias Apalodimas <apalos(a)gmail.com> Date: Wed Aug 2 11:15:14 2017 +0300 linux-gen: queue: checks on memory allocations Fixes: https://bugs.linaro.org/show_bug.cgi?id=3182 by adding proper checks on allocated memory. Signed-off-by: Ilias Apalodimas <ilias.apalodimas(a)linaro.org> 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_pkt_queue.c b/platform/linux-generic/odp_pkt_queue.c index 7c6cd87e..06420a96 100644 --- a/platform/linux-generic/odp_pkt_queue.c +++ b/platform/linux-generic/odp_pkt_queue.c @@ -85,17 +85,27 @@ static queue_blk_t *blk_idx_to_queue_blk(queue_pool_t *queue_pool, return &queue_region_desc->queue_blks->blks[blk_tbl_idx]; } +static void free_alloced_queue_blks(uint32_t end, queue_blks_t *blk_array[]) +{ + uint32_t i; + + for (i = 0; i < end; i++) + free(blk_array[i]); +} + static int pkt_queue_free_list_add(queue_pool_t *pool, uint32_t num_queue_blks) { queue_region_desc_t *region_desc; queue_blks_t *queue_blks; + queue_blks_t *alloced_queue_blks[num_queue_blks]; queue_blk_t *queue_blk; uint32_t which_region, blks_added, num_blks, start_idx; - uint32_t malloc_len, blks_to_add, cnt, i; + uint32_t malloc_len, blks_to_add, cnt, i, alloc_cnt; which_region = pool->current_region; blks_added = 0; + alloc_cnt = 0; while ((blks_added < num_queue_blks) && (pool->all_regions_used == 0)) { region_desc = &pool->queue_region_descs[which_region]; start_idx = region_desc->next_blk_idx; @@ -104,6 +114,13 @@ static int pkt_queue_free_list_add(queue_pool_t *pool, if (!queue_blks) { malloc_len = num_blks * sizeof(queue_blk_t); queue_blks = malloc(malloc_len); + if (!queue_blks) { + free_alloced_queue_blks(alloc_cnt, + alloced_queue_blks); + return -1; + } + alloced_queue_blks[alloc_cnt] = queue_blks; + alloc_cnt++; for (i = 0; i < num_blks; i++) init_queue_blk(&queue_blks->blks[i]); @@ -194,8 +211,19 @@ _odp_int_queue_pool_t _odp_queue_pool_create(uint32_t max_num_queues, int rc; pool = malloc(sizeof(queue_pool_t)); + if (!pool) + return _ODP_INT_QUEUE_POOL_INVALID; + memset(pool, 0, sizeof(queue_pool_t)); + malloc_len = max_num_queues * sizeof(uint32_t); + pool->queue_num_tbl = malloc(malloc_len); + if (!pool->queue_num_tbl) { + free(pool); + return _ODP_INT_QUEUE_POOL_INVALID; + } + memset(pool->queue_num_tbl, 0, malloc_len); + /* Initialize the queue_blk_tbl_sizes array based upon the * max_queued_pkts. */ @@ -223,10 +251,6 @@ _odp_int_queue_pool_t _odp_queue_pool_create(uint32_t max_num_queues, pool->max_queued_pkts = max_queued_pkts; pool->next_queue_num = 1; - malloc_len = max_num_queues * sizeof(uint32_t); - pool->queue_num_tbl = malloc(malloc_len); - memset(pool->queue_num_tbl, 0, malloc_len); - pool->min_free_list_size = pool->free_list_size; pool->peak_free_list_size = pool->free_list_size; return (_odp_int_queue_pool_t)(uintptr_t)pool; ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/odp_pkt_queue.c | 39 ++++++++++++++++++++++++++++------ 1 file changed, 33 insertions(+), 6 deletions(-) hooks/post-receive --

8 years, 6 months

[COMMIT] branch master updated. v1.15.0.0-101-g641717ba

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 641717bac482831a8f9702af7f941cfc349ada91 (commit) via c5436c447df98e0ec78de3620c7fe48141fef760 (commit) via 2fff8b0247a0da108c45c9febc1029bc8e12d347 (commit) from 4537d096721a753086592ed5a989beab5647bcfa (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 641717bac482831a8f9702af7f941cfc349ada91 Author: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Date: Wed Aug 2 07:12:00 2017 -0700 validation: classification: add test case for classifier enable boolean updates test suite to enable classifier in odp_pktin_queue_param_t config adds test case for classifier enable boolean Fixes https://bugs.linaro.org/show_bug.cgi?id=3177 Signed-off-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/common_plat/validation/api/classification/classification.h b/test/common_plat/validation/api/classification/classification.h index 53c527f3..326177ad 100644 --- a/test/common_plat/validation/api/classification/classification.h +++ b/test/common_plat/validation/api/classification/classification.h @@ -102,6 +102,7 @@ void classification_test_pmr_term_vlan_id_0(void); void classification_test_pmr_term_vlan_id_x(void); void classification_test_pmr_term_eth_type_0(void); void classification_test_pmr_term_eth_type_x(void); +void classification_test_pktin_classifier_flag(void); /* test arrays: */ extern odp_testinfo_t classification_suite_basic[]; diff --git a/test/common_plat/validation/api/classification/odp_classification_basic.c b/test/common_plat/validation/api/classification/odp_classification_basic.c index 9817287e..3f4a82ed 100644 --- a/test/common_plat/validation/api/classification/odp_classification_basic.c +++ b/test/common_plat/validation/api/classification/odp_classification_basic.c @@ -87,7 +87,7 @@ void classification_test_create_pmr_match(void) pkt_pool = pool_create("pkt_pool"); CU_ASSERT_FATAL(pkt_pool != ODP_POOL_INVALID); - pktio = create_pktio(ODP_QUEUE_TYPE_SCHED, pkt_pool); + pktio = create_pktio(ODP_QUEUE_TYPE_SCHED, pkt_pool, true); CU_ASSERT_FATAL(pktio != ODP_PKTIO_INVALID); configure_default_cos(pktio, &default_cos, @@ -271,7 +271,7 @@ void classification_test_pmr_composite_create(void) pkt_pool = pool_create("pkt_pool"); CU_ASSERT_FATAL(pkt_pool != ODP_POOL_INVALID); - pktio = create_pktio(ODP_QUEUE_TYPE_SCHED, pkt_pool); + pktio = create_pktio(ODP_QUEUE_TYPE_SCHED, pkt_pool, true); CU_ASSERT_FATAL(pktio != ODP_PKTIO_INVALID); configure_default_cos(pktio, &default_cos, diff --git a/test/common_plat/validation/api/classification/odp_classification_common.c b/test/common_plat/validation/api/classification/odp_classification_common.c index eca30b87..de8a9327 100644 --- a/test/common_plat/validation/api/classification/odp_classification_common.c +++ b/test/common_plat/validation/api/classification/odp_classification_common.c @@ -24,7 +24,8 @@ static uint8_t IPV6_DST_ADDR[ODPH_IPV6ADDR_LEN] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xFF, 0xFF, 10, 0, 0, 100 }; -odp_pktio_t create_pktio(odp_queue_type_t q_type, odp_pool_t pool) +odp_pktio_t create_pktio(odp_queue_type_t q_type, odp_pool_t pool, + odp_bool_t cls_enable) { odp_pktio_t pktio; odp_pktio_param_t pktio_param; @@ -50,6 +51,8 @@ odp_pktio_t create_pktio(odp_queue_type_t q_type, odp_pool_t pool) odp_pktin_queue_param_init(&pktin_param); pktin_param.queue_param.sched.sync = ODP_SCHED_SYNC_ATOMIC; + pktin_param.classifier_enable = cls_enable; + pktin_param.hash_enable = false; if (odp_pktin_queue_config(pktio, &pktin_param)) { fprintf(stderr, "pktin queue config failed.\n"); diff --git a/test/common_plat/validation/api/classification/odp_classification_test_pmr.c b/test/common_plat/validation/api/classification/odp_classification_test_pmr.c index d9524205..e6b496a1 100644 --- a/test/common_plat/validation/api/classification/odp_classification_test_pmr.c +++ b/test/common_plat/validation/api/classification/odp_classification_test_pmr.c @@ -86,6 +86,104 @@ int classification_suite_pmr_term(void) return retcode; } +void classification_test_pktin_classifier_flag(void) +{ + odp_packet_t pkt; + odph_tcphdr_t *tcp; + uint32_t seqno; + uint16_t val; + uint16_t mask; + int retval; + odp_pktio_t pktio; + odp_queue_t queue; + odp_queue_t retqueue; + odp_queue_t default_queue; + odp_cos_t default_cos; + odp_pool_t default_pool; + odp_pmr_t pmr; + odp_cos_t cos; + char cosname[ODP_COS_NAME_LEN]; + odp_cls_cos_param_t cls_param; + odp_pool_t pool; + odp_pool_t pool_recv; + odp_pmr_param_t pmr_param; + odph_ethhdr_t *eth; + + val = CLS_DEFAULT_DPORT; + mask = 0xffff; + seqno = 0; + + /* classifier is disabled in pktin queue configuration */ + pktio = create_pktio(ODP_QUEUE_TYPE_SCHED, pkt_pool, false); + CU_ASSERT_FATAL(pktio != ODP_PKTIO_INVALID); + retval = start_pktio(pktio); + CU_ASSERT(retval == 0); + + configure_default_cos(pktio, &default_cos, + &default_queue, &default_pool); + + queue = queue_create("tcp_dport1", true); + CU_ASSERT(queue != ODP_QUEUE_INVALID); + + pool = pool_create("tcp_dport1"); + CU_ASSERT_FATAL(pool != ODP_POOL_INVALID); + + sprintf(cosname, "tcp_dport"); + odp_cls_cos_param_init(&cls_param); + cls_param.pool = pool; + cls_param.queue = queue; + cls_param.drop_policy = ODP_COS_DROP_POOL; + + cos = odp_cls_cos_create(cosname, &cls_param); + CU_ASSERT(cos != ODP_COS_INVALID); + + odp_cls_pmr_param_init(&pmr_param); + pmr_param.term = ODP_PMR_TCP_DPORT; + pmr_param.match.value = &val; + pmr_param.match.mask = &mask; + pmr_param.val_sz = sizeof(val); + + pmr = odp_cls_pmr_create(&pmr_param, 1, default_cos, cos); + CU_ASSERT(pmr != ODP_PMR_INVAL); + + pkt = create_packet(default_pkt_info); + CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID); + seqno = cls_pkt_get_seq(pkt); + CU_ASSERT(seqno != TEST_SEQ_INVALID); + eth = (odph_ethhdr_t *)odp_packet_l2_ptr(pkt, NULL); + odp_pktio_mac_addr(pktio, eth->src.addr, ODPH_ETHADDR_LEN); + odp_pktio_mac_addr(pktio, eth->dst.addr, ODPH_ETHADDR_LEN); + + tcp = (odph_tcphdr_t *)odp_packet_l4_ptr(pkt, NULL); + tcp->dst_port = odp_cpu_to_be_16(CLS_DEFAULT_DPORT); + + enqueue_pktio_interface(pkt, pktio); + + /* since classifier flag is disabled in pktin queue configuration + packet will not be delivered in classifier queues */ + pkt = receive_packet(&retqueue, ODP_TIME_SEC_IN_NS); + CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID); + pool_recv = odp_packet_pool(pkt); + /* since classifier is disabled packet should not be received in + pool and queue configured with classifier */ + CU_ASSERT(pool != pool_recv); + CU_ASSERT(retqueue != queue); + CU_ASSERT(seqno == cls_pkt_get_seq(pkt)); + + odp_packet_free(pkt); + + odp_packet_free(pkt); + odp_cos_destroy(cos); + odp_cos_destroy(default_cos); + odp_cls_pmr_destroy(pmr); + stop_pktio(pktio); + odp_queue_destroy(queue); + odp_queue_destroy(default_queue); + odp_pool_destroy(pool); + odp_pool_destroy(default_pool); + odp_pktio_close(pktio); +} + void classification_test_pmr_term_tcp_dport(void) { odp_packet_t pkt; @@ -113,7 +211,7 @@ void classification_test_pmr_term_tcp_dport(void) mask = 0xffff; seqno = 0; - pktio = create_pktio(ODP_QUEUE_TYPE_SCHED, pkt_pool); + pktio = create_pktio(ODP_QUEUE_TYPE_SCHED, pkt_pool, true); CU_ASSERT_FATAL(pktio != ODP_PKTIO_INVALID); retval = start_pktio(pktio); CU_ASSERT(retval == 0); @@ -227,7 +325,7 @@ void classification_test_pmr_term_tcp_sport(void) mask = 0xffff; seqno = 0; - pktio = create_pktio(ODP_QUEUE_TYPE_SCHED, pkt_pool); + pktio = create_pktio(ODP_QUEUE_TYPE_SCHED, pkt_pool, true); CU_ASSERT_FATAL(pktio != ODP_PKTIO_INVALID); retval = start_pktio(pktio); CU_ASSERT(retval == 0); @@ -340,7 +438,7 @@ void classification_test_pmr_term_udp_dport(void) mask = 0xffff; seqno = 0; - pktio = create_pktio(ODP_QUEUE_TYPE_SCHED, pkt_pool); + pktio = create_pktio(ODP_QUEUE_TYPE_SCHED, pkt_pool, true); CU_ASSERT_FATAL(pktio != ODP_PKTIO_INVALID); retval = start_pktio(pktio); CU_ASSERT(retval == 0); @@ -456,7 +554,7 @@ void classification_test_pmr_term_udp_sport(void) mask = 0xffff; seqno = 0; - pktio = create_pktio(ODP_QUEUE_TYPE_SCHED, pkt_pool); + pktio = create_pktio(ODP_QUEUE_TYPE_SCHED, pkt_pool, true); CU_ASSERT_FATAL(pktio != ODP_PKTIO_INVALID); retval = start_pktio(pktio); CU_ASSERT(retval == 0); @@ -570,7 +668,7 @@ void classification_test_pmr_term_ipproto(void) mask = 0xff; seqno = 0; - pktio = create_pktio(ODP_QUEUE_TYPE_SCHED, pkt_pool); + pktio = create_pktio(ODP_QUEUE_TYPE_SCHED, pkt_pool, true); CU_ASSERT_FATAL(pktio != ODP_PKTIO_INVALID); retval = start_pktio(pktio); CU_ASSERT(retval == 0); @@ -679,7 +777,7 @@ void classification_test_pmr_term_dmac(void) mask = 0xffffffffffff; seqno = 0; - pktio = create_pktio(ODP_QUEUE_TYPE_SCHED, pkt_pool); + pktio = create_pktio(ODP_QUEUE_TYPE_SCHED, pkt_pool, true); CU_ASSERT_FATAL(pktio != ODP_PKTIO_INVALID); retval = start_pktio(pktio); CU_ASSERT(retval == 0); @@ -786,7 +884,7 @@ void classification_test_pmr_term_packet_len(void) mask = 0xff00; seqno = 0; - pktio = create_pktio(ODP_QUEUE_TYPE_SCHED, pkt_pool); + pktio = create_pktio(ODP_QUEUE_TYPE_SCHED, pkt_pool, true); CU_ASSERT_FATAL(pktio != ODP_PKTIO_INVALID); retval = start_pktio(pktio); CU_ASSERT(retval == 0); @@ -898,7 +996,7 @@ void classification_test_pmr_term_vlan_id_0(void) mask = 0xff00; seqno = 0; - pktio = create_pktio(ODP_QUEUE_TYPE_SCHED, pkt_pool); + pktio = create_pktio(ODP_QUEUE_TYPE_SCHED, pkt_pool, true); CU_ASSERT_FATAL(pktio != ODP_PKTIO_INVALID); retval = start_pktio(pktio); CU_ASSERT(retval == 0); @@ -1011,7 +1109,7 @@ void classification_test_pmr_term_vlan_id_x(void) mask = 0xff00; seqno = 0; - pktio = create_pktio(ODP_QUEUE_TYPE_SCHED, pkt_pool); + pktio = create_pktio(ODP_QUEUE_TYPE_SCHED, pkt_pool, true); CU_ASSERT_FATAL(pktio != ODP_PKTIO_INVALID); retval = start_pktio(pktio); CU_ASSERT(retval == 0); @@ -1124,7 +1222,7 @@ void classification_test_pmr_term_eth_type_0(void) mask = 0xffff; seqno = 0; - pktio = create_pktio(ODP_QUEUE_TYPE_SCHED, pkt_pool); + pktio = create_pktio(ODP_QUEUE_TYPE_SCHED, pkt_pool, true); CU_ASSERT_FATAL(pktio != ODP_PKTIO_INVALID); retval = start_pktio(pktio); CU_ASSERT(retval == 0); @@ -1234,7 +1332,7 @@ void classification_test_pmr_term_eth_type_x(void) mask = 0xff00; seqno = 0; - pktio = create_pktio(ODP_QUEUE_TYPE_SCHED, pkt_pool); + pktio = create_pktio(ODP_QUEUE_TYPE_SCHED, pkt_pool, true); CU_ASSERT_FATAL(pktio != ODP_PKTIO_INVALID); retval = start_pktio(pktio); CU_ASSERT(retval == 0); @@ -1347,7 +1445,7 @@ static void classification_test_pmr_pool_set(void) mask = 0xff; seqno = 0; - pktio = create_pktio(ODP_QUEUE_TYPE_SCHED, pkt_pool); + pktio = create_pktio(ODP_QUEUE_TYPE_SCHED, pkt_pool, true); CU_ASSERT_FATAL(pktio != ODP_PKTIO_INVALID); retval = start_pktio(pktio); CU_ASSERT(retval == 0); @@ -1446,7 +1544,7 @@ static void classification_test_pmr_queue_set(void) mask = 0xff; seqno = 0; - pktio = create_pktio(ODP_QUEUE_TYPE_SCHED, pkt_pool); + pktio = create_pktio(ODP_QUEUE_TYPE_SCHED, pkt_pool, true); CU_ASSERT_FATAL(pktio != ODP_PKTIO_INVALID); retval = start_pktio(pktio); CU_ASSERT(retval == 0); @@ -1539,7 +1637,7 @@ static void classification_test_pmr_term_daddr(void) const char *dst_addr = "10.0.0.99/32"; odph_ethhdr_t *eth; - pktio = create_pktio(ODP_QUEUE_TYPE_SCHED, pkt_pool); + pktio = create_pktio(ODP_QUEUE_TYPE_SCHED, pkt_pool, true); retval = start_pktio(pktio); CU_ASSERT(retval == 0); @@ -1650,7 +1748,7 @@ static void classification_test_pmr_term_ipv6daddr(void) 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }; - pktio = create_pktio(ODP_QUEUE_TYPE_SCHED, pkt_pool); + pktio = create_pktio(ODP_QUEUE_TYPE_SCHED, pkt_pool, true); retval = start_pktio(pktio); CU_ASSERT(retval == 0); @@ -1760,7 +1858,7 @@ static void classification_test_pmr_term_ipv6saddr(void) 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }; - pktio = create_pktio(ODP_QUEUE_TYPE_SCHED, pkt_pool); + pktio = create_pktio(ODP_QUEUE_TYPE_SCHED, pkt_pool, true); retval = start_pktio(pktio); CU_ASSERT(retval == 0); @@ -1860,5 +1958,6 @@ odp_testinfo_t classification_suite_pmr[] = { ODP_TEST_INFO(classification_test_pmr_term_vlan_id_x), ODP_TEST_INFO(classification_test_pmr_term_eth_type_0), ODP_TEST_INFO(classification_test_pmr_term_eth_type_x), + ODP_TEST_INFO(classification_test_pktin_classifier_flag), ODP_TEST_INFO_NULL, }; diff --git a/test/common_plat/validation/api/classification/odp_classification_tests.c b/test/common_plat/validation/api/classification/odp_classification_tests.c index 4f430826..a0f73e39 100644 --- a/test/common_plat/validation/api/classification/odp_classification_tests.c +++ b/test/common_plat/validation/api/classification/odp_classification_tests.c @@ -52,6 +52,8 @@ int classification_suite_init(void) odp_pktin_queue_param_init(&pktin_param); pktin_param.queue_param.sched.sync = ODP_SCHED_SYNC_ATOMIC; + pktin_param.classifier_enable = true; + pktin_param.hash_enable = false; if (odp_pktin_queue_config(pktio_loop, &pktin_param)) { fprintf(stderr, "pktin queue config failed.\n"); diff --git a/test/common_plat/validation/api/classification/odp_classification_testsuites.h b/test/common_plat/validation/api/classification/odp_classification_testsuites.h index d296923a..e1624162 100644 --- a/test/common_plat/validation/api/classification/odp_classification_testsuites.h +++ b/test/common_plat/validation/api/classification/odp_classification_testsuites.h @@ -35,7 +35,8 @@ int classification_suite_pmr_init(void); odp_packet_t create_packet(cls_packet_info_t pkt_info); int cls_pkt_set_seq(odp_packet_t pkt); uint32_t cls_pkt_get_seq(odp_packet_t pkt); -odp_pktio_t create_pktio(odp_queue_type_t q_type, odp_pool_t pool); +odp_pktio_t create_pktio(odp_queue_type_t q_type, odp_pool_t pool, + odp_bool_t cls_enable); void configure_default_cos(odp_pktio_t pktio, odp_cos_t *cos, odp_queue_t *queue, odp_pool_t *pool); int parse_ipv4_string(const char *ipaddress, uint32_t *addr, uint32_t *mask); commit c5436c447df98e0ec78de3620c7fe48141fef760 Author: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Date: Wed Aug 2 07:11:18 2017 -0700 linux-generic: classification: update classifier enable boolean removes classifier enable boolean default setting Fixes https://bugs.linaro.org/show_bug.cgi?id=3177 Signed-off-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/odp_classification.c b/platform/linux-generic/odp_classification.c index cc08b9f4..08b09078 100644 --- a/platform/linux-generic/odp_classification.c +++ b/platform/linux-generic/odp_classification.c @@ -328,7 +328,6 @@ int odp_pktio_default_cos_set(odp_pktio_t pktio_in, odp_cos_t default_cos) } entry->s.cls.default_cos = cos; - pktio_cls_enabled_set(entry, 1); return 0; } @@ -403,7 +402,6 @@ int odp_cos_with_l2_priority(odp_pktio_t pktio_in, l2_cos->cos[qos_table[i]] = cos; } } - pktio_cls_enabled_set(entry, 1); UNLOCK(&l2_cos->lock); return 0; } @@ -436,7 +434,6 @@ int odp_cos_with_l3_qos(odp_pktio_t pktio_in, l3_cos->cos[qos_table[i]] = cos; } } - pktio_cls_enabled_set(entry, 1); UNLOCK(&l3_cos->lock); return 0; } commit 2fff8b0247a0da108c45c9febc1029bc8e12d347 Author: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Date: Wed Aug 2 07:11:42 2017 -0700 linux-generic: pktio: update classifier enable boolean sets classifer enable based on boolean setting on odp_pktin_queue_param_t Fixes https://bugs.linaro.org/show_bug.cgi?id=3177 Signed-off-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> 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 64c6e452..b4523389 100644 --- a/platform/linux-generic/odp_packet_io.c +++ b/platform/linux-generic/odp_packet_io.c @@ -1234,6 +1234,8 @@ int odp_pktin_queue_config(odp_pktio_t pktio, return -1; } + pktio_cls_enabled_set(entry, param->classifier_enable); + if (num_queues > capa.max_input_queues) { ODP_DBG("pktio %s: too many input queues\n", entry->s.name); return -1; ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/odp_classification.c | 3 - platform/linux-generic/odp_packet_io.c | 2 + .../validation/api/classification/classification.h | 1 + .../api/classification/odp_classification_basic.c | 4 +- .../api/classification/odp_classification_common.c | 5 +- .../classification/odp_classification_test_pmr.c | 131 ++++++++++++++++++--- .../api/classification/odp_classification_tests.c | 2 + .../classification/odp_classification_testsuites.h | 3 +- 8 files changed, 128 insertions(+), 23 deletions(-) hooks/post-receive --

8 years, 6 months

[COMMIT] branch cloud-dev updated. v1.15.0.0-401-g370f9313

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, cloud-dev has been updated via 370f93139e16633390cb28acda6296da8fee006d (commit) via 5f738a79248183a252478856de88bafa37344445 (commit) via 3058124d5c307149272c1b37651056451939c3bf (commit) from 1ba26aa5650c05718c177842178de6d0f70b7fc1 (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 370f93139e16633390cb28acda6296da8fee006d Author: Yi He <yi.he(a)linaro.org> Date: Thu Jul 20 13:56:36 2017 +0800 odp: add modular framework Add modular programming framework to support selectable implementations for variant software subsystems. Signed-off-by: Yi He <yi.he(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> diff --git a/frameworks/modular/list.h b/frameworks/modular/list.h new file mode 100644 index 00000000..cc42b714 --- /dev/null +++ b/frameworks/modular/list.h @@ -0,0 +1,271 @@ +/* Adopted and modified Rusty Russell CCAN Project + * https://github.com/rustyrussell/ccan + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + * + * Copyright (c) 2017, ARM Limited. All rights reserved. + * + * Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#ifndef CCAN_LIST_H +#define CCAN_LIST_H + +#include <stddef.h> +#include <stdbool.h> + +/* Always assume the availabilities of typeof or __typeof__ */ +#if defined(__STDC__) +#define typeof __typeof__ +#endif + +/** + * struct list_node - an entry in a doubly-linked list + * @next: next entry (self if empty) + * @prev: previous entry (self if empty) + * + * This is used as an entry in a linked list. + * Example: + * struct child { + * const char *name; + * // Linked list of all us children. + * struct list_node list; + * }; + */ +struct list_node { + struct list_node *next, *prev; +}; + +/** + * struct list_head - the head of a doubly-linked list + * @node: the head node + * + * This is used as the head of a linked list. + * Example: + * struct parent { + * const char *name; + * struct list_head children; + * unsigned int num_children; + * }; + */ +struct list_head { + struct list_node node; +}; + +/** + * LIST_HEAD_INIT - initializer for an empty list_head + * @name: the name of the list. + * + * Explicit initializer for an empty list. + * + * See also: + * LIST_HEAD, list_head_init() + * + * Example: + * static struct list_head my_list = LIST_HEAD_INIT(my_list); + */ +#define LIST_HEAD_INIT(name) { { &(name).node, &(name).node } } + +/** + * list_head_init - initialize a list_head + * @h: the list_head to set to the empty list + * + * Example: + * ... + * struct parent *parent = malloc(sizeof(*parent)); + * + * list_head_init(&parent->children); + * parent->num_children = 0; + */ +static inline void list_head_init(struct list_head *h) +{ + h->node.next = &h->node; + h->node.prev = &h->node; +} + +/** + * list_node_init - initialize a list_node + * @n: the list_node to link to itself. + * + * You don't need to use this normally! But it lets you list_del(@n) + * safely. + */ +static inline void list_node_init(struct list_node *n) +{ + n->next = n; + n->prev = n; +} + +/** + * list_add_after - add an entry after an existing node in a linked list + * @p: the existing list_node to add the node after + * @n: the new list_node to add to the list. + * + * The existing list_node must already be a member of the list. + * The new list_node does not need to be initialized; it will be overwritten. + * + * Example: + * struct child c1, c2, c3; + * LIST_HEAD(h); + * + * list_add_tail(&h, &c1.list); + * list_add_tail(&h, &c3.list); + * list_add_after(&c1.list, &c2.list); + */ +static inline void list_add_after(struct list_node *p, + struct list_node *n) +{ + n->next = p->next; + n->prev = p; + p->next->prev = n; + p->next = n; +} + +/** + * list_add - add an entry at the start of a linked list. + * @h: the list_head to add the node to + * @n: the list_node to add to the list. + * + * The list_node does not need to be initialized; it will be overwritten. + * Example: + * struct child *child = malloc(sizeof(*child)); + * + * child->name = "marvin"; + * list_add(&parent->children, &child->list); + * parent->num_children++; + */ +static inline void list_add(struct list_head *h, + struct list_node *n) +{ + list_add_after(&h->node, n); +} + +/** + * list_add_before - add an entry before an existing node in a linked list + * @p: the existing list_node to add the node before + * @n: the new list_node to add to the list. + * + * The existing list_node must already be a member of the list. + * The new list_node does not need to be initialized; it will be overwritten. + * + * Example: + * list_head_init(&h); + * list_add_tail(&h, &c1.list); + * list_add_tail(&h, &c3.list); + * list_add_before(&c3.list, &c2.list); + */ +static inline void list_add_before(struct list_node *p, + struct list_node *n) +{ + n->next = p; + n->prev = p->prev; + p->prev->next = n; + p->prev = n; +} + +/** + * list_add_tail - add an entry at the end of a linked list. + * @h: the list_head to add the node to + * @n: the list_node to add to the list. + * + * The list_node does not need to be initialized; it will be overwritten. + * Example: + * list_add_tail(&parent->children, &child->list); + * parent->num_children++; + */ +static inline void list_add_tail(struct list_head *h, + struct list_node *n) +{ + list_add_before(&h->node, n); +} + +/** + * list_empty - is a list empty? + * @h: the list_head + * + * If the list is empty, returns true. + * + * Example: + * assert(list_empty(&parent->children) == (parent->num_children == 0)); + */ +static inline bool list_empty(const struct list_head *h) +{ + return (h->node.next == &h->node); +} + +/** + * list_node_detached - is a node detached from any lists? + * @n: the list_node + * + * If the list node is initialized and detached, return true. + * Always use list_node_init() and list_del_init() on list nodes. + */ +static inline bool list_node_detached(const struct list_node *n) +{ + return (n->next == n); +} + +/** + * list_del - delete an entry from an (unknown) linked list. + * @n: the list_node to delete from the list. + * + * Note that this leaves @n in an undefined state; it can be added to + * another list, but not deleted again. + * + * See also: + * list_del_from(), list_del_init() + * + * Example: + * list_del(&child->list); + * parent->num_children--; + */ +static inline void list_del(struct list_node *n) +{ + n->next->prev = n->prev; + n->prev->next = n->next; + + /* Catch use-after-del. */ + n->next = NULL; + n->prev = NULL; +} + +/** + * list_del_init - delete a node, and reset it so it can be deleted again. + * @n: the list_node to be deleted. + * + * list_del(@n) or list_del_init() again after this will be safe, + * which can be useful in some cases. + * + * See also: + * list_del_from(), list_del() + * + * Example: + * list_del_init(&child->list); + * parent->num_children--; + */ +static inline void list_del_init(struct list_node *n) +{ + list_del(n); + list_node_init(n); +} + +#endif /* CCAN_LIST_H */ diff --git a/frameworks/modular/odp_module.c b/frameworks/modular/odp_module.c new file mode 100644 index 00000000..89b7cb0d --- /dev/null +++ b/frameworks/modular/odp_module.c @@ -0,0 +1,179 @@ +/* Copyright (c) 2017, ARM Limited. All rights reserved. + * + * Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <stdio.h> +#include <errno.h> +#include "odp_module.h" + +#define MODULE_FRAMEWORK_VERSION 0x00010000UL +ODP_SUBSYSTEM_DEFINE(module, "module framework", MODULE_FRAMEWORK_VERSION); + +/* Bootstrap log facility, enable if ODP_DEBUG_PRINT flag is set. */ +#define DBG(format, ...) \ + do { \ + if (ODP_DEBUG_PRINT == 1) \ + fprintf(stderr, format, ##__VA_ARGS__); \ + } while (0) + +/* Keep it simple, allow one registration session at a time. */ +static struct { + odp_rwlock_t lock; + odp_subsystem_t *subsystem; + odp_module_base_t *module; +} registration = { + .lock = ODP_RWLOCK_UNLOCKED, + .subsystem = NULL, + .module = NULL, +}; + +static inline int registration_sanity_check( + odp_subsystem_t *subsystem, odp_module_base_t *module) +{ + if (subsystem == NULL || module == NULL) + return -ENOENT; + + if (!list_node_detached(&module->list)) { + DBG("module %s was already registered.\n", module->name); + return -EAGAIN; + } + + return 0; +} + +/* Module is linked statically or dynamically, and are loaded by + * program loader (execve) or dynamic linker/loader (ld.so) + * + * subsystem_register_module() should complete the whole registration + * session and link the module into subsystem's module array. + */ +static int linker_register_module( + odp_subsystem_t *subsystem, odp_module_base_t *module) +{ + int sanity = registration_sanity_check(subsystem, module); + + if (sanity < 0) /* sanity check errors */ + return sanity; + + /* Allow one registration session at a time */ + odp_rwlock_write_lock(&registration.lock); + + /* Block the subsystem API calls in load new + * implementation modules. */ + odp_rwlock_write_lock(&subsystem->lock); + module->handler = NULL; /* no DSO handler */ + list_add_tail(&subsystem->modules, &module->list); + odp_rwlock_write_unlock(&subsystem->lock); + + odp_rwlock_write_unlock(&registration.lock); + return 0; +} + +static int (*do_register_module)(odp_subsystem_t *, odp_module_base_t *) + = &linker_register_module; + +static int loader_register_module( + odp_subsystem_t *subsystem, odp_module_base_t *module) +{ + int sanity = registration_sanity_check(subsystem, module); + + if (sanity < 0) /* sanity check errors */ + return sanity; + + /* Registration session lock must be held by + * module_loader_start(). */ + if (odp_rwlock_write_trylock(&registration.lock) == 0) { + registration.subsystem = subsystem; + registration.module = module; + return 0; + } + + odp_rwlock_write_unlock(&registration.lock); + return -EACCES; +} + +void odp_module_loader_start(void) +{ + odp_rwlock_write_lock(&registration.lock); + + if (registration.module != NULL || + registration.subsystem != NULL) { + DBG("module loader start warn, A previous " + "registration did not complete yet.\n"); + } + + registration.module = NULL; + registration.subsystem = NULL; + do_register_module = &loader_register_module; +} + +void odp_module_loader_end(void) +{ + if (registration.module != NULL || + registration.subsystem != NULL) { + DBG("module loader end warn, A previous " + "registration did not complete yet.\n"); + } + + registration.module = NULL; + registration.subsystem = NULL; + do_register_module = &linker_register_module; + + odp_rwlock_write_unlock(&registration.lock); +} + +int odp_module_install(void *dso, bool active) +{ + /* Bottom halves of the registration, context exclusion + * is guaranteed by module_loader_start() + */ + if (odp_rwlock_write_trylock(&registration.lock) == 0) { + odp_subsystem_t *subsystem = registration.subsystem; + odp_module_base_t *module = registration.module; + + if (subsystem != NULL && module != NULL) { + odp_rwlock_write_lock(&subsystem->lock); + + module->handler = dso; + list_add_tail(&subsystem->modules, &module->list); + + /* install as active implementation */ + if (active) /* warn: replaceable */ + subsystem->active = module; + + odp_rwlock_write_unlock(&subsystem->lock); + } + + registration.subsystem = NULL; + registration.module = NULL; + return 0; + } + + odp_rwlock_write_unlock(&registration.lock); + return -EACCES; +} + +int odp_module_abandon(void) +{ + /* Bottom halves of the registration, context exclusion + * is guaranteed by module_loader_start() + */ + if (odp_rwlock_write_trylock(&registration.lock) == 0) { + registration.subsystem = NULL; + registration.module = NULL; + return 0; + } + + odp_rwlock_write_unlock(&registration.lock); + return -EACCES; +} + +int __subsystem_register_module( + odp_subsystem_t *subsystem, odp_module_base_t *module) +{ + return do_register_module(subsystem, module); +} diff --git a/frameworks/modular/odp_module.h b/frameworks/modular/odp_module.h new file mode 100644 index 00000000..1a9e178c --- /dev/null +++ b/frameworks/modular/odp_module.h @@ -0,0 +1,296 @@ +/* Copyright (c) 2017, ARM Limited. All rights reserved. + * + * Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +/** + * @file + * + * Modular framework solves the problem of choosing a module + * from multiple modules of a subsystem. + * + * The choice is available during compile time or during runtime + * or initialization. The runtime choice could be using shared + * libraries or dynamic loadable libraries. + * + * Multiple modules of the same subsystem can be built into + * individual static libraries(.a), shared libraries(.so) to be + * dynamically linked or loaded, and use constructor functions + * to register themselves. + * + * A subsystem can choose one active module and provide APIs to + * switch between modules. + * + * Alternatively, subsystem can load multiple modules and + * determine the APIs route in runtime. + * + * In order to gain full possible performance, the subsystem + * allows for choosing a specific module at compile time. + * This eliminates the need to choose the module using function + * pointer table. + * + * This framework tries to minimizes dependencies to the linked + * list and rwlock facilities only. + */ + +#ifndef ODP_MODULE_H_ +#define ODP_MODULE_H_ + +#include <stdbool.h> +#include <odp/api/rwlock.h> +#include "list.h" + +/* Forward declaration */ +typedef struct odp_module_base odp_module_base_t; + +/* Subsystem */ +typedef struct odp_subsystem { + odp_rwlock_t lock; + uint32_t version; + const char *name; + const char *description; + struct list_head modules; + odp_module_base_t *active; +} odp_subsystem_t; + +/* Internally construct subsystem instance name */ +#define __subsystem(name) odp_ ## name ## _subsystem + +/* Declare an ODP subsystem in header file */ +#define ODP_SUBSYSTEM_DECLARE(name) \ + extern odp_subsystem_t __subsystem(name) + +/* Define an ODP subsystem in source file */ +#define ODP_SUBSYSTEM_DEFINE(_name, _description, _version) \ + odp_subsystem_t __subsystem(_name) = \ + { \ + .lock = ODP_RWLOCK_UNLOCKED, \ + .name = # _name, \ + .version = _version, \ + .description = _description, \ + } + +/* Internally construct subsystem API name */ +#define __odp_api(subsystem, api) odp_ ## subsystem ##_## api + +/* Subsystem API prototype name */ +#define odp_api_proto(subsystem, api) __odp_api(subsystem, api ## _proto_t) + +/* Subsystem API declaration */ +#define ODP_SUBSYSTEM_API(name, _return, api, ...) \ + extern _return __odp_api(name, api)(__VA_ARGS__); \ + typedef _return (*odp_api_proto(name, api))(__VA_ARGS__) + +/* Subsystem API stubs are weak */ +#define ODP_SUBSYSTEM_API_STUB(name, api) \ + __attribute__((weak)) __odp_api(name, api) + +/* In case a subsystem module are built as static libraries(.a) + * or preload dynamic libraries(.so), the module can use this + * macro to override the APIs weak stubs. + */ +#define ODP_SUBSYSTEM_API_OVERRIDE(name, api, _alias) \ + __attribute__((alias(#_alias))) __odp_api(name, api) + +#define odp_subsystem_constructor(name) \ + do { \ + odp_rwlock_init(&__subsystem(name).lock); \ + list_head_init(&__subsystem(name).modules); \ + __subsystem(name).active = NULL; \ + } while (0) + +#define ODP_SUBSYSTEM_CONSTRUCTOR(name) \ + static void __attribute__((constructor(101))) \ + odp_ ## name ## _subsystem_constructor(void) + +#define odp_subsystem_lock(access, name) \ + odp_rwlock_ ## access ## _lock(&__subsystem(name).lock) + +#define odp_subsystem_unlock(access, name) \ + odp_rwlock_ ## access ## _unlock(&__subsystem(name).lock) + +/* Base class to all inherited subsystem module classes */ +struct odp_module_base { + struct list_node list; + const char *name; + void *handler; /* DSO */ + int (*init_local)(void); + int (*term_local)(void); + int (*init_global)(void); + int (*term_global)(void); +}; + +/* It is required to define subsystem module class with the + * base class as its 1st member and named as "base", and also + * use ODP_MODULE_CLASS(subsystem) to create the association + * between module class name and subsystem name, like: + * + * typedef ODP_MODULE_CLASS(subsystem) { + * odp_module_base_t base; + * ...new members... + * } new_module_t; // Here pick the name you like freely + * + * It also supports forward declaration like: + * + * // Forward declaration + * typedef ODP_MODULE_CLASS(subsystem) new_module_t; + * // Laterly comes the definition + * ODP_MODULE_CLASS(subsystem) { + * odp_module_base_t base; + * ...new members... + * } + * + * Then in preprocessor macros when we have the subsystem name + * we can recover the module class type information, like: + * + * #define MACRO(subsystem) + * do { + * ODP_MODULE_CLASS(subsystem) *mod = NULL; + * odp_subsystem_foreach_module(subsystem, mod) { + * mod->xxx; // access the module class + * } + * } while(0) + */ +#define ODP_MODULE_CLASS(subsystem) struct odp_ ## subsystem ## _module + +/* Below macros assume that all subsystem module classes have + * odp_module_base_t as their 1st member named "base". + * + * This greatly reduces the complexity for module list iteration + * and module pointer recovery from its list_node member by a forced + * type conversion instead of complex calls to container_of() etc. + */ +#define __force_cast(module, node) \ + ((typeof(module))((void *)(node))) + +#define __foreach_module(pos, head) \ + for (pos = __force_cast(pos, (head)->node.next); \ + pos != __force_cast(pos, head); \ + pos = __force_cast(pos, (pos)->base.list.next)) + +#define __foreach_module_safe(pos, n, head) \ + for (pos = __force_cast(pos, (head)->node.next), \ + n = __force_cast(pos, (pos)->base.list.next); \ + pos != __force_cast(pos, head); \ + pos = n, n = __force_cast(next, (next)->base.list.next)) + +#define odp_subsystem_active_module(name, mod) \ + __force_cast(mod, __subsystem(name).active) + +#define odp_subsystem_foreach_module(name, mod) \ + __foreach_module(mod, &__subsystem(name).modules) + +#define odp_subsystem_foreach_module_safe(name, mod, next) \ + __foreach_module_safe(mod, next, &__subsystem(name).modules) + +#define odp_module_constructor(mod) list_node_init(&(mod)->base.list) + +/* Module constructors should be later than subsystem constructors, + * in statically linked scenarios (both subsystems and modules are + * linked statically). thus the priority 102 compared to the above + * subsystem constructor priority 101. + */ +#define ODP_MODULE_CONSTRUCTOR(name) \ + static void __attribute__((constructor(102))) \ + odp_ ## name ## _module_constructor(void) + +/* All subsystems' initialization and termination routines are + * the same, provide template to help generate similar routines + * automatically, examples: + * + * ODP_SUBSYSTEM_FOREACH_TEMPLATE(subsystem, init_global, DBG) + * will generate a function walk through all the modules of the + * subsystem and invoke init_global method for each. + */ +#define ODP_SUBSYSTEM_FOREACH_TEMPLATE(subs, method, print) \ +static int odp_ ## subs ##_## method(bool continue_on_errors) \ +{ \ + int result = 0; \ + ODP_MODULE_CLASS(subs) * mod = NULL; \ + \ + odp_subsystem_lock(read, subs); \ + odp_subsystem_foreach_module(subs, mod) { \ + result = mod->base.method ? \ + mod->base.method() : 0; \ + if (result < 0) { \ + print("error %d to %s subsystem %s " \ + "module %s.\n", result, #method, \ + __subsystem(subs).name, \ + mod->base.name); \ + \ + if (continue_on_errors) \ + continue; \ + else \ + goto done; \ + } \ + } \ +done: \ + odp_subsystem_unlock(read, subs); \ + return result; \ +} + +/* Subsystem Modules Registration + * + * odp_subsystem_register_module() are called by all modules in their + * constructors, whereas the modules could be: + * + * 1) built as static libraries(.a) and linked statically, or + * built as shared libraries(.so) and linked dynamically. + * + * odp_subsystem_register_module() should complete the whole + * registration session and link the module into subsystem's + * module array. + * + * 2) built as shared libraries(.so) and loaded by a module loader + * in runtime with libdl APIs + * + * The whole registration session needs to be split to aim the + * module loader to properly handle dlopen() returns, and save + * the DSO handler into module's data structure. + * + * The module loader should program in this way: + * odp_module_loader_start(); + * ...... + * for each module + * handler = dlopen(module); + * // The module constructor runs before dlopen() returns + * // which in turn calls odp_subsystem_register_module() + * if (handler is valid) + * odp_module_install(handler); + * else + * odp_module_abandon(); + * ...... + * odp_module_loader_end(); + */ + +void odp_module_loader_start(void); +void odp_module_loader_end(void); + +int odp_module_install(void *, bool active); +int odp_module_abandon(void); + +#define __maybe_unused __attribute__((unused)) +static inline void __subsystem_set_active( + odp_subsystem_t *subsystem __maybe_unused, + odp_module_base_t *module __maybe_unused) +{ +#if defined(IM_ACTIVE_MODULE) + subsystem->active = module; +#endif +} + +int __subsystem_register_module( + odp_subsystem_t *, odp_module_base_t *); + +/* Macro to allow polymorphism on module classes */ +#define odp_subsystem_register_module(name, module) \ +({ \ + odp_module_base_t *base = &(module)->base; \ + __subsystem_register_module(&__subsystem(name), base); \ + __subsystem_set_active(&__subsystem(name), base); \ +}) + +#endif diff --git a/include/odp/api/spec/atomic.h b/include/odp/api/spec/atomic.h index 408829df..54a174ea 100644 --- a/include/odp/api/spec/atomic.h +++ b/include/odp/api/spec/atomic.h @@ -59,6 +59,12 @@ extern "C" { * Atomic 32-bit unsigned integer */ +/** + * @def ODP_ATOMIC_INIT + * Compile-time atomic initializer: + * odp_atomic_xx_t atomic = ODP_ATOMIC_INIT(v); + */ + /* * 32-bit operations in RELAXED memory ordering * -------------------------------------------- diff --git a/include/odp/api/spec/rwlock.h b/include/odp/api/spec/rwlock.h index ff8a3f27..8816b6e7 100644 --- a/include/odp/api/spec/rwlock.h +++ b/include/odp/api/spec/rwlock.h @@ -36,6 +36,11 @@ extern "C" { * ODP reader/writer lock */ +/** + * @def ODP_RWLOCK_UNLOCKED + * Compile-time RW lock initializer: + * odp_rwlock_t lock = ODP_RWLOCK_UNLOCKED; + */ /** * Initialize a reader/writer lock. diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index ba4a31ea..4a7b77b8 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -6,6 +6,7 @@ include $(top_srcdir)/platform/@with_platform@/Makefile.inc AM_CFLAGS += -I$(srcdir)/include AM_CFLAGS += -I$(top_srcdir)/include +AM_CFLAGS += -I$(top_srcdir)/frameworks/modular AM_CFLAGS += -I$(top_srcdir)/include/odp/arch/@ARCH_ABI@ AM_CFLAGS += -I$(top_builddir)/include AM_CFLAGS += -Iinclude @@ -292,6 +293,13 @@ if HAVE_PCAP __LIB__libodp_linux_la_SOURCES += pktio/pcap.c endif +# Build modular framework into odp-linux library +modularframeworkdir = $(top_srcdir)/frameworks/modular +noinst_HEADERS += $(modularframeworkdir)/list.h \ + $(modularframeworkdir)/odp_module.h + +__LIB__libodp_linux_la_SOURCES += ../../frameworks/modular/odp_module.c + __LIB__libodp_linux_la_LIBADD = $(ATOMIC_LIBS) # Create symlink for ABI header files. Application does not need to use the arch diff --git a/platform/linux-generic/include/odp/api/plat/atomic_types.h b/platform/linux-generic/include/odp/api/plat/atomic_types.h index a674ac99..86c9e5b0 100644 --- a/platform/linux-generic/include/odp/api/plat/atomic_types.h +++ b/platform/linux-generic/include/odp/api/plat/atomic_types.h @@ -81,6 +81,8 @@ typedef struct odp_atomic_u64_s odp_atomic_u64_t; typedef struct odp_atomic_u32_s odp_atomic_u32_t; +#define ODP_ATOMIC_INIT(a) { .v = a } + #ifdef __cplusplus } #endif diff --git a/platform/linux-generic/include/odp/api/plat/rwlock_types.h b/platform/linux-generic/include/odp/api/plat/rwlock_types.h index f7dc0449..2c1f3660 100644 --- a/platform/linux-generic/include/odp/api/plat/rwlock_types.h +++ b/platform/linux-generic/include/odp/api/plat/rwlock_types.h @@ -30,6 +30,8 @@ struct odp_rwlock_s { typedef struct odp_rwlock_s odp_rwlock_t; +#define ODP_RWLOCK_UNLOCKED { .cnt = ODP_ATOMIC_INIT(0) } + #ifdef __cplusplus } #endif commit 5f738a79248183a252478856de88bafa37344445 Author: Yi He <yi.he(a)linaro.org> Date: Wed Jul 19 15:05:14 2017 +0800 validation: pktio: disable socket mmsg pktio It was not working already, the problem are obscured in make check because with static pktio_if_ops array socket mmap pktio always take precedence over socket mmsg pktio. Signed-off-by: Yi He <yi.he(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> diff --git a/test/linux-generic/validation/api/pktio/pktio_env b/test/linux-generic/validation/api/pktio/pktio_env index 345b5bd5..3a6f9e89 100644 --- a/test/linux-generic/validation/api/pktio/pktio_env +++ b/test/linux-generic/validation/api/pktio/pktio_env @@ -103,6 +103,9 @@ setup_pktio_env() return 5 fi done + + # disable socket mmsg pktio since it was not working already + export ODP_PKTIO_DISABLE_SOCKET_MMSG=1 } cleanup_pktio_env() commit 3058124d5c307149272c1b37651056451939c3bf Author: Yi He <yi.he(a)linaro.org> Date: Thu Jul 13 15:48:20 2017 +0800 example: ddf_app: add .gitignore Signed-off-by: Yi He <yi.he(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> diff --git a/example/ddf_app/.gitignore b/example/ddf_app/.gitignore new file mode 100644 index 00000000..f79a1409 --- /dev/null +++ b/example/ddf_app/.gitignore @@ -0,0 +1 @@ +odp_ddf_app ----------------------------------------------------------------------- Summary of changes: example/ddf_app/.gitignore | 1 + frameworks/modular/list.h | 271 +++++++++++++++++++ frameworks/modular/odp_module.c | 179 +++++++++++++ frameworks/modular/odp_module.h | 296 +++++++++++++++++++++ include/odp/api/spec/atomic.h | 6 + include/odp/api/spec/rwlock.h | 5 + platform/linux-generic/Makefile.am | 8 + .../include/odp/api/plat/atomic_types.h | 2 + .../include/odp/api/plat/rwlock_types.h | 2 + test/linux-generic/validation/api/pktio/pktio_env | 3 + 10 files changed, 773 insertions(+) create mode 100644 example/ddf_app/.gitignore create mode 100644 frameworks/modular/list.h create mode 100644 frameworks/modular/odp_module.c create mode 100644 frameworks/modular/odp_module.h hooks/post-receive --

8 years, 6 months

[COMMIT] branch packet-diagram-fix created. v1.15.0.0-98-g4537d096

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, packet-diagram-fix has been created at 4537d096721a753086592ed5a989beab5647bcfa (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- hooks/post-receive --

8 years, 6 months

[COMMIT] branch api-next updated. v1.15.0.0-536-g8390f890

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 8390f890d4bd2babb63a24f7b15d2f4763e44050 (commit) via e02f89b3a981d5f87332cd9a3dfd6b532f92c3bc (commit) via 8eeb3366d62c34665bcef2392b22b73489d70f88 (commit) via 705062dc19a4ce5e6ae2224c21bc9e32dae64ebc (commit) from b4cd6c50f9f0c2e1fa975b768253d4f4b35fad07 (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 8390f890d4bd2babb63a24f7b15d2f4763e44050 Author: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Date: Thu Aug 3 08:44:29 2017 -0700 linux-generic: classification: rename internal defines remove ODP_ from internal #define variable names Signed-off-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> 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_classification_datamodel.h b/platform/linux-generic/include/odp_classification_datamodel.h index 3cfe8c5a..29b39f9c 100644 --- a/platform/linux-generic/include/odp_classification_datamodel.h +++ b/platform/linux-generic/include/odp_classification_datamodel.h @@ -28,27 +28,27 @@ extern "C" { #include <protocols/ip.h> /* Maximum Class Of Service Entry */ -#define ODP_COS_MAX_ENTRY 64 +#define CLS_COS_MAX_ENTRY 64 /* Maximum PMR Entry */ -#define ODP_PMR_MAX_ENTRY 256 +#define CLS_PMR_MAX_ENTRY 256 /* Maximum PMR Terms in a PMR Set */ -#define ODP_PMRTERM_MAX 8 +#define CLS_PMRTERM_MAX 8 /* Maximum PMRs attached in PKTIO Level */ -#define ODP_PMR_PER_COS_MAX 8 +#define CLS_PMR_PER_COS_MAX 8 /* L2 Priority Bits */ -#define ODP_COS_L2_QOS_BITS 3 +#define CLS_COS_L2_QOS_BITS 3 /* Max L2 QoS value */ -#define ODP_COS_MAX_L2_QOS (1 << ODP_COS_L2_QOS_BITS) +#define CLS_COS_MAX_L2_QOS (1 << CLS_COS_L2_QOS_BITS) /* L2 DSCP Bits */ -#define ODP_COS_L3_QOS_BITS 6 +#define CLS_COS_L3_QOS_BITS 6 /* Max L3 QoS Value */ -#define ODP_COS_MAX_L3_QOS (1 << ODP_COS_L3_QOS_BITS) +#define CLS_COS_MAX_L3_QOS (1 << CLS_COS_L3_QOS_BITS) /* Max PMR Term bits */ -#define ODP_PMR_TERM_BYTES_MAX 16 - -#define ODP_COS_QUEUE_MAX 32 - -#define ODP_CLS_QUEUE_GROUP_MAX (ODP_COS_MAX_ENTRY * ODP_COS_QUEUE_MAX) +#define CLS_PMR_TERM_BYTES_MAX 16 +/* Max queue per Class of service */ +#define CLS_COS_QUEUE_MAX 32 +/* Max number of implementation created queues */ +#define CLS_QUEUE_GROUP_MAX (CLS_COS_MAX_ENTRY * CLS_COS_QUEUE_MAX) typedef union { /* All proto fileds */ @@ -103,8 +103,8 @@ Class Of Service struct cos_s { odp_queue_t queue; /* Associated Queue */ odp_pool_t pool; /* Associated Buffer pool */ - union pmr_u *pmr[ODP_PMR_PER_COS_MAX]; /* Chained PMR */ - union cos_u *linked_cos[ODP_PMR_PER_COS_MAX]; /* Chained CoS with PMR*/ + union pmr_u *pmr[CLS_PMR_PER_COS_MAX]; /* Chained PMR */ + union cos_u *linked_cos[CLS_PMR_PER_COS_MAX]; /* Chained CoS with PMR*/ uint32_t valid; /* validity Flag */ odp_cls_drop_t drop_policy; /* Associated Drop Policy */ size_t headroom; /* Headroom for this CoS */ @@ -134,7 +134,7 @@ struct pmr_s { uint32_t num_pmr; /* num of PMR Term Values*/ odp_spinlock_t lock; /* pmr lock*/ cos_t *src_cos; /* source CoS where PMR is attached */ - pmr_term_value_t pmr_term_value[ODP_PMRTERM_MAX]; + pmr_term_value_t pmr_term_value[CLS_PMRTERM_MAX]; /* List of associated PMR Terms */ }; @@ -144,7 +144,7 @@ typedef union pmr_u { } pmr_t; typedef struct _cls_queue_grp_tbl_s { - odp_queue_t queue[ODP_CLS_QUEUE_GROUP_MAX]; + odp_queue_t queue[CLS_QUEUE_GROUP_MAX]; } _cls_queue_grp_tbl_s; typedef union _cls_queue_grp_tbl_t { @@ -160,7 +160,7 @@ corresponding cos_t object **/ typedef struct pmr_l2_cos { odp_spinlock_t lock; /* pmr_l2_cos lock */ - cos_t *cos[ODP_COS_MAX_L2_QOS]; /* Array of CoS objects */ + cos_t *cos[CLS_COS_MAX_L2_QOS]; /* Array of CoS objects */ } pmr_l2_cos_t; /** @@ -171,7 +171,7 @@ corresponding cos_t object **/ typedef struct pmr_l3_cos { odp_spinlock_t lock; /* pmr_l3_cos lock */ - cos_t *cos[ODP_COS_MAX_L3_QOS]; /* Array of CoS objects */ + cos_t *cos[CLS_COS_MAX_L3_QOS]; /* Array of CoS objects */ } pmr_l3_cos_t; /** @@ -194,14 +194,14 @@ typedef struct classifier { Class of Service Table **/ typedef struct odp_cos_table { - cos_t cos_entry[ODP_COS_MAX_ENTRY]; + cos_t cos_entry[CLS_COS_MAX_ENTRY]; } cos_tbl_t; /** PMR table **/ typedef struct pmr_tbl { - pmr_t pmr[ODP_PMR_MAX_ENTRY]; + pmr_t pmr[CLS_PMR_MAX_ENTRY]; } pmr_tbl_t; #ifdef __cplusplus diff --git a/platform/linux-generic/include/odp_classification_inlines.h b/platform/linux-generic/include/odp_classification_inlines.h index 2747db8c..c2e94c63 100644 --- a/platform/linux-generic/include/odp_classification_inlines.h +++ b/platform/linux-generic/include/odp_classification_inlines.h @@ -320,7 +320,7 @@ static inline int verify_pmr_custom_frame(const uint8_t *pkt_addr, uint32_t offset = term_value->offset; uint32_t val_sz = term_value->val_sz; - ODP_ASSERT(val_sz <= ODP_PMR_TERM_BYTES_MAX); + ODP_ASSERT(val_sz <= CLS_PMR_TERM_BYTES_MAX); if (packet_len(pkt_hdr) <= offset + val_sz) return 0; diff --git a/platform/linux-generic/odp_classification.c b/platform/linux-generic/odp_classification.c index 5672b234..892d2fad 100644 --- a/platform/linux-generic/odp_classification.c +++ b/platform/linux-generic/odp_classification.c @@ -74,7 +74,7 @@ int odp_classification_init_global(void) goto error_cos; memset(cos_tbl, 0, sizeof(cos_tbl_t)); - for (i = 0; i < ODP_COS_MAX_ENTRY; i++) { + for (i = 0; i < CLS_COS_MAX_ENTRY; i++) { /* init locks */ cos_t *cos = get_cos_entry_internal(_odp_cast_scalar(odp_cos_t, i)); @@ -95,7 +95,7 @@ int odp_classification_init_global(void) goto error_pmr; memset(pmr_tbl, 0, sizeof(pmr_tbl_t)); - for (i = 0; i < ODP_PMR_MAX_ENTRY; i++) { + for (i = 0; i < CLS_PMR_MAX_ENTRY; i++) { /* init locks */ pmr_t *pmr = get_pmr_entry_internal(_odp_cast_scalar(odp_pmr_t, i)); @@ -170,13 +170,13 @@ int odp_cls_capability(odp_cls_capability_t *capability) { unsigned count = 0; - for (int i = 0; i < ODP_PMR_MAX_ENTRY; i++) + for (int i = 0; i < CLS_PMR_MAX_ENTRY; i++) if (!pmr_tbl->pmr[i].s.valid) count++; - capability->max_pmr_terms = ODP_PMR_MAX_ENTRY; + capability->max_pmr_terms = CLS_PMR_MAX_ENTRY; capability->available_pmr_terms = count; - capability->max_cos = ODP_COS_MAX_ENTRY; + capability->max_cos = CLS_COS_MAX_ENTRY; capability->pmr_range_supported = false; capability->supported_terms.all_bits = 0; capability->supported_terms.bit.ip_proto = 1; @@ -212,12 +212,12 @@ odp_cos_t odp_cls_cos_create(const char *name, odp_cls_cos_param_t *param) uint32_t tbl_index; /* Packets are dropped if Queue or Pool is invalid*/ - if (param->num_queue > ODP_COS_QUEUE_MAX) + if (param->num_queue > CLS_COS_QUEUE_MAX) return ODP_COS_INVALID; drop_policy = param->drop_policy; - for (i = 0; i < ODP_COS_MAX_ENTRY; i++) { + for (i = 0; i < CLS_COS_MAX_ENTRY; i++) { cos = &cos_tbl->cos_entry[i]; LOCK(&cos->s.lock); if (0 == cos->s.valid) { @@ -229,7 +229,7 @@ odp_cos_t odp_cls_cos_create(const char *name, odp_cls_cos_param_t *param) strncpy(cos_name, name, ODP_COS_NAME_LEN - 1); cos_name[ODP_COS_NAME_LEN - 1] = 0; } - for (j = 0; j < ODP_PMR_PER_COS_MAX; j++) { + for (j = 0; j < CLS_PMR_PER_COS_MAX; j++) { cos->s.pmr[j] = NULL; cos->s.linked_cos[j] = NULL; } @@ -241,8 +241,8 @@ odp_cos_t odp_cls_cos_create(const char *name, odp_cls_cos_param_t *param) cos->s.num_queue = param->num_queue; _odp_cls_update_hash_proto(cos, param->hash_proto); - tbl_index = cos->s.index * ODP_COS_QUEUE_MAX; - for (j = 0; j < ODP_COS_QUEUE_MAX; j++) { + tbl_index = cos->s.index * CLS_COS_QUEUE_MAX; + for (j = 0; j < CLS_COS_QUEUE_MAX; j++) { queue = odp_queue_create(NULL, &cos->s. queue_param); if (queue == ODP_QUEUE_INVALID) { @@ -269,7 +269,7 @@ odp_cos_t odp_cls_cos_create(const char *name, odp_cls_cos_param_t *param) UNLOCK(&cos->s.lock); } - ODP_ERR("ODP_COS_MAX_ENTRY reached"); + ODP_ERR("CLS_COS_MAX_ENTRY reached"); return ODP_COS_INVALID; } @@ -277,7 +277,7 @@ odp_pmr_t alloc_pmr(pmr_t **pmr) { int i; - for (i = 0; i < ODP_PMR_MAX_ENTRY; i++) { + for (i = 0; i < CLS_PMR_MAX_ENTRY; i++) { LOCK(&pmr_tbl->pmr[i].s.lock); if (0 == pmr_tbl->pmr[i].s.valid) { pmr_tbl->pmr[i].s.valid = 1; @@ -289,13 +289,13 @@ odp_pmr_t alloc_pmr(pmr_t **pmr) } UNLOCK(&pmr_tbl->pmr[i].s.lock); } - ODP_ERR("ODP_PMR_MAX_ENTRY reached"); + ODP_ERR("CLS_PMR_MAX_ENTRY reached"); return ODP_PMR_INVAL; } cos_t *get_cos_entry(odp_cos_t cos_id) { - if (_odp_typeval(cos_id) >= ODP_COS_MAX_ENTRY || + if (_odp_typeval(cos_id) >= CLS_COS_MAX_ENTRY || cos_id == ODP_COS_INVALID) return NULL; if (cos_tbl->cos_entry[_odp_typeval(cos_id)].s.valid == 0) @@ -305,7 +305,7 @@ cos_t *get_cos_entry(odp_cos_t cos_id) pmr_t *get_pmr_entry(odp_pmr_t pmr_id) { - if (_odp_typeval(pmr_id) >= ODP_PMR_MAX_ENTRY || + if (_odp_typeval(pmr_id) >= CLS_PMR_MAX_ENTRY || pmr_id == ODP_PMR_INVAL) return NULL; if (pmr_tbl->pmr[_odp_typeval(pmr_id)].s.valid == 0) @@ -383,7 +383,7 @@ uint32_t odp_cls_cos_queues(odp_cos_t cos_id, odp_queue_t queue[], else num_queues = cos->s.num_queue; - tbl_index = cos->s.index * ODP_COS_QUEUE_MAX; + tbl_index = cos->s.index * CLS_COS_QUEUE_MAX; for (i = 0; i < num_queues; i++) queue[i] = queue_grp_tbl->s.queue[tbl_index + i]; @@ -504,7 +504,7 @@ int odp_cos_with_l2_priority(odp_pktio_t pktio_in, for (i = 0; i < num_qos; i++) { cos = get_cos_entry(cos_table[i]); if (cos != NULL) { - if (ODP_COS_MAX_L2_QOS > qos_table[i]) + if (CLS_COS_MAX_L2_QOS > qos_table[i]) l2_cos->cos[qos_table[i]] = cos; } } @@ -537,7 +537,7 @@ int odp_cos_with_l3_qos(odp_pktio_t pktio_in, for (i = 0; i < num_qos; i++) { cos = get_cos_entry(cos_table[i]); if (cos != NULL) { - if (ODP_COS_MAX_L3_QOS > qos_table[i]) + if (CLS_COS_MAX_L3_QOS > qos_table[i]) l3_cos->cos[qos_table[i]] = cos; } } @@ -643,12 +643,12 @@ odp_pmr_t odp_cls_pmr_create(const odp_pmr_param_t *terms, int num_terms, return ODP_PMR_INVAL; } - if (num_terms > ODP_PMRTERM_MAX) { - ODP_ERR("no of terms greater than supported ODP_PMRTERM_MAX"); + if (num_terms > CLS_PMRTERM_MAX) { + ODP_ERR("no of terms greater than supported CLS_PMRTERM_MAX"); return ODP_PMR_INVAL; } - if (ODP_PMR_PER_COS_MAX == odp_atomic_load_u32(&cos_src->s.num_rule)) + if (CLS_PMR_PER_COS_MAX == odp_atomic_load_u32(&cos_src->s.num_rule)) return ODP_PMR_INVAL; id = alloc_pmr(&pmr); @@ -659,7 +659,7 @@ odp_pmr_t odp_cls_pmr_create(const odp_pmr_param_t *terms, int num_terms, pmr->s.num_pmr = num_terms; for (i = 0; i < num_terms; i++) { val_sz = terms[i].val_sz; - if (val_sz > ODP_PMR_TERM_BYTES_MAX) { + if (val_sz > CLS_PMR_TERM_BYTES_MAX) { pmr->s.valid = 0; return ODP_PMR_INVAL; } @@ -961,9 +961,9 @@ int cls_classify_packet(pktio_entry_t *entry, const uint8_t *base, } hash = packet_rss_hash(pkt_hdr, cos->s.hash_proto, base); - /* ODP_COS_QUEUE_MAX is a power of 2 */ - hash = hash & (ODP_COS_QUEUE_MAX - 1); - tbl_index = (cos->s.index * ODP_COS_QUEUE_MAX) + hash; + /* CLS_COS_QUEUE_MAX is a power of 2 */ + hash = hash & (CLS_COS_QUEUE_MAX - 1); + tbl_index = (cos->s.index * CLS_COS_QUEUE_MAX) + hash; pkt_hdr->dst_queue = queue_fn->from_ext(queue_grp_tbl-> s.queue[tbl_index]); return 0; commit e02f89b3a981d5f87332cd9a3dfd6b532f92c3bc Author: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Date: Tue Jul 25 16:42:16 2017 +0530 linux-generic: classification implement packet hashing implementation for packet hashing on classification Signed-off-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> 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_classification_datamodel.h b/platform/linux-generic/include/odp_classification_datamodel.h index fbe10cb4..3cfe8c5a 100644 --- a/platform/linux-generic/include/odp_classification_datamodel.h +++ b/platform/linux-generic/include/odp_classification_datamodel.h @@ -46,6 +46,22 @@ extern "C" { /* Max PMR Term bits */ #define ODP_PMR_TERM_BYTES_MAX 16 +#define ODP_COS_QUEUE_MAX 32 + +#define ODP_CLS_QUEUE_GROUP_MAX (ODP_COS_MAX_ENTRY * ODP_COS_QUEUE_MAX) + +typedef union { + /* All proto fileds */ + uint32_t all; + + struct { + uint32_t ipv4:1; + uint32_t ipv6:1; + uint32_t udp:1; + uint32_t tcp:1; + }; +} odp_cls_hash_proto_t; + /** Packet Matching Rule Term Value @@ -85,7 +101,7 @@ typedef struct pmr_term_value { Class Of Service */ struct cos_s { - queue_t queue; /* Associated Queue */ + odp_queue_t queue; /* Associated Queue */ odp_pool_t pool; /* Associated Buffer pool */ union pmr_u *pmr[ODP_PMR_PER_COS_MAX]; /* Chained PMR */ union cos_u *linked_cos[ODP_PMR_PER_COS_MAX]; /* Chained CoS with PMR*/ @@ -94,7 +110,12 @@ struct cos_s { size_t headroom; /* Headroom for this CoS */ odp_spinlock_t lock; /* cos lock */ odp_atomic_u32_t num_rule; /* num of PMRs attached with this CoS */ + bool queue_group; + odp_cls_hash_proto_t hash_proto; + uint32_t num_queue; + odp_queue_param_t queue_param; char name[ODP_COS_NAME_LEN]; /* name */ + uint8_t index; }; typedef union cos_u { @@ -122,6 +143,15 @@ typedef union pmr_u { uint8_t pad[ROUNDUP_CACHE_LINE(sizeof(struct pmr_s))]; } pmr_t; +typedef struct _cls_queue_grp_tbl_s { + odp_queue_t queue[ODP_CLS_QUEUE_GROUP_MAX]; +} _cls_queue_grp_tbl_s; + +typedef union _cls_queue_grp_tbl_t { + _cls_queue_grp_tbl_s s; + uint8_t pad[ROUNDUP_CACHE_LINE(sizeof(_cls_queue_grp_tbl_s))]; +} _cls_queue_grp_tbl_t; + /** L2 QoS and CoS Map diff --git a/platform/linux-generic/include/odp_classification_internal.h b/platform/linux-generic/include/odp_classification_internal.h index 78eaac90..aca8e8c6 100644 --- a/platform/linux-generic/include/odp_classification_internal.h +++ b/platform/linux-generic/include/odp_classification_internal.h @@ -79,6 +79,9 @@ This function returns the CoS associated with L3 QoS value cos_t *match_qos_l3_cos(pmr_l3_cos_t *l3_cos, const uint8_t *pkt_addr, odp_packet_hdr_t *hdr); +void _odp_cls_update_hash_proto(cos_t *cos, + odp_pktin_hash_proto_t hash_proto); + /** @internal CoS associated with L2 QoS value @@ -138,6 +141,10 @@ Otherwise. **/ int verify_pmr(pmr_t *pmr, const uint8_t *pkt_addr, odp_packet_hdr_t *pkt_hdr); +uint32_t packet_rss_hash(odp_packet_hdr_t *pkt_hdr, + odp_cls_hash_proto_t hash_proto, + const uint8_t *base); + #ifdef __cplusplus } #endif diff --git a/platform/linux-generic/odp_classification.c b/platform/linux-generic/odp_classification.c index cc08b9f4..5672b234 100644 --- a/platform/linux-generic/odp_classification.c +++ b/platform/linux-generic/odp_classification.c @@ -17,6 +17,7 @@ #include <odp_classification_inlines.h> #include <odp_classification_internal.h> #include <odp/api/shared_memory.h> +#include <protocols/thash.h> #include <protocols/eth.h> #include <protocols/ip.h> #include <string.h> @@ -30,6 +31,17 @@ static cos_tbl_t *cos_tbl; static pmr_tbl_t *pmr_tbl; +static _cls_queue_grp_tbl_t *queue_grp_tbl; + +const rss_key default_rss = { + .u8 = { + 0x6d, 0x5a, 0x56, 0xda, 0x25, 0x5b, 0x0e, 0xc2, + 0x41, 0x67, 0x25, 0x3d, 0x43, 0xa3, 0x8f, 0xb0, + 0xd0, 0xca, 0x2b, 0xcb, 0xae, 0x7b, 0x30, 0xb4, + 0x77, 0xcb, 0x2d, 0xa3, 0x80, 0x30, 0xf2, 0x0c, + 0x6a, 0x42, 0xb7, 0x3b, 0xbe, 0xac, 0x01, 0xfa, + } +}; cos_t *get_cos_entry_internal(odp_cos_t cos_id) { @@ -45,6 +57,7 @@ int odp_classification_init_global(void) { odp_shm_t cos_shm; odp_shm_t pmr_shm; + odp_shm_t queue_grp_shm; int i; cos_shm = odp_shm_reserve("shm_odp_cos_tbl", @@ -89,8 +102,22 @@ int odp_classification_init_global(void) LOCK_INIT(&pmr->s.lock); } + queue_grp_shm = odp_shm_reserve("shm_odp_cls_queue_grp_tbl", + sizeof(_cls_queue_grp_tbl_t), + sizeof(queue_entry_t *), 0); + + if (queue_grp_shm == ODP_SHM_INVALID) { + ODP_ERR("shm allocation failed for queue_grp_tbl"); + goto error_queue_grp; + } + + queue_grp_tbl = odp_shm_addr(queue_grp_shm); + memset(queue_grp_tbl, 0, sizeof(_cls_queue_grp_tbl_t)); + return 0; +error_queue_grp: + odp_shm_free(queue_grp_shm); error_pmr: odp_shm_free(pmr_shm); error_cos: @@ -116,6 +143,12 @@ int odp_classification_term_global(void) rc = -1; } + ret = odp_shm_free(odp_shm_lookup("shm_odp_cls_queue_grp_tbl")); + if (ret < 0) { + ODP_ERR("shm free failed for shm_odp_cls_queue_grp_tbl"); + rc = -1; + } + return rc; } @@ -124,6 +157,8 @@ void odp_cls_cos_param_init(odp_cls_cos_param_t *param) param->queue = ODP_QUEUE_INVALID; param->pool = ODP_POOL_INVALID; param->drop_policy = ODP_COS_DROP_NEVER; + param->num_queue = 1; + odp_queue_param_init(&param->queue_param); } void odp_cls_pmr_param_init(odp_pmr_param_t *param) @@ -154,24 +189,39 @@ int odp_cls_capability(odp_cls_capability_t *capability) return 0; } +void _odp_cls_update_hash_proto(cos_t *cos, odp_pktin_hash_proto_t hash_proto) +{ + if (hash_proto.proto.ipv4 || hash_proto.proto.ipv4_tcp || + hash_proto.proto.ipv4_udp) + cos->s.hash_proto.ipv4 = 1; + if (hash_proto.proto.ipv6 || hash_proto.proto.ipv6_tcp || + hash_proto.proto.ipv6_udp) + cos->s.hash_proto.ipv6 = 1; + if (hash_proto.proto.ipv4_tcp || hash_proto.proto.ipv6_tcp) + cos->s.hash_proto.tcp = 1; + if (hash_proto.proto.ipv4_udp || hash_proto.proto.ipv6_udp) + cos->s.hash_proto.udp = 1; +} + odp_cos_t odp_cls_cos_create(const char *name, odp_cls_cos_param_t *param) { int i, j; - queue_t queue; + odp_queue_t queue; odp_cls_drop_t drop_policy; + cos_t *cos; + uint32_t tbl_index; /* Packets are dropped if Queue or Pool is invalid*/ - if (param->queue == ODP_QUEUE_INVALID) - queue = QUEUE_NULL; - else - queue = queue_fn->from_ext(param->queue); + if (param->num_queue > ODP_COS_QUEUE_MAX) + return ODP_COS_INVALID; drop_policy = param->drop_policy; for (i = 0; i < ODP_COS_MAX_ENTRY; i++) { - LOCK(&cos_tbl->cos_entry[i].s.lock); - if (0 == cos_tbl->cos_entry[i].s.valid) { - char *cos_name = cos_tbl->cos_entry[i].s.name; + cos = &cos_tbl->cos_entry[i]; + LOCK(&cos->s.lock); + if (0 == cos->s.valid) { + char *cos_name = cos->s.name; if (name == NULL) { cos_name[0] = 0; @@ -180,20 +230,43 @@ odp_cos_t odp_cls_cos_create(const char *name, odp_cls_cos_param_t *param) cos_name[ODP_COS_NAME_LEN - 1] = 0; } for (j = 0; j < ODP_PMR_PER_COS_MAX; j++) { - cos_tbl->cos_entry[i].s.pmr[j] = NULL; - cos_tbl->cos_entry[i].s.linked_cos[j] = NULL; + cos->s.pmr[j] = NULL; + cos->s.linked_cos[j] = NULL; } - cos_tbl->cos_entry[i].s.queue = queue; - cos_tbl->cos_entry[i].s.pool = param->pool; - cos_tbl->cos_entry[i].s.headroom = 0; - cos_tbl->cos_entry[i].s.valid = 1; - cos_tbl->cos_entry[i].s.drop_policy = drop_policy; - odp_atomic_init_u32(&cos_tbl->cos_entry[i] - .s.num_rule, 0); - UNLOCK(&cos_tbl->cos_entry[i].s.lock); + + if (param->num_queue > 1) { + odp_queue_param_init(&cos->s.queue_param); + cos->s.queue_group = true; + cos->s.queue = ODP_QUEUE_INVALID; + cos->s.num_queue = param->num_queue; + _odp_cls_update_hash_proto(cos, + param->hash_proto); + tbl_index = cos->s.index * ODP_COS_QUEUE_MAX; + for (j = 0; j < ODP_COS_QUEUE_MAX; j++) { + queue = odp_queue_create(NULL, &cos->s. + queue_param); + if (queue == ODP_QUEUE_INVALID) { + UNLOCK(&cos->s.lock); + return ODP_COS_INVALID; + } + queue_grp_tbl->s.queue[tbl_index + j] = + queue; + } + + } else { + cos->s.queue = param->queue; + } + + cos->s.pool = param->pool; + cos->s.headroom = 0; + cos->s.valid = 1; + cos->s.drop_policy = drop_policy; + odp_atomic_init_u32(&cos->s.num_rule, 0); + cos->s.index = i; + UNLOCK(&cos->s.lock); return _odp_cast_scalar(odp_cos_t, i); } - UNLOCK(&cos_tbl->cos_entry[i].s.lock); + UNLOCK(&cos->s.lock); } ODP_ERR("ODP_COS_MAX_ENTRY reached"); @@ -263,10 +336,7 @@ int odp_cos_queue_set(odp_cos_t cos_id, odp_queue_t queue_id) } /* Locking is not required as intermittent stale data during CoS modification is acceptable*/ - if (queue_id == ODP_QUEUE_INVALID) - cos->s.queue = QUEUE_NULL; - else - cos->s.queue = queue_fn->from_ext(queue_id); + cos->s.queue = queue_id; return 0; } @@ -279,10 +349,45 @@ odp_queue_t odp_cos_queue(odp_cos_t cos_id) return ODP_QUEUE_INVALID; } - if (cos->s.queue == QUEUE_NULL) - return ODP_QUEUE_INVALID; + return cos->s.queue; +} + +uint32_t odp_cls_cos_num_queue(odp_cos_t cos_id) +{ + cos_t *cos = get_cos_entry(cos_id); + + if (!cos) { + ODP_ERR("Invalid odp_cos_t handle"); + return 0; + } + + return cos->s.num_queue; +} + +uint32_t odp_cls_cos_queues(odp_cos_t cos_id, odp_queue_t queue[], + uint32_t num) +{ + uint32_t num_queues; + cos_t *cos; + uint32_t tbl_index; + uint32_t i; + + cos = get_cos_entry(cos_id); + if (!cos) { + ODP_ERR("Invalid odp_cos_t handle"); + return 0; + } + + if (num < cos->s.num_queue) + num_queues = num; + else + num_queues = cos->s.num_queue; + + tbl_index = cos->s.index * ODP_COS_QUEUE_MAX; + for (i = 0; i < num_queues; i++) + queue[i] = queue_grp_tbl->s.queue[tbl_index + i]; - return queue_fn->to_ext(cos->s.queue); + return num_queues; } int odp_cos_drop_set(odp_cos_t cos_id, odp_cls_drop_t drop_policy) @@ -830,6 +935,8 @@ int cls_classify_packet(pktio_entry_t *entry, const uint8_t *base, odp_packet_hdr_t *pkt_hdr) { cos_t *cos; + uint32_t tbl_index; + uint32_t hash; packet_parse_reset(pkt_hdr); packet_set_len(pkt_hdr, pkt_len); @@ -841,16 +948,95 @@ int cls_classify_packet(pktio_entry_t *entry, const uint8_t *base, if (cos == NULL) return -EINVAL; - if (cos->s.queue == QUEUE_NULL || cos->s.pool == ODP_POOL_INVALID) + if (cos->s.queue == ODP_QUEUE_INVALID || + cos->s.pool == ODP_POOL_INVALID) return -EFAULT; *pool = cos->s.pool; pkt_hdr->p.input_flags.dst_queue = 1; - pkt_hdr->dst_queue = cos->s.queue; + if (!cos->s.queue_group) { + pkt_hdr->dst_queue = queue_fn->from_ext(cos->s.queue); + return 0; + } + + hash = packet_rss_hash(pkt_hdr, cos->s.hash_proto, base); + /* ODP_COS_QUEUE_MAX is a power of 2 */ + hash = hash & (ODP_COS_QUEUE_MAX - 1); + tbl_index = (cos->s.index * ODP_COS_QUEUE_MAX) + hash; + pkt_hdr->dst_queue = queue_fn->from_ext(queue_grp_tbl-> + s.queue[tbl_index]); return 0; } +uint32_t packet_rss_hash(odp_packet_hdr_t *pkt_hdr, + odp_cls_hash_proto_t hash_proto, + const uint8_t *base) +{ + thash_tuple_t tuple; + const _odp_ipv4hdr_t *ipv4; + const _odp_udphdr_t *udp; + const _odp_tcphdr_t *tcp; + const _odp_ipv6hdr_t *ipv6; + uint32_t hash; + uint32_t tuple_len; + + tuple_len = 0; + hash = 0; + if (pkt_hdr->p.input_flags.ipv4) { + if (hash_proto.ipv4) { + /* add ipv4 */ + ipv4 = (const _odp_ipv4hdr_t *)base + + pkt_hdr->p.l3_offset; + tuple.v4.src_addr = ipv4->src_addr; + tuple.v4.dst_addr = ipv4->dst_addr; + tuple_len += 2; + } + + if (pkt_hdr->p.input_flags.tcp && hash_proto.tcp) { + /* add tcp */ + tcp = (const _odp_tcphdr_t *)base + + pkt_hdr->p.l4_offset; + tuple.v4.sport = tcp->src_port; + tuple.v4.dport = tcp->dst_port; + tuple_len += 1; + } else if (pkt_hdr->p.input_flags.udp && hash_proto.udp) { + /* add udp */ + udp = (const _odp_udphdr_t *)base + + pkt_hdr->p.l4_offset; + tuple.v4.sport = udp->src_port; + tuple.v4.dport = udp->dst_port; + tuple_len += 1; + } + } else if (pkt_hdr->p.input_flags.ipv6) { + if (hash_proto.ipv6) { + /* add ipv6 */ + ipv6 = (const _odp_ipv6hdr_t *)base + + pkt_hdr->p.l3_offset; + thash_load_ipv6_addr(ipv6, &tuple); + tuple_len += 8; + } + if (pkt_hdr->p.input_flags.tcp && hash_proto.tcp) { + tcp = (const _odp_tcphdr_t *)base + + pkt_hdr->p.l4_offset; + tuple.v4.sport = tcp->src_port; + tuple.v4.dport = tcp->dst_port; + tuple_len += 1; + } else if (pkt_hdr->p.input_flags.udp && hash_proto.udp) { + /* add udp */ + udp = (const _odp_udphdr_t *)base + + pkt_hdr->p.l4_offset; + tuple.v4.sport = udp->src_port; + tuple.v4.dport = udp->dst_port; + tuple_len += 1; + } + } + if (tuple_len) + hash = thash_softrss((uint32_t *)&tuple, + tuple_len, default_rss); + return hash; +} + cos_t *match_qos_l3_cos(pmr_l3_cos_t *l3_cos, const uint8_t *pkt_addr, odp_packet_hdr_t *hdr) { commit 8eeb3366d62c34665bcef2392b22b73489d70f88 Author: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Date: Tue Jul 25 16:42:14 2017 +0530 api: classification: add support for packet hashing in classification Enable packet hashing per CoS to be able to distribute incoming packets to multiple queues linked with a CoS. Signed-off-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/include/odp/api/spec/classification.h b/include/odp/api/spec/classification.h index 39831b24..0c4a95c5 100644 --- a/include/odp/api/spec/classification.h +++ b/include/odp/api/spec/classification.h @@ -4,7 +4,6 @@ * SPDX-License-Identifier: BSD-3-Clause */ - /** * @file * @@ -19,12 +18,13 @@ extern "C" { #endif +#include <odp/api/packet_io.h> +#include <odp/api/support.h> /** @defgroup odp_classification ODP CLASSIFICATION * Classification operations. * @{ */ - /** * @typedef odp_cos_t * ODP Class of service handle @@ -126,6 +126,13 @@ typedef struct odp_cls_capability_t { /** Maximum number of CoS supported */ unsigned max_cos; + /** Maximun number of queue supported per CoS + * if the value is 1, then hashing is not supported*/ + unsigned max_hash_queues; + + /** Protocol header combination supported for Hashing */ + odp_pktin_hash_proto_t hash_protocols; + /** A Boolean to denote support of PMR range */ odp_bool_t pmr_range_supported; } odp_cls_capability_t; @@ -164,9 +171,41 @@ typedef enum { * Used to communicate class of service creation options */ typedef struct odp_cls_cos_param { - odp_queue_t queue; /**< Queue associated with CoS */ - odp_pool_t pool; /**< Pool associated with CoS */ - odp_cls_drop_t drop_policy; /**< Drop policy associated with CoS */ + /** Number of queues to be linked to this CoS. + * If the number is greater than 1 then hashing is enabled. + * If number is equal to 1 then hashing is disabled. + * When hashing is enabled the queues are created by the implementation + * and application need not configure any queue to the class of service. + * When hashing is disabled application has to configure the queue to + * the class of service. + * Depening on the implementation this number might be rounded-off to + * nearest supported value (e.g power of 2) + */ + uint32_t num_queue; + + /** Variant mapping for queue hash configurataion */ + union { + /** Mapping used when num_queue = 1, hashing is disabled in + * this case and application has to configure this queue and + * packets are delivered to this queue */ + odp_queue_t queue; + + /** Mapping used when num_queue > 1, hashing is enabled in + * this case and queues are created by the implementation */ + struct { + /** Queue parameters */ + odp_queue_param_t queue_param; + + /** Protocol header fields which are included in + * packet input hash calculation */ + odp_pktin_hash_proto_t hash_proto; + }; + }; + /** Pool associated with CoS */ + odp_pool_t pool; + + /** Drop policy associated with CoS */ + odp_cls_drop_t drop_policy; } odp_cls_cos_param_t; /** @@ -209,6 +248,23 @@ int odp_cls_capability(odp_cls_capability_t *capability); odp_cos_t odp_cls_cos_create(const char *name, odp_cls_cos_param_t *param); /** + * Queue hash result + * Returns the queue within a CoS in which a particular packet will be enqueued + * based on the packet parameters and hash protocol field configured with the + * class of service. + * + * @param cos class of service + * @param packet Packet handle + * + * @retval Returns the queue handle on which this packet will be + * enqueued. + * @retval ODP_QUEUE_INVALID for error case + * + * @note The packet has to be updated with valid header pointers L2, L3 and L4. + */ +odp_queue_t odp_cls_hash_result(odp_cos_t cos, odp_packet_t packet); + +/** * Discard a class-of-service along with all its associated resources * * @param[in] cos_id class-of-service instance. @@ -245,6 +301,31 @@ int odp_cos_queue_set(odp_cos_t cos_id, odp_queue_t queue_id); odp_queue_t odp_cos_queue(odp_cos_t cos_id); /** + * Get the number of queues linked with the specific class-of-service + * + * @param cos_id class-of-service instance. + * + * @return Number of queues linked with the class-of-service. + */ +uint32_t odp_cls_cos_num_queue(odp_cos_t cos_id); + +/** + * Get the list of queue associated with the specific class-of-service + * + * @param[in] cos_id class-of-service instance. + * + * @param[out] queue Array of queue handles associated + * with the class-of-service. + * + * @param[in] num Maximum number of queue handles to output. + * + * @return Number of queues linked with CoS + * @retval 0 on failure + */ +uint32_t odp_cls_cos_queues(odp_cos_t cos_id, odp_queue_t queue[], + uint32_t num); + +/** * Assign packet drop policy for specific class-of-service * * @param[in] cos_id class-of-service instance. commit 705062dc19a4ce5e6ae2224c21bc9e32dae64ebc Author: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Date: Tue Jul 25 16:42:15 2017 +0530 linux-generic: add toeplitz hash algorithm Adds toeplitz hash algorithm implementation for RSS hashing Signed-off-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> 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/Makefile.am b/platform/linux-generic/Makefile.am index f43e14be..cfccaa98 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -206,6 +206,7 @@ noinst_HEADERS = \ ${srcdir}/include/protocols/ip.h \ ${srcdir}/include/protocols/ipsec.h \ ${srcdir}/include/protocols/tcp.h \ + ${srcdir}/include/protocols/thash.h \ ${srcdir}/include/protocols/udp.h \ ${srcdir}/Makefile.inc diff --git a/platform/linux-generic/include/protocols/thash.h b/platform/linux-generic/include/protocols/thash.h new file mode 100644 index 00000000..c938e67e --- /dev/null +++ b/platform/linux-generic/include/protocols/thash.h @@ -0,0 +1,105 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +/** + * @file + * + * ODP Toeplitz hash function + */ + +#ifndef ODPH_THASH_H_ +#define ODPH_THASH_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#include <protocols/ip.h> + +/** rss data type */ +typedef union { + uint8_t u8[40]; + uint32_t u32[10]; +} rss_key; + +/** IPv4 tuple + * + */ +typedef struct thash_ipv4_tuple { + uint32_t src_addr; + uint32_t dst_addr; + union { + struct { + uint16_t sport; + uint16_t dport; + }; + uint32_t sctp_tag; + }; +} thash_ipv4_tuple_t; + +/** IPv6 tuple */ +typedef struct thash_ipv6_tuple { + _odp_ipv6_addr_t src_addr; + _odp_ipv6_addr_t dst_addr; + union { + struct { + uint16_t sport; + uint16_t dport; + }; + uint32_t sctp_tag; + }; +} thash_ipv6_tuple_t; + +/** Thash tuple union */ +typedef union { + thash_ipv4_tuple_t v4; + thash_ipv6_tuple_t v6; +} thash_tuple_t; + +static inline +void thash_load_ipv6_addr(const _odp_ipv6hdr_t *ipv6, + thash_tuple_t *tuple) +{ + int i; + + for (i = 0; i < 4; i++) { + *(tuple->v6.src_addr.u32 + i) = + odp_be_to_cpu_32(*(ipv6->src_addr.u32 + i)); + + *(tuple->v6.dst_addr.u32 + i) = + odp_be_to_cpu_32(*(ipv6->dst_addr.u32 + i)); + } +} + +static inline +uint32_t thash_softrss(uint32_t *tuple, uint8_t len, + const rss_key key) +{ + uint32_t i, j, ret = 0; + + for (j = 0; j < len; j++) { + for (i = 0; i < 32; i++) { + if (tuple[j] & (1 << (31 - i))) { + ret ^= odp_cpu_to_be_32(((const uint32_t *) + key.u32)[j]) << i | (uint32_t)((uint64_t) + (odp_cpu_to_be_32(((const uint32_t *)key.u32) + [j + 1])) >> (32 - i)); + } + } + } + + return ret; +} + +/** + * @} + */ + +#ifdef __cplusplus +} +#endif + +#endif ----------------------------------------------------------------------- Summary of changes: include/odp/api/spec/classification.h | 91 ++++++- platform/linux-generic/Makefile.am | 1 + .../include/odp_classification_datamodel.h | 64 +++-- .../include/odp_classification_inlines.h | 2 +- .../include/odp_classification_internal.h | 7 + platform/linux-generic/include/protocols/thash.h | 105 ++++++++ platform/linux-generic/odp_classification.c | 278 +++++++++++++++++---- 7 files changed, 479 insertions(+), 69 deletions(-) create mode 100644 platform/linux-generic/include/protocols/thash.h hooks/post-receive --

8 years, 6 months

[COMMIT] branch api-next updated. v1.15.0.0-532-gb4cd6c50

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 b4cd6c50f9f0c2e1fa975b768253d4f4b35fad07 (commit) from e65248393a0d7263a26e4e8e4f64ac12c7142c54 (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 b4cd6c50f9f0c2e1fa975b768253d4f4b35fad07 Author: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Date: Wed Aug 2 08:40:38 2017 -0700 api: packetio: deprecate redundant loop_supported field in capability removes redundant loop_supported boolean in odp_pktio_capability_t Fixes https://bugs.linaro.org/show_bug.cgi?id=2861 Signed-off-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> diff --git a/include/odp/api/spec/packet_io.h b/include/odp/api/spec/packet_io.h index 88020892..d42cebf0 100644 --- a/include/odp/api/spec/packet_io.h +++ b/include/odp/api/spec/packet_io.h @@ -19,6 +19,7 @@ extern "C" { #endif +#include <odp/api/deprecated.h> #include <odp/api/packet_io_stats.h> #include <odp/api/queue.h> #include <odp/api/time.h> @@ -477,11 +478,8 @@ typedef struct odp_pktio_capability_t { * set to zero. */ odp_pktio_set_op_t set_op; - /** Support of Loopback mode - * - * A boolean to denote whether loop back mode is supported on this - * specific interface. */ - odp_bool_t loop_supported; + /** @deprecated Use enable_loop inside odp_pktin_config_t */ + odp_bool_t ODP_DEPRECATE(loop_supported); } odp_pktio_capability_t; /** diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c index 64c6e452..94075567 100644 --- a/platform/linux-generic/odp_packet_io.c +++ b/platform/linux-generic/odp_packet_io.c @@ -416,7 +416,7 @@ int odp_pktio_config(odp_pktio_t hdl, const odp_pktio_config_t *config) return -1; } - if (config->enable_loop && !capa.loop_supported) { + if (config->enable_loop && !capa.config.enable_loop) { ODP_ERR("Loopback mode not supported\n"); return -1; } ----------------------------------------------------------------------- Summary of changes: include/odp/api/spec/packet_io.h | 8 +++----- platform/linux-generic/odp_packet_io.c | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) hooks/post-receive --

8 years, 6 months

[COMMIT] branch api-next updated. v1.15.0.0-531-ge6524839

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 e65248393a0d7263a26e4e8e4f64ac12c7142c54 (commit) via 4537d096721a753086592ed5a989beab5647bcfa (commit) via 93cbd8caf4ab5ccf22c092d42df4028969ed8a7b (commit) via 2050915d34995f4be695a88dd99e9275f346733b (commit) via ded0918391865956e3b00df3c43e4311a7285d4b (commit) via a2040db93b114fb9e1da9aeca1d0a1ea91699448 (commit) from 999042e51837a7ed8c7fb616f75707349515fc3d (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 e65248393a0d7263a26e4e8e4f64ac12c7142c54 Merge: 999042e5 4537d096 Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Wed Aug 2 22:22:09 2017 +0300 Merge branch 'master' into api-next Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> ----------------------------------------------------------------------- Summary of changes: .travis.yml | 82 ++++++++++++++++++++----------------- platform/linux-generic/odp_crypto.c | 4 ++ 2 files changed, 49 insertions(+), 37 deletions(-) hooks/post-receive --

8 years, 6 months

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

git-lng-odp