git-lng-odp October 2018

git-lng-odp@lists.linaro.org

1 participants
23 discussions

[COMMIT] branch master updated. v1.19.0.2_tigermoth-225-ge468e704

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 e468e7041ba526fd8e2814b1158bde2e4917a987 (commit) via c13d8ba9b4a7c0b4adddd637e942bf8d83675a95 (commit) from 48018032f54e6e50f509d073c8735f7a5c0bbcb1 (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 e468e7041ba526fd8e2814b1158bde2e4917a987 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Mon Oct 29 14:14:46 2018 +0200 linux-gen: pktio: remove sched_cb_pktin_poll_old The function is not used anymore. 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/platform/linux-generic/include/odp_schedule_if.h b/platform/linux-generic/include/odp_schedule_if.h index df875c48..a131b6eb 100644 --- a/platform/linux-generic/include/odp_schedule_if.h +++ b/platform/linux-generic/include/odp_schedule_if.h @@ -84,7 +84,6 @@ extern const schedule_fn_t *sched_fn; /* Interface for the scheduler */ int sched_cb_pktin_poll(int pktio_index, int pktin_index, odp_buffer_hdr_t *hdr_tbl[], int num); -int sched_cb_pktin_poll_old(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); diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c index 92c14cc2..1e0429f5 100644 --- a/platform/linux-generic/odp_packet_io.c +++ b/platform/linux-generic/odp_packet_io.c @@ -872,54 +872,6 @@ int sched_cb_pktin_poll(int pktio_index, int pktin_index, return pktin_recv_buf(entry, pktin_index, hdr_tbl, num); } -int sched_cb_pktin_poll_old(int pktio_index, int num_queue, int index[]) -{ - odp_buffer_hdr_t *hdr_tbl[QUEUE_MULTI_MAX]; - int num, idx; - pktio_entry_t *entry = pktio_entry_by_index(pktio_index); - int state = entry->s.state; - - if (odp_unlikely(state != PKTIO_STATE_STARTED)) { - if (state < PKTIO_STATE_ACTIVE || - state == PKTIO_STATE_STOP_PENDING) - return -1; - - ODP_DBG("interface not started\n"); - return 0; - } - - for (idx = 0; idx < num_queue; idx++) { - odp_queue_t queue; - int num_enq; - - num = pktin_recv_buf(entry, index[idx], hdr_tbl, - QUEUE_MULTI_MAX); - - if (num == 0) - continue; - - if (num < 0) { - ODP_ERR("Packet recv error\n"); - return -1; - } - - queue = entry->s.in_queue[index[idx]].queue; - num_enq = odp_queue_enq_multi(queue, - (odp_event_t *)hdr_tbl, num); - - if (odp_unlikely(num_enq < num)) { - if (odp_unlikely(num_enq < 0)) - num_enq = 0; - - ODP_DBG("Interface %s dropped %i packets\n", - entry->s.name, num - num_enq); - buffer_free_multi(&hdr_tbl[num_enq], num - num_enq); - } - } - - return 0; -} - void sched_cb_pktio_stop_finalize(int pktio_index) { int state; commit c13d8ba9b4a7c0b4adddd637e942bf8d83675a95 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Mon Oct 29 13:57:21 2018 +0200 linux-gen: schedule_sp: use sched_cb_pktin_poll Use sched_cb_pktin_poll instead of sched_cb_pktin_poll_old, so that the old pktin poll function can be removed. 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/platform/linux-generic/odp_schedule_sp.c b/platform/linux-generic/odp_schedule_sp.c index e63bd061..8dcf9b0e 100644 --- a/platform/linux-generic/odp_schedule_sp.c +++ b/platform/linux-generic/odp_schedule_sp.c @@ -62,6 +62,7 @@ struct sched_cmd_s { int init; int num_pktin; int pktin_idx[NUM_PKTIN]; + odp_queue_t queue[NUM_PKTIN]; }; typedef struct ODP_ALIGNED_CACHE sched_cmd_t { @@ -438,7 +439,7 @@ static int ord_enq_multi(odp_queue_t queue, void *buf_hdr[], int num, static void pktio_start(int pktio_index, int num, int pktin_idx[], - odp_queue_t odpq[] ODP_UNUSED) + odp_queue_t queue[]) { int i; sched_cmd_t *cmd; @@ -452,8 +453,10 @@ static void pktio_start(int pktio_index, ODP_ABORT("Supports only %i pktin queues per interface\n", NUM_PKTIN); - for (i = 0; i < num; i++) + for (i = 0; i < num; i++) { cmd->s.pktin_idx[i] = pktin_idx[i]; + cmd->s.queue[i] = queue[i]; + } cmd->s.num_pktin = num; @@ -507,6 +510,26 @@ static uint64_t schedule_wait_time(uint64_t ns) return ns; } +static inline void enqueue_packets(odp_queue_t queue, + odp_buffer_hdr_t *hdr_tbl[], int num_pkt) +{ + int num_enq, num_drop; + + num_enq = odp_queue_enq_multi(queue, (odp_event_t *)hdr_tbl, + num_pkt); + + if (num_enq < 0) + num_enq = 0; + + if (num_enq < num_pkt) { + num_drop = num_pkt - num_enq; + + ODP_DBG("Dropped %i packets\n", num_drop); + odp_packet_free_multi((odp_packet_t *)&hdr_tbl[num_enq], + num_drop); + } +} + static int schedule_multi(odp_queue_t *from, uint64_t wait, odp_event_t events[], int max_events ODP_UNUSED) { @@ -534,12 +557,33 @@ static int schedule_multi(odp_queue_t *from, uint64_t wait, cmd = sched_cmd(); if (cmd && cmd->s.type == CMD_PKTIO) { - if (sched_cb_pktin_poll_old(cmd->s.index, - cmd->s.num_pktin, - cmd->s.pktin_idx)) { - /* Pktio stopped or closed. */ - sched_cb_pktio_stop_finalize(cmd->s.index); - } else { + odp_buffer_hdr_t *hdr_tbl[CONFIG_BURST_SIZE]; + int i; + int num_pkt = 0; + int max_num = CONFIG_BURST_SIZE; + int pktio_idx = cmd->s.index; + int num_pktin = cmd->s.num_pktin; + int *pktin_idx = cmd->s.pktin_idx; + odp_queue_t *queue = cmd->s.queue; + + for (i = 0; i < num_pktin; i++) { + num_pkt = sched_cb_pktin_poll(pktio_idx, + pktin_idx[i], + hdr_tbl, max_num); + + if (num_pkt < 0) { + /* Pktio stopped or closed. */ + sched_cb_pktio_stop_finalize(pktio_idx); + break; + } + + if (num_pkt == 0) + continue; + + enqueue_packets(queue[i], hdr_tbl, num_pkt); + } + + if (num_pkt >= 0) { /* Continue polling pktio. */ add_tail(cmd); } ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/include/odp_schedule_if.h | 1 - platform/linux-generic/odp_packet_io.c | 48 ------------------- platform/linux-generic/odp_schedule_sp.c | 60 ++++++++++++++++++++---- 3 files changed, 52 insertions(+), 57 deletions(-) hooks/post-receive --

6 years, 3 months

[COMMIT] branch master updated. v1.19.0.2_tigermoth-223-g48018032

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 48018032f54e6e50f509d073c8735f7a5c0bbcb1 (commit) via 380fa4598b4c58101a2f07ff179ae67fdcba70ab (commit) via 297cd7e9f93e31dd5a640b707895d702d17b30ae (commit) via d945bf9517ab5abfc59447ab30456d1ca9716a5a (commit) from 67d6f7120962594e6b9e3343fd7cf13eda956b15 (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 48018032f54e6e50f509d073c8735f7a5c0bbcb1 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Thu Oct 25 17:38:24 2018 +0300 linux-gen: thread: use automatic schedule group configuration Read from scheduler configuration if an automatic schedule group is enabled or disabled. 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/platform/linux-generic/odp_thread.c b/platform/linux-generic/odp_thread.c index 4fc6acc9..7728929b 100644 --- a/platform/linux-generic/odp_thread.c +++ b/platform/linux-generic/odp_thread.c @@ -136,6 +136,20 @@ int odp_thread_init_local(odp_thread_type_t type) { int id; int cpu; + int group_all, group_worker, group_control; + + group_all = 1; + group_worker = 1; + group_control = 1; + + if (sched_fn->config) { + schedule_config_t schedule_config; + + sched_fn->config(&schedule_config); + group_all = schedule_config.group_enable.all; + group_worker = schedule_config.group_enable.worker; + group_control = schedule_config.group_enable.control; + } odp_spinlock_lock(&thread_globals->lock); id = alloc_id(type); @@ -159,11 +173,13 @@ int odp_thread_init_local(odp_thread_type_t type) _odp_this_thread = &thread_globals->thr[id]; - sched_fn->thr_add(ODP_SCHED_GROUP_ALL, id); + if (group_all) + sched_fn->thr_add(ODP_SCHED_GROUP_ALL, id); - if (type == ODP_THREAD_WORKER) + if (type == ODP_THREAD_WORKER && group_worker) sched_fn->thr_add(ODP_SCHED_GROUP_WORKER, id); - else if (type == ODP_THREAD_CONTROL) + + if (type == ODP_THREAD_CONTROL && group_control) sched_fn->thr_add(ODP_SCHED_GROUP_CONTROL, id); return 0; @@ -172,14 +188,30 @@ int odp_thread_init_local(odp_thread_type_t type) int odp_thread_term_local(void) { int num; + int group_all, group_worker, group_control; int id = _odp_this_thread->thr; odp_thread_type_t type = _odp_this_thread->type; - sched_fn->thr_rem(ODP_SCHED_GROUP_ALL, id); + group_all = 1; + group_worker = 1; + group_control = 1; - if (type == ODP_THREAD_WORKER) + if (sched_fn->config) { + schedule_config_t schedule_config; + + sched_fn->config(&schedule_config); + group_all = schedule_config.group_enable.all; + group_worker = schedule_config.group_enable.worker; + group_control = schedule_config.group_enable.control; + } + + if (group_all) + sched_fn->thr_rem(ODP_SCHED_GROUP_ALL, id); + + if (type == ODP_THREAD_WORKER && group_worker) sched_fn->thr_rem(ODP_SCHED_GROUP_WORKER, id); - else if (type == ODP_THREAD_CONTROL) + + if (type == ODP_THREAD_CONTROL && group_control) sched_fn->thr_rem(ODP_SCHED_GROUP_CONTROL, id); odp_spinlock_lock(&thread_globals->lock); commit 380fa4598b4c58101a2f07ff179ae67fdcba70ab Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Thu Oct 25 17:26:37 2018 +0300 linux-gen: sched: add config request function to interface Added config request function to scheduler internal interface. Other modules may use this to examine scheduler configuration. 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/platform/linux-generic/include/odp_schedule_if.h b/platform/linux-generic/include/odp_schedule_if.h index 13e209f2..df875c48 100644 --- a/platform/linux-generic/include/odp_schedule_if.h +++ b/platform/linux-generic/include/odp_schedule_if.h @@ -19,6 +19,15 @@ extern "C" { /* Number of ordered locks per queue */ #define SCHEDULE_ORDERED_LOCKS_PER_QUEUE 2 +typedef struct schedule_config_t { + struct { + int all; + int worker; + int control; + } group_enable; + +} schedule_config_t; + typedef void (*schedule_pktio_start_fn_t)(int pktio_index, int num_in_queue, int in_queue_idx[], @@ -44,7 +53,7 @@ typedef void (*schedule_order_unlock_lock_fn_t)(void); typedef void (*schedule_order_lock_start_fn_t)(void); typedef void (*schedule_order_lock_wait_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 void (*schedule_config_fn_t)(schedule_config_t *config); typedef struct schedule_fn_t { schedule_pktio_start_fn_t pktio_start; @@ -65,6 +74,7 @@ typedef struct schedule_fn_t { schedule_order_lock_wait_fn_t wait_order_lock; schedule_order_unlock_lock_fn_t order_unlock_lock; schedule_max_ordered_locks_fn_t max_ordered_locks; + schedule_config_fn_t config; } schedule_fn_t; diff --git a/platform/linux-generic/odp_schedule_basic.c b/platform/linux-generic/odp_schedule_basic.c index 7208200a..74942341 100644 --- a/platform/linux-generic/odp_schedule_basic.c +++ b/platform/linux-generic/odp_schedule_basic.c @@ -226,6 +226,9 @@ typedef struct { order_context_t order[ODP_CONFIG_QUEUES]; + /* Scheduler interface config options (not used in fast path) */ + schedule_config_t config_if; + } sched_global_t; /* Check that queue[] variables are large enough */ @@ -320,7 +323,37 @@ static int read_config_file(sched_global_t *sched) return -1; } } - ODP_PRINT("\n\n"); + + ODP_PRINT("\n"); + + str = "sched_basic.group_enable.all"; + if (!_odp_libconfig_lookup_int(str, &val)) { + ODP_ERR("Config option '%s' not found.\n", str); + return -1; + } + + sched->config_if.group_enable.all = val; + ODP_PRINT(" %s: %i\n", str, val); + + str = "sched_basic.group_enable.worker"; + if (!_odp_libconfig_lookup_int(str, &val)) { + ODP_ERR("Config option '%s' not found.\n", str); + return -1; + } + + sched->config_if.group_enable.worker = val; + ODP_PRINT(" %s: %i\n", str, val); + + str = "sched_basic.group_enable.control"; + if (!_odp_libconfig_lookup_int(str, &val)) { + ODP_ERR("Config option '%s' not found.\n", str); + return -1; + } + + sched->config_if.group_enable.control = val; + ODP_PRINT(" %s: %i\n", str, val); + + ODP_PRINT("\n"); return 0; } @@ -1474,6 +1507,11 @@ static int schedule_num_grps(void) return NUM_SCHED_GRPS; } +static void schedule_config(schedule_config_t *config) +{ + *config = *(&sched->config_if); +} + /* Fill in scheduler interface */ const schedule_fn_t schedule_basic_fn = { .pktio_start = schedule_pktio_start, @@ -1490,7 +1528,8 @@ const schedule_fn_t schedule_basic_fn = { .term_local = schedule_term_local, .order_lock = order_lock, .order_unlock = order_unlock, - .max_ordered_locks = schedule_max_ordered_locks + .max_ordered_locks = schedule_max_ordered_locks, + .config = schedule_config }; /* Fill in scheduler API calls */ commit 297cd7e9f93e31dd5a640b707895d702d17b30ae Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Thu Oct 25 16:53:39 2018 +0300 linux-gen: config: add schedule group config file options Added options to disable unused automatic schedule groups. 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/config/odp-linux-generic.conf b/config/odp-linux-generic.conf index 2417d23f..4585a896 100644 --- a/config/odp-linux-generic.conf +++ b/config/odp-linux-generic.conf @@ -16,7 +16,7 @@ # Mandatory fields odp_implementation = "linux-generic" -config_file_version = "0.1.2" +config_file_version = "0.1.3" # Shared memory options shm: { @@ -114,4 +114,15 @@ sched_basic: { burst_size_default = [ 32, 32, 32, 32, 32, 16, 8, 4] burst_size_max = [255, 255, 255, 255, 255, 16, 16, 8] + # Automatically updated schedule groups + # + # API specification defines that ODP_SCHED_GROUP_ALL, + # _WORKER and _CONTROL are updated automatically. These options can be + # used to disable these group when not used. Set value to 0 to disable + # a group. Performance may improve when unused groups are disabled. + group_enable: { + all = 1 + worker = 1 + control = 1 + } } diff --git a/platform/linux-generic/test/process-mode.conf b/platform/linux-generic/test/process-mode.conf index 7a06544a..f631f54b 100644 --- a/platform/linux-generic/test/process-mode.conf +++ b/platform/linux-generic/test/process-mode.conf @@ -1,6 +1,6 @@ # Mandatory fields odp_implementation = "linux-generic" -config_file_version = "0.1.2" +config_file_version = "0.1.3" # Shared memory options shm: { commit d945bf9517ab5abfc59447ab30456d1ca9716a5a Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Thu Oct 25 16:26:42 2018 +0300 test: sched_pktio: add burst size option Added option to control maximum burst size, which is requested from scheduler. 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/test/performance/odp_sched_pktio.c b/test/performance/odp_sched_pktio.c index 91771e87..82f74422 100644 --- a/test/performance/odp_sched_pktio.c +++ b/test/performance/odp_sched_pktio.c @@ -24,7 +24,6 @@ #define MAX_PKT_LEN 1514 #define MAX_PKT_NUM (128 * 1024) #define MIN_PKT_SEG_LEN 64 -#define BURST_SIZE 32 #define CHECK_PERIOD 10000 #define TEST_PASSED_LIMIT 5000 #define TIMEOUT_OFFSET_NS 1000000 @@ -38,6 +37,7 @@ typedef struct test_options_t { int num_worker; int num_pktio; int num_pktio_queue; + int burst_size; int pipe_stages; int pipe_queues; uint32_t pipe_queue_size; @@ -182,7 +182,6 @@ static inline void send_packets(test_global_t *test_global, static int worker_thread_direct(void *arg) { - odp_event_t ev[BURST_SIZE]; int num_pkt, out; odp_pktout_queue_t pktout; odp_queue_t queue; @@ -191,6 +190,7 @@ static int worker_thread_direct(void *arg) test_global_t *test_global = worker_arg->test_global_ptr; int worker_id = worker_arg->worker_id; uint32_t polls = 0; + int burst_size = test_global->opt.burst_size; printf("Worker %i started\n", worker_id); @@ -198,10 +198,11 @@ static int worker_thread_direct(void *arg) odp_barrier_wait(&test_global->worker_start); while (1) { - odp_packet_t pkt[BURST_SIZE]; + odp_event_t ev[burst_size]; + odp_packet_t pkt[burst_size]; num_pkt = odp_schedule_multi(&queue, ODP_SCHED_NO_WAIT, - ev, BURST_SIZE); + ev, burst_size); polls++; @@ -267,7 +268,6 @@ static inline odp_queue_t next_queue(test_global_t *test_global, int input, static int worker_thread_pipeline(void *arg) { - odp_event_t ev[BURST_SIZE]; int i, num_pkt, input, output, output_queue; odp_queue_t queue, dst_queue; odp_pktout_queue_t pktout; @@ -281,6 +281,7 @@ static int worker_thread_pipeline(void *arg) int num_pktio = test_global->opt.num_pktio; int num_pktio_queue = test_global->opt.num_pktio_queue; uint32_t polls = 0; + int burst_size = test_global->opt.burst_size; printf("Worker %i started\n", worker_id); @@ -288,10 +289,11 @@ static int worker_thread_pipeline(void *arg) odp_barrier_wait(&test_global->worker_start); while (1) { - odp_packet_t pkt[BURST_SIZE]; + odp_event_t ev[burst_size]; + odp_packet_t pkt[burst_size]; num_pkt = odp_schedule_multi(&queue, ODP_SCHED_NO_WAIT, - ev, BURST_SIZE); + ev, burst_size); polls++; @@ -399,7 +401,6 @@ static int worker_thread_pipeline(void *arg) static int worker_thread_timers(void *arg) { - odp_event_t ev[BURST_SIZE]; int num, num_pkt, out, tmos, i, src_pktio, src_queue; odp_pktout_queue_t pktout; odp_queue_t queue; @@ -410,6 +411,7 @@ static int worker_thread_timers(void *arg) test_global_t *test_global = worker_arg->test_global_ptr; int worker_id = worker_arg->worker_id; uint32_t polls = 0; + int burst_size = test_global->opt.burst_size; uint64_t tick = test_global->timer.timeout_tick; printf("Worker (timers) %i started\n", worker_id); @@ -418,10 +420,11 @@ static int worker_thread_timers(void *arg) odp_barrier_wait(&test_global->worker_start); while (1) { - odp_packet_t pkt[BURST_SIZE]; + odp_event_t ev[burst_size]; + odp_packet_t pkt[burst_size]; num = odp_schedule_multi(&queue, ODP_SCHED_NO_WAIT, - ev, BURST_SIZE); + ev, burst_size); polls++; @@ -534,6 +537,7 @@ static void print_usage(const char *progname) " -i, --interface <name> Packet IO interfaces (comma-separated, no spaces)\n" " -c, --num_cpu <number> Worker thread count. Default: 1\n" " -q, --num_queue <number> Number of pktio queues. Default: Worker thread count\n" + " -b, --burst <number> Maximum number of events requested from scheduler. Default: 32\n" " -t, --timeout <number> Flow inactivity timeout (in usec) per packet. Default: 0 (don't use timers)\n" " --pipe-stages <number> Number of pipeline stages per interface\n" " --pipe-queues <number> Number of queues per pipeline stage\n" @@ -553,6 +557,7 @@ static int parse_options(int argc, char *argv[], test_options_t *test_options) {"interface", required_argument, NULL, 'i'}, {"num_cpu", required_argument, NULL, 'c'}, {"num_queue", required_argument, NULL, 'q'}, + {"burst", required_argument, NULL, 'b'}, {"timeout", required_argument, NULL, 't'}, {"sched_mode", required_argument, NULL, 'm'}, {"pipe-stages", required_argument, NULL, 0}, @@ -562,7 +567,7 @@ static int parse_options(int argc, char *argv[], test_options_t *test_options) {"help", no_argument, NULL, 'h'}, {NULL, 0, NULL, 0} }; - const char *shortopts = "+i:c:q:t:m:sh"; + const char *shortopts = "+i:c:q:b:t:m:sh"; int ret = 0; memset(test_options, 0, sizeof(test_options_t)); @@ -570,6 +575,7 @@ static int parse_options(int argc, char *argv[], test_options_t *test_options) test_options->sched_mode = SCHED_MODE_ATOMIC; test_options->num_worker = 1; test_options->num_pktio_queue = 0; + test_options->burst_size = 32; test_options->pipe_queue_size = 256; /* let helper collect its own arguments (e.g. --odph_proc) */ @@ -628,6 +634,9 @@ static int parse_options(int argc, char *argv[], test_options_t *test_options) case 'q': test_options->num_pktio_queue = atoi(optarg); break; + case 'b': + test_options->burst_size = atoi(optarg); + break; case 't': test_options->timeout_us = atol(optarg); break; @@ -771,6 +780,7 @@ static void print_config(test_global_t *test_global) " queues per interface: %i\n", test_global->opt.num_pktio_queue); + printf(" burst size: %u\n", test_global->opt.burst_size); printf(" collect statistics: %u\n", test_global->opt.collect_stat); printf(" timeout usec: %li\n", test_global->opt.timeout_us); ----------------------------------------------------------------------- Summary of changes: config/odp-linux-generic.conf | 13 ++++++- platform/linux-generic/include/odp_schedule_if.h | 12 ++++++- platform/linux-generic/odp_schedule_basic.c | 43 +++++++++++++++++++++-- platform/linux-generic/odp_thread.c | 44 ++++++++++++++++++++---- platform/linux-generic/test/process-mode.conf | 2 +- test/performance/odp_sched_pktio.c | 32 +++++++++++------ 6 files changed, 124 insertions(+), 22 deletions(-) hooks/post-receive --

6 years, 3 months

[COMMIT] branch master updated. v1.19.0.2_tigermoth-219-g67d6f7120

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 67d6f7120962594e6b9e3343fd7cf13eda956b15 (commit) from 45cd0923809b2b4b972c9e9843ca7323183380c7 (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 67d6f7120962594e6b9e3343fd7cf13eda956b15 Author: Janne Peltonen <janne.peltonen(a)nokia.com> Date: Mon Sep 10 13:19:31 2018 +0300 linux-gen: ipsec: make SA lifetime checking more scalable to multiple threads Enforcing the packet and byte based SA life times is currently slow if the same SA is being handled by multiple threads since the threads keep checking and updating the same shared byte and packet counters. Make the implementation more scalable by having a thread-local quota of packets and bytes for each SA and by updating the shared byte and packet counters less frequently (i.e. when the quota runs out). This introduces some inexactness to life time warnings and errors. The warnings and errors about soft and hard limits being reached may come a bit earlier than expected based on the packets sent to the wire. Signed-off-by: Janne Peltonen <janne.peltonen(a)nokia.com> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/odp_ipsec_sad.c b/platform/linux-generic/odp_ipsec_sad.c index fa0d70968..178b01c0a 100644 --- a/platform/linux-generic/odp_ipsec_sad.c +++ b/platform/linux-generic/odp_ipsec_sad.c @@ -42,7 +42,42 @@ #warning IPV4_ID_RING_SIZE is too small for the maximum number of threads. #endif +/* + * To avoid checking and updating the packet and byte counters in the + * SA for every packet, we increment the global counters once for several + * packets. We decrement a preallocated thread-local quota for every + * packet. When the quota runs out, we get a new quota by incementing the + * global counter. + * + * This improves performance but the looser synchronization between + * threads makes life time warnings and errors somewhat inaccurate. + * The warnings and errors may get triggered a bit too early since + * some threads may still have unused quota when the first thread + * hits the limit. + */ +#define SA_LIFE_PACKETS_PREALLOC 64 +#define SA_LIFE_BYTES_PREALLOC 4000 + +typedef struct sa_thread_local_s { + /* + * Packets that can be processed in this thread before looking at + * the SA-global packet counter and checking hard and soft limits. + */ + uint32_t packet_quota; + /* + * Bytes that can be processed in this thread before looking at + * at the SA-global byte counter and checking hard and soft limits. + */ + uint32_t byte_quota; + /* + * Life time status when this thread last checked the global + * counter(s). + */ + odp_ipsec_op_status_t lifetime_status; +} sa_thread_local_t; + typedef struct ODP_ALIGNED_CACHE ipsec_thread_local_s { + sa_thread_local_t sa[ODP_CONFIG_IPSEC_SAS]; uint16_t first_ipv4_id; /* first ID of current block of IDs */ uint16_t next_ipv4_id; /* next ID to be used */ } ipsec_thread_local_t; @@ -80,6 +115,24 @@ ipsec_sa_t *_odp_ipsec_sa_entry_from_hdl(odp_ipsec_sa_t sa) return ipsec_sa_entry_from_hdl(sa); } +static inline sa_thread_local_t *ipsec_sa_thread_local(ipsec_sa_t *sa) +{ + return &ipsec_sa_tbl->per_thread[odp_thread_id()].sa[sa->ipsec_sa_idx]; +} + +static void init_sa_thread_local(ipsec_sa_t *sa) +{ + sa_thread_local_t *sa_tl; + int n; + + for (n = 0; n < ODP_THREAD_COUNT_MAX; n++) { + sa_tl = &ipsec_sa_tbl->per_thread[n].sa[sa->ipsec_sa_idx]; + sa_tl->packet_quota = 0; + sa_tl->byte_quota = 0; + sa_tl->lifetime_status.all = 0; + } +} + int _odp_ipsec_sad_init_global(void) { odp_shm_t shm; @@ -540,6 +593,8 @@ odp_ipsec_sa_t odp_ipsec_sa_create(const odp_ipsec_sa_param_t *param) &ses_create_rc)) goto error; + init_sa_thread_local(ipsec_sa); + ipsec_sa_publish(ipsec_sa); return ipsec_sa->ipsec_sa_hdl; @@ -681,17 +736,11 @@ int _odp_ipsec_sa_stats_precheck(ipsec_sa_t *ipsec_sa, odp_ipsec_op_status_t *status) { int rc = 0; + sa_thread_local_t *sa_tl = ipsec_sa_thread_local(ipsec_sa); - if (ipsec_sa->hard_limit_bytes > 0 && - odp_atomic_load_u64(&ipsec_sa->hot.bytes) > - ipsec_sa->hard_limit_bytes) { - status->error.hard_exp_bytes = 1; - rc = -1; - } - if (ipsec_sa->hard_limit_packets > 0 && - odp_atomic_load_u64(&ipsec_sa->hot.packets) > - ipsec_sa->hard_limit_packets) { - status->error.hard_exp_packets = 1; + if (sa_tl->lifetime_status.error.hard_exp_packets || + sa_tl->lifetime_status.error.hard_exp_bytes) { + status->all |= sa_tl->lifetime_status.all; rc = -1; } @@ -701,30 +750,47 @@ int _odp_ipsec_sa_stats_precheck(ipsec_sa_t *ipsec_sa, int _odp_ipsec_sa_stats_update(ipsec_sa_t *ipsec_sa, uint32_t len, odp_ipsec_op_status_t *status) { - uint64_t bytes = odp_atomic_fetch_add_u64(&ipsec_sa->hot.bytes, len) + len; - uint64_t packets = odp_atomic_fetch_add_u64(&ipsec_sa->hot.packets, 1) + 1; - int rc = 0; + sa_thread_local_t *sa_tl = ipsec_sa_thread_local(ipsec_sa); + uint64_t packets, bytes; + + if (odp_unlikely(sa_tl->packet_quota == 0)) { + packets = odp_atomic_fetch_add_u64(&ipsec_sa->hot.packets, + SA_LIFE_PACKETS_PREALLOC); + packets += SA_LIFE_PACKETS_PREALLOC; + sa_tl->packet_quota += SA_LIFE_PACKETS_PREALLOC; + + if (ipsec_sa->soft_limit_packets > 0 && + packets >= ipsec_sa->soft_limit_packets) + sa_tl->lifetime_status.warn.soft_exp_packets = 1; + + if (ipsec_sa->hard_limit_packets > 0 && + packets >= ipsec_sa->hard_limit_packets) + sa_tl->lifetime_status.error.hard_exp_packets = 1; + } + sa_tl->packet_quota--; - if (ipsec_sa->soft_limit_bytes > 0 && - bytes > ipsec_sa->soft_limit_bytes) - status->warn.soft_exp_bytes = 1; + if (odp_unlikely(sa_tl->byte_quota < len)) { + bytes = odp_atomic_fetch_add_u64(&ipsec_sa->hot.bytes, + len + SA_LIFE_BYTES_PREALLOC); + bytes += len + SA_LIFE_BYTES_PREALLOC; + sa_tl->byte_quota += len + SA_LIFE_BYTES_PREALLOC; - if (ipsec_sa->soft_limit_packets > 0 && - packets > ipsec_sa->soft_limit_packets) - status->warn.soft_exp_packets = 1; + if (ipsec_sa->soft_limit_bytes > 0 && + bytes >= ipsec_sa->soft_limit_bytes) + sa_tl->lifetime_status.warn.soft_exp_bytes = 1; - if (ipsec_sa->hard_limit_bytes > 0 && - bytes > ipsec_sa->hard_limit_bytes) { - status->error.hard_exp_bytes = 1; - rc = -1; - } - if (ipsec_sa->hard_limit_packets > 0 && - packets > ipsec_sa->hard_limit_packets) { - status->error.hard_exp_packets = 1; - rc = -1; + if (ipsec_sa->hard_limit_bytes > 0 && + bytes >= ipsec_sa->hard_limit_bytes) + sa_tl->lifetime_status.error.hard_exp_bytes = 1; } + sa_tl->byte_quota -= len; - return rc; + status->all |= sa_tl->lifetime_status.all; + + if (sa_tl->lifetime_status.error.hard_exp_packets || + sa_tl->lifetime_status.error.hard_exp_bytes) + return -1; + return 0; } int _odp_ipsec_sa_replay_precheck(ipsec_sa_t *ipsec_sa, uint32_t seq, ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/odp_ipsec_sad.c | 124 +++++++++++++++++++++++++-------- 1 file changed, 95 insertions(+), 29 deletions(-) hooks/post-receive --

6 years, 3 months

[COMMIT] branch master updated. v1.19.0.2_tigermoth-218-g45cd09238

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 45cd0923809b2b4b972c9e9843ca7323183380c7 (commit) via 8de012860878e3cb70aab7b6151223b201a8d9a1 (commit) via 52d54fae53f5e65f232cb21b116e51ea36b4eb0b (commit) from eab91f7101cdf47c59b14b5a511a82c701e66ff4 (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 45cd0923809b2b4b972c9e9843ca7323183380c7 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Wed Oct 24 15:54:53 2018 +0300 linux-gen: sched: increase max spread weight Increase max spread weight. The default value is kept the same. 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/platform/linux-generic/odp_schedule_basic.c b/platform/linux-generic/odp_schedule_basic.c index 456704a08..7208200aa 100644 --- a/platform/linux-generic/odp_schedule_basic.c +++ b/platform/linux-generic/odp_schedule_basic.c @@ -58,7 +58,7 @@ ODP_STATIC_ASSERT((ODP_SCHED_PRIO_NORMAL > 0) && /* A thread polls a non preferred sched queue every this many polls * of the prefer queue. */ -#define MAX_PREFER_WEIGHT 63 +#define MAX_PREFER_WEIGHT 127 #define MIN_PREFER_WEIGHT 1 #define MAX_PREFER_RATIO (MAX_PREFER_WEIGHT + 1) commit 8de012860878e3cb70aab7b6151223b201a8d9a1 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Wed Oct 24 15:45:38 2018 +0300 linux-gen: sched: use spread weight from config file Use the new config file option instead of fixed prefer ratio. 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/platform/linux-generic/odp_schedule_basic.c b/platform/linux-generic/odp_schedule_basic.c index 214d42c8b..456704a08 100644 --- a/platform/linux-generic/odp_schedule_basic.c +++ b/platform/linux-generic/odp_schedule_basic.c @@ -333,7 +333,7 @@ static inline uint8_t prio_spread_index(uint32_t index) static void sched_local_init(void) { int i; - uint8_t spread; + uint8_t spread, prefer_ratio; uint8_t num_spread = sched->config.num_spread; uint8_t offset = 1; @@ -344,11 +344,12 @@ static void sched_local_init(void) sched_local.stash.queue = ODP_QUEUE_INVALID; spread = prio_spread_index(sched_local.thr); + prefer_ratio = sched->config.prefer_ratio; for (i = 0; i < SPREAD_TBL_SIZE; i++) { sched_local.spread_tbl[i] = spread; - if (num_spread > 1 && (i % MAX_PREFER_RATIO) == 0) { + if (num_spread > 1 && (i % prefer_ratio) == 0) { sched_local.spread_tbl[i] = prio_spread_index(spread + offset); offset++; @@ -362,6 +363,7 @@ static int schedule_init_global(void) { odp_shm_t shm; int i, j, grp; + int prefer_ratio; ODP_DBG("Schedule init ... "); @@ -382,8 +384,10 @@ static int schedule_init_global(void) return -1; } + prefer_ratio = sched->config.prefer_ratio; + /* When num_spread == 1, only spread_tbl[0] is used. */ - sched->max_spread = (sched->config.num_spread - 1) * MAX_PREFER_RATIO; + sched->max_spread = (sched->config.num_spread - 1) * prefer_ratio; sched->shm = shm; odp_spinlock_init(&sched->mask_lock); commit 52d54fae53f5e65f232cb21b116e51ea36b4eb0b Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Wed Oct 24 15:20:21 2018 +0300 linux-gen: sched: add spread weight config file option Add new config file option to control scheduler internal queue preference ratio. 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/config/odp-linux-generic.conf b/config/odp-linux-generic.conf index af651d7f6..2417d23f2 100644 --- a/config/odp-linux-generic.conf +++ b/config/odp-linux-generic.conf @@ -16,7 +16,7 @@ # Mandatory fields odp_implementation = "linux-generic" -config_file_version = "0.1.1" +config_file_version = "0.1.2" # Shared memory options shm: { @@ -80,13 +80,27 @@ queue_basic: { } sched_basic: { - # Priority level spread. Each priority level is spread into multiple - # scheduler internal queues. A higher spread value typically improves - # parallelism and thus is better for high thread counts, but causes - # uneven service level for low thread counts. Typically, optimal - # value is the number of threads using the scheduler. + # Priority level spread + # + # Each priority level is spread into multiple scheduler internal queues. + # This value defines the number of those queues. Minimum value is 1. + # Each thread prefers one of the queues over other queues. A higher + # spread value typically improves parallelism and thus is better for + # high thread counts, but causes uneven service level for low thread + # counts. Typically, optimal value is the number of threads using + # the scheduler. prio_spread = 4 + # Weight of the preferred scheduler internal queue + # + # Each thread prefers one of the internal queues over other queues. + # This value controls how many times the preferred queue is polled + # between a poll to another internal queue. Minimum value is 1. A higher + # value typically improves parallelism as threads work mostly on their + # preferred queues, but causes uneven service level for low thread + # counts as non-preferred queues are served less often + prio_spread_weight = 63 + # Burst size configuration per priority. The first array element # represents the highest queue priority. The scheduler tries to get # burst_size_default[prio] events from a queue and stashes those that diff --git a/platform/linux-generic/odp_schedule_basic.c b/platform/linux-generic/odp_schedule_basic.c index 58396293b..214d42c8b 100644 --- a/platform/linux-generic/odp_schedule_basic.c +++ b/platform/linux-generic/odp_schedule_basic.c @@ -58,10 +58,12 @@ ODP_STATIC_ASSERT((ODP_SCHED_PRIO_NORMAL > 0) && /* A thread polls a non preferred sched queue every this many polls * of the prefer queue. */ -#define PREFER_RATIO 64 +#define MAX_PREFER_WEIGHT 63 +#define MIN_PREFER_WEIGHT 1 +#define MAX_PREFER_RATIO (MAX_PREFER_WEIGHT + 1) /* Spread weight table */ -#define SPREAD_TBL_SIZE ((MAX_SPREAD - 1) * PREFER_RATIO) +#define SPREAD_TBL_SIZE ((MAX_SPREAD - 1) * MAX_PREFER_RATIO) /* Maximum number of packet IO interfaces */ #define NUM_PKTIO ODP_CONFIG_PKTIO_ENTRIES @@ -182,6 +184,7 @@ typedef struct { uint8_t burst_default[NUM_PRIO]; uint8_t burst_max[NUM_PRIO]; uint8_t num_spread; + uint8_t prefer_ratio; } config; uint16_t max_spread; @@ -256,13 +259,29 @@ static int read_config_file(sched_global_t *sched) } if (val > MAX_SPREAD || val < MIN_SPREAD) { - ODP_ERR("Bad value %s = %u\n", str, val); + ODP_ERR("Bad value %s = %u [min: %u, max: %u]\n", str, val, + MIN_SPREAD, MAX_SPREAD); return -1; } sched->config.num_spread = val; ODP_PRINT(" %s: %i\n", str, val); + str = "sched_basic.prio_spread_weight"; + if (!_odp_libconfig_lookup_int(str, &val)) { + ODP_ERR("Config option '%s' not found.\n", str); + return -1; + } + + if (val > MAX_PREFER_WEIGHT || val < MIN_PREFER_WEIGHT) { + ODP_ERR("Bad value %s = %u [min: %u, max: %u]\n", str, val, + MIN_PREFER_WEIGHT, MAX_PREFER_WEIGHT); + return -1; + } + + sched->config.prefer_ratio = val + 1; + ODP_PRINT(" %s: %i\n", str, val); + str = "sched_basic.burst_size_default"; if (_odp_libconfig_lookup_array(str, burst_val, NUM_PRIO) != NUM_PRIO) { @@ -329,7 +348,7 @@ static void sched_local_init(void) for (i = 0; i < SPREAD_TBL_SIZE; i++) { sched_local.spread_tbl[i] = spread; - if (num_spread > 1 && (i % PREFER_RATIO) == 0) { + if (num_spread > 1 && (i % MAX_PREFER_RATIO) == 0) { sched_local.spread_tbl[i] = prio_spread_index(spread + offset); offset++; @@ -364,7 +383,7 @@ static int schedule_init_global(void) } /* When num_spread == 1, only spread_tbl[0] is used. */ - sched->max_spread = (sched->config.num_spread - 1) * PREFER_RATIO; + sched->max_spread = (sched->config.num_spread - 1) * MAX_PREFER_RATIO; sched->shm = shm; odp_spinlock_init(&sched->mask_lock); diff --git a/platform/linux-generic/test/process-mode.conf b/platform/linux-generic/test/process-mode.conf index d80df25c4..7a06544ab 100644 --- a/platform/linux-generic/test/process-mode.conf +++ b/platform/linux-generic/test/process-mode.conf @@ -1,6 +1,6 @@ # Mandatory fields odp_implementation = "linux-generic" -config_file_version = "0.1.1" +config_file_version = "0.1.2" # Shared memory options shm: { ----------------------------------------------------------------------- Summary of changes: config/odp-linux-generic.conf | 26 +++++++++++++++----- platform/linux-generic/odp_schedule_basic.c | 35 ++++++++++++++++++++++----- platform/linux-generic/test/process-mode.conf | 2 +- 3 files changed, 50 insertions(+), 13 deletions(-) hooks/post-receive --

6 years, 3 months

[COMMIT] branch master updated. v1.19.0.2_tigermoth-215-geab91f710

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 eab91f7101cdf47c59b14b5a511a82c701e66ff4 (commit) from cc91c95216ca80d17c638c07659873ecf24f25e6 (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 eab91f7101cdf47c59b14b5a511a82c701e66ff4 Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Sun Oct 21 10:19:41 2018 +0300 remove scripts/build-pktio-dpdk Script was introduced to quick build odp with dpdk pktio support for dev or testing propose. Now it's more easy to run docker container with same parameters as CI does. Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-and-tested-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/DEPENDENCIES b/DEPENDENCIES index 6b345b9c3..abe6d7411 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -166,23 +166,42 @@ Prerequisites for building the OpenDataPlane (ODP) API Use DPDK for ODP packet I/O. + Note: only packet I/O is accelerated with DPDK. Use + https://github.com/Linaro/odp-dpdk.git + for fully accelerated odp dpdk platform. + +3.4.1 DPDK pktio requirements + DPDK pktio adds a depency to NUMA library. # Debian/Ubuntu $ sudo apt-get install libnuma-dev # CentOS/RedHat/Fedora $ sudo yum install numactl-devel - Note: only packet I/O is accelerated with DPDK. Use - https://github.com/Linaro/odp-dpdk.git - for fully accelerated odp dpdk platform. +3.4.2 Native DPDK install + # Debian/Ubuntu starting from 18.04 + $ sudo apt-get install dpdk-dev + +3.4.2 Built DPDK from src + git clone --branch=17.11 http://dpdk.org/git/dpdk-stable dpdk + + #Make and edit DPDK configuration + TARGET="x86_64-native-linuxapp-gcc" + make config T=${TARGET} O=${TARGET} + pushd ${TARGET} -3.4.1 Building DPDK and ODP with DPDK pktio support + #To use I/O without DPDK supported NIC's enable pcap pmd: + sed -ri 's,(CONFIG_RTE_LIBRTE_PMD_PCAP=).*,\1y,' .config + popd - DPDK packet I/O has been tested to work with DPDK v17.11. + #Build DPDK + make build O=${TARGET} EXTRA_CFLAGS="-fPIC" + make install O=${TARGET} DESTDIR=${TARGET} - Follow steps in ./scripts/build-pktio-dpdk + #compile ODP + ./configure --with-dpdk-path=`pwd`/dpdk/${TARGET}/usr/local -3.4.2 Setup system +3.4.3 Setup system # Load DPDK modules $ sudo /sbin/modprobe uio @@ -194,13 +213,13 @@ Prerequisites for building the OpenDataPlane (ODP) API 512 x 2MB hugepages. All this can be done with the DPDK setup script (<dpdk-dir>/tools/dpdk-setup.sh). -3.4.3 Running ODP with DPDK pktio +3.4.4 Running ODP with DPDK pktio ODP applications will try use DPDK for packet I/O by default. If some other I/O type is desired instead, DPDK I/O can be disabled by setting the environment variable ODP_PKTIO_DISABLE_DPDK. - DPDK interfaces are accessed using indices. For example, two first DPDK + DPDK interfaces are accessed using indexes. For example, two first DPDK interfaces can be used with the odp_l2fwd example as follows: $ cd <odp_dir> $ sudo ./test/performance/odp_l2fwd -i 0,1 -c 2 -m 0 diff --git a/scripts/build-pktio-dpdk b/scripts/build-pktio-dpdk deleted file mode 100755 index b0c0a4d0e..000000000 --- a/scripts/build-pktio-dpdk +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash - -TARGET=${TARGET:-"x86_64-native-linuxapp-gcc"} - -export ROOT_DIR=$(readlink -e $(dirname $0) | sed 's|/scripts||') -pushd ${ROOT_DIR} - -echo '#include "pcap.h"' | cpp -H -o /dev/null 2>&1 -if [ "$?" != "0" ]; then - echo "Error: pcap is not installed. You may need to install libpcap-dev" -fi - -echo '#include "numa.h"' | cpp -H -o /dev/null 2>&1 -if [ "$?" != "0" ]; then - echo "Error: NUMA library is not installed. You need to install libnuma-dev" - exit 1 -fi - -git -c advice.detachedHead=false clone -q --depth=1 --single-branch --branch=17.11 http://dpdk.org/git/dpdk-stable dpdk -pushd dpdk -git log --oneline --decorate - -#Make and edit DPDK configuration -make config T=${TARGET} O=${TARGET} -pushd ${TARGET} -#To use I/O without DPDK supported NIC's enable pcap pmd: -sed -ri 's,(CONFIG_RTE_LIBRTE_PMD_PCAP=).*,\1y,' .config -popd - -#Build DPDK -make build O=${TARGET} EXTRA_CFLAGS="-fPIC" -make install O=${TARGET} DESTDIR=${TARGET} -popd - -#Build ODP -./bootstrap; -./configure --enable-test-vald --enable-test-perf --enable-test-cpp \ - --enable-debug --enable-debug-print \ - --with-dpdk-path=`pwd`/dpdk/${TARGET}/usr/local -make ----------------------------------------------------------------------- Summary of changes: DEPENDENCIES | 37 ++++++++++++++++++++++++++++--------- scripts/build-pktio-dpdk | 40 ---------------------------------------- 2 files changed, 28 insertions(+), 49 deletions(-) delete mode 100755 scripts/build-pktio-dpdk hooks/post-receive --

6 years, 3 months

[COMMIT] branch master updated. v1.19.0.2_tigermoth-214-gcc91c9521

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 cc91c95216ca80d17c638c07659873ecf24f25e6 (commit) via 4aa40267ae25e6ee021c8ce067bae649db2d0d8d (commit) via 83e9a6c3896d2d8a949a7bece565bae7dfd1d967 (commit) from 8dc48817b06a5a303cf2b778eda68cc3627dd625 (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 cc91c95216ca80d17c638c07659873ecf24f25e6 Author: Matias Elo <matias.elo(a)nokia.com> Date: Wed Oct 17 15:34:53 2018 +0300 linux-gen: timer: run inline timers during queue dequeue operations Process inline timers (if enabled) during odp_queue_deq() and odp_queue_deq_multi() calls. This fixes inline timers not working if odp_schedule() or odp_schedule_multi() was never called. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/odp_queue_basic.c b/platform/linux-generic/odp_queue_basic.c index 73a5536d8..4e23fb53b 100644 --- a/platform/linux-generic/odp_queue_basic.c +++ b/platform/linux-generic/odp_queue_basic.c @@ -16,6 +16,7 @@ #include <odp_pool_internal.h> #include <odp_init_internal.h> #include <odp_shm_internal.h> +#include <odp_timer_internal.h> #include <odp/api/shared_memory.h> #include <odp/api/schedule.h> #include <odp_schedule_if.h> @@ -28,6 +29,7 @@ #include <odp/api/traffic_mngr.h> #include <odp_libconfig_internal.h> #include <odp/api/plat/queue_inline_types.h> +#include <odp_global_data.h> #define NUM_INTERNAL_QUEUES 64 @@ -976,6 +978,10 @@ static int queue_api_deq_multi(odp_queue_t handle, odp_event_t ev[], int num) { queue_entry_t *queue = qentry_from_handle(handle); + if (odp_global_rw->inline_timers && + odp_atomic_load_u64(&queue->s.num_timers)) + timer_run(); + if (num > QUEUE_MULTI_MAX) num = QUEUE_MULTI_MAX; @@ -987,6 +993,10 @@ static odp_event_t queue_api_deq(odp_queue_t handle) { queue_entry_t *queue = qentry_from_handle(handle); + if (odp_global_rw->inline_timers && + odp_atomic_load_u64(&queue->s.num_timers)) + timer_run(); + return (odp_event_t)queue->s.dequeue(handle); } diff --git a/platform/linux-generic/odp_queue_scalable.c b/platform/linux-generic/odp_queue_scalable.c index 6ec7f14b7..3acfc0841 100644 --- a/platform/linux-generic/odp_queue_scalable.c +++ b/platform/linux-generic/odp_queue_scalable.c @@ -24,9 +24,11 @@ #include <odp_pool_internal.h> #include <odp_queue_scalable_internal.h> #include <odp_schedule_if.h> +#include <odp_timer_internal.h> #include <odp_ishm_internal.h> #include <odp_ishmpool_internal.h> #include <odp/api/plat/queue_inline_types.h> +#include <odp_global_data.h> #include <string.h> #include <inttypes.h> @@ -845,6 +847,11 @@ static int queue_deq_multi(odp_queue_t handle, odp_event_t ev[], int num) num = QUEUE_MULTI_MAX; queue = qentry_from_ext(handle); + + if (odp_global_rw->inline_timers && + odp_atomic_load_u64(&queue->s.num_timers)) + timer_run(); + return queue->s.dequeue_multi(handle, (odp_buffer_hdr_t **)ev, num); } @@ -853,6 +860,11 @@ static odp_event_t queue_deq(odp_queue_t handle) queue_entry_t *queue; queue = qentry_from_ext(handle); + + if (odp_global_rw->inline_timers && + odp_atomic_load_u64(&queue->s.num_timers)) + timer_run(); + return (odp_event_t)queue->s.dequeue(handle); } diff --git a/platform/linux-generic/odp_timer.c b/platform/linux-generic/odp_timer.c index 507226580..a22617559 100644 --- a/platform/linux-generic/odp_timer.c +++ b/platform/linux-generic/odp_timer.c @@ -55,6 +55,7 @@ #include <odp/api/time.h> #include <odp/api/plat/time_inlines.h> #include <odp/api/timer.h> +#include <odp_queue_if.h> #include <odp_timer_internal.h> #include <odp/api/plat/queue_inlines.h> #include <odp_global_data.h> @@ -442,6 +443,8 @@ static inline odp_timer_t timer_alloc(timer_pool_t *tp, tp->num_alloc, _ODP_MEMMODEL_RLS); hdl = tp_idx_to_handle(tp, idx); + /* Add timer to queue */ + queue_fn->timer_add(queue); } else { __odp_errno = ENFILE; /* Reusing file table overflow */ hdl = ODP_TIMER_INVALID; @@ -461,6 +464,9 @@ static inline odp_buffer_t timer_free(timer_pool_t *tp, uint32_t idx) * grab any timeout buffer */ odp_buffer_t old_buf = timer_set_unused(tp, idx); + /* Remove timer from queue */ + queue_fn->timer_rem(tim->queue); + /* Destroy timer */ timer_fini(tim, &tp->tick_buf[idx]); commit 4aa40267ae25e6ee021c8ce067bae649db2d0d8d Author: Matias Elo <matias.elo(a)nokia.com> Date: Wed Oct 17 13:29:42 2018 +0300 linux-gen: timer: reduce inline timer overhead Reduce inline timer overhead by not polling timers until at least one timer pool has been created. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/include/odp_global_data.h b/platform/linux-generic/include/odp_global_data.h index f1be1502c..a12d12973 100644 --- a/platform/linux-generic/include/odp_global_data.h +++ b/platform/linux-generic/include/odp_global_data.h @@ -40,6 +40,7 @@ typedef struct { /* Read-only global data. Members should not be modified after global init * to enable process more support. */ struct odp_global_data_ro_t { + odp_init_t init_param; /* directory for odp mmaped files */ char *shm_dir; /* overload default with env */ @@ -69,6 +70,7 @@ struct odp_global_data_rw_t { pthread_t inotify_thread; int inotify_pcapng_is_running; odp_bool_t dpdk_initialized; + odp_bool_t inline_timers; }; extern struct odp_global_data_ro_t odp_global_ro; diff --git a/platform/linux-generic/include/odp_timer_internal.h b/platform/linux-generic/include/odp_timer_internal.h index 8dda9e6ff..02ba92e0d 100644 --- a/platform/linux-generic/include/odp_timer_internal.h +++ b/platform/linux-generic/include/odp_timer_internal.h @@ -19,6 +19,7 @@ #include <odp_buffer_internal.h> #include <odp_pool_internal.h> #include <odp/api/timer.h> +#include <odp_global_data.h> /* Minimum number of scheduling rounds between checking timer pools. */ #define CONFIG_TIMER_RUN_RATELIMIT_ROUNDS 1 @@ -38,22 +39,12 @@ typedef struct { odp_timer_t timer; } odp_timeout_hdr_t; -/* - * Whether to run timer pool processing 'inline' (on worker cores) or in - * background threads (thread-per-timerpool). - * - * If the application will use both scheduler and timer this flag is set - * to true, otherwise false. This application conveys this information via - * the 'not_used' bits in odp_init_t which are passed to odp_global_init(). - */ -extern odp_bool_t inline_timers; - unsigned _timer_run(void); /* Static inline wrapper to minimize modification of schedulers. */ static inline unsigned timer_run(void) { - return inline_timers ? _timer_run() : 0; + return odp_global_rw->inline_timers ? _timer_run() : 0; } #endif diff --git a/platform/linux-generic/odp_init.c b/platform/linux-generic/odp_init.c index dca06641a..0f7e0df28 100644 --- a/platform/linux-generic/odp_init.c +++ b/platform/linux-generic/odp_init.c @@ -268,6 +268,8 @@ int odp_init_global(odp_instance_t *instance, odp_global_ro.abort_fn = odp_override_abort; if (params != NULL) { + odp_global_ro.init_param = *params; + if (params->log_fn != NULL) odp_global_ro.log_fn = params->log_fn; if (params->abort_fn != NULL) diff --git a/platform/linux-generic/odp_timer.c b/platform/linux-generic/odp_timer.c index eeb863530..507226580 100644 --- a/platform/linux-generic/odp_timer.c +++ b/platform/linux-generic/odp_timer.c @@ -68,8 +68,6 @@ * for checking the freshness of received timeouts */ #define TMO_INACTIVE ((uint64_t)0x8000000000000000) -odp_bool_t inline_timers = false; - /****************************************************************************** * Mutual exclusion in the absence of CAS16 *****************************************************************************/ @@ -333,8 +331,26 @@ static odp_timer_pool_t timer_pool_new(const char *name, odp_spinlock_init(&tp->lock); odp_ticketlock_lock(&timer_global->lock); timer_global->timer_pool[tp_idx] = tp; + + if (timer_global->num_timer_pools == 1) { + odp_bool_t inline_tim; + + /* + * Whether to run timer pool processing 'inline' (on worker + * cores) or in background threads (thread-per-timerpool). + * + * If the application will use scheduler this flag is set to + * true, otherwise false. This application conveys this + * information via the 'not_used' bits in odp_init_t which are + * passed to odp_global_init(). + */ + inline_tim = !odp_global_ro.init_param.not_used.feat.schedule; + + odp_global_rw->inline_timers = inline_tim; + } + odp_ticketlock_unlock(&timer_global->lock); - if (!inline_timers) { + if (!odp_global_rw->inline_timers) { if (tp->param.clk_src == ODP_CLOCK_CPU) itimer_init(tp); } @@ -368,7 +384,7 @@ static void odp_timer_pool_del(timer_pool_t *tp) odp_spinlock_lock(&tp->lock); - if (!inline_timers) { + if (!odp_global_rw->inline_timers) { /* Stop POSIX itimer signals */ if (tp->param.clk_src == ODP_CLOCK_CPU) itimer_fini(tp); @@ -390,6 +406,11 @@ static void odp_timer_pool_del(timer_pool_t *tp) timer_global->timer_pool[tp->tp_idx] = NULL; timer_global->timer_pool_used[tp->tp_idx] = 0; timer_global->num_timer_pools--; + + /* Disable inline timer polling */ + if (timer_global->num_timer_pools == 0) + odp_global_rw->inline_timers = false; + odp_ticketlock_unlock(&timer_global->lock); rc = odp_shm_free(shm); @@ -1093,6 +1114,11 @@ int odp_timer_capability(odp_timer_clk_src_t clk_src, odp_timer_pool_t odp_timer_pool_create(const char *name, const odp_timer_pool_param_t *param) { + if (odp_global_ro.init_param.not_used.feat.timer) { + ODP_ERR("Trying to use disabled ODP feature.\n"); + return ODP_TIMER_POOL_INVALID; + } + if (param->res_ns < timer_global->highest_res_ns) { __odp_errno = EINVAL; return ODP_TIMER_POOL_INVALID; @@ -1295,6 +1321,7 @@ void odp_timeout_free(odp_timeout_t tmo) int odp_timer_init_global(const odp_init_t *params) { odp_shm_t shm; + odp_bool_t inline_timers = false; shm = odp_shm_reserve("_odp_timer", sizeof(timer_global_t), ODP_CACHE_LINE_SIZE, 0); commit 83e9a6c3896d2d8a949a7bece565bae7dfd1d967 Author: Matias Elo <matias.elo(a)nokia.com> Date: Tue Oct 2 14:13:35 2018 +0300 linux-gen: queue: add internal interface for adding/removing inline timers Add internal queue interface functions queue_timer_add_fn_t and queue_timer_rem_fn_t for adding/removing inline timers. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/include/odp_queue_basic_internal.h b/platform/linux-generic/include/odp_queue_basic_internal.h index 41ca424c7..c8ed978ce 100644 --- a/platform/linux-generic/include/odp_queue_basic_internal.h +++ b/platform/linux-generic/include/odp_queue_basic_internal.h @@ -54,6 +54,7 @@ struct queue_entry_s { ring_spsc_t ring_spsc; }; + odp_atomic_u64_t num_timers; int status; queue_deq_multi_fn_t orig_dequeue_multi; diff --git a/platform/linux-generic/include/odp_queue_if.h b/platform/linux-generic/include/odp_queue_if.h index 6ec7e24c2..5fe28dac1 100644 --- a/platform/linux-generic/include/odp_queue_if.h +++ b/platform/linux-generic/include/odp_queue_if.h @@ -39,6 +39,8 @@ typedef void (*queue_set_enq_deq_fn_t)(odp_queue_t queue, queue_enq_multi_fn_t enq_multi, queue_deq_fn_t deq, queue_deq_multi_fn_t deq_multi); +typedef void (*queue_timer_add_fn_t)(odp_queue_t queue); +typedef void (*queue_timer_rem_fn_t)(odp_queue_t queue); /* Queue functions towards other internal components */ typedef struct { @@ -51,6 +53,8 @@ typedef struct { queue_get_pktin_fn_t get_pktin; queue_set_pktin_fn_t set_pktin; queue_set_enq_deq_fn_t set_enq_deq_fn; + queue_timer_add_fn_t timer_add; + queue_timer_rem_fn_t timer_rem; /* Original queue dequeue multi function (before override). May be used * by an overriding dequeue function. */ diff --git a/platform/linux-generic/include/odp_queue_scalable_internal.h b/platform/linux-generic/include/odp_queue_scalable_internal.h index 05932a36a..3c582076c 100644 --- a/platform/linux-generic/include/odp_queue_scalable_internal.h +++ b/platform/linux-generic/include/odp_queue_scalable_internal.h @@ -35,6 +35,7 @@ struct queue_entry_s { sched_elem_t sched_elem; odp_ticketlock_t ODP_ALIGNED_CACHE lock; + odp_atomic_u64_t num_timers; int status; queue_enq_fn_t ODP_ALIGNED_CACHE enqueue; diff --git a/platform/linux-generic/odp_queue_basic.c b/platform/linux-generic/odp_queue_basic.c index ccd97da1e..73a5536d8 100644 --- a/platform/linux-generic/odp_queue_basic.c +++ b/platform/linux-generic/odp_queue_basic.c @@ -806,6 +806,7 @@ static int queue_init(queue_entry_t *queue, const char *name, queue->s.param.deq_mode = ODP_QUEUE_OP_DISABLED; queue->s.type = queue_type; + odp_atomic_init_u64(&queue->s.num_timers, 0); queue->s.pktin = PKTIN_INVALID; queue->s.pktout = PKTOUT_INVALID; @@ -949,6 +950,20 @@ static int queue_api_enq_multi(odp_queue_t handle, (odp_buffer_hdr_t **)(uintptr_t)ev, num); } +static void queue_timer_add(odp_queue_t handle) +{ + queue_entry_t *queue = qentry_from_handle(handle); + + odp_atomic_inc_u64(&queue->s.num_timers); +} + +static void queue_timer_rem(odp_queue_t handle) +{ + queue_entry_t *queue = qentry_from_handle(handle); + + odp_atomic_dec_u64(&queue->s.num_timers); +} + static int queue_api_enq(odp_queue_t handle, odp_event_t ev) { queue_entry_t *queue = qentry_from_handle(handle); @@ -1007,5 +1022,7 @@ queue_fn_t queue_basic_fn = { .get_pktin = queue_get_pktin, .set_pktin = queue_set_pktin, .set_enq_deq_fn = queue_set_enq_deq_func, - .orig_deq_multi = queue_orig_multi + .orig_deq_multi = queue_orig_multi, + .timer_add = queue_timer_add, + .timer_rem = queue_timer_rem }; diff --git a/platform/linux-generic/odp_queue_scalable.c b/platform/linux-generic/odp_queue_scalable.c index b7ff2195f..6ec7f14b7 100644 --- a/platform/linux-generic/odp_queue_scalable.c +++ b/platform/linux-generic/odp_queue_scalable.c @@ -124,6 +124,8 @@ static int queue_init(queue_entry_t *queue, const char *name, ring[ring_idx] = NULL; queue->s.type = queue->s.param.type; + odp_atomic_init_u64(&queue->s.num_timers, 0); + queue->s.enqueue = _queue_enq; queue->s.dequeue = _queue_deq; queue->s.enqueue_multi = _queue_enq_multi; @@ -958,6 +960,20 @@ static int queue_orig_multi(odp_queue_t handle, buf_hdr, num); } +static void queue_timer_add(odp_queue_t handle) +{ + queue_entry_t *queue = qentry_from_ext(handle); + + odp_atomic_inc_u64(&queue->s.num_timers); +} + +static void queue_timer_rem(odp_queue_t handle) +{ + queue_entry_t *queue = qentry_from_ext(handle); + + odp_atomic_dec_u64(&queue->s.num_timers); +} + /* API functions */ _odp_queue_api_fn_t queue_scalable_api = { .queue_create = queue_create, @@ -990,5 +1006,7 @@ queue_fn_t queue_scalable_fn = { .get_pktin = queue_get_pktin, .set_pktin = queue_set_pktin, .set_enq_deq_fn = queue_set_enq_deq_func, - .orig_deq_multi = queue_orig_multi + .orig_deq_multi = queue_orig_multi, + .timer_add = queue_timer_add, + .timer_rem = queue_timer_rem }; ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/include/odp_global_data.h | 2 ++ .../include/odp_queue_basic_internal.h | 1 + platform/linux-generic/include/odp_queue_if.h | 4 +++ .../include/odp_queue_scalable_internal.h | 1 + .../linux-generic/include/odp_timer_internal.h | 13 ++----- platform/linux-generic/odp_init.c | 2 ++ platform/linux-generic/odp_queue_basic.c | 29 ++++++++++++++- platform/linux-generic/odp_queue_scalable.c | 32 ++++++++++++++++- platform/linux-generic/odp_timer.c | 41 +++++++++++++++++++--- 9 files changed, 108 insertions(+), 17 deletions(-) hooks/post-receive --

6 years, 3 months

[COMMIT] branch master updated. v1.19.0.2_tigermoth-211-g8dc48817b

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 8dc48817b06a5a303cf2b778eda68cc3627dd625 (commit) via f21e5e8137becb8bda722ac8b9dd27d476af77f8 (commit) via f46ecd688b8c0de5f273ad92478f473eea167112 (commit) from 0e53dabacd38643eb17834b15b5ae8e459700a4f (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 8dc48817b06a5a303cf2b778eda68cc3627dd625 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Mon Oct 22 17:01:14 2018 +0300 m4: update ax_prog_doxygen.m4 to latest version Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/m4/ax_prog_doxygen.m4 b/m4/ax_prog_doxygen.m4 index 426ba0dfb..ed1dc83b4 100644 --- a/m4/ax_prog_doxygen.m4 +++ b/m4/ax_prog_doxygen.m4 @@ -1,5 +1,5 @@ # =========================================================================== -# http://www.gnu.org/software/autoconf-archive/ax_prog_doxygen.html +# https://www.gnu.org/software/autoconf-archive/ax_prog_doxygen.html # =========================================================================== # # SYNOPSIS @@ -21,7 +21,7 @@ # The DX_*_FEATURE macros control the default setting for the given # Doxygen feature. Supported features are 'DOXYGEN' itself, 'DOT' for # generating graphics, 'HTML' for plain HTML, 'CHM' for compressed HTML -# help (for MS users), 'CHI' for generating a seperate .chi file by the +# help (for MS users), 'CHI' for generating a separate .chi file by the # .chm file, and 'MAN', 'RTF', 'XML', 'PDF' and 'PS' for the appropriate # output formats. The environment variable DOXYGEN_PAPER_SIZE may be # specified to override the default 'a4wide' paper size. @@ -97,7 +97,7 @@ # and this notice are preserved. This file is offered as-is, without any # warranty. -#serial 18 +#serial 24 ## ----------## ## Defaults. ## @@ -164,7 +164,7 @@ AC_DEFUN([DX_TEST_FEATURE], [test "$DX_FLAG_$1" = 1]) AC_DEFUN([DX_CHECK_DEPEND], [ test "$DX_FLAG_$1" = "$2" \ || AC_MSG_ERROR([doxygen-DX_CURRENT_FEATURE ifelse([$2], 1, - requires, contradicts) doxygen-DX_CURRENT_FEATURE]) + requires, contradicts) doxygen-$1]) ]) # DX_CLEAR_DEPEND(FEATURE, REQUIRED_FEATURE, REQUIRED_STATE) @@ -265,14 +265,10 @@ m4_define([DX_loop], m4_dquote(m4_if(m4_eval(3 < m4_count($@)), 1, [m4_for([DX_i], 4, m4_count($@), 2, [, m4_eval(DX_i[/2])])], [])))dnl -# Environment variables used inside Doxyfile: +# Environment variables used inside doxygen.cfg: DX_ENV_APPEND(SRCDIR, $srcdir) -DX_ENV_APPEND(BUILDDIR, $builddir) -DX_ENV_APPEND(VERSION, $VERSION) -DX_ENV_APPEND(WITH_PLATFORM, $with_platform) DX_ENV_APPEND(PROJECT, $DX_PROJECT) DX_ENV_APPEND(VERSION, $PACKAGE_VERSION) -DX_ENV_APPEND(WITH_ARCH, $ARCH_DIR) # Doxygen itself: DX_ARG_ABLE(doc, [generate any doxygen documentation], @@ -325,8 +321,8 @@ DX_ARG_ABLE(chm, [generate doxygen compressed HTML help documentation], DX_ENV_APPEND(GENERATE_HTMLHELP, YES)], [DX_ENV_APPEND(GENERATE_HTMLHELP, NO)]) -# Seperate CHI file generation. -DX_ARG_ABLE(chi, [generate doxygen seperate compressed HTML help index file], +# Separate CHI file generation. +DX_ARG_ABLE(chi, [generate doxygen separate compressed HTML help index file], [DX_CHECK_DEPEND(chm, 1)], [DX_CLEAR_DEPEND(chm, 1)], [], @@ -382,94 +378,82 @@ a4wide|a4|letter|legal|executive) esac # Rules: -if test $DX_FLAG_html -eq 1; then - DX_SNIPPET_html="## ------------------------------- ## +AS_IF([[test $DX_FLAG_html -eq 1]], +[[DX_SNIPPET_html="## ------------------------------- ## ## Rules specific for HTML output. ## ## ------------------------------- ## -DX_CLEAN_HTML = \$(DX_DOCDIR)/html[]dnl +DX_CLEAN_HTML = \$(DX_DOCDIR)/html]dnl m4_foreach([DX_i], [m4_shift(DX_loop)], [[\\ - \$(DX_DOCDIR]DX_i[)/html]]) + \$(DX_DOCDIR]DX_i[)/html]])[ -" -else - DX_SNIPPET_html="" -fi -if test $DX_FLAG_chi -eq 1; then - DX_SNIPPET_chi=" -DX_CLEAN_CHI = \$(DX_DOCDIR)/\$(PACKAGE).chi[]dnl +"]], +[[DX_SNIPPET_html=""]]) +AS_IF([[test $DX_FLAG_chi -eq 1]], +[[DX_SNIPPET_chi=" +DX_CLEAN_CHI = \$(DX_DOCDIR)/\$(PACKAGE).chi]dnl m4_foreach([DX_i], [m4_shift(DX_loop)], [[\\ - \$(DX_DOCDIR]DX_i[)/\$(PACKAGE).chi]])" -else - DX_SNIPPET_chi="" -fi -if test $DX_FLAG_chm -eq 1; then - DX_SNIPPET_chm="## ------------------------------ ## + \$(DX_DOCDIR]DX_i[)/\$(PACKAGE).chi]])["]], +[[DX_SNIPPET_chi=""]]) +AS_IF([[test $DX_FLAG_chm -eq 1]], +[[DX_SNIPPET_chm="## ------------------------------ ## ## Rules specific for CHM output. ## ## ------------------------------ ## -DX_CLEAN_CHM = \$(DX_DOCDIR)/chm[]dnl +DX_CLEAN_CHM = \$(DX_DOCDIR)/chm]dnl m4_foreach([DX_i], [m4_shift(DX_loop)], [[\\ - \$(DX_DOCDIR]DX_i[)/chm]])\ + \$(DX_DOCDIR]DX_i[)/chm]])[\ ${DX_SNIPPET_chi} -" -else - DX_SNIPPET_chm="" -fi -if test $DX_FLAG_man -eq 1; then - DX_SNIPPET_man="## ------------------------------ ## +"]], +[[DX_SNIPPET_chm=""]]) +AS_IF([[test $DX_FLAG_man -eq 1]], +[[DX_SNIPPET_man="## ------------------------------ ## ## Rules specific for MAN output. ## ## ------------------------------ ## -DX_CLEAN_MAN = \$(DX_DOCDIR)/man[]dnl +DX_CLEAN_MAN = \$(DX_DOCDIR)/man]dnl m4_foreach([DX_i], [m4_shift(DX_loop)], [[\\ - \$(DX_DOCDIR]DX_i[)/man]]) + \$(DX_DOCDIR]DX_i[)/man]])[ -" -else - DX_SNIPPET_man="" -fi -if test $DX_FLAG_rtf -eq 1; then - DX_SNIPPET_rtf="## ------------------------------ ## +"]], +[[DX_SNIPPET_man=""]]) +AS_IF([[test $DX_FLAG_rtf -eq 1]], +[[DX_SNIPPET_rtf="## ------------------------------ ## ## Rules specific for RTF output. ## ## ------------------------------ ## -DX_CLEAN_RTF = \$(DX_DOCDIR)/rtf[]dnl +DX_CLEAN_RTF = \$(DX_DOCDIR)/rtf]dnl m4_foreach([DX_i], [m4_shift(DX_loop)], [[\\ - \$(DX_DOCDIR]DX_i[)/rtf]]) + \$(DX_DOCDIR]DX_i[)/rtf]])[ -" -else - DX_SNIPPET_rtf="" -fi -if test $DX_FLAG_xml -eq 1; then - DX_SNIPPET_xml="## ------------------------------ ## +"]], +[[DX_SNIPPET_rtf=""]]) +AS_IF([[test $DX_FLAG_xml -eq 1]], +[[DX_SNIPPET_xml="## ------------------------------ ## ## Rules specific for XML output. ## ## ------------------------------ ## -DX_CLEAN_XML = \$(DX_DOCDIR)/xml[]dnl +DX_CLEAN_XML = \$(DX_DOCDIR)/xml]dnl m4_foreach([DX_i], [m4_shift(DX_loop)], [[\\ - \$(DX_DOCDIR]DX_i[)/xml]]) + \$(DX_DOCDIR]DX_i[)/xml]])[ -" -else - DX_SNIPPET_xml="" -fi -if test $DX_FLAG_ps -eq 1; then - DX_SNIPPET_ps="## ----------------------------- ## +"]], +[[DX_SNIPPET_xml=""]]) +AS_IF([[test $DX_FLAG_ps -eq 1]], +[[DX_SNIPPET_ps="## ----------------------------- ## ## Rules specific for PS output. ## ## ----------------------------- ## -DX_CLEAN_PS = \$(DX_DOCDIR)/\$(PACKAGE).ps[]dnl +DX_CLEAN_PS = \$(DX_DOCDIR)/\$(PACKAGE).ps]dnl m4_foreach([DX_i], [m4_shift(DX_loop)], [[\\ - \$(DX_DOCDIR]DX_i[)/\$(PACKAGE).ps]]) + \$(DX_DOCDIR]DX_i[)/\$(PACKAGE).ps]])[ DX_PS_GOAL = doxygen-ps doxygen-ps: \$(DX_CLEAN_PS) -m4_foreach([DX_i], [DX_loop], +]m4_foreach([DX_i], [DX_loop], [[\$(DX_DOCDIR]DX_i[)/\$(PACKAGE).ps: \$(DX_DOCDIR]DX_i[)/\$(PACKAGE).tag \$(DX_V_LATEX)cd \$(DX_DOCDIR]DX_i[)/latex; \\ rm -f *.aux *.toc *.idx *.ind *.ilg *.log *.out; \\ @@ -485,25 +469,22 @@ m4_foreach([DX_i], [DX_loop], done; \\ \$(DX_DVIPS) -o ../\$(PACKAGE).ps refman.dvi -]])dnl -" -else - DX_SNIPPET_ps="" -fi -if test $DX_FLAG_pdf -eq 1; then - DX_SNIPPET_pdf="## ------------------------------ ## +]])["]], +[[DX_SNIPPET_ps=""]]) +AS_IF([[test $DX_FLAG_pdf -eq 1]], +[[DX_SNIPPET_pdf="## ------------------------------ ## ## Rules specific for PDF output. ## ## ------------------------------ ## -DX_CLEAN_PDF = \$(DX_DOCDIR)/\$(PACKAGE).pdf[]dnl +DX_CLEAN_PDF = \$(DX_DOCDIR)/\$(PACKAGE).pdf]dnl m4_foreach([DX_i], [m4_shift(DX_loop)], [[\\ - \$(DX_DOCDIR]DX_i[)/\$(PACKAGE).pdf]]) + \$(DX_DOCDIR]DX_i[)/\$(PACKAGE).pdf]])[ DX_PDF_GOAL = doxygen-pdf doxygen-pdf: \$(DX_CLEAN_PDF) -m4_foreach([DX_i], [DX_loop], +]m4_foreach([DX_i], [DX_loop], [[\$(DX_DOCDIR]DX_i[)/\$(PACKAGE).pdf: \$(DX_DOCDIR]DX_i[)/\$(PACKAGE).tag \$(DX_V_LATEX)cd \$(DX_DOCDIR]DX_i[)/latex; \\ rm -f *.aux *.toc *.idx *.ind *.ilg *.log *.out; \\ @@ -519,31 +500,26 @@ m4_foreach([DX_i], [DX_loop], done; \\ mv refman.pdf ../\$(PACKAGE).pdf -]])dnl -" -else - DX_SNIPPET_pdf="" -fi -if test $DX_FLAG_ps -eq 1 -o $DX_FLAG_pdf -eq 1; then - DX_SNIPPET_latex="## ------------------------------------------------- ## +]])["]], +[[DX_SNIPPET_pdf=""]]) +AS_IF([[test $DX_FLAG_ps -eq 1 -o $DX_FLAG_pdf -eq 1]], +[[DX_SNIPPET_latex="## ------------------------------------------------- ## ## Rules specific for LaTeX (shared for PS and PDF). ## ## ------------------------------------------------- ## DX_V_LATEX = \$(_DX_v_LATEX_\$(V)) _DX_v_LATEX_ = \$(_DX_v_LATEX_\$(AM_DEFAULT_VERBOSITY)) -_DX_v_LATEX_0 = @echo \" LATEX \" \$[]][[]@; +_DX_v_LATEX_0 = @echo \" LATEX \" \$][@; -DX_CLEAN_LATEX = \$(DX_DOCDIR)/latex[]dnl +DX_CLEAN_LATEX = \$(DX_DOCDIR)/latex]dnl m4_foreach([DX_i], [m4_shift(DX_loop)], [[\\ - \$(DX_DOCDIR]DX_i[)/latex]]) + \$(DX_DOCDIR]DX_i[)/latex]])[ -" -else - DX_SNIPPET_latex="" -fi +"]], +[[DX_SNIPPET_latex=""]]) -if test $DX_FLAG_doc -eq 1; then - DX_SNIPPET_doc="## --------------------------------- ## +AS_IF([[test $DX_FLAG_doc -eq 1]], +[[DX_SNIPPET_doc="## --------------------------------- ## ## Format-independent Doxygen rules. ## ## --------------------------------- ## @@ -563,23 +539,24 @@ _DX_v_DXGEN_0 = @echo \" DXGEN \" \$<; .INTERMEDIATE: doxygen-run \$(DX_PS_GOAL) \$(DX_PDF_GOAL) -doxygen-run:[]m4_foreach([DX_i], [DX_loop], - [[ \$(DX_DOCDIR]DX_i[)/\$(PACKAGE).tag]]) +doxygen-run:]m4_foreach([DX_i], [DX_loop], + [[ \$(DX_DOCDIR]DX_i[)/\$(PACKAGE).tag]])[ doxygen-doc: doxygen-run \$(DX_PS_GOAL) \$(DX_PDF_GOAL) -m4_foreach([DX_i], [DX_loop], +]m4_foreach([DX_i], [DX_loop], [[\$(DX_DOCDIR]DX_i[)/\$(PACKAGE).tag: \$(DX_CONFIG]DX_i[) \$(pkginclude_HEADERS) \$(A""M_V_at)rm -rf \$(DX_DOCDIR]DX_i[) \$(DX_V_DXGEN)\$(DX_ENV) DOCDIR=\$(DX_DOCDIR]DX_i[) \$(DX_DOXYGEN) \$(DX_CONFIG]DX_i[) \$(A""M_V_at)echo Timestamp >\$][@ ]])dnl -DX_CLEANFILES = \\ +[DX_CLEANFILES = \\] m4_foreach([DX_i], [DX_loop], -[[ \$(DX_DOCDIR]DX_i[)/\$(PACKAGE).tag \\ +[[ \$(DX_DOCDIR]DX_i[)/doxygen_sqlite3.db \\ + \$(DX_DOCDIR]DX_i[)/\$(PACKAGE).tag \\ ]])dnl - -r \\ +[ -r \\ \$(DX_CLEAN_HTML) \\ \$(DX_CLEAN_CHM) \\ \$(DX_CLEAN_CHI) \\ @@ -588,19 +565,17 @@ m4_foreach([DX_i], [DX_loop], \$(DX_CLEAN_XML) \\ \$(DX_CLEAN_PS) \\ \$(DX_CLEAN_PDF) \\ - \$(DX_CLEAN_LATEX)" -else - DX_SNIPPET_doc="" -fi + \$(DX_CLEAN_LATEX)"]], +[[DX_SNIPPET_doc=""]]) AC_SUBST([DX_RULES], ["${DX_SNIPPET_doc}"])dnl AM_SUBST_NOTMAKE([DX_RULES]) #For debugging: -echo DX_FLAG_doc=$DX_FLAG_doc +#echo DX_FLAG_doc=$DX_FLAG_doc #echo DX_FLAG_dot=$DX_FLAG_dot #echo DX_FLAG_man=$DX_FLAG_man -echo DX_FLAG_html=$DX_FLAG_html +#echo DX_FLAG_html=$DX_FLAG_html #echo DX_FLAG_chm=$DX_FLAG_chm #echo DX_FLAG_chi=$DX_FLAG_chi #echo DX_FLAG_rtf=$DX_FLAG_rtf commit f21e5e8137becb8bda722ac8b9dd27d476af77f8 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Mon Oct 22 17:00:39 2018 +0300 doc: pass generated include files to Doxygen Pass generated files to doxygen to let it know about ODP_DEPRECATED()/ODP_VERSION_API_xxx Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/doc/application-api-guide/Doxyfile b/doc/application-api-guide/Doxyfile index 00c18df2e..b101153d1 100644 --- a/doc/application-api-guide/Doxyfile +++ b/doc/application-api-guide/Doxyfile @@ -4,6 +4,7 @@ PROJECT_NAME = "API Reference Manual" PROJECT_NUMBER = $(VERSION) PROJECT_LOGO = $(SRCDIR)/doc/images/ODP-Logo-HQ.svg INPUT = $(SRCDIR)/doc/application-api-guide \ + include \ $(SRCDIR)/include EXAMPLE_PATH = $(SRCDIR)/example $(SRCDIR) WARNINGS = NO diff --git a/doc/platform-api-guide/Doxyfile b/doc/platform-api-guide/Doxyfile index d716b4a3c..02e325cc6 100644 --- a/doc/platform-api-guide/Doxyfile +++ b/doc/platform-api-guide/Doxyfile @@ -5,8 +5,8 @@ PROJECT_NUMBER = $(VERSION) PROJECT_LOGO = $(SRCDIR)/doc/images/ODP-Logo-HQ.svg INPUT = $(SRCDIR)/doc/application-api-guide \ $(SRCDIR)/doc/platform-api-guide \ + include/odp/api \ $(SRCDIR)/include/odp/api \ $(SRCDIR)/platform/$(WITH_PLATFORM)/doc \ - $(SRCDIR)/platform/$(WITH_PLATFORM)/include/odp/api \ - $(SRCDIR)/platform/$(WITH_PLATFORM)/arch/$(WITH_ARCH) + $(SRCDIR)/platform/$(WITH_PLATFORM)/include/odp/api EXAMPLE_PATH = $(SRCDIR)/example $(SRCDIR)/platform $(SRCDIR) commit f46ecd688b8c0de5f273ad92478f473eea167112 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Mon Oct 22 17:00:29 2018 +0300 configure.ac: set DX environment WITH_PLATFORM from configure.ac Rather than manually modifying ax_prog_doxygen.m4 set variable from configure.ac. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/configure.ac b/configure.ac index 3b71ef510..68da20df5 100644 --- a/configure.ac +++ b/configure.ac @@ -283,6 +283,8 @@ AM_CONDITIONAL([ARCH_IS_X86_64], [test "x${ARCH_ABI}" = "xx86_64-linux"]) DX_HTML_FEATURE(ON) DX_PDF_FEATURE(OFF) DX_PS_FEATURE(OFF) +DX_ENV_APPEND(WITH_PLATFORM, $with_platform) + DX_INIT_DOXYGEN($PACKAGE_NAME, ${srcdir}/doc/application-api-guide/Doxyfile, ${builddir}/doc/application-api-guide/output, ----------------------------------------------------------------------- Summary of changes: configure.ac | 2 + doc/application-api-guide/Doxyfile | 1 + doc/platform-api-guide/Doxyfile | 4 +- m4/ax_prog_doxygen.m4 | 177 ++++++++++++++++--------------------- 4 files changed, 81 insertions(+), 103 deletions(-) hooks/post-receive --

6 years, 3 months

[COMMIT] branch master updated. v1.19.0.2_tigermoth-208-g0e53dabac

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 0e53dabacd38643eb17834b15b5ae8e459700a4f (commit) via bf5c002a2d9549fa0120d03588684096145f9fcc (commit) via 3f3997ff3af3f85c4ce150f41c9d95b7fd9e9f57 (commit) via 8f9f3784b900297f555f3a17d5ce47584846c77c (commit) via c5ee737dca5375e2f9fab38ffc768223b2d9eb64 (commit) via 1aca253a08ee916a66486bb6eca05cfc4567e38f (commit) via 4443213d11e3d9feeecb6d2f5b3bad80d8d73c4b (commit) via b6f8955f3f70a5e09bdd86c408373c0b8caeb3eb (commit) via 3cae562cf7e11f87d00c19f96b7b29f98a8dddc3 (commit) via 8c72eb46fb1ee47340ffc7af322215fb78894b37 (commit) from 044cae351a1e60e4381cdbae37e2a759772c2258 (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 0e53dabacd38643eb17834b15b5ae8e459700a4f Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Mon Oct 15 15:30:54 2018 +0300 travis: run all test with gcc first Change build matrix format from N x 2 to 2 x N. Run first all tests with GCC, then with clang. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/.travis.yml b/.travis.yml index e07942872..4e29102fa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,6 +36,10 @@ cache: - netmap - $HOME/doxygen-install +compiler: + - gcc + - clang + env: global: # @@ -74,10 +78,6 @@ matrix: - compiler: gcc env: BUILD_ONLY=1 ARCH="i386" -compiler: - - gcc - - clang - install: - if [ ${NETMAP} -eq 1 ] ; then echo "Installing NETMAP"; commit bf5c002a2d9549fa0120d03588684096145f9fcc Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Tue Oct 16 15:57:01 2018 +0300 travis: explicit netmap test cases Build, install and test with netmap only on couple of test cases. This saves travis test time and validates that ODP passes tests also without netmap (on x86). Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/.travis.yml b/.travis.yml index 18bf47902..e07942872 100644 --- a/.travis.yml +++ b/.travis.yml @@ -45,9 +45,11 @@ env: - CODECOV_TOKEN=a733c34c-5f5c-4ff1-af4b-e9f5edb1ab5e - UBUNTU_VERS="16.04" - BUILD_ONLY=0 + - NETMAP=0 matrix: - CONF="" - CONF="--disable-abi-compat" + - NETMAP=1 CONF="" - BUILD_ONLY=1 ARCH="arm64" - BUILD_ONLY=1 ARCH="armhf" - BUILD_ONLY=1 ARCH="powerpc" @@ -58,7 +60,7 @@ env: - BUILD_ONLY=1 ARCH="i386" CONF="--disable-abi-compat" - CONF="--enable-deprecated" - CONF="--enable-dpdk-zero-copy --disable-static-applications" - - CONF="--disable-static-applications" + - NETMAP=1 CONF="--disable-static-applications" - CONF="--disable-host-optimization" - CONF="--disable-host-optimization --disable-abi-compat" - BUILD_ONLY=1 ARCH="x86_64" CONF="--enable-pcapng-support" @@ -77,13 +79,13 @@ compiler: - clang install: - - sudo apt-get install linux-headers-`uname -r` - - if [ -z "${ARCH}" -o "${ARCH}" == "x86_64" ] ; then - echo "compilling netmap"; + - if [ ${NETMAP} -eq 1 ] ; then + echo "Installing NETMAP"; + sudo apt-get install linux-headers-`uname -r` ; CDIR=`pwd` ; git -c advice.detachedHead=false clone -q --depth=1 --single-branch --branch=v11.2 https://github.com/luigirizzo/netmap.git; pushd netmap/LINUX; - ./configure; + ./configure --drivers= ; make -j $(nproc); popd; sudo insmod ./netmap/LINUX/netmap.ko; commit 3f3997ff3af3f85c4ce150f41c9d95b7fd9e9f57 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Tue Oct 16 15:28:56 2018 +0300 travis: start coverage test early Coverage test takes a long time. Start it early, so that other jobs run in parallel with it. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/.travis.yml b/.travis.yml index ffafe650a..18bf47902 100644 --- a/.travis.yml +++ b/.travis.yml @@ -106,6 +106,16 @@ script: fi jobs: include: + - stage: test + env: TEST=coverage + compiler: gcc + script: + - if [ -z "${DOCKER_NAMESPACE}" ] ; then export DOCKER_NAMESPACE="opendataplane"; fi + - docker run --privileged -i -t + -v `pwd`:/odp --shm-size 8g + -e CODECOV_TOKEN="${CODECOV_TOKEN}" + -e CC="${CC}" + ${DOCKER_NAMESPACE}/travis-odp-lng-ubuntu_16.04 /odp/scripts/ci/coverage.sh - stage: test env: TEST=scheduler_sp compiler: gcc @@ -142,17 +152,6 @@ jobs: -e ODP_CONFIG_FILE=/odp/platform/linux-generic/test/process-mode.conf -e ODPH_PROC_MODE=1 ${DOCKER_NAMESPACE}/travis-odp-lng-ubuntu_16.04 /odp/scripts/ci/check.sh - - stage: test - env: TEST=coverage - compiler: gcc - script: - - if [ -z "${DOCKER_NAMESPACE}" ] ; then export DOCKER_NAMESPACE="opendataplane"; fi - - docker run --privileged -i -t - -v `pwd`:/odp --shm-size 8g - -e CODECOV_TOKEN="${CODECOV_TOKEN}" - -e CC="${CC}" - -e CONF="${CONF}" - ${DOCKER_NAMESPACE}/travis-odp-lng-ubuntu_16.04 /odp/scripts/ci/coverage.sh - stage: test env: TEST=distcheck compiler: gcc commit 8f9f3784b900297f555f3a17d5ce47584846c77c Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Tue Oct 16 12:48:30 2018 +0300 travis: exclude duplicate tests arm64/i386 with GCC build tests are excluded from the matrix as those are executed in the first phase. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/.travis.yml b/.travis.yml index ea26b0533..ffafe650a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -65,6 +65,13 @@ env: - CONF="--without-openssl" - CONF="" UBUNTU_VERS="18.04" +matrix: + exclude: + - compiler: gcc + env: BUILD_ONLY=1 ARCH="arm64" + - compiler: gcc + env: BUILD_ONLY=1 ARCH="i386" + compiler: - gcc - clang commit c5ee737dca5375e2f9fab38ffc768223b2d9eb64 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Tue Oct 16 10:24:53 2018 +0300 travis: change pcapng test to build only Pcapng does not have specific validation tests, so running 'make check' on it is not important. Change it to a build only test to save travis execution time. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/.travis.yml b/.travis.yml index 8c369c535..ea26b0533 100644 --- a/.travis.yml +++ b/.travis.yml @@ -61,7 +61,7 @@ env: - CONF="--disable-static-applications" - CONF="--disable-host-optimization" - CONF="--disable-host-optimization --disable-abi-compat" - - CONF="--enable-pcapng-support" + - BUILD_ONLY=1 ARCH="x86_64" CONF="--enable-pcapng-support" - CONF="--without-openssl" - CONF="" UBUNTU_VERS="18.04" @@ -85,7 +85,7 @@ install: script: - if [ -z "${DOCKER_NAMESPACE}" ] ; then export DOCKER_NAMESPACE="opendataplane"; fi - if [ ${BUILD_ONLY} -eq 1 ] ; then - docker run -i -t -v `pwd`:/odp + docker run -i -t -v `pwd`:/odp --shm-size 8g -e CC="${CC}" -e CONF="${CONF}" ${DOCKER_NAMESPACE}/travis-odp-lng-ubuntu_${UBUNTU_VERS} /odp/scripts/ci/build_${ARCH}.sh ; commit 1aca253a08ee916a66486bb6eca05cfc4567e38f Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Tue Oct 16 10:16:16 2018 +0300 travis: explicit build only tests Use new BUILD_ONLY variable to select test cases that are built only, and not checked with 'make check'. This enables to mark some x86_64 test cases to "build only". Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/.travis.yml b/.travis.yml index 7b912af21..8c369c535 100644 --- a/.travis.yml +++ b/.travis.yml @@ -44,17 +44,18 @@ env: # you need generated new one at https://codecov.io specific for your repo. - CODECOV_TOKEN=a733c34c-5f5c-4ff1-af4b-e9f5edb1ab5e - UBUNTU_VERS="16.04" + - BUILD_ONLY=0 matrix: - CONF="" - CONF="--disable-abi-compat" - - CROSS_ARCH="arm64" - - CROSS_ARCH="armhf" - - CROSS_ARCH="powerpc" - - CROSS_ARCH="i386" - - CROSS_ARCH="arm64" CONF="--disable-abi-compat" - - CROSS_ARCH="armhf" CONF="--disable-abi-compat" - - CROSS_ARCH="powerpc" CONF="--disable-abi-compat" - - CROSS_ARCH="i386" CONF="--disable-abi-compat" + - BUILD_ONLY=1 ARCH="arm64" + - BUILD_ONLY=1 ARCH="armhf" + - BUILD_ONLY=1 ARCH="powerpc" + - BUILD_ONLY=1 ARCH="i386" + - BUILD_ONLY=1 ARCH="arm64" CONF="--disable-abi-compat" + - BUILD_ONLY=1 ARCH="armhf" CONF="--disable-abi-compat" + - BUILD_ONLY=1 ARCH="powerpc" CONF="--disable-abi-compat" + - BUILD_ONLY=1 ARCH="i386" CONF="--disable-abi-compat" - CONF="--enable-deprecated" - CONF="--enable-dpdk-zero-copy --disable-static-applications" - CONF="--disable-static-applications" @@ -70,7 +71,7 @@ compiler: install: - sudo apt-get install linux-headers-`uname -r` - - if [ -z "${CROSS_ARCH}" ] ; then + - if [ -z "${ARCH}" -o "${ARCH}" == "x86_64" ] ; then echo "compilling netmap"; CDIR=`pwd` ; git -c advice.detachedHead=false clone -q --depth=1 --single-branch --branch=v11.2 https://github.com/luigirizzo/netmap.git; @@ -83,11 +84,11 @@ install: fi script: - if [ -z "${DOCKER_NAMESPACE}" ] ; then export DOCKER_NAMESPACE="opendataplane"; fi - - if [ -n "${CROSS_ARCH}" ] ; then + - if [ ${BUILD_ONLY} -eq 1 ] ; then docker run -i -t -v `pwd`:/odp -e CC="${CC}" -e CONF="${CONF}" - ${DOCKER_NAMESPACE}/travis-odp-lng-ubuntu_${UBUNTU_VERS} /odp/scripts/ci/build_${CROSS_ARCH}.sh ; + ${DOCKER_NAMESPACE}/travis-odp-lng-ubuntu_${UBUNTU_VERS} /odp/scripts/ci/build_${ARCH}.sh ; else echo "Running test" ; docker run --privileged -i -t commit 4443213d11e3d9feeecb6d2f5b3bad80d8d73c4b Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Tue Oct 16 08:55:38 2018 +0300 travis: clean process mode test script Removed extra environment variable. Use default configure. Explicitly use ubuntu 16.04 as other tests under jobs. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/.travis.yml b/.travis.yml index d39cf93dd..7b912af21 100644 --- a/.travis.yml +++ b/.travis.yml @@ -129,12 +129,11 @@ jobs: - if [ -z "${DOCKER_NAMESPACE}" ] ; then export DOCKER_NAMESPACE="opendataplane"; fi - docker run --privileged -i -t -v `pwd`:/odp --shm-size 8g - -e CODECOV_TOKEN="${CODECOV_TOKEN}" -e CC="${CC}" - -e CONF="${CONF}" + -e CONF="" -e ODP_CONFIG_FILE=/odp/platform/linux-generic/test/process-mode.conf -e ODPH_PROC_MODE=1 - ${DOCKER_NAMESPACE}/travis-odp-lng-ubuntu_${UBUNTU_VERS} /odp/scripts/ci/check.sh ; + ${DOCKER_NAMESPACE}/travis-odp-lng-ubuntu_16.04 /odp/scripts/ci/check.sh - stage: test env: TEST=coverage compiler: gcc commit b6f8955f3f70a5e09bdd86c408373c0b8caeb3eb Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Tue Oct 16 08:47:50 2018 +0300 travis: split distcheck test Distcheck test takes over 20 minutes. Split it into two test cases, so that those can run in parallel. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/.travis.yml b/.travis.yml index f6e0e49ff..d39cf93dd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -154,7 +154,17 @@ jobs: - docker run --privileged -i -t -v `pwd`:/odp --shm-size 8g -e CC="${CC}" - -e CONF="${CONF}" + -e CONF="--enable-user-guides" + ${DOCKER_NAMESPACE}/travis-odp-lng-ubuntu_16.04 /odp/scripts/ci/distcheck.sh + - stage: test + env: TEST=distcheck_nonabi + compiler: gcc + script: + - if [ -z "${DOCKER_NAMESPACE}" ] ; then export DOCKER_NAMESPACE="opendataplane"; fi + - docker run --privileged -i -t + -v `pwd`:/odp --shm-size 8g + -e CC="${CC}" + -e CONF="--enable-user-guides --disable-abi-compat" ${DOCKER_NAMESPACE}/travis-odp-lng-ubuntu_16.04 /odp/scripts/ci/distcheck.sh - stage: "build only" env: TEST=doxygen diff --git a/scripts/ci/distcheck.sh b/scripts/ci/distcheck.sh index c78349e2d..9d45536f4 100755 --- a/scripts/ci/distcheck.sh +++ b/scripts/ci/distcheck.sh @@ -7,15 +7,13 @@ fi cd "$(dirname "$0")"/../.. ./bootstrap -./configure \ - --enable-user-guides +./configure ${CONF} # Ignore possible failures there because these tests depends on measurements # and systems might differ in performance. export CI="true" -make distcheck - -make clean +# Additional configure flags for distcheck +export DISTCHECK_CONFIGURE_FLAGS="${CONF}" -make distcheck DISTCHECK__CONFIGURE_FLAGS=--disable-abi-compat +make distcheck commit 3cae562cf7e11f87d00c19f96b7b29f98a8dddc3 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Mon Oct 15 17:12:10 2018 +0300 travis: add test cases for optional schedulers Added separate tests for schedulers, so that those can be executed in parallel. Schedulers are tested with default compiler flags. Previously, optional schedulers were tested only without compiler optimizations (-O0) in coverage test. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/.travis.yml b/.travis.yml index 16e3a3103..f6e0e49ff 100644 --- a/.travis.yml +++ b/.travis.yml @@ -98,6 +98,28 @@ script: fi jobs: include: + - stage: test + env: TEST=scheduler_sp + compiler: gcc + script: + - if [ -z "${DOCKER_NAMESPACE}" ] ; then export DOCKER_NAMESPACE="opendataplane"; fi + - docker run --privileged -i -t + -v `pwd`:/odp --shm-size 8g + -e CC="${CC}" + -e CONF="" + -e ODP_SCHEDULER=sp + ${DOCKER_NAMESPACE}/travis-odp-lng-ubuntu_16.04 /odp/scripts/ci/check.sh + - stage: test + env: TEST=scheduler_scalable + compiler: gcc + script: + - if [ -z "${DOCKER_NAMESPACE}" ] ; then export DOCKER_NAMESPACE="opendataplane"; fi + - docker run --privileged -i -t + -v `pwd`:/odp --shm-size 8g + -e CC="${CC}" + -e CONF="" + -e ODP_SCHEDULER=scalable + ${DOCKER_NAMESPACE}/travis-odp-lng-ubuntu_16.04 /odp/scripts/ci/check.sh - stage: test env: TEST=process_mode install: commit 8c72eb46fb1ee47340ffc7af322215fb78894b37 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Mon Oct 15 14:42:55 2018 +0300 travis: build ODP on multiple threads Build ODP on multiple threads with 'make -j $(nproc)'. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/scripts/ci/build.sh b/scripts/ci/build.sh index 995c797b2..21922a493 100755 --- a/scripts/ci/build.sh +++ b/scripts/ci/build.sh @@ -9,7 +9,7 @@ cd "$(dirname "$0")"/../.. --prefix=/opt/odp \ ${CONF} -make -j 8 +make -j $(nproc) make install ----------------------------------------------------------------------- Summary of changes: .travis.yml | 98 ++++++++++++++++++++++++++++++++++--------------- scripts/ci/build.sh | 2 +- scripts/ci/distcheck.sh | 10 ++--- 3 files changed, 74 insertions(+), 36 deletions(-) hooks/post-receive --

6 years, 3 months

[COMMIT] branch master updated. v1.19.0.2_tigermoth-198-g044cae351

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 044cae351a1e60e4381cdbae37e2a759772c2258 (commit) via 95cbee5ac9cdcb696d48e6f820593c813f535f8a (commit) via 0c8a2c0027e35184cbc6eeadc3a8aa8bd2e8605b (commit) via 2c41f8f678bbb96a63dedb4e4d948c5dd779f65d (commit) via 7e188187a77fa9bab56f1407eb660c324736cd34 (commit) via 031802ec0c5e3e44d70aee7b19e0cd1055c9fe0b (commit) from 690bacc61c55e4f8f3195faaac068da83790ebf4 (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 044cae351a1e60e4381cdbae37e2a759772c2258 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Wed Oct 17 16:51:49 2018 +0300 linux-gen: config: maximum pool size 1M Change maximum pool size back to 1M. Maximum packet pool capability is defined in the config file. This is the upper limit for that config. Also this is max capability of buffer and tmo pools. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/include/odp_config_internal.h b/platform/linux-generic/include/odp_config_internal.h index 7a573bd76..65f751972 100644 --- a/platform/linux-generic/include/odp_config_internal.h +++ b/platform/linux-generic/include/odp_config_internal.h @@ -150,7 +150,7 @@ extern "C" { * Maximum number of events in a pool. Power of two minus one results optimal * memory usage for the ring. */ -#define CONFIG_POOL_MAX_NUM ((256 * 1024) - 1) +#define CONFIG_POOL_MAX_NUM ((1024 * 1024) - 1) /* * Maximum number of events in a thread local pool cache commit 95cbee5ac9cdcb696d48e6f820593c813f535f8a Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Wed Oct 17 16:41:52 2018 +0300 linux-gen: pool: add max num packets in config file This config is used to for maximum capability. The default capability needs to be modest so that system memory limit is not exceeded. User may increase maximum number of packets when system memory size allows (and SHM single VA is not used). Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/config/odp-linux-generic.conf b/config/odp-linux-generic.conf index 4db9ed489..af651d7f6 100644 --- a/config/odp-linux-generic.conf +++ b/config/odp-linux-generic.conf @@ -16,7 +16,7 @@ # Mandatory fields odp_implementation = "linux-generic" -config_file_version = "0.1.0" +config_file_version = "0.1.1" # Shared memory options shm: { @@ -39,6 +39,16 @@ shm: { single_va = 0 } +# Pool options +pool: { + # Packet pool options + pkt: { + # Maximum number of packets per pool. Power of two minus one + # results optimal memory usage (e.g. (256 * 1024) - 1). + max_num = 262143 + } +} + # DPDK pktio options pktio_dpdk: { # Default options diff --git a/platform/linux-generic/include/odp_pool_internal.h b/platform/linux-generic/include/odp_pool_internal.h index 2696e8eec..94f859de0 100644 --- a/platform/linux-generic/include/odp_pool_internal.h +++ b/platform/linux-generic/include/odp_pool_internal.h @@ -89,6 +89,11 @@ typedef struct pool_t { typedef struct pool_table_t { pool_t pool[ODP_CONFIG_POOLS]; odp_shm_t shm; + + struct { + uint32_t pkt_max_num; + } config; + } pool_table_t; extern pool_table_t *pool_tbl; diff --git a/platform/linux-generic/odp_pool.c b/platform/linux-generic/odp_pool.c index db7a8da3f..d08be4378 100644 --- a/platform/linux-generic/odp_pool.c +++ b/platform/linux-generic/odp_pool.c @@ -22,6 +22,7 @@ #include <odp_ring_internal.h> #include <odp_shm_internal.h> #include <odp_global_data.h> +#include <odp_libconfig_internal.h> #include <string.h> #include <stdio.h> @@ -33,8 +34,9 @@ #define UNLOCK(a) odp_ticketlock_unlock(a) #define LOCK_INIT(a) odp_ticketlock_init(a) -#define CACHE_BURST 32 -#define RING_SIZE_MIN (2 * CACHE_BURST) +#define CACHE_BURST 32 +#define RING_SIZE_MIN (2 * CACHE_BURST) +#define POOL_MAX_NUM_MIN RING_SIZE_MIN /* Make sure packet buffers don't cross huge page boundaries starting from this * page size. 2MB is typically the smallest used huge page size. */ @@ -83,6 +85,32 @@ static inline pool_t *pool_from_buf(odp_buffer_t buf) return buf_hdr->pool_ptr; } +static int read_config_file(pool_table_t *pool_tbl) +{ + const char *str; + int val = 0; + + ODP_PRINT("Pool config:\n"); + + str = "pool.pkt.max_num"; + if (!_odp_libconfig_lookup_int(str, &val)) { + ODP_ERR("Config option '%s' not found.\n", str); + return -1; + } + + if (val > CONFIG_POOL_MAX_NUM || val < POOL_MAX_NUM_MIN) { + ODP_ERR("Bad value %s = %u\n", str, val); + return -1; + } + + pool_tbl->config.pkt_max_num = val; + ODP_PRINT(" %s: %i\n", str, val); + + ODP_PRINT("\n"); + + return 0; +} + int odp_pool_init_global(void) { uint32_t i; @@ -101,6 +129,11 @@ int odp_pool_init_global(void) memset(pool_tbl, 0, sizeof(pool_table_t)); pool_tbl->shm = shm; + if (read_config_file(pool_tbl)) { + odp_shm_free(shm); + return -1; + } + for (i = 0; i < ODP_CONFIG_POOLS; i++) { pool_t *pool = pool_entry(i); @@ -950,7 +983,7 @@ int odp_pool_capability(odp_pool_capability_t *capa) /* Packet pools */ capa->pkt.max_pools = ODP_CONFIG_POOLS; capa->pkt.max_len = CONFIG_PACKET_MAX_LEN; - capa->pkt.max_num = CONFIG_POOL_MAX_NUM; + capa->pkt.max_num = pool_tbl->config.pkt_max_num; capa->pkt.min_headroom = CONFIG_PACKET_HEADROOM; capa->pkt.max_headroom = CONFIG_PACKET_HEADROOM; capa->pkt.min_tailroom = CONFIG_PACKET_TAILROOM; diff --git a/platform/linux-generic/test/process-mode.conf b/platform/linux-generic/test/process-mode.conf index 8618f2fdb..d80df25c4 100644 --- a/platform/linux-generic/test/process-mode.conf +++ b/platform/linux-generic/test/process-mode.conf @@ -1,6 +1,6 @@ # Mandatory fields odp_implementation = "linux-generic" -config_file_version = "0.1.0" +config_file_version = "0.1.1" # Shared memory options shm: { commit 0c8a2c0027e35184cbc6eeadc3a8aa8bd2e8605b Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Wed Oct 17 14:43:43 2018 +0300 linux-gen: pool: add packet param checks Do also checks against maximum number of packets and max packet headroom size. Signed-off-by: Petri Savolainen <petri.savolainen(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 544348189..db7a8da3f 100644 --- a/platform/linux-generic/odp_pool.c +++ b/platform/linux-generic/odp_pool.c @@ -572,6 +572,17 @@ static int check_params(odp_pool_param_t *params) break; case ODP_POOL_PACKET: + if (params->pkt.num > capa.pkt.max_num) { + ODP_ERR("pkt.num too large %u\n", params->pkt.num); + return -1; + } + + if (params->pkt.max_num > capa.pkt.max_num) { + ODP_ERR("pkt.max_num too large %u\n", + params->pkt.max_num); + return -1; + } + if (params->pkt.len > capa.pkt.max_len) { ODP_ERR("pkt.len too large %u\n", params->pkt.len); return -1; @@ -595,6 +606,12 @@ static int check_params(odp_pool_param_t *params) return -1; } + if (params->pkt.headroom > capa.pkt.max_headroom) { + ODP_ERR("pkt.headroom too large %u\n", + params->pkt.headroom); + return -1; + } + break; case ODP_POOL_TIMEOUT: commit 2c41f8f678bbb96a63dedb4e4d948c5dd779f65d Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Wed Oct 17 14:38:16 2018 +0300 linux-gen: pool: output error on pool create Change from debug to error message on pool create checks. These are slow path errors and it's helpful to see those also when not debugging. Signed-off-by: Petri Savolainen <petri.savolainen(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 7a4a9eb99..544348189 100644 --- a/platform/linux-generic/odp_pool.c +++ b/platform/linux-generic/odp_pool.c @@ -555,17 +555,17 @@ static int check_params(odp_pool_param_t *params) switch (params->type) { case ODP_POOL_BUFFER: if (params->buf.num > capa.buf.max_num) { - ODP_DBG("buf.num too large %u\n", params->buf.num); + ODP_ERR("buf.num too large %u\n", params->buf.num); return -1; } if (params->buf.size > capa.buf.max_size) { - ODP_DBG("buf.size too large %u\n", params->buf.size); + ODP_ERR("buf.size too large %u\n", params->buf.size); return -1; } if (params->buf.align > capa.buf.max_align) { - ODP_DBG("buf.align too large %u\n", params->buf.align); + ODP_ERR("buf.align too large %u\n", params->buf.align); return -1; } @@ -573,24 +573,24 @@ static int check_params(odp_pool_param_t *params) case ODP_POOL_PACKET: if (params->pkt.len > capa.pkt.max_len) { - ODP_DBG("pkt.len too large %u\n", params->pkt.len); + ODP_ERR("pkt.len too large %u\n", params->pkt.len); return -1; } if (params->pkt.max_len > capa.pkt.max_len) { - ODP_DBG("pkt.max_len too large %u\n", + ODP_ERR("pkt.max_len too large %u\n", params->pkt.max_len); return -1; } if (params->pkt.seg_len > capa.pkt.max_seg_len) { - ODP_DBG("pkt.seg_len too large %u\n", + ODP_ERR("pkt.seg_len too large %u\n", params->pkt.seg_len); return -1; } if (params->pkt.uarea_size > capa.pkt.max_uarea_size) { - ODP_DBG("pkt.uarea_size too large %u\n", + ODP_ERR("pkt.uarea_size too large %u\n", params->pkt.uarea_size); return -1; } @@ -599,13 +599,13 @@ static int check_params(odp_pool_param_t *params) case ODP_POOL_TIMEOUT: if (params->tmo.num > capa.tmo.max_num) { - ODP_DBG("tmo.num too large %u\n", params->tmo.num); + ODP_ERR("tmo.num too large %u\n", params->tmo.num); return -1; } break; default: - ODP_DBG("bad pool type %i\n", params->type); + ODP_ERR("bad pool type %i\n", params->type); return -1; } commit 7e188187a77fa9bab56f1407eb660c324736cd34 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Wed Oct 17 13:13:20 2018 +0300 linux-gen: config: move queue size config to scalable Only scalable queues use build time the queue size config. Move it to scalable config file. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/include/odp_config_internal.h b/platform/linux-generic/include/odp_config_internal.h index 8ceb325b2..7a573bd76 100644 --- a/platform/linux-generic/include/odp_config_internal.h +++ b/platform/linux-generic/include/odp_config_internal.h @@ -26,13 +26,6 @@ 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 */ diff --git a/platform/linux-generic/include/odp_schedule_scalable_config.h b/platform/linux-generic/include/odp_schedule_scalable_config.h index a84dc0724..3462d047b 100644 --- a/platform/linux-generic/include/odp_schedule_scalable_config.h +++ b/platform/linux-generic/include/odp_schedule_scalable_config.h @@ -9,6 +9,9 @@ #ifndef ODP_SCHEDULE_SCALABLE_CONFIG_H_ #define ODP_SCHEDULE_SCALABLE_CONFIG_H_ +/* Maximum number of events that can be stored in a queue */ +#define CONFIG_SCAL_QUEUE_SIZE 4096 + /* * Default scaling factor for the scheduler group * diff --git a/platform/linux-generic/odp_queue_scalable.c b/platform/linux-generic/odp_queue_scalable.c index bbc57e44d..b7ff2195f 100644 --- a/platform/linux-generic/odp_queue_scalable.c +++ b/platform/linux-generic/odp_queue_scalable.c @@ -110,7 +110,7 @@ static int queue_init(queue_entry_t *queue, const char *name, sched_elem = &queue->s.sched_elem; ring_size = param->size > 0 ? - ROUNDUP_POWER2_U32(param->size) : CONFIG_QUEUE_SIZE; + ROUNDUP_POWER2_U32(param->size) : CONFIG_SCAL_QUEUE_SIZE; strncpy(queue->s.name, name ? name : "", ODP_QUEUE_NAME_LEN - 1); queue->s.name[ODP_QUEUE_NAME_LEN - 1] = 0; memcpy(&queue->s.param, param, sizeof(odp_queue_param_t)); @@ -212,15 +212,16 @@ static int queue_init_global(void) /* Add size of the array holding the queues */ pool_size = sizeof(queue_table_t); /* Add storage required for queues */ - pool_size += (CONFIG_QUEUE_SIZE * sizeof(odp_buffer_hdr_t *)) * - ODP_CONFIG_QUEUES; + pool_size += (CONFIG_SCAL_QUEUE_SIZE * + sizeof(odp_buffer_hdr_t *)) * ODP_CONFIG_QUEUES; + /* Add the reorder window size */ pool_size += sizeof(reorder_window_t) * ODP_CONFIG_QUEUES; /* Choose min_alloc and max_alloc such that buddy allocator is * is selected. */ min_alloc = 0; - max_alloc = CONFIG_QUEUE_SIZE * sizeof(odp_buffer_hdr_t *); + max_alloc = CONFIG_SCAL_QUEUE_SIZE * sizeof(odp_buffer_hdr_t *); queue_shm_pool = _odp_ishm_pool_create("queue_shm_pool", pool_size, min_alloc, max_alloc, commit 031802ec0c5e3e44d70aee7b19e0cd1055c9fe0b Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Thu Oct 18 09:37:47 2018 +0300 linux-gen: config: improve config file check error output It was hard to notice from log that config file version has a mismatch. This is a common error when config file version has updated, but a user has not updated his own config file. Improve error check output, so that failure reason is better highlighted. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/odp_libconfig.c b/platform/linux-generic/odp_libconfig.c index baf825bbe..014409e2b 100644 --- a/platform/linux-generic/odp_libconfig.c +++ b/platform/linux-generic/odp_libconfig.c @@ -21,10 +21,12 @@ int _odp_libconfig_init_global(void) const char *filename; const char *vers; const char *vers_rt; - const char *ipml; - const char *ipml_rt; + const char *impl; + const char *impl_rt; config_t *config = &odp_global_ro.libconfig_default; config_t *config_rt = &odp_global_ro.libconfig_runtime; + const char *impl_field = "odp_implementation"; + const char *vers_field = "config_file_version"; config_init(config); config_init(config_rt); @@ -40,34 +42,45 @@ int _odp_libconfig_init_global(void) if (filename == NULL) return 0; - ODP_PRINT("CONFIG FILE: %s\n", filename); + ODP_PRINT("ODP CONFIG FILE: %s\n", filename); if (!config_read_file(config_rt, filename)) { - ODP_ERR("Failed to read config file: %s(%d): %s\n", - config_error_file(config_rt), - config_error_line(config_rt), - config_error_text(config_rt)); + ODP_PRINT(" ERROR: failed to read config file: %s(%d): %s\n\n", + config_error_file(config_rt), + config_error_line(config_rt), + config_error_text(config_rt)); goto fail; } /* Check runtime configuration's implementation name and version */ - if (!config_lookup_string(config, "odp_implementation", &ipml) || - !config_lookup_string(config_rt, "odp_implementation", &ipml_rt)) { - ODP_ERR("Configuration missing 'odp_implementation' field\n"); + if (!config_lookup_string(config, impl_field, &impl) || + !config_lookup_string(config_rt, impl_field, &impl_rt)) { + ODP_PRINT(" ERROR: missing mandatory field: %s\n\n", + impl_field); goto fail; } - if (!config_lookup_string(config, "config_file_version", &vers) || - !config_lookup_string(config_rt, "config_file_version", &vers_rt)) { - ODP_ERR("Configuration missing 'config_file_version' field\n"); + if (!config_lookup_string(config, vers_field, &vers) || + !config_lookup_string(config_rt, vers_field, &vers_rt)) { + ODP_PRINT(" ERROR: missing mandatory field: %s\n\n", + vers_field); goto fail; } - if (strcmp(vers, vers_rt) || strcmp(ipml, ipml_rt)) { - ODP_ERR("Runtime configuration mismatch\n"); + if (strcmp(impl, impl_rt)) { + ODP_PRINT(" ERROR: ODP implementation name mismatch:\n" + " Expected: \"%s\"\n" + " Found: \"%s\"\n\n", impl, impl_rt); + goto fail; + } + if (strcmp(vers, vers_rt)) { + ODP_PRINT(" ERROR: config file version number mismatch:\n" + " Expected: \"%s\"\n" + " Found: \"%s\"\n\n", vers, vers_rt); goto fail; } return 0; fail: + ODP_ERR("Config file failure\n"); config_destroy(config); config_destroy(config_rt); return -1; ----------------------------------------------------------------------- Summary of changes: config/odp-linux-generic.conf | 12 +++- .../linux-generic/include/odp_config_internal.h | 9 +-- platform/linux-generic/include/odp_pool_internal.h | 5 ++ .../include/odp_schedule_scalable_config.h | 3 + platform/linux-generic/odp_libconfig.c | 43 ++++++++----- platform/linux-generic/odp_pool.c | 74 ++++++++++++++++++---- platform/linux-generic/odp_queue_scalable.c | 9 +-- platform/linux-generic/test/process-mode.conf | 2 +- 8 files changed, 116 insertions(+), 41 deletions(-) hooks/post-receive --

6 years, 3 months

[COMMIT] branch master updated. v1.19.0.2_tigermoth-192-g690bacc61

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 690bacc61c55e4f8f3195faaac068da83790ebf4 (commit) from 0287f1432eda1cf3e7fb8323e0fda838cf744816 (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 690bacc61c55e4f8f3195faaac068da83790ebf4 Author: Matias Elo <matias.elo(a)nokia.com> Date: Thu Oct 18 09:49:01 2018 +0300 linux-gen: pool: increase minimum packet segment length Some DPDK NICs need at least 2176 byte buffers (2048B + headroom) to not segment standard ethernet frames. Increase minimum segment length to avoid this and add matching check to zero-copy dpdk pktio pool create. Reported-by: P. Gyanesh Kumar Patra <pgyanesh.patra(a)gmail.com> Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Tested-by: P. Gyanesh Kumar Patra <pgyanesh.patra(a)gmail.com> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/include/odp_config_internal.h b/platform/linux-generic/include/odp_config_internal.h index a94012acc..8ceb325b2 100644 --- a/platform/linux-generic/include/odp_config_internal.h +++ b/platform/linux-generic/include/odp_config_internal.h @@ -125,8 +125,8 @@ extern "C" { * defined segment length (seg_len in odp_pool_param_t) will be rounded up into * this value. */ -#define CONFIG_PACKET_SEG_LEN_MIN ((2 * 1024) - \ - CONFIG_PACKET_HEADROOM - \ +#define CONFIG_PACKET_SEG_LEN_MIN ((2 * 1024) + \ + CONFIG_PACKET_HEADROOM + \ CONFIG_PACKET_TAILROOM) /* Maximum number of shared memory blocks. diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c index 23f39445e..4253451f5 100644 --- a/platform/linux-generic/pktio/dpdk.c +++ b/platform/linux-generic/pktio/dpdk.c @@ -327,6 +327,13 @@ static struct rte_mempool *mbuf_pool_create(const char *name, goto fail; } + if (pool_entry->seg_len < RTE_MBUF_DEFAULT_BUF_SIZE) { + ODP_ERR("Some NICs need at least %dB buffers to not segment " + "standard ethernet frames. Increase pool seg_len.\n", + RTE_MBUF_DEFAULT_BUF_SIZE); + goto fail; + } + total_size = rte_mempool_calc_obj_size(elt_size, MEMPOOL_F_NO_SPREAD, &sz); if (total_size != pool_entry->block_size) { ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/include/odp_config_internal.h | 4 ++-- platform/linux-generic/pktio/dpdk.c | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) hooks/post-receive --

6 years, 3 months

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

git-lng-odp October 2018