git-lng-odp April 2018

git-lng-odp@lists.linaro.org

1 participants
37 discussions

[COMMIT] branch master updated. v1.18.0.1_tigermoth_rc3-53-gb7ee13d7

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 b7ee13d765e5d8da1ef68f0c0777cb5e40fffbf7 (commit) via a2cad95118b79f204bc13914acf43a8fc1dd2682 (commit) from a5340c53957b3174c89d03ecf2c61e9ba98ac57c (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 b7ee13d765e5d8da1ef68f0c0777cb5e40fffbf7 Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Mon Apr 2 13:57:40 2018 +0300 shippable: reenable clang with disable abi compat options Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> diff --git a/.shippable.yml b/.shippable.yml index 6ef5cab7..53e094bc 100644 --- a/.shippable.yml +++ b/.shippable.yml @@ -15,11 +15,6 @@ env: # - CROSS_ARCH="powerpc" # - CROSS_ARCH="i386" -matrix: - exclude: - - compiler: clang - env: CONF="--disable-abi-compat --disable-test-perf --disable-test-perf-proc" - build: pre_ci: # use Dockerfile to install additional CI dependencies commit a2cad95118b79f204bc13914acf43a8fc1dd2682 Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Mon Apr 16 21:50:11 2018 +0300 linux-gen: fix clang on aarch64 build No code change. Just move array definition several lines up to make clang happy to generate valid code. Fixes: https://bugs.linaro.org/show_bug.cgi?id=3611 Suggested-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)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_pool.c b/platform/linux-generic/odp_pool.c index 998fc649..955e14f9 100644 --- a/platform/linux-generic/odp_pool.c +++ b/platform/linux-generic/odp_pool.c @@ -718,12 +718,13 @@ int buffer_alloc_multi(pool_t *pool, odp_buffer_hdr_t *buf_hdr[], int max_num) buf_hdr[i] = buf_hdr_from_index(pool, cache->buf_index[j]); } + /* Declare variable here to fix clang compilation bug */ + uint32_t data[burst]; + /* If needed, get more from the global pool */ if (odp_unlikely(num_deq)) { - /* Temporary copy needed since odp_buffer_t is uintptr_t - * and not uint32_t. */ - uint32_t data[burst]; - + /* Temporary copy to data[] needed since odp_buffer_t is + * uintptr_t and not uint32_t. */ ring = &pool->ring->hdr; mask = pool->ring_mask; burst = ring_deq_multi(ring, mask, data, burst); ----------------------------------------------------------------------- Summary of changes: .shippable.yml | 5 ----- platform/linux-generic/odp_pool.c | 9 +++++---- 2 files changed, 5 insertions(+), 9 deletions(-) hooks/post-receive --

6 years, 10 months

[COMMIT] branch master updated. v1.18.0.1_tigermoth_rc3-51-ga5340c53

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 a5340c53957b3174c89d03ecf2c61e9ba98ac57c (commit) from 813cd2df67ae0591b0f792eff82854c5c9c642ca (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 a5340c53957b3174c89d03ecf2c61e9ba98ac57c Author: Matias Elo <matias.elo(a)nokia.com> Date: Thu Apr 12 13:12:12 2018 +0300 linux-gen: dpdk: allocate huge page memory for all numa nodes Allocate DPDK memory for all numa nodes in the system. Fixes bug: https://bugs.linaro.org/show_bug.cgi?id=3657 Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c index 7bccab87..0550416b 100644 --- a/platform/linux-generic/pktio/dpdk.c +++ b/platform/linux-generic/pktio/dpdk.c @@ -49,6 +49,13 @@ #include <rte_string_fns.h> #include <rte_version.h> +/* NUMA is not supported on all platforms */ +#ifdef RTE_EAL_NUMA_AWARE_HUGEPAGES +#include <numa.h> +#else +#define numa_num_configured_nodes() 1 +#endif + #if RTE_VERSION < RTE_VERSION_NUM(17, 5, 0, 0) #define rte_log_set_global_level rte_set_log_level #endif @@ -1086,6 +1093,7 @@ static int dpdk_pktio_init(void) int32_t masklen; int mem_str_len; int cmd_len; + int numa_nodes; cpu_set_t original_cpuset; struct rte_config *cfg; @@ -1120,21 +1128,29 @@ static int dpdk_pktio_init(void) return -1; } - mem_str_len = snprintf(NULL, 0, "%d", DPDK_MEMORY_MB); + mem_str_len = snprintf(NULL, 0, "%d,", DPDK_MEMORY_MB); + numa_nodes = numa_num_configured_nodes(); + + char mem_str[mem_str_len * numa_nodes]; + + for (i = 0; i < numa_nodes; i++) + sprintf(&mem_str[i * mem_str_len], "%d,", DPDK_MEMORY_MB); + mem_str[mem_str_len * numa_nodes - 1] = '\0'; cmdline = getenv("ODP_PKTIO_DPDK_PARAMS"); if (cmdline == NULL) cmdline = ""; /* masklen includes the terminating null as well */ - cmd_len = strlen("odpdpdk -c -m ") + masklen + mem_str_len + - strlen(cmdline) + strlen(" "); + cmd_len = strlen("odpdpdk -c --socket-mem ") + masklen + + strlen(mem_str) + strlen(cmdline) + strlen(" "); char full_cmd[cmd_len]; /* first argument is facility log, simply bind it to odpdpdk for now.*/ - cmd_len = snprintf(full_cmd, cmd_len, "odpdpdk -c %s -m %d %s", - mask_str, DPDK_MEMORY_MB, cmdline); + cmd_len = snprintf(full_cmd, cmd_len, + "odpdpdk -c %s --socket-mem %s %s", mask_str, + mem_str, cmdline); for (i = 0, dpdk_argc = 1; i < cmd_len; ++i) { if (isspace(full_cmd[i])) ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/pktio/dpdk.c | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) hooks/post-receive --

6 years, 10 months

[COMMIT] branch master updated. v1.18.0.1_tigermoth_rc3-50-g813cd2df

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 813cd2df67ae0591b0f792eff82854c5c9c642ca (commit) via 48f8503baf847315dda6609abc01f5befe6e0284 (commit) via b1100fdba29d8f514236dbcfd6f17e7941c0256a (commit) via f96a21992e13cf401a3494f2caeec9d42f56f0d9 (commit) via 1e925d0ccc7340575ddcfa07ab7bd372d751e006 (commit) from c9d31f30ba4fd7818b4ba2ffd7bbaea74761a2d9 (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 813cd2df67ae0591b0f792eff82854c5c9c642ca Author: Bill Fischofer <bill.fischofer(a)linaro.org> Date: Mon Apr 9 09:49:56 2018 -0500 example: l2fwd: update readme regarding ordered queue usage Update the README file to clarify the effect of using ordered queues with direct I/O or output interfaces supporting multiple queues. Signed-off-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Janne Peltonen <janne.peltonen(a)nokia.com> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/example/l2fwd/README b/example/l2fwd/README index f6fdc01c..091d046e 100644 --- a/example/l2fwd/README +++ b/example/l2fwd/README @@ -5,3 +5,10 @@ Source code and Makefiles placed under test/performance/ directory. This L2 forwarding application can be used as example reference as well as performance test for different odp modes (direct, queue or scheduler with parallel, atomic or ordered queues). + +Note that this example is tuned for performance. As a result, when using +scheduled mode with direct packet I/O output or queued output with multiple +output queues, packet order is not guaranteed. To achieve guaranteed order, +use a single worker thread or output interfaces with single output +queues. Other examples of scalable processing using ordered queues that +preserve order can be seen in the odp_pktio_ordered performance test. commit 48f8503baf847315dda6609abc01f5befe6e0284 Author: Josep Puigdemont <josep.puigdemont(a)linaro.org> Date: Mon Apr 9 13:45:25 2018 +0200 fdserver: change session ID after fork This is to avoid the fdserver process from handling signals sent to the process group. This patch partly fixes: https://bugs.linaro.org/show_bug.cgi?id=3690 Signed-off-by: Josep Puigdemont <josep.puigdemont(a)linaro.org> Suggested-by: Janne Peltonen <janne.peltonen(a)nokia.com> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/odp_fdserver.c b/platform/linux-generic/odp_fdserver.c index a06fb508..9562ea0c 100644 --- a/platform/linux-generic/odp_fdserver.c +++ b/platform/linux-generic/odp_fdserver.c @@ -654,6 +654,12 @@ int _odp_fdserver_init_global(void) /* orphans being "adopted" by the init process... */ prctl(PR_SET_PDEATHSIG, SIGTERM); + res = setsid(); + if (res == -1) { + ODP_ERR("Could not setsid()"); + exit(1); + } + /* allocate the space for the file descriptor<->key table: */ fd_table = malloc(FDSERVER_MAX_ENTRIES * sizeof(fdentry_t)); if (!fd_table) { commit b1100fdba29d8f514236dbcfd6f17e7941c0256a Author: Josep Puigdemont <josep.puigdemont(a)linaro.org> Date: Thu Apr 12 14:07:30 2018 +0200 linux-gen: shm: be consistent with rest of the code We should be consistent and use new_block as in the rest of the function, instead of accessing the array of blocks using an index. Signed-off-by: Josep Puigdemont <josep.puigdemont(a)linaro.org> Signed-off-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/odp_ishm.c b/platform/linux-generic/odp_ishm.c index 282c39e8..a1a90424 100644 --- a/platform/linux-generic/odp_ishm.c +++ b/platform/linux-generic/odp_ishm.c @@ -566,7 +566,7 @@ static void *do_map(int block_index, uint64_t len, uint32_t align, } return NULL; } - ishm_tbl->block[block_index].fragment = fragment; + new_block->fragment = fragment; } /* try to mmap: */ commit f96a21992e13cf401a3494f2caeec9d42f56f0d9 Author: Josep Puigdemont <josep.puigdemont(a)linaro.org> Date: Thu Apr 12 13:49:00 2018 +0200 linux-gen: shm: do not close provided file descriptors If we provide a file descriptor to _odp_ishm_reserve, this function should not close them. It's the responsibility of the caller to decide what to do with the file descriptor if the return value indicates an error. Signed-off-by: Josep Puigdemont <josep.puigdemont(a)linaro.org> Signed-off-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/odp_ishm.c b/platform/linux-generic/odp_ishm.c index 18255678..282c39e8 100644 --- a/platform/linux-generic/odp_ishm.c +++ b/platform/linux-generic/odp_ishm.c @@ -831,7 +831,6 @@ int _odp_ishm_reserve(const char *name, uint64_t size, int fd, /* If a file descriptor is provided, get the real size and map: */ if (fd >= 0) { if (fstat(fd, &statbuf) < 0) { - close(fd); odp_spinlock_unlock(&ishm_tbl->lock); ODP_ERR("_ishm_reserve failed (fstat failed: %s).\n", strerror(errno)); @@ -844,7 +843,6 @@ int _odp_ishm_reserve(const char *name, uint64_t size, int fd, * page is determined by the provided file descriptor: */ addr = do_map(new_index, len, align, flags, EXTERNAL, &fd); if (addr == NULL) { - close(fd); odp_spinlock_unlock(&ishm_tbl->lock); ODP_ERR("_ishm_reserve failed.\n"); return -1; commit 1e925d0ccc7340575ddcfa07ab7bd372d751e006 Author: Josep Puigdemont <josep.puigdemont(a)linaro.org> Date: Thu Apr 12 13:53:48 2018 +0200 linux-gen: shm: fill data used in do_map before the call do_map() checks the block's external_fd field to find out whether the file descriptor provided was allocated externally or not, before closing it in case an error occurred. However, this field was only updated _after_ calling the do_map() function. Fix this. Signed-off-by: Josep Puigdemont <josep.puigdemont(a)linaro.org> Signed-off-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/odp_ishm.c b/platform/linux-generic/odp_ishm.c index 5f5e5eef..18255678 100644 --- a/platform/linux-generic/odp_ishm.c +++ b/platform/linux-generic/odp_ishm.c @@ -839,6 +839,7 @@ int _odp_ishm_reserve(const char *name, uint64_t size, int fd, return -1; } len = statbuf.st_size; + new_block->external_fd = 1; /* note that the huge page flag is meningless here as huge * page is determined by the provided file descriptor: */ addr = do_map(new_index, len, align, flags, EXTERNAL, &fd); @@ -849,7 +850,6 @@ int _odp_ishm_reserve(const char *name, uint64_t size, int fd, return -1; } new_block->huge = EXTERNAL; - new_block->external_fd = 1; } else { new_block->external_fd = 0; } ----------------------------------------------------------------------- Summary of changes: example/l2fwd/README | 7 +++++++ platform/linux-generic/odp_fdserver.c | 6 ++++++ platform/linux-generic/odp_ishm.c | 6 ++---- 3 files changed, 15 insertions(+), 4 deletions(-) hooks/post-receive --

6 years, 10 months

[COMMIT] branch master updated. v1.18.0.1_tigermoth_rc3-45-gc9d31f30

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 c9d31f30ba4fd7818b4ba2ffd7bbaea74761a2d9 (commit) from cabee48a54a68f333569ee1904bc04d53da7c9c6 (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 c9d31f30ba4fd7818b4ba2ffd7bbaea74761a2d9 Author: Juha-Matti Tilli <juha-matti.tilli(a)iki.fi> Date: Mon Apr 9 19:59:46 2018 +0300 linux-gen: netmap: ring configuration for VALE Configure ring for VALE. On my test laptop, this may increase odp_l2fwd performance from 1.9 MPPS to 2.3 MPPS, so it gives over 20% more performance. Signed-off-by: Juha-Matti Tilli <juha-matti.tilli(a)iki.fi> Reviewed-and-tested-by: Matias Elo <matias.elo(a)nokia.com> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/config/odp-linux-generic.conf b/config/odp-linux-generic.conf index 0034c64b..f5f21b45 100644 --- a/config/odp-linux-generic.conf +++ b/config/odp-linux-generic.conf @@ -31,6 +31,15 @@ pktio_dpdk: { } } +# netmap pktio options +pktio_netmap: { + # Interface specific options + virt: { + nr_rx_slots = 0 + nr_tx_slots = 0 + } +} + queue_basic: { # Maximum queue size. Value must be a power of two. max_queue_size = 8192 diff --git a/platform/linux-generic/include/odp_packet_netmap.h b/platform/linux-generic/include/odp_packet_netmap.h index bb81f5f8..bd3efdcf 100644 --- a/platform/linux-generic/include/odp_packet_netmap.h +++ b/platform/linux-generic/include/odp_packet_netmap.h @@ -19,6 +19,12 @@ #define NM_MAX_DESC 64 +/** netmap runtime configuration options */ +typedef struct { + int nr_rx_slots; + int nr_tx_slots; +} netmap_opt_t; + /** Ring for mapping pktin/pktout queues to netmap descriptors */ struct netmap_ring_t { unsigned first; /**< Index of first netmap descriptor */ @@ -61,6 +67,7 @@ typedef struct { netmap_ring_t rx_desc_ring[PKTIO_MAX_QUEUES]; /** mapping of pktout queues to netmap tx descriptors */ netmap_ring_t tx_desc_ring[PKTIO_MAX_QUEUES]; + netmap_opt_t opt; /**< options */ } pkt_netmap_t; #endif diff --git a/platform/linux-generic/pktio/netmap.c b/platform/linux-generic/pktio/netmap.c index 4276d4bc..835d81eb 100644 --- a/platform/linux-generic/pktio/netmap.c +++ b/platform/linux-generic/pktio/netmap.c @@ -27,6 +27,8 @@ #include <odp_classification_datamodel.h> #include <odp_classification_inlines.h> #include <odp_classification_internal.h> +#include <odp_libconfig_internal.h> + #include <inttypes.h> @@ -46,6 +48,49 @@ static int disable_pktio; /** !0 this pktio disabled, 0 enabled */ static int netmap_stats_reset(pktio_entry_t *pktio_entry); +static int lookup_opt(const char *opt_name, const char *drv_name, int *val) +{ + const char *base = "pktio_netmap"; + int ret; + + ret = _odp_libconfig_lookup_ext_int(base, drv_name, opt_name, val); + if (ret == 0) + ODP_ERR("Unable to find netmap configuration option: %s\n", + opt_name); + + return ret; +} + +static int init_options(pktio_entry_t *pktio_entry) +{ + netmap_opt_t *opt = &pktio_entry->s.pkt_nm.opt; + + if (!lookup_opt("nr_rx_slots", "virt", + &opt->nr_rx_slots)) + return -1; + if (opt->nr_rx_slots < 0 || + opt->nr_rx_slots > 4096) { + ODP_ERR("Invalid number of RX slots\n"); + return -1; + } + + if (!lookup_opt("nr_tx_slots", "virt", + &opt->nr_tx_slots)) + return -1; + if (opt->nr_tx_slots < 0 || + opt->nr_tx_slots > 4096) { + ODP_ERR("Invalid number of TX slots\n"); + return -1; + } + + ODP_PRINT("netmap interface: %s\n", + pktio_entry->s.pkt_nm.if_name); + ODP_PRINT(" num_rx_desc: %d\n", opt->nr_rx_slots); + ODP_PRINT(" num_tx_desc: %d\n", opt->nr_tx_slots); + + return 0; +} + static int netmap_do_ioctl(pktio_entry_t *pktio_entry, unsigned long cmd, int subcmd) { @@ -363,6 +408,12 @@ static int netmap_open(odp_pktio_t id ODP_UNUSED, pktio_entry_t *pktio_entry, netdev); snprintf(pkt_nm->if_name, sizeof(pkt_nm->if_name), "%s", netdev); + /* Initialize runtime options */ + if (init_options(pktio_entry)) { + ODP_ERR("Initializing runtime options failed\n"); + return -1; + } + /* Dummy open here to check if netmap module is available and to read * capability info. */ desc = nm_open(pkt_nm->nm_name, NULL, 0, NULL); @@ -526,6 +577,12 @@ static int netmap_start(pktio_entry_t *pktio_entry) base_desc.self = &base_desc; base_desc.mem = NULL; + if (pktio_entry->s.pkt_nm.is_virtual) { + base_desc.req.nr_rx_slots = + pktio_entry->s.pkt_nm.opt.nr_rx_slots; + base_desc.req.nr_tx_slots = + pktio_entry->s.pkt_nm.opt.nr_tx_slots; + } base_desc.req.nr_ringid = 0; if ((base_desc.req.nr_flags & NR_REG_MASK) == NR_REG_ALL_NIC || (base_desc.req.nr_flags & NR_REG_MASK) == NR_REG_ONE_NIC) { @@ -539,6 +596,8 @@ static int netmap_start(pktio_entry_t *pktio_entry) /* Only the first rx descriptor does mmap */ desc_ring = pkt_nm->rx_desc_ring; flags = NM_OPEN_IFNAME | NETMAP_NO_TX_POLL; + if (pktio_entry->s.pkt_nm.is_virtual) + flags |= NM_OPEN_RING_CFG; desc_ring[0].s.desc[0] = nm_open(pkt_nm->nm_name, NULL, flags, &base_desc); if (desc_ring[0].s.desc[0] == NULL) { @@ -547,6 +606,8 @@ static int netmap_start(pktio_entry_t *pktio_entry) } /* Open rest of the rx descriptors (one per netmap ring) */ flags = NM_OPEN_IFNAME | NETMAP_NO_TX_POLL | NM_OPEN_NO_MMAP; + if (pktio_entry->s.pkt_nm.is_virtual) + flags |= NM_OPEN_RING_CFG; for (i = 0; i < pktio_entry->s.num_in_queue; i++) { for (j = desc_ring[i].s.first; j <= desc_ring[i].s.last; j++) { if (i == 0 && j == 0) { /* First already opened */ @@ -568,6 +629,8 @@ static int netmap_start(pktio_entry_t *pktio_entry) /* Open tx descriptors */ desc_ring = pkt_nm->tx_desc_ring; flags = NM_OPEN_IFNAME | NM_OPEN_NO_MMAP; + if (pktio_entry->s.pkt_nm.is_virtual) + flags |= NM_OPEN_RING_CFG; if ((base_desc.req.nr_flags & NR_REG_MASK) == NR_REG_ALL_NIC) { base_desc.req.nr_flags &= ~NR_REG_ALL_NIC; ----------------------------------------------------------------------- Summary of changes: config/odp-linux-generic.conf | 9 ++++ platform/linux-generic/include/odp_packet_netmap.h | 7 +++ platform/linux-generic/pktio/netmap.c | 63 ++++++++++++++++++++++ 3 files changed, 79 insertions(+) hooks/post-receive --

6 years, 10 months

[COMMIT] branch master updated. v1.18.0.1_tigermoth_rc3-44-gcabee48a

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 cabee48a54a68f333569ee1904bc04d53da7c9c6 (commit) via 183ce9babe20e161caef6b55eccfd043b334f748 (commit) via 0fa9977e21010f963892f59a75f03e3ba800bc74 (commit) via b0b07f403ffc22349ac8dd75f47238bea40891be (commit) via bd0377ae95427e80f04b0dd5f3a8dcb0b1ab89e3 (commit) via 5555878edbda765134fbe50f3181f409963037ea (commit) via 009dab38672eaf8ab6eddc551da41a84e86915a5 (commit) from 290decaf3259b036c3a402be428b04ba100f0f81 (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 cabee48a54a68f333569ee1904bc04d53da7c9c6 Author: Bill Fischofer <bill.fischofer(a)linaro.org> Date: Sun Apr 8 16:36:23 2018 -0500 doc: userguide: add pktio capability and config info Update PktIO section of Users Guide to cover pktio capability and input/output/parser configuration features. Signed-off-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Josep Puigdemont <josep.puigdemont(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/doc/users-guide/users-guide-pktio.adoc b/doc/users-guide/users-guide-pktio.adoc index 79d6b1a2..73d6e048 100644 --- a/doc/users-guide/users-guide-pktio.adoc +++ b/doc/users-guide/users-guide-pktio.adoc @@ -132,6 +132,304 @@ use for packet allocation if not overridden by the classifier due to a specific or default Class-of-Service (CoS) match on the packet. The *param* struct, in turn, specifies the input and output *modes* of the PktIO. +=== PktIO Capabilities and PktIn/PktOut Configuration +Associated with each PktIO is a set of _capabilities_ that provide information +such as the maximum number of input/output queues it supports, its configuration +options, and the operations is supports. These are aggregated into +the struct: +[source,c] +----- +/** + * Packet IO capabilities + */ +typedef struct odp_pktio_capability_t { + /** Maximum number of input queues */ + unsigned max_input_queues; + + /** Maximum number of output queues */ + unsigned max_output_queues; + + /** Supported pktio configuration options */ + odp_pktio_config_t config; + + /** Supported set operations + * + * A bit set to one indicates a supported operation. All other bits are + * set to zero. */ + odp_pktio_set_op_t set_op; + + /** @deprecated Use enable_loop inside odp_pktin_config_t */ + odp_bool_t ODP_DEPRECATE(loop_supported); +} odp_pktio_capability_t; +----- +That is returned by the `odp_pktio_capability()` API. This returns the +limits and default values for these capabilities which can in turn be set +via the `odp_pktio_config()` API, which takes as input the struct: +[source,c] +----- +/** + * Packet IO configuration options + * + * Packet IO interface level configuration options. Use odp_pktio_capability() + * to see which options are supported by the implementation. + * Use odp_pktio_config_init() to initialize the structure with default values. + */ +typedef struct odp_pktio_config_t { + /** Packet input configuration options bit field + * + * Default value for all bits is zero. */ + odp_pktin_config_opt_t pktin; + + /** Packet output configuration options bit field + * + * Default value for all bits is zero. */ + odp_pktout_config_opt_t pktout; + + /** Packet input parser configuration */ + odp_pktio_parser_config_t parser; + + /** Interface loopback mode + * + * In this mode the packets sent out through the interface is + * looped back to input of the same interface. Supporting loopback mode + * is an optional feature per interface and should be queried in the + * interface capability before enabling the same. */ + odp_bool_t enable_loop; + + /** Inbound IPSEC inlined with packet input + * + * Enable/disable inline inbound IPSEC operation. When enabled packet + * input directs all IPSEC packets automatically to IPSEC inbound + * processing. IPSEC configuration is done through the IPSEC API. + * Packets that are not (recognized as) IPSEC are processed + * according to the packet input configuration. + * + * 0: Disable inbound IPSEC inline operation (default) + * 1: Enable inbound IPSEC inline operation + * + * @see odp_ipsec_config(), odp_ipsec_sa_create() + */ + odp_bool_t inbound_ipsec; + + /** Outbound IPSEC inlined with packet output + * + * Enable/disable inline outbound IPSEC operation. When enabled IPSEC + * outbound processing can send outgoing IPSEC packets directly + * to the pktio interface for output. IPSEC configuration is done + * through the IPSEC API. + * + * Outbound IPSEC inline operation cannot be combined with traffic + * manager (ODP_PKTOUT_MODE_TM). + * + * 0: Disable outbound IPSEC inline operation (default) + * 1: Enable outbound IPSEC inline operation + * + * @see odp_ipsec_config(), odp_ipsec_sa_create() + */ + odp_bool_t outbound_ipsec; + +} odp_pktio_config_t; +----- +The IPsec related configurations will be discussed later in the IPsec chapter, +but for now we'll focus on the PktIn/PktOut configuration and the +parser configuration. + +==== PktIn Configuration +For PktIOs that will receive packets, the `odp_pktin_config_opt_t` struct +controls RX processing to be performed on these packets as they are received: +[source,c] +----- +/** + * Packet input configuration options bit field + * + * Packet input configuration options listed in a bit field structure. Packet + * input timestamping may be enabled for all packets or at least for those that + * belong to time synchronization protocol (PTP). + * + * Packet input checksum checking may be enabled or disabled. When it is + * enabled, implementation will attempt to verify checksum correctness on + * incoming packets and depending on drop configuration either deliver erroneous + * packets with appropriate flags set (e.g. odp_packet_has_l3_error(), + * odp_packet_l3_chksum_status()) or drop those. When packet dropping is + * enabled, application will never receive a packet with the specified error + * and may avoid to check the error flag. + * + * If checksum checking is enabled, IPv4 header checksum checking is always + * done for packets that do not have IP options and L4 checksum checking + * is done for unfragmented packets that do not have IPv4 options or IPv6 + * extension headers. In other cases checksum checking may or may not + * be done. For example, L4 checksum of fragmented packets is typically + * not checked. + * + * IPv4 checksum checking may be enabled only when parsing level is + * ODP_PROTO_LAYER_L3 or higher. Similarly, L4 level checksum checking + * may be enabled only with parsing level ODP_PROTO_LAYER_L4 or higher. + * + * Whether checksum checking was done and whether a checksum was correct + * can be queried for each received packet with odp_packet_l3_chksum_status() + * and odp_packet_l4_chksum_status(). + */ +typedef union odp_pktin_config_opt_t { + /** Option flags */ + struct { + /** Timestamp all packets on packet input */ + uint64_t ts_all : 1; + + /** Timestamp (at least) IEEE1588 / PTP packets + * on packet input */ + uint64_t ts_ptp : 1; + + /** Check IPv4 header checksum on packet input */ + uint64_t ipv4_chksum : 1; + + /** Check UDP checksum on packet input */ + uint64_t udp_chksum : 1; + + /** Check TCP checksum on packet input */ + uint64_t tcp_chksum : 1; + + /** Check SCTP checksum on packet input */ + uint64_t sctp_chksum : 1; + + /** Drop packets with an IPv4 error on packet input */ + uint64_t drop_ipv4_err : 1; + + /** Drop packets with an IPv6 error on packet input */ + uint64_t drop_ipv6_err : 1; + + /** Drop packets with a UDP error on packet input */ + uint64_t drop_udp_err : 1; + + /** Drop packets with a TCP error on packet input */ + uint64_t drop_tcp_err : 1; + + /** Drop packets with a SCTP error on packet input */ + uint64_t drop_sctp_err : 1; + + } bit; + + /** All bits of the bit field structure + * + * This field can be used to set/clear all flags, or bitwise + * operations over the entire structure. */ + uint64_t all_bits; +} odp_pktin_config_opt_t; +----- +These are used to control packet timestamping as well as default packet checkum +verification processing. + +==== PktIO Parsing Configuration +For RX processing, packets may also be parsed automatically as part of +receipt as controlled by the `odp_pktio_parser_config_t` struct: +[source,c] +----- +/** + * Parser configuration + */ +typedef struct odp_pktio_parser_config_t { + /** Protocol parsing level in packet input + * + * Application requires that protocol headers in a packet are checked + * up to this layer during packet input. Use ODP_PROTO_LAYER_ALL for + * all layers. Packet metadata for this and all preceding layers are + * set. In addition, offset (and pointer) to the next layer is set. + * Other layer/protocol specific metadata have undefined values. + * + * The default value is ODP_PROTO_LAYER_ALL. */ + odp_proto_layer_t layer; + +} odp_pktio_parser_config_t; +----- +Note that parsing is automatically done whenever classification is enabled +for an RX interface (see below). + +==== PktOut Configuration +For PktIOs that will transmit packets, the `odp_pktout_config_opt_t` struct +controls TX processing to be performed on these packets as they are +transmitted: +[source,c] +----- +/** + * Packet output configuration options bit field + * + * Packet output configuration options listed in a bit field structure. Packet + * output checksum insertion may be enabled or disabled (e.g. ipv4_chksum_ena): + * + * 0: Disable checksum insertion. Application will not request checksum + * insertion for any packet. This is the default value for xxx_chksum_ena + * bits. + * 1: Enable checksum insertion. Application will request checksum insertion + * for some packets. + * + * When checksum insertion is enabled, application may use configuration options + * to set the default behaviour on packet output (e.g. ipv4_chksum): + * + * 0: Do not insert checksum by default. This is the default value for + * xxx_chksum bits. + * 1: Calculate and insert checksum by default. + * + * These defaults may be overridden on per packet basis using e.g. + * odp_packet_l4_chksum_insert(). + * + * For correct operation, packet metadata must provide valid offsets for the + * appropriate protocols. For example, UDP checksum calculation needs both L3 + * and L4 offsets (to access IP and UDP headers). When application + * (e.g. a switch) does not modify L3/L4 data and thus checksum does not need + * to be updated, checksum insertion should be disabled for optimal performance. + * + * Packet flags (odp_packet_has_*()) are ignored for the purpose of checksum + * insertion in packet output. + * + * UDP, TCP and SCTP checksum insertion must not be requested for IP fragments. + * Use checksum override function (odp_packet_l4_chksum_insert()) to disable + * checksumming when sending a fragment through a packet IO interface that has + * the relevant L4 checksum insertion enabled. + * + * Result of checksum insertion at packet output is undefined if the protocol + * headers required for checksum calculation are not well formed. Packet must + * contain at least as many data bytes after L3/L4 offsets as the headers + * indicate. Other data bytes of the packet are ignored for the checksum + * insertion. + */ +typedef union odp_pktout_config_opt_t { + /** Option flags for packet output */ + struct { + /** Enable IPv4 header checksum insertion. */ + uint64_t ipv4_chksum_ena : 1; + + /** Enable UDP checksum insertion */ + uint64_t udp_chksum_ena : 1; + + /** Enable TCP checksum insertion */ + uint64_t tcp_chksum_ena : 1; + + /** Enable SCTP checksum insertion */ + uint64_t sctp_chksum_ena : 1; + + /** Insert IPv4 header checksum by default */ + uint64_t ipv4_chksum : 1; + + /** Insert UDP checksum on packet by default */ + uint64_t udp_chksum : 1; + + /** Insert TCP checksum on packet by default */ + uint64_t tcp_chksum : 1; + + /** Insert SCTP checksum on packet by default */ + uint64_t sctp_chksum : 1; + + } bit; + + /** All bits of the bit field structure + * + * This field can be used to set/clear all flags, or bitwise + * operations over the entire structure. */ + uint64_t all_bits; +} odp_pktout_config_opt_t; +----- +These are used to control default checksum generation processing for +transmitted packets. + === PktIO Input and Output Modes PktIO objects support four different Input and Output modes, that may be specified independently at *open* time. commit 183ce9babe20e161caef6b55eccfd043b334f748 Author: Bill Fischofer <bill.fischofer(a)linaro.org> Date: Sun Apr 8 16:35:21 2018 -0500 doc: userguide: add packet checksum and parsing info Update packet documentation to include information on packet parsing and checksum override handling. Signed-off-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Josep Puigdemont <josep.puigdemont(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/doc/users-guide/users-guide-packet.adoc b/doc/users-guide/users-guide-packet.adoc index 6d9e98a5..c38c5c86 100644 --- a/doc/users-guide/users-guide-packet.adoc +++ b/doc/users-guide/users-guide-packet.adoc @@ -499,3 +499,38 @@ Note also that a packet may not reference itself, nor may circular reference relationships be formed, _e.g.,_ packet A is used as a header for a reference to packet B and B is used as a header for a reference to packet A. Results are undefined if such circular references are attempted. + +=== Packet Parsing, Checksum Processing, and Overrides +Packet parsing is normally triggered automatically as part of packet RX +processing. However, the application can trigger parsing explicitly via the +API: +[source,c] +----- +int odp_packet_parse(odp_packet_t pkt, uint32_t offset, + const odp_packet_parse_param_t *param); +----- +This is typically done following packet decapsulation or other preprocessing +that would prevent RX parsing from "seeing" the relevant portion of the +packet. The `odp_packet_parse_param_t` struct that is passed to control the +depth of the desired parse, as well as whether checksum validation should be +performed as part of the parse, and if so which checksums require this +processing. + +Packets containing Layer 3 (IPv4) and Layer 4 (TCP, UDP, SCTP) checksums +can have these validated (on RX) and generated (on TX) automatically. +This is normally controlled by the settings on the PktIOs that +receive/transmit them, however they can also be controlled on an +individual packet basis. + +Packets have associated `odp_packet_chksum_status_t` metadata that indicates +the state any checksums contained in that packet. These can be queried via +the APIs `odp_packet_l3_chksum_status()` and `odp_packet_l4_chksum_status()`, +respectively. Checksums can either be known good, known bad, or unknown, where +unknown means that checksum validation processing has not occurred or the +attempt to validate the checksum failed. + +Similarly, the `odp_packet_l3_chksum_insert()` and +`odp_packet_l4_chksum_insert()` APIs may be used to override default checksum +processing for individual packets prior to transmission. If no explicit +checksum processing is specified for a packet, then any checksum generation +is controlled by the PktIO configuration of the interface used to transmit it. commit 0fa9977e21010f963892f59a75f03e3ba800bc74 Author: Bill Fischofer <bill.fischofer(a)linaro.org> Date: Thu Apr 5 17:04:13 2018 -0500 doc: userguide: refresh pktio code examples Update pktio code examples to reflect latest API definitions. Signed-off-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Josep Puigdemont <josep.puigdemont(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/doc/users-guide/users-guide-pktio.adoc b/doc/users-guide/users-guide-pktio.adoc index ef5cced6..79d6b1a2 100644 --- a/doc/users-guide/users-guide-pktio.adoc +++ b/doc/users-guide/users-guide-pktio.adoc @@ -38,6 +38,9 @@ PktIO objects begin life by being _opened_ via the call: * errno set. Use odp_pktio_lookup() to obtain a handle to an already open * device. Packet IO parameters provide interface level configuration options. * + * Use odp_pktio_param_init() to initialize packet IO parameters into their + * default values. Default values are also used when 'param' pointer is NULL. + * * Packet input queue configuration must be setup with * odp_pktin_queue_config() before odp_pktio_start() is called. When packet * input mode is ODP_PKTIN_MODE_DISABLED, odp_pktin_queue_config() call is @@ -66,7 +69,7 @@ PktIO objects begin life by being _opened_ via the call: * @param name Packet IO device name * @param pool Default pool from which to allocate storage for packets * received over this interface, must be of type ODP_POOL_PACKET - * @param param Packet IO parameters + * @param param Packet IO parameters. Uses defaults when NULL. * * @return Packet IO handle * @retval ODP_PKTIO_INVALID on failure @@ -85,7 +88,7 @@ PktIO objects begin life by being _opened_ via the call: * @see odp_pktio_start(), odp_pktio_stop(), odp_pktio_close() */ odp_pktio_t odp_pktio_open(const char *name, odp_pool_t pool, - const odp_pktio_param_t *param); + const odp_pktio_param_t *param); ----- `odp_pktio_open()` takes three arguments: a *name*, which is an implementation-defined string that identifies the logical interface to be @@ -97,18 +100,20 @@ I/O options to be associated with this PktIO instance. /** * Packet IO parameters * - * In minimum, user must select input and output modes. Use 0 for defaults. - * Initialize entire struct with zero to maintain API compatibility. + * Packet IO interface level parameters. Use odp_pktio_param_init() to + * initialize the structure with default values. */ typedef struct odp_pktio_param_t { /** Packet input mode * * The default value is ODP_PKTIN_MODE_DIRECT. */ odp_pktin_mode_t in_mode; + /** Packet output mode * * The default value is ODP_PKTOUT_MODE_DIRECT. */ odp_pktout_mode_t out_mode; + } odp_pktio_param_t; ----- ODP defines *"loop"* as a reserved name to indicate that this PktIO represents @@ -209,25 +214,48 @@ typedef struct odp_pktin_queue_param_t { * applicable. */ odp_pktio_op_mode_t op_mode; + /** Enable classifier + * + * * 0: Classifier is disabled (default) + * * 1: Classifier is enabled. Use classifier to direct incoming + * packets into pktin event queues. Classifier can be enabled + * only in ODP_PKTIN_MODE_SCHED and ODP_PKTIN_MODE_QUEUE modes. + * Both classifier and hashing cannot be enabled simultaneously + * ('hash_enable' must be 0). */ + odp_bool_t classifier_enable; + /** Enable flow hashing - * 0: Do not hash flows - * 1: Hash flows to input queues */ + * + * * 0: Do not hash flows (default) + * * 1: Enable flow hashing. Use flow hashing to spread incoming + * packets into input queues. Hashing can be enabled in all + * modes. Both classifier and hashing cannot be enabled + * simultaneously ('classifier_enable' must be 0). */ odp_bool_t hash_enable; - /** Protocol field selection for hashing. Multiple protocols can be - * selected. */ + /** Protocol field selection for hashing + * + * Multiple protocols can be selected. Ignored when 'hash_enable' is + * zero. The default value is all bits zero. */ odp_pktin_hash_proto_t hash_proto; - /** Number of input queues to be created. More than one input queue - * require input hashing or classifier setup. Hash_proto is ignored - * when hash_enable is zero or num_queues is one. This value must be - * between 1 and interface capability. Queue type is defined by the - * input mode. The default value is 1. */ + /** Number of input queues to be created + * + * When classifier is enabled in odp_pktin_queue_config() this + * value is ignored, otherwise at least one queue is required. + * More than one input queues require flow hashing configured. + * The maximum value is defined by pktio capability 'max_input_queues'. + * Queue type is defined by the input mode. The default value is 1. */ unsigned num_queues; - /** Queue parameters for creating input queues in ODP_PKTIN_MODE_QUEUE + /** Queue parameters + * + * These are used for input queue creation in ODP_PKTIN_MODE_QUEUE * or ODP_PKTIN_MODE_SCHED modes. Scheduler parameters are considered - * only in ODP_PKTIN_MODE_SCHED mode. */ + * only in ODP_PKTIN_MODE_SCHED mode. Default values are defined in + * odp_queue_param_t documentation. + * When classifier is enabled in odp_pktin_queue_config() this + * value is ignored. */ odp_queue_param_t queue_param; } odp_pktin_queue_param_t; @@ -347,8 +375,10 @@ Once started, the PktIn queue handles are used as arguments to /** * Receive packets directly from an interface input queue * - * Receives up to 'num' packets from the pktio interface input queue. When - * input queue parameter 'op_mode' has been set to ODP_PKTIO_OP_MT_UNSAFE, + * Receives up to 'num' packets from the pktio interface input queue. Returns + * the number of packets received. + * + * When input queue parameter 'op_mode' has been set to ODP_PKTIO_OP_MT_UNSAFE, * the operation is optimized for single thread operation per queue and the same * queue must not be accessed simultaneously from multiple threads. * @@ -478,6 +508,11 @@ Once the PktIO has been configured for output and started via * is less than 'num', the remaining packets at the end of packets[] array * are not consumed, and the caller has to take care of them. * + * Entire packet data is sent out (odp_packet_len() bytes of data, starting from + * odp_packet_data()). All other packet metadata is ignored unless otherwise + * specified e.g. for protocol offload purposes. Link protocol specific frame + * checksum and padding are added to frames before transmission. + * * @param queue Packet output queue handle for sending packets * @param packets[] Array of packets to send * @param num Number of packets to send @@ -485,7 +520,8 @@ Once the PktIO has been configured for output and started via * @return Number of packets sent * @retval <0 on failure */ -int odp_pktout_send(odp_pktout_queue_t queue, odp_packet_t packets[], int num); +int odp_pktout_send(odp_pktout_queue_t queue, const odp_packet_t packets[], + int num);; ----- Note that the argument to this call specifies the PktOut queue that the packet is to be added to rather than the PktIO itself. This permits multiple commit b0b07f403ffc22349ac8dd75f47238bea40891be Author: Bill Fischofer <bill.fischofer(a)linaro.org> Date: Wed Apr 4 16:20:47 2018 -0500 doc: userguide: change sched type none to parallel Replace old ODP_SCHED_SYNC_NONE with current ODP_SCHED_SYNC_PARALLEL when describing queue scheduling options. Signed-off-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Josep Puigdemont <josep.puigdemont(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/doc/users-guide/users-guide.adoc b/doc/users-guide/users-guide.adoc index 9c1307b4..7914459e 100644 --- a/doc/users-guide/users-guide.adoc +++ b/doc/users-guide/users-guide.adoc @@ -998,7 +998,7 @@ odp_queue_param_init(&qp); odp_schedule_prio_t prio = ...; odp_schedule_group_t sched_group = ...; qp.sched.prio = prio; -qp.sched.sync = ODP_SCHED_SYNC_[NONE|ATOMIC|ORDERED]; +qp.sched.sync = ODP_SCHED_SYNC_[PARALLEL|ATOMIC|ORDERED]; qp.sched.group = sched_group; qp.lock_count = n; /* Only relevant for ordered queues */ odp_queue_t sched_q1 = odp_queue_create("sched queue 1", ODP_QUEUE_TYPE_SCHED, &qp); @@ -1054,8 +1054,8 @@ Three types of queue scheduler synchronization area supported: Parallel, Atomic, and Ordered. ==== Parallel Queues -SCHED queues that specify a sync mode of ODP_SCHED_SYNC_NONE are unrestricted -in how events are processed. +SCHED queues that specify a sync mode of ODP_SCHED_SYNC_PARALLEL are +unrestricted in how events are processed. .Parallel Queue Scheduling image::parallel_queue.svg[align="center"] commit bd0377ae95427e80f04b0dd5f3a8dcb0b1ab89e3 Author: Bill Fischofer <bill.fischofer(a)linaro.org> Date: Wed Apr 4 16:19:27 2018 -0500 doc: userguide: shm corrections Clarify the use of the ODP_SHM_SINGLE_VM flag on shm operations. Signed-off-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Josep Puigdemont <josep.puigdemont(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/doc/users-guide/users-guide.adoc b/doc/users-guide/users-guide.adoc index e480c69d..9c1307b4 100644 --- a/doc/users-guide/users-guide.adoc +++ b/doc/users-guide/users-guide.adoc @@ -798,16 +798,16 @@ shared_data_t *shared_data; shared_data = odp_shm_addr(shm); ---- -The address returned by `odp_shm_addr()` is valid only in the calling ODP -thread space: odp_shm_t handles can be shared between ODP threads and remain -valid within any threads, whereas the address returned by `odp_shm_addr(shm)` -may differ from ODP threads to ODP threads (for the same 'shm' block), and -should therefore not be shared between ODP threads. -For instance, it would be correct to send a shm handle using IPC between two -ODP threads and let each of these thread do their own `odp_shm_addr()` to -get the block address. Directly sending the address returned by -`odp_shm_addr()` from one ODP thread to another would however possibly fail -(the address may have no sense in the receiver address space). +The address returned by `odp_shm_addr()` is normally valid only in the calling +ODP thread space: odp_shm_t handles can be shared between ODP threads and +remain valid within any threads, whereas the address returned by +`odp_shm_addr(shm)` may differ from ODP threads to ODP threads (for the same +'shm' block), and should therefore not be shared between ODP threads. For +instance, it would be correct to send a shm handle using IPC between two ODP +threads and let each of these thread do their own `odp_shm_addr()` to get the +block address. Directly sending the address returned by `odp_shm_addr()` from +one ODP thread to another would however possibly fail (the address may make no +sense in the receiver address space). The address returned by `odp_shm_addr()` is nevertheless guaranteed to be aligned according to the alignment requirements provided at block creation @@ -819,7 +819,13 @@ All shared memory blocks are contiguous in any ODP thread addressing space: as provided in the `odp_shm_reserve()` call) is read and writeable and mapping the shared memory block. There is no fragmentation. -=== Memory behaviour +The exception to this rule is if the `odp_shm_t` is created with the +`ODP_SHM_SINGLE_VA` flag. This requests that `odp_shm_addr()` return the same +virtual address for all ODP threads in this instance. Note that there may be a +performance cost or shm size limit associated with providing this function in +some implementations. + +=== Memory behavior By default ODP threads are assumed to behave as cache coherent systems: Any change performed on a shared memory block is guaranteed to eventually become visible to other ODP threads sharing this memory block. commit 5555878edbda765134fbe50f3181f409963037ea Author: Bill Fischofer <bill.fischofer(a)linaro.org> Date: Wed Apr 4 16:18:11 2018 -0500 doc: userguide: change pool queue to plain queue Queues fall into types PLAIN and SCHED. Correct terminology from the old POLL queue type to the current PLAIN queue type. Signed-off-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Josep Puigdemont <josep.puigdemont(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/doc/users-guide/users-guide.adoc b/doc/users-guide/users-guide.adoc index d0687f97..e480c69d 100644 --- a/doc/users-guide/users-guide.adoc +++ b/doc/users-guide/users-guide.adoc @@ -312,7 +312,7 @@ appropriate type represented by the event. A queue is a message passing channel that holds events. Events can be added to a queue via enqueue operations or removed from a queue via dequeue operations. The endpoints of a queue will vary depending on how it is used. -Queues come in two major types: polled and scheduled, which will be +Queues come in two major types: plain and scheduled, which will be discussed in more detail when the event model is introduced. Queues may also have an associated context, which represents a persistent state for all events that make use of it. These states are what permit threads to perform @@ -964,23 +964,23 @@ Queues are the fundamental event sequencing mechanism provided by ODP and all ODP applications make use of them either explicitly or implicitly. Queues are created via the 'odp_queue_create()' API that returns a handle of type `odp_queue_t` that is used to refer to this queue in all subsequent APIs that -reference it. Queues have one of two ODP-defined _types_, POLL, and SCHED that -determine how they are used. POLL queues directly managed by the ODP +reference it. Queues have one of two ODP-defined _types_, PLAIN, and SCHED that +determine how they are used. PLAIN queues directly managed by the ODP application while SCHED queues make use of the *ODP scheduler* to provide automatic scalable dispatching and synchronization services. -.Operations on POLL queues +.Operations on PLAIN queues [source,c] ---- -odp_queue_t poll_q1 = odp_queue_create("poll queue 1", ODP_QUEUE_TYPE_POLL, NULL); -odp_queue_t poll_q2 = odp_queue_create("poll queue 2", ODP_QUEUE_TYPE_POLL, NULL); +odp_queue_t plain_q1 = odp_queue_create("poll queue 1", ODP_QUEUE_TYPE_PLAIN, NULL); +odp_queue_t plain_q2 = odp_queue_create("poll queue 2", ODP_QUEUE_TYPE_PLAIN, NULL); ... -odp_event_t ev = odp_queue_deq(poll_q1); +odp_event_t ev = odp_queue_deq(plain_q1); ...do something -int rc = odp_queue_enq(poll_q2, ev); +int rc = odp_queue_enq(plain_q2, ev); ---- -The key distinction is that dequeueing events from POLL queues is an +The key distinction is that dequeueing events from PLAIN queues is an application responsibility while dequeueing events from SCHED queues is the responsibility of the ODP scheduler. commit 009dab38672eaf8ab6eddc551da41a84e86915a5 Author: Bill Fischofer <bill.fischofer(a)linaro.org> Date: Wed Apr 4 16:16:11 2018 -0500 doc: userguide: typo corrections Signed-off-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Josep Puigdemont <josep.puigdemont(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/doc/users-guide/users-guide-cls.adoc b/doc/users-guide/users-guide-cls.adoc index a689826c..359d225d 100644 --- a/doc/users-guide/users-guide-cls.adoc +++ b/doc/users-guide/users-guide-cls.adoc @@ -7,7 +7,7 @@ prioritization, classification and scheduling of each packet, so that the software application can run faster, scale better and adhere to QoS requirements. -The following API abstraction are not modelled after any existing product +The following API abstraction are not modeled after any existing product implementation, but is instead defined in terms of what a typical data-plane application may require from such a platform, without sacrificing simplicity and avoiding ambiguity. Certain terms that are being used within the context of diff --git a/doc/users-guide/users-guide-crypto.adoc b/doc/users-guide/users-guide-crypto.adoc index 029f47b1..b44402ad 100644 --- a/doc/users-guide/users-guide-crypto.adoc +++ b/doc/users-guide/users-guide-crypto.adoc @@ -175,7 +175,7 @@ any software generated pseudo-random data. May not be available on all platforms. These form a hierarchy with BASIC being the lowest kind of random and TRUE -behing the highest. The main API for accessing random data is: +being the highest. The main API for accessing random data is: [source,c] ----- diff --git a/doc/users-guide/users-guide-ipsec.adoc b/doc/users-guide/users-guide-ipsec.adoc index ac4eae85..6af67662 100644 --- a/doc/users-guide/users-guide-ipsec.adoc +++ b/doc/users-guide/users-guide-ipsec.adoc @@ -381,7 +381,7 @@ any further application involvement. Only if a problem arises will the packet be returned to the application with an `odp_ipsec_packet_result_t` indicating the nature of the problem. -Note that while operating in inline mode, asychronous lookaside operations are +Note that while operating in inline mode, asynchronous lookaside operations are also permitted. This provide the application with additional flexibility if, for example, some packets need additional handling that cannot be supported directly with inline IPsec processing. @@ -449,7 +449,7 @@ the application continues to receive and process IPsec events as normal. Disable completion is indicated by the application seeing an event of type `ODP_EVENT_IPSEC_STATUS` for this SA that contains an `odp_ipsec_status_id_t` of `ODP_IPSEC_STATUS_SA_DISABLE`. For inbound SAs, receipt of this event means -that the application has seen all IPsec packets associatd with this SA that +that the application has seen all IPsec packets associated with this SA that were pending at the time of the disable call. For outbound SAs, receipt of this event means that the application has seen all result events associated with packets sent via this SA. diff --git a/doc/users-guide/users-guide-pktio.adoc b/doc/users-guide/users-guide-pktio.adoc index 80a58d2f..ef5cced6 100644 --- a/doc/users-guide/users-guide-pktio.adoc +++ b/doc/users-guide/users-guide-pktio.adoc @@ -114,8 +114,8 @@ typedef struct odp_pktio_param_t { ODP defines *"loop"* as a reserved name to indicate that this PktIO represents a loopback interface. Loopback interfaces are useful as a means of recycling packets back for reclassification after decryption or decapsulation, as well as -for diagnostic or testing purposes. For example, when receiving IPSEC traffic, -the classifier is able to recognize that the traffic is IPSEC, however until +for diagnostic or testing purposes. For example, when receiving IPsec traffic, +the classifier is able to recognize that the traffic is IPsec, however until the traffic is decrypted it is unable to say what that traffic contains. So following decryption, sending the decrypted packet back to a loopback interface allows the classifier to take a "second look" at the packet and diff --git a/doc/users-guide/users-guide-tm.adoc b/doc/users-guide/users-guide-tm.adoc index 25129733..55efb1b2 100644 --- a/doc/users-guide/users-guide-tm.adoc +++ b/doc/users-guide/users-guide-tm.adoc @@ -10,7 +10,7 @@ A given platform supporting this TM API could support one or more pure hardware based packet scheduling systems, one or more pure software based systems or one or more hybrid systems - where because of hardware constraints some of the packet scheduling is done in hardware and some is done in software. In -addition, there may also be additional API's beyond those described here for: +addition, there may also be additional APIs beyond those described here for: - controlling advanced capabilities supported by specific hardware, software or hybrid subsystems @@ -84,7 +84,7 @@ traffic, while allowing for less idle outputs. ==== Weighted Fair Queuing -Weighted Fair Queuing (WFQ) is used to arbitrate amongst multiple input +Weighted Fair Queuing (WFQ) is used to arbitrate among multiple input packets with the same priority. Each input can be assigned a weight in the range MIN_WFQ_WEIGHT..MAX_WFQ_WEIGHT (nominally 1..255) that affects the way the algorithm chooses the next packet. If all of the weights are equal AND all @@ -158,7 +158,7 @@ final scheduling decision is controlled by equal priority schedulers, strict priority multiplexers, bandwidth shapers - at multiple levels - all forming a tree rooted at a single egress object. In other words, all tm_queues and tm_nodes have the property that their logical "output" feeds -into one fan-in of a subsequent tm_node or egresss object - forming a proper +into one fan-in of a subsequent tm_node or egress object - forming a proper tree. .Hierarchical Scheduling @@ -178,7 +178,7 @@ choice" of what packet/tm_queue should next be serviced. Tm_nodes are the main "entity"/object that a TM system is composed of. Each tm_node is a mini-TM subsystem of its own, but the interconnection and interplay of a multi-level "tree" of tm_nodes can allow the user to specify -some very sophisticated behaviours. Each tm_node can contain a set of scheduler +some very sophisticated behaviors. Each tm_node can contain a set of scheduler (one per strict priority level), a strict priority multiplexer, a bandwidth shaper and a WRED component - or a subset of these. diff --git a/doc/users-guide/users-guide.adoc b/doc/users-guide/users-guide.adoc index 7f2ad69e..d0687f97 100644 --- a/doc/users-guide/users-guide.adoc +++ b/doc/users-guide/users-guide.adoc @@ -151,7 +151,7 @@ of the specification or other minor changes that do not affect either the syntax or semantics of the specification. Such changes in the API specification are expected to be rare. Increments to the minor level represent the introduction of new APIs or functional capabilities, or changes -to he specified syntax or functional behavior of APIs and thus may require +to the specified syntax or functional behavior of APIs and thus may require application source code changes. Such changes are well documented in the release notes for each revision of the specification. Finally, increments to the major level represent significant structural changes that most likely @@ -247,14 +247,14 @@ polled by ODP _Threads_, or can pass through the _Classifier_ and sorted into Queues that represent individual flows. These queues can then be dispatched to application threads via the _Scheduler_. -Threads, in term can invoke various ODP APIs to manipulate packet contents +Threads, in turn can invoke various ODP APIs to manipulate packet contents prior to disposing of them. For output processing, packets make by directly queued to a PktIO output queue or else they may be handed to the _Traffic Manager_ for programmatic _Quality of Service (QoS)_ processing before winding up being transmitted (TX). Note that output interfaces may operate in _loopback_ mode, in which case packets sent to them are re-routed back to the -input lines for "second pass" processing. For example, an incoming IPSec packet -cannot be properly classified (beyond being IPSec traffic) until it is +input lines for "second pass" processing. For example, an incoming IPsec packet +cannot be properly classified (beyond being IPsec traffic) until it is decrypted. Once decrypted and its actual contents made visible, it can then be classified into its real flow. @@ -576,7 +576,7 @@ values. Calling `odp_init_global()` establishes the ODP API framework and MUST be called before any other ODP API may be called. Note that it is only called once per application. A successful call to `odp_init_global()` returns rc = 0 -and sets the `instance` variable supplied as input to the call to an handle +and sets the `instance` variable supplied as input to the call to a handle representing this unique ODP instance. The `odp_init_t` parameter is used to specify various customizations to the @@ -661,7 +661,7 @@ area and how best to use ODP to achieve these goals. === Portability and Coexistence Because ODP offers a programming _framework_ rather than a programming _environment_, it is designed to be able to work alongside APIs offered by -other frameworks with minimual interference. Therefore when we speak of +other frameworks with minimal interference. Therefore when we speak of portability in an ODP context, we of necessity speak of portability of those portions of the application that make use of ODP APIs. If an application uses non-ODP APIs then those must be taken into consideration as well when @@ -756,10 +756,10 @@ Architecture (ISA), such as x86-64 or AArch64. Binaries cannot directly port between ISAs--that requires a recompilation. Each ODP implementation will identify which ABI definition it supports, if any. -When compiling against an ODP implementation in ABI compabitilty mode, the +When compiling against an ODP implementation in ABI compatibility mode, the resulting binary is automatically binary compatible with all other ODP implementations that share this ABI. For example, for the x86-64 ISA, both -the `odp-linux` and `odp-dpdk` implemtations are a common ABI. +the `odp-linux` and `odp-dpdk` implementations are a common ABI. == Shared memory === Allocating shared memory ----------------------------------------------------------------------- Summary of changes: doc/users-guide/users-guide-cls.adoc | 2 +- doc/users-guide/users-guide-crypto.adoc | 2 +- doc/users-guide/users-guide-ipsec.adoc | 4 +- doc/users-guide/users-guide-packet.adoc | 35 +++ doc/users-guide/users-guide-pktio.adoc | 374 ++++++++++++++++++++++++++++++-- doc/users-guide/users-guide-tm.adoc | 8 +- doc/users-guide/users-guide.adoc | 68 +++--- 7 files changed, 434 insertions(+), 59 deletions(-) hooks/post-receive --

6 years, 10 months

[COMMIT] branch master updated. v1.18.0.1_tigermoth_rc3-37-g290decaf

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 290decaf3259b036c3a402be428b04ba100f0f81 (commit) via 61d16e162788ac0923c544b4d31bb847fa3d9189 (commit) from 83fda5a447335b95bdd991187d4efb0a15a5709a (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 290decaf3259b036c3a402be428b04ba100f0f81 Author: yhe <yhe(a)sonicwall.com> Date: Wed Mar 28 08:51:20 2018 +0800 validation:crypto:implement AES-XCBC-MAC and SHA384-HMAC Add AES-XCBC-MAC and SHA384-HMAC into the test case Signed-off-by: Tom He <yhe(a)sonicwall.com> Reviewed-by: Maxim Uvarov <maxim.uvarov(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/crypto/odp_crypto_test_inp.c b/test/validation/api/crypto/odp_crypto_test_inp.c index 39ef3350..aa053dd5 100644 --- a/test/validation/api/crypto/odp_crypto_test_inp.c +++ b/test/validation/api/crypto/odp_crypto_test_inp.c @@ -47,8 +47,12 @@ static const char *auth_alg_name(odp_auth_alg_t auth) return "ODP_AUTH_ALG_SHA1_HMAC"; case ODP_AUTH_ALG_SHA256_HMAC: return "ODP_AUTH_ALG_SHA256_HMAC"; + case ODP_AUTH_ALG_SHA384_HMAC: + return "ODP_AUTH_ALG_SHA384_HMAC"; case ODP_AUTH_ALG_SHA512_HMAC: return "ODP_AUTH_ALG_SHA512_HMAC"; + case ODP_AUTH_ALG_AES_XCBC_MAC: + return "ODP_AUTH_ALG_AES_XCBC_MAC"; case ODP_AUTH_ALG_AES_GCM: return "ODP_AUTH_ALG_AES_GCM"; case ODP_AUTH_ALG_AES_GMAC: @@ -527,9 +531,15 @@ static void check_alg(odp_crypto_op_t op, if (auth_alg == ODP_AUTH_ALG_SHA256_HMAC && !(capa.auths.bit.sha256_hmac)) rc = -1; + if (auth_alg == ODP_AUTH_ALG_SHA384_HMAC && + !(capa.auths.bit.sha384_hmac)) + rc = -1; if (auth_alg == ODP_AUTH_ALG_SHA512_HMAC && !(capa.auths.bit.sha512_hmac)) rc = -1; + if (auth_alg == ODP_AUTH_ALG_AES_XCBC_MAC && + !(capa.auths.bit.aes_xcbc_mac)) + rc = -1; CU_ASSERT(!rc); CU_ASSERT((~capa.auths.all_bits & capa.hw_auths.all_bits) == 0); @@ -711,10 +721,18 @@ static int check_alg_support(odp_cipher_alg_t cipher, odp_auth_alg_t auth) if (!capability.auths.bit.sha256_hmac) return ODP_TEST_INACTIVE; break; + case ODP_AUTH_ALG_SHA384_HMAC: + if (!capability.auths.bit.sha384_hmac) + return ODP_TEST_INACTIVE; + break; case ODP_AUTH_ALG_SHA512_HMAC: if (!capability.auths.bit.sha512_hmac) return ODP_TEST_INACTIVE; break; + case ODP_AUTH_ALG_AES_XCBC_MAC: + if (!capability.auths.bit.aes_xcbc_mac) + return ODP_TEST_INACTIVE; + break; case ODP_AUTH_ALG_AES_GCM: if (!capability.auths.bit.aes_gcm) return ODP_TEST_INACTIVE; @@ -1205,6 +1223,38 @@ static void crypto_test_check_alg_hmac_sha256(void) false); } +static int check_alg_hmac_sha384(void) +{ + return check_alg_support(ODP_CIPHER_ALG_NULL, ODP_AUTH_ALG_SHA384_HMAC); +} + +/* This test verifies the correctness of HMAC_SHA384 digest operation. + * The output check length is truncated to 24 bytes (192 bits) as + * returned by the crypto operation API call. + * Note that hash digest is a one-way operation. + * In addition the test verifies if the implementation can use the + * packet buffer as completion event buffer. + * */ +static void crypto_test_gen_alg_hmac_sha384(void) +{ + check_alg(ODP_CRYPTO_OP_ENCODE, + ODP_CIPHER_ALG_NULL, + ODP_AUTH_ALG_SHA384_HMAC, + hmac_sha384_reference, + ARRAY_SIZE(hmac_sha384_reference), + false); +} + +static void crypto_test_check_alg_hmac_sha384(void) +{ + check_alg(ODP_CRYPTO_OP_DECODE, + ODP_CIPHER_ALG_NULL, + ODP_AUTH_ALG_SHA384_HMAC, + hmac_sha384_reference, + ARRAY_SIZE(hmac_sha384_reference), + false); +} + static int check_alg_hmac_sha512(void) { return check_alg_support(ODP_CIPHER_ALG_NULL, ODP_AUTH_ALG_SHA512_HMAC); @@ -1237,6 +1287,39 @@ static void crypto_test_check_alg_hmac_sha512(void) false); } +static int check_alg_aes_xcbc(void) +{ + return check_alg_support(ODP_CIPHER_ALG_NULL, + ODP_AUTH_ALG_AES_XCBC_MAC); +} + +/* This test verifies the correctness of AES_XCBC_MAC digest operation. + * The output check length is truncated to 16 bytes (128 bits) as + * returned by the crypto operation API call. + * Note that hash digest is a one-way operation. + * In addition the test verifies if the implementation can use the + * packet buffer as completion event buffer. + * */ +static void crypto_test_gen_alg_aes_xcbc(void) +{ + check_alg(ODP_CRYPTO_OP_ENCODE, + ODP_CIPHER_ALG_NULL, + ODP_AUTH_ALG_AES_XCBC_MAC, + aes_xcbc_reference, + ARRAY_SIZE(aes_xcbc_reference), + false); +} + +static void crypto_test_check_alg_aes_xcbc(void) +{ + check_alg(ODP_CRYPTO_OP_DECODE, + ODP_CIPHER_ALG_NULL, + ODP_AUTH_ALG_AES_XCBC_MAC, + aes_xcbc_reference, + ARRAY_SIZE(aes_xcbc_reference), + false); +} + static int check_alg_aes_gmac(void) { return check_alg_support(ODP_CIPHER_ALG_NULL, ODP_AUTH_ALG_AES_GMAC); @@ -1424,10 +1507,18 @@ odp_testinfo_t crypto_suite[] = { check_alg_hmac_sha256), ODP_TEST_INFO_CONDITIONAL(crypto_test_check_alg_hmac_sha256, check_alg_hmac_sha256), + ODP_TEST_INFO_CONDITIONAL(crypto_test_gen_alg_hmac_sha384, + check_alg_hmac_sha384), + ODP_TEST_INFO_CONDITIONAL(crypto_test_check_alg_hmac_sha384, + check_alg_hmac_sha384), ODP_TEST_INFO_CONDITIONAL(crypto_test_gen_alg_hmac_sha512, check_alg_hmac_sha512), ODP_TEST_INFO_CONDITIONAL(crypto_test_check_alg_hmac_sha512, check_alg_hmac_sha512), + ODP_TEST_INFO_CONDITIONAL(crypto_test_gen_alg_aes_xcbc, + check_alg_aes_xcbc), + ODP_TEST_INFO_CONDITIONAL(crypto_test_check_alg_aes_xcbc, + check_alg_aes_xcbc), ODP_TEST_INFO_CONDITIONAL(crypto_test_gen_alg_aes_gmac, check_alg_aes_gmac), ODP_TEST_INFO_CONDITIONAL(crypto_test_gen_alg_aes_gmac_ovr_iv, diff --git a/test/validation/api/crypto/test_vectors.h b/test/validation/api/crypto/test_vectors.h index 23ed9525..9adb4332 100644 --- a/test/validation/api/crypto/test_vectors.h +++ b/test/validation/api/crypto/test_vectors.h @@ -1188,6 +1188,134 @@ static crypto_test_reference_t hmac_sha256_reference[] = { } }; +static crypto_test_reference_t hmac_sha384_reference[] = { + { + .auth_key_length = HMAC_SHA384_KEY_LEN, + .auth_key = { 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, + 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, + 0x0b, 0x0b, 0x0b, 0x0b }, + .length = 8, + /* "Hi There" */ + .plaintext = { 0x48, 0x69, 0x20, 0x54, 0x68, 0x65, 0x72, 0x65}, + .ciphertext = { 0x48, 0x69, 0x20, 0x54, 0x68, 0x65, 0x72, 0x65}, + .digest_length = HMAC_SHA384_192_CHECK_LEN, + .digest = { 0xaf, 0xd0, 0x39, 0x44, 0xd8, 0x48, 0x95, 0x62, + 0x6b, 0x08, 0x25, 0xf4, 0xab, 0x46, 0x90, 0x7f, + 0x15, 0xf9, 0xda, 0xdb, 0xe4, 0x10, 0x1e, 0xc6 } + }, + { + .auth_key_length = HMAC_SHA384_KEY_LEN, + /* "Jefe" */ + .auth_key = { 0x4a, 0x65, 0x66, 0x65 }, + .length = 28, + /* what do ya want for nothing?*/ + .plaintext = { 0x77, 0x68, 0x61, 0x74, 0x20, 0x64, 0x6f, 0x20, + 0x79, 0x61, 0x20, 0x77, 0x61, 0x6e, 0x74, 0x20, + 0x66, 0x6f, 0x72, 0x20, 0x6e, 0x6f, 0x74, 0x68, + 0x69, 0x6e, 0x67, 0x3f }, + .ciphertext = { 0x77, 0x68, 0x61, 0x74, 0x20, 0x64, 0x6f, 0x20, + 0x79, 0x61, 0x20, 0x77, 0x61, 0x6e, 0x74, 0x20, + 0x66, 0x6f, 0x72, 0x20, 0x6e, 0x6f, 0x74, 0x68, + 0x69, 0x6e, 0x67, 0x3f }, + .digest_length = HMAC_SHA384_192_CHECK_LEN, + .digest = { 0xaf, 0x45, 0xd2, 0xe3, 0x76, 0x48, 0x40, 0x31, + 0x61, 0x7f, 0x78, 0xd2, 0xb5, 0x8a, 0x6b, 0x1b, + 0x9c, 0x7e, 0xf4, 0x64, 0xf5, 0xa0, 0x1b, 0x47 } + }, + { + .auth_key_length = HMAC_SHA384_KEY_LEN, + .auth_key = { 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, + 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, + 0xaa, 0xaa, 0xaa, 0xaa }, + .length = 50, + .plaintext = { 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, + 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, + 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, + 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, + 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, + 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, + 0xdd, 0xdd }, + .ciphertext = { 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, + 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, + 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, + 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, + 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, + 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, + 0xdd, 0xdd }, + .digest_length = HMAC_SHA384_192_CHECK_LEN, + .digest = { 0x88, 0x06, 0x26, 0x08, 0xd3, 0xe6, 0xad, 0x8a, + 0x0a, 0xa2, 0xac, 0xe0, 0x14, 0xc8, 0xa8, 0x6f, + 0x0a, 0xa6, 0x35, 0xd9, 0x47, 0xac, 0x9f, 0xeb } + }, + { + .auth_key_length = HMAC_SHA384_KEY_LEN, + .auth_key = { 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, + 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, + 0x0b, 0x0b, 0x0b, 0x0b }, + .length = 8, + /* "Hi There" */ + .plaintext = { 0x48, 0x69, 0x20, 0x54, 0x68, 0x65, 0x72, 0x65}, + .ciphertext = { 0x48, 0x69, 0x20, 0x54, 0x68, 0x65, 0x72, 0x65}, + .digest_length = HMAC_SHA384_CHECK_LEN, + .digest = { 0xaf, 0xd0, 0x39, 0x44, 0xd8, 0x48, 0x95, 0x62, + 0x6b, 0x08, 0x25, 0xf4, 0xab, 0x46, 0x90, 0x7f, + 0x15, 0xf9, 0xda, 0xdb, 0xe4, 0x10, 0x1e, 0xc6, + 0x82, 0xaa, 0x03, 0x4c, 0x7c, 0xeb, 0xc5, 0x9c, + 0xfa, 0xea, 0x9e, 0xa9, 0x07, 0x6e, 0xde, 0x7f, + 0x4a, 0xf1, 0x52, 0xe8, 0xb2, 0xfa, 0x9c, 0xb6 } + }, + { + .auth_key_length = HMAC_SHA384_KEY_LEN, + /* "Jefe" */ + .auth_key = { 0x4a, 0x65, 0x66, 0x65 }, + .length = 28, + /* what do ya want for nothing?*/ + .plaintext = { 0x77, 0x68, 0x61, 0x74, 0x20, 0x64, 0x6f, 0x20, + 0x79, 0x61, 0x20, 0x77, 0x61, 0x6e, 0x74, 0x20, + 0x66, 0x6f, 0x72, 0x20, 0x6e, 0x6f, 0x74, 0x68, + 0x69, 0x6e, 0x67, 0x3f }, + .ciphertext = { 0x77, 0x68, 0x61, 0x74, 0x20, 0x64, 0x6f, 0x20, + 0x79, 0x61, 0x20, 0x77, 0x61, 0x6e, 0x74, 0x20, + 0x66, 0x6f, 0x72, 0x20, 0x6e, 0x6f, 0x74, 0x68, + 0x69, 0x6e, 0x67, 0x3f }, + .digest_length = HMAC_SHA384_CHECK_LEN, + .digest = { 0xaf, 0x45, 0xd2, 0xe3, 0x76, 0x48, 0x40, 0x31, + 0x61, 0x7f, 0x78, 0xd2, 0xb5, 0x8a, 0x6b, 0x1b, + 0x9c, 0x7e, 0xf4, 0x64, 0xf5, 0xa0, 0x1b, 0x47, + 0xe4, 0x2e, 0xc3, 0x73, 0x63, 0x22, 0x44, 0x5e, + 0x8e, 0x22, 0x40, 0xca, 0x5e, 0x69, 0xe2, 0xc7, + 0x8b, 0x32, 0x39, 0xec, 0xfa, 0xb2, 0x16, 0x49 } + }, + { + .auth_key_length = HMAC_SHA384_KEY_LEN, + .auth_key = { 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, + 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, + 0xaa, 0xaa, 0xaa, 0xaa }, + .length = 50, + .plaintext = { 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, + 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, + 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, + 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, + 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, + 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, + 0xdd, 0xdd }, + .ciphertext = { 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, + 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, + 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, + 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, + 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, + 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, + 0xdd, 0xdd }, + .digest_length = HMAC_SHA384_CHECK_LEN, + .digest = {0x88, 0x06, 0x26, 0x08, 0xd3, 0xe6, 0xad, 0x8a, + 0x0a, 0xa2, 0xac, 0xe0, 0x14, 0xc8, 0xa8, 0x6f, + 0x0a, 0xa6, 0x35, 0xd9, 0x47, 0xac, 0x9f, 0xeb, + 0xe8, 0x3e, 0xf4, 0xe5, 0x59, 0x66, 0x14, 0x4b, + 0x2a, 0x5a, 0xb3, 0x9d, 0xc1, 0x38, 0x14, 0xb9, + 0x4e, 0x3a, 0xb6, 0xe1, 0x01, 0xa3, 0x4f, 0x27 } + } +}; + static crypto_test_reference_t hmac_sha512_reference[] = { { .auth_key_length = HMAC_SHA512_KEY_LEN, @@ -1325,4 +1453,85 @@ static crypto_test_reference_t hmac_sha512_reference[] = { } }; +static crypto_test_reference_t aes_xcbc_reference[] = { + { + .auth_key_length = AES_XCBC_MAC_KEY_LEN, + .auth_key = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, + 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f }, + .length = 3, + .plaintext = { 0x00, 0x01, 0x02 }, + .ciphertext = { 0x00, 0x01, 0x02 }, + .digest_length = AES_XCBC_MAC_96_CHECK_LEN, + .digest = { 0x5b, 0x37, 0x65, 0x80, 0xae, 0x2f, 0x19, 0xaf, + 0xe7, 0x21, 0x9c, 0xee } + }, + { + .auth_key_length = AES_XCBC_MAC_KEY_LEN, + .auth_key = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, + 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f }, + .length = 16, + .plaintext = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, + 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f }, + .ciphertext = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, + 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f }, + .digest_length = AES_XCBC_MAC_96_CHECK_LEN, + .digest = { 0xd2, 0xa2, 0x46, 0xfa, 0x34, 0x9b, 0x68, 0xa7, + 0x99, 0x98, 0xa4, 0x39 } + }, + { + .auth_key_length = AES_XCBC_MAC_KEY_LEN, + .auth_key = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, + 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f }, + .length = 20, + .plaintext = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, + 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, + 0x10, 0x11, 0x12, 0x13 }, + .ciphertext = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, + 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, + 0x10, 0x11, 0x12, 0x13 }, + .digest_length = AES_XCBC_MAC_96_CHECK_LEN, + .digest = { 0x47, 0xf5, 0x1b, 0x45, 0x64, 0x96, 0x62, 0x15, + 0xb8, 0x98, 0x5c, 0x63 } + }, + { + .auth_key_length = AES_XCBC_MAC_KEY_LEN, + .auth_key = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, + 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f }, + .length = 3, + .plaintext = { 0x00, 0x01, 0x02 }, + .ciphertext = { 0x00, 0x01, 0x02 }, + .digest_length = AES_XCBC_MAC_CHECK_LEN, + .digest = { 0x5b, 0x37, 0x65, 0x80, 0xae, 0x2f, 0x19, 0xaf, + 0xe7, 0x21, 0x9c, 0xee, 0xf1, 0x72, 0x75, 0x6f } + }, + { + .auth_key_length = AES_XCBC_MAC_KEY_LEN, + .auth_key = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, + 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f }, + .length = 16, + .plaintext = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, + 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f }, + .ciphertext = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, + 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f }, + .digest_length = AES_XCBC_MAC_CHECK_LEN, + .digest = { 0xd2, 0xa2, 0x46, 0xfa, 0x34, 0x9b, 0x68, 0xa7, + 0x99, 0x98, 0xa4, 0x39, 0x4f, 0xf7, 0xa2, 0x63 } + }, + { + .auth_key_length = AES_XCBC_MAC_KEY_LEN, + .auth_key = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, + 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f }, + .length = 20, + .plaintext = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, + 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, + 0x10, 0x11, 0x12, 0x13 }, + .ciphertext = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, + 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, + 0x10, 0x11, 0x12, 0x13 }, + .digest_length = AES_XCBC_MAC_CHECK_LEN, + .digest = { 0x47, 0xf5, 0x1b, 0x45, 0x64, 0x96, 0x62, 0x15, + 0xb8, 0x98, 0x5c, 0x63, 0x05, 0x5e, 0xd3, 0x08 } + } +}; + #endif diff --git a/test/validation/api/crypto/test_vectors_len.h b/test/validation/api/crypto/test_vectors_len.h index 860840cf..95d202b6 100644 --- a/test/validation/api/crypto/test_vectors_len.h +++ b/test/validation/api/crypto/test_vectors_len.h @@ -50,6 +50,11 @@ #define HMAC_SHA1_96_CHECK_LEN 12 #define HMAC_SHA1_CHECK_LEN 20 +/* HMAC-SHA384 */ +#define HMAC_SHA384_KEY_LEN 48 +#define HMAC_SHA384_192_CHECK_LEN 24 +#define HMAC_SHA384_CHECK_LEN 48 + /* HMAC-SHA512 */ #define HMAC_SHA512_KEY_LEN 64 #define HMAC_SHA512_256_CHECK_LEN 32 @@ -60,4 +65,9 @@ #define CHACHA20_POLY1305_IV_LEN 12 #define CHACHA20_POLY1305_CHECK_LEN 16 +/* AES-XCBC-MAC */ +#define AES_XCBC_MAC_KEY_LEN 16 +#define AES_XCBC_MAC_96_CHECK_LEN 12 +#define AES_XCBC_MAC_CHECK_LEN 16 + #endif diff --git a/test/validation/api/ipsec/ipsec.c b/test/validation/api/ipsec/ipsec.c index 3e2e743d..7c82d85a 100644 --- a/test/validation/api/ipsec/ipsec.c +++ b/test/validation/api/ipsec/ipsec.c @@ -204,10 +204,18 @@ int ipsec_check(odp_bool_t ah, if (!capa.auths.bit.sha256_hmac) return ODP_TEST_INACTIVE; break; + case ODP_AUTH_ALG_SHA384_HMAC: + if (!capa.auths.bit.sha384_hmac) + return ODP_TEST_INACTIVE; + break; case ODP_AUTH_ALG_SHA512_HMAC: if (!capa.auths.bit.sha512_hmac) return ODP_TEST_INACTIVE; break; + case ODP_AUTH_ALG_AES_XCBC_MAC: + if (!capa.auths.bit.aes_xcbc_mac) + return ODP_TEST_INACTIVE; + break; case ODP_AUTH_ALG_AES_GCM: if (!capa.auths.bit.aes_gcm) return ODP_TEST_INACTIVE; commit 61d16e162788ac0923c544b4d31bb847fa3d9189 Author: yhe <yhe(a)sonicwall.com> Date: Wed Mar 21 22:06:58 2018 +0800 linux-gen:crypto:implement AES-XCBC-MAC and SHA384-HMAC implement the algorithm AES-XCBC-MAC and SHA384-HMAC Signed-off-by: Tom He <yhe(a)sonicwall.com> Reviewed-by: Maxim Uvarov <maxim.uvarov(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 21449cfe..852f0212 100644 --- a/platform/linux-generic/odp_crypto.c +++ b/platform/linux-generic/odp_crypto.c @@ -35,6 +35,8 @@ #endif #define MAX_SESSIONS 32 +#define AES_BLOCK_SIZE 16 +#define AES_KEY_LENGTH 16 /* * Cipher algorithm capabilities @@ -95,10 +97,18 @@ static const odp_crypto_auth_capability_t auth_capa_sha256_hmac[] = { {.digest_len = 16, .key_len = 32, .aad_len = {.min = 0, .max = 0, .inc = 0} }, {.digest_len = 32, .key_len = 32, .aad_len = {.min = 0, .max = 0, .inc = 0} } }; +static const odp_crypto_auth_capability_t auth_capa_sha384_hmac[] = { +{.digest_len = 24, .key_len = 48, .aad_len = {.min = 0, .max = 0, .inc = 0} }, +{.digest_len = 48, .key_len = 48, .aad_len = {.min = 0, .max = 0, .inc = 0} } }; + static const odp_crypto_auth_capability_t auth_capa_sha512_hmac[] = { {.digest_len = 32, .key_len = 64, .aad_len = {.min = 0, .max = 0, .inc = 0} }, {.digest_len = 64, .key_len = 64, .aad_len = {.min = 0, .max = 0, .inc = 0} } }; +static const odp_crypto_auth_capability_t auth_capa_aes_xcbc[] = { +{.digest_len = 12, .key_len = 16, .aad_len = {.min = 0, .max = 0, .inc = 0} }, +{.digest_len = 16, .key_len = 16, .aad_len = {.min = 0, .max = 0, .inc = 0} } }; + static const odp_crypto_auth_capability_t auth_capa_aes_gcm[] = { {.digest_len = 16, .key_len = 0, .aad_len = {.min = 8, .max = 12, .inc = 4} } }; @@ -308,6 +318,169 @@ void packet_hmac(odp_packet_t pkt, HMAC_Final(ctx, hash, NULL); } +static void xor_block(uint8_t *res, const uint8_t *op) +{ + int i; + + for (i = 0; i < AES_BLOCK_SIZE; i++) + res[i] ^= op[i]; +} + +static void memxor(uint8_t *res, const uint8_t *op, size_t len) +{ + for (size_t i = 0; i < len; i++) + res[i] ^= op[i]; +} + +static +void packet_aes_xcbc_mac(odp_packet_t pkt, + const odp_crypto_packet_op_param_t *param, + odp_crypto_generic_session_t *session, + uint8_t *hash) +{ + uint8_t e[AES_BLOCK_SIZE] = {0}; + size_t eoff = 0; + uint32_t offset = param->auth_range.offset; + uint32_t len = param->auth_range.length; + uint32_t seglen = 0; + uint32_t datalen = 0; + int dummy_len = 0; + EVP_CIPHER_CTX *ctx; + void *mapaddr; + uint8_t *data = NULL; + + ODP_ASSERT(offset + len <= odp_packet_len(pkt)); + ODP_ASSERT(session != NULL); + ODP_ASSERT(sizeof(session->auth.key) >= 3 * AES_KEY_LENGTH); + + ctx = EVP_CIPHER_CTX_new(); + EVP_EncryptInit_ex(ctx, session->auth.evp_cipher, + NULL, session->auth.key, NULL); + + while (len > 0) { + mapaddr = odp_packet_offset(pkt, offset, &seglen, NULL); + datalen = seglen >= len ? len : seglen; + data = (uint8_t *)mapaddr; + offset += datalen; + len -= datalen; + if (eoff != 0) { + if (eoff + datalen > AES_BLOCK_SIZE) { + memxor(e + eoff, data, AES_BLOCK_SIZE - eoff); + datalen -= (AES_BLOCK_SIZE - eoff); + eoff = 0; + EVP_EncryptUpdate(ctx, + e, &dummy_len, e, sizeof(e)); + } else { + memxor(e + eoff, data, datalen); + eoff += datalen; + continue; + } + } + while (datalen > AES_BLOCK_SIZE) { + xor_block(e, data); + EVP_EncryptUpdate(ctx, e, &dummy_len, e, sizeof(e)); + data += AES_BLOCK_SIZE; + datalen -= AES_BLOCK_SIZE; + } + /* Segmentation handle */ + if (datalen > 0) { + memxor(e, data, datalen); + eoff = datalen; + } + } + + if (eoff == AES_BLOCK_SIZE) { + xor_block(e, session->auth.key + AES_KEY_LENGTH); + } else { + e[eoff] ^= 0x80; + xor_block(e, session->auth.key + AES_KEY_LENGTH * 2); + } + EVP_EncryptUpdate(ctx, hash, &dummy_len, e, sizeof(e)); + EVP_CIPHER_CTX_free(ctx); +} + +static +odp_crypto_alg_err_t auth_xcbcmac_gen(odp_packet_t pkt, + const odp_crypto_packet_op_param_t *param, + odp_crypto_generic_session_t *session) +{ + uint8_t hash[EVP_MAX_MD_SIZE]; + + /* Hash it */ + packet_aes_xcbc_mac(pkt, param, session, hash); + + /* Copy to the output location */ + odp_packet_copy_from_mem(pkt, + param->hash_result_offset, + session->p.auth_digest_len, + hash); + + return ODP_CRYPTO_ALG_ERR_NONE; +} + +static odp_crypto_alg_err_t +auth_xcbcmac_check(odp_packet_t pkt, + const odp_crypto_packet_op_param_t *param, + odp_crypto_generic_session_t *session) +{ + uint32_t bytes = session->p.auth_digest_len; + uint8_t hash_in[EVP_MAX_MD_SIZE]; + uint8_t hash_out[EVP_MAX_MD_SIZE]; + + /* Copy current value out and clear it before authentication */ + odp_packet_copy_to_mem(pkt, param->hash_result_offset, + bytes, hash_in); + + _odp_packet_set_data(pkt, param->hash_result_offset, + 0, bytes); + + /* Hash it */ + packet_aes_xcbc_mac(pkt, param, session, hash_out); + + /* Verify match */ + if (0 != memcmp(hash_in, hash_out, bytes)) + return ODP_CRYPTO_ALG_ERR_ICV_CHECK; + + /* Matched */ + return ODP_CRYPTO_ALG_ERR_NONE; +} + +static int process_aesxcbc_param(odp_crypto_generic_session_t *session, + const EVP_CIPHER *cipher) +{ + uint32_t k1[4] = { 0x01010101, 0x01010101, 0x01010101, 0x01010101 }; + uint32_t k2[4] = { 0x02020202, 0x02020202, 0x02020202, 0x02020202 }; + uint32_t k3[4] = { 0x03030303, 0x03030303, 0x03030303, 0x03030303 }; + EVP_CIPHER_CTX *ctx; + int dummy_len = 0; + + /* Set function */ + if (ODP_CRYPTO_OP_ENCODE == session->p.op) + session->auth.func = auth_xcbcmac_gen; + else + session->auth.func = auth_xcbcmac_check; + session->auth.init = null_crypto_init_routine; + + session->auth.evp_cipher = cipher; + ctx = EVP_CIPHER_CTX_new(); + EVP_EncryptInit_ex(ctx, session->auth.evp_cipher, NULL, + session->p.auth_key.data, NULL); + /* K1 = 0x01010101010101010101010101010101 encrypted with Key K */ + EVP_EncryptUpdate(ctx, session->auth.key, + &dummy_len, (uint8_t *)k1, AES_BLOCK_SIZE); + + /* K2 = 0x02020202020202020202020202020202 encrypted with Key K */ + EVP_EncryptUpdate(ctx, session->auth.key + AES_KEY_LENGTH, + &dummy_len, (uint8_t *)k2, AES_BLOCK_SIZE); + + /* K3 = 0x03030303030303030303030303030303 encrypted with Key K */ + EVP_EncryptUpdate(ctx, session->auth.key + AES_KEY_LENGTH * 2, + &dummy_len, (uint8_t *)k3, AES_BLOCK_SIZE); + + EVP_CIPHER_CTX_free(ctx); + return 0; +} + static odp_crypto_alg_err_t auth_hmac_gen(odp_packet_t pkt, const odp_crypto_packet_op_param_t *param, @@ -1171,7 +1344,9 @@ int odp_crypto_capability(odp_crypto_capability_t *capa) capa->auths.bit.md5_hmac = 1; capa->auths.bit.sha1_hmac = 1; capa->auths.bit.sha256_hmac = 1; + capa->auths.bit.sha384_hmac = 1; capa->auths.bit.sha512_hmac = 1; + capa->auths.bit.aes_xcbc_mac = 1; capa->auths.bit.aes_gcm = 1; capa->auths.bit.aes_ccm = 1; capa->auths.bit.aes_gmac = 1; @@ -1268,10 +1443,18 @@ int odp_crypto_auth_capability(odp_auth_alg_t auth, src = auth_capa_sha256_hmac; num = sizeof(auth_capa_sha256_hmac) / size; break; + case ODP_AUTH_ALG_SHA384_HMAC: + src = auth_capa_sha384_hmac; + num = sizeof(auth_capa_sha384_hmac) / size; + break; case ODP_AUTH_ALG_SHA512_HMAC: src = auth_capa_sha512_hmac; num = sizeof(auth_capa_sha512_hmac) / size; break; + case ODP_AUTH_ALG_AES_XCBC_MAC: + src = auth_capa_aes_xcbc; + num = sizeof(auth_capa_aes_xcbc) / size; + break; case ODP_AUTH_ALG_AES_GCM: src = auth_capa_aes_gcm; num = sizeof(auth_capa_aes_gcm) / size; @@ -1481,9 +1664,15 @@ odp_crypto_session_create(odp_crypto_session_param_t *param, case ODP_AUTH_ALG_SHA256_HMAC: rc = process_auth_hmac_param(session, EVP_sha256()); break; + case ODP_AUTH_ALG_SHA384_HMAC: + rc = process_auth_hmac_param(session, EVP_sha384()); + break; case ODP_AUTH_ALG_SHA512_HMAC: rc = process_auth_hmac_param(session, EVP_sha512()); break; + case ODP_AUTH_ALG_AES_XCBC_MAC: + rc = process_aesxcbc_param(session, EVP_aes_128_ecb()); + break; #if ODP_DEPRECATED_API case ODP_AUTH_ALG_AES128_GCM: if (param->cipher_alg == ODP_CIPHER_ALG_AES128_GCM) diff --git a/platform/linux-generic/odp_ipsec_sad.c b/platform/linux-generic/odp_ipsec_sad.c index 8dab489c..c2126969 100644 --- a/platform/linux-generic/odp_ipsec_sad.c +++ b/platform/linux-generic/odp_ipsec_sad.c @@ -246,8 +246,12 @@ uint32_t _odp_ipsec_auth_digest_len(odp_auth_alg_t auth) #endif case ODP_AUTH_ALG_SHA256_HMAC: return 16; + case ODP_AUTH_ALG_SHA384_HMAC: + return 24; case ODP_AUTH_ALG_SHA512_HMAC: return 32; + case ODP_AUTH_ALG_AES_XCBC_MAC: + return 12; #if ODP_DEPRECATED_API case ODP_AUTH_ALG_AES128_GCM: #endif ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/odp_crypto.c | 189 ++++++++++++++++++++ platform/linux-generic/odp_ipsec_sad.c | 4 + test/validation/api/crypto/odp_crypto_test_inp.c | 91 ++++++++++ test/validation/api/crypto/test_vectors.h | 209 +++++++++++++++++++++++ test/validation/api/crypto/test_vectors_len.h | 10 ++ test/validation/api/ipsec/ipsec.c | 8 + 6 files changed, 511 insertions(+) hooks/post-receive --

6 years, 10 months

[COMMIT] branch master updated. v1.18.0.1_tigermoth_rc3-35-g83fda5a4

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 83fda5a447335b95bdd991187d4efb0a15a5709a (commit) from 654507c6eeed83dd84210f7e481ded34f5d4cdca (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 83fda5a447335b95bdd991187d4efb0a15a5709a Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Tue Mar 27 16:53:08 2018 +0300 api: packet: UDP checksum value of zero UDP checksum value of zero results OK status when checksum is checked. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/include/odp/api/spec/packet.h b/include/odp/api/spec/packet.h index e1f2f221..66665e12 100644 --- a/include/odp/api/spec/packet.h +++ b/include/odp/api/spec/packet.h @@ -1711,6 +1711,9 @@ odp_packet_chksum_status_t odp_packet_l3_chksum_status(odp_packet_t pkt); * attempt. It depends on packet input (or IPSEC) configuration, packet content * and implementation capabilities if checksum check is attempted for a packet. * + * When a UDP packet does not have a checksum (e.g. checksum field of a UDP/IPv4 + * packet is zero), checksum check result is ODP_PACKET_CHKSUM_OK. + * * @param pkt Packet handle * * @return L4 checksum check status ----------------------------------------------------------------------- Summary of changes: include/odp/api/spec/packet.h | 3 +++ 1 file changed, 3 insertions(+) hooks/post-receive --

6 years, 10 months

[COMMIT] branch api-next updated. v1.18.0.0_tigermoth_rc2-5-g1c11eb2f

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, api-next has been updated via 1c11eb2f0e612eb9b7a6cbe91a3e4ac3e61c7b80 (commit) from f3cf9c3583364af7625679d0021c4d55c3414994 (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 1c11eb2f0e612eb9b7a6cbe91a3e4ac3e61c7b80 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Tue Mar 27 16:53:08 2018 +0300 api: packet: UDP checksum value of zero UDP checksum value of zero results OK status when checksum is checked. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/include/odp/api/spec/packet.h b/include/odp/api/spec/packet.h index e1f2f221..66665e12 100644 --- a/include/odp/api/spec/packet.h +++ b/include/odp/api/spec/packet.h @@ -1711,6 +1711,9 @@ odp_packet_chksum_status_t odp_packet_l3_chksum_status(odp_packet_t pkt); * attempt. It depends on packet input (or IPSEC) configuration, packet content * and implementation capabilities if checksum check is attempted for a packet. * + * When a UDP packet does not have a checksum (e.g. checksum field of a UDP/IPv4 + * packet is zero), checksum check result is ODP_PACKET_CHKSUM_OK. + * * @param pkt Packet handle * * @return L4 checksum check status ----------------------------------------------------------------------- Summary of changes: include/odp/api/spec/packet.h | 3 +++ 1 file changed, 3 insertions(+) hooks/post-receive --

6 years, 10 months

[COMMIT] branch master updated. v1.18.0.1_tigermoth_rc3-34-g654507c6

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 654507c6eeed83dd84210f7e481ded34f5d4cdca (commit) via 84f8013995d4b96ac9471cc92285c76b50464415 (commit) from 92ebb26bae583ff864bc4bef6a2776329527a069 (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 654507c6eeed83dd84210f7e481ded34f5d4cdca Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Tue Mar 27 14:25:12 2018 +0300 test: sched_pktio: run in validation test suite Add script to run the test as part of validation test suite. The script is based on odp_l2fwd_run.sh. Use only single worker as that requires only one rx/tx queue from pktio. Test passes if at least 1000 packets are received in 5 seconds. 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/Makefile.am b/test/performance/Makefile.am index c8f0bdec..811cc1c0 100644 --- a/test/performance/Makefile.am +++ b/test/performance/Makefile.am @@ -15,6 +15,7 @@ COMPILE_ONLY = odp_l2fwd \ TESTSCRIPTS = odp_l2fwd_run.sh \ odp_sched_latency_run.sh \ + odp_sched_pktio_run.sh \ odp_scheduling_run.sh if HAVE_PCAP diff --git a/test/performance/odp_sched_pktio_run.sh b/test/performance/odp_sched_pktio_run.sh new file mode 100755 index 00000000..db14fb59 --- /dev/null +++ b/test/performance/odp_sched_pktio_run.sh @@ -0,0 +1,101 @@ +#!/bin/sh +# +# Copyright (c) 2018, Linaro Limited +# All rights reserved. +# +# SPDX-License-Identifier: BSD-3-Clause +# + +# directory where test binaries have been built +TEST_DIR="${TEST_DIR:-$PWD}" +# directory where test sources are, including scripts +TEST_SRC_DIR=$(dirname $0) + +PATH=$TEST_DIR:$TEST_DIR/../../example/generator:$PATH + +# exit codes expected by automake for skipped tests +TEST_SKIPPED=77 + +VALIDATION_TESTDIR=platform/$ODP_PLATFORM/test/validation +PLATFORM_VALIDATION=${TEST_SRC_DIR}/../../$VALIDATION_TESTDIR + +FLOOD_MODE=0 + +# Use installed pktio env or for make check take it from platform directory +if [ -f "./pktio_env" ]; then + . ./pktio_env +elif [ "$ODP_PLATFORM" = "" ]; then + echo "$0: error: ODP_PLATFORM must be defined" + # not skipped as this should never happen via "make check" + exit 1 +elif [ -f ${PLATFORM_VALIDATION}/api/pktio/pktio_env ]; then + . ${PLATFORM_VALIDATION}/api/pktio/pktio_env +else + echo "BUG: unable to find pktio_env!" + echo "pktio_env has to be in current directory or " + echo "in platform/\$ODP_PLATFORM/test." + echo "ODP_PLATFORM=\"$ODP_PLATFORM\"" + exit 1 +fi + +run_sched_pktio() +{ + setup_pktio_env clean # install trap to call cleanup_pktio_env + + if [ $? -ne 0 ]; then + echo "setup_pktio_env error $?" + exit $TEST_SKIPPED + fi + + type odp_generator > /dev/null + if [ $? -ne 0 ]; then + echo "odp_generator not installed. Aborting." + cleanup_pktio_env + exit 1 + fi + + # 1 worker + odp_sched_pktio${EXEEXT} -i $IF1,$IF2 -c 1 -s & + + TEST_PID=$! + + sleep 1 + + # Run generator with one worker + (odp_generator${EXEEXT} --interval $FLOOD_MODE -I $IF0 \ + --srcip 192.168.0.1 --dstip 192.168.0.2 \ + -m u -w 1 2>&1 > /dev/null) \ + 2>&1 > /dev/null & + + GEN_PID=$! + + # Run test for 5 sec + sleep 5 + + kill ${GEN_PID} + wait ${GEN_PID} + + # Kill with SIGINT to output statistics + kill -2 ${TEST_PID} + wait ${TEST_PID} + + ret=$? + + if [ $ret -eq 3 ]; then + echo "PASS: received and transmitted over 5000 packets" + ret=0 + else + echo "FAIL: less than thousand rx or tx packets $ret" + ret=1 + fi + + cleanup_pktio_env + + exit $ret +} + +case "$1" in + setup) setup_pktio_env ;; + cleanup) cleanup_pktio_env ;; + *) run_sched_pktio ;; +esac commit 84f8013995d4b96ac9471cc92285c76b50464415 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Tue Mar 27 12:55:57 2018 +0300 test: sched_pktio: add option to collect statistics Options -s enables statistics collection and changes return value to kilo-packets. Return value can be used in scripts to validate correct test execution. 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 cf6e17f4..16d14b19 100644 --- a/test/performance/odp_sched_pktio.c +++ b/test/performance/odp_sched_pktio.c @@ -8,6 +8,8 @@ #include <string.h> #include <signal.h> #include <stdlib.h> +#include <stdint.h> +#include <inttypes.h> #include <odp_api.h> #include <odp/helper/odph_api.h> @@ -22,12 +24,18 @@ #define BURST_SIZE 32 #define CHECK_PERIOD 10000 #define MAX_PKTIO_INDEXES 256 +#define TEST_PASSED_LIMIT 5000 typedef struct { int worker_id; void *test_global_ptr; } worker_arg_t; +typedef struct ODP_ALIGNED_CACHE { + uint64_t rx_pkt; + uint64_t tx_pkt; +} worker_stat_t; + typedef struct { volatile int stop_workers; odp_barrier_t worker_start; @@ -35,6 +43,7 @@ typedef struct { struct { int num_worker; int num_pktio; + uint8_t collect_stat; } opt; int max_workers; @@ -66,6 +75,10 @@ typedef struct { /* 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; + } test_global_t; static test_global_t *test_global; @@ -143,6 +156,11 @@ static int worker_thread(void *arg) 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); @@ -172,7 +190,8 @@ static void print_usage(const char *progname) "\n" "OPTIONS:\n" " -i, --interface <name> Packet IO interfaces (comma-separated, no spaces)\n" - " -c, --count Worker thread count. Default: 1\n" + " -c, --count <number> Worker thread count. Default: 1\n" + " -s, --stat Collect statistics.\n" " -h, --help Display help and exit.\n\n", NO_PATH(progname)); } @@ -185,10 +204,11 @@ static int parse_options(int argc, char *argv[], test_global_t *test_global) const struct option longopts[] = { {"interface", required_argument, NULL, 'i'}, {"count", required_argument, NULL, 'c'}, + {"stat", no_argument, NULL, 's'}, {"help", no_argument, NULL, 'h'}, {NULL, 0, NULL, 0} }; - const char *shortopts = "+i:c:h"; + const char *shortopts = "+i:c:sh"; int ret = 0; test_global->opt.num_worker = 1; @@ -237,6 +257,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 's': + test_global->opt.collect_stat = 1; + break; case 'h': print_usage(argv[0]); ret = -1; @@ -342,9 +365,47 @@ static void print_config(test_global_t *test_global) " num output queues: %i\n", test_global->num_input_queues, test_global->num_output_queues); + printf(" collect statistics: %u\n", test_global->opt.collect_stat); + printf("\n"); } +static void print_stat(test_global_t *test_global, uint64_t nsec) +{ + int i; + uint64_t rx, tx, drop; + uint64_t rx_sum = 0; + uint64_t tx_sum = 0; + double sec = 0.0; + + printf("\nTest statistics\n"); + printf(" worker rx_pkt tx_pkt dropped\n"); + + for (i = 0; i < test_global->opt.num_worker; i++) { + rx = test_global->worker_stat[i].rx_pkt; + tx = test_global->worker_stat[i].tx_pkt; + rx_sum += rx; + tx_sum += tx; + + printf(" %6i %16" PRIu64 " %16" PRIu64 " %16" PRIu64 "\n", + i, rx, tx, rx - tx); + } + + test_global->rx_pkt_sum = rx_sum; + test_global->tx_pkt_sum = tx_sum; + drop = rx_sum - tx_sum; + + printf(" --------------------------------------------------\n"); + printf(" total %16" PRIu64 " %16" PRIu64 " %16" PRIu64 "\n\n", + rx_sum, tx_sum, drop); + + sec = nsec / 1000000000.0; + printf(" Total test time: %.2f sec\n", sec); + printf(" Rx packet rate: %.2f pps\n", rx_sum / sec); + printf(" Tx packet rate: %.2f pps\n", tx_sum / sec); + printf(" Drop rate: %.2f pps\n\n", drop / sec); +} + static int open_pktios(test_global_t *test_global) { odp_pool_param_t pool_param; @@ -628,7 +689,9 @@ int main(int argc, char *argv[]) odp_instance_t instance; odp_init_t init; odp_shm_t shm; + odp_time_t t1, t2; odph_odpthread_t thread[MAX_WORKERS]; + int ret = 0; signal(SIGINT, sig_handler); @@ -696,13 +759,28 @@ int main(int argc, char *argv[]) odp_mb_full(); } + t1 = odp_time_local(); + wait_workers(thread, test_global); + t2 = odp_time_local(); + quit: stop_pktios(test_global); empty_queues(); close_pktios(test_global); + if (test_global->opt.collect_stat) { + print_stat(test_global, odp_time_diff_ns(t2, t1)); + + /* Encode return value for validation test usage. */ + if (test_global->rx_pkt_sum > TEST_PASSED_LIMIT) + ret += 1; + + if (test_global->tx_pkt_sum > TEST_PASSED_LIMIT) + ret += 2; + } + if (odp_shm_free(shm)) { printf("Error: shm free failed.\n"); return -1; @@ -718,5 +796,5 @@ quit: return -1; } - return 0; + return ret; } ----------------------------------------------------------------------- Summary of changes: test/performance/Makefile.am | 1 + test/performance/odp_sched_pktio.c | 84 +++++++++++++++++++++- .../{odp_l2fwd_run.sh => odp_sched_pktio_run.sh} | 69 +++++++----------- 3 files changed, 108 insertions(+), 46 deletions(-) copy test/performance/{odp_l2fwd_run.sh => odp_sched_pktio_run.sh} (50%) hooks/post-receive --

6 years, 10 months

[COMMIT] branch master updated. v1.18.0.1_tigermoth_rc3-32-g92ebb26b

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 92ebb26bae583ff864bc4bef6a2776329527a069 (commit) via ed4e1bfea15d8502e50b6c210f38dd3f13683d2f (commit) via ef5998dfd0ba1405fef6dd1a7f0e9adf686fca89 (commit) via a430caf661d4a0ad8d69c67dc7a20911e3169a25 (commit) from fbe07de54f3768f32bd39a0ea9aa2a79188b1186 (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 92ebb26bae583ff864bc4bef6a2776329527a069 Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Fri Apr 6 16:40:17 2018 +0300 travis: use -M option for generated patches generate patches with -M (move) option to not validate moved files from stratch. Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> diff --git a/scripts/ci-checkpatches.sh b/scripts/ci-checkpatches.sh index 798efe05..383045cd 100755 --- a/scripts/ci-checkpatches.sh +++ b/scripts/ci-checkpatches.sh @@ -7,14 +7,14 @@ echo "Run checkpatch for ${PATCHES}" # validate only the latest commit if it's not merge commit. if [ "$PATCHES" = "" ]; then - git format-patch -1 HEAD; + git format-patch -1 -M HEAD; perl ./scripts/checkpatch.pl *.patch; exit $? fi git show --summary HEAD| grep -q '^Merge:'; if [ $? -ne 0 ]; then - git format-patch -1 HEAD; + git format-patch -1 -M HEAD; perl ./scripts/checkpatch.pl *.patch; exit $? fi commit ed4e1bfea15d8502e50b6c210f38dd3f13683d2f Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Fri Apr 6 16:21:34 2018 +0300 linux-gen: ishm: remove useless debug print in case of huge page it is ok that file was not created, no need to generate confusing debug message here. 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/odp_ishm.c b/platform/linux-generic/odp_ishm.c index 3f123c90..5f5e5eef 100644 --- a/platform/linux-generic/odp_ishm.c +++ b/platform/linux-generic/odp_ishm.c @@ -456,10 +456,7 @@ static int create_file(int block_index, huge_flag_t huge, uint64_t len, fd = open(filename, oflag, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); if (fd < 0) { - if (huge == HUGE) - ODP_DBG("open failed for %s: %s.\n", - filename, strerror(errno)); - else + if (huge != HUGE) ODP_ERR("open failed for %s: %s.\n", filename, strerror(errno)); return -1; commit ef5998dfd0ba1405fef6dd1a7f0e9adf686fca89 Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Fri Apr 6 16:17:01 2018 +0300 linux-gen: hide debug prints from fd server Debug prints are very specific to fdserver internals and useless until you debug fdserver code itself. Add option to uncomment this prints if needed. 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/odp_fdserver.c b/platform/linux-generic/odp_fdserver.c index f8d40ff9..a06fb508 100644 --- a/platform/linux-generic/odp_fdserver.c +++ b/platform/linux-generic/odp_fdserver.c @@ -70,6 +70,14 @@ #define MAP_ANONYMOUS MAP_ANON #endif +#define FD_ODP_DEBUG_PRINT 0 + +#define FD_ODP_DBG(fmt, ...) \ + do { \ + if (FD_ODP_DEBUG_PRINT == 1) \ + ODP_DBG(fmt, ##__VA_ARGS__);\ + } while (0) + /* when accessing the client functions, clients should be mutexed: */ static odp_spinlock_t *client_lock; @@ -280,8 +288,8 @@ int _odp_fdserver_register_fd(fd_server_context_e context, uint64_t key, odp_spinlock_lock(client_lock); - ODP_DBG("FD client register: pid=%d key=%" PRIu64 ", fd=%d\n", - getpid(), key, fd_to_send); + FD_ODP_DBG("FD client register: pid=%d key=%" PRIu64 ", fd=%d\n", + getpid(), key, fd_to_send); s_sock = get_socket(); if (s_sock < 0) { @@ -326,8 +334,8 @@ int _odp_fdserver_deregister_fd(fd_server_context_e context, uint64_t key) odp_spinlock_lock(client_lock); - ODP_DBG("FD client deregister: pid=%d key=%" PRIu64 "\n", - getpid(), key); + FD_ODP_DBG("FD client deregister: pid=%d key=%" PRIu64 "\n", + getpid(), key); s_sock = get_socket(); if (s_sock < 0) { @@ -413,7 +421,7 @@ static int stop_server(void) odp_spinlock_lock(client_lock); - ODP_DBG("FD sending server stop request\n"); + FD_ODP_DBG("FD sending server stop request\n"); s_sock = get_socket(); if (s_sock < 0) { @@ -464,8 +472,8 @@ static int handle_request(int client_sock) fd_table[fd_table_nb_entries].context = context; fd_table[fd_table_nb_entries].key = key; fd_table[fd_table_nb_entries++].fd = fd; - ODP_DBG("storing {ctx=%d, key=%" PRIu64 "}->fd=%d\n", - context, key, fd); + FD_ODP_DBG("storing {ctx=%d, key=%" PRIu64 "}->fd=%d\n", + context, key, fd); } else { ODP_ERR("FD table full\n"); send_fdserver_msg(client_sock, FD_REGISTER_NACK, @@ -517,9 +525,9 @@ static int handle_request(int client_sock) for (i = 0; i < fd_table_nb_entries; i++) { if ((fd_table[i].context == context) && (fd_table[i].key == key)) { - ODP_DBG("drop {ctx=%d," - " key=%" PRIu64 "}->fd=%d\n", - context, key, fd_table[i].fd); + FD_ODP_DBG("drop {ctx=%d," + " key=%" PRIu64 "}->fd=%d\n", + context, key, fd_table[i].fd); close(fd_table[i].fd); fd_table[i] = fd_table[--fd_table_nb_entries]; send_fdserver_msg(client_sock, @@ -535,7 +543,7 @@ static int handle_request(int client_sock) break; case FD_SERVERSTOP_REQ: - ODP_DBG("Stoping FD server\n"); + FD_ODP_DBG("Stoping FD server\n"); return 1; default: commit a430caf661d4a0ad8d69c67dc7a20911e3169a25 Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Thu Apr 5 18:31:08 2018 +0300 linux-gen: clean up ishm file naming rename ivshmem related files with _<name> prefix to odp_<name> for better fix project code style. No code change, just file renames. 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/Makefile.am b/platform/linux-generic/Makefile.am index 7e57994d..4f03eab1 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -82,15 +82,11 @@ endif noinst_HEADERS = \ arch/odp_arch_time_internal.h \ - include/_fdserver_internal.h \ - include/_ishm_internal.h \ - include/_ishmphy_internal.h \ - include/_ishmpool_internal.h \ include/odp_align_internal.h \ include/odp_atomic_internal.h \ - include/odp_buffer_inlines.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 \ @@ -98,37 +94,41 @@ noinst_HEADERS = \ include/odp_config_internal.h \ include/odp_debug_internal.h \ include/odp_errno_define.h \ + include/odp_fdserver_internal.h \ include/odp_forward_typedefs_internal.h \ include/odp_internal.h \ include/odp_ipsec_internal.h \ + include/odp_ishm_internal.h \ + include/odp_ishmphy_internal.h \ + include/odp_ishmpool_internal.h \ include/odp_libconfig_internal.h \ include/odp_llqueue.h \ include/odp_macros_internal.h \ include/odp_name_table_internal.h \ + include/odp_packet_dpdk.h \ include/odp_packet_internal.h \ include/odp_packet_io_internal.h \ include/odp_packet_io_ipc_internal.h \ include/odp_packet_io_ring_internal.h \ include/odp_packet_netmap.h \ - include/odp_packet_dpdk.h \ + include/odp_packet_null.h \ include/odp_packet_socket.h \ include/odp_packet_tap.h \ - include/odp_packet_null.h \ include/odp_pkt_queue_internal.h \ include/odp_pool_internal.h \ include/odp_posix_extensions.h \ - include/odp_queue_internal.h \ - include/odp_queue_scalable_internal.h \ include/odp_queue_if.h \ + include/odp_queue_internal.h \ include/odp_queue_lf.h \ + include/odp_queue_scalable_internal.h \ include/odp_ring_internal.h \ include/odp_ring_st_internal.h \ include/odp_schedule_if.h \ - include/odp_schedule_scalable.h \ include/odp_schedule_scalable_config.h \ + include/odp_schedule_scalable.h \ include/odp_schedule_scalable_ordered.h \ - include/odp_sorted_list_internal.h \ include/odp_shm_internal.h \ + include/odp_sorted_list_internal.h \ include/odp_timer_internal.h \ include/odp_timer_wheel_internal.h \ include/odp_traffic_mngr_internal.h \ @@ -138,15 +138,10 @@ noinst_HEADERS = \ include/protocols/tcp.h \ include/protocols/thash.h \ include/protocols/udp.h - nodist_noinst_HEADERS = \ include/odp_libconfig_config.h __LIB__libodp_linux_la_SOURCES = \ - _fdserver.c \ - _ishm.c \ - _ishmphy.c \ - _ishmpool.c \ odp_atomic.c \ odp_barrier.c \ odp_bitmap.c \ @@ -159,30 +154,21 @@ __LIB__libodp_linux_la_SOURCES = \ odp_crypto.c \ odp_errno.c \ odp_event.c \ + odp_fdserver.c \ odp_hash.c \ - odp_init.c \ odp_impl.c \ + odp_init.c \ odp_ipsec.c \ odp_ipsec_events.c \ odp_ipsec_sad.c \ + odp_ishm.c \ + odp_ishmphy.c \ + odp_ishmpool.c \ odp_libconfig.c \ odp_name_table.c \ odp_packet.c \ odp_packet_flags.c \ odp_packet_io.c \ - pktio/ethtool.c \ - pktio/io_ops.c \ - pktio/ipc.c \ - pktio/pktio_common.c \ - pktio/loop.c \ - pktio/netmap.c \ - pktio/null.c \ - pktio/dpdk.c \ - pktio/socket.c \ - pktio/socket_mmap.c \ - pktio/sysfs.c \ - pktio/tap.c \ - pktio/ring.c \ odp_pkt_queue.c \ odp_pool.c \ odp_queue_basic.c \ @@ -193,10 +179,10 @@ __LIB__libodp_linux_la_SOURCES = \ odp_rwlock_recursive.c \ odp_schedule_basic.c \ odp_schedule_if.c \ - odp_schedule_sp.c \ odp_schedule_iquery.c \ odp_schedule_scalable.c \ odp_schedule_scalable_ordered.c \ + odp_schedule_sp.c \ odp_shared_memory.c \ odp_sorted_list.c \ odp_spinlock.c \ @@ -209,8 +195,20 @@ __LIB__libodp_linux_la_SOURCES = \ odp_timer_wheel.c \ odp_traffic_mngr.c \ odp_version.c \ - odp_weak.c - + odp_weak.c \ + pktio/dpdk.c \ + pktio/ethtool.c \ + pktio/io_ops.c \ + pktio/ipc.c \ + pktio/loop.c \ + pktio/netmap.c \ + pktio/null.c \ + pktio/pktio_common.c \ + pktio/ring.c \ + pktio/socket.c \ + pktio/socket_mmap.c \ + pktio/sysfs.c \ + pktio/tap.c if ODP_ABI_COMPAT __LIB__libodp_linux_la_SOURCES += \ odp_atomic_api.c \ diff --git a/platform/linux-generic/include/_fdserver_internal.h b/platform/linux-generic/include/odp_fdserver_internal.h similarity index 100% rename from platform/linux-generic/include/_fdserver_internal.h rename to platform/linux-generic/include/odp_fdserver_internal.h diff --git a/platform/linux-generic/include/_ishm_internal.h b/platform/linux-generic/include/odp_ishm_internal.h similarity index 100% rename from platform/linux-generic/include/_ishm_internal.h rename to platform/linux-generic/include/odp_ishm_internal.h diff --git a/platform/linux-generic/include/_ishmphy_internal.h b/platform/linux-generic/include/odp_ishmphy_internal.h similarity index 100% rename from platform/linux-generic/include/_ishmphy_internal.h rename to platform/linux-generic/include/odp_ishmphy_internal.h diff --git a/platform/linux-generic/include/_ishmpool_internal.h b/platform/linux-generic/include/odp_ishmpool_internal.h similarity index 100% rename from platform/linux-generic/include/_ishmpool_internal.h rename to platform/linux-generic/include/odp_ishmpool_internal.h diff --git a/platform/linux-generic/include/odp_schedule_scalable_ordered.h b/platform/linux-generic/include/odp_schedule_scalable_ordered.h index fb4720a5..17d4f7ea 100644 --- a/platform/linux-generic/include/odp_schedule_scalable_ordered.h +++ b/platform/linux-generic/include/odp_schedule_scalable_ordered.h @@ -14,7 +14,7 @@ #include <odp_internal.h> #include <odp_align_internal.h> #include <odp_bitset.h> -#include <_ishmpool_internal.h> +#include <odp_ishmpool_internal.h> /* High level functioning of reordering * Datastructures - diff --git a/platform/linux-generic/_fdserver.c b/platform/linux-generic/odp_fdserver.c similarity index 99% rename from platform/linux-generic/_fdserver.c rename to platform/linux-generic/odp_fdserver.c index af9ca4a0..f8d40ff9 100644 --- a/platform/linux-generic/_fdserver.c +++ b/platform/linux-generic/odp_fdserver.c @@ -42,7 +42,7 @@ #include <odp/api/spinlock.h> #include <odp_internal.h> #include <odp_debug_internal.h> -#include <_fdserver_internal.h> +#include <odp_fdserver_internal.h> #include <sys/prctl.h> #include <signal.h> diff --git a/platform/linux-generic/_ishm.c b/platform/linux-generic/odp_ishm.c similarity index 99% rename from platform/linux-generic/_ishm.c rename to platform/linux-generic/odp_ishm.c index ab112ace..3f123c90 100644 --- a/platform/linux-generic/_ishm.c +++ b/platform/linux-generic/odp_ishm.c @@ -57,10 +57,10 @@ #include <odp_shm_internal.h> #include <odp_debug_internal.h> #include <odp_align_internal.h> -#include <_fdserver_internal.h> -#include <_ishm_internal.h> -#include <_ishmphy_internal.h> -#include <_ishmpool_internal.h> +#include <odp_fdserver_internal.h> +#include <odp_ishm_internal.h> +#include <odp_ishmphy_internal.h> +#include <odp_ishmpool_internal.h> #include <stdlib.h> #include <stdio.h> #include <unistd.h> diff --git a/platform/linux-generic/_ishmphy.c b/platform/linux-generic/odp_ishmphy.c similarity index 98% rename from platform/linux-generic/_ishmphy.c rename to platform/linux-generic/odp_ishmphy.c index 8dde2831..6207ce75 100644 --- a/platform/linux-generic/_ishmphy.c +++ b/platform/linux-generic/odp_ishmphy.c @@ -18,8 +18,8 @@ #include <odp/api/debug.h> #include <odp_debug_internal.h> #include <odp_align_internal.h> -#include <_ishm_internal.h> -#include <_ishmphy_internal.h> +#include <odp_ishm_internal.h> +#include <odp_ishmphy_internal.h> #include <stdlib.h> #include <stdio.h> @@ -31,7 +31,7 @@ #include <fcntl.h> #include <sys/types.h> #include <sys/wait.h> -#include <_ishmphy_internal.h> +#include <odp_ishmphy_internal.h> static void *common_va_address; static uint64_t common_va_len; diff --git a/platform/linux-generic/_ishmpool.c b/platform/linux-generic/odp_ishmpool.c similarity index 99% rename from platform/linux-generic/_ishmpool.c rename to platform/linux-generic/odp_ishmpool.c index 4ff24c02..04a0e535 100644 --- a/platform/linux-generic/_ishmpool.c +++ b/platform/linux-generic/odp_ishmpool.c @@ -51,8 +51,8 @@ #include <odp_shm_internal.h> #include <odp_debug_internal.h> #include <odp_align_internal.h> -#include <_ishm_internal.h> -#include <_ishmpool_internal.h> +#include <odp_ishm_internal.h> +#include <odp_ishmpool_internal.h> #include <stdlib.h> #include <stdio.h> #include <unistd.h> diff --git a/platform/linux-generic/odp_queue_scalable.c b/platform/linux-generic/odp_queue_scalable.c index 895133cd..2a5e01d4 100644 --- a/platform/linux-generic/odp_queue_scalable.c +++ b/platform/linux-generic/odp_queue_scalable.c @@ -25,8 +25,8 @@ #include <odp_pool_internal.h> #include <odp_queue_scalable_internal.h> #include <odp_schedule_if.h> -#include <_ishm_internal.h> -#include <_ishmpool_internal.h> +#include <odp_ishm_internal.h> +#include <odp_ishmpool_internal.h> #include <string.h> #include <inttypes.h> diff --git a/platform/linux-generic/odp_schedule_scalable.c b/platform/linux-generic/odp_schedule_scalable.c index f5974442..023ab1ed 100644 --- a/platform/linux-generic/odp_schedule_scalable.c +++ b/platform/linux-generic/odp_schedule_scalable.c @@ -21,8 +21,8 @@ #include <odp_internal.h> #include <odp_config_internal.h> #include <odp_debug_internal.h> -#include <_ishm_internal.h> -#include <_ishmpool_internal.h> +#include <odp_ishm_internal.h> +#include <odp_ishmpool_internal.h> #include <odp_align_internal.h> #include <odp_buffer_inlines.h> diff --git a/platform/linux-generic/odp_shared_memory.c b/platform/linux-generic/odp_shared_memory.c index c9b04dfd..edf261af 100644 --- a/platform/linux-generic/odp_shared_memory.c +++ b/platform/linux-generic/odp_shared_memory.c @@ -11,7 +11,7 @@ #include <odp/api/std_types.h> #include <odp/api/shared_memory.h> #include <odp/api/plat/strong_types.h> -#include <_ishm_internal.h> +#include <odp_ishm_internal.h> #include <odp_internal.h> #include <string.h> diff --git a/platform/linux-generic/pktio/ipc.c b/platform/linux-generic/pktio/ipc.c index 6dcc7a59..08e3e4bc 100644 --- a/platform/linux-generic/pktio/ipc.c +++ b/platform/linux-generic/pktio/ipc.c @@ -11,7 +11,7 @@ #include <odp_packet_io_internal.h> #include <odp/api/system_info.h> #include <odp_shm_internal.h> -#include <_ishm_internal.h> +#include <odp_ishm_internal.h> #include <sys/mman.h> #include <sys/stat.h> ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/Makefile.am | 64 +++++++++++----------- ...fdserver_internal.h => odp_fdserver_internal.h} | 0 .../{_ishm_internal.h => odp_ishm_internal.h} | 0 ...{_ishmphy_internal.h => odp_ishmphy_internal.h} | 0 ...ishmpool_internal.h => odp_ishmpool_internal.h} | 0 .../include/odp_schedule_scalable_ordered.h | 2 +- .../linux-generic/{_fdserver.c => odp_fdserver.c} | 32 +++++++---- platform/linux-generic/{_ishm.c => odp_ishm.c} | 13 ++--- .../linux-generic/{_ishmphy.c => odp_ishmphy.c} | 6 +- .../linux-generic/{_ishmpool.c => odp_ishmpool.c} | 4 +- platform/linux-generic/odp_queue_scalable.c | 4 +- platform/linux-generic/odp_schedule_scalable.c | 4 +- platform/linux-generic/odp_shared_memory.c | 2 +- platform/linux-generic/pktio/ipc.c | 2 +- scripts/ci-checkpatches.sh | 4 +- 15 files changed, 70 insertions(+), 67 deletions(-) rename platform/linux-generic/include/{_fdserver_internal.h => odp_fdserver_internal.h} (100%) rename platform/linux-generic/include/{_ishm_internal.h => odp_ishm_internal.h} (100%) rename platform/linux-generic/include/{_ishmphy_internal.h => odp_ishmphy_internal.h} (100%) rename platform/linux-generic/include/{_ishmpool_internal.h => odp_ishmpool_internal.h} (100%) rename platform/linux-generic/{_fdserver.c => odp_fdserver.c} (96%) rename platform/linux-generic/{_ishm.c => odp_ishm.c} (99%) rename platform/linux-generic/{_ishmphy.c => odp_ishmphy.c} (98%) rename platform/linux-generic/{_ishmpool.c => odp_ishmpool.c} (99%) hooks/post-receive --

6 years, 10 months

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

git-lng-odp April 2018