git-lng-odp

git-lng-odp@lists.linaro.org

1 participants
1239 discussions

Start a nNew thread

[COMMIT] branch api-next updated. v1.15.0.0-695-gbfbe4f50

by git＠git-us.linaro.org

8 years, 11 months

[COMMIT] branch cloud-dev updated. v1.15.0.0-605-gc6a52012

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 c6a520126eff39b7ebce8e790fb960259ce8f812 (commit) via d27a5b7e08a5cdce84bad9607ce94a5fcbe00ee2 (commit) via ad728d38a886b876c2ab300e9a64d711b2638b0a (commit) via 6448dbc4114c655f1de056ea18003956f3b91b76 (commit) from a1f50ad720e11a54b13c4786cad4687cb5c4ec2a (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 c6a520126eff39b7ebce8e790fb960259ce8f812 Author: Balakrishna Garapati <balakrishna.garapati(a)linaro.org> Date: Fri Sep 8 14:05:07 2017 +0200 linux-dpdk:introduce buffer submodule Signed-off-by: Balakrishna Garapati <balakrishna.garapati(a)linaro.org> Reviewed-by: Honnappa Nagarahalli <honnappa.nagarahalli(a)arm.com> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Yi He <yi.he(a)linaro.org> diff --git a/platform/linux-dpdk/Makefile.am b/platform/linux-dpdk/Makefile.am index 168e0f92..93086570 100644 --- a/platform/linux-dpdk/Makefile.am +++ b/platform/linux-dpdk/Makefile.am @@ -168,6 +168,7 @@ odpdrvplatinclude_HEADERS = \ noinst_HEADERS = \ + ${top_srcdir}/platform/linux-generic/include/odp_buffer_subsystem.h \ ${top_srcdir}/platform/linux-generic/include/_fdserver_internal.h \ ${top_srcdir}/platform/linux-generic/include/_ishm_internal.h \ ${top_srcdir}/platform/linux-generic/include/_ishmphy_internal.h \ @@ -255,6 +256,7 @@ __LIB__libodp_dpdk_la_SOURCES = \ ../linux-generic/odp_rwlock.c \ ../linux-generic/odp_rwlock_recursive.c \ ../linux-generic/pool/subsystem.c \ + ../linux-generic/buffer/subsystem.c \ ../linux-generic/odp_schedule_if.c \ ../linux-generic/schedule/generic.c \ ../linux-generic/schedule/iquery.c \ @@ -303,6 +305,7 @@ __LIB__libodp_dpdk_la_SOURCES += arch/x86/cpu_flags.c \ endif pool/dpdk.lo: AM_CFLAGS += -DIM_ACTIVE_MODULE +buffer/dpdk.lo: AM_CFLAGS += -DIM_ACTIVE_MODULE if ODP_SCHEDULE_SCALABLE ../linux-generic/schedule/scalable.lo: AM_CFLAGS += -DIM_ACTIVE_MODULE else diff --git a/platform/linux-dpdk/buffer/dpdk.c b/platform/linux-dpdk/buffer/dpdk.c index 3c71fef8..346549ec 100644 --- a/platform/linux-dpdk/buffer/dpdk.c +++ b/platform/linux-dpdk/buffer/dpdk.c @@ -7,30 +7,96 @@ #include <odp/api/buffer.h> #include <odp_buffer_internal.h> #include <odp_buffer_inlines.h> +#include <odp_buffer_subsystem.h> #include <odp_debug_internal.h> +#include <odp_pool_internal.h> #include <string.h> #include <stdio.h> #include <inttypes.h> -odp_buffer_t odp_buffer_from_event(odp_event_t ev) +static odp_buffer_t buffer_alloc(odp_pool_t pool_hdl) +{ + odp_buffer_t buffer; + pool_entry_dp_t *pool_dp; + + ODP_ASSERT(odp_pool_to_entry_cp(pool_hdl)->params.type == + ODP_POOL_BUFFER || + odp_pool_to_entry_cp(pool_hdl)->params.type == + ODP_POOL_TIMEOUT); + + pool_dp = odp_pool_to_entry_dp(pool_hdl); + + buffer = (odp_buffer_t)rte_ctrlmbuf_alloc(pool_dp->rte_mempool); + + if ((struct rte_mbuf *)buffer == NULL) { + rte_errno = ENOMEM; + return ODP_BUFFER_INVALID; + } + + buf_hdl_to_hdr(buffer)->next = NULL; + return buffer; +} + +static odp_buffer_t dpdk_buffer_alloc(odp_pool_t pool_hdl) +{ + ODP_ASSERT(ODP_POOL_INVALID != pool_hdl); + + return buffer_alloc(pool_hdl); +} + +static int dpdk_buffer_alloc_multi(odp_pool_t pool_hdl, + odp_buffer_t buf[], + int num) +{ + int i; + + ODP_ASSERT(ODP_POOL_INVALID != pool_hdl); + + for (i = 0; i < num; i++) { + buf[i] = buffer_alloc(pool_hdl); + if (buf[i] == ODP_BUFFER_INVALID) + return rte_errno == ENOMEM ? i : -EINVAL; + } + return i; +} + +static void dpdk_buffer_free(odp_buffer_t buf) +{ + struct rte_mbuf *mbuf = (struct rte_mbuf *)buf; + + rte_ctrlmbuf_free(mbuf); +} + +static void dpdk_buffer_free_multi(const odp_buffer_t buf[], int num) +{ + int i; + + for (i = 0; i < num; i++) { + struct rte_mbuf *mbuf = (struct rte_mbuf *)buf[i]; + + rte_ctrlmbuf_free(mbuf); + } +} + +static odp_buffer_t dpdk_buffer_from_event(odp_event_t ev) { return (odp_buffer_t)ev; } -odp_event_t odp_buffer_to_event(odp_buffer_t buf) +static odp_event_t dpdk_buffer_to_event(odp_buffer_t buf) { return (odp_event_t)buf; } -void *odp_buffer_addr(odp_buffer_t buf) +static void *dpdk_buffer_addr(odp_buffer_t buf) { odp_buffer_hdr_t *hdr = buf_hdl_to_hdr(buf); return hdr->mb.buf_addr; } -uint32_t odp_buffer_size(odp_buffer_t buf) +static uint32_t dpdk_buffer_size(odp_buffer_t buf) { odp_buffer_hdr_t *hdr = buf_hdl_to_hdr(buf); struct rte_mbuf *mbuf = (struct rte_mbuf *)hdr; @@ -52,7 +118,7 @@ void _odp_buffer_type_set(odp_buffer_t buf, int type) hdr->type = type; } -int odp_buffer_is_valid(odp_buffer_t buf) +static int dpdk_buffer_is_valid(odp_buffer_t buf) { /* We could call rte_mbuf_sanity_check, but that panics * and aborts the program */ @@ -71,43 +137,71 @@ int odp_buffer_snprint(char *str, uint32_t n, odp_buffer_t buf) hdr = buf_hdl_to_hdr(buf); - len += snprintf(&str[len], n-len, + len += snprintf(&str[len], n - len, "Buffer\n"); - len += snprintf(&str[len], n-len, + len += snprintf(&str[len], n - len, " pool %p\n", hdr->mb.pool); - len += snprintf(&str[len], n-len, - " phy_addr %"PRIu64"\n", hdr->mb.buf_physaddr); - len += snprintf(&str[len], n-len, + len += snprintf(&str[len], n - len, + " phy_addr %" PRIu64 "\n", hdr->mb.buf_physaddr); + len += snprintf(&str[len], n - len, " addr %p\n", hdr->mb.buf_addr); - len += snprintf(&str[len], n-len, + len += snprintf(&str[len], n - len, " size %u\n", hdr->mb.buf_len); - len += snprintf(&str[len], n-len, + len += snprintf(&str[len], n - len, " ref_count %i\n", rte_mbuf_refcnt_read(&hdr->mb)); - len += snprintf(&str[len], n-len, + len += snprintf(&str[len], n - len, " odp type %i\n", hdr->type); return len; } -void odp_buffer_print(odp_buffer_t buf) +static void dpdk_buffer_print(odp_buffer_t buf) { int max_len = 512; char str[max_len]; int len; - len = odp_buffer_snprint(str, max_len-1, buf); + len = odp_buffer_snprint(str, max_len - 1, buf); str[len] = 0; ODP_PRINT("\n%s\n", str); } -uint64_t odp_buffer_to_u64(odp_buffer_t hdl) +static uint64_t dpdk_buffer_to_u64(odp_buffer_t hdl) { return _odp_pri(hdl); } -odp_pool_t odp_buffer_pool(odp_buffer_t buf) +static odp_pool_t dpdk_buffer_pool(odp_buffer_t buf) { return buf_hdl_to_hdr(buf)->pool_hdl; } + +odp_buffer_module_t dpdk_buffer = { + .base = { + .name = "dpdk_buffer", + .init_local = NULL, + .term_local = NULL, + .init_global = NULL, + .term_global = NULL, + }, + .buffer_alloc = dpdk_buffer_alloc, + .buffer_alloc_multi = dpdk_buffer_alloc_multi, + .buffer_free = dpdk_buffer_free, + .buffer_free_multi = dpdk_buffer_free_multi, + .buffer_from_event = dpdk_buffer_from_event, + .buffer_to_event = dpdk_buffer_to_event, + .buffer_addr = dpdk_buffer_addr, + .buffer_size = dpdk_buffer_size, + .buffer_is_valid = dpdk_buffer_is_valid, + .buffer_print = dpdk_buffer_print, + .buffer_to_u64 = dpdk_buffer_to_u64, + .buffer_pool = dpdk_buffer_pool, +}; + +ODP_MODULE_CONSTRUCTOR(dpdk_buffer) +{ + odp_module_constructor(&dpdk_buffer); + odp_subsystem_register_module(buffer, &dpdk_buffer); +} diff --git a/platform/linux-dpdk/odp_packet.c b/platform/linux-dpdk/odp_packet.c index 23aec95e..b2860a77 100644 --- a/platform/linux-dpdk/odp_packet.c +++ b/platform/linux-dpdk/odp_packet.c @@ -90,7 +90,7 @@ static odp_packet_t packet_alloc(odp_pool_t pool_hdl, uint32_t len) struct rte_mbuf *mbuf; ODP_ASSERT(odp_pool_to_entry_cp(pool_hdl)->params.type - != ODP_POOL_PACKET); + == ODP_POOL_PACKET); pool_dp = odp_pool_to_entry_dp(pool_hdl); diff --git a/platform/linux-dpdk/pool/dpdk.c b/platform/linux-dpdk/pool/dpdk.c index 499bea12..6acc4e90 100644 --- a/platform/linux-dpdk/pool/dpdk.c +++ b/platform/linux-dpdk/pool/dpdk.c @@ -549,68 +549,6 @@ static odp_pool_t dpdk_pool_lookup(const char *name) return pool_hdl; } -static odp_buffer_t buffer_alloc(odp_pool_t pool_hdl) -{ - odp_buffer_t buffer; - pool_entry_cp_t *pool_cp; - pool_entry_dp_t *pool_dp; - - pool_cp = odp_pool_to_entry_cp(pool_hdl); - pool_dp = odp_pool_to_entry_dp(pool_hdl); - - ODP_ASSERT(pool_cp->params.type != ODP_POOL_BUFFER && - pool_cp->params.type != ODP_POOL_TIMEOUT); - - buffer = (odp_buffer_t)rte_ctrlmbuf_alloc(pool_dp->rte_mempool); - - if ((struct rte_mbuf *)buffer == NULL) { - rte_errno = ENOMEM; - return ODP_BUFFER_INVALID; - } - - buf_hdl_to_hdr(buffer)->next = NULL; - return buffer; -} - -odp_buffer_t odp_buffer_alloc(odp_pool_t pool_hdl) -{ - ODP_ASSERT(ODP_POOL_INVALID != pool_hdl); - - return buffer_alloc(pool_hdl); -} - -int odp_buffer_alloc_multi(odp_pool_t pool_hdl, odp_buffer_t buf[], int num) -{ - int i; - - ODP_ASSERT(ODP_POOL_INVALID != pool_hdl); - - for (i = 0; i < num; i++) { - buf[i] = buffer_alloc(pool_hdl); - if (buf[i] == ODP_BUFFER_INVALID) - return rte_errno == ENOMEM ? i : -EINVAL; - } - return i; -} - -void odp_buffer_free(odp_buffer_t buf) -{ - struct rte_mbuf *mbuf = (struct rte_mbuf *)buf; - - rte_ctrlmbuf_free(mbuf); -} - -void odp_buffer_free_multi(const odp_buffer_t buf[], int num) -{ - int i; - - for (i = 0; i < num; i++) { - struct rte_mbuf *mbuf = (struct rte_mbuf *)buf[i]; - - rte_ctrlmbuf_free(mbuf); - } -} - static void dpdk_pool_print(odp_pool_t pool_hdl) { pool_entry_dp_t *pool_dp = odp_pool_to_entry_dp(pool_hdl); commit d27a5b7e08a5cdce84bad9607ce94a5fcbe00ee2 Author: Balakrishna Garapati <balakrishna.garapati(a)linaro.org> Date: Fri Sep 8 13:59:08 2017 +0200 linux-dpdk:prepare for buffer submodule Signed-off-by: Balakrishna Garapati <balakrishna.garapati(a)linaro.org> Reviewed-by: Honnappa Nagarahalli <honnappa.nagarahalli(a)arm.com> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Yi He <yi.he(a)linaro.org> diff --git a/platform/linux-dpdk/Makefile.am b/platform/linux-dpdk/Makefile.am index f8fa67a6..168e0f92 100644 --- a/platform/linux-dpdk/Makefile.am +++ b/platform/linux-dpdk/Makefile.am @@ -227,7 +227,7 @@ __LIB__libodp_dpdk_la_SOURCES = \ ../linux-generic/odp_atomic.c \ ../linux-generic/odp_barrier.c \ ../linux-generic/odp_bitmap.c \ - odp_buffer.c \ + buffer/dpdk.c \ ../linux-generic/odp_byteorder.c \ ../linux-generic/odp_classification.c \ ../linux-generic/odp_cpu.c \ diff --git a/platform/linux-dpdk/odp_buffer.c b/platform/linux-dpdk/buffer/dpdk.c similarity index 100% rename from platform/linux-dpdk/odp_buffer.c rename to platform/linux-dpdk/buffer/dpdk.c commit ad728d38a886b876c2ab300e9a64d711b2638b0a Author: Joyce Kong <joyce.kong(a)arm.com> Date: Tue Sep 5 14:39:24 2017 +0800 linux-gen: queue: add queue module to subsystem Signed-off-by: Joyce Kong <joyce.kong(a)arm.com> Reviewed-by: Yi He <yi.he(a)linaro.org> Reviewed-by: Kevin Wang <kevin.wang(a)arm.com> Reviewed-by: Honnappa Nagarahalli <honnappa.nagarahalli(a)arm.com> Reviewed-by: Brian Brooks <brian.brooks(a)arm.com> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> diff --git a/platform/linux-dpdk/Makefile.am b/platform/linux-dpdk/Makefile.am index 587d4836..f8fa67a6 100644 --- a/platform/linux-dpdk/Makefile.am +++ b/platform/linux-dpdk/Makefile.am @@ -201,6 +201,7 @@ noinst_HEADERS = \ ${srcdir}/include/odp_posix_extensions.h \ ${top_srcdir}/platform/linux-generic/include/odp_queue_internal.h \ ${top_srcdir}/platform/linux-generic/include/odp_queue_if.h \ + ${top_srcdir}/platform/linux-generic/include/odp_queue_subsystem.h \ ${top_srcdir}/platform/linux-generic/include/odp_ring_internal.h \ ${top_srcdir}/platform/linux-generic/include/odp_schedule_if.h \ ${top_srcdir}/platform/linux-generic/include/odp_schedule_subsystem.h \ @@ -247,8 +248,10 @@ __LIB__libodp_dpdk_la_SOURCES = \ ../linux-generic/pktio/loop.c \ ../linux-generic/odp_pkt_queue.c \ pool/dpdk.c \ - ../linux-generic/odp_queue.c \ ../linux-generic/odp_queue_if.c \ + ../linux-generic/queue/subsystem.c \ + ../linux-generic/queue/generic.c \ + ../linux-generic/queue/scalable.c \ ../linux-generic/odp_rwlock.c \ ../linux-generic/odp_rwlock_recursive.c \ ../linux-generic/pool/subsystem.c \ @@ -313,6 +316,11 @@ else endif endif endif +if ODP_SCHEDULE_SCALABLE +../linux-generic/queue/scalable.lo: AM_CFLAGS += -DIM_ACTIVE_MODULE +else +../linux-generic/queue/generic.lo: AM_CFLAGS += -DIM_ACTIVE_MODULE +endif # Build modular framework into odp-linux library modularframeworkdir = $(top_srcdir)/frameworks/modular diff --git a/platform/linux-dpdk/include/odp_buffer_inlines.h b/platform/linux-dpdk/include/odp_buffer_inlines.h index a2fa502f..05c8d931 100644 --- a/platform/linux-dpdk/include/odp_buffer_inlines.h +++ b/platform/linux-dpdk/include/odp_buffer_inlines.h @@ -29,6 +29,11 @@ static inline odp_buffer_hdr_t *buf_hdl_to_hdr(odp_buffer_t buf) return (odp_buffer_hdr_t *)(void *)buf; } +static inline odp_buffer_t buf_from_buf_hdr(odp_buffer_hdr_t *hdr) +{ + return (odp_buffer_t)hdr; +} + static inline odp_event_type_t _odp_buffer_event_type(odp_buffer_t buf) { return buf_hdl_to_hdr(buf)->event_type; diff --git a/platform/linux-dpdk/include/odp_config_internal.h b/platform/linux-dpdk/include/odp_config_internal.h index ea469ee4..6aadc93f 100644 --- a/platform/linux-dpdk/include/odp_config_internal.h +++ b/platform/linux-dpdk/include/odp_config_internal.h @@ -22,6 +22,13 @@ extern "C" { #define ODP_CONFIG_QUEUES 1024 /* + * Maximum queue depth. Maximum number of elements that can be stored in a + * queue. This value is used only when the size is not explicitly provided + * during queue creation. + */ +#define CONFIG_QUEUE_SIZE 4096 + +/* * Maximum number of ordered locks per queue */ #define CONFIG_QUEUE_MAX_ORD_LOCKS 4 diff --git a/platform/linux-dpdk/odp_init.c b/platform/linux-dpdk/odp_init.c index cd7abce6..737b5331 100644 --- a/platform/linux-dpdk/odp_init.c +++ b/platform/linux-dpdk/odp_init.c @@ -352,7 +352,7 @@ int odp_init_global(odp_instance_t *instance, } stage = POOL_INIT; - if (queue_fn->init_global()) { + if (odp_queue_init_global()) { ODP_ERR("ODP queue init failed.\n"); goto init_failed; } @@ -495,7 +495,7 @@ int _odp_term_global(enum init_stage stage) /* Fall through */ case QUEUE_INIT: - if (queue_fn->term_global()) { + if (odp_queue_term_global()) { ODP_ERR("ODP queue term failed.\n"); rc = -1; } diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index b542966f..c13d73b5 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -277,10 +277,10 @@ __LIB__libodp_linux_la_SOURCES = \ pool/generic.c \ pool/subsystem.c \ odp_pkt_queue.c \ - odp_queue.c \ odp_queue_if.c \ queue/subsystem.c \ - odp_queue_scalable.c \ + queue/generic.c \ + queue/scalable.c \ odp_rwlock.c \ odp_rwlock_recursive.c \ odp_schedule_if.c \ @@ -347,6 +347,11 @@ endif if ODP_SCHEDULE_IQUERY schedule/iquery.lo: AM_CFLAGS += -DIM_ACTIVE_MODULE endif +if ODP_SCHEDULE_SCALABLE +queue/scalable.lo: AM_CFLAGS += -DIM_ACTIVE_MODULE +else +queue/generic.lo: AM_CFLAGS += -DIM_ACTIVE_MODULE +endif # Build modular framework into odp-linux library modularframeworkdir = $(top_srcdir)/frameworks/modular diff --git a/platform/linux-generic/include/odp_internal.h b/platform/linux-generic/include/odp_internal.h index 2c935a9f..1fb38648 100644 --- a/platform/linux-generic/include/odp_internal.h +++ b/platform/linux-generic/include/odp_internal.h @@ -109,6 +109,8 @@ int odp_classification_term_global(void); int odp_queue_init_global(void); int odp_queue_term_global(void); +int odp_queue_init_local(void); +int odp_queue_term_local(void); int odp_crypto_init_global(void); int odp_crypto_term_global(void); diff --git a/platform/linux-generic/include/odp_queue_if.h b/platform/linux-generic/include/odp_queue_if.h index 410c6b79..863aa3ce 100644 --- a/platform/linux-generic/include/odp_queue_if.h +++ b/platform/linux-generic/include/odp_queue_if.h @@ -18,77 +18,33 @@ extern "C" { #define QUEUE_MULTI_MAX CONFIG_BURST_SIZE -/* Queue API functions */ -typedef struct { - odp_queue_t (*queue_create)(const char *name, - const odp_queue_param_t *param); - int (*queue_destroy)(odp_queue_t queue); - odp_queue_t (*queue_lookup)(const char *name); - int (*queue_capability)(odp_queue_capability_t *capa); - int (*queue_context_set)(odp_queue_t queue, void *context, - uint32_t len); - void *(*queue_context)(odp_queue_t queue); - int (*queue_enq)(odp_queue_t queue, odp_event_t ev); - int (*queue_enq_multi)(odp_queue_t queue, const odp_event_t events[], - int num); - odp_event_t (*queue_deq)(odp_queue_t queue); - int (*queue_deq_multi)(odp_queue_t queue, odp_event_t events[], - int num); - odp_queue_type_t (*queue_type)(odp_queue_t queue); - odp_schedule_sync_t (*queue_sched_type)(odp_queue_t queue); - odp_schedule_prio_t (*queue_sched_prio)(odp_queue_t queue); - odp_schedule_group_t (*queue_sched_group)(odp_queue_t queue); - int (*queue_lock_count)(odp_queue_t queue); - uint64_t (*queue_to_u64)(odp_queue_t hdl); - void (*queue_param_init)(odp_queue_param_t *param); - int (*queue_info)(odp_queue_t queue, odp_queue_info_t *info); -} queue_api_t; - /* Internal abstract queue handle */ typedef struct { char dummy; } _queue_t; typedef _queue_t *queue_t; #define QUEUE_NULL ((queue_t)NULL) -typedef int (*queue_init_global_fn_t)(void); -typedef int (*queue_term_global_fn_t)(void); -typedef int (*queue_init_local_fn_t)(void); -typedef int (*queue_term_local_fn_t)(void); -typedef queue_t (*queue_from_ext_fn_t)(odp_queue_t handle); -typedef odp_queue_t (*queue_to_ext_fn_t)(queue_t q_int); typedef int (*queue_enq_fn_t)(queue_t q_int, odp_buffer_hdr_t *); typedef int (*queue_enq_multi_fn_t)(queue_t q_int, odp_buffer_hdr_t **, int); typedef odp_buffer_hdr_t *(*queue_deq_fn_t)(queue_t q_int); typedef int (*queue_deq_multi_fn_t)(queue_t q_int, odp_buffer_hdr_t **, int); -typedef odp_pktout_queue_t (*queue_get_pktout_fn_t)(queue_t q_int); -typedef void (*queue_set_pktout_fn_t)(queue_t q_int, odp_pktio_t pktio, - int index); -typedef odp_pktin_queue_t (*queue_get_pktin_fn_t)(queue_t q_int); -typedef void (*queue_set_pktin_fn_t)(queue_t q_int, odp_pktio_t pktio, - int index); -typedef void (*queue_set_enq_deq_fn_t)(queue_t q_int, - queue_enq_fn_t enq, - queue_enq_multi_fn_t enq_multi, - queue_deq_fn_t deq, - queue_deq_multi_fn_t deq_multi); /* Queue functions towards other internal components */ typedef struct { - queue_init_global_fn_t init_global; - queue_term_global_fn_t term_global; - queue_init_local_fn_t init_local; - queue_term_local_fn_t term_local; - queue_from_ext_fn_t from_ext; - queue_to_ext_fn_t to_ext; + queue_t (*from_ext)(odp_queue_t handle); + odp_queue_t (*to_ext)(queue_t q_int); queue_enq_fn_t enq; queue_enq_multi_fn_t enq_multi; queue_deq_fn_t deq; queue_deq_multi_fn_t deq_multi; - queue_get_pktout_fn_t get_pktout; - queue_set_pktout_fn_t set_pktout; - queue_get_pktin_fn_t get_pktin; - queue_set_pktin_fn_t set_pktin; - queue_set_enq_deq_fn_t set_enq_deq_fn; + odp_pktout_queue_t (*get_pktout)(queue_t q_int); + void (*set_pktout)(queue_t q_int, odp_pktio_t pktio, int index); + odp_pktin_queue_t (*get_pktin)(queue_t q_int); + void (*set_pktin)(queue_t q_int, odp_pktio_t pktio, int index); + void (*set_enq_deq_fn)(queue_t q_int, queue_enq_fn_t enq, + queue_enq_multi_fn_t enq_multi, + queue_deq_fn_t deq, + queue_deq_multi_fn_t deq_multi); } queue_fn_t; extern const queue_fn_t *queue_fn; diff --git a/platform/linux-generic/include/odp_queue_subsystem.h b/platform/linux-generic/include/odp_queue_subsystem.h index c63309fa..2c62af37 100644 --- a/platform/linux-generic/include/odp_queue_subsystem.h +++ b/platform/linux-generic/include/odp_queue_subsystem.h @@ -5,6 +5,7 @@ * * SPDX-License-Identifier: BSD-3-Clause */ + #ifndef ODP_QUEUE_SUBSYSTEM_H #define ODP_QUEUE_SUBSYSTEM_H diff --git a/platform/linux-generic/odp_init.c b/platform/linux-generic/odp_init.c index 340171a5..d5a85d76 100644 --- a/platform/linux-generic/odp_init.c +++ b/platform/linux-generic/odp_init.c @@ -172,7 +172,7 @@ int odp_init_global(odp_instance_t *instance, } stage = POOL_INIT; - if (queue_fn->init_global()) { + if (odp_queue_init_global()) { ODP_ERR("ODP queue init failed.\n"); goto init_failed; } @@ -313,7 +313,7 @@ int _odp_term_global(enum init_stage stage) /* Fall through */ case QUEUE_INIT: - if (queue_fn->term_global()) { + if (odp_queue_term_global()) { ODP_ERR("ODP queue term failed.\n"); rc = -1; } @@ -408,7 +408,7 @@ int odp_init_local(odp_instance_t instance, odp_thread_type_t thr_type) } stage = POOL_INIT; - if (queue_fn->init_local()) { + if (odp_queue_init_local()) { ODP_ERR("ODP queue local init failed.\n"); goto init_fail; } @@ -454,7 +454,7 @@ int _odp_term_local(enum init_stage stage) /* Fall through */ case QUEUE_INIT: - if (queue_fn->term_local()) { + if (odp_queue_term_local()) { ODP_ERR("ODP queue local term failed.\n"); rc = -1; } diff --git a/platform/linux-generic/odp_queue_if.c b/platform/linux-generic/odp_queue_if.c index d7471dfc..f77405a9 100644 --- a/platform/linux-generic/odp_queue_if.c +++ b/platform/linux-generic/odp_queue_if.c @@ -1,111 +1,15 @@ /* Copyright (c) 2017, ARM Limited * All rights reserved. * - * SPDX-License-Identifier: BSD-3-Clause + * SPDX-License-Identifier: BSD-3-Clause */ - #include <odp_queue_if.h> -extern const queue_api_t queue_scalable_api; extern const queue_fn_t queue_scalable_fn; - -extern const queue_api_t queue_default_api; extern const queue_fn_t queue_default_fn; #ifdef ODP_SCHEDULE_SCALABLE -const queue_api_t *queue_api = &queue_scalable_api; const queue_fn_t *queue_fn = &queue_scalable_fn; #else -const queue_api_t *queue_api = &queue_default_api; const queue_fn_t *queue_fn = &queue_default_fn; #endif - -odp_queue_t odp_queue_create(const char *name, const odp_queue_param_t *param) -{ - return queue_api->queue_create(name, param); -} - -int odp_queue_destroy(odp_queue_t queue) -{ - return queue_api->queue_destroy(queue); -} - -odp_queue_t odp_queue_lookup(const char *name) -{ - return queue_api->queue_lookup(name); -} - -int odp_queue_capability(odp_queue_capability_t *capa) -{ - return queue_api->queue_capability(capa); -} - -int odp_queue_context_set(odp_queue_t queue, void *context, uint32_t len) -{ - return queue_api->queue_context_set(queue, context, len); -} - -void *odp_queue_context(odp_queue_t queue) -{ - return queue_api->queue_context(queue); -} - -int odp_queue_enq(odp_queue_t queue, odp_event_t ev) -{ - return queue_api->queue_enq(queue, ev); -} - -int odp_queue_enq_multi(odp_queue_t queue, const odp_event_t events[], int num) -{ - return queue_api->queue_enq_multi(queue, events, num); -} - -odp_event_t odp_queue_deq(odp_queue_t queue) -{ - return queue_api->queue_deq(queue); -} - -int odp_queue_deq_multi(odp_queue_t queue, odp_event_t events[], int num) -{ - return queue_api->queue_deq_multi(queue, events, num); -} - -odp_queue_type_t odp_queue_type(odp_queue_t queue) -{ - return queue_api->queue_type(queue); -} - -odp_schedule_sync_t odp_queue_sched_type(odp_queue_t queue) -{ - return queue_api->queue_sched_type(queue); -} - -odp_schedule_prio_t odp_queue_sched_prio(odp_queue_t queue) -{ - return queue_api->queue_sched_prio(queue); -} - -odp_schedule_group_t odp_queue_sched_group(odp_queue_t queue) -{ - return queue_api->queue_sched_group(queue); -} - -int odp_queue_lock_count(odp_queue_t queue) -{ - return queue_api->queue_lock_count(queue); -} - -uint64_t odp_queue_to_u64(odp_queue_t hdl) -{ - return queue_api->queue_to_u64(hdl); -} - -void odp_queue_param_init(odp_queue_param_t *param) -{ - return queue_api->queue_param_init(param); -} - -int odp_queue_info(odp_queue_t queue, odp_queue_info_t *info) -{ - return queue_api->queue_info(queue, info); -} diff --git a/platform/linux-generic/odp_queue.c b/platform/linux-generic/queue/generic.c similarity index 85% rename from platform/linux-generic/odp_queue.c rename to platform/linux-generic/queue/generic.c index 46197e00..37f13d03 100644 --- a/platform/linux-generic/odp_queue.c +++ b/platform/linux-generic/queue/generic.c @@ -1,12 +1,13 @@ /* Copyright (c) 2013, Linaro Limited * All rights reserved. * - * SPDX-License-Identifier: BSD-3-Clause + * SPDX-License-Identifier: BSD-3-Clause */ #include <odp/api/queue.h> #include <odp_queue_internal.h> #include <odp_queue_if.h> +#include <odp_queue_subsystem.h> #include <odp/api/std_types.h> #include <odp/api/align.h> #include <odp/api/buffer.h> @@ -65,7 +66,7 @@ queue_entry_t *get_qentry(uint32_t queue_id) return &queue_tbl->queue[queue_id]; } -static int queue_init_global(void) +static int generic_queue_init_global(void) { uint32_t i; odp_shm_t shm; @@ -86,6 +87,7 @@ static int queue_init_global(void) for (i = 0; i < ODP_CONFIG_QUEUES; i++) { /* init locks */ queue_entry_t *queue = get_qentry(i); + LOCK_INIT(&queue->s.lock); queue->s.index = i; queue->s.handle = queue_from_id(i); @@ -102,17 +104,17 @@ static int queue_init_global(void) return 0; } -static int queue_init_local(void) +static int generic_queue_init_local(void) { return 0; } -static int queue_term_local(void) +static int generic_queue_term_local(void) { return 0; } -static int queue_term_global(void) +static int generic_queue_term_global(void) { int ret = 0; int rc = 0; @@ -138,7 +140,7 @@ static int queue_term_global(void) return rc; } -static int queue_capability(odp_queue_capability_t *capa) +static int generic_queue_capability(odp_queue_capability_t *capa) { memset(capa, 0, sizeof(odp_queue_capability_t)); @@ -153,27 +155,27 @@ static int queue_capability(odp_queue_capability_t *capa) return 0; } -static odp_queue_type_t queue_type(odp_queue_t handle) +static odp_queue_type_t generic_queue_type(odp_queue_t handle) { return handle_to_qentry(handle)->s.type; } -static odp_schedule_sync_t queue_sched_type(odp_queue_t handle) +static odp_schedule_sync_t generic_queue_sched_type(odp_queue_t handle) { return handle_to_qentry(handle)->s.param.sched.sync; } -static odp_schedule_prio_t queue_sched_prio(odp_queue_t handle) +static odp_schedule_prio_t generic_queue_sched_prio(odp_queue_t handle) { return handle_to_qentry(handle)->s.param.sched.prio; } -static odp_schedule_group_t queue_sched_group(odp_queue_t handle) +static odp_schedule_group_t generic_queue_sched_group(odp_queue_t handle) { return handle_to_qentry(handle)->s.param.sched.group; } -static int queue_lock_count(odp_queue_t handle) +static int generic_queue_lock_count(odp_queue_t handle) { queue_entry_t *queue = handle_to_qentry(handle); @@ -181,8 +183,8 @@ static int queue_lock_count(odp_queue_t handle) (int)queue->s.param.sched.lock_count : -1; } -static odp_queue_t queue_create(const char *name, - const odp_queue_param_t *param) +static odp_queue_t generic_queue_create(const char *name, + const odp_queue_param_t *param) { uint32_t i; queue_entry_t *queue; @@ -247,9 +249,10 @@ void queue_destroy_finalize(uint32_t queue_index) UNLOCK(&queue->s.lock); } -static int queue_destroy(odp_queue_t handle) +static int generic_queue_destroy(odp_queue_t handle) { queue_entry_t *queue; + queue = handle_to_qentry(handle); if (handle == ODP_QUEUE_INVALID) @@ -292,8 +295,8 @@ static int queue_destroy(odp_queue_t handle) return 0; } -static int queue_context_set(odp_queue_t handle, void *context, - uint32_t len ODP_UNUSED) +static int generic_queue_context_set(odp_queue_t handle, void *context, + uint32_t len ODP_UNUSED) { odp_mb_full(); handle_to_qentry(handle)->s.param.context = context; @@ -301,12 +304,12 @@ static int queue_context_set(odp_queue_t handle, void *context, return 0; } -static void *queue_context(odp_queue_t handle) +static void *generic_queue_context(odp_queue_t handle) { return handle_to_qentry(handle)->s.param.context; } -static odp_queue_t queue_lookup(const char *name) +static odp_queue_t generic_queue_lookup(const char *name) { uint32_t i; @@ -424,7 +427,8 @@ static int queue_int_enq(queue_t q_int, odp_buffer_hdr_t *buf_hdr) return -1; } -static int queue_enq_multi(odp_queue_t handle, const odp_event_t ev[], int num) +static int generic_queue_enq_multi(odp_queue_t handle, + const odp_event_t ev[], int num) { queue_entry_t *queue = handle_to_qentry(handle); @@ -438,7 +442,7 @@ static int queue_enq_multi(odp_queue_t handle, const odp_event_t ev[], int num) (odp_buffer_hdr_t **)(uintptr_t)ev, num); } -static int queue_enq(odp_queue_t handle, odp_event_t ev) +static int generic_queue_enq(odp_queue_t handle, odp_event_t ev) { queue_entry_t *queue = handle_to_qentry(handle); @@ -543,7 +547,8 @@ static odp_buffer_hdr_t *queue_int_deq(queue_t q_int) return NULL; } -static int queue_deq_multi(odp_queue_t handle, odp_event_t ev[], int num) +static int generic_queue_deq_multi(odp_queue_t handle, odp_event_t ev[], + int num) { queue_entry_t *queue = handle_to_qentry(handle); @@ -554,7 +559,7 @@ static int queue_deq_multi(odp_queue_t handle, odp_event_t ev[], int num) (odp_buffer_hdr_t **)ev, num); } -static odp_event_t queue_deq(odp_queue_t handle) +static odp_event_t generic_queue_deq(odp_queue_t handle) { queue_entry_t *queue = handle_to_qentry(handle); @@ -593,7 +598,7 @@ static int queue_init(queue_entry_t *queue, const char *name, return 0; } -static void queue_param_init(odp_queue_param_t *params) +static void generic_queue_param_init(odp_queue_param_t *params) { memset(params, 0, sizeof(odp_queue_param_t)); params->type = ODP_QUEUE_TYPE_PLAIN; @@ -604,7 +609,7 @@ static void queue_param_init(odp_queue_param_t *params) params->sched.group = ODP_SCHED_GROUP_ALL; } -static int queue_info(odp_queue_t handle, odp_queue_info_t *info) +static int generic_queue_info(odp_queue_t handle, odp_queue_info_t *info) { uint32_t queue_id; queue_entry_t *queue; @@ -681,7 +686,7 @@ int queue_empty(uint32_t queue_index) return ret; } -static uint64_t queue_to_u64(odp_queue_t hdl) +static uint64_t generic_queue_to_u64(odp_queue_t hdl) { return _odp_pri(hdl); } @@ -744,33 +749,42 @@ static odp_queue_t queue_to_ext(queue_t q_int) } /* API functions */ -queue_api_t queue_default_api = { - .queue_create = queue_create, - .queue_destroy = queue_destroy, - .queue_lookup = queue_lookup, - .queue_capability = queue_capability, - .queue_context_set = queue_context_set, - .queue_context = queue_context, - .queue_enq = queue_enq, - .queue_enq_multi = queue_enq_multi, - .queue_deq = queue_deq, - .queue_deq_multi = queue_deq_multi, - .queue_type = queue_type, - .queue_sched_type = queue_sched_type, - .queue_sched_prio = queue_sched_prio, - .queue_sched_group = queue_sched_group, - .queue_lock_count = queue_lock_count, - .queue_to_u64 = queue_to_u64, - .queue_param_init = queue_param_init, - .queue_info = queue_info +odp_queue_module_t generic_queue = { + .base = { + .name = "generic_queue", + .init_global = generic_queue_init_global, + .term_global = generic_queue_term_global, + .init_local = generic_queue_init_local, + .term_local = generic_queue_term_local, + }, + .create = generic_queue_create, + .destroy = generic_queue_destroy, + .lookup = generic_queue_lookup, + .capability = generic_queue_capability, + .context_set = generic_queue_context_set, + .context = generic_queue_context, + .enq = generic_queue_enq, + .enq_multi = generic_queue_enq_multi, + .deq = generic_queue_deq, + .deq_multi = generic_queue_deq_multi, + .type = generic_queue_type, + .sched_type = generic_queue_sched_type, + .sched_prio = generic_queue_sched_prio, + .sched_group = generic_queue_sched_group, + .lock_count = generic_queue_lock_count, + .to_u64 = generic_queue_to_u64, + .param_init = generic_queue_param_init, + .info = generic_queue_info, }; +ODP_MODULE_CONSTRUCTOR(generic_queue) +{ + odp_module_constructor(&generic_queue); + odp_subsystem_register_module(queue, &generic_queue); +} + /* Functions towards internal components */ queue_fn_t queue_default_fn = { - .init_global = queue_init_global, - .term_global = queue_term_global, - .init_local = queue_init_local, - .term_local = queue_term_local, .from_ext = queue_from_ext, .to_ext = queue_to_ext, .enq = queue_int_enq, @@ -781,5 +795,5 @@ queue_fn_t queue_default_fn = { .set_pktout = queue_set_pktout, .get_pktin = queue_get_pktin, .set_pktin = queue_set_pktin, - .set_enq_deq_fn = queue_set_enq_deq_func + .set_enq_deq_fn = queue_set_enq_deq_func, }; diff --git a/platform/linux-generic/odp_queue_scalable.c b/platform/linux-generic/queue/scalable.c similarity index 89% rename from platform/linux-generic/odp_queue_scalable.c rename to platform/linux-generic/queue/scalable.c index 503b40f5..020b790d 100644 --- a/platform/linux-generic/odp_queue_scalable.c +++ b/platform/linux-generic/queue/scalable.c @@ -3,7 +3,7 @@ * Copyright (c) 2017, Linaro Limited * All rights reserved. * - * SPDX-License-Identifier: BSD-3-Clause + * SPDX-License-Identifier: BSD-3-Clause */ #include <odp/api/hints.h> @@ -22,6 +22,7 @@ #include <odp_packet_io_internal.h> #include <odp_pool_internal.h> #include <odp_queue_scalable_internal.h> +#include <odp_queue_subsystem.h> #include <odp_schedule_if.h> #include <_ishm_internal.h> #include <_ishmpool_internal.h> @@ -182,7 +183,7 @@ rwin_create_failed: return -1; } -static int queue_init_global(void) +static int scalable_queue_init_global(void) { uint32_t i; uint64_t pool_size; @@ -258,7 +259,7 @@ queue_tbl_ishm_alloc_failed: return -1; } -static int queue_term_global(void) +static int scalable_queue_term_global(void) { int ret = 0; int rc = 0; @@ -285,17 +286,17 @@ static int queue_term_global(void) return rc; } -static int queue_init_local(void) +static int scalable_queue_init_local(void) { return 0; } -static int queue_term_local(void) +static int scalable_queue_term_local(void) { return 0; } -static int queue_capability(odp_queue_capability_t *capa) +static int scalable_queue_capability(odp_queue_capability_t *capa) { memset(capa, 0, sizeof(odp_queue_capability_t)); @@ -312,27 +313,27 @@ static int queue_capability(odp_queue_capability_t *capa) return 0; } -static odp_queue_type_t queue_type(odp_queue_t handle) +static odp_queue_type_t scalable_queue_type(odp_queue_t handle) { return qentry_from_int(queue_from_ext(handle))->s.type; } -static odp_schedule_sync_t queue_sched_type(odp_queue_t handle) +static odp_schedule_sync_t scalable_queue_sched_type(odp_queue_t handle) { return qentry_from_int(queue_from_ext(handle))->s.param.sched.sync; } -static odp_schedule_prio_t queue_sched_prio(odp_queue_t handle) +static odp_schedule_prio_t scalable_queue_sched_prio(odp_queue_t handle) { return qentry_from_int(queue_from_ext(handle))->s.param.sched.prio; } -static odp_schedule_group_t queue_sched_group(odp_queue_t handle) +static odp_schedule_group_t scalable_queue_sched_group(odp_queue_t handle) { return qentry_from_int(queue_from_ext(handle))->s.param.sched.group; } -static int queue_lock_count(odp_queue_t handle) +static int scalable_queue_lock_count(odp_queue_t handle) { queue_entry_t *queue = qentry_from_int(queue_from_ext(handle)); @@ -340,8 +341,8 @@ static int queue_lock_count(odp_queue_t handle) (int)queue->s.param.sched.lock_count : -1; } -static odp_queue_t queue_create(const char *name, - const odp_queue_param_t *param) +static odp_queue_t scalable_queue_create(const char *name, + const odp_queue_param_t *param) { int queue_idx; odp_queue_t handle = ODP_QUEUE_INVALID; @@ -375,7 +376,7 @@ static odp_queue_t queue_create(const char *name, return handle; } -static int queue_destroy(odp_queue_t handle) +static int scalable_queue_destroy(odp_queue_t handle) { queue_entry_t *queue; sched_elem_t *q; @@ -451,8 +452,8 @@ static int queue_destroy(odp_queue_t handle) return 0; } -static int queue_context_set(odp_queue_t handle, void *context, - uint32_t len ODP_UNUSED) +static int scalable_queue_context_set(odp_queue_t handle, void *context, + uint32_t len ODP_UNUSED) { odp_mb_full(); qentry_from_int(queue_from_ext(handle))->s.param.context = context; @@ -460,12 +461,12 @@ static int queue_context_set(odp_queue_t handle, void *context, return 0; } -static void *queue_context(odp_queue_t handle) +static void *scalable_queue_context(odp_queue_t handle) { return qentry_from_int(queue_from_ext(handle))->s.param.context; } -static odp_queue_t queue_lookup(const char *name) +static odp_queue_t scalable_queue_lookup(const char *name) { uint32_t i; @@ -645,7 +646,8 @@ static int _queue_enq(queue_t handle, odp_buffer_hdr_t *buf_hdr) _queue_enq_multi(handle, &buf_hdr, 1) == 1) ? 0 : -1; } -static int queue_enq_multi(odp_queue_t handle, const odp_event_t ev[], int num) +static int scalable_queue_enq_multi(odp_queue_t handle, + const odp_event_t ev[], int num) { odp_buffer_hdr_t *buf_hdr[QUEUE_MULTI_MAX]; queue_entry_t *queue; @@ -662,7 +664,7 @@ static int queue_enq_multi(odp_queue_t handle, const odp_event_t ev[], int num) return queue->s.enqueue_multi(qentry_to_int(queue), buf_hdr, num); } -static int queue_enq(odp_queue_t handle, odp_event_t ev) +static int scalable_queue_enq(odp_queue_t handle, odp_event_t ev) { odp_buffer_hdr_t *buf_hdr; queue_entry_t *queue; @@ -827,7 +829,8 @@ static odp_buffer_hdr_t *_queue_deq(queue_t handle) return NULL; } -static int queue_deq_multi(odp_queue_t handle, odp_event_t ev[], int num) +static int scalable_queue_deq_multi(odp_queue_t handle, odp_event_t ev[], + int num) { queue_entry_t *queue; @@ -835,10 +838,11 @@ static int queue_deq_multi(odp_queue_t handle, odp_event_t ev[], int num) num = QUEUE_MULTI_MAX; queue = qentry_from_int(queue_from_ext(handle)); - return queue->s.dequeue_multi(qentry_to_int(queue), (odp_buffer_hdr_t **)ev, num); + return queue->s.dequeue_multi(qentry_to_int(queue), + (odp_buffer_hdr_t **)ev, num); } -static odp_event_t queue_deq(odp_queue_t handle) +static odp_event_t scalable_queue_deq(odp_queue_t handle) { queue_entry_t *queue; @@ -846,7 +850,7 @@ static odp_event_t queue_deq(odp_queue_t handle) return (odp_event_t)queue->s.dequeue(qentry_to_int(queue)); } -static void queue_param_init(odp_queue_param_t *params) +static void scalable_queue_param_init(odp_queue_param_t *params) { memset(params, 0, sizeof(odp_queue_param_t)); params->type = ODP_QUEUE_TYPE_PLAIN; @@ -857,7 +861,7 @@ static void queue_param_init(odp_queue_param_t *params) params->sched.group = ODP_SCHED_GROUP_ALL; } -static int queue_info(odp_queue_t handle, odp_queue_info_t *info) +static int scalable_queue_info(odp_queue_t handle, odp_queue_info_t *info) { uint32_t queue_id; queue_entry_t *queue; @@ -896,7 +900,7 @@ static int queue_info(odp_queue_t handle, odp_queue_info_t *info) return 0; } -static uint64_t queue_to_u64(odp_queue_t hdl) +static uint64_t scalable_queue_to_u64(odp_queue_t hdl) { return _odp_pri(hdl); } @@ -956,33 +960,42 @@ static odp_queue_t queue_to_ext(queue_t handle) } /* API functions */ -queue_api_t queue_scalable_api = { - .queue_create = queue_create, - .queue_destroy = queue_destroy, - .queue_lookup = queue_lookup, - .queue_capability = queue_capability, - .queue_context_set = queue_context_set, - .queue_context = queue_context, - .queue_enq = queue_enq, - .queue_enq_multi = queue_enq_multi, - .queue_deq = queue_deq, - .queue_deq_multi = queue_deq_multi, - .queue_type = queue_type, - .queue_sched_type = queue_sched_type, - .queue_sched_prio = queue_sched_prio, - .queue_sched_group = queue_sched_group, - .queue_lock_count = queue_lock_count, - .queue_to_u64 = queue_to_u64, - .queue_param_init = queue_param_init, - .queue_info = queue_info +odp_queue_module_t scalable_queue = { + .base = { + .name = "scalable_queue", + .init_global = scalable_queue_init_global, + .term_global = scalable_queue_term_global, + .init_local = scalable_queue_init_local, + .term_local = scalable_queue_term_local, + }, + .create = scalable_queue_create, + .destroy = scalable_queue_destroy, + .lookup = scalable_queue_lookup, + .capability = scalable_queue_capability, + .context_set = scalable_queue_context_set, + .context = scalable_queue_context, + .enq = scalable_queue_enq, + .enq_multi = scalable_queue_enq_multi, + .deq = scalable_queue_deq, + .deq_multi = scalable_queue_deq_multi, + .type = scalable_queue_type, + .sched_type = scalable_queue_sched_type, + .sched_prio = scalable_queue_sched_prio, + .sched_group = scalable_queue_sched_group, + .lock_count = scalable_queue_lock_count, + .to_u64 = scalable_queue_to_u64, + .param_init = scalable_queue_param_init, + .info = scalable_queue_info, }; +ODP_MODULE_CONSTRUCTOR(scalable_queue) +{ + odp_module_constructor(&scalable_queue); + odp_subsystem_register_module(queue, &scalable_queue); +} + /* Functions towards internal components */ queue_fn_t queue_scalable_fn = { - .init_global = queue_init_global, - .term_global = queue_term_global, - .init_local = queue_init_local, - .term_local = queue_term_local, .from_ext = queue_from_ext, .to_ext = queue_to_ext, .enq = _queue_enq, @@ -993,5 +1006,5 @@ queue_fn_t queue_scalable_fn = { .set_pktout = queue_set_pktout, .get_pktin = queue_get_pktin, .set_pktin = queue_set_pktin, - .set_enq_deq_fn = queue_set_enq_deq_func + .set_enq_deq_fn = queue_set_enq_deq_func, }; diff --git a/platform/linux-generic/queue/subsystem.c b/platform/linux-generic/queue/subsystem.c index d4707f0f..e4c66a2b 100644 --- a/platform/linux-generic/queue/subsystem.c +++ b/platform/linux-generic/queue/subsystem.c @@ -5,8 +5,11 @@ * * SPDX-License-Identifier: BSD-3-Clause */ -#include <odp_module.h> +#include <odp/api/queue.h> +#include <odp_internal.h> +#include <odp_debug_internal.h> #include <odp_queue_subsystem.h> +#include <odp_module.h> ODP_SUBSYSTEM_DEFINE(queue, "queue public APIs", QUEUE_SUBSYSTEM_VERSION); @@ -14,3 +17,248 @@ ODP_SUBSYSTEM_CONSTRUCTOR(queue) { odp_subsystem_constructor(queue); } + +int odp_queue_init_global(void) +{ + odp_queue_module_t *mod = + odp_subsystem_active_module(queue, mod); + + ODP_ASSERT(mod); + ODP_ASSERT(mod->base.init_global); + + return mod->base.init_global(); +} + +int odp_queue_term_global(void) +{ + odp_queue_module_t *mod = + odp_subsystem_active_module(queue, mod); + + ODP_ASSERT(mod); + ODP_ASSERT(mod->base.term_global); + + return mod->base.term_global(); +} + +int odp_queue_init_local(void) +{ + odp_queue_module_t *mod = + odp_subsystem_active_module(queue, mod); + + ODP_ASSERT(mod); + ODP_ASSERT(mod->base.init_local); + + return mod->base.init_local(); +} + +int odp_queue_term_local(void) +{ + odp_queue_module_t *mod = + odp_subsystem_active_module(queue, mod); + + ODP_ASSERT(mod); + ODP_ASSERT(mod->base.term_local); + + return mod->base.term_local(); +} + +odp_queue_t odp_queue_create(const char *name, + const odp_queue_param_t *param) +{ + odp_queue_module_t *mod = + odp_subsystem_active_module(queue, mod); + + ODP_ASSERT(mod); + ODP_ASSERT(mod->create); + + return mod->create(name, param); +} + +int odp_queue_destroy(odp_queue_t queue_hdl) +{ + odp_queue_module_t *mod = + odp_subsystem_active_module(queue, mod); + + ODP_ASSERT(mod); + ODP_ASSERT(mod->destroy); + + return mod->destroy(queue_hdl); +} + +odp_queue_t odp_queue_lookup(const char *name) +{ + odp_queue_module_t *mod = + odp_subsystem_active_module(queue, mod); + + ODP_ASSERT(mod); + ODP_ASSERT(mod->lookup); + + return mod->lookup(name); +} + +int odp_queue_capability(odp_queue_capability_t *capa) +{ + odp_queue_module_t *mod = + odp_subsystem_active_module(queue, mod); + + ODP_ASSERT(mod); + ODP_ASSERT(mod->capability); + + return mod->capability(capa); +} + +int odp_queue_context_set(odp_queue_t queue_hdl, void *context, + uint32_t len ODP_UNUSED) +{ + odp_queue_module_t *mod = + odp_subsystem_active_module(queue, mod); + + ODP_ASSERT(mod); + ODP_ASSERT(mod->context_set); + + return mod->context_set(queue_hdl, context, len); +} + +void *odp_queue_context(odp_queue_t queue_hdl) +{ + odp_queue_module_t *mod = + odp_subsystem_active_module(queue, mod); + + ODP_ASSERT(mod); + ODP_ASSERT(mod->context); + + return mod->context(queue_hdl); +} + +int odp_queue_enq(odp_queue_t queue_hdl, odp_event_t ev) +{ + odp_queue_module_t *mod = + odp_subsystem_active_module(queue, mod); + + ODP_ASSERT(mod); + ODP_ASSERT(mod->enq); + + return mod->enq(queue_hdl, ev); +} + +int odp_queue_enq_multi(odp_queue_t queue_hdl, + const odp_event_t events[], int num) +{ + odp_queue_module_t *mod = + odp_subsystem_active_module(queue, mod); + + ODP_ASSERT(mod); + ODP_ASSERT(mod->enq_multi); + + return mod->enq_multi(queue_hdl, events, num); +} + +odp_event_t odp_queue_deq(odp_queue_t queue_hdl) +{ + odp_queue_module_t *mod = + odp_subsystem_active_module(queue, mod); + + ODP_ASSERT(mod); + ODP_ASSERT(mod->deq); + + return mod->deq(queue_hdl); +} + +int odp_queue_deq_multi(odp_queue_t queue_hdl, odp_event_t events[], int num) +{ + odp_queue_module_t *mod = + odp_subsystem_active_module(queue, mod); + + ODP_ASSERT(mod); + ODP_ASSERT(mod->deq_multi); + + return mod->deq_multi(queue_hdl, events, num); +} + +odp_queue_type_t odp_queue_type(odp_queue_t queue_hdl) +{ + odp_queue_module_t *mod = + odp_subsystem_active_module(queue, mod); + + ODP_ASSERT(mod); + ODP_ASSERT(mod->type); + + return mod->type(queue_hdl); +} + +odp_schedule_sync_t odp_queue_sched_type(odp_queue_t queue_hdl) +{ + odp_queue_module_t *mod = + odp_subsystem_active_module(queue, mod); + + ODP_ASSERT(mod); + ODP_ASSERT(mod->sched_type); + + return mod->sched_type(queue_hdl); +} + +odp_schedule_prio_t odp_queue_sched_prio(odp_queue_t queue_hdl) +{ + odp_queue_module_t *mod = + odp_subsystem_active_module(queue, mod); + + ODP_ASSERT(mod); + ODP_ASSERT(mod->sched_prio); + + return mod->sched_prio(queue_hdl); +} + +odp_schedule_group_t odp_queue_sched_group(odp_queue_t queue_hdl) +{ + odp_queue_module_t *mod = + odp_subsystem_active_module(queue, mod); + + ODP_ASSERT(mod); + ODP_ASSERT(mod->sched_group); + + return mod->sched_group(queue_hdl); +} + +int odp_queue_lock_count(odp_queue_t queue_hdl) +{ + odp_queue_module_t *mod = + odp_subsystem_active_module(queue, mod); + + ODP_ASSERT(mod); + ODP_ASSERT(mod->lock_count); + + return mod->lock_count(queue_hdl); +} + +uint64_t odp_queue_to_u64(odp_queue_t queue_hdl) +{ + odp_queue_module_t *mod = + odp_subsystem_active_module(queue, mod); + + ODP_ASSERT(mod); + ODP_ASSERT(mod->to_u64); + + return mod->to_u64(queue_hdl); +} + +void odp_queue_param_init(odp_queue_param_t *params) +{ + odp_queue_module_t *mod = + odp_subsystem_active_module(queue, mod); + + ODP_ASSERT(mod); + ODP_ASSERT(mod->param_init); + + return mod->param_init(params); +} + +int odp_queue_info(odp_queue_t queue_hdl, odp_queue_info_t *info) +{ + odp_queue_module_t *mod = + odp_subsystem_active_module(queue, mod); + + ODP_ASSERT(mod); + ODP_ASSERT(mod->info); + + return mod->info(queue_hdl, info); +} commit 6448dbc4114c655f1de056ea18003956f3b91b76 Author: Joyce Kong <joyce.kong(a)arm.com> Date: Tue Sep 5 14:21:36 2017 +0800 linux-gen: queue: apply modular framework and create subsystem Signed-off-by: Joyce Kong <joyce.kong(a)arm.com> Reviewed-by: Yi He <yi.he(a)linaro.org> Reviewed-by: Kevin Wang <kevin.wang(a)arm.com> Reviewed-by: Honnappa Nagarahalli <honnappa.nagarahalli(a)arm.com> Reviewed-by: Brian Brooks <brian.brooks(a)arm.com> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index cbbefa4e..b542966f 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -192,6 +192,7 @@ noinst_HEADERS = \ ${srcdir}/include/odp_packet_socket.h \ ${srcdir}/include/odp_packet_tap.h \ ${srcdir}/include/odp_pkt_queue_internal.h \ + ${srcdir}/include/odp_queue_subsystem.h \ ${srcdir}/include/odp_pool_internal.h \ ${srcdir}/include/odp_pool_subsystem.h \ ${srcdir}/include/odp_posix_extensions.h \ @@ -278,6 +279,7 @@ __LIB__libodp_linux_la_SOURCES = \ odp_pkt_queue.c \ odp_queue.c \ odp_queue_if.c \ + queue/subsystem.c \ odp_queue_scalable.c \ odp_rwlock.c \ odp_rwlock_recursive.c \ diff --git a/platform/linux-generic/include/odp_queue_subsystem.h b/platform/linux-generic/include/odp_queue_subsystem.h new file mode 100644 index 00000000..c63309fa --- /dev/null +++ b/platform/linux-generic/include/odp_queue_subsystem.h @@ -0,0 +1,76 @@ +/* Copyright (c) 2017, ARM Limited. All rights reserved. + * + * Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ +#ifndef ODP_QUEUE_SUBSYSTEM_H +#define ODP_QUEUE_SUBSYSTEM_H + +#ifdef __cplusplus +extern "C" { +#endif + +#include <odp_module.h> +#include <odp/api/queue.h> + +#define QUEUE_SUBSYSTEM_VERSION 0x00010000UL + +/* ODP queue public APIs subsystem */ +ODP_SUBSYSTEM_DECLARE(queue); + +/* Subsystem APIs declarations */ +ODP_SUBSYSTEM_API(queue, odp_queue_t, create, const char *name, + const odp_queue_param_t *param); +ODP_SUBSYSTEM_API(queue, int, destroy, odp_queue_t queue); +ODP_SUBSYSTEM_API(queue, odp_queue_t, lookup, const char *name); +ODP_SUBSYSTEM_API(queue, int, capability, odp_queue_capability_t *capa); +ODP_SUBSYSTEM_API(queue, int, context_set, odp_queue_t queue, + void *context, uint32_t len); +ODP_SUBSYSTEM_API(queue, void *, context, odp_queue_t queue); +ODP_SUBSYSTEM_API(queue, int, enq, odp_queue_t queue, odp_event_t ev); +ODP_SUBSYSTEM_API(queue, int, enq_multi, odp_queue_t queue, + const odp_event_t events[], int num); +ODP_SUBSYSTEM_API(queue, odp_event_t, deq, odp_queue_t queue); +ODP_SUBSYSTEM_API(queue, int, deq_multi, odp_queue_t queue, + odp_event_t events[], int num); +ODP_SUBSYSTEM_API(queue, odp_queue_type_t, type, odp_queue_t queue); +ODP_SUBSYSTEM_API(queue, odp_schedule_sync_t, sched_type, odp_queue_t queue); +ODP_SUBSYSTEM_API(queue, odp_schedule_prio_t, sched_prio, odp_queue_t queue); +ODP_SUBSYSTEM_API(queue, odp_schedule_group_t, sched_group, + odp_queue_t queue); +ODP_SUBSYSTEM_API(queue, int, lock_count, odp_queue_t queue); +ODP_SUBSYSTEM_API(queue, uint64_t, to_u64, odp_queue_t hdl); +ODP_SUBSYSTEM_API(queue, void, param_init, odp_queue_param_t *param); +ODP_SUBSYSTEM_API(queue, int, info, odp_queue_t queue, + odp_queue_info_t *info); + +typedef ODP_MODULE_CLASS(queue) { + odp_module_base_t base; + + odp_api_proto(queue, enq_multi) enq_multi; + odp_api_proto(queue, deq_multi) deq_multi; + odp_api_proto(queue, enq) enq; + odp_api_proto(queue, deq) deq; + odp_api_proto(queue, context) context; + odp_api_proto(queue, sched_type) sched_type; + odp_api_proto(queue, sched_prio) sched_prio; + odp_api_proto(queue, sched_group) sched_group; + odp_api_proto(queue, create) create; + odp_api_proto(queue, destroy) destroy; + odp_api_proto(queue, lookup) lookup; + odp_api_proto(queue, capability) capability; + odp_api_proto(queue, context_set) context_set; + odp_api_proto(queue, type) type; + odp_api_proto(queue, lock_count) lock_count; + odp_api_proto(queue, to_u64) to_u64; + odp_api_proto(queue, param_init) param_init; + odp_api_proto(queue, info) info; +} odp_queue_module_t; + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/platform/linux-generic/queue/subsystem.c b/platform/linux-generic/queue/subsystem.c new file mode 100644 index 00000000..d4707f0f --- /dev/null +++ b/platform/linux-generic/queue/subsystem.c @@ -0,0 +1,16 @@ +/* Copyright (c) 2017, ARM Limited. All rights reserved. + * + * Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ +#include <odp_module.h> +#include <odp_queue_subsystem.h> + +ODP_SUBSYSTEM_DEFINE(queue, "queue public APIs", QUEUE_SUBSYSTEM_VERSION); + +ODP_SUBSYSTEM_CONSTRUCTOR(queue) +{ + odp_subsystem_constructor(queue); +} ----------------------------------------------------------------------- Summary of changes: platform/linux-dpdk/Makefile.am | 15 +- platform/linux-dpdk/buffer/dpdk.c | 207 ++++++++++++++++ platform/linux-dpdk/include/odp_buffer_inlines.h | 5 + platform/linux-dpdk/include/odp_config_internal.h | 7 + platform/linux-dpdk/odp_buffer.c | 113 --------- platform/linux-dpdk/odp_init.c | 4 +- platform/linux-dpdk/odp_packet.c | 2 +- platform/linux-dpdk/pool/dpdk.c | 62 ----- platform/linux-generic/Makefile.am | 11 +- platform/linux-generic/include/odp_internal.h | 2 + platform/linux-generic/include/odp_queue_if.h | 64 +---- .../linux-generic/include/odp_queue_subsystem.h | 77 ++++++ platform/linux-generic/odp_init.c | 8 +- platform/linux-generic/odp_queue_if.c | 98 +------- .../linux-generic/{odp_queue.c => queue/generic.c} | 112 +++++---- .../{odp_queue_scalable.c => queue/scalable.c} | 113 +++++---- platform/linux-generic/queue/subsystem.c | 264 +++++++++++++++++++++ 17 files changed, 728 insertions(+), 436 deletions(-) create mode 100644 platform/linux-dpdk/buffer/dpdk.c delete mode 100644 platform/linux-dpdk/odp_buffer.c create mode 100644 platform/linux-generic/include/odp_queue_subsystem.h rename platform/linux-generic/{odp_queue.c => queue/generic.c} (85%) rename platform/linux-generic/{odp_queue_scalable.c => queue/scalable.c} (89%) create mode 100644 platform/linux-generic/queue/subsystem.c hooks/post-receive --

8 years, 11 months

[COMMIT] branch api-next updated. v1.15.0.0-694-g6e79d897

by git＠git-us.linaro.org

8 years, 11 months

[COMMIT] branch api-next updated. v1.15.0.0-693-gc6ab55e8

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 c6ab55e8bc2b797af290349b56c829e38839929b (commit) via f2da0136e11df9372ada5f01efdc4cf176680dea (commit) from e344e4364f771f32b86d822d0c447770588fe65d (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 c6ab55e8bc2b797af290349b56c829e38839929b Author: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Date: Mon Aug 28 21:53:18 2017 -0700 linux-generic: pool: implementation for min and max headroom configuration Implements pool min and max headroom configuration 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/odp_pool.c b/platform/linux-generic/odp_pool.c index 39e01083..c9aca7d6 100644 --- a/platform/linux-generic/odp_pool.c +++ b/platform/linux-generic/odp_pool.c @@ -356,6 +356,10 @@ static odp_pool_t pool_create(const char *name, odp_pool_param_t *params, break; case ODP_POOL_PACKET: + if (params->pkt.headroom > CONFIG_PACKET_HEADROOM) { + ODP_ERR("Packet headroom size not supported."); + return ODP_POOL_INVALID; + } headroom = CONFIG_PACKET_HEADROOM; tailroom = CONFIG_PACKET_TAILROOM; num = params->pkt.num; @@ -862,6 +866,7 @@ int odp_pool_capability(odp_pool_capability_t *capa) capa->pkt.max_len = CONFIG_PACKET_MAX_SEGS * max_seg_len; capa->pkt.max_num = CONFIG_POOL_MAX_NUM; capa->pkt.min_headroom = CONFIG_PACKET_HEADROOM; + capa->pkt.max_headroom = CONFIG_PACKET_HEADROOM; capa->pkt.min_tailroom = CONFIG_PACKET_TAILROOM; capa->pkt.max_segs_per_pkt = CONFIG_PACKET_MAX_SEGS; capa->pkt.min_seg_len = max_seg_len; @@ -921,6 +926,7 @@ odp_pool_t odp_buffer_pool(odp_buffer_t buf) void odp_pool_param_init(odp_pool_param_t *params) { memset(params, 0, sizeof(odp_pool_param_t)); + params->pkt.headroom = CONFIG_PACKET_HEADROOM; } uint64_t odp_pool_to_u64(odp_pool_t hdl) commit f2da0136e11df9372ada5f01efdc4cf176680dea Author: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Date: Mon Aug 28 21:52:42 2017 -0700 api: pool: add min and max headroom configuration in pool Adds minimum and maximum headroom configuration in pool 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/pool.h b/include/odp/api/spec/pool.h index 6fc5b6b4..221798ee 100644 --- a/include/odp/api/spec/pool.h +++ b/include/odp/api/spec/pool.h @@ -97,6 +97,13 @@ typedef struct odp_pool_capability_t { * packet input and user allocated packets.*/ uint32_t min_headroom; + /** Maximum packet level headroom length in bytes + * + * The maximum value of packet pool headroom parameter + * that can be configured. This value applies to both ODP + * packet input and user allocated packets.*/ + uint32_t max_headroom; + /** Minimum packet level tailroom length in bytes * * The minimum number of tailroom bytes that newly created @@ -214,6 +221,13 @@ typedef struct odp_pool_param_t { defined by pool capability pkt.max_uarea_size. Specify as 0 if no user area is needed. */ uint32_t uarea_size; + + /** Minimum Headroom size in bytes. Each newly allocated + packet from the pool must have at least this much + headroom. The maximum value is defined by pool + capability pkt.max_headroom. + Use zero if headroom is not needed. */ + uint32_t headroom; } pkt; /** Parameters for timeout pools */ ----------------------------------------------------------------------- Summary of changes: include/odp/api/spec/pool.h | 14 ++++++++++++++ platform/linux-generic/odp_pool.c | 6 ++++++ 2 files changed, 20 insertions(+) hooks/post-receive --

8 years, 11 months

[COMMIT] branch api-next updated. v1.15.0.0-691-ge344e436

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 e344e4364f771f32b86d822d0c447770588fe65d (commit) via f3fa10fa00f5040f5ce2bfd18894227a7ef76c02 (commit) via 4e6dbf3c8151335c2a5361da3f228666c688d8fa (commit) via f172905f96be14da4760653cba92cd1f9c820374 (commit) via 7018fa1c5e446ca8f60490c848a95b27e942783b (commit) via f66f92352bb5d1ed3a19fe5b5b8ca0419e525274 (commit) via e35949df96b46d2e23ca83029f468415efcbf18a (commit) via d248692dfe6ace13138e48eb1c23c1f5e942269c (commit) via 88efcd91e325438d7e2b7c410213ca95a9acefe5 (commit) from f91cde2bb770eefcfe791ce49c67ce3b1f5bf6d2 (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 e344e4364f771f32b86d822d0c447770588fe65d Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue Sep 12 10:59:50 2017 +0300 api: ipsec: rename odp_ipsec_mtu_update to follow odp_ipsec_sa_* pattern All SA-related functions use odp_ipsec_sa_ prefix, except odp_ipsec_mtu_update(). Rename this function to follow this pattern. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/include/odp/api/spec/ipsec.h b/include/odp/api/spec/ipsec.h index 0b36b864..5631989f 100644 --- a/include/odp/api/spec/ipsec.h +++ b/include/odp/api/spec/ipsec.h @@ -714,7 +714,7 @@ typedef struct odp_ipsec_sa_param_t { * * This is the maximum length of IP packets that * outbound IPSEC operations may produce. The value may - * be updated later with odp_ipsec_mtu_update(). + * be updated later with odp_ipsec_sa_mtu_update(). */ uint32_t mtu; @@ -1481,7 +1481,7 @@ int odp_ipsec_status(odp_ipsec_status_t *status, odp_event_t event); * @retval 0 On success * @retval <0 On failure */ -int odp_ipsec_mtu_update(odp_ipsec_sa_t sa, uint32_t mtu); +int odp_ipsec_sa_mtu_update(odp_ipsec_sa_t sa, uint32_t mtu); /** * Get user defined SA context pointer diff --git a/platform/linux-generic/odp_ipsec.c b/platform/linux-generic/odp_ipsec.c index c7eeb4ec..04757e78 100644 --- a/platform/linux-generic/odp_ipsec.c +++ b/platform/linux-generic/odp_ipsec.c @@ -147,7 +147,7 @@ int odp_ipsec_status(odp_ipsec_status_t *status, odp_event_t event) return -1; } -int odp_ipsec_mtu_update(odp_ipsec_sa_t sa, uint32_t mtu) +int odp_ipsec_sa_mtu_update(odp_ipsec_sa_t sa, uint32_t mtu) { (void)sa; (void)mtu; commit f3fa10fa00f5040f5ce2bfd18894227a7ef76c02 Author: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Date: Thu Sep 14 03:45:26 2017 -0700 test: validation: schduler: change order lock function signature change order lock function param signature from unsigned to uint32_t Signed-off-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/common_plat/validation/api/scheduler/scheduler.c b/test/common_plat/validation/api/scheduler/scheduler.c index 963275be..2c0d4410 100644 --- a/test/common_plat/validation/api/scheduler/scheduler.c +++ b/test/common_plat/validation/api/scheduler/scheduler.c @@ -730,12 +730,12 @@ static int schedule_common_(void *arg) continue; if (sync == ODP_SCHED_SYNC_ORDERED) { - int ndx; - int ndx_max; + uint32_t ndx; + uint32_t ndx_max; int rc; ndx_max = odp_queue_lock_count(from); - CU_ASSERT_FATAL(ndx_max >= 0); + CU_ASSERT_FATAL(ndx_max > 0); qctx = odp_queue_context(from); @@ -781,12 +781,12 @@ static int schedule_common_(void *arg) buf = odp_buffer_from_event(ev); num = 1; if (sync == ODP_SCHED_SYNC_ORDERED) { - int ndx; - int ndx_max; + uint32_t ndx; + uint32_t ndx_max; int rc; ndx_max = odp_queue_lock_count(from); - CU_ASSERT_FATAL(ndx_max >= 0); + CU_ASSERT_FATAL(ndx_max > 0); qctx = odp_queue_context(from); bctx = odp_buffer_addr(buf); @@ -996,11 +996,11 @@ static void reset_queues(thread_args_t *args) for (k = 0; k < args->num_bufs; k++) { queue_context *qctx = odp_queue_context(queue); - int ndx; - int ndx_max; + uint32_t ndx; + uint32_t ndx_max; ndx_max = odp_queue_lock_count(queue); - CU_ASSERT_FATAL(ndx_max >= 0); + CU_ASSERT_FATAL(ndx_max > 0); qctx->sequence = 0; for (ndx = 0; ndx < ndx_max; ndx++) qctx->lock_sequence[ndx] = 0; @@ -1436,7 +1436,7 @@ static int create_queues(void) return -1; } if (odp_queue_lock_count(q) != - (int)capa.max_ordered_locks) { + capa.max_ordered_locks) { printf("Queue %" PRIu64 " created with " "%d locks instead of expected %d\n", odp_queue_to_u64(q), commit 4e6dbf3c8151335c2a5361da3f228666c688d8fa Author: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Date: Thu Sep 14 03:44:49 2017 -0700 test: validation: queue: change order lock data type change oder lock count data type from unsigned to uint32_t Signed-off-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/common_plat/validation/api/queue/queue.c b/test/common_plat/validation/api/queue/queue.c index 94d0a2fd..1ec05b1f 100644 --- a/test/common_plat/validation/api/queue/queue.c +++ b/test/common_plat/validation/api/queue/queue.c @@ -267,9 +267,9 @@ void queue_test_info(void) odp_queue_capability_t capability; char q_plain_ctx[] = "test_q_plain context data"; char q_order_ctx[] = "test_q_order context data"; - unsigned lock_count; + uint32_t lock_count; char *ctx; - int ret; + uint32_t ret; /* Create a plain queue and set context */ q_plain = odp_queue_create(nq_plain, NULL); @@ -314,8 +314,8 @@ void queue_test_info(void) CU_ASSERT(info.param.sched.sync == odp_queue_sched_type(q_order)); CU_ASSERT(info.param.sched.group == odp_queue_sched_group(q_order)); ret = odp_queue_lock_count(q_order); - CU_ASSERT(ret >= 0); - lock_count = (unsigned)ret; + CU_ASSERT(ret > 0); + lock_count = ret; CU_ASSERT(info.param.sched.lock_count == lock_count); CU_ASSERT(odp_queue_destroy(q_plain) == 0); commit f172905f96be14da4760653cba92cd1f9c820374 Author: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Date: Fri Sep 15 14:28:38 2017 +0530 linux-generic: schedule: implement schedule order unlock lock api Implements odp_schedule_order_unlock_lock() api. This api combines schedule order unlock and lock into a single api for performance optimization in HW. Signed-off-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/include/odp_schedule_if.h b/platform/linux-generic/include/odp_schedule_if.h index 272c6af6..06a70bdd 100644 --- a/platform/linux-generic/include/odp_schedule_if.h +++ b/platform/linux-generic/include/odp_schedule_if.h @@ -40,6 +40,7 @@ typedef int (*schedule_init_local_fn_t)(void); typedef int (*schedule_term_local_fn_t)(void); typedef void (*schedule_order_lock_fn_t)(void); typedef void (*schedule_order_unlock_fn_t)(void); +typedef void (*schedule_order_unlock_lock_fn_t)(void); typedef uint32_t (*schedule_max_ordered_locks_fn_t)(void); typedef void (*schedule_save_context_fn_t)(uint32_t queue_index); @@ -59,6 +60,7 @@ typedef struct schedule_fn_t { schedule_term_local_fn_t term_local; schedule_order_lock_fn_t order_lock; schedule_order_unlock_fn_t order_unlock; + schedule_order_unlock_lock_fn_t order_unlock_lock; schedule_max_ordered_locks_fn_t max_ordered_locks; /* Called only when status_sync is set */ @@ -102,6 +104,7 @@ typedef struct { odp_schedule_group_info_t *); void (*schedule_order_lock)(uint32_t); void (*schedule_order_unlock)(uint32_t); + void (*schedule_order_unlock_lock)(uint32_t, uint32_t); } schedule_api_t; diff --git a/platform/linux-generic/odp_schedule.c b/platform/linux-generic/odp_schedule.c index b23cbec9..59d924a5 100644 --- a/platform/linux-generic/odp_schedule.c +++ b/platform/linux-generic/odp_schedule.c @@ -1144,6 +1144,13 @@ static void schedule_order_unlock(uint32_t lock_index) odp_atomic_store_rel_u64(ord_lock, sched_local.ordered.ctx + 1); } +static void schedule_order_unlock_lock(uint32_t unlock_index, + uint32_t lock_index) +{ + schedule_order_unlock(unlock_index); + schedule_order_lock(lock_index); +} + static void schedule_pause(void) { sched_local.pause = 1; @@ -1429,5 +1436,6 @@ const schedule_api_t schedule_default_api = { .schedule_group_thrmask = schedule_group_thrmask, .schedule_group_info = schedule_group_info, .schedule_order_lock = schedule_order_lock, - .schedule_order_unlock = schedule_order_unlock + .schedule_order_unlock = schedule_order_unlock, + .schedule_order_unlock_lock = schedule_order_unlock_lock }; diff --git a/platform/linux-generic/odp_schedule_if.c b/platform/linux-generic/odp_schedule_if.c index ff664420..08ca813a 100644 --- a/platform/linux-generic/odp_schedule_if.c +++ b/platform/linux-generic/odp_schedule_if.c @@ -129,3 +129,8 @@ void odp_schedule_order_unlock(uint32_t lock_index) { return sched_api->schedule_order_unlock(lock_index); } + +void odp_schedule_order_unlock_lock(uint32_t unlock_index, uint32_t lock_index) +{ + sched_api->schedule_order_unlock_lock(unlock_index, lock_index); +} diff --git a/platform/linux-generic/odp_schedule_iquery.c b/platform/linux-generic/odp_schedule_iquery.c index 59126a83..1ad918a4 100644 --- a/platform/linux-generic/odp_schedule_iquery.c +++ b/platform/linux-generic/odp_schedule_iquery.c @@ -1299,6 +1299,13 @@ static void schedule_order_unlock(uint32_t lock_index) odp_atomic_store_rel_u64(ord_lock, thread_local.ordered.ctx + 1); } +static void schedule_order_unlock_lock(uint32_t unlock_index, + uint32_t lock_index) +{ + schedule_order_unlock(unlock_index); + schedule_order_lock(lock_index); +} + static uint32_t schedule_max_ordered_locks(void) { return CONFIG_QUEUE_MAX_ORD_LOCKS; @@ -1371,7 +1378,8 @@ const schedule_api_t schedule_iquery_api = { .schedule_group_thrmask = schedule_group_thrmask, .schedule_group_info = schedule_group_info, .schedule_order_lock = schedule_order_lock, - .schedule_order_unlock = schedule_order_unlock + .schedule_order_unlock = schedule_order_unlock, + .schedule_order_unlock_lock = schedule_order_unlock_lock }; static void thread_set_interest(sched_thread_local_t *thread, diff --git a/platform/linux-generic/odp_schedule_scalable.c b/platform/linux-generic/odp_schedule_scalable.c index 6f769ca5..642e7ee7 100644 --- a/platform/linux-generic/odp_schedule_scalable.c +++ b/platform/linux-generic/odp_schedule_scalable.c @@ -1179,6 +1179,13 @@ static void schedule_order_unlock(uint32_t lock_index) rctx->olock_flags |= 1U << lock_index; } +static void schedule_order_unlock_lock(uint32_t unlock_index, + uint32_t lock_index) +{ + schedule_order_unlock(unlock_index); + schedule_order_lock(lock_index); +} + static void schedule_release_atomic(void) { sched_scalable_thread_state_t *ts; @@ -2088,4 +2095,5 @@ const schedule_api_t schedule_scalable_api = { .schedule_group_info = schedule_group_info, .schedule_order_lock = schedule_order_lock, .schedule_order_unlock = schedule_order_unlock, + .schedule_order_unlock_lock = schedule_order_unlock_lock, }; diff --git a/platform/linux-generic/odp_schedule_sp.c b/platform/linux-generic/odp_schedule_sp.c index 0dd2404a..7f0404b1 100644 --- a/platform/linux-generic/odp_schedule_sp.c +++ b/platform/linux-generic/odp_schedule_sp.c @@ -822,6 +822,13 @@ static void schedule_order_unlock(uint32_t lock_index) (void)lock_index; } +static void schedule_order_unlock_lock(uint32_t unlock_index, + uint32_t lock_index) +{ + (void)unlock_index; + (void)lock_index; +} + static void order_lock(void) { } @@ -871,5 +878,6 @@ const schedule_api_t schedule_sp_api = { .schedule_group_thrmask = schedule_group_thrmask, .schedule_group_info = schedule_group_info, .schedule_order_lock = schedule_order_lock, - .schedule_order_unlock = schedule_order_unlock + .schedule_order_unlock = schedule_order_unlock, + .schedule_order_unlock_lock = schedule_order_unlock_lock }; commit 7018fa1c5e446ca8f60490c848a95b27e942783b Author: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Date: Fri Sep 15 14:27:51 2017 +0530 linux-generic: schedule: change order lock function signature change function param signature from unsigned to uint32_t Signed-off-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/include/odp_schedule_if.h b/platform/linux-generic/include/odp_schedule_if.h index 71538e62..272c6af6 100644 --- a/platform/linux-generic/include/odp_schedule_if.h +++ b/platform/linux-generic/include/odp_schedule_if.h @@ -40,7 +40,7 @@ typedef int (*schedule_init_local_fn_t)(void); typedef int (*schedule_term_local_fn_t)(void); typedef void (*schedule_order_lock_fn_t)(void); typedef void (*schedule_order_unlock_fn_t)(void); -typedef unsigned (*schedule_max_ordered_locks_fn_t)(void); +typedef uint32_t (*schedule_max_ordered_locks_fn_t)(void); typedef void (*schedule_save_context_fn_t)(uint32_t queue_index); typedef struct schedule_fn_t { @@ -100,8 +100,8 @@ typedef struct { int (*schedule_group_thrmask)(odp_schedule_group_t, odp_thrmask_t *); int (*schedule_group_info)(odp_schedule_group_t, odp_schedule_group_info_t *); - void (*schedule_order_lock)(unsigned); - void (*schedule_order_unlock)(unsigned); + void (*schedule_order_lock)(uint32_t); + void (*schedule_order_unlock)(uint32_t); } schedule_api_t; diff --git a/platform/linux-generic/include/odp_schedule_scalable_ordered.h b/platform/linux-generic/include/odp_schedule_scalable_ordered.h index ca49bbf4..c493dead 100644 --- a/platform/linux-generic/include/odp_schedule_scalable_ordered.h +++ b/platform/linux-generic/include/odp_schedule_scalable_ordered.h @@ -79,7 +79,7 @@ typedef struct reorder_window { uint32_t tail; uint32_t turn; uint32_t olock[CONFIG_QUEUE_MAX_ORD_LOCKS]; - uint16_t lock_count; + uint32_t lock_count; /* Reorder contexts in this window */ reorder_context_t *ring[RWIN_SIZE]; } reorder_window_t; diff --git a/platform/linux-generic/odp_schedule.c b/platform/linux-generic/odp_schedule.c index 8c444f4d..b23cbec9 100644 --- a/platform/linux-generic/odp_schedule.c +++ b/platform/linux-generic/odp_schedule.c @@ -250,7 +250,7 @@ typedef struct { int prio; int queue_per_prio; int sync; - unsigned order_lock_count; + uint32_t order_lock_count; } queue[ODP_CONFIG_QUEUES]; struct { @@ -465,7 +465,7 @@ static inline int grp_update_tbl(void) return num; } -static unsigned schedule_max_ordered_locks(void) +static uint32_t schedule_max_ordered_locks(void) { return CONFIG_QUEUE_MAX_ORD_LOCKS; } @@ -699,7 +699,7 @@ static inline void ordered_stash_release(void) static inline void release_ordered(void) { uint32_t qi; - unsigned i; + uint32_t i; qi = sched_local.ordered.src_queue; @@ -1100,7 +1100,7 @@ static void order_unlock(void) { } -static void schedule_order_lock(unsigned lock_index) +static void schedule_order_lock(uint32_t lock_index) { odp_atomic_u64_t *ord_lock; uint32_t queue_index; @@ -1127,7 +1127,7 @@ static void schedule_order_lock(unsigned lock_index) } } -static void schedule_order_unlock(unsigned lock_index) +static void schedule_order_unlock(uint32_t lock_index) { odp_atomic_u64_t *ord_lock; uint32_t queue_index; diff --git a/platform/linux-generic/odp_schedule_if.c b/platform/linux-generic/odp_schedule_if.c index e56e3722..ff664420 100644 --- a/platform/linux-generic/odp_schedule_if.c +++ b/platform/linux-generic/odp_schedule_if.c @@ -120,12 +120,12 @@ int odp_schedule_group_info(odp_schedule_group_t group, return sched_api->schedule_group_info(group, info); } -void odp_schedule_order_lock(unsigned lock_index) +void odp_schedule_order_lock(uint32_t lock_index) { return sched_api->schedule_order_lock(lock_index); } -void odp_schedule_order_unlock(unsigned lock_index) +void odp_schedule_order_unlock(uint32_t lock_index) { return sched_api->schedule_order_unlock(lock_index); } diff --git a/platform/linux-generic/odp_schedule_iquery.c b/platform/linux-generic/odp_schedule_iquery.c index afe8ee1a..59126a83 100644 --- a/platform/linux-generic/odp_schedule_iquery.c +++ b/platform/linux-generic/odp_schedule_iquery.c @@ -1153,7 +1153,7 @@ static inline void ordered_stash_release(void) static inline void release_ordered(void) { uint32_t qi; - unsigned i; + uint32_t i; qi = thread_local.ordered.src_queue; @@ -1255,7 +1255,7 @@ static void order_unlock(void) { } -static void schedule_order_lock(unsigned lock_index) +static void schedule_order_lock(uint32_t lock_index) { odp_atomic_u64_t *ord_lock; uint32_t queue_index; @@ -1282,7 +1282,7 @@ static void schedule_order_lock(unsigned lock_index) } } -static void schedule_order_unlock(unsigned lock_index) +static void schedule_order_unlock(uint32_t lock_index) { odp_atomic_u64_t *ord_lock; uint32_t queue_index; @@ -1299,7 +1299,7 @@ static void schedule_order_unlock(unsigned lock_index) odp_atomic_store_rel_u64(ord_lock, thread_local.ordered.ctx + 1); } -static unsigned schedule_max_ordered_locks(void) +static uint32_t schedule_max_ordered_locks(void) { return CONFIG_QUEUE_MAX_ORD_LOCKS; } diff --git a/platform/linux-generic/odp_schedule_scalable.c b/platform/linux-generic/odp_schedule_scalable.c index 676b3419..6f769ca5 100644 --- a/platform/linux-generic/odp_schedule_scalable.c +++ b/platform/linux-generic/odp_schedule_scalable.c @@ -1141,7 +1141,7 @@ restart_same: /******************************************************************************/ -static void schedule_order_lock(unsigned lock_index) +static void schedule_order_lock(uint32_t lock_index) { struct reorder_context *rctx = sched_ts->rctx; @@ -1161,7 +1161,7 @@ static void schedule_order_lock(unsigned lock_index) } } -static void schedule_order_unlock(unsigned lock_index) +static void schedule_order_unlock(uint32_t lock_index) { struct reorder_context *rctx; @@ -2046,7 +2046,7 @@ static void order_unlock(void) { } -static unsigned schedule_max_ordered_locks(void) +static uint32_t schedule_max_ordered_locks(void) { return CONFIG_QUEUE_MAX_ORD_LOCKS; } diff --git a/platform/linux-generic/odp_schedule_scalable_ordered.c b/platform/linux-generic/odp_schedule_scalable_ordered.c index 7261b446..9bc12f2a 100644 --- a/platform/linux-generic/odp_schedule_scalable_ordered.c +++ b/platform/linux-generic/odp_schedule_scalable_ordered.c @@ -246,7 +246,7 @@ static inline void olock_unlock(const reorder_context_t *rctx, static void olock_release(const reorder_context_t *rctx) { reorder_window_t *rwin; - int i; + uint32_t i; rwin = rctx->rwin; diff --git a/platform/linux-generic/odp_schedule_sp.c b/platform/linux-generic/odp_schedule_sp.c index 47e6ddd3..0dd2404a 100644 --- a/platform/linux-generic/odp_schedule_sp.c +++ b/platform/linux-generic/odp_schedule_sp.c @@ -243,7 +243,7 @@ static int term_local(void) return 0; } -static unsigned max_ordered_locks(void) +static uint32_t max_ordered_locks(void) { return NUM_ORDERED_LOCKS; } @@ -812,12 +812,12 @@ static int schedule_group_info(odp_schedule_group_t group, return 0; } -static void schedule_order_lock(unsigned lock_index) +static void schedule_order_lock(uint32_t lock_index) { (void)lock_index; } -static void schedule_order_unlock(unsigned lock_index) +static void schedule_order_unlock(uint32_t lock_index) { (void)lock_index; } commit f66f92352bb5d1ed3a19fe5b5b8ca0419e525274 Author: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Date: Thu Sep 14 02:11:24 2017 -0700 linux-generic: queue: change order lock count data type change order lock count data type from unsigned to uint32_t Signed-off-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/include/odp_queue_if.h b/platform/linux-generic/include/odp_queue_if.h index 410c6b79..ed8d6ca9 100644 --- a/platform/linux-generic/include/odp_queue_if.h +++ b/platform/linux-generic/include/odp_queue_if.h @@ -38,7 +38,7 @@ typedef struct { odp_schedule_sync_t (*queue_sched_type)(odp_queue_t queue); odp_schedule_prio_t (*queue_sched_prio)(odp_queue_t queue); odp_schedule_group_t (*queue_sched_group)(odp_queue_t queue); - int (*queue_lock_count)(odp_queue_t queue); + uint32_t (*queue_lock_count)(odp_queue_t queue); uint64_t (*queue_to_u64)(odp_queue_t hdl); void (*queue_param_init)(odp_queue_param_t *param); int (*queue_info)(odp_queue_t queue, odp_queue_info_t *info); diff --git a/platform/linux-generic/odp_queue.c b/platform/linux-generic/odp_queue.c index d941accc..3f355e69 100644 --- a/platform/linux-generic/odp_queue.c +++ b/platform/linux-generic/odp_queue.c @@ -175,12 +175,12 @@ static odp_schedule_group_t queue_sched_group(odp_queue_t handle) return handle_to_qentry(handle)->s.param.sched.group; } -static int queue_lock_count(odp_queue_t handle) +static uint32_t queue_lock_count(odp_queue_t handle) { queue_entry_t *queue = handle_to_qentry(handle); return queue->s.param.sched.sync == ODP_SCHED_SYNC_ORDERED ? - (int)queue->s.param.sched.lock_count : -1; + queue->s.param.sched.lock_count : 0; } static odp_queue_t queue_create(const char *name, diff --git a/platform/linux-generic/odp_queue_if.c b/platform/linux-generic/odp_queue_if.c index 44fda0d6..969b0d3c 100644 --- a/platform/linux-generic/odp_queue_if.c +++ b/platform/linux-generic/odp_queue_if.c @@ -92,7 +92,7 @@ odp_schedule_group_t odp_queue_sched_group(odp_queue_t queue) return queue_api->queue_sched_group(queue); } -int odp_queue_lock_count(odp_queue_t queue) +uint32_t odp_queue_lock_count(odp_queue_t queue) { return queue_api->queue_lock_count(queue); } diff --git a/platform/linux-generic/odp_queue_scalable.c b/platform/linux-generic/odp_queue_scalable.c index cef3236d..07201ce7 100644 --- a/platform/linux-generic/odp_queue_scalable.c +++ b/platform/linux-generic/odp_queue_scalable.c @@ -341,12 +341,12 @@ static odp_schedule_group_t queue_sched_group(odp_queue_t handle) return qentry_from_int(queue_from_ext(handle))->s.param.sched.group; } -static int queue_lock_count(odp_queue_t handle) +static uint32_t queue_lock_count(odp_queue_t handle) { queue_entry_t *queue = qentry_from_int(queue_from_ext(handle)); return queue->s.param.sched.sync == ODP_SCHED_SYNC_ORDERED ? - (int)queue->s.param.sched.lock_count : -1; + queue->s.param.sched.lock_count : 0; } static odp_queue_t queue_create(const char *name, commit e35949df96b46d2e23ca83029f468415efcbf18a Author: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Date: Thu Sep 14 03:27:11 2017 -0700 api: schedule: add schedule order unlock lock api Adds odp_schedule_order_unlock_lock() api. This api combines schedule order unlock and lock into a single api for performance optimization in HW Signed-off-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/include/odp/api/spec/schedule.h b/include/odp/api/spec/schedule.h index e2abf990..fe2300db 100644 --- a/include/odp/api/spec/schedule.h +++ b/include/odp/api/spec/schedule.h @@ -371,6 +371,27 @@ void odp_schedule_order_lock(uint32_t lock_index); void odp_schedule_order_unlock(uint32_t lock_index); /** + * Release existing ordered context lock and acquire a new lock + * + * This call is valid only when holding an ordered synchronization context. + * Release a previously locked ordered context lock and acquire a new ordered + * context lock. The operation is equivalent to application calling first + * odp_schedule_order_unlock(unlock_index) and then + * odp_schedule_order_lock(lock_index). The same constraints apply with this + * call as with those two. + * + * @param unlock_index Index of the acquired ordered lock in the current + * context to be released. + * @param lock_index Index of the ordered lock in the current context to be + * acquired. Must be in the range + * 0...odp_queue_lock_count() - 1. + * + * @see odp_schedule_order_lock(), odp_schedule_order_unlock() + * + */ +void odp_schedule_order_unlock_lock(uint32_t unlock_index, uint32_t lock_index); + +/** * @} */ commit d248692dfe6ace13138e48eb1c23c1f5e942269c Author: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Date: Mon Sep 11 06:16:42 2017 -0700 api: schedule: remove support for nested ordered lock removes support for nested ordered lock use-case changes function param signature from unsigned to uint32_t Signed-off-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/include/odp/api/spec/schedule.h b/include/odp/api/spec/schedule.h index 8244746d..e2abf990 100644 --- a/include/odp/api/spec/schedule.h +++ b/include/odp/api/spec/schedule.h @@ -347,12 +347,15 @@ int odp_schedule_group_info(odp_schedule_group_t group, * be protected by its own ordered lock. This promotes maximum parallelism by * allowing order to maintained on a more granular basis. If an ordered lock * is used multiple times in the same ordered context results are undefined. + * Only one ordered lock can be active in an ordered context at any given time. + * Results are undefined when multiple ordered locks are acquired in nested + * fashion within the same ordered context. * * @param lock_index Index of the ordered lock in the current context to be * acquired. Must be in the range 0..odp_queue_lock_count() * - 1 */ -void odp_schedule_order_lock(unsigned lock_index); +void odp_schedule_order_lock(uint32_t lock_index); /** * Release ordered context lock @@ -365,7 +368,7 @@ void odp_schedule_order_lock(unsigned lock_index); * hold this lock. Must be in the range * 0..odp_queue_lock_count() - 1 */ -void odp_schedule_order_unlock(unsigned lock_index); +void odp_schedule_order_unlock(uint32_t lock_index); /** * @} diff --git a/include/odp/api/spec/schedule_types.h b/include/odp/api/spec/schedule_types.h index 8a4e42c6..397f98fc 100644 --- a/include/odp/api/spec/schedule_types.h +++ b/include/odp/api/spec/schedule_types.h @@ -146,7 +146,7 @@ typedef struct odp_schedule_param_t { /** Ordered lock count for this queue * * Default value is 0. */ - unsigned lock_count; + uint32_t lock_count; } odp_schedule_param_t; /** commit 88efcd91e325438d7e2b7c410213ca95a9acefe5 Author: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Date: Thu Sep 14 02:09:39 2017 -0700 api: queue: change order lock count data type change order lock count data type from unsigned to uint32_t Signed-off-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/include/odp/api/spec/queue.h b/include/odp/api/spec/queue.h index 9dd0a561..73598be0 100644 --- a/include/odp/api/spec/queue.h +++ b/include/odp/api/spec/queue.h @@ -106,7 +106,7 @@ typedef struct odp_queue_capability_t { uint32_t max_queues; /** Maximum number of ordered locks per queue */ - unsigned max_ordered_locks; + uint32_t max_ordered_locks; /** Maximum number of scheduling groups */ unsigned max_sched_groups; @@ -393,10 +393,11 @@ odp_schedule_group_t odp_queue_sched_group(odp_queue_t queue); * * @param queue Queue handle * - * @return Number of ordered locks associated with this ordered queue - * @retval <0 Specified queue is not ordered + * @return Number of ordered locks associated with this ordered queue + * @retval 0 Specified queue is not ordered or no ordered lock associated + * with the ordered queue. */ -int odp_queue_lock_count(odp_queue_t queue); +uint32_t odp_queue_lock_count(odp_queue_t queue); /** * Get printable value for an odp_queue_t ----------------------------------------------------------------------- Summary of changes: include/odp/api/spec/ipsec.h | 4 ++-- include/odp/api/spec/queue.h | 9 +++---- include/odp/api/spec/schedule.h | 28 ++++++++++++++++++++-- include/odp/api/spec/schedule_types.h | 2 +- platform/linux-generic/include/odp_queue_if.h | 2 +- platform/linux-generic/include/odp_schedule_if.h | 9 ++++--- .../include/odp_schedule_scalable_ordered.h | 2 +- platform/linux-generic/odp_ipsec.c | 2 +- platform/linux-generic/odp_queue.c | 4 ++-- platform/linux-generic/odp_queue_if.c | 2 +- platform/linux-generic/odp_queue_scalable.c | 4 ++-- platform/linux-generic/odp_schedule.c | 20 +++++++++++----- platform/linux-generic/odp_schedule_if.c | 9 +++++-- platform/linux-generic/odp_schedule_iquery.c | 18 ++++++++++---- platform/linux-generic/odp_schedule_scalable.c | 14 ++++++++--- .../linux-generic/odp_schedule_scalable_ordered.c | 2 +- platform/linux-generic/odp_schedule_sp.c | 16 +++++++++---- test/common_plat/validation/api/queue/queue.c | 8 +++---- .../validation/api/scheduler/scheduler.c | 20 ++++++++-------- 19 files changed, 120 insertions(+), 55 deletions(-) hooks/post-receive --

8 years, 12 months

[COMMIT] branch api-next updated. v1.15.0.0-682-gf91cde2b

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 f91cde2bb770eefcfe791ce49c67ce3b1f5bf6d2 (commit) via 3e03317f3663abc76708141233b18d6225b2482b (commit) via cc6d4562f16e134299e21ca3e545999c97549ad0 (commit) via 80321bd9880b03929056483be9bc9d8861636b33 (commit) via e1c46f8e296a730ed27141a33189185bb7dfd1b1 (commit) via 054306373ed6aa7a65a160d11ca339b24cf9c662 (commit) via a38ea82cf1ae45b7c807164dde5783d099efd39d (commit) from 8c5516bba62ee7250cbf64d1f4b89ee4f0b12824 (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 f91cde2bb770eefcfe791ce49c67ce3b1f5bf6d2 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Tue Sep 5 16:01:55 2017 +0300 api: packet_io: refine rules for checksum calculation An implementation must be able to check checksum for normal IP packets. It's implementation defined if options or extension headers are supported. Parsing configuration must match the layers of checksum check configuration. Checksum insertion on packet output can expect well formed packet headers from the application. Checksum calculation ignores possible extra data in the packet. Signed-off-by: Petri Savolainen <petri.savolainen(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/ipsec.h b/include/odp/api/spec/ipsec.h index 7085bc0d..0b36b864 100644 --- a/include/odp/api/spec/ipsec.h +++ b/include/odp/api/spec/ipsec.h @@ -156,7 +156,9 @@ typedef struct odp_ipsec_inbound_config_t { odp_ipsec_proto_layer_t parse; /** Flags to control IPSEC payload data checks up to the selected parse - * level. */ + * level. Checksum checking status can be queried for each packet with + * odp_packet_l3_chksum_status() and odp_packet_l4_chksum_status(). + */ union { /** Mapping for individual bits */ struct { @@ -191,10 +193,12 @@ typedef struct odp_ipsec_inbound_config_t { */ typedef struct odp_ipsec_outbound_config_t { /** Flags to control L3/L4 checksum insertion as part of outbound - * packet processing. Packet must have set with valid L3/L4 offsets. - * Checksum configuration is ignored for packets that checksum cannot - * be computed for (e.g. IPv4 fragments). Application may use a packet - * metadata flag to disable checksum insertion per packet bases. + * packet processing. These flags control checksum insertion (for the + * payload packet) in the same way as the checksum flags in + * odp_pktout_config_opt_t control checksum insertion when sending + * packets out through a pktio interface. Also packet checksum override + * functions (e.g. odp_packet_l4_chksum_insert()) can be used in + * the same way. */ union { /** Mapping for individual bits */ diff --git a/include/odp/api/spec/packet.h b/include/odp/api/spec/packet.h index b3e1449f..c498e2e2 100644 --- a/include/odp/api/spec/packet.h +++ b/include/odp/api/spec/packet.h @@ -1428,6 +1428,10 @@ odp_packet_chksum_status_t odp_packet_l4_chksum_status(odp_packet_t pkt); * overrides a higher level configuration for checksum insertion into a L3 * header during packet output processing. * + * Calling this function is always allowed but the checksum will not be + * inserted if the packet is output through a pktio that does not have + * the relevant pktout chksum bit set in the pktio capability. + * * @param pkt Packet handle * @param l3 0: do not insert L3 checksum * 1: insert L3 checksum @@ -1441,6 +1445,10 @@ void odp_packet_l3_chksum_insert(odp_packet_t pkt, int l3); * overrides a higher level configuration for checksum insertion into a L4 * header during packet output processing. * + * Calling this function is always allowed but the checksum will not be + * inserted if the packet is output through a pktio that does not have + * the relevant pktout chksum bit set in the pktio capability. + * * @param pkt Packet handle * @param l4 0: do not insert L4 checksum * 1: insert L4 checksum diff --git a/include/odp/api/spec/packet_io.h b/include/odp/api/spec/packet_io.h index 6040a831..b56a5205 100644 --- a/include/odp/api/spec/packet_io.h +++ b/include/odp/api/spec/packet_io.h @@ -256,11 +256,27 @@ typedef struct odp_pktio_param_t { * belong to time synchronization protocol (PTP). * * Packet input checksum checking may be enabled or disabled. When it is - * enabled, implementation will verify checksum correctness on incoming packets - * and depending on drop configuration either deliver erroneous packets with - * appropriate flags set (e.g. odp_packet_has_l3_error()) or drop those. - * When packet dropping is enabled, application will never receive a packet - * with the specified error and may avoid to check the error flag. + * enabled, implementation will attempt to verify checksum correctness on + * incoming packets and depending on drop configuration either deliver erroneous + * packets with appropriate flags set (e.g. odp_packet_has_l3_error(), + * odp_packet_l3_chksum_status()) or drop those. When packet dropping is + * enabled, application will never receive a packet with the specified error + * and may avoid to check the error flag. + * + * If checksum checking is enabled, IPv4 header checksum checking is always + * done for packets that do not have IP options and L4 checksum checking + * is done for unfragmented packets that do not have IPv4 options or IPv6 + * extension headers. In other cases checksum checking may or may not + * be done. For example, L4 checksum of fragmented packets is typically + * not checked. + * + * IPv4 checksum checking may be enabled only when parsing level is + * ODP_PKTIO_PARSER_LAYER_L3 or higher. Similarly, L4 level checksum checking + * may be enabled only with parsing level ODP_PKTIO_PARSER_LAYER_L4 or higher. + * + * Whether checksum checking was done and whether a checksum was correct + * can be queried for each received packet with odp_packet_l3_chksum_status() + * and odp_packet_l4_chksum_status(). */ typedef union odp_pktin_config_opt_t { /** Option flags */ @@ -314,13 +330,27 @@ typedef union odp_pktin_config_opt_t { * Packet output configuration options listed in a bit field structure. Packet * output checksum insertion may be enabled or disabled. When it is enabled, * implementation will calculate and insert checksum into every outgoing packet - * by default. Application may use a packet metadata flag to disable checksum - * insertion per packet bases. For correct operation, packet metadata must - * provide valid offsets for the appropriate protocols. For example, UDP - * checksum calculation needs both L3 and L4 offsets (to access IP and UDP - * headers). When application (e.g. a switch) does not modify L3/L4 data and - * thus checksum does not need to be updated, output checksum insertion should - * be disabled for optimal performance. + * by default. Application may disable checksum insertion (e.g. + * odp_packet_l4_chksum_insert()) on per packet basis. For correct operation, + * packet metadata must provide valid offsets for the appropriate protocols. + * For example, UDP checksum calculation needs both L3 and L4 offsets (to access + * IP and UDP headers). When application (e.g. a switch) does not modify L3/L4 + * data and thus checksum does not need to be updated, output checksum insertion + * should be disabled for optimal performance. + * + * Packet flags (odp_packet_has_*()) are ignored for the purpose of checksum + * insertion in packet output. + * + * UDP, TCP and SCTP checksum insertion must not be requested for IP fragments. + * Use checksum override function (odp_packet_l4_chksum_insert()) to disable + * checksumming when sending a fragment through a packet IO interface that has + * the relevant L4 checksum insertion enabled. + * + * Result of checksum insertion at packet output is undefined if the protocol + * headers required for checksum calculation are not well formed. Packet must + * contain at least as many data bytes after L3/L4 offsets as the headers + * indicate. Other data bytes of the packet are ignored for the checksum + * insertion. */ typedef union odp_pktout_config_opt_t { /** Option flags */ commit 3e03317f3663abc76708141233b18d6225b2482b Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Tue Sep 5 15:36:04 2017 +0300 api: packet: add checksum status Added functions to request L3/L4 checksum check status for a packet. Even if checksum checking is enabled on an interface, all packets may not be checked - for example L4 checksum cannot be checked for fragments (before reassembly). Also it varies how e.g. IP options affect HW checksum capability. Signed-off-by: Petri Savolainen <petri.savolainen(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/packet.h b/include/odp/api/spec/packet.h index 95f5349b..b3e1449f 100644 --- a/include/odp/api/spec/packet.h +++ b/include/odp/api/spec/packet.h @@ -83,6 +83,22 @@ typedef struct odp_packet_data_range { } odp_packet_data_range_t; +/** + * Checksum check status in packet + */ +typedef enum odp_packet_chksum_status_t { + /** Checksum was not checked. Checksum check was not attempted or + * the attempt failed. */ + ODP_PACKET_CHKSUM_UNKNOWN = 0, + + /** Checksum was checked and it was not correct */ + ODP_PACKET_CHKSUM_BAD, + + /** Checksum was checked and it was correct */ + ODP_PACKET_CHKSUM_OK + +} odp_packet_chksum_status_t; + /* * * Alloc and free @@ -1378,6 +1394,34 @@ uint32_t odp_packet_l4_offset(odp_packet_t pkt); int odp_packet_l4_offset_set(odp_packet_t pkt, uint32_t offset); /** + * Layer 3 checksum check status + * + * Returns the result of the latest layer 3 checksum check done for the packet. + * The status tells if checksum check was attempted and the result of the + * attempt. It depends on packet input (or IPSEC) configuration, packet content + * and implementation capabilities if checksum check is attempted for a packet. + * + * @param pkt Packet handle + * + * @return L3 checksum check status + */ +odp_packet_chksum_status_t odp_packet_l3_chksum_status(odp_packet_t pkt); + +/** + * Layer 4 checksum check status + * + * Returns the result of the latest layer 4 checksum check done for the packet. + * The status tells if checksum check was attempted and the result of the + * attempt. It depends on packet input (or IPSEC) configuration, packet content + * and implementation capabilities if checksum check is attempted for a packet. + * + * @param pkt Packet handle + * + * @return L4 checksum check status + */ +odp_packet_chksum_status_t odp_packet_l4_chksum_status(odp_packet_t pkt); + +/** * Layer 3 checksum insertion override * * Override checksum insertion configuration per packet. This per packet setting commit cc6d4562f16e134299e21ca3e545999c97549ad0 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Tue Sep 5 13:46:58 2017 +0300 api: packet_io: refine packet format on output Define explicitly that (by default) packet output does not need any extra metadata to be set. Also (Ethernet) padding and CRC are added by default. Signed-off-by: Petri Savolainen <petri.savolainen(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/packet_io.h b/include/odp/api/spec/packet_io.h index d42cebf0..6040a831 100644 --- a/include/odp/api/spec/packet_io.h +++ b/include/odp/api/spec/packet_io.h @@ -889,6 +889,11 @@ uint64_t odp_pktin_wait_time(uint64_t nsec); * is less than 'num', the remaining packets at the end of packets[] array * are not consumed, and the caller has to take care of them. * + * Entire packet data is sent out (odp_packet_len() bytes of data, starting from + * odp_packet_data()). All other packet metadata is ignored unless otherwise + * specified e.g. for protocol offload purposes. Link protocol specific frame + * checksum and padding are added to frames before transmission. + * * @param queue Packet output queue handle for sending packets * @param packets[] Array of packets to send * @param num Number of packets to send commit 80321bd9880b03929056483be9bc9d8861636b33 Merge: 8c5516bb e1c46f8e Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Fri Sep 15 18:39:04 2017 +0300 Merge branch 'master' into api-next diff --cc platform/linux-generic/include/odp_internal.h index ab935ff8,e0cc6dd4..a3516ded --- a/platform/linux-generic/include/odp_internal.h +++ b/platform/linux-generic/include/odp_internal.h @@@ -133,9 -130,8 +133,10 @@@ int _odp_ishm_init_local(void) int _odp_ishm_term_global(void); int _odp_ishm_term_local(void); +int _odp_modules_init_global(void); + int cpuinfo_parser(FILE *file, system_info_t *sysinfo); + uint64_t odp_cpufreq_id(const char *filename, int id); uint64_t odp_cpu_hz_current(int id); void sys_info_print_arch(void); ----------------------------------------------------------------------- Summary of changes: helper/include/odp/helper/ip.h | 11 ++++ helper/include/odph_list_internal.h | 22 +++++++- include/odp/api/spec/ipsec.h | 14 +++-- include/odp/api/spec/packet.h | 52 +++++++++++++++++++ include/odp/api/spec/packet_io.h | 59 +++++++++++++++++----- .../linux-generic/arch/arm/odp_sysinfo_parse.c | 5 -- .../linux-generic/arch/default/odp_sysinfo_parse.c | 5 -- .../linux-generic/arch/mips64/odp_sysinfo_parse.c | 5 -- .../linux-generic/arch/powerpc/odp_sysinfo_parse.c | 5 -- .../linux-generic/arch/x86/odp_sysinfo_parse.c | 36 ------------- platform/linux-generic/include/odp_internal.h | 1 + platform/linux-generic/odp_system_info.c | 37 ++++++++++++++ 12 files changed, 177 insertions(+), 75 deletions(-) hooks/post-receive --

8 years, 12 months

[COMMIT] branch master updated. v1.15.0.0-206-ge1c46f8e

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 e1c46f8e296a730ed27141a33189185bb7dfd1b1 (commit) from 054306373ed6aa7a65a160d11ca339b24cf9c662 (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 e1c46f8e296a730ed27141a33189185bb7dfd1b1 Author: Kelvin Cheung <keguang.zhang(a)gmail.com> Date: Wed Aug 23 17:00:58 2017 +0800 linux-gen: system: correctly set CPU frequency When CPU frequency info under /sys is available, use the real value instead of default value. Signed-off-by: Kelvin Cheung <keguang.zhang(a)gmail.com> Reviewed-by: Ilias Apalodimas <ilias.apalodimas(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/arch/arm/odp_sysinfo_parse.c b/platform/linux-generic/arch/arm/odp_sysinfo_parse.c index 1e9db418..1e2c729a 100644 --- a/platform/linux-generic/arch/arm/odp_sysinfo_parse.c +++ b/platform/linux-generic/arch/arm/odp_sysinfo_parse.c @@ -23,11 +23,6 @@ int cpuinfo_parser(FILE *file ODP_UNUSED, system_info_t *sysinfo) return 0; } -uint64_t odp_cpu_hz_current(int id ODP_UNUSED) -{ - return 0; -} - void sys_info_print_arch(void) { } diff --git a/platform/linux-generic/arch/default/odp_sysinfo_parse.c b/platform/linux-generic/arch/default/odp_sysinfo_parse.c index 1e9db418..1e2c729a 100644 --- a/platform/linux-generic/arch/default/odp_sysinfo_parse.c +++ b/platform/linux-generic/arch/default/odp_sysinfo_parse.c @@ -23,11 +23,6 @@ int cpuinfo_parser(FILE *file ODP_UNUSED, system_info_t *sysinfo) return 0; } -uint64_t odp_cpu_hz_current(int id ODP_UNUSED) -{ - return 0; -} - void sys_info_print_arch(void) { } diff --git a/platform/linux-generic/arch/mips64/odp_sysinfo_parse.c b/platform/linux-generic/arch/mips64/odp_sysinfo_parse.c index 2a37ae70..5ed7a398 100644 --- a/platform/linux-generic/arch/mips64/odp_sysinfo_parse.c +++ b/platform/linux-generic/arch/mips64/odp_sysinfo_parse.c @@ -60,11 +60,6 @@ int cpuinfo_parser(FILE *file, system_info_t *sysinfo) return 0; } -uint64_t odp_cpu_hz_current(int id ODP_UNUSED) -{ - return 0; -} - void sys_info_print_arch(void) { } diff --git a/platform/linux-generic/arch/powerpc/odp_sysinfo_parse.c b/platform/linux-generic/arch/powerpc/odp_sysinfo_parse.c index 29c97613..02a83e51 100644 --- a/platform/linux-generic/arch/powerpc/odp_sysinfo_parse.c +++ b/platform/linux-generic/arch/powerpc/odp_sysinfo_parse.c @@ -59,11 +59,6 @@ int cpuinfo_parser(FILE *file, system_info_t *sysinfo) return 0; } -uint64_t odp_cpu_hz_current(int id ODP_UNUSED) -{ - return 0; -} - void sys_info_print_arch(void) { } diff --git a/platform/linux-generic/arch/x86/odp_sysinfo_parse.c b/platform/linux-generic/arch/x86/odp_sysinfo_parse.c index f7918d40..55bbda8c 100644 --- a/platform/linux-generic/arch/x86/odp_sysinfo_parse.c +++ b/platform/linux-generic/arch/x86/odp_sysinfo_parse.c @@ -41,42 +41,6 @@ int cpuinfo_parser(FILE *file, system_info_t *sysinfo) return 0; } -uint64_t odp_cpu_hz_current(int id) -{ - char str[1024]; - FILE *file; - int cpu; - char *pos; - double mhz = 0.0; - - file = fopen("/proc/cpuinfo", "rt"); - - /* find the correct processor instance */ - while (fgets(str, sizeof(str), file) != NULL) { - pos = strstr(str, "processor"); - if (pos) { - if (sscanf(pos, "processor : %d", &cpu) == 1) - if (cpu == id) - break; - } - } - - /* extract the cpu current speed */ - while (fgets(str, sizeof(str), file) != NULL) { - pos = strstr(str, "cpu MHz"); - if (pos) { - if (sscanf(pos, "cpu MHz : %lf", &mhz) == 1) - break; - } - } - - fclose(file); - if (mhz) - return (uint64_t)(mhz * 1000000.0); - - return 0; -} - void sys_info_print_arch(void) { cpu_flags_print_all(); diff --git a/platform/linux-generic/include/odp_internal.h b/platform/linux-generic/include/odp_internal.h index 355e25f7..e0cc6dd4 100644 --- a/platform/linux-generic/include/odp_internal.h +++ b/platform/linux-generic/include/odp_internal.h @@ -131,6 +131,7 @@ int _odp_ishm_term_global(void); int _odp_ishm_term_local(void); int cpuinfo_parser(FILE *file, system_info_t *sysinfo); +uint64_t odp_cpufreq_id(const char *filename, int id); uint64_t odp_cpu_hz_current(int id); void sys_info_print_arch(void); diff --git a/platform/linux-generic/odp_system_info.c b/platform/linux-generic/odp_system_info.c index d6eeb786..d310d779 100644 --- a/platform/linux-generic/odp_system_info.c +++ b/platform/linux-generic/odp_system_info.c @@ -261,6 +261,30 @@ static char *get_hugepage_dir(uint64_t hugepage_sz) } /* + * Analysis of /sys/devices/system/cpu/cpu%d/cpufreq/ files + */ +uint64_t odp_cpufreq_id(const char *filename, int id) +{ + char path[256], buffer[256], *endptr = NULL; + FILE *file; + uint64_t ret = 0; + + snprintf(path, sizeof(path), + "/sys/devices/system/cpu/cpu%d/cpufreq/%s", id, filename); + + file = fopen(path, "r"); + if (file == NULL) + return ret; + + if (fgets(buffer, sizeof(buffer), file) != NULL) + ret = strtoull(buffer, &endptr, 0) * 1000; + + fclose(file); + + return ret; +} + +/* * Analysis of /sys/devices/system/cpu/ files */ static int systemcpu(system_info_t *sysinfo) @@ -310,6 +334,7 @@ static int system_hp(hugepage_info_t *hugeinfo) */ int odp_system_info_init(void) { + int i; FILE *file; memset(&odp_global_data.system_info, 0, sizeof(system_info_t)); @@ -326,6 +351,13 @@ int odp_system_info_init(void) fclose(file); + for (i = 0; i < MAX_CPU_NUMBER; i++) { + uint64_t cpu_hz_max = odp_cpufreq_id("cpuinfo_max_freq", i); + + if (cpu_hz_max) + odp_global_data.system_info.cpu_hz_max[i] = cpu_hz_max; + } + if (systemcpu(&odp_global_data.system_info)) { ODP_ERR("systemcpu failed\n"); return -1; @@ -351,6 +383,11 @@ int odp_system_info_term(void) * Public access functions ************************* */ +uint64_t odp_cpu_hz_current(int id) +{ + return odp_cpufreq_id("cpuinfo_cur_freq", id); +} + uint64_t odp_cpu_hz(void) { int id = sched_getcpu(); ----------------------------------------------------------------------- Summary of changes: .../linux-generic/arch/arm/odp_sysinfo_parse.c | 5 --- .../linux-generic/arch/default/odp_sysinfo_parse.c | 5 --- .../linux-generic/arch/mips64/odp_sysinfo_parse.c | 5 --- .../linux-generic/arch/powerpc/odp_sysinfo_parse.c | 5 --- .../linux-generic/arch/x86/odp_sysinfo_parse.c | 36 --------------------- platform/linux-generic/include/odp_internal.h | 1 + platform/linux-generic/odp_system_info.c | 37 ++++++++++++++++++++++ 7 files changed, 38 insertions(+), 56 deletions(-) hooks/post-receive --

8 years, 12 months

[COMMIT] branch master updated. v1.15.0.0-205-g05430637

by git＠git-us.linaro.org

8 years, 12 months

[COMMIT] branch api-next updated. v1.15.0.0-675-g8c5516bb

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 8c5516bba62ee7250cbf64d1f4b89ee4f0b12824 (commit) from 32f5f3ff343b516cb0dbe98e81479e6c748f0ebf (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 8c5516bba62ee7250cbf64d1f4b89ee4f0b12824 Author: Ola Liljedahl <ola.liljedahl(a)arm.com> Date: Thu Aug 31 21:46:47 2017 +0200 linux-gen: scheduled pktin polling for ssched Pktin polling is handled by the scalable scheduler the same way as queues. Non-empty pktin queues stay on the schedq of their designated priority level. Empty pktin queues are pushed to a lower-than-lowest priority schedq so to be polled only when all other (highest to lowest priority) schedq's have been processed. Signed-off-by: Ola Liljedahl <ola.liljedahl(a)arm.com> Reviewed-by: Honnappa Nagarahalli <honnappa.nagarahalli(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/include/odp_queue_scalable_internal.h b/platform/linux-generic/include/odp_queue_scalable_internal.h index f15314b2..ddc65f60 100644 --- a/platform/linux-generic/include/odp_queue_scalable_internal.h +++ b/platform/linux-generic/include/odp_queue_scalable_internal.h @@ -58,6 +58,8 @@ union queue_entry_u { int _odp_queue_deq(sched_elem_t *q, odp_buffer_hdr_t *buf_hdr[], int num); int _odp_queue_deq_sc(sched_elem_t *q, odp_event_t *evp, int num); int _odp_queue_deq_mc(sched_elem_t *q, odp_event_t *evp, int num); +int _odp_queue_enq_sp(sched_elem_t *q, odp_buffer_hdr_t *buf_hdr[], int num); +queue_entry_t *qentry_from_ext(odp_queue_t handle); /* Round up memory size to next cache line size to * align all memory addresses on cache line boundary. diff --git a/platform/linux-generic/include/odp_schedule_if.h b/platform/linux-generic/include/odp_schedule_if.h index 657993b1..71538e62 100644 --- a/platform/linux-generic/include/odp_schedule_if.h +++ b/platform/linux-generic/include/odp_schedule_if.h @@ -14,9 +14,15 @@ extern "C" { #include <odp/api/queue.h> #include <odp_queue_if.h> #include <odp/api/schedule.h> +#include <odp_forward_typedefs_internal.h> -typedef void (*schedule_pktio_start_fn_t)(int pktio_index, int num_in_queue, - int in_queue_idx[]); +/* Number of ordered locks per queue */ +#define SCHEDULE_ORDERED_LOCKS_PER_QUEUE 2 + +typedef void (*schedule_pktio_start_fn_t)(int pktio_index, + int num_in_queue, + int in_queue_idx[], + odp_queue_t odpq[]); typedef int (*schedule_thr_add_fn_t)(odp_schedule_group_t group, int thr); typedef int (*schedule_thr_rem_fn_t)(odp_schedule_group_t group, int thr); typedef int (*schedule_num_grps_fn_t)(void); @@ -66,6 +72,7 @@ extern const schedule_fn_t *sched_fn; /* Interface for the scheduler */ int sched_cb_pktin_poll(int pktio_index, int num_queue, int index[]); +int sched_cb_pktin_poll_one(int pktio_index, int rx_queue, odp_event_t evts[]); void sched_cb_pktio_stop_finalize(int pktio_index); odp_queue_t sched_cb_queue_handle(uint32_t queue_index); void sched_cb_queue_destroy_finalize(uint32_t queue_index); diff --git a/platform/linux-generic/include/odp_schedule_scalable.h b/platform/linux-generic/include/odp_schedule_scalable.h index 8a2d70da..ac357b01 100644 --- a/platform/linux-generic/include/odp_schedule_scalable.h +++ b/platform/linux-generic/include/odp_schedule_scalable.h @@ -22,8 +22,12 @@ * constants, but not ODP_SCHED_PRIO_NUM. The current API for this * is odp_schedule_num_prio(). The other schedulers also define * this internally as NUM_PRIO. + * + * One additional priority level for idle pktin queues. + * This is only for internal use and not visible to the user. */ -#define ODP_SCHED_PRIO_NUM 8 +#define ODP_SCHED_PRIO_PKTIN 8 +#define ODP_SCHED_PRIO_NUM 9 typedef struct { union { @@ -55,14 +59,18 @@ typedef uint32_t ringidx_t; #define ODP_NO_SCHED_QUEUE (ODP_SCHED_SYNC_ORDERED + 1) typedef struct { - struct llnode node; /* must be first */ + struct llnode node; sched_queue_t *schedq; #ifdef CONFIG_QSCHST_LOCK odp_ticketlock_t qschlock; #endif qschedstate_t qschst; - uint16_t pop_deficit; - uint16_t qschst_type; + uint8_t pop_deficit; + uint8_t qschst_type; + uint8_t pktio_idx; + uint8_t rx_queue; + uint16_t xoffset; + uint8_t sched_prio; ringidx_t prod_read SPLIT_PC; ringidx_t prod_write; ringidx_t prod_mask; @@ -80,6 +88,7 @@ typedef struct { #define cons_ring prod_ring #define cons_type qschst_type #endif + odp_schedule_group_t sched_grp; } sched_elem_t ODP_ALIGNED_CACHE; /* Number of scheduling groups */ @@ -106,6 +115,8 @@ typedef struct { typedef struct { /* Atomic queue currently being processed or NULL */ sched_elem_t *atomq; + /* Schedq the currently processed queue was popped from */ + sched_queue_t *src_schedq; /* Current reorder context or NULL */ reorder_context_t *rctx; uint8_t pause; @@ -113,8 +124,6 @@ typedef struct { uint8_t tidx; uint8_t pad; uint32_t dequeued; /* Number of events dequeued from atomic queue */ - uint16_t pktin_next; /* Next pktin tag to poll */ - uint16_t pktin_poll_cnts; uint16_t ticket; /* Ticket for atomic queue or TICKET_INVALID */ uint16_t num_schedq; uint16_t sg_sem; /* Set when sg_wanted is modified by other thread */ @@ -133,7 +142,7 @@ typedef struct { void sched_update_enq(sched_elem_t *q, uint32_t actual); void sched_update_enq_sp(sched_elem_t *q, uint32_t actual); -sched_queue_t *schedq_from_sched_group(odp_schedule_group_t grp, uint32_t prio); -void sched_group_xcount_dec(odp_schedule_group_t grp, uint32_t prio); +sched_queue_t *sched_queue_add(odp_schedule_group_t grp, uint32_t prio); +void sched_queue_rem(odp_schedule_group_t grp, uint32_t prio); #endif /* ODP_SCHEDULE_SCALABLE_H */ diff --git a/platform/linux-generic/include/odp_schedule_scalable_ordered.h b/platform/linux-generic/include/odp_schedule_scalable_ordered.h index 1c365a2b..ca49bbf4 100644 --- a/platform/linux-generic/include/odp_schedule_scalable_ordered.h +++ b/platform/linux-generic/include/odp_schedule_scalable_ordered.h @@ -115,6 +115,8 @@ reorder_window_t *rwin_alloc(_odp_ishm_pool_t *pool, unsigned lock_count); int rwin_free(_odp_ishm_pool_t *pool, reorder_window_t *rwin); bool rwin_reserve(reorder_window_t *rwin, uint32_t *sn); +bool rwin_reserve_sc(reorder_window_t *rwin, uint32_t *sn); +void rwin_unreserve_sc(reorder_window_t *rwin, uint32_t sn); void rctx_init(reorder_context_t *rctx, uint16_t idx, reorder_window_t *rwin, uint32_t sn); void rctx_release(reorder_context_t *rctx); diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c index 732e0c15..bf792a34 100644 --- a/platform/linux-generic/odp_packet_io.c +++ b/platform/linux-generic/odp_packet_io.c @@ -469,9 +469,11 @@ int odp_pktio_start(odp_pktio_t hdl) unsigned i; unsigned num = entry->s.num_in_queue; int index[num]; + odp_queue_t odpq[num]; for (i = 0; i < num; i++) { index[i] = i; + odpq[i] = entry->s.in_queue[i].queue; if (entry->s.in_queue[i].queue == ODP_QUEUE_INVALID) { ODP_ERR("No input queue\n"); @@ -479,7 +481,7 @@ int odp_pktio_start(odp_pktio_t hdl) } } - sched_fn->pktio_start(pktio_to_id(hdl), num, index); + sched_fn->pktio_start(pktio_to_id(hdl), num, index, odpq); } return res; @@ -668,6 +670,51 @@ static int pktin_deq_multi(queue_t q_int, odp_buffer_hdr_t *buf_hdr[], int num) return nbr; } +int sched_cb_pktin_poll_one(int pktio_index, + int rx_queue, + odp_event_t evt_tbl[QUEUE_MULTI_MAX]) +{ + int num_rx, num_pkts, i; + pktio_entry_t *entry = pktio_entry_by_index(pktio_index); + odp_packet_t pkt; + odp_packet_hdr_t *pkt_hdr; + odp_buffer_hdr_t *buf_hdr; + odp_packet_t packets[QUEUE_MULTI_MAX]; + queue_t queue; + + if (odp_unlikely(entry->s.state != PKTIO_STATE_STARTED)) { + if (entry->s.state < PKTIO_STATE_ACTIVE || + entry->s.state == PKTIO_STATE_STOP_PENDING) + return -1; + + ODP_DBG("interface not started\n"); + return 0; + } + + ODP_ASSERT((unsigned)rx_queue < entry->s.num_in_queue); + num_pkts = entry->s.ops->recv(entry, rx_queue, + packets, QUEUE_MULTI_MAX); + + num_rx = 0; + for (i = 0; i < num_pkts; i++) { + pkt = packets[i]; + pkt_hdr = odp_packet_hdr(pkt); + if (odp_unlikely(pkt_hdr->p.input_flags.dst_queue)) { + queue = pkt_hdr->dst_queue; + buf_hdr = packet_to_buf_hdr(pkt); + if (queue_fn->enq_multi(queue, &buf_hdr, 1) < 0) + /* Queue full? */ + odp_packet_free(pkt); + __atomic_fetch_add(&entry->s.stats.in_discards, + 1, + __ATOMIC_RELAXED); + } else { + evt_tbl[num_rx++] = odp_packet_to_event(pkt); + } + } + return num_rx; +} + int sched_cb_pktin_poll(int pktio_index, int num_queue, int index[]) { odp_buffer_hdr_t *hdr_tbl[QUEUE_MULTI_MAX]; diff --git a/platform/linux-generic/odp_queue_scalable.c b/platform/linux-generic/odp_queue_scalable.c index bcda2195..cef3236d 100644 --- a/platform/linux-generic/odp_queue_scalable.c +++ b/platform/linux-generic/odp_queue_scalable.c @@ -70,6 +70,11 @@ static queue_entry_t *get_qentry(uint32_t queue_id) return &queue_tbl->queue[queue_id]; } +queue_entry_t *qentry_from_ext(odp_queue_t handle) +{ + return get_qentry(queue_to_id(handle)); +} + static int _odp_queue_disable_enq(sched_elem_t *q) { ringidx_t old_read, old_write, new_write; @@ -170,9 +175,12 @@ static int queue_init(queue_entry_t *queue, const char *name, goto rwin_create_failed; } } + sched_elem->sched_grp = param->sched.group; + sched_elem->sched_prio = param->sched.prio; sched_elem->schedq = - schedq_from_sched_group(param->sched.group, - param->sched.prio); + sched_queue_add(param->sched.group, param->sched.prio); + ODP_ASSERT(sched_elem->schedq != NULL); + } return 0; @@ -433,19 +441,20 @@ static int queue_destroy(odp_queue_t handle) doze(); } - /* Adjust the spread factor for the queues in the schedule group */ - if (queue->s.type == ODP_QUEUE_TYPE_SCHED) - sched_group_xcount_dec(queue->s.param.sched.group, - queue->s.param.sched.prio); + if (q->schedq != NULL) { + sched_queue_rem(q->sched_grp, q->sched_prio); + q->schedq = NULL; + } _odp_ishm_pool_free(queue_shm_pool, q->prod_ring); - if (queue->s.param.sched.sync == ODP_SCHED_SYNC_ORDERED) { + if (q->rwin != NULL) { if (rwin_free(queue_shm_pool, q->rwin) < 0) { ODP_ERR("Failed to free reorder window\n"); UNLOCK(&queue->s.lock); return -1; } + q->rwin = NULL; } queue->s.status = QUEUE_STATUS_FREE; UNLOCK(&queue->s.lock); @@ -554,11 +563,11 @@ static inline int _odp_queue_enq(sched_elem_t *q, return actual; } -#else +#endif -static inline int _odp_queue_enq_sp(sched_elem_t *q, - odp_buffer_hdr_t *buf_hdr[], - int num) +int _odp_queue_enq_sp(sched_elem_t *q, + odp_buffer_hdr_t *buf_hdr[], + int num) { ringidx_t old_read; ringidx_t old_write; @@ -602,7 +611,6 @@ static inline int _odp_queue_enq_sp(sched_elem_t *q, return actual; } -#endif static int _queue_enq_multi(queue_t handle, odp_buffer_hdr_t *buf_hdr[], int num) diff --git a/platform/linux-generic/odp_schedule.c b/platform/linux-generic/odp_schedule.c index 5b940762..8c444f4d 100644 --- a/platform/linux-generic/odp_schedule.c +++ b/platform/linux-generic/odp_schedule.c @@ -592,7 +592,7 @@ static inline void free_pktio_cmd(pktio_cmd_t *cmd) } static void schedule_pktio_start(int pktio_index, int num_pktin, - int pktin_idx[]) + int pktin_idx[], odp_queue_t odpq[] ODP_UNUSED) { int i, idx; pktio_cmd_t *cmd; diff --git a/platform/linux-generic/odp_schedule_iquery.c b/platform/linux-generic/odp_schedule_iquery.c index b81e5dab..afe8ee1a 100644 --- a/platform/linux-generic/odp_schedule_iquery.c +++ b/platform/linux-generic/odp_schedule_iquery.c @@ -574,7 +574,10 @@ static inline void free_pktio_cmd(pktio_cmd_t *cmd) odp_rwlock_write_unlock(&sched->pktio_poll.lock); } -static void schedule_pktio_start(int pktio, int count, int pktin[]) +static void schedule_pktio_start(int pktio, + int count, + int pktin[], + odp_queue_t odpq[] ODP_UNUSED) { int i, index; pktio_cmd_t *cmd; diff --git a/platform/linux-generic/odp_schedule_scalable.c b/platform/linux-generic/odp_schedule_scalable.c index 765326e8..676b3419 100644 --- a/platform/linux-generic/odp_schedule_scalable.c +++ b/platform/linux-generic/odp_schedule_scalable.c @@ -40,42 +40,17 @@ #define LOCK(a) _odp_ticketlock_lock((a)) #define UNLOCK(a) _odp_ticketlock_unlock((a)) -#define TAG_EMPTY 0U -#define TAG_USED (1U << 15) -#define TAG_BUSY (1U << 31) -#define PKTIO_QUEUE_2_TAG(p, q) ((p) << 16 | (q) | TAG_USED) -#define TAG_2_PKTIO(t) (((t) >> 16) & 0x7FFF) -#define TAG_2_QUEUE(t) ((t) & 0x7FFF) -#define TAG_IS_READY(t) (((t) & (TAG_USED | TAG_BUSY)) == TAG_USED) -#define PKTIN_MAX (ODP_CONFIG_PKTIO_ENTRIES * PKTIO_MAX_QUEUES) #define MAXTHREADS ATOM_BITSET_SIZE +#define FLAG_PKTIN 0x80 + static _odp_ishm_pool_t *sched_shm_pool; -static uint32_t pktin_num; -static uint32_t pktin_hi; -static uint16_t pktin_count[ODP_CONFIG_PKTIO_ENTRIES]; -static uint32_t pktin_tags[PKTIN_MAX] ODP_ALIGNED_CACHE; - -#define __atomic_fetch_max(var, v, mo) do { \ - /* Evalulate 'v' once */ \ - __typeof__(v) tmp_v = (v); \ - __typeof__(*var) old_var = \ - __atomic_load_n((var), __ATOMIC_RELAXED); \ - while (tmp_v > old_var) { \ - /* Attempt to store 'v' in '*var' */ \ - if (__atomic_compare_exchange_n((var), &old_var, \ - tmp_v, true, (mo), \ - (mo))) \ - break; \ - } \ - /* v <= old_var, nothing to do */ \ - } while (0) - -ODP_STATIC_ASSERT(ODP_SCHED_PRIO_LOWEST == (ODP_SCHED_PRIO_NUM - 1), + +ODP_STATIC_ASSERT(ODP_SCHED_PRIO_LOWEST == (ODP_SCHED_PRIO_NUM - 2), "lowest_prio_does_not_match_with_num_prios"); ODP_STATIC_ASSERT((ODP_SCHED_PRIO_NORMAL > 0) && - (ODP_SCHED_PRIO_NORMAL < (ODP_SCHED_PRIO_NUM - 1)), + (ODP_SCHED_PRIO_NORMAL < (ODP_SCHED_PRIO_NUM - 2)), "normal_prio_is_not_between_highest_and_lowest"); ODP_STATIC_ASSERT(CHECK_IS_POWER2(ODP_CONFIG_QUEUES), @@ -99,9 +74,6 @@ static odp_spinlock_t sched_grp_lock; static sched_scalable_thread_state_t thread_state[MAXTHREADS]; __thread sched_scalable_thread_state_t *sched_ts; -/* - * Forward declarations. - */ static int thread_state_init(int tidx) { sched_scalable_thread_state_t *ts; @@ -110,13 +82,12 @@ static int thread_state_init(int tidx) ODP_ASSERT(tidx < MAXTHREADS); ts = &thread_state[tidx]; ts->atomq = NULL; + ts->src_schedq = NULL; ts->rctx = NULL; ts->pause = false; ts->out_of_order = false; ts->tidx = tidx; ts->dequeued = 0; - ts->pktin_next = 0; - ts->pktin_poll_cnts = 0; ts->ticket = TICKET_INVALID; ts->priv_rvec_free = 0; ts->rvec_free = (1ULL << TS_RVEC_SIZE) - 1; @@ -539,7 +510,25 @@ static inline void sched_update_popd(sched_elem_t *elem) } #endif -sched_queue_t *schedq_from_sched_group(odp_schedule_group_t grp, uint32_t prio) +static void signal_threads_add(sched_group_t *sg, uint32_t sgi, uint32_t prio) +{ + sched_group_mask_t thrds = sg->thr_wanted; + uint32_t thr; + + while (!bitset_is_null(thrds)) { + thr = bitset_ffs(thrds) - 1; + thrds = bitset_clr(thrds, thr); + /* Notify the thread about membership in this + * group/priority. + */ + atom_bitset_set(&thread_state[thr].sg_wanted[prio], + sgi, __ATOMIC_RELEASE); + __atomic_store_n(&thread_state[thr].sg_sem, 1, + __ATOMIC_RELEASE); + } +} + +sched_queue_t *sched_queue_add(odp_schedule_group_t grp, uint32_t prio) { uint32_t sgi; sched_group_t *sg; @@ -561,26 +550,46 @@ sched_queue_t *schedq_from_sched_group(odp_schedule_group_t grp, uint32_t prio) * Notify all threads in sg->thr_wanted that they * should join. */ - sched_group_mask_t thrds = sg->thr_wanted; + signal_threads_add(sg, sgi, prio); + } + return &sg->schedq[prio * sg->xfactor + x % sg->xfactor]; +} - while (!bitset_is_null(thrds)) { - uint32_t thr; +static uint32_t sched_pktin_add(odp_schedule_group_t grp, uint32_t prio) +{ + uint32_t sgi; + sched_group_t *sg; - thr = bitset_ffs(thrds) - 1; - thrds = bitset_clr(thrds, thr); - /* Notify the thread about membership in this - * group/priority. - */ - atom_bitset_set(&thread_state[thr].sg_wanted[prio], - sgi, __ATOMIC_RELEASE); - __atomic_store_n(&thread_state[thr].sg_sem, 1, - __ATOMIC_RELEASE); - } + ODP_ASSERT(grp >= 0 && grp < (odp_schedule_group_t)MAX_SCHED_GROUP); + ODP_ASSERT((sg_free & (1ULL << grp)) == 0); + ODP_ASSERT(prio < ODP_SCHED_PRIO_NUM); + + sgi = grp; + sg = sg_vec[sgi]; + + (void)sched_queue_add(grp, ODP_SCHED_PRIO_PKTIN); + return (ODP_SCHED_PRIO_PKTIN - prio) * sg->xfactor; +} + +static void signal_threads_rem(sched_group_t *sg, uint32_t sgi, uint32_t prio) +{ + sched_group_mask_t thrds = sg->thr_wanted; + uint32_t thr; + + while (!bitset_is_null(thrds)) { + thr = bitset_ffs(thrds) - 1; + thrds = bitset_clr(thrds, thr); + /* Notify the thread about membership in this + * group/priority. + */ + atom_bitset_clr(&thread_state[thr].sg_wanted[prio], + sgi, __ATOMIC_RELEASE); + __atomic_store_n(&thread_state[thr].sg_sem, 1, + __ATOMIC_RELEASE); } - return &sg->schedq[prio * sg->xfactor + x % sg->xfactor]; } -void sched_group_xcount_dec(odp_schedule_group_t grp, uint32_t prio) +void sched_queue_rem(odp_schedule_group_t grp, uint32_t prio) { uint32_t sgi; sched_group_t *sg; @@ -592,77 +601,83 @@ void sched_group_xcount_dec(odp_schedule_group_t grp, uint32_t prio) sgi = grp; sg = sg_vec[sgi]; - x = __atomic_sub_fetch(&sg->xcount[prio], 1, __ATOMIC_RELAXED); + x = __atomic_sub_fetch(&sg->xcount[prio], 1, __ATOMIC_RELAXED); if (x == 0) { /* Last ODP queue for this priority * Notify all threads in sg->thr_wanted that they * should leave. */ - sched_group_mask_t thrds = sg->thr_wanted; + signal_threads_rem(sg, sgi, prio); + } +} - while (!bitset_is_null(thrds)) { - uint32_t thr; +static void sched_pktin_rem(odp_schedule_group_t grp) +{ + sched_queue_rem(grp, ODP_SCHED_PRIO_PKTIN); +} - thr = bitset_ffs(thrds) - 1; - thrds = bitset_clr(thrds, thr); - /* Notify the thread about membership in this - * group/priority. +static void update_sg_add(sched_scalable_thread_state_t *ts, + uint32_t p, + sched_group_mask_t sg_wanted) +{ + sched_group_mask_t added; + uint32_t sgi; + sched_group_t *sg; + uint32_t x; + + added = bitset_andn(sg_wanted, ts->sg_actual[p]); + while (!bitset_is_null(added)) { + sgi = bitset_ffs(added) - 1; + sg = sg_vec[sgi]; + for (x = 0; x < sg->xfactor; x++) { + /* Include our thread index to shift + * (rotate) the order of schedq's */ - atom_bitset_clr(&thread_state[thr].sg_wanted[prio], - sgi, __ATOMIC_RELEASE); - __atomic_store_n(&thread_state[thr].sg_sem, 1, - __ATOMIC_RELEASE); + insert_schedq_in_list(ts, + &sg->schedq[p * sg->xfactor + + (x + ts->tidx) % sg->xfactor]); } + atom_bitset_set(&sg->thr_actual[p], ts->tidx, __ATOMIC_RELAXED); + added = bitset_clr(added, sgi); } } -static void update_sg_membership(sched_scalable_thread_state_t *ts) +static void update_sg_rem(sched_scalable_thread_state_t *ts, + uint32_t p, + sched_group_mask_t sg_wanted) { - uint32_t p; - sched_group_mask_t sg_wanted; - sched_group_mask_t added; sched_group_mask_t removed; uint32_t sgi; sched_group_t *sg; uint32_t x; + removed = bitset_andn(ts->sg_actual[p], sg_wanted); + while (!bitset_is_null(removed)) { + sgi = bitset_ffs(removed) - 1; + sg = sg_vec[sgi]; + for (x = 0; x < sg->xfactor; x++) { + remove_schedq_from_list(ts, + &sg->schedq[p * + sg->xfactor + x]); + } + atom_bitset_clr(&sg->thr_actual[p], ts->tidx, __ATOMIC_RELAXED); + removed = bitset_clr(removed, sgi); + } +} + +static void update_sg_membership(sched_scalable_thread_state_t *ts) +{ + uint32_t p; + sched_group_mask_t sg_wanted; + for (p = 0; p < ODP_SCHED_PRIO_NUM; p++) { sg_wanted = atom_bitset_load(&ts->sg_wanted[p], __ATOMIC_ACQUIRE); if (!bitset_is_eql(ts->sg_actual[p], sg_wanted)) { /* Our sched_group membership has changed */ - added = bitset_andn(sg_wanted, ts->sg_actual[p]); - while (!bitset_is_null(added)) { - sgi = bitset_ffs(added) - 1; - sg = sg_vec[sgi]; - for (x = 0; x < sg->xfactor; x++) { - /* Include our thread index to shift - * (rotate) the order of schedq's - */ - insert_schedq_in_list - (ts, - &sg->schedq[p * sg->xfactor + - (x + ts->tidx) % sg->xfactor]); - } - atom_bitset_set(&sg->thr_actual[p], ts->tidx, - __ATOMIC_RELAXED); - added = bitset_clr(added, sgi); - } - removed = bitset_andn(ts->sg_actual[p], sg_wanted); - while (!bitset_is_null(removed)) { - sgi = bitset_ffs(removed) - 1; - sg = sg_vec[sgi]; - for (x = 0; x < sg->xfactor; x++) { - remove_schedq_from_list - (ts, - &sg->schedq[p * - sg->xfactor + x]); - } - atom_bitset_clr(&sg->thr_actual[p], ts->tidx, - __ATOMIC_RELAXED); - removed = bitset_clr(removed, sgi); - } + update_sg_add(ts, p, sg_wanted); + update_sg_rem(ts, p, sg_wanted); ts->sg_actual[p] = sg_wanted; } } @@ -693,61 +708,180 @@ static inline void _schedule_release_ordered(sched_scalable_thread_state_t *ts) ts->rctx = NULL; } -static void pktin_poll(sched_scalable_thread_state_t *ts) +static uint16_t poll_count[ODP_CONFIG_PKTIO_ENTRIES]; + +static void pktio_start(int pktio_idx, + int num_in_queue, + int in_queue_idx[], + odp_queue_t odpq[]) { - uint32_t i, tag, hi, npolls = 0; - int pktio_index, queue_index; + int i, rxq; + queue_entry_t *qentry; + sched_elem_t *elem; - hi = __atomic_load_n(&pktin_hi, __ATOMIC_RELAXED); - if (hi == 0) - return; + ODP_ASSERT(pktio_idx < ODP_CONFIG_PKTIO_ENTRIES); + for (i = 0; i < num_in_queue; i++) { + rxq = in_queue_idx[i]; + ODP_ASSERT(rxq < PKTIO_MAX_QUEUES); + __atomic_fetch_add(&poll_count[pktio_idx], 1, __ATOMIC_RELAXED); + qentry = qentry_from_ext(odpq[i]); + elem = &qentry->s.sched_elem; + elem->cons_type |= FLAG_PKTIN; /* Set pktin queue flag */ + elem->pktio_idx = pktio_idx; + elem->rx_queue = rxq; + elem->xoffset = sched_pktin_add(elem->sched_grp, + elem->sched_prio); + ODP_ASSERT(elem->schedq != NULL); + schedq_push(elem->schedq, elem); + } +} - for (i = ts->pktin_next; npolls != hi; i = (i + 1) % hi, npolls++) { - tag = __atomic_load_n(&pktin_tags[i], __ATOMIC_RELAXED); - if (!TAG_IS_READY(tag)) - continue; - if (!__atomic_compare_exchange_n(&pktin_tags[i], &tag, - tag | TAG_BUSY, - true, - __ATOMIC_ACQUIRE, - __ATOMIC_RELAXED)) - continue; - /* Tag grabbed */ - pktio_index = TAG_2_PKTIO(tag); - queue_index = TAG_2_QUEUE(tag); - if (odp_unlikely(sched_cb_pktin_poll(pktio_index, - 1, &queue_index))) { - /* Pktio stopped or closed - * Remove tag from pktin_tags - */ - __atomic_store_n(&pktin_tags[i], - TAG_EMPTY, __ATOMIC_RELAXED); - __atomic_fetch_sub(&pktin_num, - 1, __ATOMIC_RELEASE); - /* Call stop_finalize when all queues - * of the pktio have been removed - */ - if (__atomic_sub_fetch(&pktin_count[pktio_index], 1, - __ATOMIC_RELAXED) == 0) - sched_cb_pktio_stop_finalize(pktio_index); - } else { - /* We don't know whether any packets were found and enqueued - * Write back original tag value to release pktin queue - */ - __atomic_store_n(&pktin_tags[i], tag, __ATOMIC_RELAXED); - /* Do not iterate through all pktin queues every time */ - if ((ts->pktin_poll_cnts & 0xf) != 0) - break; +static void pktio_stop(sched_elem_t *elem) +{ + elem->cons_type &= ~FLAG_PKTIN; /* Clear pktin queue flag */ + sched_pktin_rem(elem->sched_grp); + if (__atomic_sub_fetch(&poll_count[elem->pktio_idx], + 1, __ATOMIC_RELAXED) == 0) { + /* Call stop_finalize when all queues + * of the pktio have been removed */ + sched_cb_pktio_stop_finalize(elem->pktio_idx); + } +} + +static bool have_reorder_ctx(sched_scalable_thread_state_t *ts) +{ + if (odp_unlikely(bitset_is_null(ts->priv_rvec_free))) { + ts->priv_rvec_free = atom_bitset_xchg(&ts->rvec_free, 0, + __ATOMIC_RELAXED); + if (odp_unlikely(bitset_is_null(ts->priv_rvec_free))) { + /* No free reorder contexts for this thread */ + return false; } } - ODP_ASSERT(i < hi); - ts->pktin_poll_cnts++; - ts->pktin_next = i; + return true; +} + +static inline bool is_pktin(sched_elem_t *elem) +{ + return (elem->cons_type & FLAG_PKTIN) != 0; +} + +static inline bool is_atomic(sched_elem_t *elem) +{ + return elem->cons_type == (ODP_SCHED_SYNC_ATOMIC | FLAG_PKTIN); +} + +static inline bool is_ordered(sched_elem_t *elem) +{ + return elem->cons_type == (ODP_SCHED_SYNC_ORDERED | FLAG_PKTIN); +} + +static int poll_pktin(sched_elem_t *elem, odp_event_t ev[], int num_evts) +{ + sched_scalable_thread_state_t *ts = sched_ts; + int num, i; + /* For ordered queues only */ + reorder_context_t *rctx; + reorder_window_t *rwin = NULL; + uint32_t sn; + uint32_t idx; + + if (is_ordered(elem)) { + /* Need reorder context and slot in reorder window */ + rwin = queue_get_rwin((queue_entry_t *)elem); + ODP_ASSERT(rwin != NULL); + if (odp_unlikely(!have_reorder_ctx(ts) || + !rwin_reserve_sc(rwin, &sn))) { + /* Put back queue on source schedq */ + schedq_push(ts->src_schedq, elem); + return 0; + } + /* Slot in reorder window reserved! */ + } + + /* Try to dequeue events from the ingress queue itself */ + num = _odp_queue_deq_sc(elem, ev, num_evts); + if (odp_likely(num > 0)) { +events_dequeued: + if (is_atomic(elem)) { + ts->atomq = elem; /* Remember */ + ts->dequeued += num; + /* Don't push atomic queue on schedq */ + } else /* Parallel or ordered */ { + if (is_ordered(elem)) { + /* Find and initialise an unused reorder + * context. */ + idx = bitset_ffs(ts->priv_rvec_free) - 1; + ts->priv_rvec_free = + bitset_clr(ts->priv_rvec_free, idx); + rctx = &ts->rvec[idx]; + rctx_init(rctx, idx, rwin, sn); + /* Are we in-order or out-of-order? */ + ts->out_of_order = sn != rwin->hc.head; + ts->rctx = rctx; + } + schedq_push(elem->schedq, elem); + } + return num; + } + + /* Ingress queue empty => poll pktio RX queue */ + odp_event_t rx_evts[QUEUE_MULTI_MAX]; + int num_rx = sched_cb_pktin_poll_one(elem->pktio_idx, + elem->rx_queue, + rx_evts); + if (odp_likely(num_rx > 0)) { + num = num_rx < num_evts ? num_rx : num_evts; + for (i = 0; i < num; i++) { + /* Return events directly to caller */ + ev[i] = rx_evts[i]; + } + if (num_rx > num) { + /* Events remain, enqueue them */ + odp_buffer_hdr_t *bufs[QUEUE_MULTI_MAX]; + + for (i = num; i < num_rx; i++) + bufs[i] = + (odp_buffer_hdr_t *)(void *)rx_evts[i]; + i = _odp_queue_enq_sp(elem, &bufs[num], num_rx - num); + /* Enqueue must succeed as the queue was empty */ + ODP_ASSERT(i == num_rx - num); + } + goto events_dequeued; + } + /* No packets received, reset state and undo side effects */ + if (is_atomic(elem)) + ts->atomq = NULL; + else if (is_ordered(elem)) + rwin_unreserve_sc(rwin, sn); + + if (odp_likely(num_rx == 0)) { + /* RX queue empty, push it to pktin priority schedq */ + sched_queue_t *schedq = ts->src_schedq; + /* Check if queue came from the designated schedq */ + if (schedq == elem->schedq) { + /* Yes, add offset to the pktin priority level + * in order to get alternate schedq */ + schedq += elem->xoffset; + } + /* Else no, queue must have come from alternate schedq */ + schedq_push(schedq, elem); + } else /* num_rx < 0 => pktio stopped or closed */ { + /* Remove queue */ + pktio_stop(elem); + /* Don't push queue to schedq */ + } + + ODP_ASSERT(ts->atomq == NULL); + ODP_ASSERT(!ts->out_of_order); + ODP_ASSERT(ts->rctx == NULL); + return 0; } static int _schedule(odp_queue_t *from, odp_event_t ev[], int num_evts) { sched_scalable_thread_state_t *ts; + sched_elem_t *first; sched_elem_t *atomq; int num; uint32_t i; @@ -758,7 +892,23 @@ static int _schedule(odp_queue_t *from, odp_event_t ev[], int num_evts) /* Once an atomic queue has been scheduled to a thread, it will stay * on that thread until empty or 'rotated' by WRR */ - if (atomq != NULL) { + if (atomq != NULL && is_pktin(atomq)) { + /* Atomic pktin queue */ + if (ts->dequeued < atomq->qschst.wrr_budget) { + ODP_ASSERT(ts->src_schedq != NULL); + num = poll_pktin(atomq, ev, num_evts); + if (odp_likely(num != 0)) { + if (from) + *from = queue_get_handle( + (queue_entry_t *)atomq); + return num; + } + } else { + /* WRR budget exhausted, move queue to end of schedq */ + schedq_push(atomq->schedq, atomq); + } + ts->atomq = NULL; + } else if (atomq != NULL) { ODP_ASSERT(ts->ticket != TICKET_INVALID); #ifdef CONFIG_QSCHST_LOCK LOCK(&atomq->qschlock); @@ -794,10 +944,6 @@ dequeue_atomic: #endif } - /* Release any previous reorder context. */ - if (ts->rctx != NULL) - _schedule_release_ordered(ts); - /* Check for and perform any scheduler group updates. */ if (odp_unlikely(__atomic_load_n(&ts->sg_sem, __ATOMIC_RELAXED) != 0)) { (void)__atomic_load_n(&ts->sg_sem, __ATOMIC_ACQUIRE); @@ -806,7 +952,7 @@ dequeue_atomic: } /* Scan our schedq list from beginning to end */ - for (i = 0; i < ts->num_schedq; i++) { + for (i = 0, first = NULL; i < ts->num_schedq; i++, first = NULL) { sched_queue_t *schedq = ts->schedq_list[i]; sched_elem_t *elem; restart_same: @@ -815,8 +961,24 @@ restart_same: /* Schedq empty, look at next one. */ continue; } + if (is_pktin(elem)) { + /* Pktio ingress queue */ + if (first == NULL) + first = elem; + else if (elem == first) /* Wrapped around */ + continue; /* Go to next schedq */ + + if (odp_unlikely(!schedq_cond_pop(schedq, elem))) + goto restart_same; - if (elem->cons_type == ODP_SCHED_SYNC_ATOMIC) { + ts->src_schedq = schedq; /* Remember source schedq */ + num = poll_pktin(elem, ev, num_evts); + if (odp_unlikely(num <= 0)) + goto restart_same; + if (from) + *from = queue_get_handle((queue_entry_t *)elem); + return num; + } else if (elem->cons_type == ODP_SCHED_SYNC_ATOMIC) { /* Dequeue element only if it is still at head * of schedq. */ @@ -885,19 +1047,9 @@ restart_same: * collect all outgoing events. Ensure there is at least * one available reorder context. */ - if (odp_unlikely(bitset_is_null(ts->priv_rvec_free))) { - ts->priv_rvec_free = atom_bitset_xchg( - &ts->rvec_free, 0, - __ATOMIC_RELAXED); - if (odp_unlikely(bitset_is_null( - ts->priv_rvec_free))) { - /* No free reorder contexts for - * this thread. Look at next schedq, - * hope we find non-ordered queue. - */ - continue; - } - } + if (odp_unlikely(!have_reorder_ctx(ts))) + continue; + /* rwin_reserve and odp_queue_deq must be atomic or * there will be a potential race condition. * Allocate a slot in the reorder window. @@ -984,7 +1136,6 @@ restart_same: } } - pktin_poll(ts); return 0; } @@ -1066,6 +1217,10 @@ static int schedule_multi(odp_queue_t *from, uint64_t wait, odp_event_t ev[], odp_time_t deadline; ts = sched_ts; + /* Release any previous reorder context. */ + if (ts->rctx != NULL) + _schedule_release_ordered(ts); + if (odp_unlikely(ts->pause)) { if (ts->atomq != NULL) { #ifdef CONFIG_QSCHST_LOCK @@ -1078,8 +1233,6 @@ static int schedule_multi(odp_queue_t *from, uint64_t wait, odp_event_t ev[], #ifdef CONFIG_QSCHST_LOCK UNLOCK(&atomq->qschlock); #endif - } else if (ts->rctx != NULL) { - _schedule_release_ordered(ts); } return 0; } @@ -1124,6 +1277,10 @@ static odp_event_t schedule(odp_queue_t *from, uint64_t wait) odp_time_t deadline; ts = sched_ts; + /* Release any previous reorder context. */ + if (ts->rctx != NULL) + _schedule_release_ordered(ts); + if (odp_unlikely(ts->pause)) { if (ts->atomq != NULL) { #ifdef CONFIG_QSCHST_LOCK @@ -1136,8 +1293,6 @@ static odp_event_t schedule(odp_queue_t *from, uint64_t wait) #ifdef CONFIG_QSCHST_LOCK UNLOCK(&atomq->qschlock); #endif - } else if (ts->rctx != NULL) { - _schedule_release_ordered(ts); } return ev; } @@ -1190,7 +1345,7 @@ static uint64_t schedule_wait_time(uint64_t ns) static int schedule_num_prio(void) { - return ODP_SCHED_PRIO_NUM; + return ODP_SCHED_PRIO_NUM - 1; /* Discount the pktin priority level */ } static int schedule_group_update(sched_group_t *sg, @@ -1387,7 +1542,7 @@ static int schedule_group_destroy(odp_schedule_group_t group) ret = -1; goto thrd_q_present_in_group; } - if (sg->xcount[p] != 0) { + if (p != ODP_SCHED_PRIO_PKTIN && sg->xcount[p] != 0) { ODP_ERR("Group has queues\n"); ret = -1; goto thrd_q_present_in_group; @@ -1783,51 +1938,6 @@ static int schedule_term_local(void) return rc; } -static void pktio_start(int pktio_index, int num_in_queue, int in_queue_idx[]) -{ - int i; - uint32_t old, tag, j; - - for (i = 0; i < num_in_queue; i++) { - /* Try to reserve a slot */ - if (__atomic_fetch_add(&pktin_num, - 1, __ATOMIC_RELAXED) >= PKTIN_MAX) { - __atomic_fetch_sub(&pktin_num, 1, __ATOMIC_RELAXED); - ODP_ABORT("Too many pktio in queues for scheduler\n"); - } - /* A slot has been reserved, now we need to find an empty one */ - for (j = 0; ; j = (j + 1) % PKTIN_MAX) { - if (__atomic_load_n(&pktin_tags[j], - __ATOMIC_RELAXED) != TAG_EMPTY) - /* Slot used, continue with next */ - continue; - /* Empty slot found */ - old = TAG_EMPTY; - tag = PKTIO_QUEUE_2_TAG(pktio_index, in_queue_idx[i]); - if (__atomic_compare_exchange_n(&pktin_tags[j], - &old, - tag, - true, - __ATOMIC_RELEASE, - __ATOMIC_RELAXED)) { - /* Success grabbing slot,update high - * watermark - */ - __atomic_fetch_max(&pktin_hi, - j + 1, __ATOMIC_RELAXED); - /* One more tag (queue) for this pktio - * instance - */ - __atomic_fetch_add(&pktin_count[pktio_index], - 1, __ATOMIC_RELAXED); - /* Continue with next RX queue */ - break; - } - /* Failed to grab slot */ - } - } -} - static int num_grps(void) { return MAX_SCHED_GROUP; diff --git a/platform/linux-generic/odp_schedule_scalable_ordered.c b/platform/linux-generic/odp_schedule_scalable_ordered.c index 80ff2490..7261b446 100644 --- a/platform/linux-generic/odp_schedule_scalable_ordered.c +++ b/platform/linux-generic/odp_schedule_scalable_ordered.c @@ -72,6 +72,32 @@ bool rwin_reserve(reorder_window_t *rwin, uint32_t *sn) return true; } +bool rwin_reserve_sc(reorder_window_t *rwin, uint32_t *sn) +{ + uint32_t head; + uint32_t oldt; + uint32_t newt; + uint32_t winmask; + + /* Read head and tail separately */ + oldt = rwin->tail; + winmask = rwin->winmask; + head = rwin->hc.head; + if (odp_unlikely(oldt - head >= winmask)) + return false; + newt = oldt + 1; + rwin->tail = newt; + *sn = oldt; + + return true; +} + +void rwin_unreserve_sc(reorder_window_t *rwin, uint32_t sn) +{ + ODP_ASSERT(rwin->tail == sn + 1); + rwin->tail = sn; +} + static void rwin_insert(reorder_window_t *rwin, reorder_context_t *rctx, uint32_t sn, diff --git a/platform/linux-generic/odp_schedule_sp.c b/platform/linux-generic/odp_schedule_sp.c index 05241275..47e6ddd3 100644 --- a/platform/linux-generic/odp_schedule_sp.c +++ b/platform/linux-generic/odp_schedule_sp.c @@ -424,7 +424,10 @@ static int ord_enq_multi(queue_t q_int, void *buf_hdr[], int num, return 0; } -static void pktio_start(int pktio_index, int num, int pktin_idx[]) +static void pktio_start(int pktio_index, + int num, + int pktin_idx[], + odp_queue_t odpq[] ODP_UNUSED) { int i; sched_cmd_t *cmd; ----------------------------------------------------------------------- Summary of changes: .../include/odp_queue_scalable_internal.h | 2 + platform/linux-generic/include/odp_schedule_if.h | 11 +- .../linux-generic/include/odp_schedule_scalable.h | 25 +- .../include/odp_schedule_scalable_ordered.h | 2 + platform/linux-generic/odp_packet_io.c | 49 +- platform/linux-generic/odp_queue_scalable.c | 32 +- platform/linux-generic/odp_schedule.c | 2 +- platform/linux-generic/odp_schedule_iquery.c | 5 +- platform/linux-generic/odp_schedule_scalable.c | 540 +++++++++++++-------- .../linux-generic/odp_schedule_scalable_ordered.c | 26 + platform/linux-generic/odp_schedule_sp.c | 5 +- 11 files changed, 458 insertions(+), 241 deletions(-) hooks/post-receive --

8 years, 12 months

[COMMIT] branch api-next updated. v1.15.0.0-674-g32f5f3ff

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 32f5f3ff343b516cb0dbe98e81479e6c748f0ebf (commit) via 3c9248f5c98b194d91712fafed4bf3b21327f2a8 (commit) via 91ef9f7e224056af351cbaf99ccfa98ee815460d (commit) via ba97c3174d0de3e08cffaad414bf2a55de8853df (commit) via 69a1179a05344b59961aaf997a1b406698b6840b (commit) via 6efe7d971a3a4b8f7eaa42660b48eee31493924c (commit) via ef4e4d4c4ef1f9f569c236494cb178feb7c90343 (commit) via e4289ab4f73221a9d20ecfb8eac6b79a26df06a3 (commit) via a787abf96b17d9714a6b892091d19c1be2bc5e6c (commit) via 20c75b764af6fd15e5e1d4df969ac33d62525405 (commit) via 04029613fbdc85221d1a20354a49ada912302fc0 (commit) via 88d36e6811de494708c520cb12e9e5f97628e9e4 (commit) via a820d8a84e132652b4cef295756ccf135e3bd54b (commit) via f7c5f3e973814e0fc9211e008a37080b1c7d4a76 (commit) via d445395c66edb38abedb918afdba37ec9f7f95af (commit) via b38117eeed5d7bd5a334ef2387bf83d5cb8b9188 (commit) via d0821c9c43fb89e4c0021b174bbc12bef543ffa0 (commit) via 17e829a3b78d6513d22496734c6edbec955cbfd4 (commit) via eccc78540c05dc71095179b613f014648385f3df (commit) via f8c6360667380f6b3fb917ecbe5b941b23dbadf1 (commit) from 6b6253c30f88c80bf632436ff06c1b000860a2f1 (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 32f5f3ff343b516cb0dbe98e81479e6c748f0ebf Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Thu Sep 14 22:29:44 2017 +0300 linux-gen: move packet_to_buffer to packet_inlines.h odp_crypto.c is also uses packet_to_buffer() so move this function to common place. Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> diff --git a/platform/linux-generic/include/odp/api/plat/packet_inlines.h b/platform/linux-generic/include/odp/api/plat/packet_inlines.h index 6874d149..be7e18ec 100644 --- a/platform/linux-generic/include/odp/api/plat/packet_inlines.h +++ b/platform/linux-generic/include/odp/api/plat/packet_inlines.h @@ -157,6 +157,11 @@ static inline void _odp_packet_prefetch(odp_packet_t pkt, uint32_t offset, (void)pkt; (void)offset; (void)len; } +static inline odp_buffer_t packet_to_buffer(odp_packet_t pkt) +{ + return (odp_buffer_t)pkt; +} + /* Include inlined versions of API functions */ #include <odp/api/plat/static_inline.h> #if ODP_ABI_COMPAT == 0 diff --git a/platform/linux-generic/odp_crypto.c b/platform/linux-generic/odp_crypto.c index 081fe178..3174feee 100644 --- a/platform/linux-generic/odp_crypto.c +++ b/platform/linux-generic/odp_crypto.c @@ -19,6 +19,7 @@ #include <odp_debug_internal.h> #include <odp/api/hints.h> #include <odp/api/random.h> +#include <odp/api/plat/packet_inlines.h> #include <odp_packet_internal.h> #include <string.h> diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index 5dbe65d3..ff0cb8fe 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -69,11 +69,6 @@ odp_packet_t _odp_packet_from_buf_hdr(odp_buffer_hdr_t *buf_hdr) return (odp_packet_t)buf_hdr; } -static inline odp_buffer_t packet_to_buffer(odp_packet_t pkt) -{ - return (odp_buffer_t)pkt; -} - static inline seg_entry_t *seg_entry(odp_packet_hdr_t *hdr, uint32_t seg_idx) { commit 3c9248f5c98b194d91712fafed4bf3b21327f2a8 Merge: 6b6253c3 91ef9f7e Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Thu Sep 14 17:56:51 2017 +0300 Merge branch 'master' into api-next Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --cc .travis.yml index 0b5fb87d,43141f9f..8cf6ed22 --- a/.travis.yml +++ b/.travis.yml @@@ -67,8 -66,11 +67,12 @@@ env - CONF="--disable-abi-compat" - CONF="--enable-schedule-sp" - CONF="--enable-schedule-iquery" + - CONF="--enable-schedule-scalable" - CONF="--enable-dpdk-zero-copy" + - CROSS_ARCH="arm64" + - CROSS_ARCH="armhf" CFLAGS="-march=armv7-a" + - CROSS_ARCH="powerpc" + - CROSS_ARCH="i386" before_install: diff --cc platform/linux-generic/include/odp_buffer_internal.h index fe0c26b9,5d40303b..358c0e44 --- a/platform/linux-generic/include/odp_buffer_internal.h +++ b/platform/linux-generic/include/odp_buffer_internal.h @@@ -80,15 -107,9 +107,12 @@@ struct odp_buffer_hdr_t /* User area size */ uint32_t uarea_size; - /* Event type. Maybe different than pool type (crypto compl event) */ - int8_t event_type; + /* Max data size */ + uint32_t size; + /* Event subtype. Should be ODP_EVENT_NO_SUBTYPE except packets. */ + int8_t event_subtype; + - /* Burst table */ - struct odp_buffer_hdr_t *burst[BUFFER_BURST_SIZE]; - /* ipc mapped process can not walk over pointers, * offset has to be used */ uint64_t ipc_data_offset; diff --cc platform/linux-generic/include/odp_packet_internal.h index 91fba1ea,d76d7bf0..09726423 --- a/platform/linux-generic/include/odp_packet_internal.h +++ b/platform/linux-generic/include/odp_packet_internal.h @@@ -272,11 -230,6 +230,8 @@@ static inline void packet_init(odp_pack CONFIG_PACKET_TAILROOM; pkt_hdr->input = ODP_PKTIO_INVALID; + pkt_hdr->buf_hdr.event_subtype = ODP_EVENT_PACKET_BASIC; + - /* By default packet has no references */ - pkt_hdr->unshared_len = len; - pkt_hdr->ref_hdr = NULL; } static inline void copy_packet_parser_metadata(odp_packet_hdr_t *src_hdr, ----------------------------------------------------------------------- Summary of changes: .travis.yml | 134 +- include/odp/arch/default/api/abi/packet.h | 2 +- .../include/odp/api/plat/packet_inlines.h | 49 +- .../include/odp/api/plat/packet_inlines_api.h | 16 + .../include/odp/api/plat/packet_types.h | 38 +- .../linux-generic/include/odp_buffer_internal.h | 71 +- .../linux-generic/include/odp_packet_internal.h | 133 +- platform/linux-generic/odp_crypto.c | 1 + platform/linux-generic/odp_packet.c | 1514 +++++++++----------- platform/linux-generic/odp_pool.c | 8 + test/common_plat/validation/api/packet/packet.c | 109 +- 11 files changed, 979 insertions(+), 1096 deletions(-) hooks/post-receive --

8 years, 12 months

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

git-lng-odp