git-lng-odp

git-lng-odp@lists.linaro.org

1203 discussions

[COMMIT] branch master updated. v1.19.0.1_tigermoth-5-g49c671e8

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 49c671e80fd2c88b6f36337ebd1cd4748eb8bae1 (commit) from 11207ff1e211658bfb44c635423ae818a0654239 (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 49c671e80fd2c88b6f36337ebd1cd4748eb8bae1 Author: Ilias Apalodimas <ilias.apalodimas(a)linaro.org> Date: Fri Feb 16 12:12:26 2018 +0200 odp: pktio: add pcapng capture capabilities Introduce new fast pcap capture interface to odp. How to test: sudo mkdir /var/run/odp/ start the ODP application sudo dd if=/var/run/odp/"pid"-ethX-flow-"queue" of=~/t.pcap Signed-off-by: Ilias Apalodimas <ilias.apalodimas(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/.travis.yml b/.travis.yml index cb05b839..886e40f0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -58,6 +58,7 @@ env: - CONF="--disable-static-applications" - CONF="--disable-host-optimization" - CONF="--disable-host-optimization --disable-abi-compat" + - CONF="--enable-pcapng-support" - DPDK_SHARED="y" CONF="--disable-static-applications" compiler: diff --git a/configure.ac b/configure.ac index 11a89b58..f13525de 100644 --- a/configure.ac +++ b/configure.ac @@ -418,4 +418,5 @@ AC_MSG_RESULT([ test_helper: ${test_helper} test_example: ${test_example} user_guides: ${user_guides} + pcapng: ${have_pcapng} ]) diff --git a/doc/users-guide/Makefile.am b/doc/users-guide/Makefile.am index 7be32ddc..6b2e818d 100644 --- a/doc/users-guide/Makefile.am +++ b/doc/users-guide/Makefile.am @@ -7,7 +7,8 @@ SRC = users-guide.adoc \ users-guide-packet.adoc \ users-guide-pktio.adoc \ users-guide-timer.adoc \ - users-guide-tm.adoc + users-guide-tm.adoc \ + users-guide-utilities-examples.adoc TARGET = users-guide.html IMAGES = $(IMAGES_DIR)/overview.svg \ $(IMAGES_DIR)/atomic_queue.svg \ diff --git a/doc/users-guide/users-guide-utilities-examples.adoc b/doc/users-guide/users-guide-utilities-examples.adoc new file mode 100644 index 00000000..e51bbef8 --- /dev/null +++ b/doc/users-guide/users-guide-utilities-examples.adoc @@ -0,0 +1,19 @@ +== Utilities and examples + +=== PcapNg capture +If compiled using `--enable-pcapng-support` ODP will offer packet capturing +functionality in PcapNg format. If the /var/run/odp directory exists prior to +launching the application ODP will create a fifo for each NIC queue. +Queue naming will be of the following format: *<odp global pid>-<NIC +name>-flow-<queue number>*. Linux dd application can be used for capturing a +sample of the live stream from the fifo. Killing ether the application or dd +will stop the capturing process. + +. `./configure --enable-pcapng-support` +. `sudo mkdir /var/run/odp` +. `sudo ./example/generator/odp_generator -I enp2s0 -mu --dstmac +A0:F6:FD:AE:62:6C --dstip 192.168.49.20 --srcmac 2c:56:dc:9a:8f:06 --srcip +192.168.49.4 -i0 -w1` +. `sudo dd if=/var/run/odp/26737-enp2s0-flow-0 of=~/test.pcap` +. `ctrl^c` +. `wireshark ~/test.pcap` diff --git a/doc/users-guide/users-guide.adoc b/doc/users-guide/users-guide.adoc index 7914459e..8ed581f5 100644 --- a/doc/users-guide/users-guide.adoc +++ b/doc/users-guide/users-guide.adoc @@ -1204,4 +1204,6 @@ include::users-guide-tm.adoc[] include::users-guide-cls.adoc[] +include::users-guide-utilities-examples.adoc[] + include::../glossary.adoc[] diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index a73dc61d..f9e99afd 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -115,6 +115,7 @@ noinst_HEADERS = \ include/odp_packet_null.h \ include/odp_packet_socket.h \ include/odp_packet_tap.h \ + include/odp_pcapng.h \ include/odp_pkt_queue_internal.h \ include/odp_pool_internal.h \ include/odp_posix_extensions.h \ @@ -190,6 +191,7 @@ __LIB__libodp_linux_la_SOURCES = \ odp_spinlock.c \ odp_spinlock_recursive.c \ odp_system_info.c \ + odp_pcapng.c \ odp_thread.c \ odp_thrmask.c \ odp_time.c \ diff --git a/platform/linux-generic/include/odp_internal.h b/platform/linux-generic/include/odp_internal.h index 153c787e..f39b6152 100644 --- a/platform/linux-generic/include/odp_internal.h +++ b/platform/linux-generic/include/odp_internal.h @@ -24,6 +24,7 @@ extern "C" { #include <stdio.h> #include <sys/types.h> #include <libconfig.h> +#include <pthread.h> #define MAX_CPU_NUMBER 128 #define UID_MAXLEN 30 @@ -58,7 +59,10 @@ struct odp_global_data_s { int num_cpus_installed; config_t libconfig_default; config_t libconfig_runtime; - + int inotify_pcapng_fd; + int inotify_watch_fd; + pthread_t inotify_thread; + int inotify_pcapng_is_running; }; enum init_stage { diff --git a/platform/linux-generic/include/odp_packet_io_internal.h b/platform/linux-generic/include/odp_packet_io_internal.h index e4852cc9..4be4b151 100644 --- a/platform/linux-generic/include/odp_packet_io_internal.h +++ b/platform/linux-generic/include/odp_packet_io_internal.h @@ -182,6 +182,15 @@ struct pktio_entry { odp_queue_t queue; odp_pktout_queue_t pktout; } out_queue[PKTIO_MAX_QUEUES]; + + /**< inotify instance for pcapng fifos */ + struct { + enum { + PCAPNG_WR_STOP = 0, + PCAPNG_WR_PKT, + } state[PKTIO_MAX_QUEUES]; + int fd[PKTIO_MAX_QUEUES]; + } pcapng; }; typedef union { diff --git a/platform/linux-generic/include/odp_pcapng.h b/platform/linux-generic/include/odp_pcapng.h new file mode 100644 index 00000000..8e0e624e --- /dev/null +++ b/platform/linux-generic/include/odp_pcapng.h @@ -0,0 +1,56 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <sys/types.h> + +#include <odp_packet_io_internal.h> + +#define PCAPNG_BLOCK_TYPE_EPB 0x00000006UL +#define PCAPNG_BLOCK_TYPE_SHB 0x0A0D0D0AUL +#define PCAPNG_BLOCK_TYPE_IDB 0x00000001UL +#define PCAPNG_ENDIAN_MAGIC 0x1A2B3C4DUL +#define PCAPNG_DATA_ALIGN 4 +#define PCAPNG_LINKTYPE_ETHERNET 0x1 + +/* inotify */ +#define INOTIFY_BUF_LEN (16 * (sizeof(struct inotify_event))) +#define PCAPNG_WATCH_DIR "/var/run/odp/" + +/* pcapng: enhanced packet block file encoding */ +typedef struct ODP_PACKED pcapng_section_hdr_block_s { + uint32_t block_type; + uint32_t block_total_length; + uint32_t magic; + uint16_t version_major; + uint16_t version_minor; + int64_t section_len; + uint32_t block_total_length2; +} pcapng_section_hdr_block_t; + +typedef struct pcapng_interface_description_block { + uint32_t block_type; + uint32_t block_total_length; + uint16_t linktype; + uint16_t reserved; + uint32_t snaplen; + uint32_t block_total_length2; +} pcapng_interface_description_block_t; + +typedef struct pcapng_enhanced_packet_block_s { + uint32_t block_type; + uint32_t block_total_length; + uint32_t interface_idx; + uint32_t timestamp_high; + uint32_t timestamp_low; + uint32_t captured_len; + uint32_t packet_len; +} pcapng_enhanced_packet_block_t; + +int pcapng_prepare(pktio_entry_t *entry); +void pcapng_destroy(pktio_entry_t *entry); +int write_pcapng_hdr(pktio_entry_t *entry, int qidx); +int write_pcapng_pkts(pktio_entry_t *entry, int qidx, + const odp_packet_t packets[], int num); diff --git a/platform/linux-generic/m4/configure.m4 b/platform/linux-generic/m4/configure.m4 index 7cf0a9b6..951704ed 100644 --- a/platform/linux-generic/m4/configure.m4 +++ b/platform/linux-generic/m4/configure.m4 @@ -8,6 +8,7 @@ ODP_TIMER ODP_OPENSSL ODP_LIBCONFIG([linux-generic]) m4_include([platform/linux-generic/m4/odp_pcap.m4]) +m4_include([platform/linux-generic/m4/odp_pcapng.m4]) m4_include([platform/linux-generic/m4/odp_netmap.m4]) m4_include([platform/linux-generic/m4/odp_dpdk.m4]) ODP_SCHEDULER diff --git a/platform/linux-generic/m4/odp_pcapng.m4 b/platform/linux-generic/m4/odp_pcapng.m4 new file mode 100644 index 00000000..44274c26 --- /dev/null +++ b/platform/linux-generic/m4/odp_pcapng.m4 @@ -0,0 +1,18 @@ +########################################################################## +# Enable PCAPNG support +########################################################################## +have_pcapng=no +pcapng_support=0 + +AC_ARG_ENABLE([pcapng-support], + [AS_HELP_STRING([--enable-pcapng-support], + [enable experimental tcpdump for pktios])], + have_pcapng=$enableval + [if test x$enableval = xyes; then + pcapng_support=1 + fi]) + +AC_DEFINE_UNQUOTED([_ODP_PCAPNG], [$pcapng_support], + [Define to 1 to enable pcapng support]) + +AM_CONDITIONAL([have_pcapng], [test x$have_pcapng = xyes]) diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c index bf7aef14..7b211c45 100644 --- a/platform/linux-generic/odp_packet_io.c +++ b/platform/linux-generic/odp_packet_io.c @@ -25,6 +25,7 @@ #include <odp_debug_internal.h> #include <odp_packet_io_ipc_internal.h> #include <odp/api/time.h> +#include <odp_pcapng.h> #include <string.h> #include <inttypes.h> @@ -512,6 +513,11 @@ int odp_pktio_start(odp_pktio_t hdl) ODP_DBG("interface: %s, input queues: %u, output queues: %u\n", entry->s.name, entry->s.num_in_queue, entry->s.num_out_queue); + if (_ODP_PCAPNG) { + if (pcapng_prepare(entry)) + ODP_ERR("pcap init failed, won't capture\n"); + } + return res; } @@ -536,6 +542,9 @@ static int _pktio_stop(pktio_entry_t *entry) else entry->s.state = PKTIO_STATE_STOPPED; + if (_ODP_PCAPNG) + pcapng_destroy(entry); + return res; } @@ -1746,10 +1755,18 @@ int odp_pktout_queue(odp_pktio_t pktio, odp_pktout_queue_t queues[], int num) return num_queues; } +static inline void _odp_dump_pcapng_pkts(pktio_entry_t *entry, int qidx, + const odp_packet_t packets[], int num) +{ + if (odp_unlikely(entry->s.pcapng.state[qidx] == PCAPNG_WR_PKT)) + write_pcapng_pkts(entry, qidx, packets, num); +} + int odp_pktin_recv(odp_pktin_queue_t queue, odp_packet_t packets[], int num) { pktio_entry_t *entry; odp_pktio_t pktio = queue.pktio; + int ret; entry = get_pktio_entry(pktio); if (entry == NULL) { @@ -1757,7 +1774,11 @@ int odp_pktin_recv(odp_pktin_queue_t queue, odp_packet_t packets[], int num) return -1; } - return entry->s.ops->recv(entry, queue.index, packets, num); + ret = entry->s.ops->recv(entry, queue.index, packets, num); + if (_ODP_PCAPNG) + _odp_dump_pcapng_pkts(entry, queue.index, packets, ret); + + return ret; } int odp_pktin_recv_tmo(odp_pktin_queue_t queue, odp_packet_t packets[], int num, @@ -1779,12 +1800,19 @@ int odp_pktin_recv_tmo(odp_pktin_queue_t queue, odp_packet_t packets[], int num, return -1; } - if (entry->s.ops->recv_tmo && wait != ODP_PKTIN_NO_WAIT) - return entry->s.ops->recv_tmo(entry, queue.index, packets, num, + if (entry->s.ops->recv_tmo && wait != ODP_PKTIN_NO_WAIT) { + ret = entry->s.ops->recv_tmo(entry, queue.index, packets, num, wait); + if (_ODP_PCAPNG) + _odp_dump_pcapng_pkts(entry, queue.index, packets, ret); + + return ret; + } while (1) { ret = entry->s.ops->recv(entry, queue.index, packets, num); + if (_ODP_PCAPNG) + _odp_dump_pcapng_pkts(entry, queue.index, packets, ret); if (ret != 0 || wait == 0) return ret; @@ -1827,6 +1855,7 @@ int odp_pktin_recv_mq_tmo(const odp_pktin_queue_t queues[], unsigned num_q, int started = 0; uint64_t sleep_round = 0; int trial_successful = 0; + unsigned int lfrom = 0; for (i = 0; i < num_q; i++) { ret = odp_pktin_recv(queues[i], packets, num); @@ -1841,11 +1870,23 @@ int odp_pktin_recv_mq_tmo(const odp_pktin_queue_t queues[], unsigned num_q, if (wait == 0) return 0; - ret = sock_recv_mq_tmo_try_int_driven(queues, num_q, from, + ret = sock_recv_mq_tmo_try_int_driven(queues, num_q, &lfrom, packets, num, wait, &trial_successful); - if (trial_successful) + if (ret > 0 && from) + *from = lfrom; + if (trial_successful) { + if (_ODP_PCAPNG) { + pktio_entry_t *entry; + + entry = get_pktio_entry(queues[lfrom].pktio); + if (entry) + _odp_dump_pcapng_pkts(entry, lfrom, packets, + ret); + } + return ret; + } ts.tv_sec = 0; ts.tv_nsec = 1000 * SLEEP_USEC; @@ -1911,6 +1952,9 @@ int odp_pktout_send(odp_pktout_queue_t queue, const odp_packet_t packets[], return -1; } + if (_ODP_PCAPNG) + _odp_dump_pcapng_pkts(entry, queue.index, packets, num); + return entry->s.ops->send(entry, queue.index, packets, num); } diff --git a/platform/linux-generic/odp_pcapng.c b/platform/linux-generic/odp_pcapng.c new file mode 100644 index 00000000..b8d29e5a --- /dev/null +++ b/platform/linux-generic/odp_pcapng.c @@ -0,0 +1,434 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include "config.h" + +#if defined(_ODP_PCAPNG) && _ODP_PCAPNG == 1 + +#include <odp_macros_internal.h> +#include <odp_packet_io_internal.h> +#include <odp/api/plat/packet_inlines.h> +#include <odp_posix_extensions.h> +#include <odp_pcapng.h> + +#include <errno.h> +#include <fcntl.h> +#include <limits.h> +#include <pthread.h> +#include <unistd.h> +#include <sys/stat.h> +#include <sys/uio.h> +#include <sys/inotify.h> +#include <sys/select.h> + +static void pcapng_drain_fifo(int fd) +{ + char buffer[4096]; + ssize_t len; + + do { + len = read(fd, buffer, sizeof(buffer)); + } while (len > 0); +} + +static void inotify_event_handle(pktio_entry_t *entry, int qidx, + struct inotify_event *event) +{ + int mtu = MAX(odp_pktin_maxlen(entry->s.handle), + odp_pktout_maxlen(entry->s.handle)); + + if (event->mask & IN_OPEN) { + int ret; + + if (PIPE_BUF < mtu + sizeof(pcapng_enhanced_packet_block_t) + + sizeof(uint32_t)) { + ODP_ERR("PIPE_BUF:%d too small. Disabling pcap\n", + PIPE_BUF); + entry->s.pcapng.state[qidx] = PCAPNG_WR_STOP; + + return; + } + + ret = write_pcapng_hdr(entry, qidx); + if (ret) { + entry->s.pcapng.state[qidx] = PCAPNG_WR_STOP; + } else { + entry->s.pcapng.state[qidx] = PCAPNG_WR_PKT; + ODP_DBG("Open %s for pcap tracing\n", event->name); + } + } else if (event->mask & IN_CLOSE) { + int fd = entry->s.pcapng.fd[qidx]; + + pcapng_drain_fifo(fd); + entry->s.pcapng.state[qidx] = PCAPNG_WR_STOP; + ODP_DBG("Close %s for pcap tracing\n", event->name); + } else { + ODP_ERR("Unknown inotify event 0x%08x\n", event->mask); + } +} + +static void get_pcapng_fifo_name(char *pcapng_entry, size_t len, + char *pktio_name, int qidx) +{ + snprintf(pcapng_entry, len, "%d-%s-flow-%d", + odp_global_data.main_pid, pktio_name, qidx); + pcapng_entry[len - 1] = 0; +} + +static int get_qidx_from_fifo(pktio_entry_t *entry, char *name) +{ + unsigned int max_queue = + MAX(entry->s.num_in_queue, entry->s.num_out_queue); + unsigned int i; + + for (i = 0; i < max_queue; i++) { + char pcapng_entry[256]; + + get_pcapng_fifo_name(pcapng_entry, sizeof(pcapng_entry), + entry->s.name, i); + /* + * verify we still talk to a fifo before returning a valid + * queue number + */ + if (strcmp(name, pcapng_entry) == 0) { + struct stat fstat; + char pcapng_path[256]; + + snprintf(pcapng_path, sizeof(pcapng_path), "%s/%s", + PCAPNG_WATCH_DIR, name); + stat(pcapng_path, &fstat); + + return S_ISFIFO(fstat.st_mode) ? (int)i : -1; + } + } + + return -1; +} + +static void *inotify_update(void *arg) +{ + pktio_entry_t *entry = (pktio_entry_t *)arg; + struct timeval time; + ssize_t rdlen; + int offset; + char buffer[INOTIFY_BUF_LEN]; + fd_set rfds; + + while (1) { + offset = 0; + FD_ZERO(&rfds); + FD_SET(odp_global_data.inotify_pcapng_fd, &rfds); + time.tv_sec = 2; + time.tv_usec = 0; + select(odp_global_data.inotify_pcapng_fd + 1, &rfds, NULL, + NULL, &time); + if (FD_ISSET(odp_global_data.inotify_pcapng_fd, &rfds)) { + rdlen = read(odp_global_data.inotify_pcapng_fd, + buffer, INOTIFY_BUF_LEN); + while (offset < rdlen) { + int qidx; + struct inotify_event *event = + (struct inotify_event *)(void *) + &buffer[offset]; + + qidx = get_qidx_from_fifo(entry, event->name); + if (qidx == -1) { + offset += sizeof(struct inotify_event) + + event->len; + continue; + } + + inotify_event_handle(entry, qidx, event); + offset += sizeof(struct inotify_event) + + event->len; + } + } + } + + return NULL; +} + +static int get_fifo_max_size(void) +{ + FILE *file; + char buf[128]; + int ret = -1; + + file = fopen("/proc/sys/fs/pipe-max-size", "r"); + if (file == NULL) + return ret; + + if (fgets(buf, sizeof(buf), file)) + ret = atoi(buf); + + fclose(file); + + return ret; +} + +int pcapng_prepare(pktio_entry_t *entry) +{ + int ret = -1, fd; + pthread_attr_t attr; + unsigned int i; + unsigned int max_queue = + MAX(entry->s.num_in_queue, entry->s.num_out_queue); + int fifo_sz; + + fifo_sz = get_fifo_max_size(); + if (fifo_sz < 0) + ODP_DBG("failed to read max fifo size\n"); + + for (i = 0; i < max_queue; i++) { + char pcapng_name[128]; + char pcapng_path[256]; + + entry->s.pcapng.fd[i] = -1; + entry->s.pcapng.state[i] = PCAPNG_WR_STOP; + + get_pcapng_fifo_name(pcapng_name, sizeof(pcapng_name), + entry->s.name, i); + snprintf(pcapng_path, sizeof(pcapng_path), "%s/%s", + PCAPNG_WATCH_DIR, pcapng_name); + if (mkfifo(pcapng_path, O_RDWR)) { + ODP_ERR("pcap not available for %s %s\n", + pcapng_path, strerror(errno)); + continue; + } + + fd = open(pcapng_path, O_RDWR | O_NONBLOCK); + if (fd == -1) { + ODP_ERR("Fail to open fifo\n"); + entry->s.pcapng.state[i] = PCAPNG_WR_STOP; + if (remove(pcapng_path) == -1) + ODP_ERR("Can't remove fifo %s\n", pcapng_path); + continue; + } + + if (fifo_sz > 0) { + if (fcntl(fd, F_SETPIPE_SZ, fifo_sz) != fifo_sz) + ODP_DBG("Failed to set max fifo size\n"); + else + ODP_DBG("set pcap fifo size %i\n", fifo_sz); + } + + entry->s.pcapng.fd[i] = fd; + } + + /* already running from a previous pktio */ + if (odp_global_data.inotify_pcapng_is_running == 1) + return 0; + + odp_global_data.inotify_pcapng_fd = -1; + odp_global_data.inotify_watch_fd = -1; + + odp_global_data.inotify_pcapng_fd = inotify_init(); + if (odp_global_data.inotify_pcapng_fd == -1) { + ODP_ERR("can't init inotify. pcap disabled\n"); + goto out_destroy; + } + + odp_global_data.inotify_watch_fd = + inotify_add_watch(odp_global_data.inotify_pcapng_fd, + PCAPNG_WATCH_DIR, IN_CLOSE | IN_OPEN); + + if (odp_global_data.inotify_watch_fd == -1) { + ODP_ERR("can't register inotify for %s. pcap disabled\n", + strerror(errno)); + goto out_destroy; + } + + /* create a thread to poll inotify triggers */ + pthread_attr_init(&attr); + ret = pthread_create(&odp_global_data.inotify_thread, &attr, + inotify_update, entry); + if (ret) + ODP_ERR("can't start inotify thread. pcap disabled\n"); + else + odp_global_data.inotify_pcapng_is_running = 1; + + return ret; + +out_destroy: + pcapng_destroy(entry); + + return ret; +} + +void pcapng_destroy(pktio_entry_t *entry) +{ + int ret; + unsigned int i; + unsigned int max_queue = + MAX(entry->s.num_in_queue, entry->s.num_out_queue); + + if (odp_global_data.inotify_pcapng_is_running == 1) { + ret = pthread_cancel(odp_global_data.inotify_thread); + if (ret) + ODP_ERR("can't cancel inotify thread %s\n", + strerror(errno)); + } + + /* fd's will be -1 in case of any failure */ + ret = inotify_rm_watch(odp_global_data.inotify_pcapng_fd, + odp_global_data.inotify_watch_fd); + if (ret) + ODP_ERR("can't deregister inotify %s\n", strerror(errno)); + + if (odp_global_data.inotify_pcapng_fd != -1) + close(odp_global_data.inotify_pcapng_fd); + + if (odp_global_data.inotify_watch_fd != -1) + close(odp_global_data.inotify_watch_fd); + + for (i = 0; i < max_queue; i++) { + char pcapng_name[128]; + char pcapng_path[256]; + + entry->s.pcapng.state[i] = PCAPNG_WR_STOP; + close(entry->s.pcapng.fd[i]); + + get_pcapng_fifo_name(pcapng_name, sizeof(pcapng_name), + entry->s.name, i); + snprintf(pcapng_path, sizeof(pcapng_path), "%s/%s", + PCAPNG_WATCH_DIR, pcapng_name); + + if (remove(pcapng_path)) + ODP_ERR("can't delete fifo %s\n", pcapng_path); + } +} + +int write_pcapng_hdr(pktio_entry_t *entry, int qidx) +{ + size_t len; + pcapng_section_hdr_block_t shb; + pcapng_interface_description_block_t idb; + int fd = entry->s.pcapng.fd[qidx]; + + memset(&shb, 0, sizeof(shb)); + memset(&idb, 0, sizeof(idb)); + + shb.block_type = PCAPNG_BLOCK_TYPE_SHB; + shb.block_total_length = sizeof(shb); + shb.block_total_length2 = sizeof(shb); + shb.magic = PCAPNG_ENDIAN_MAGIC; + shb.version_major = 0x1; + shb.version_minor = 0x0; + shb.section_len = -1; + + len = write(fd, &shb, sizeof(shb)); + /* fail to write shb/idb means the pcapng is unreadable */ + if (len != sizeof(shb)) { + ODP_ERR("Failed to write pcapng section hdr\n"); + return -1; + } + fsync(fd); + + idb.block_type = PCAPNG_BLOCK_TYPE_IDB; + idb.block_total_length = sizeof(idb); + idb.block_total_length2 = sizeof(idb); + idb.linktype = PCAPNG_LINKTYPE_ETHERNET; + idb.snaplen = 0x0; /* unlimited */ + len = write(fd, &idb, sizeof(idb)); + if (len != sizeof(idb)) { + ODP_ERR("Failed to write pcapng interface description\n"); + return -1; + } + fsync(fd); + + return 0; +} + +/* + * make sure that each fifo write is less than PIPE_BUF + * this will make sure writes are atomic (on non blocking mode). + * writev() transfers all the data and returns the number of bytes requested or + * -EAGAIN + */ +static ssize_t write_fifo(int fd, struct iovec *iov, int iovcnt) +{ + ssize_t len = 0; + + len = writev(fd, iov, iovcnt); + /* + * we don't care if a writev fails, we asynchronously read the fifo + * so the next block of packets might be successful. This error only + * means that some packets failed to append on the pcap file + */ + if (len > 0) + fsync(fd); + + return len; +} + +int write_pcapng_pkts(pktio_entry_t *entry, int qidx, + const odp_packet_t packets[], int num) +{ + int i = 0; + struct iovec packet_iov[3 * num]; + pcapng_enhanced_packet_block_t epb[num]; + int iovcnt = 0; + ssize_t block_len = 0; + int fd = entry->s.pcapng.fd[qidx]; + ssize_t len = 0, wlen; + + for (i = 0; i < num; i++) { + odp_packet_hdr_t *pkt_hdr = packet_hdr(packets[i]); + uint32_t seg_len; + char *buf = (char *)odp_packet_offset(packets[i], 0, &seg_len, + NULL); + + if (block_len + sizeof(epb[i]) + + ROUNDUP_ALIGN(seg_len, PCAPNG_DATA_ALIGN) + + sizeof(uint32_t) > PIPE_BUF) { + wlen = write_fifo(fd, packet_iov, iovcnt); + if (wlen > 0) { + len += wlen; + block_len = 0; + iovcnt = 0; + } + } + epb[i].block_type = PCAPNG_BLOCK_TYPE_EPB; + epb[i].block_total_length = sizeof(epb[i]) + + ROUNDUP_ALIGN(seg_len, PCAPNG_DATA_ALIGN) + + PCAPNG_DATA_ALIGN; + epb[i].interface_idx = 0; + epb[i].timestamp_high = + (uint32_t)(pkt_hdr->timestamp.u64 >> 32); + epb[i].timestamp_low = (uint32_t)(pkt_hdr->timestamp.u64); + epb[i].captured_len = seg_len; + epb[i].packet_len = seg_len; + + /* epb */ + packet_iov[iovcnt].iov_base = &epb[i]; + packet_iov[iovcnt].iov_len = sizeof(epb[i]); + block_len += packet_iov[iovcnt].iov_len; + iovcnt++; + + /* data */ + packet_iov[iovcnt].iov_base = buf; + packet_iov[iovcnt].iov_len = + ROUNDUP_ALIGN(seg_len, PCAPNG_DATA_ALIGN); + block_len += packet_iov[iovcnt].iov_len; + iovcnt++; + + /* trailing */ + packet_iov[iovcnt].iov_base = &epb[i].block_total_length; + packet_iov[iovcnt].iov_len = sizeof(uint32_t); + block_len += packet_iov[iovcnt].iov_len; + iovcnt++; + } + + if (iovcnt) { + wlen = write_fifo(fd, packet_iov, iovcnt); + if (wlen > 0) + len += wlen; + } + + return len; +} + +#endif /* _ODP_PCAPNG */ ----------------------------------------------------------------------- Summary of changes: .travis.yml | 1 + configure.ac | 1 + doc/users-guide/Makefile.am | 3 +- .../users-guide-utilities-examples.adoc | 19 + doc/users-guide/users-guide.adoc | 2 + platform/linux-generic/Makefile.am | 2 + platform/linux-generic/include/odp_internal.h | 6 +- .../linux-generic/include/odp_packet_io_internal.h | 9 + platform/linux-generic/include/odp_pcapng.h | 56 +++ platform/linux-generic/m4/configure.m4 | 1 + platform/linux-generic/m4/odp_pcapng.m4 | 18 + platform/linux-generic/odp_packet_io.c | 54 ++- platform/linux-generic/odp_pcapng.c | 434 +++++++++++++++++++++ 13 files changed, 599 insertions(+), 7 deletions(-) create mode 100644 doc/users-guide/users-guide-utilities-examples.adoc create mode 100644 platform/linux-generic/include/odp_pcapng.h create mode 100644 platform/linux-generic/m4/odp_pcapng.m4 create mode 100644 platform/linux-generic/odp_pcapng.c hooks/post-receive --

7 years, 1 month

[COMMIT] annotated tag v1.19.0.1 created. v1.19.0.1_tigermoth

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 annotated tag, v1.19.0.1 has been created at 0cba45678a388360b3b7bfd75a6a29f21ffca4aa (tag) tagging 332877d51e773a584d272a03f08446d18cbe1634 (commit) replaces v1.19.0.0_tigermoth tagged by Maxim Uvarov on Thu May 10 22:12:31 2018 +0300 - Log ----------------------------------------------------------------- == OpenDataPlane (1.19.0.1) === Summary of Changes ODP v1.19.0.1 is the first service update for the Tiger Moth release. It incorporates a number of corrections and enhancements that improve the quality and testability of ODP. ==== APIs There are no API changes in this release. ==== DPDK Service Release Sync ODP is now paired with DPDK 17.11.2 for it's DPDK-related support. This is the current service level for the DPDK 17.11 LTS package used by ODP Tiger Moth and incorporates a number of important bug fixes. === Implementation Improvements The ODP reference implementation has been improved in a number of areas. ==== GCC 8 Support The GCC 8 series of compilers provides additional warnings about possible string truncation. A few ODP modules were changed to avoid misleading warnings when compiling with this level of GCC. ==== Linking with `libnuma` The `libnuma` library is used for DPDK pktios to provide proper memory allocation on NUMA-aware systems. Linking with this library is improved to avoid extraneous error messages at build time. ==== Packet metadata reorganization Packet metadata is reorganized to reduce the cache footprint used by the ODP reference implementation, resulting in performance improvements. ==== Random split from crypto module The `odp_random_xxx()` family of APIs was moved to a separate module (`odp_random.c`) for modularity and better isolation from planned crypto enhancements. ==== Shmem improvements Unnecessary locking is removed from the `odp_fdserver` module, streamlining operations on shared memory. ==== Timer pools The default number of timer pools supported by the ODP reference implementation has been reduced from 255 to 32. This lower number remains generously adequate for most applications and meaningfully reduces memory footprint, giving better performance. ==== Timer resolution During initialization ODP normally measures timer resolution to set the reported `highest_res_ns`. When such measurement is not able to be performed, this is not limited to 500ns to avoid bounds errors with overly precise resolutions. === Validation Improvements The ODP validation test suite has been improved in a number of areas. ==== Crypto validation test The validation test now correctly handles corner cases when the implementation under test fails to process any test packets. It also includes the previously missing `ODP_CIPHER_ALG_AES_CTR` name. Additionally, since individual implementations indicate which crypto/hash algorithms are supported via the `odp_crypto_capability()` API, the crypto validation test now properly uses this information and only tests those algorithms that the implementation reports as supported. The list of unsupported algorithms is also reported as part of the test results. ==== `odp_sched_pktio` test improvements The number of input/output queues used by this test can now be specified, providing additional controls for test flexibility. In addition, pktout queues are now selected based on input queue rather than worker id, thus ensuring packet order flow is maintained. Finally, an inactivity timer is added that allows the test to report when packets were handled due to timeout rather than I/O activity. ==== Timer validation test The validation test for the ODP timer APIs has been reorganized to better characterize an implementation's conformance to the ODP Timer API specification. Since implementations can have widely differing timer accuracy levels, particularly when running in virtualized environments, the test also relaxes its bounds checking and enforcement somewhat to better avoid false negative test results. Additionally, a timer pool create/destroy test was added as this area was not adequately covered previously. === Documentation Improvements The `EXTRA_ASCIIDOC_FLAGS` environment variable may now be used to supply additional build flags for Asciidoctor, which can be used to override icons and/or fonts for distribution or other needs. === Bug Fixes ==== https://bugs.linaro.org/show_bug.cgi?id=3657[Bug 3657] PktIO does not work with Mellanox Interfaces ==== https://bugs.linaro.org/show_bug.cgi?id=3685[Bug 3685] RX UDP checksum offload drops valid UDP packets with Niantic ==== https://bugs.linaro.org/show_bug.cgi?id=3686[Bug 3686] IP header checksum not inserted if L4 offset not set ==== https://bugs.linaro.org/show_bug.cgi?id=3690[Bug 3690] fdserver process interferes with signal handling ==== https://bugs.linaro.org/show_bug.cgi?id=3763[Bug 3763] tests should fail if odp_crypto_op/op_enq process 0 packets ==== https://bugs.linaro.org/show_bug.cgi?id=3764[Bug 3764] IPsec code can occasionally damage packets ==== https://bugs.linaro.org/show_bug.cgi?id=3772[Bug 3772] Timer segfaults when creating and destroying multiple timer pools ==== https://bugs.linaro.org/show_bug.cgi?id=3788[Bug 3788] linux-gen: ipc test fails to reserve memory === Known Issues ==== https://bugs.linaro.org/show_bug.cgi?id=3774[Bug 3774] Shmem validation test runs indefinitely with 1GB huge pages ==== https://bugs.linaro.org/show_bug.cgi?id=3787[Bug 3787] Timeout accuracy breaks down with odd resolution requests Bill Fischofer (1): changelog: updates for odp v1.19.0.1 Dmitry Eremin-Solenikov (10): linux-generic: random: split from crypto module validation: crypto: zero return code of odp_crypto_op/odp_crypto_op_enq linux-gen: ipsec: parse IPv6 next header in tunnel case travis: fetch explicitly specified DPDK version travis: bump DPDK version to 17.11.2 - latest LTS release validation: crypto: add missing ODP_CIPHER_ALG_AES_CTR name linux-gen: dpdk: fix linking to libnuma travis: do not run gcov before executing codecov script doc: allow user to provide exta asciidoctor flags build: odp_dpdk: add dependencies for crypto PMDs Josep Puigdemont (2): linux-gen: fdserver: remove unnecessary locking linux-gen: fix compilation warnings Matias Elo (1): linux-gen: packet: rearrange odp_packet_hdr_t members Maxim Uvarov (2): linux-gen: pktio: ipc free ring memory on error configure.ac: update version to v1.19.0.1 Petri Savolainen (20): validation: timer: remove doxygen tags validation: timer: check user pointer once validation: timer: tick conversion may lose precision validation: timer: don't assume low timer tick frequency validation: timer: add plain and sched queue tests validation: timer: fix timer_all test sync issue validation: timer: honor min timeout param value test: crypto perf: check algorithm capabilities test: mmap_vlan_ins: wait for background process validation: timer: loosen period accuracy requirement test: crypto perf: add missing breaks to switch case linux-gen: timer: fix timer pool index allocation linux-gen: timer: reduce number of timer pools validation: timer: add timer pool create-destroy test linux-gen: timer: set and check highest resolution test: sched_pktio: add pktio queue count option test: sched_pktio: ensure packet order per flow test: sched_pktio: parse options before odp global init test: sched_pktio: add inactivity timer example: timer_accuracy: simple timer accuracy measurement app ----------------------------------------------------------------------- hooks/post-receive --

7 years, 1 month

[COMMIT] branch tigermoth_lts updated. v1.19.0.1_tigermoth

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, tigermoth_lts has been updated via 332877d51e773a584d272a03f08446d18cbe1634 (commit) via bed462d28fa081a0d66dd29a8034f188256c7d04 (commit) via 2b27f75b587cf23d2687dd37897cbb26ed915890 (commit) via 79781031e28dee010425f575d1bf5de5b18af0d6 (commit) via 7d91fbd6c1a40e378b06f9be6dd3ef260c66dba9 (commit) via d189d704a29f490583057ccb5c762432a4e4b7a7 (commit) via 122b74c0074329f1758b2ed5d241e0e9a790087b (commit) via bd37df82b49faefef078558cdb2a54477bec6c5a (commit) via dea03d0a24117764ea9b8763e640a4836031e82b (commit) via 5c745f55a160b0a72d8e493604917a0d63dd71a5 (commit) via 15a30694560ba62160fa3a8ffddeb51b800e351a (commit) via 27a84cdfc0dfb82e3b86067e473658c091377892 (commit) via 3600304c30c4a345538f6c06ca50183b14cd12b1 (commit) via 4ec4a756c7607e3a78878e6699a82ccf6d0a1461 (commit) via 0f700e1a4b8e66c269081eba64eb5be8c37de868 (commit) via f0d0fd91978a8127ed270b03853ac0e04492a333 (commit) via 2ee48570ed824d5caff4f8cb121b7c293a481820 (commit) via 82499a9a4c80670de20825992478ccd4d764e28c (commit) via c164ad605422f90f3566e4c4ebed0ea3c2adb3a8 (commit) via 53dca8426775ed5bf40f2c2708915f02b2dccc74 (commit) via f69f033da3b6900acdd170668cae07ac6cd959f3 (commit) via 8d957f16105fa44d483478b2c05bae735680c007 (commit) via 5028177e4e795305b514d7164ff882dcf1d3622b (commit) via 24262a9aae62290dfd1a041d0bd5c6943270251d (commit) via 7e355890905a9195ff1027377991b4134e285a03 (commit) via 6947621e1b3a3c73c3ee351325f505e5e191474f (commit) via 29cb860583cb906bc16eddf9a4c98d6bb37333e5 (commit) via acc05760d5060d1782aa597e44c72ccb9a71b63b (commit) via c440dfceff97526d2763383afd8da064faef3d0d (commit) via 93591a6134fbc5655c0cf6a25e0b4e0668357971 (commit) via fec701841dbe2e963cf3adc7c74c98b41e059b9d (commit) via 0e24607e3075a573ebe4ac408703c76daac7236c (commit) via 5d4be5077adeec54d1956c86dcb87b186c39a7cb (commit) via 3aa3f4352083d159260cebc23b87607e73aa6f2b (commit) via 0d4271e31fe685a8a82381d21d5166f0398080c1 (commit) via d324b9de12c510ccf9fa1c1b6ece327c578ee53d (commit) from e828b4d6f503ff94c40e30b1d8babf0dcbecde91 (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: .travis.yml | 22 +- CHANGELOG | 124 +++++ configure.ac | 2 +- doc/Makefile.inc | 3 +- example/timer/.gitignore | 1 + example/timer/Makefile.am | 13 +- example/timer/odp_timer_accuracy.c | 461 +++++++++++++++++++ m4/odp_dpdk.m4 | 6 + platform/linux-generic/Makefile.am | 1 + .../linux-generic/include/odp_packet_internal.h | 15 +- platform/linux-generic/m4/odp_dpdk.m4 | 8 + platform/linux-generic/odp_crypto.c | 42 -- platform/linux-generic/odp_fdserver.c | 49 +- platform/linux-generic/odp_ipsec.c | 1 + platform/linux-generic/odp_ishm.c | 3 +- platform/linux-generic/odp_random.c | 54 +++ platform/linux-generic/odp_timer.c | 98 ++-- platform/linux-generic/pktio/dpdk.c | 2 +- platform/linux-generic/pktio/ipc.c | 8 +- .../test/mmap_vlan_ins/mmap_vlan_ins.sh | 4 +- test/performance/odp_crypto.c | 162 ++++++- test/performance/odp_sched_pktio.c | 510 ++++++++++++++++++--- test/validation/api/crypto/odp_crypto_test_inp.c | 6 +- test/validation/api/timer/timer.c | 414 ++++++++++++++--- 24 files changed, 1698 insertions(+), 311 deletions(-) create mode 100644 example/timer/odp_timer_accuracy.c create mode 100644 platform/linux-generic/odp_random.c hooks/post-receive --

7 years, 1 month

[COMMIT] branch master updated. v1.19.0.0_tigermoth-40-g11207ff1

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 11207ff1e211658bfb44c635423ae818a0654239 (commit) via 3abbe8b729310d29b9a2c84a7d7a11771513908d (commit) via f49289a7f621ffe5c981caa8531623d9e0a4abd9 (commit) via cc6d68e1dcf0f4f9b8b7442a4739288892fcb345 (commit) via 332877d51e773a584d272a03f08446d18cbe1634 (commit) from bed462d28fa081a0d66dd29a8034f188256c7d04 (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 11207ff1e211658bfb44c635423ae818a0654239 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Mon May 7 12:41:54 2018 +0300 linux-gen: use inlined event type function Implementation uses internally inlined version of event functions. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(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/platform/linux-generic/odp_crypto.c b/platform/linux-generic/odp_crypto.c index aca822d8..0fce762a 100644 --- a/platform/linux-generic/odp_crypto.c +++ b/platform/linux-generic/odp_crypto.c @@ -20,6 +20,9 @@ #include <odp/api/plat/packet_inlines.h> #include <odp_packet_internal.h> +/* Inlined API functions */ +#include <odp/api/plat/event_inlines.h> + #include <string.h> #include <stdlib.h> diff --git a/platform/linux-generic/odp_ipsec_events.c b/platform/linux-generic/odp_ipsec_events.c index 7fcebeb8..247e9f8b 100644 --- a/platform/linux-generic/odp_ipsec_events.c +++ b/platform/linux-generic/odp_ipsec_events.c @@ -14,6 +14,9 @@ #include <odp_ipsec_internal.h> #include <odp_pool_internal.h> +/* Inlined API functions */ +#include <odp/api/plat/event_inlines.h> + typedef struct { /* common buffer header */ odp_buffer_hdr_t buf_hdr; diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index d4b19fee..e0635444 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -16,6 +16,9 @@ #include <odp/api/packet_io.h> #include <odp/api/plat/pktio_inlines.h> +/* Inlined API functions */ +#include <odp/api/plat/event_inlines.h> + #include <protocols/eth.h> #include <protocols/ip.h> #include <protocols/tcp.h> diff --git a/platform/linux-generic/odp_timer.c b/platform/linux-generic/odp_timer.c index 3fc8f380..9085f1bb 100644 --- a/platform/linux-generic/odp_timer.c +++ b/platform/linux-generic/odp_timer.c @@ -56,6 +56,9 @@ #include <odp_arch_time_internal.h> #include <odp_timer_internal.h> +/* Inlined API functions */ +#include <odp/api/plat/event_inlines.h> + #define TMO_UNUSED ((uint64_t)0xFFFFFFFFFFFFFFFF) /* TMO_INACTIVE is or-ed with the expiration tick to indicate an expired timer. * The original expiration tick (63 bits) is still available so it can be used commit 3abbe8b729310d29b9a2c84a7d7a11771513908d Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Fri May 4 15:20:33 2018 +0300 linux-gen: event: inline event_type function Inline odp_event_type() as an example how current inline mechanism can be simplified. Only one file is needed for inline function definitions (xxx_inlines.h) and _ODP_NO_INLINE macro selects when non-inlined implementation is needed (only by xxx_api.c files). Implementation uses internally always inlined functions. Inlined function name is changed with macro from odp_foo() to __odp_foo(). Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(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/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index de2ada50..a73dc61d 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -24,8 +24,10 @@ if !ODP_ABI_COMPAT odpapiplatincludedir= $(includedir)/odp/api/plat odpapiplatinclude_HEADERS = \ include/odp/api/plat/atomic_inlines.h \ + include/odp/api/plat/buffer_inline_types.h \ include/odp/api/plat/byteorder_inlines.h \ include/odp/api/plat/byteorder_inlines_api.h \ + include/odp/api/plat/event_inlines.h \ include/odp/api/plat/packet_flag_inlines.h \ include/odp/api/plat/packet_flag_inlines_api.h \ include/odp/api/plat/packet_inline_types.h \ @@ -213,6 +215,7 @@ if ODP_ABI_COMPAT __LIB__libodp_linux_la_SOURCES += \ odp_atomic_api.c \ odp_byteorder.c \ + odp_event_api.c \ odp_packet_api.c \ odp_packet_flags_api.c \ odp_pktio_api.c \ diff --git a/platform/linux-generic/include-abi/odp/api/abi/event.h b/platform/linux-generic/include-abi/odp/api/abi/event.h index 7ba426a6..d7bd57c0 100644 --- a/platform/linux-generic/include-abi/odp/api/abi/event.h +++ b/platform/linux-generic/include-abi/odp/api/abi/event.h @@ -43,6 +43,9 @@ typedef enum odp_event_subtype_t { ODP_EVENT_PACKET_IPSEC = 3 } odp_event_subtype_t; +/* Inlined functions for non-ABI compat mode */ +#include <odp/api/plat/event_inlines.h> + /** * @} */ diff --git a/platform/linux-generic/include/odp/api/plat/buffer_inline_types.h b/platform/linux-generic/include/odp/api/plat/buffer_inline_types.h new file mode 100644 index 00000000..29f49f8d --- /dev/null +++ b/platform/linux-generic/include/odp/api/plat/buffer_inline_types.h @@ -0,0 +1,35 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#ifndef ODP_PLAT_BUFFER_INLINE_TYPES_H_ +#define ODP_PLAT_BUFFER_INLINE_TYPES_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#include <stdint.h> + +/** @cond _ODP_HIDE_FROM_DOXYGEN_ */ + +/* Buffer header field accessor */ +#define _odp_buf_hdr_field(buf_hdr, cast, field) \ + (*(cast *)(uintptr_t)((uint8_t *)buf_hdr + \ + _odp_buffer_inline_offset.field)) + +/* Buffer header field offsets for inline functions */ +typedef struct _odp_buffer_inline_offset_t { + uint16_t event_type; + +} _odp_buffer_inline_offset_t; + +/** @endcond */ + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/platform/linux-generic/include/odp/api/plat/event_inlines.h b/platform/linux-generic/include/odp/api/plat/event_inlines.h new file mode 100644 index 00000000..fbecd2c1 --- /dev/null +++ b/platform/linux-generic/include/odp/api/plat/event_inlines.h @@ -0,0 +1,37 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#ifndef ODP_PLAT_EVENT_INLINES_H_ +#define ODP_PLAT_EVENT_INLINES_H_ + +#include <odp/api/abi/buffer.h> +#include <odp/api/plat/buffer_inline_types.h> + +/** @cond _ODP_HIDE_FROM_DOXYGEN_ */ + +extern const _odp_buffer_inline_offset_t _odp_buffer_inline_offset; + +#ifndef _ODP_NO_INLINE + /* Inline functions by default */ + #define _ODP_INLINE static inline + #define odp_event_type __odp_event_type +#else + #define _ODP_INLINE +#endif + +_ODP_INLINE odp_event_type_t odp_event_type(odp_event_t event) +{ + int8_t type; + odp_buffer_t buf = (odp_buffer_t)event; + + type = _odp_buf_hdr_field(buf, int8_t, event_type); + + return (odp_event_type_t)type; +} + +/** @endcond */ + +#endif diff --git a/platform/linux-generic/odp_buffer.c b/platform/linux-generic/odp_buffer.c index 8c9d921c..ac0b9f9c 100644 --- a/platform/linux-generic/odp_buffer.c +++ b/platform/linux-generic/odp_buffer.c @@ -10,11 +10,22 @@ #include <odp_pool_internal.h> #include <odp_buffer_internal.h> #include <odp_debug_internal.h> +#include <odp/api/plat/buffer_inline_types.h> #include <string.h> #include <stdio.h> #include <inttypes.h> +#include <odp/visibility_begin.h> + +/* Fill in buffer header field offsets for inline functions */ +const _odp_buffer_inline_offset_t ODP_ALIGNED_CACHE +_odp_buffer_inline_offset = { + .event_type = offsetof(odp_buffer_hdr_t, event_type) +}; + +#include <odp/visibility_end.h> + odp_buffer_t odp_buffer_from_event(odp_event_t ev) { return (odp_buffer_t)ev; diff --git a/platform/linux-generic/odp_event.c b/platform/linux-generic/odp_event.c index f8ed478c..fa20af5f 100644 --- a/platform/linux-generic/odp_event.c +++ b/platform/linux-generic/odp_event.c @@ -17,10 +17,8 @@ #include <odp_debug_internal.h> #include <odp_packet_internal.h> -odp_event_type_t odp_event_type(odp_event_t event) -{ - return _odp_buffer_event_type(odp_buffer_from_event(event)); -} +/* Inlined API functions */ +#include <odp/api/plat/event_inlines.h> odp_event_subtype_t odp_event_subtype(odp_event_t event) { diff --git a/platform/linux-generic/odp_event_api.c b/platform/linux-generic/odp_event_api.c new file mode 100644 index 00000000..ea9e6110 --- /dev/null +++ b/platform/linux-generic/odp_event_api.c @@ -0,0 +1,13 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include "config.h" + +#include <odp/api/event.h> + +/* Non-inlined functions for ABI compat mode */ +#define _ODP_NO_INLINE +#include <odp/api/plat/event_inlines.h> commit f49289a7f621ffe5c981caa8531623d9e0a4abd9 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Fri May 4 14:58:47 2018 +0300 linux-gen: buffer: remove buffer_inlines header file Moved odp_buffer_inlines.h content to odp_buffer_internal.h and removed the file. Other xxx_inlines.h headers do not contain internal functions but only code for API function inlining. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(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/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 7d1d5554..de2ada50 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -86,7 +86,6 @@ noinst_HEADERS = \ include/odp_atomic_internal.h \ include/odp_bitmap_internal.h \ include/odp_bitset.h \ - include/odp_buffer_inlines.h \ include/odp_buffer_internal.h \ include/odp_classification_datamodel.h \ include/odp_classification_inlines.h \ diff --git a/platform/linux-generic/include/odp_buffer_inlines.h b/platform/linux-generic/include/odp_buffer_inlines.h deleted file mode 100644 index 9e3b6ef7..00000000 --- a/platform/linux-generic/include/odp_buffer_inlines.h +++ /dev/null @@ -1,40 +0,0 @@ -/* Copyright (c) 2014-2018, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -/** - * @file - * - * Inline functions for ODP buffer mgmt routines - implementation internal - */ - -#ifndef ODP_BUFFER_INLINES_H_ -#define ODP_BUFFER_INLINES_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -#include <odp_buffer_internal.h> - -odp_event_type_t _odp_buffer_event_type(odp_buffer_t buf); -void _odp_buffer_event_type_set(odp_buffer_t buf, int ev); -int odp_buffer_snprint(char *str, uint32_t n, odp_buffer_t buf); - -static inline odp_buffer_t buf_from_buf_hdr(odp_buffer_hdr_t *hdr) -{ - return (odp_buffer_t)hdr; -} - -static inline odp_event_t event_from_buf_hdr(odp_buffer_hdr_t *hdr) -{ - return (odp_event_t)hdr; -} - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/platform/linux-generic/include/odp_buffer_internal.h b/platform/linux-generic/include/odp_buffer_internal.h index e50dd604..48e74dd2 100644 --- a/platform/linux-generic/include/odp_buffer_internal.h +++ b/platform/linux-generic/include/odp_buffer_internal.h @@ -111,6 +111,20 @@ struct ODP_ALIGNED_CACHE odp_buffer_hdr_t { ODP_STATIC_ASSERT(CONFIG_PACKET_SEGS_PER_HDR < 256, "CONFIG_PACKET_SEGS_PER_HDR_TOO_LARGE"); +odp_event_type_t _odp_buffer_event_type(odp_buffer_t buf); +void _odp_buffer_event_type_set(odp_buffer_t buf, int ev); +int odp_buffer_snprint(char *str, uint32_t n, odp_buffer_t buf); + +static inline odp_buffer_t buf_from_buf_hdr(odp_buffer_hdr_t *hdr) +{ + return (odp_buffer_t)hdr; +} + +static inline odp_event_t event_from_buf_hdr(odp_buffer_hdr_t *hdr) +{ + return (odp_event_t)hdr; +} + #ifdef __cplusplus } #endif diff --git a/platform/linux-generic/include/odp_packet_internal.h b/platform/linux-generic/include/odp_packet_internal.h index 04112662..933dd4be 100644 --- a/platform/linux-generic/include/odp_packet_internal.h +++ b/platform/linux-generic/include/odp_packet_internal.h @@ -21,7 +21,6 @@ extern "C" { #include <odp/api/debug.h> #include <odp_buffer_internal.h> #include <odp_pool_internal.h> -#include <odp_buffer_inlines.h> #include <odp/api/packet.h> #include <odp/api/plat/packet_inline_types.h> #include <odp/api/packet_io.h> diff --git a/platform/linux-generic/odp_buffer.c b/platform/linux-generic/odp_buffer.c index fcab5e81..8c9d921c 100644 --- a/platform/linux-generic/odp_buffer.c +++ b/platform/linux-generic/odp_buffer.c @@ -9,7 +9,6 @@ #include <odp/api/buffer.h> #include <odp_pool_internal.h> #include <odp_buffer_internal.h> -#include <odp_buffer_inlines.h> #include <odp_debug_internal.h> #include <string.h> diff --git a/platform/linux-generic/odp_event.c b/platform/linux-generic/odp_event.c index 986b7317..f8ed478c 100644 --- a/platform/linux-generic/odp_event.c +++ b/platform/linux-generic/odp_event.c @@ -14,7 +14,6 @@ #include <odp/api/pool.h> #include <odp_buffer_internal.h> #include <odp_ipsec_internal.h> -#include <odp_buffer_inlines.h> #include <odp_debug_internal.h> #include <odp_packet_internal.h> diff --git a/platform/linux-generic/odp_ipsec_events.c b/platform/linux-generic/odp_ipsec_events.c index 93f838a5..7fcebeb8 100644 --- a/platform/linux-generic/odp_ipsec_events.c +++ b/platform/linux-generic/odp_ipsec_events.c @@ -10,7 +10,6 @@ #include <odp/api/shared_memory.h> #include <odp_buffer_internal.h> -#include <odp_buffer_inlines.h> #include <odp_debug_internal.h> #include <odp_ipsec_internal.h> #include <odp_pool_internal.h> diff --git a/platform/linux-generic/odp_pool.c b/platform/linux-generic/odp_pool.c index 955e14f9..0df8aa3f 100644 --- a/platform/linux-generic/odp_pool.c +++ b/platform/linux-generic/odp_pool.c @@ -14,7 +14,6 @@ #include <odp_pool_internal.h> #include <odp_internal.h> -#include <odp_buffer_inlines.h> #include <odp_packet_internal.h> #include <odp_config_internal.h> #include <odp_debug_internal.h> diff --git a/platform/linux-generic/odp_queue_basic.c b/platform/linux-generic/odp_queue_basic.c index 89a0cd90..764f39e8 100644 --- a/platform/linux-generic/odp_queue_basic.c +++ b/platform/linux-generic/odp_queue_basic.c @@ -14,7 +14,6 @@ #include <odp/api/buffer.h> #include <odp_buffer_internal.h> #include <odp_pool_internal.h> -#include <odp_buffer_inlines.h> #include <odp_internal.h> #include <odp/api/shared_memory.h> #include <odp/api/schedule.h> diff --git a/platform/linux-generic/odp_queue_scalable.c b/platform/linux-generic/odp_queue_scalable.c index 2a5e01d4..05246410 100644 --- a/platform/linux-generic/odp_queue_scalable.c +++ b/platform/linux-generic/odp_queue_scalable.c @@ -20,7 +20,6 @@ #include <odp_config_internal.h> #include <odp_debug_internal.h> -#include <odp_buffer_inlines.h> #include <odp_packet_io_internal.h> #include <odp_pool_internal.h> #include <odp_queue_scalable_internal.h> diff --git a/platform/linux-generic/odp_schedule_basic.c b/platform/linux-generic/odp_schedule_basic.c index b50462a5..540dc6a4 100644 --- a/platform/linux-generic/odp_schedule_basic.c +++ b/platform/linux-generic/odp_schedule_basic.c @@ -26,7 +26,6 @@ #include <odp_ring_internal.h> #include <odp_timer_internal.h> #include <odp_queue_internal.h> -#include <odp_buffer_inlines.h> #include <odp_libconfig_internal.h> /* Number of priority levels */ diff --git a/platform/linux-generic/odp_schedule_scalable.c b/platform/linux-generic/odp_schedule_scalable.c index 023ab1ed..58d5190c 100644 --- a/platform/linux-generic/odp_schedule_scalable.c +++ b/platform/linux-generic/odp_schedule_scalable.c @@ -25,7 +25,6 @@ #include <odp_ishmpool_internal.h> #include <odp_align_internal.h> -#include <odp_buffer_inlines.h> #include <odp_llqueue.h> #include <odp_queue_scalable_internal.h> #include <odp_schedule_if.h> diff --git a/platform/linux-generic/odp_timer.c b/platform/linux-generic/odp_timer.c index 37d0304c..3fc8f380 100644 --- a/platform/linux-generic/odp_timer.c +++ b/platform/linux-generic/odp_timer.c @@ -38,7 +38,6 @@ #include <odp/api/atomic.h> #include <odp_atomic_internal.h> #include <odp/api/buffer.h> -#include <odp_buffer_inlines.h> #include <odp/api/cpu.h> #include <odp/api/pool.h> #include <odp_pool_internal.h> commit cc6d68e1dcf0f4f9b8b7442a4739288892fcb345 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Mon May 7 11:10:32 2018 +0300 test: ipsec: fix link order In LDADD a library using another library, must become before that library. An application library uses ODP, so it must become before ODP library. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(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/test/validation/api/ipsec/Makefile.am b/test/validation/api/ipsec/Makefile.am index 32882699..a9caba17 100644 --- a/test/validation/api/ipsec/Makefile.am +++ b/test/validation/api/ipsec/Makefile.am @@ -21,4 +21,4 @@ ipsec_async_SOURCES = ipsec_async.c ipsec_inline_in_SOURCES = ipsec_inline_in.c ipsec_inline_out_SOURCES = ipsec_inline_out.c -LDADD += libtestipsec.la +PRELDADD += libtestipsec.la commit 332877d51e773a584d272a03f08446d18cbe1634 Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Tue May 8 18:01:15 2018 +0300 configure.ac: update version to v1.19.0.1 Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> diff --git a/configure.ac b/configure.ac index d3f02665..11a89b58 100644 --- a/configure.ac +++ b/configure.ac @@ -5,7 +5,7 @@ AC_PREREQ([2.5]) m4_define([odpapi_generation_version], [1]) m4_define([odpapi_major_version], [19]) m4_define([odpapi_minor_version], [0]) -m4_define([odpapi_point_version], [0]) +m4_define([odpapi_point_version], [1]) m4_define([odpapi_version], [odpapi_generation_version.odpapi_major_version.odpapi_minor_version.odpapi_point_version]) AC_INIT([OpenDataPlane],[odpapi_version],[lng-odp(a)lists.linaro.org]) ----------------------------------------------------------------------- Summary of changes: configure.ac | 2 +- platform/linux-generic/Makefile.am | 4 ++- .../linux-generic/include-abi/odp/api/abi/event.h | 3 ++ .../include/odp/api/plat/buffer_inline_types.h | 35 +++++++++++++++++++ .../include/odp/api/plat/event_inlines.h | 37 ++++++++++++++++++++ .../linux-generic/include/odp_buffer_inlines.h | 40 ---------------------- .../linux-generic/include/odp_buffer_internal.h | 14 ++++++++ .../linux-generic/include/odp_packet_internal.h | 1 - platform/linux-generic/odp_buffer.c | 12 ++++++- platform/linux-generic/odp_crypto.c | 3 ++ platform/linux-generic/odp_event.c | 7 ++-- platform/linux-generic/odp_event_api.c | 13 +++++++ platform/linux-generic/odp_ipsec_events.c | 4 ++- platform/linux-generic/odp_packet.c | 3 ++ platform/linux-generic/odp_pool.c | 1 - platform/linux-generic/odp_queue_basic.c | 1 - platform/linux-generic/odp_queue_scalable.c | 1 - platform/linux-generic/odp_schedule_basic.c | 1 - platform/linux-generic/odp_schedule_scalable.c | 1 - platform/linux-generic/odp_timer.c | 4 ++- test/validation/api/ipsec/Makefile.am | 2 +- 21 files changed, 132 insertions(+), 57 deletions(-) create mode 100644 platform/linux-generic/include/odp/api/plat/buffer_inline_types.h create mode 100644 platform/linux-generic/include/odp/api/plat/event_inlines.h delete mode 100644 platform/linux-generic/include/odp_buffer_inlines.h create mode 100644 platform/linux-generic/odp_event_api.c hooks/post-receive --

7 years, 1 month

[COMMIT] branch master updated. v1.19.0.0_tigermoth-35-gbed462d2

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 bed462d28fa081a0d66dd29a8034f188256c7d04 (commit) from 2b27f75b587cf23d2687dd37897cbb26ed915890 (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 bed462d28fa081a0d66dd29a8034f188256c7d04 Author: Bill Fischofer <bill.fischofer(a)linaro.org> Date: Mon May 7 15:29:04 2018 -0500 changelog: updates for odp v1.19.0.1 Add updates for ODP v1.19.0.1 (Tiger Moth Service Update 1) Signed-off-by: Bill Fischofer <bill.fischofer(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/CHANGELOG b/CHANGELOG index 5af1777c..96655320 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,127 @@ +== OpenDataPlane (1.19.0.1) +=== Summary of Changes +ODP v1.19.0.1 is the first service update for the Tiger Moth release. It +incorporates a number of corrections and enhancements that improve the quality +and testability of ODP. + +==== APIs +There are no API changes in this release. + +==== DPDK Service Release Sync +ODP is now paired with DPDK 17.11.2 for it's DPDK-related support. This is the +current service level for the DPDK 17.11 LTS package used by ODP Tiger Moth +and incorporates a number of important bug fixes. + +=== Implementation Improvements +The ODP reference implementation has been improved in a number of areas. + +==== GCC 8 Support +The GCC 8 series of compilers provides additional warnings about possible +string truncation. A few ODP modules were changed to avoid misleading +warnings when compiling with this level of GCC. + +==== Linking with `libnuma` +The `libnuma` library is used for DPDK pktios to provide proper memory +allocation on NUMA-aware systems. Linking with this library is improved to +avoid extraneous error messages at build time. + +==== Packet metadata reorganization +Packet metadata is reorganized to reduce the cache footprint used by the ODP +reference implementation, resulting in performance improvements. + +==== Random split from crypto module +The `odp_random_xxx()` family of APIs was moved to a separate module +(`odp_random.c`) for modularity and better isolation from planned crypto +enhancements. + +==== Shmem improvements +Unnecessary locking is removed from the `odp_fdserver` module, streamlining +operations on shared memory. + +==== Timer pools +The default number of timer pools supported by the ODP reference +implementation has been reduced from 255 to 32. This lower number remains +generously adequate for most applications and meaningfully reduces memory +footprint, giving better performance. + +==== Timer resolution +During initialization ODP normally measures timer resolution to set the +reported `highest_res_ns`. When such measurement is not able to be performed, +this is not limited to 500ns to avoid bounds errors with overly precise +resolutions. + +=== Validation Improvements +The ODP validation test suite has been improved in a number of areas. + +==== Crypto validation test +The validation test now correctly handles corner cases when the implementation +under test fails to process any test packets. It also includes the +previously missing `ODP_CIPHER_ALG_AES_CTR` name. + +Additionally, since individual implementations indicate which crypto/hash +algorithms are supported via the `odp_crypto_capability()` API, the crypto +validation test now properly uses this information and only tests those +algorithms that the implementation reports as supported. The list of +unsupported algorithms is also reported as part of the test results. + +==== `odp_sched_pktio` test improvements +The number of input/output queues used by this test can now be specified, +providing additional controls for test flexibility. In addition, pktout +queues are now selected based on input queue rather than worker id, thus +ensuring packet order flow is maintained. + +Finally, an inactivity timer is added that allows the test to report when +packets were handled due to timeout rather than I/O activity. + +==== Timer validation test +The validation test for the ODP timer APIs has been reorganized to better +characterize an implementation's conformance to the ODP Timer API +specification. Since implementations can have widely differing timer accuracy +levels, particularly when running in virtualized environments, the test also +relaxes its bounds checking and enforcement somewhat to better avoid false +negative test results. + +Additionally, a timer pool create/destroy test was added as this area was +not adequately covered previously. + +=== Documentation Improvements +The `EXTRA_ASCIIDOC_FLAGS` environment variable may now be used to supply +additional build flags for Asciidoctor, which can be used to override +icons and/or fonts for distribution or other needs. + +=== Bug Fixes +==== https://bugs.linaro.org/show_bug.cgi?id=3657[Bug 3657] +PktIO does not work with Mellanox Interfaces + +==== https://bugs.linaro.org/show_bug.cgi?id=3685[Bug 3685] +RX UDP checksum offload drops valid UDP packets with Niantic + +==== https://bugs.linaro.org/show_bug.cgi?id=3686[Bug 3686] +IP header checksum not inserted if L4 offset not set + +==== https://bugs.linaro.org/show_bug.cgi?id=3690[Bug 3690] +fdserver process interferes with signal handling + +==== https://bugs.linaro.org/show_bug.cgi?id=3763[Bug 3763] +tests should fail if odp_crypto_op/op_enq process 0 packets + +==== https://bugs.linaro.org/show_bug.cgi?id=3764[Bug 3764] +IPsec code can occasionally damage packets + +==== https://bugs.linaro.org/show_bug.cgi?id=3772[Bug 3772] +Timer segfaults when creating and destroying multiple timer pools + +==== https://bugs.linaro.org/show_bug.cgi?id=3788[Bug 3788] +linux-gen: ipc test fails to reserve memory + +=== Known Issues +==== https://bugs.linaro.org/show_bug.cgi?id=3774[Bug 3774] +Shmem validation test runs indefinitely with 1GB huge pages + +==== https://bugs.linaro.org/show_bug.cgi?id=3787[Bug 3787] +Timeout accuracy breaks down with odd resolution requests + + == OpenDataPlane (1.19.0.0) === Summary of Changes ODP v1.19.0.0 is the official Tiger Moth final release. It incorporates final ----------------------------------------------------------------------- Summary of changes: CHANGELOG | 124 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 124 insertions(+) hooks/post-receive --

7 years, 1 month

[COMMIT] branch master updated. v1.19.0.0_tigermoth-34-g2b27f75b

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 2b27f75b587cf23d2687dd37897cbb26ed915890 (commit) from 79781031e28dee010425f575d1bf5de5b18af0d6 (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 2b27f75b587cf23d2687dd37897cbb26ed915890 Author: Josep Puigdemont <josep.puigdemont(a)linaro.org> Date: Fri May 4 14:04:21 2018 +0200 linux-gen: fix compilation warnings gcc 8 complains when strncpy may truncate the destination string, possibly not copying the null terminating character (-Werror=stringop-truncation). By using memcpy we silent gcc8, but we also make sure that the strings are null-terminated. Signed-off-by: Josep Puigdemont <josep.puigdemont(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/odp_fdserver.c b/platform/linux-generic/odp_fdserver.c index 774fe360..4b6fd088 100644 --- a/platform/linux-generic/odp_fdserver.c +++ b/platform/linux-generic/odp_fdserver.c @@ -588,7 +588,9 @@ int _odp_fdserver_init_global(void) /* bind to new named socket: */ local.sun_family = AF_UNIX; - strncpy(local.sun_path, sockpath, sizeof(local.sun_path)); + memcpy(local.sun_path, sockpath, sizeof(local.sun_path)); + local.sun_path[sizeof(local.sun_path) - 1] = '\0'; + res = bind(sock, (struct sockaddr *)&local, sizeof(struct sockaddr_un)); if (res == -1) { ODP_ERR("_odp_fdserver_init_global: %s\n", strerror(errno)); diff --git a/platform/linux-generic/odp_ishm.c b/platform/linux-generic/odp_ishm.c index babf51b9..cf4ec9cf 100644 --- a/platform/linux-generic/odp_ishm.c +++ b/platform/linux-generic/odp_ishm.c @@ -475,8 +475,7 @@ static int create_file(int block_index, huge_flag_t huge, uint64_t len, * external ref: */ if (flags & _ODP_ISHM_EXPORT) { - strncpy(new_block->filename, filename, - ISHM_FILENAME_MAXLEN - 1); + memcpy(new_block->filename, filename, ISHM_FILENAME_MAXLEN); snprintf(new_block->exptname, ISHM_FILENAME_MAXLEN, ISHM_EXPTNAME_FORMAT, odp_global_data.shm_dir, ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/odp_fdserver.c | 4 +++- platform/linux-generic/odp_ishm.c | 3 +-- 2 files changed, 4 insertions(+), 3 deletions(-) hooks/post-receive --

7 years, 1 month

[COMMIT] branch master updated. v1.19.0.0_tigermoth-33-g79781031

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 79781031e28dee010425f575d1bf5de5b18af0d6 (commit) via 7d91fbd6c1a40e378b06f9be6dd3ef260c66dba9 (commit) from d189d704a29f490583057ccb5c762432a4e4b7a7 (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 79781031e28dee010425f575d1bf5de5b18af0d6 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Wed May 2 11:58:33 2018 +0300 example: timer_accuracy: simple timer accuracy measurement app Added simple application to measure timer accuracy. Uses time API to measure accuracy of received timeouts from timer. 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/example/timer/.gitignore b/example/timer/.gitignore index eaa9a361..2b077829 100644 --- a/example/timer/.gitignore +++ b/example/timer/.gitignore @@ -1,4 +1,5 @@ *.log *.trs +odp_timer_accuracy odp_timer_test odp_timer_simple diff --git a/example/timer/Makefile.am b/example/timer/Makefile.am index 64e722a3..c7d58922 100644 --- a/example/timer/Makefile.am +++ b/example/timer/Makefile.am @@ -1,11 +1,16 @@ include $(top_srcdir)/example/Makefile.inc -bin_PROGRAMS = odp_timer_test \ - odp_timer_simple -odp_timer_test_SOURCES = odp_timer_test.c +bin_PROGRAMS = odp_timer_accuracy \ + odp_timer_simple \ + odp_timer_test + +odp_timer_accuracy_SOURCES = odp_timer_accuracy.c odp_timer_simple_SOURCES = odp_timer_simple.c +odp_timer_test_SOURCES = odp_timer_test.c + if test_example -TESTS = odp_timer_simple +TESTS = odp_timer_accuracy \ + odp_timer_simple endif diff --git a/example/timer/odp_timer_accuracy.c b/example/timer/odp_timer_accuracy.c new file mode 100644 index 00000000..f1a088cb --- /dev/null +++ b/example/timer/odp_timer_accuracy.c @@ -0,0 +1,461 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <stdio.h> +#include <string.h> +#include <inttypes.h> +#include <stdlib.h> + +#include <unistd.h> +#include <getopt.h> + +#include <odp_api.h> + +#define START_OFFSET_NS ((uint64_t)(300 * ODP_TIME_MSEC_IN_NS)) + +typedef struct test_global_t { + struct { + unsigned long long int period_ns; + unsigned long long int res_ns; + int num; + int init; + } opt; + + odp_queue_t queue; + odp_timer_pool_t timer_pool; + odp_pool_t timeout_pool; + odp_timer_t *timer; + uint64_t period_ns; + uint64_t first_ns; + +} test_global_t; + +static void print_usage(void) +{ + printf("\n" + "Timer accuracy test application.\n" + "\n" + "OPTIONS:\n" + " -p, --period <nsec> Timeout period. Default: 200 milliseconds\n" + " -r, --resolution <nsec> Timeout resolution. Default: period / 10\n" + " -n, --num <number> Number of timeouts. Default: 50\n" + " -i, --init Set global init parameters. Default: init params not set.\n" + " -h, --help Display help and exit.\n\n"); +} + +static int parse_options(int argc, char *argv[], test_global_t *test_global) +{ + int opt, long_index; + const struct option longopts[] = { + {"period", required_argument, NULL, 'p'}, + {"resolution", required_argument, NULL, 'r'}, + {"num", required_argument, NULL, 'n'}, + {"init", no_argument, NULL, 'i'}, + {"help", no_argument, NULL, 'h'}, + {NULL, 0, NULL, 0} + }; + const char *shortopts = "+p:r:n:ih"; + int ret = 0; + + test_global->opt.period_ns = 200 * ODP_TIME_MSEC_IN_NS; + test_global->opt.res_ns = 0; + test_global->opt.num = 50; + test_global->opt.init = 0; + + while (1) { + opt = getopt_long(argc, argv, shortopts, longopts, &long_index); + + if (opt == -1) + break; /* No more options */ + + switch (opt) { + case 'p': + test_global->opt.period_ns = strtoull(optarg, NULL, 0); + break; + case 'r': + test_global->opt.res_ns = strtoull(optarg, NULL, 0); + break; + case 'n': + test_global->opt.num = atoi(optarg); + break; + case 'i': + test_global->opt.init = 1; + break; + case 'h': + print_usage(); + ret = -1; + break; + default: + print_usage(); + ret = -1; + break; + } + } + + if (test_global->opt.res_ns == 0) + test_global->opt.res_ns = test_global->opt.period_ns / 10; + + return ret; +} + +static int start_timers(test_global_t *test_global) +{ + odp_pool_t pool; + odp_pool_param_t pool_param; + odp_timer_pool_t timer_pool; + odp_timer_pool_param_t timer_param; + odp_timer_capability_t timer_capa; + odp_timer_t timer; + odp_queue_t queue; + odp_queue_param_t queue_param; + uint64_t tick, first_tick, period_tick, offset_tick; + uint64_t period_ns, res_ns, first_ns, res_capa; + odp_event_t event; + odp_timeout_t timeout; + odp_timer_set_t ret; + odp_time_t time; + int i, num; + + num = test_global->opt.num; + period_ns = test_global->opt.period_ns; + test_global->period_ns = period_ns; + + /* Always init globals for destroy calls */ + test_global->queue = ODP_QUEUE_INVALID; + test_global->timer_pool = ODP_TIMER_POOL_INVALID; + test_global->timeout_pool = ODP_POOL_INVALID; + + for (i = 0; i < num; i++) + test_global->timer[i] = ODP_TIMER_INVALID; + + odp_queue_param_init(&queue_param); + queue_param.type = ODP_QUEUE_TYPE_SCHED; + queue_param.sched.prio = ODP_SCHED_PRIO_DEFAULT; + queue_param.sched.sync = ODP_SCHED_SYNC_ATOMIC; + queue_param.sched.group = ODP_SCHED_GROUP_ALL; + + queue = odp_queue_create("timeout_queue", &queue_param); + if (queue == ODP_QUEUE_INVALID) { + printf("Queue create failed.\n"); + return -1; + } + + test_global->queue = queue; + + odp_pool_param_init(&pool_param); + pool_param.type = ODP_POOL_TIMEOUT; + pool_param.tmo.num = num; + + pool = odp_pool_create("timeout pool", &pool_param); + + if (pool == ODP_POOL_INVALID) { + printf("Timeout pool create failed.\n"); + return -1; + } + + test_global->timeout_pool = pool; + + if (odp_timer_capability(ODP_CLOCK_CPU, &timer_capa)) { + printf("Timer capa failed\n"); + return -1; + } + + res_capa = timer_capa.highest_res_ns; + + res_ns = test_global->opt.res_ns; + + if (res_ns < res_capa) { + printf("Resolution %" PRIu64 " nsec too high. " + "Highest resolution %" PRIu64 " nsec. " + "Default resolution is period / 10.\n\n", + res_ns, res_capa); + return -1; + } + + memset(&timer_param, 0, sizeof(odp_timer_pool_param_t)); + + timer_param.res_ns = res_ns; + timer_param.min_tmo = period_ns; + timer_param.max_tmo = START_OFFSET_NS + (num * period_ns); + timer_param.num_timers = num; + timer_param.clk_src = ODP_CLOCK_CPU; + + printf("\nTest parameters:\n"); + printf(" resolution capa: %" PRIu64 " nsec\n", res_capa); + printf(" start offset: %" PRIu64 " nsec\n", START_OFFSET_NS); + printf(" period: %" PRIu64 " nsec\n", period_ns); + printf(" resolution: %" PRIu64 " nsec\n", timer_param.res_ns); + printf(" min timeout: %" PRIu64 " nsec\n", timer_param.min_tmo); + printf(" max timeout: %" PRIu64 " nsec\n", timer_param.max_tmo); + printf(" num timers: %u\n", timer_param.num_timers); + printf(" test run time: %.1f sec\n\n", + timer_param.max_tmo / 1000000000.0); + + timer_pool = odp_timer_pool_create("timer_accuracy", &timer_param); + + if (timer_pool == ODP_TIMER_POOL_INVALID) { + printf("Timer pool create failed\n"); + return -1; + } + + odp_timer_pool_start(); + + test_global->timer_pool = timer_pool; + first_tick = 0; + offset_tick = odp_timer_ns_to_tick(timer_pool, START_OFFSET_NS); + period_tick = odp_timer_ns_to_tick(timer_pool, period_ns); + + for (i = 0; i < num; i++) { + timer = odp_timer_alloc(timer_pool, queue, NULL); + + if (timer == ODP_TIMER_INVALID) { + printf("Timer alloc failed.\n"); + return -1; + } + + test_global->timer[i] = timer; + } + + for (i = 0; i < num; i++) { + timer = test_global->timer[i]; + + timeout = odp_timeout_alloc(pool); + if (timeout == ODP_TIMEOUT_INVALID) { + printf("Timeout alloc failed\n"); + return -1; + } + + event = odp_timeout_to_event(timeout); + + if (i == 0) { + first_tick = odp_timer_current_tick(timer_pool); + time = odp_time_local(); + first_ns = odp_time_to_ns(time); + test_global->first_ns = first_ns + START_OFFSET_NS; + } + + tick = first_tick + offset_tick + (i * period_tick); + ret = odp_timer_set_abs(timer, tick, &event); + + if (ret != ODP_TIMER_SUCCESS) { + printf("Timer[%i] set failed: ret %i\n", i, ret); + return -1; + } + } + + return 0; +} + +static int destroy_timers(test_global_t *test_global) +{ + int i, num; + odp_timer_t timer; + odp_event_t ev; + int ret = 0; + + num = test_global->opt.num; + + for (i = 0; i < num; i++) { + timer = test_global->timer[i]; + + if (timer == ODP_TIMER_INVALID) + break; + + ev = odp_timer_free(timer); + + if (ev != ODP_EVENT_INVALID) + odp_event_free(ev); + } + + if (test_global->timer_pool != ODP_TIMER_POOL_INVALID) + odp_timer_pool_destroy(test_global->timer_pool); + + if (test_global->timeout_pool != ODP_POOL_INVALID) { + if (odp_pool_destroy(test_global->timeout_pool)) { + printf("Pool destroy failed.\n"); + ret = -1; + } + } + + if (test_global->queue != ODP_QUEUE_INVALID) { + if (odp_queue_destroy(test_global->queue)) { + printf("Queue destroy failed.\n"); + ret = -1; + } + } + + return ret; +} + +static void run_test(test_global_t *test_global) +{ + int num, num_left; + odp_event_t ev; + odp_time_t time; + uint64_t time_ns, diff_ns, next_tmo, res_ns; + uint64_t after = 0; + uint64_t min_after = UINT64_MAX; + uint64_t max_after = 0; + uint64_t before = 0; + uint64_t min_before = UINT64_MAX; + uint64_t max_before = 0; + double ave_after = 0.0; + double ave_before = 0.0; + int num_after = 0; + int num_exact = 0; + int num_before = 0; + + res_ns = test_global->opt.res_ns; + num = test_global->opt.num; + num_left = num; + next_tmo = test_global->first_ns; + + while (num_left) { + ev = odp_schedule(NULL, ODP_SCHED_WAIT); + + time = odp_time_local(); + time_ns = odp_time_to_ns(time); + + if (time_ns > next_tmo) { + diff_ns = time_ns - next_tmo; + num_after++; + after += diff_ns; + if (diff_ns < min_after) + min_after = diff_ns; + if (diff_ns > max_after) + max_after = diff_ns; + + } else if (time_ns < next_tmo) { + diff_ns = next_tmo - time_ns; + num_before++; + before += diff_ns; + if (diff_ns < min_before) + min_before = diff_ns; + if (diff_ns > max_before) + max_before = diff_ns; + + } else { + num_exact++; + } + + odp_event_free(ev); + + next_tmo += test_global->period_ns; + num_left--; + } + + /* Free current scheduler context. There should be no more events. */ + while ((ev = odp_schedule(NULL, ODP_SCHED_NO_WAIT)) + != ODP_EVENT_INVALID) { + printf("Dropping extra event\n"); + odp_event_free(ev); + } + + if (num_after) + ave_after = (double)after / num_after; + else + min_after = 0; + + if (num_before) + ave_before = (double)before / num_before; + else + min_before = 0; + + printf("\n Test results:\n"); + printf(" num after: %12i / %.2f%%\n", + num_after, 100.0 * num_after / num); + printf(" num before: %12i / %.2f%%\n", + num_before, 100.0 * num_before / num); + printf(" num exact: %12i / %.2f%%\n", + num_exact, 100.0 * num_exact / num); + printf(" error after (nsec):\n"); + printf(" min: %12" PRIu64 " / %.3fx resolution\n", + min_after, (double)min_after / res_ns); + printf(" max: %12" PRIu64 " / %.3fx resolution\n", + max_after, (double)max_after / res_ns); + printf(" ave: %12.0f / %.3fx resolution\n", + ave_after, ave_after / res_ns); + printf(" error before (nsec):\n"); + printf(" min: %12" PRIu64 " / %.3fx resolution\n", + min_before, (double)min_before / res_ns); + printf(" max: %12" PRIu64 " / %.3fx resolution\n", + max_before, (double)max_before / res_ns); + printf(" ave: %12.0f / %.3fx resolution\n", + ave_before, ave_before / res_ns); + printf("\n"); +} + +int main(int argc, char *argv[]) +{ + odp_instance_t instance; + odp_init_t init; + int num; + test_global_t test_global; + odp_init_t *init_ptr = NULL; + int ret = 0; + + memset(&test_global, 0, sizeof(test_global_t)); + + if (parse_options(argc, argv, &test_global)) + return -1; + + /* List features not to be used (may optimize performance) */ + odp_init_param_init(&init); + init.not_used.feat.cls = 1; + init.not_used.feat.crypto = 1; + init.not_used.feat.ipsec = 1; + init.not_used.feat.tm = 1; + + if (test_global.opt.init) + init_ptr = &init; + + /* Init ODP before calling anything else */ + if (odp_init_global(&instance, init_ptr, NULL)) { + printf("Global init failed.\n"); + return -1; + } + + /* Init this thread */ + if (odp_init_local(instance, ODP_THREAD_WORKER)) { + printf("Local init failed.\n"); + return -1; + } + + odp_sys_info_print(); + + num = test_global.opt.num; + + test_global.timer = calloc(num, sizeof(odp_timer_t)); + + if (test_global.timer == NULL) { + printf("Malloc failed.\n"); + goto quit; + } + + if (start_timers(&test_global)) + goto quit; + + run_test(&test_global); + +quit: + if (destroy_timers(&test_global)) + ret = -1; + + if (test_global.timer) + free(test_global.timer); + + if (odp_term_local()) { + printf("Term local failed.\n"); + ret = -1; + } + + if (odp_term_global(instance)) { + printf("Term global failed.\n"); + ret = -1; + } + + return ret; +} commit 7d91fbd6c1a40e378b06f9be6dd3ef260c66dba9 Author: Matias Elo <matias.elo(a)nokia.com> Date: Fri May 4 10:39:48 2018 +0300 linux-gen: packet: rearrange odp_packet_hdr_t members Save 64 bytes by rearranging odp_packet_hdr_t members. 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_packet_internal.h b/platform/linux-generic/include/odp_packet_internal.h index be17cac8..04112662 100644 --- a/platform/linux-generic/include/odp_packet_internal.h +++ b/platform/linux-generic/include/odp_packet_internal.h @@ -96,6 +96,9 @@ typedef struct { * Members below are not initialized by packet_init() */ + /* Type of extra data */ + uint8_t extra_type; + /* Flow hash value */ uint32_t flow_hash; @@ -108,16 +111,14 @@ typedef struct { /* Result for crypto packet op */ odp_crypto_packet_result_t crypto_op_result; -#ifdef ODP_PKTIO_DPDK - /* Type of extra data */ - uint8_t extra_type; - /* Extra space for packet descriptors. E.g. DPDK mbuf */ - uint8_t ODP_ALIGNED_CACHE extra[PKT_EXTRA_LEN]; -#endif - /* Context for IPsec */ odp_ipsec_packet_result_t ipsec_ctx; +#ifdef ODP_PKTIO_DPDK + /* Extra space for packet descriptors. E.g. DPDK mbuf. Keep as the last + * member before data. */ + uint8_t ODP_ALIGNED_CACHE extra[PKT_EXTRA_LEN]; +#endif /* Packet data storage */ uint8_t data[0]; } odp_packet_hdr_t; ----------------------------------------------------------------------- Summary of changes: example/timer/.gitignore | 1 + example/timer/Makefile.am | 13 +- example/timer/odp_timer_accuracy.c | 461 +++++++++++++++++++++ .../linux-generic/include/odp_packet_internal.h | 15 +- 4 files changed, 479 insertions(+), 11 deletions(-) create mode 100644 example/timer/odp_timer_accuracy.c hooks/post-receive --

7 years, 1 month

[COMMIT] branch master updated. v1.19.0.0_tigermoth-31-gd189d704

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 d189d704a29f490583057ccb5c762432a4e4b7a7 (commit) from 122b74c0074329f1758b2ed5d241e0e9a790087b (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 d189d704a29f490583057ccb5c762432a4e4b7a7 Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Fri May 4 12:33:26 2018 +0300 linux-gen: pktio: ipc free ring memory on error ipc pktio can fail on open if second process is not yet ready to connect. But on this error free of ring memory is missing which leads to taking all available shm descriptors. https://bugs.linaro.org/show_bug.cgi?id=3788 Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> diff --git a/platform/linux-generic/pktio/ipc.c b/platform/linux-generic/pktio/ipc.c index 08e3e4bc..d1e30ab8 100644 --- a/platform/linux-generic/pktio/ipc.c +++ b/platform/linux-generic/pktio/ipc.c @@ -347,6 +347,8 @@ static int ipc_pktio_open(odp_pktio_t id ODP_UNUSED, pktio_entry->s.ipc.rx.cache = _ring_create("ipc_rx_cache", PKTIO_IPC_ENTRIES, _RING_NO_LIST); + if (!pktio_entry->s.ipc.rx.cache) + return -1; /* Shared info about remote pktio */ if (sscanf(dev, "ipc:%d:%s", &pid, tail) == 2) { @@ -355,12 +357,15 @@ static int ipc_pktio_open(odp_pktio_t id ODP_UNUSED, snprintf(name, sizeof(name), "ipc:%s_info", tail); IPC_ODP_DBG("lookup for name %s for pid %d\n", name, pid); shm = odp_shm_import(name, pid, name); - if (ODP_SHM_INVALID == shm) + if (ODP_SHM_INVALID == shm) { + _ring_destroy("ipc_rx_cache"); return -1; + } pinfo = odp_shm_addr(shm); if (!pinfo->master.init_done) { odp_shm_free(shm); + _ring_destroy("ipc_rx_cache"); return -1; } pktio_entry->s.ipc.pinfo = pinfo; @@ -374,6 +379,7 @@ static int ipc_pktio_open(odp_pktio_t id ODP_UNUSED, ODP_CACHE_LINE_SIZE, _ODP_ISHM_EXPORT | _ODP_ISHM_LOCK); if (ODP_SHM_INVALID == shm) { + _ring_destroy("ipc_rx_cache"); ODP_ERR("can not create shm %s\n", name); return -1; } ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/pktio/ipc.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) hooks/post-receive --

7 years, 1 month

[COMMIT] branch master updated. v1.19.0.0_tigermoth-30-g122b74c0

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 122b74c0074329f1758b2ed5d241e0e9a790087b (commit) from bd37df82b49faefef078558cdb2a54477bec6c5a (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 122b74c0074329f1758b2ed5d241e0e9a790087b Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Mon Apr 23 15:59:38 2018 +0300 build: odp_dpdk: add dependencies for crypto PMDs Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/m4/odp_dpdk.m4 b/m4/odp_dpdk.m4 index ec248e76..2ef5253c 100644 --- a/m4/odp_dpdk.m4 +++ b/m4/odp_dpdk.m4 @@ -12,6 +12,12 @@ AS_CASE([$cur_driver], [rte_pmd_mlx4], [AS_VAR_APPEND([DPDK_LIBS], [" -lmlx4 -libverbs"])], [rte_pmd_mlx5], [AS_VAR_APPEND([DPDK_LIBS], [" -lmlx5 -libverbs"])], [rte_pmd_pcap], [AS_VAR_APPEND([DPDK_LIBS], [" -lpcap"])], + [rte_pmd_aesni_gcm], [AS_VAR_APPEND([DPDK_LIBS], [" -lIPSec_MB"])], + [rte_pmd_aesni_mb], [AS_VAR_APPEND([DPDK_LIBS], [" -lIPSec_MB"])], + [rte_pmd_kasumi], [AS_VAR_APPEND([DPDK_LIBS], [" -lsso_kasumi"])], + [rte_pmd_snow3g], [AS_VAR_APPEND([DPDK_LIBS], [" -lsso_snow3g"])], + [rte_pmd_zuc], [AS_VAR_APPEND([DPDK_LIBS], [" -lsso_zuc"])], + [rte_pmd_qat], [AS_VAR_APPEND([DPDK_LIBS], [" -lcrypto"])], [rte_pmd_openssl], [AS_VAR_APPEND([DPDK_LIBS], [" -lcrypto"])]) done AS_VAR_APPEND([DPDK_PMDS], [--no-whole-archive]) ----------------------------------------------------------------------- Summary of changes: m4/odp_dpdk.m4 | 6 ++++++ 1 file changed, 6 insertions(+) hooks/post-receive --

7 years, 1 month

[COMMIT] branch master updated. v1.19.0.0_tigermoth-29-gbd37df82

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 bd37df82b49faefef078558cdb2a54477bec6c5a (commit) via dea03d0a24117764ea9b8763e640a4836031e82b (commit) via 5c745f55a160b0a72d8e493604917a0d63dd71a5 (commit) via 15a30694560ba62160fa3a8ffddeb51b800e351a (commit) via 27a84cdfc0dfb82e3b86067e473658c091377892 (commit) from 3600304c30c4a345538f6c06ca50183b14cd12b1 (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 bd37df82b49faefef078558cdb2a54477bec6c5a Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Fri Apr 27 13:33:58 2018 +0300 test: sched_pktio: add inactivity timer Add a timer per packet input queue to test timer performance with packet IO. The timer is reset every time packets are received from a queue, or when timer expires. Timer testing is enabled by setting the timeout period in usec with -t option. 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 840fe8da..46a08c92 100644 --- a/test/performance/odp_sched_pktio.c +++ b/test/performance/odp_sched_pktio.c @@ -25,8 +25,10 @@ #define BURST_SIZE 32 #define CHECK_PERIOD 10000 #define TEST_PASSED_LIMIT 5000 +#define TIMEOUT_OFFSET_NS 1000000 typedef struct test_options_t { + long int timeout_us; int num_worker; int num_pktio; int num_pktio_queue; @@ -80,6 +82,14 @@ typedef struct { } pktio[MAX_PKTIOS]; + struct { + odp_timer_pool_t timer_pool; + odp_pool_t timeout_pool; + uint64_t timeout_tick; + odp_timer_t timer[MAX_PKTIOS][MAX_PKTIO_QUEUES]; + + } timer; + worker_arg_t worker_arg[MAX_WORKERS]; worker_stat_t worker_stat[MAX_WORKERS]; @@ -186,6 +196,121 @@ static int worker_thread(void *arg) return 0; } +static int worker_thread_timers(void *arg) +{ + odp_event_t ev[BURST_SIZE]; + int num, sent, drop, out, tmos, i, src_pktio, src_queue; + odp_pktout_queue_t pktout; + odp_queue_t queue; + queue_context_t *queue_context; + odp_timer_t timer; + odp_timer_set_t ret; + worker_arg_t *worker_arg = arg; + test_global_t *test_global = worker_arg->test_global_ptr; + int worker_id = worker_arg->worker_id; + uint32_t polls = 0; + uint64_t tick = test_global->timer.timeout_tick; + + printf("Worker (timers) %i started\n", worker_id); + + /* Wait for other workers to start */ + odp_barrier_wait(&test_global->worker_start); + + while (1) { + odp_packet_t pkt[BURST_SIZE]; + + num = odp_schedule_multi(&queue, ODP_SCHED_NO_WAIT, + ev, BURST_SIZE); + + polls++; + + if (polls == CHECK_PERIOD) { + polls = 0; + if (test_global->stop_workers) + break; + } + + if (num <= 0) + continue; + + tmos = 0; + queue_context = odp_queue_context(queue); + src_pktio = queue_context->src_pktio; + src_queue = queue_context->src_queue; + timer = test_global->timer.timer[src_pktio][src_queue]; + + for (i = 0; i < num; i++) { + if (odp_unlikely(odp_event_type(ev[i]) == + ODP_EVENT_TIMEOUT)) { + tmos++; + ret = odp_timer_set_rel(timer, tick, &ev[i]); + + if (odp_unlikely(ret != ODP_TIMER_SUCCESS)) { + /* Should never happen */ + printf("Expired timer reset failed\n"); + odp_event_free(ev[i]); + } + + if (odp_unlikely(tmos > 1)) { + /* Should never happen */ + printf("Too many timeouts\n"); + } + } else { + pkt[i - tmos] = odp_packet_from_event(ev[i]); + } + } + + if (tmos == 0) { + /* Reset timer with existing timeout event */ + ret = odp_timer_set_rel(timer, tick, NULL); + + if (odp_unlikely(ret != ODP_TIMER_SUCCESS && + ret != ODP_TIMER_TOOEARLY)) { + /* Should never happen. Reset should either + * succeed or be too close to timer expiration + * in which case timeout event will be received + * soon. */ + printf("Timer reset failed %i\n", ret); + } + } + + num = num - tmos; + + if (DEBUG_PRINT) + printf("worker %i: [%i/%i] -> [%i/%i], %i packets " + "%i timeouts\n", + worker_id, + queue_context->src_pktio, + queue_context->src_queue, + queue_context->dst_pktio, + queue_context->dst_queue, num, tmos); + + pktout = queue_context->dst_pktout; + out = queue_context->dst_pktio; + + fill_eth_addr(pkt, num, test_global, out); + + sent = odp_pktout_send(pktout, pkt, num); + + if (odp_unlikely(sent < 0)) + sent = 0; + + drop = num - sent; + + if (odp_unlikely(drop)) + odp_packet_free_multi(&pkt[sent], drop); + + if (odp_unlikely(test_global->opt.collect_stat)) { + test_global->worker_stat[worker_id].rx_pkt += num; + test_global->worker_stat[worker_id].tx_pkt += sent; + } + } + + printf("Worker %i stopped\n", worker_id); + + return 0; +} + static void sig_handler(int signo) { (void)signo; @@ -210,6 +335,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" + " -t, --timeout <number> Flow inactivity timeout (in usec) per packet. Default: 0 (don't use timers)\n" " -s, --stat Collect statistics.\n" " -h, --help Display help and exit.\n\n", NO_PATH(progname)); @@ -224,11 +350,12 @@ 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'}, + {"timeout", required_argument, NULL, 't'}, {"stat", no_argument, NULL, 's'}, {"help", no_argument, NULL, 'h'}, {NULL, 0, NULL, 0} }; - const char *shortopts = "+i:c:q:sh"; + const char *shortopts = "+i:c:q:t:sh"; int ret = 0; memset(test_options, 0, sizeof(test_options_t)); @@ -283,6 +410,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 't': + test_options->timeout_us = atol(optarg); + break; case 's': test_options->collect_stat = 1; break; @@ -382,6 +512,7 @@ static void print_config(test_global_t *test_global) test_global->opt.num_pktio_queue); printf(" collect statistics: %u\n", test_global->opt.collect_stat); + printf(" timeout usec: %li\n", test_global->opt.timeout_us); printf("\n"); } @@ -691,6 +822,178 @@ static int close_pktios(test_global_t *test_global) return ret; } +static int create_timers(test_global_t *test_global) +{ + int num_timer, num_pktio, num_queue, i, j; + odp_pool_t pool; + odp_pool_param_t pool_param; + odp_timer_pool_t timer_pool; + odp_timer_pool_param_t timer_param; + odp_timer_capability_t timer_capa; + odp_timer_t timer; + odp_queue_t queue; + uint64_t res_ns, tick; + uint64_t timeout_ns = 1000 * test_global->opt.timeout_us; + + num_pktio = test_global->opt.num_pktio; + num_queue = test_global->opt.num_pktio_queue; + num_timer = num_pktio * num_queue; + + /* Always init globals for destroy calls */ + test_global->timer.timer_pool = ODP_TIMER_POOL_INVALID; + test_global->timer.timeout_pool = ODP_POOL_INVALID; + + for (i = 0; i < num_pktio; i++) + for (j = 0; j < num_queue; j++) + test_global->timer.timer[i][j] = ODP_TIMER_INVALID; + + /* Timers not used */ + if (test_global->opt.timeout_us == 0) + return 0; + + if (odp_timer_capability(ODP_CLOCK_CPU, &timer_capa)) { + printf("Timer capa failed\n"); + return -1; + } + + res_ns = timeout_ns / 10; + + if (timer_capa.highest_res_ns > res_ns) { + printf("Timeout too short. Min timeout %" PRIu64 " usec\n", + timer_capa.highest_res_ns / 100); + return -1; + } + + memset(&timer_param, 0, sizeof(odp_timer_pool_param_t)); + + timer_param.res_ns = res_ns; + timer_param.min_tmo = timeout_ns; + timer_param.max_tmo = timeout_ns; + timer_param.num_timers = num_timer; + timer_param.clk_src = ODP_CLOCK_CPU; + + timer_pool = odp_timer_pool_create("sched_pktio_timer", &timer_param); + + if (timer_pool == ODP_TIMER_POOL_INVALID) { + printf("Timer pool create failed\n"); + return -1; + } + + test_global->timer.timer_pool = timer_pool; + tick = odp_timer_ns_to_tick(timer_pool, timeout_ns); + test_global->timer.timeout_tick = tick; + + odp_timer_pool_start(); + + for (i = 0; i < num_pktio; i++) { + for (j = 0; j < num_queue; j++) { + queue = test_global->pktio[i].input_queue[j]; + timer = odp_timer_alloc(timer_pool, queue, NULL); + + if (timer == ODP_TIMER_INVALID) { + printf("Timer alloc failed.\n"); + return -1; + } + + test_global->timer.timer[i][j] = timer; + } + } + + odp_pool_param_init(&pool_param); + pool_param.type = ODP_POOL_TIMEOUT; + pool_param.tmo.num = num_timer; + + pool = odp_pool_create("timeout pool", &pool_param); + + if (pool == ODP_POOL_INVALID) { + printf("Timeout pool create failed.\n"); + return -1; + } + + test_global->timer.timeout_pool = pool; + + return 0; +} + +static int start_timers(test_global_t *test_global) +{ + int i, j; + odp_event_t event; + odp_timeout_t timeout; + odp_timer_t timer; + odp_timer_set_t ret; + uint64_t timeout_tick = test_global->timer.timeout_tick; + int num_pktio = test_global->opt.num_pktio; + int num_queue = test_global->opt.num_pktio_queue; + odp_pool_t pool = test_global->timer.timeout_pool; + + /* Timers not used */ + if (test_global->opt.timeout_us == 0) + return 0; + + /* Delay the first timeout so that workers have time to startup */ + timeout_tick += odp_timer_ns_to_tick(test_global->timer.timer_pool, + TIMEOUT_OFFSET_NS); + + for (i = 0; i < num_pktio; i++) { + for (j = 0; j < num_queue; j++) { + timer = test_global->timer.timer[i][j]; + + timeout = odp_timeout_alloc(pool); + if (timeout == ODP_TIMEOUT_INVALID) { + printf("Timeout alloc failed\n"); + return -1; + } + + event = odp_timeout_to_event(timeout); + + ret = odp_timer_set_rel(timer, timeout_tick, &event); + + if (ret != ODP_TIMER_SUCCESS) { + printf("Timer set failed\n"); + return -1; + } + } + } + + return 0; +} + +static void destroy_timers(test_global_t *test_global) +{ + int i, j; + odp_event_t event; + odp_timer_t timer; + int num_pktio = test_global->opt.num_pktio; + int num_queue = test_global->opt.num_pktio_queue; + odp_timer_pool_t timer_pool = test_global->timer.timer_pool; + odp_pool_t pool = test_global->timer.timeout_pool; + + if (timer_pool == ODP_TIMER_POOL_INVALID) + return; + + for (i = 0; i < num_pktio; i++) { + for (j = 0; j < num_queue; j++) { + timer = test_global->timer.timer[i][j]; + + if (timer == ODP_TIMER_INVALID) + break; + + event = odp_timer_free(timer); + + if (event != ODP_EVENT_INVALID) + odp_event_free(event); + } + } + + if (pool != ODP_POOL_INVALID) { + if (odp_pool_destroy(pool)) + printf("Timeout pool destroy failed\n"); + } + + odp_timer_pool_destroy(timer_pool); +} + static void start_workers(odph_odpthread_t thread[], test_global_t *test_global) { @@ -700,7 +1003,12 @@ static void start_workers(odph_odpthread_t thread[], int num = test_global->opt.num_worker; memset(&param, 0, sizeof(odph_odpthread_params_t)); - param.start = worker_thread; + + if (test_global->opt.timeout_us) + param.start = worker_thread_timers; + else + param.start = worker_thread; + param.thr_type = ODP_THREAD_WORKER; param.instance = test_global->instance; @@ -745,8 +1053,11 @@ int main(int argc, char *argv[]) init.not_used.feat.cls = 1; init.not_used.feat.crypto = 1; init.not_used.feat.ipsec = 1; - init.not_used.feat.timer = 1; init.not_used.feat.tm = 1; + init.not_used.feat.timer = 1; + + if (test_options.timeout_us) + init.not_used.feat.timer = 0; /* Init ODP before calling anything else */ if (odp_init_global(&instance, &init, NULL)) { @@ -789,6 +1100,12 @@ int main(int argc, char *argv[]) link_pktios(test_global); + if (create_timers(test_global)) + goto quit; + + if (start_timers(test_global)) + goto quit; + odp_barrier_init(&test_global->worker_start, test_global->opt.num_worker + 1); @@ -813,6 +1130,7 @@ quit: stop_pktios(test_global); empty_queues(); close_pktios(test_global); + destroy_timers(test_global); if (test_global->opt.collect_stat) { print_stat(test_global, odp_time_diff_ns(t2, t1)); commit dea03d0a24117764ea9b8763e640a4836031e82b Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Thu Apr 26 17:13:40 2018 +0300 test: sched_pktio: parse options before odp global init Options can be used to set parameters for odp_init_global(). 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 f03c2911..840fe8da 100644 --- a/test/performance/odp_sched_pktio.c +++ b/test/performance/odp_sched_pktio.c @@ -26,6 +26,15 @@ #define CHECK_PERIOD 10000 #define TEST_PASSED_LIMIT 5000 +typedef struct test_options_t { + int num_worker; + int num_pktio; + int num_pktio_queue; + uint8_t collect_stat; + char pktio_name[MAX_PKTIOS][MAX_PKTIO_NAME + 1]; + +} test_options_t; + typedef struct { int worker_id; void *test_global_ptr; @@ -48,12 +57,7 @@ typedef struct { volatile int stop_workers; odp_barrier_t worker_start; - struct { - int num_worker; - int num_pktio; - int num_pktio_queue; - uint8_t collect_stat; - } opt; + test_options_t opt; int max_workers; odp_cpumask_t cpumask; @@ -66,7 +70,6 @@ typedef struct { uint32_t pkt_num; struct { - char name[MAX_PKTIO_NAME + 1]; odp_pktio_t pktio; int pktio_index; int started; @@ -212,7 +215,7 @@ static void print_usage(const char *progname) NO_PATH(progname)); } -static int parse_options(int argc, char *argv[], test_global_t *test_global) +static int parse_options(int argc, char *argv[], test_options_t *test_options) { int i, opt, long_index; char *name, *str; @@ -228,8 +231,10 @@ static int parse_options(int argc, char *argv[], test_global_t *test_global) const char *shortopts = "+i:c:q:sh"; int ret = 0; - test_global->opt.num_worker = 1; - test_global->opt.num_pktio_queue = 0; + memset(test_options, 0, sizeof(test_options_t)); + + test_options->num_worker = 1; + test_options->num_pktio_queue = 0; /* let helper collect its own arguments (e.g. --odph_proc) */ odph_parse_options(argc, argv, shortopts, longopts); @@ -263,23 +268,23 @@ static int parse_options(int argc, char *argv[], test_global_t *test_global) break; } - name = test_global->pktio[i].name; + name = test_options->pktio_name[i]; memcpy(name, str, len); str += len + 1; i++; } - test_global->opt.num_pktio = i; + test_options->num_pktio = i; break; case 'c': - test_global->opt.num_worker = atoi(optarg); + test_options->num_worker = atoi(optarg); break; case 'q': - test_global->opt.num_pktio_queue = atoi(optarg); + test_options->num_pktio_queue = atoi(optarg); break; case 's': - test_global->opt.collect_stat = 1; + test_options->collect_stat = 1; break; case 'h': print_usage(argv[0]); @@ -291,8 +296,8 @@ static int parse_options(int argc, char *argv[], test_global_t *test_global) } } - if (test_global->opt.num_pktio_queue == 0) - test_global->opt.num_pktio_queue = test_global->opt.num_worker; + if (test_options->num_pktio_queue == 0) + test_options->num_pktio_queue = test_options->num_worker; return ret; } @@ -370,7 +375,7 @@ static void print_config(test_global_t *test_global) " interface names: ", test_global->opt.num_pktio); for (i = 0; i < test_global->opt.num_pktio; i++) - printf(" %s", test_global->pktio[i].name); + printf(" %s", test_global->opt.pktio_name[i]); printf("\n" " queues per interface: %i\n", @@ -462,7 +467,7 @@ static int open_pktios(test_global_t *test_global) /* Open and configure interfaces */ for (i = 0; i < num_pktio; i++) { - name = test_global->pktio[i].name; + name = test_global->opt.pktio_name[i]; pktio = odp_pktio_open(name, pool, &pktio_param); if (pktio == ODP_PKTIO_INVALID) { @@ -605,7 +610,7 @@ static int start_pktios(test_global_t *test_global) for (i = 0; i < test_global->opt.num_pktio; i++) { if (odp_pktio_start(test_global->pktio[i].pktio)) { printf("Error (%s): Pktio start failed.\n", - test_global->pktio[i].name); + test_global->opt.pktio_name[i]); return -1; } @@ -630,7 +635,7 @@ static int stop_pktios(test_global_t *test_global) if (odp_pktio_stop(pktio)) { printf("Error (%s): Pktio stop failed.\n", - test_global->pktio[i].name); + test_global->opt.pktio_name[i]); ret = -1; } } @@ -668,7 +673,7 @@ static int close_pktios(test_global_t *test_global) if (odp_pktio_close(pktio)) { printf("Error (%s): Pktio close failed.\n", - test_global->pktio[i].name); + test_global->opt.pktio_name[i]); ret = -1; } } @@ -727,10 +732,14 @@ int main(int argc, char *argv[]) odp_shm_t shm; odp_time_t t1, t2; odph_odpthread_t thread[MAX_WORKERS]; + test_options_t test_options; int ret = 0; signal(SIGINT, sig_handler); + if (parse_options(argc, argv, &test_options)) + return -1; + /* List features not to be used (may optimize performance) */ odp_init_param_init(&init); init.not_used.feat.cls = 1; @@ -766,8 +775,7 @@ int main(int argc, char *argv[]) test_global->instance = instance; test_global->pool = ODP_POOL_INVALID; - if (parse_options(argc, argv, test_global)) - goto quit; + memcpy(&test_global->opt, &test_options, sizeof(test_options_t)); odp_sys_info_print(); commit 5c745f55a160b0a72d8e493604917a0d63dd71a5 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Thu Apr 26 14:18:57 2018 +0300 test: sched_pktio: ensure packet order per flow Select pktout queue based on input queue, instead of worker id. Packet order is maintained from input to output as each flow is routed always through the same queues. 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 1a16bb50..f03c2911 100644 --- a/test/performance/odp_sched_pktio.c +++ b/test/performance/odp_sched_pktio.c @@ -14,6 +14,7 @@ #include <odp_api.h> #include <odp/helper/odph_api.h> +#define DEBUG_PRINT 0 #define MAX_WORKERS 64 #define MAX_PKTIOS 32 #define MAX_PKTIO_NAME 31 @@ -23,7 +24,6 @@ #define MIN_PKT_SEG_LEN 64 #define BURST_SIZE 32 #define CHECK_PERIOD 10000 -#define MAX_PKTIO_INDEXES 256 #define TEST_PASSED_LIMIT 5000 typedef struct { @@ -36,6 +36,14 @@ typedef struct ODP_ALIGNED_CACHE { uint64_t tx_pkt; } worker_stat_t; +typedef struct queue_context_t { + odp_pktout_queue_t dst_pktout; + uint8_t dst_pktio; + uint8_t dst_queue; + uint8_t src_pktio; + uint8_t src_queue; +} queue_context_t; + typedef struct { volatile int stop_workers; odp_barrier_t worker_start; @@ -65,14 +73,12 @@ typedef struct { odph_ethaddr_t my_addr; odp_queue_t input_queue[MAX_PKTIO_QUEUES]; odp_pktout_queue_t pktout[MAX_PKTIO_QUEUES]; + queue_context_t queue_context[MAX_PKTIO_QUEUES]; } pktio[MAX_PKTIOS]; worker_arg_t worker_arg[MAX_WORKERS]; - /* Maps pktio input index to pktio[] index for output */ - uint8_t pktio_map[MAX_PKTIO_INDEXES]; - worker_stat_t worker_stat[MAX_WORKERS]; uint64_t rx_pkt_sum; uint64_t tx_pkt_sum; @@ -108,8 +114,10 @@ static inline void fill_eth_addr(odp_packet_t pkt[], int num, static int worker_thread(void *arg) { odp_event_t ev[BURST_SIZE]; - int num, sent, drop, in, out; + int num, sent, drop, out; odp_pktout_queue_t pktout; + odp_queue_t queue; + queue_context_t *queue_context; worker_arg_t *worker_arg = arg; test_global_t *test_global = worker_arg->test_global_ptr; int worker_id = worker_arg->worker_id; @@ -123,7 +131,7 @@ static int worker_thread(void *arg) while (1) { odp_packet_t pkt[BURST_SIZE]; - num = odp_schedule_multi(NULL, ODP_SCHED_NO_WAIT, + num = odp_schedule_multi(&queue, ODP_SCHED_NO_WAIT, ev, BURST_SIZE); polls++; @@ -137,11 +145,20 @@ static int worker_thread(void *arg) if (num <= 0) continue; + queue_context = odp_queue_context(queue); + + if (DEBUG_PRINT) + printf("worker %i: [%i/%i] -> [%i/%i], %i packets\n", + worker_id, + queue_context->src_pktio, + queue_context->src_queue, + queue_context->dst_pktio, + queue_context->dst_queue, num); + odp_packet_from_event_multi(pkt, ev, num); - in = odp_packet_input_index(pkt[0]); - out = test_global->pktio_map[in]; - pktout = test_global->pktio[out].pktout[worker_id]; + pktout = queue_context->dst_pktout; + out = queue_context->dst_pktio; fill_eth_addr(pkt, num, test_global, out); @@ -307,12 +324,6 @@ static int config_setup(test_global_t *test_global) return -1; } - if (MAX_PKTIO_INDEXES <= odp_pktio_max_index()) { - printf("Error: Larger pktio_map[] table needed: %u\n", - odp_pktio_max_index()); - return -1; - } - if (odp_pool_capability(&pool_capa)) { printf("Error: Pool capability failed.\n"); return -1; @@ -420,6 +431,7 @@ static int open_pktios(test_global_t *test_global) unsigned int num_queue; char *name; int i, num_pktio, ret; + unsigned int j; num_pktio = test_global->opt.num_pktio; num_queue = test_global->opt.num_pktio_queue; @@ -518,6 +530,21 @@ static int open_pktios(test_global_t *test_global) return -1; } + for (j = 0; j < num_queue; j++) { + odp_queue_t queue; + void *ctx; + uint32_t len = sizeof(queue_context_t); + + queue = test_global->pktio[i].input_queue[j]; + ctx = &test_global->pktio[i].queue_context[j]; + + if (odp_queue_context_set(queue, ctx, len)) { + printf("Error (%s): Queue ctx set failed.\n", + name); + return -1; + } + } + odp_pktout_queue_param_init(&pktout_param); pktout_param.num_queues = num_queue; pktout_param.op_mode = ODP_PKTIO_OP_MT_UNSAFE; @@ -542,20 +569,30 @@ static int open_pktios(test_global_t *test_global) static void link_pktios(test_global_t *test_global) { int i, num_pktio, input, output; + int num_queue; + odp_pktout_queue_t pktout; + queue_context_t *ctx; num_pktio = test_global->opt.num_pktio; + num_queue = test_global->opt.num_pktio_queue; printf("Forwarding table (pktio indexes)\n"); /* If single interface loopback, otherwise forward to the next * interface. */ - for (i = 0; i < num_pktio; i++) { - input = test_global->pktio[i].pktio_index; - output = (i + 1) % num_pktio; - test_global->pktio_map[input] = output; - printf(" input %i, output %i\n", - input, - test_global->pktio[output].pktio_index); + for (input = 0; input < num_pktio; input++) { + output = (input + 1) % num_pktio; + printf(" input %i, output %i\n", input, output); + + for (i = 0; i < num_queue; i++) { + ctx = &test_global->pktio[input].queue_context[i]; + pktout = test_global->pktio[output].pktout[i]; + ctx->dst_pktout = pktout; + ctx->dst_pktio = output; + ctx->dst_queue = i; + ctx->src_pktio = input; + ctx->src_queue = i; + } } printf("\n"); commit 15a30694560ba62160fa3a8ffddeb51b800e351a Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Thu Apr 26 14:50:39 2018 +0300 test: sched_pktio: add pktio queue count option Added option for selecting number of input / output queues per pktio interface. For simplicity, the same number of queues is configured for all interfaces and both (input / output) directions. 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 16d14b19..1a16bb50 100644 --- a/test/performance/odp_sched_pktio.c +++ b/test/performance/odp_sched_pktio.c @@ -43,6 +43,7 @@ typedef struct { struct { int num_worker; int num_pktio; + int num_pktio_queue; uint8_t collect_stat; } opt; @@ -56,9 +57,6 @@ typedef struct { uint32_t pkt_len; uint32_t pkt_num; - unsigned int num_input_queues; - unsigned int num_output_queues; - struct { char name[MAX_PKTIO_NAME + 1]; odp_pktio_t pktio; @@ -189,10 +187,11 @@ static void print_usage(const char *progname) "Usage: %s [options]\n" "\n" "OPTIONS:\n" - " -i, --interface <name> Packet IO interfaces (comma-separated, no spaces)\n" - " -c, --count <number> Worker thread count. Default: 1\n" - " -s, --stat Collect statistics.\n" - " -h, --help Display help and exit.\n\n", + " -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" + " -s, --stat Collect statistics.\n" + " -h, --help Display help and exit.\n\n", NO_PATH(progname)); } @@ -203,15 +202,17 @@ static int parse_options(int argc, char *argv[], test_global_t *test_global) int len, str_len; const struct option longopts[] = { {"interface", required_argument, NULL, 'i'}, - {"count", required_argument, NULL, 'c'}, + {"num_cpu", required_argument, NULL, 'c'}, + {"num_queue", required_argument, NULL, 'q'}, {"stat", no_argument, NULL, 's'}, {"help", no_argument, NULL, 'h'}, {NULL, 0, NULL, 0} }; - const char *shortopts = "+i:c:sh"; + const char *shortopts = "+i:c:q:sh"; int ret = 0; test_global->opt.num_worker = 1; + test_global->opt.num_pktio_queue = 0; /* let helper collect its own arguments (e.g. --odph_proc) */ odph_parse_options(argc, argv, shortopts, longopts); @@ -257,6 +258,9 @@ static int parse_options(int argc, char *argv[], test_global_t *test_global) case 'c': test_global->opt.num_worker = atoi(optarg); break; + case 'q': + test_global->opt.num_pktio_queue = atoi(optarg); + break; case 's': test_global->opt.collect_stat = 1; break; @@ -270,6 +274,9 @@ static int parse_options(int argc, char *argv[], test_global_t *test_global) } } + if (test_global->opt.num_pktio_queue == 0) + test_global->opt.num_pktio_queue = test_global->opt.num_worker; + return ret; } @@ -323,12 +330,6 @@ static int config_setup(test_global_t *test_global) test_global->pkt_len = pkt_len; test_global->pkt_num = pkt_num; - if (test_global->num_input_queues == 0) - test_global->num_input_queues = test_global->opt.num_worker; - - if (test_global->num_output_queues == 0) - test_global->num_output_queues = test_global->opt.num_worker; - return 0; } @@ -361,9 +362,8 @@ static void print_config(test_global_t *test_global) printf(" %s", test_global->pktio[i].name); printf("\n" - " num input queues: %i\n" - " num output queues: %i\n", - test_global->num_input_queues, test_global->num_output_queues); + " queues per interface: %i\n", + test_global->opt.num_pktio_queue); printf(" collect statistics: %u\n", test_global->opt.collect_stat); @@ -417,13 +417,12 @@ static int open_pktios(test_global_t *test_global) odp_pktin_queue_param_t pktin_param; odp_pktout_queue_param_t pktout_param; odp_schedule_sync_t sched_sync; - unsigned int num_input, num_output; + unsigned int num_queue; char *name; int i, num_pktio, ret; - num_pktio = test_global->opt.num_pktio; - num_input = test_global->num_input_queues; - num_output = test_global->num_output_queues; + num_pktio = test_global->opt.num_pktio; + num_queue = test_global->opt.num_pktio_queue; odp_pool_param_init(&pool_param); pool_param.pkt.seg_len = MIN_PKT_SEG_LEN; @@ -477,15 +476,15 @@ static int open_pktios(test_global_t *test_global) return -1; } - if (num_input > pktio_capa.max_input_queues) { + if (num_queue > pktio_capa.max_input_queues) { printf("Error (%s): Too many input queues: %u\n", - name, num_input); + name, num_queue); return -1; } - if (num_output > pktio_capa.max_output_queues) { + if (num_queue > pktio_capa.max_output_queues) { printf("Error (%s): Too many output queues: %u\n", - name, num_output); + name, num_queue); return -1; } @@ -500,12 +499,12 @@ static int open_pktios(test_global_t *test_global) pktin_param.queue_param.sched.sync = sched_sync; pktin_param.queue_param.sched.group = ODP_SCHED_GROUP_ALL; - if (num_input > 1) { + if (num_queue > 1) { pktin_param.hash_enable = 1; pktin_param.hash_proto.proto.ipv4_udp = 1; } - pktin_param.num_queues = num_input; + pktin_param.num_queues = num_queue; if (odp_pktin_queue_config(pktio, &pktin_param)) { printf("Error (%s): Pktin config failed.\n", name); @@ -514,13 +513,13 @@ static int open_pktios(test_global_t *test_global) if (odp_pktin_event_queue(pktio, test_global->pktio[i].input_queue, - num_input) != (int)num_input) { + num_queue) != (int)num_queue) { printf("Error (%s): Input queue query failed.\n", name); return -1; } odp_pktout_queue_param_init(&pktout_param); - pktout_param.num_queues = num_output; + pktout_param.num_queues = num_queue; pktout_param.op_mode = ODP_PKTIO_OP_MT_UNSAFE; if (odp_pktout_queue_config(pktio, &pktout_param)) { @@ -530,7 +529,7 @@ static int open_pktios(test_global_t *test_global) if (odp_pktout_queue(pktio, test_global->pktio[i].pktout, - num_output) != (int)num_output) { + num_queue) != (int)num_queue) { printf("Error (%s): Output queue query failed.\n", name); return -1; commit 27a84cdfc0dfb82e3b86067e473658c091377892 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Fri Apr 27 12:50:52 2018 +0300 linux-gen: timer: set and check highest resolution When using inline_timers, highest resolution was left to 0 ns and was checked to be non-zero. In practice, few nanosecond resolution is not needed or practical. Limit highest supported resolution to 500 ns. 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_timer.c b/platform/linux-generic/odp_timer.c index a445a57b..37d0304c 100644 --- a/platform/linux-generic/odp_timer.c +++ b/platform/linux-generic/odp_timer.c @@ -76,7 +76,7 @@ static _odp_atomic_flag_t locks[NUM_LOCKS]; /* Multiple locks per cache line! */ #endif /* Max timer resolution in nanoseconds */ -static uint64_t highest_res_ns; +static uint64_t highest_res_ns = 500; static uint64_t min_res_ns = INT64_MAX; /****************************************************************************** @@ -1077,13 +1077,10 @@ int odp_timer_capability(odp_timer_clk_src_t clk_src, return ret; } -odp_timer_pool_t -odp_timer_pool_create(const char *name, - const odp_timer_pool_param_t *param) +odp_timer_pool_t odp_timer_pool_create(const char *name, + const odp_timer_pool_param_t *param) { - /* Verify that buffer pool can be used for timeouts */ - /* Verify that we have a valid (non-zero) timer resolution */ - if (param->res_ns == 0) { + if (param->res_ns < highest_res_ns) { __odp_errno = EINVAL; return ODP_TIMER_POOL_INVALID; } ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/odp_timer.c | 11 +- test/performance/odp_sched_pktio.c | 510 +++++++++++++++++++++++++++++++------ 2 files changed, 440 insertions(+), 81 deletions(-) hooks/post-receive --

7 years, 1 month

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

git-lng-odp