git-lng-odp

git-lng-odp@lists.linaro.org

1203 discussions

[COMMIT] branch master updated. v1.19.0.1_tigermoth-118-g6e741dee

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 6e741deee25c81429112b82ba54f09205bb7c0ab (commit) from f48fce7b90cbd7f3efa05d5e7481999bf751e98c (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 6e741deee25c81429112b82ba54f09205bb7c0ab Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Wed Jul 4 15:45:37 2018 +0300 configure.ac: update version to v1.19.0.2 Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/configure.ac b/configure.ac index d52c419d..0eacac32 100644 --- a/configure.ac +++ b/configure.ac @@ -5,7 +5,7 @@ AC_PREREQ([2.5]) m4_define([odpapi_generation_version], [1]) m4_define([odpapi_major_version], [19]) m4_define([odpapi_minor_version], [0]) -m4_define([odpapi_point_version], [1]) +m4_define([odpapi_point_version], [2]) m4_define([odpapi_version], [odpapi_generation_version.odpapi_major_version.odpapi_minor_version.odpapi_point_version]) AC_INIT([OpenDataPlane],[odpapi_version],[lng-odp(a)lists.linaro.org]) ----------------------------------------------------------------------- Summary of changes: configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive --

6 years, 11 months

[COMMIT] branch master updated. v1.19.0.1_tigermoth-117-gf48fce7b

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 f48fce7b90cbd7f3efa05d5e7481999bf751e98c (commit) via a3dccfdd5ffa6d26e00898cb76d3aa25090f983b (commit) from 838c13654c639baa1c54d19056cd771380ab8a58 (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 f48fce7b90cbd7f3efa05d5e7481999bf751e98c Author: Bill Fischofer <bill.fischofer(a)linaro.org> Date: Mon Jul 2 09:23:48 2018 -0500 changelog: addendum for v1.19.0.2 Document additional changes incorporated in v1.19.0.2 relating to running ODP on large core count systems. Signed-off-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/CHANGELOG b/CHANGELOG index 5d7b3567..7ee5670d 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -117,11 +117,19 @@ example/l2fwd_simple fails on some systems when using 1GB huge pages === Unnumbered Bug Fixes * Corrected the handling of timeout events in the scalable scheduler. * Fixed IPsec link order to streamline builds. +* Fixed scaling issues with scheduler support for large core count systems. === Known Issues ==== https://bugs.linaro.org/show_bug.cgi?id=3774[Bug 3774] Shmem validation test runs indefinitely with 1GB huge pages +==== Running ODP on Systems with more than 64 Cores +There are several issues that seem to arise when running ODP applications on +platforms with more than 64 cores. While the most critical of these, which +affected the scheduler, have been fixed in this release, there are others +that are still under investigation. These will be addressed in the next +release of ODP. + == OpenDataPlane (1.19.0.1) === Summary of Changes ODP v1.19.0.1 is the first service update for the Tiger Moth release. It commit a3dccfdd5ffa6d26e00898cb76d3aa25090f983b Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Tue Jul 3 15:19:14 2018 +0300 travis: add missing set of ODP_SHM_DIR for code coverage test Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> diff --git a/.travis.yml b/.travis.yml index 09e1bf88..3431f27e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -308,10 +308,11 @@ jobs: --enable-debug=full --enable-helper-linux - CCACHE_DISABLE=1 make -j $(nproc) - - sudo CCACHE_DISABLE=1 ODP_SCHEDULER=basic LD_LIBRARY_PATH="$HOME/cunit-install/$CROSS_ARCH/lib:$LD_LIBRARY_PATH" make check - - sudo CCACHE_DISABLE=1 ODP_SCHEDULER=sp LD_LIBRARY_PATH="$HOME/cunit-install/$CROSS_ARCH/lib:$LD_LIBRARY_PATH" make check - - sudo CCACHE_DISABLE=1 ODP_SCHEDULER=iquery LD_LIBRARY_PATH="$HOME/cunit-install/$CROSS_ARCH/lib:$LD_LIBRARY_PATH" make check - - sudo CCACHE_DISABLE=1 ODP_SCHEDULER=scalable LD_LIBRARY_PATH="$HOME/cunit-install/$CROSS_ARCH/lib:$LD_LIBRARY_PATH" make check + - mkdir -p /dev/shm/odp + - sudo CCACHE_DISABLE=1 ODP_SCHEDULER=basic ODP_SHM_DIR=/dev/shm/odp LD_LIBRARY_PATH="$HOME/cunit-install/$CROSS_ARCH/lib:$LD_LIBRARY_PATH" make check + - sudo CCACHE_DISABLE=1 ODP_SCHEDULER=sp ODP_SHM_DIR=/dev/shm/odp LD_LIBRARY_PATH="$HOME/cunit-install/$CROSS_ARCH/lib:$LD_LIBRARY_PATH" make check + - sudo CCACHE_DISABLE=1 ODP_SCHEDULER=iquery ODP_SHM_DIR=/dev/shm/odp LD_LIBRARY_PATH="$HOME/cunit-install/$CROSS_ARCH/lib:$LD_LIBRARY_PATH" make check + - sudo CCACHE_DISABLE=1 ODP_SCHEDULER=scalable ODP_SHM_DIR=/dev/shm/odp LD_LIBRARY_PATH="$HOME/cunit-install/$CROSS_ARCH/lib:$LD_LIBRARY_PATH" make check - bash <(curl -s https://codecov.io/bash) -X coveragepy - stage: test env: TEST=distcheck ----------------------------------------------------------------------- Summary of changes: .travis.yml | 9 +++++---- CHANGELOG | 8 ++++++++ 2 files changed, 13 insertions(+), 4 deletions(-) hooks/post-receive --

6 years, 11 months

[COMMIT] branch master updated. v1.19.0.1_tigermoth-115-g838c1365

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 838c13654c639baa1c54d19056cd771380ab8a58 (commit) from abd50139e35c67ddbc1ec09550ea6b6d27861703 (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 838c13654c639baa1c54d19056cd771380ab8a58 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Fri Jun 29 10:59:30 2018 +0300 linux-gen: ring: ensure head and tail load order in dequeue Acquire memory order is needed when loading r_head. It ensures that load of w_tail cannot get ahead of r_head load, and thus head value cannot get ahead of tail value. Queue empty check assumes that head is always behind or equal to tail (== ring empty). Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/include/odp_ring_internal.h b/platform/linux-generic/include/odp_ring_internal.h index 03c0817e..130d74cc 100644 --- a/platform/linux-generic/include/odp_ring_internal.h +++ b/platform/linux-generic/include/odp_ring_internal.h @@ -41,6 +41,16 @@ typedef struct ODP_ALIGNED_CACHE { uint32_t data[0]; } ring_t; +/* 32-bit CAS with memory order selection */ +static inline int cas_mo_u32(odp_atomic_u32_t *atom, uint32_t *old_val, + uint32_t new_val, int mo_success, int mo_failure) +{ + return __atomic_compare_exchange_n(&atom->v, old_val, new_val, + 0 /* strong */, + mo_success, + mo_failure); +} + /* Initialize ring */ static inline void ring_init(ring_t *ring) { @@ -56,7 +66,10 @@ static inline uint32_t ring_deq(ring_t *ring, uint32_t mask) uint32_t head, tail, new_head; uint32_t data; - head = odp_atomic_load_u32(&ring->r_head); + /* Load/CAS acquire of r_head ensures that w_tail load happens after + * r_head load, and thus head value is always behind or equal to tail + * value. */ + head = odp_atomic_load_acq_u32(&ring->r_head); /* Move reader head. This thread owns data at the new head. */ do { @@ -67,8 +80,9 @@ static inline uint32_t ring_deq(ring_t *ring, uint32_t mask) new_head = head + 1; - } while (odp_unlikely(odp_atomic_cas_acq_u32(&ring->r_head, &head, - new_head) == 0)); + } while (odp_unlikely(cas_mo_u32(&ring->r_head, &head, new_head, + __ATOMIC_ACQUIRE, + __ATOMIC_ACQUIRE) == 0)); /* Read queue index */ data = ring->data[new_head & mask]; @@ -89,7 +103,10 @@ static inline uint32_t ring_deq_multi(ring_t *ring, uint32_t mask, { uint32_t head, tail, new_head, i; - head = odp_atomic_load_u32(&ring->r_head); + /* Load/CAS acquire of r_head ensures that w_tail load happens after + * r_head load, and thus head value is always behind or equal to tail + * value. */ + head = odp_atomic_load_acq_u32(&ring->r_head); /* Move reader head. This thread owns data at the new head. */ do { @@ -105,8 +122,9 @@ static inline uint32_t ring_deq_multi(ring_t *ring, uint32_t mask, new_head = head + num; - } while (odp_unlikely(odp_atomic_cas_acq_u32(&ring->r_head, &head, - new_head) == 0)); + } while (odp_unlikely(cas_mo_u32(&ring->r_head, &head, new_head, + __ATOMIC_ACQUIRE, + __ATOMIC_ACQUIRE) == 0)); /* Read queue index */ for (i = 0; i < num; i++) ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/include/odp_ring_internal.h | 30 +++++++++++++++++----- 1 file changed, 24 insertions(+), 6 deletions(-) hooks/post-receive --

6 years, 11 months

[COMMIT] branch master updated. v1.19.0.1_tigermoth-114-gabd50139

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 abd50139e35c67ddbc1ec09550ea6b6d27861703 (commit) from 7f5cc90258fe11df6286d9ce562d904e8032c461 (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 abd50139e35c67ddbc1ec09550ea6b6d27861703 Author: Bill Fischofer <bill.fischofer(a)linaro.org> Date: Sun Jun 24 13:41:05 2018 -0500 changelog: updates for odp v1.19.0.2 Add updates for ODP v1.19.0.2 (Tiger Moth Service Update 2) Signed-off-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Bogdan Pricope <bogdan.pricope(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/CHANGELOG b/CHANGELOG index 96655320..5d7b3567 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,127 @@ +== OpenDataPlane (1.19.0.2) +=== Summary of Changes +ODP v1.19.0.2 is the second service update for the Tiger Moth release. It +incorporates a number of corrections and enhancements that further improve the +quality and testability of ODP. + +==== APIs +There are no API changes in this release. + +==== DPDK Service Release Sync +ODP is now paired with DPDK 17.11.3 for its DPDK-related support. This is the +current service level for the DPDK 17.11 LTS package used by ODP Tiger Moth. + +=== Implementation Improvements +This release incorporates several improvements in the `odp-linux` reference +implementation of ODP. + +==== Enhanced Inlining +ODP supports inlining of functions in embedded environments when ABI +compatibility is not needed. ODP itself now makes use of inlined functions for +all relevant internal use of its APIs, leading to improved performance. + +==== Completion of CRC API Implementation +The `odp_hash_crc_gen64()` API is now properly implemented and appropriate +validation tests added to support it. + +In addition, a streamlined table-based implementation of the basic CRC +functions eliminates the previous dependency on `zlib`. + +==== PktIO-Specific Parsing +To better integrate with DPDK parsing capabilities, ODP packet parsing has +been restructured to operate at the PktIO level. This permits DPDK PktIO types +to exploit the native DPDK packet parser and checksum facilities, leading +to better integration. + +==== PktIO Internal Cleanup and Restructure +The PktIO functions have been streamlined and refactored in a number of ways +to provide better long-term maintainability of these functions. This includes +moving per-PktIO data into individual files rather than sharing a common file, +as well as better placement for I/O statistics. + +==== Checksum Validation Support +Loop PktIO interfaces now add the capability to validate packet L3 and L4 +checksums as part of receive processing. The existing `odp_pktio_capability()` +API now reports that checksum validation is available for these interfaces. + +==== Single Producer / Single Consumer Queue Performance Optimizations +When defining lock free queues that have only a single producer and consumer, +a streamlined implementation offers significant speedup. + +==== Fast PCAPng Packet Capture +Fast pcap capture is now provided in `odp-linux` to capture packets on any +interface. This is enabled via the `--enable-pcapng-support` configuration +option. Once enabled, packets can be captured using a sequence such as: +----- +sudo mkdir /var/run/odp/ +start ODP application that reads/writes to the interface of interest +start the ODP application +sudo dd if=/var/run/odp/<pid>-<ifname>-flow-<queue#> of=~/test.pcap + +cntrl^c to end capture +wireshark ~/test.pcap to view capture +----- + +Interfaces of interest are identified by a string consisting of the +application process ID, the interface name, and the queue number of interest, +if the interface supports multiple queues. + +==== Removal of GPL M4 Macros +A number of autotools/autoconf M4 macros used in configuring `odp-linux` have +been rewritten to avoid potential GPL licensing concerns. These macros are +used only during ODP configuration processing and have no role in ODP +or ODP application use. + +=== Validation Test Improvements +==== Queue Pair Validation Tests +The validation test suite for queue API testing is enhanced to now test +operation on queue pairs properly. This enables the various enqueue/dequeue +modes defined by the ODP specification to be more fully exercised, leading +to improved API conformance. + +==== Scheduling Test Improvements +The scheduling validation tests now better use the various capability APIs to +ensure that implementations are only tested for advertised capabilities. + +=== Crypto Test Improvements +The crypto validation tests now better use the various capability APIs to +ensure that implementations are tested across advertised crypto capabilities. + +=== Performance Test Improvements +==== New Performance Test +A new `odp_queue_perf` test has been added to test plain (non-scheduled) +queue performance in various modes. + +=== Helper Changes +* The `getopt` library calls are no longer used to avoid packaging conflicts +that can arise with this use. There are no changes to helper functionality. +This change simply improves packaging. + +=== Examples Improvements +* The `odp_generator` example adds UDP port range support. + +==== CI Improvements +Numerous changes to Travis integration are added to improve the quality and +reliability of Continuous Integration (CI) testing. + +=== Bug Fixes +==== https://bugs.linaro.org/show_bug.cgi?id=3787[Bug 3787] +Timeout accuracy breaks down with odd resolution requests + +==== https://bugs.linaro.org/show_bug.cgi?id=3867[Bug 3867] +timer validation test fails when using 1GB huge pages + +==== https://bugs.linaro.org/show_bug.cgi?id=3879[Bug 3879] +example/l2fwd_simple fails on some systems when using 1GB huge pages + +=== Unnumbered Bug Fixes +* Corrected the handling of timeout events in the scalable scheduler. +* Fixed IPsec link order to streamline builds. + +=== Known Issues +==== https://bugs.linaro.org/show_bug.cgi?id=3774[Bug 3774] +Shmem validation test runs indefinitely with 1GB huge pages + == OpenDataPlane (1.19.0.1) === Summary of Changes ODP v1.19.0.1 is the first service update for the Tiger Moth release. It ----------------------------------------------------------------------- Summary of changes: CHANGELOG | 124 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 124 insertions(+) hooks/post-receive --

6 years, 12 months

[COMMIT] branch master updated. v1.19.0.1_tigermoth-113-g7f5cc902

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 7f5cc90258fe11df6286d9ce562d904e8032c461 (commit) via 8dd98e227876fbe8f8a0dc0504906975e93c7cd0 (commit) via 4d9446e1fb4fbc54eee5295dfc9854b2f21bb841 (commit) via a716bb568dfe2cf4c856786b8fa9006a8a9c3841 (commit) via 3d591a7970918cee809927595ebf28e554460ca1 (commit) via bbb0829282ba766e26d334dd7afa05e723ec61e7 (commit) via 033ae0b58a72f828c608a557cafaf468f8d67b9a (commit) from eaf3b566293fa2bc10bb5b99b38ad75f4914b1ab (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 7f5cc90258fe11df6286d9ce562d904e8032c461 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Fri Jun 22 13:40:49 2018 +0300 DEPENDENCIES: document building without OpenSSL Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/DEPENDENCIES b/DEPENDENCIES index 48f5a839..6b345b9c 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -21,6 +21,12 @@ Prerequisites for building the OpenDataPlane (ODP) API Libraries currently required to link: openssl, libatomic, libconfig + It is possible to build ODP without OpenSSL by passing flag + --without-openssl to configure script. However this will result in + ODP-generic not supporting any cryptography algorithm (except NULL) and any + strong random generation (only BASIC is supported and it is not + cryptographically secure). Use at your own risk! + 3.1 OpenSSL native compile For native compilation, simply load the necessary libraries using the appropriate commit 8dd98e227876fbe8f8a0dc0504906975e93c7cd0 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Thu Jun 21 20:39:59 2018 +0300 travis: check building without OpenSSL Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/.travis.yml b/.travis.yml index 3dca855c..09e1bf88 100644 --- a/.travis.yml +++ b/.travis.yml @@ -59,6 +59,7 @@ env: - CONF="--disable-host-optimization" - CONF="--disable-host-optimization --disable-abi-compat" - CONF="--enable-pcapng-support" + - CONF="--without-openssl" - DPDK_SHARED="y" CONF="--disable-static-applications" compiler: commit 4d9446e1fb4fbc54eee5295dfc9854b2f21bb841 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Fri Jun 22 13:38:48 2018 +0300 example: ipsec_api: support building w/o OpenSSL Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/example/ipsec_api/Makefile.am b/example/ipsec_api/Makefile.am index 848683e0..8f81e323 100644 --- a/example/ipsec_api/Makefile.am +++ b/example/ipsec_api/Makefile.am @@ -1,8 +1,5 @@ include $(top_srcdir)/example/Makefile.inc -AM_CPPFLAGS = $(OPENSSL_CPPFLAGS) -LDADD += $(OPENSSL_LIBS) - bin_PROGRAMS = odp_ipsec_api dist_bin_SCRIPTS = \ @@ -28,6 +25,16 @@ odp_ipsec_api_SOURCES = \ odp_ipsec_fwd_db.h \ odp_ipsec_cache.c \ odp_ipsec_cache.h \ - odp_ipsec_stream.c \ - odp_ipsec_stream.h \ odp_ipsec_misc.h + +if WITH_OPENSSL +odp_ipsec_api_SOURCES += \ + odp_ipsec_stream.c \ + odp_ipsec_stream.h + +AM_CPPFLAGS = $(OPENSSL_CPPFLAGS) +LDADD += $(OPENSSL_LIBS) + +else +AM_CPPFLAGS = -DNO_OPENSSL +endif diff --git a/example/ipsec_api/odp_ipsec.c b/example/ipsec_api/odp_ipsec.c index 8cd4caa9..6142011b 100644 --- a/example/ipsec_api/odp_ipsec.c +++ b/example/ipsec_api/odp_ipsec.c @@ -41,7 +41,27 @@ #include <odp_ipsec_sp_db.h> #include <odp_ipsec_fwd_db.h> #include <odp_ipsec_cache.h> + +#ifndef NO_OPENSSL #include <odp_ipsec_stream.h> +#else +static void init_stream_db(void) {} +static void resolve_stream_db(void) {} +static int create_stream_db_inputs(void) +{ + return 0; +} + +static odp_bool_t verify_stream_db_outputs(void) +{ + return true; +} + +static int create_stream_db_entry(char *input ODP_UNUSED) +{ + return -1; +} +#endif #define MAX_WORKERS 32 /**< maximum number of worker threads */ @@ -349,6 +369,7 @@ void ipsec_init_post(odp_ipsec_op_mode_t api_mode) } } +#ifndef NO_OPENSSL static int check_stream_db_in(const char *intf) { @@ -376,6 +397,19 @@ int check_stream_db_out(const char *intf) return 0; } +#else +static +int check_stream_db_in(const char *intf ODP_UNUSED) +{ + return 0; +} + +static +int check_stream_db_out(const char *intf ODP_UNUSED) +{ + return 0; +} +#endif /** * Initialize interface commit a716bb568dfe2cf4c856786b8fa9006a8a9c3841 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Fri Jun 22 13:38:44 2018 +0300 example: ipsec: support building w/o OpenSSL Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/example/ipsec/Makefile.am b/example/ipsec/Makefile.am index eba9b8bd..67b5a6f5 100644 --- a/example/ipsec/Makefile.am +++ b/example/ipsec/Makefile.am @@ -1,8 +1,5 @@ include $(top_srcdir)/example/Makefile.inc -AM_CPPFLAGS = $(OPENSSL_CPPFLAGS) -LDADD += $(OPENSSL_LIBS) - bin_PROGRAMS = odp_ipsec dist_bin_SCRIPTS = \ @@ -21,10 +18,20 @@ odp_ipsec_SOURCES = odp_ipsec.c \ odp_ipsec_sp_db.c \ odp_ipsec_fwd_db.c \ odp_ipsec_cache.c \ - odp_ipsec_stream.c \ odp_ipsec_cache.h \ odp_ipsec_fwd_db.h \ odp_ipsec_misc.h \ odp_ipsec_sa_db.h \ - odp_ipsec_sp_db.h \ + odp_ipsec_sp_db.h + +if WITH_OPENSSL +odp_ipsec_SOURCES += \ + odp_ipsec_stream.c \ odp_ipsec_stream.h + +AM_CPPFLAGS = $(OPENSSL_CPPFLAGS) +LDADD += $(OPENSSL_LIBS) + +else +AM_CPPFLAGS = -DNO_OPENSSL +endif diff --git a/example/ipsec/odp_ipsec.c b/example/ipsec/odp_ipsec.c index 05001a5e..1b21773e 100644 --- a/example/ipsec/odp_ipsec.c +++ b/example/ipsec/odp_ipsec.c @@ -41,7 +41,27 @@ #include <odp_ipsec_sp_db.h> #include <odp_ipsec_fwd_db.h> #include <odp_ipsec_cache.h> + +#ifndef NO_OPENSSL #include <odp_ipsec_stream.h> +#else +static void init_stream_db(void) {} +static void resolve_stream_db(void) {} +static int create_stream_db_inputs(void) +{ + return 0; +} + +static odp_bool_t verify_stream_db_outputs(void) +{ + return true; +} + +static int create_stream_db_entry(char *input ODP_UNUSED) +{ + return -1; +} +#endif #define MAX_WORKERS 32 /**< maximum number of worker threads */ @@ -406,6 +426,7 @@ void ipsec_init_post(crypto_api_mode_e api_mode) } } +#ifndef NO_OPENSSL static int check_stream_db_out(const char *intf) { @@ -419,6 +440,13 @@ int check_stream_db_out(const char *intf) return 0; } +#else +static +int check_stream_db_out(const char *intf ODP_UNUSED) +{ + return 0; +} +#endif /** * Initialize interface commit 3d591a7970918cee809927595ebf28e554460ca1 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Thu Jun 21 20:09:13 2018 +0300 linux-gen: support building ODP without libcrypto from OpenSSL Closes https://github.com/Linaro/odp/issues/626 Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 4d2ea9c4..c6b5ac99 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -157,7 +157,6 @@ __LIB__libodp_linux_la_SOURCES = \ odp_classification.c \ odp_cpumask.c \ odp_cpumask_task.c \ - odp_crypto.c \ odp_errno.c \ odp_event.c \ odp_fdserver.c \ @@ -184,7 +183,6 @@ __LIB__libodp_linux_la_SOURCES = \ odp_queue_lf.c \ odp_queue_scalable.c \ odp_queue_spsc.c \ - odp_random.c \ odp_rwlock.c \ odp_rwlock_recursive.c \ odp_schedule_basic.c \ @@ -224,6 +222,16 @@ __LIB__libodp_linux_la_SOURCES = \ pktio/socket.c \ pktio/socket_mmap.c \ pktio/tap.c + +if WITH_OPENSSL +__LIB__libodp_linux_la_SOURCES += \ + odp_crypto_openssl.c \ + odp_random_openssl.c +else +__LIB__libodp_linux_la_SOURCES += \ + odp_crypto_null.c \ + odp_random_null.c +endif if ODP_ABI_COMPAT __LIB__libodp_linux_la_SOURCES += \ odp_atomic_api.c \ diff --git a/platform/linux-generic/include/odp_init_internal.h b/platform/linux-generic/include/odp_init_internal.h index f585ceff..79f710af 100644 --- a/platform/linux-generic/include/odp_init_internal.h +++ b/platform/linux-generic/include/odp_init_internal.h @@ -46,6 +46,9 @@ int odp_classification_term_global(void); int odp_queue_init_global(void); int odp_queue_term_global(void); +int _odp_random_init_local(void); +int _odp_random_term_local(void); + int odp_crypto_init_global(void); int odp_crypto_term_global(void); int _odp_crypto_init_local(void); diff --git a/platform/linux-generic/m4/configure.m4 b/platform/linux-generic/m4/configure.m4 index 951704ed..e0fd099b 100644 --- a/platform/linux-generic/m4/configure.m4 +++ b/platform/linux-generic/m4/configure.m4 @@ -5,7 +5,14 @@ ODP_ATOMIC ODP_PTHREAD ODP_TIMER -ODP_OPENSSL +AC_ARG_WITH([openssl], + [AS_HELP_STRING([--without-openssl], + [compile without OpenSSL (results in disabled crypto and random support)])], + [], + [with_openssl=yes]) +AS_IF([test "$with_openssl" != "no"], + [ODP_OPENSSL]) +AM_CONDITIONAL([WITH_OPENSSL], [test x$with_openssl != xno]) ODP_LIBCONFIG([linux-generic]) m4_include([platform/linux-generic/m4/odp_pcap.m4]) m4_include([platform/linux-generic/m4/odp_pcapng.m4]) diff --git a/platform/linux-generic/odp_crypto_null.c b/platform/linux-generic/odp_crypto_null.c new file mode 100644 index 00000000..7d01f10e --- /dev/null +++ b/platform/linux-generic/odp_crypto_null.c @@ -0,0 +1,573 @@ +/* Copyright (c) 2014-2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include "config.h" + +#include <odp_posix_extensions.h> +#include <odp/api/crypto.h> +#include <odp_init_internal.h> +#include <odp/api/spinlock.h> +#include <odp/api/sync.h> +#include <odp/api/debug.h> +#include <odp/api/align.h> +#include <odp/api/shared_memory.h> +#include <odp_debug_internal.h> +#include <odp/api/hints.h> +#include <odp/api/random.h> +#include <odp/api/plat/packet_inlines.h> +#include <odp/api/plat/thread_inlines.h> +#include <odp_packet_internal.h> + +/* Inlined API functions */ +#include <odp/api/plat/event_inlines.h> + +#define MAX_SESSIONS 32 + +/* + * Cipher algorithm capabilities + * + * Keep sorted: first by key length, then by IV length + */ +static const odp_crypto_cipher_capability_t cipher_capa_null[] = { +{.key_len = 0, .iv_len = 0} }; + +/* + * Authentication algorithm capabilities + * + * Keep sorted: first by digest length, then by key length + */ +static const odp_crypto_auth_capability_t auth_capa_null[] = { +{.digest_len = 0, .key_len = 0, .aad_len = {.min = 0, .max = 0, .inc = 0} } }; + +/** Forward declaration of session structure */ +typedef struct odp_crypto_generic_session_t odp_crypto_generic_session_t; + +/** + * Algorithm handler function prototype + */ +typedef +odp_crypto_alg_err_t (*crypto_func_t)(odp_packet_t pkt, + const odp_crypto_packet_op_param_t *param, + odp_crypto_generic_session_t *session); +typedef void (*crypto_init_func_t)(odp_crypto_generic_session_t *session); + +/** + * Per crypto session data structure + */ +struct odp_crypto_generic_session_t { + odp_crypto_generic_session_t *next; + + /* Session creation parameters */ + odp_crypto_session_param_t p; + + unsigned int idx; +}; + +typedef struct odp_crypto_global_s odp_crypto_global_t; + +struct odp_crypto_global_s { + odp_spinlock_t lock; + odp_crypto_generic_session_t *free; + odp_crypto_generic_session_t sessions[MAX_SESSIONS]; + + /* These flags are cleared at alloc_session() */ + uint8_t ctx_valid[ODP_THREAD_COUNT_MAX][MAX_SESSIONS]; + + odp_ticketlock_t openssl_lock[0]; +}; + +static odp_crypto_global_t *global; + +static +odp_crypto_generic_session_t *alloc_session(void) +{ + odp_crypto_generic_session_t *session = NULL; + unsigned int i; + + odp_spinlock_lock(&global->lock); + session = global->free; + if (session) { + global->free = session->next; + session->next = NULL; + } + odp_spinlock_unlock(&global->lock); + + session->idx = session - global->sessions; + + for (i = 0; i < ODP_THREAD_COUNT_MAX; i++) + global->ctx_valid[i][session->idx] = 0; + + return session; +} + +static +void free_session(odp_crypto_generic_session_t *session) +{ + odp_spinlock_lock(&global->lock); + session->next = global->free; + global->free = session; + odp_spinlock_unlock(&global->lock); +} + +int odp_crypto_capability(odp_crypto_capability_t *capa) +{ + if (NULL == capa) + return -1; + + /* Initialize crypto capability structure */ + memset(capa, 0, sizeof(odp_crypto_capability_t)); + + capa->sync_mode = ODP_SUPPORT_PREFERRED; + capa->async_mode = ODP_SUPPORT_YES; + + capa->ciphers.bit.null = 1; + + capa->auths.bit.null = 1; + + capa->max_sessions = MAX_SESSIONS; + + return 0; +} + +int odp_crypto_cipher_capability(odp_cipher_alg_t cipher, + odp_crypto_cipher_capability_t dst[], + int num_copy) +{ + const odp_crypto_cipher_capability_t *src; + int num; + int size = sizeof(odp_crypto_cipher_capability_t); + + switch (cipher) { + case ODP_CIPHER_ALG_NULL: + src = cipher_capa_null; + num = sizeof(cipher_capa_null) / size; + break; + default: + return -1; + } + + if (num < num_copy) + num_copy = num; + + memcpy(dst, src, num_copy * size); + + return num; +} + +int odp_crypto_auth_capability(odp_auth_alg_t auth, + odp_crypto_auth_capability_t dst[], int num_copy) +{ + const odp_crypto_auth_capability_t *src; + int num; + int size = sizeof(odp_crypto_auth_capability_t); + + switch (auth) { + case ODP_AUTH_ALG_NULL: + src = auth_capa_null; + num = sizeof(auth_capa_null) / size; + break; + default: + return -1; + } + + if (num < num_copy) + num_copy = num; + + memcpy(dst, src, num_copy * size); + + return num; +} + +int +odp_crypto_session_create(odp_crypto_session_param_t *param, + odp_crypto_session_t *session_out, + odp_crypto_ses_create_err_t *status) +{ + int rc; + odp_crypto_generic_session_t *session; + + /* Allocate memory for this session */ + session = alloc_session(); + if (NULL == session) { + *status = ODP_CRYPTO_SES_CREATE_ERR_ENOMEM; + goto err; + } + + /* Copy parameters */ + session->p = *param; + + /* Process based on cipher */ + switch (param->cipher_alg) { + case ODP_CIPHER_ALG_NULL: + rc = 0; + break; + default: + rc = -1; + } + + /* Check result */ + if (rc) { + *status = ODP_CRYPTO_SES_CREATE_ERR_INV_CIPHER; + goto err; + } + + /* Process based on auth */ + switch (param->auth_alg) { + case ODP_AUTH_ALG_NULL: + rc = 0; + break; + default: + rc = -1; + } + + /* Check result */ + if (rc) { + *status = ODP_CRYPTO_SES_CREATE_ERR_INV_AUTH; + goto err; + } + + /* We're happy */ + *session_out = (intptr_t)session; + *status = ODP_CRYPTO_SES_CREATE_ERR_NONE; + return 0; + +err: + /* error status should be set at this moment */ + if (session != NULL) + free_session(session); + *session_out = ODP_CRYPTO_SESSION_INVALID; + return -1; +} + +int odp_crypto_session_destroy(odp_crypto_session_t session) +{ + odp_crypto_generic_session_t *generic; + + generic = (odp_crypto_generic_session_t *)(intptr_t)session; + memset(generic, 0, sizeof(*generic)); + free_session(generic); + return 0; +} + +/* + * Shim function around packet operation, can be used by other implementations. + */ +int +odp_crypto_operation(odp_crypto_op_param_t *param, + odp_bool_t *posted, + odp_crypto_op_result_t *result) +{ + odp_crypto_packet_op_param_t packet_param; + odp_packet_t out_pkt = param->out_pkt; + odp_crypto_packet_result_t packet_result; + odp_crypto_op_result_t local_result; + int rc; + + packet_param.session = param->session; + packet_param.cipher_iv_ptr = param->cipher_iv_ptr; + packet_param.auth_iv_ptr = param->auth_iv_ptr; + packet_param.hash_result_offset = param->hash_result_offset; + packet_param.aad_ptr = param->aad_ptr; + packet_param.cipher_range = param->cipher_range; + packet_param.auth_range = param->auth_range; + + rc = odp_crypto_op(&param->pkt, &out_pkt, &packet_param, 1); + if (rc < 0) + return rc; + + rc = odp_crypto_result(&packet_result, out_pkt); + if (rc < 0) + return rc; + + /* Indicate to caller operation was sync */ + *posted = 0; + + packet_subtype_set(out_pkt, ODP_EVENT_PACKET_BASIC); + + /* Fill in result */ + local_result.ctx = param->ctx; + local_result.pkt = out_pkt; + local_result.cipher_status = packet_result.cipher_status; + local_result.auth_status = packet_result.auth_status; + local_result.ok = packet_result.ok; + + /* + * Be bug-to-bug compatible. Return output packet also through params. + */ + param->out_pkt = out_pkt; + + *result = local_result; + + return 0; +} + +int +odp_crypto_init_global(void) +{ + size_t mem_size; + odp_shm_t shm; + int idx; + + /* Calculate the memory size we need */ + mem_size = sizeof(odp_crypto_global_t); + + /* Allocate our globally shared memory */ + shm = odp_shm_reserve("crypto_pool", mem_size, + ODP_CACHE_LINE_SIZE, 0); + if (ODP_SHM_INVALID == shm) { + ODP_ERR("unable to allocate crypto pool\n"); + return -1; + } + + global = odp_shm_addr(shm); + + /* Clear it out */ + memset(global, 0, mem_size); + + /* Initialize free list and lock */ + for (idx = 0; idx < MAX_SESSIONS; idx++) { + global->sessions[idx].next = global->free; + global->free = &global->sessions[idx]; + } + odp_spinlock_init(&global->lock); + + return 0; +} + +int odp_crypto_term_global(void) +{ + int rc = 0; + int ret; + int count = 0; + odp_crypto_generic_session_t *session; + + for (session = global->free; session != NULL; session = session->next) + count++; + if (count != MAX_SESSIONS) { + ODP_ERR("crypto sessions still active\n"); + rc = -1; + } + + ret = odp_shm_free(odp_shm_lookup("crypto_pool")); + if (ret < 0) { + ODP_ERR("shm free failed for crypto_pool\n"); + rc = -1; + } + + return rc; +} + +int _odp_crypto_init_local(void) +{ + return 0; +} + +int _odp_crypto_term_local(void) +{ + return 0; +} + +odp_crypto_compl_t odp_crypto_compl_from_event(odp_event_t ev) +{ + /* This check not mandated by the API specification */ + if (odp_event_type(ev) != ODP_EVENT_CRYPTO_COMPL) + ODP_ABORT("Event not a crypto completion"); + return (odp_crypto_compl_t)ev; +} + +odp_event_t odp_crypto_compl_to_event(odp_crypto_compl_t completion_event) +{ + return (odp_event_t)completion_event; +} + +void +odp_crypto_compl_result(odp_crypto_compl_t completion_event, + odp_crypto_op_result_t *result) +{ + (void)completion_event; + (void)result; + + /* We won't get such events anyway, so there can be no result */ + ODP_ASSERT(0); +} + +void +odp_crypto_compl_free(odp_crypto_compl_t completion_event) +{ + odp_event_t ev = odp_crypto_compl_to_event(completion_event); + + odp_buffer_free(odp_buffer_from_event(ev)); +} + +uint64_t odp_crypto_compl_to_u64(odp_crypto_compl_t hdl) +{ + return _odp_pri(hdl); +} + +void odp_crypto_session_param_init(odp_crypto_session_param_t *param) +{ + memset(param, 0, sizeof(odp_crypto_session_param_t)); +} + +uint64_t odp_crypto_session_to_u64(odp_crypto_session_t hdl) +{ + return (uint64_t)hdl; +} + +odp_packet_t odp_crypto_packet_from_event(odp_event_t ev) +{ + /* This check not mandated by the API specification */ + ODP_ASSERT(odp_event_type(ev) == ODP_EVENT_PACKET); + ODP_ASSERT(odp_event_subtype(ev) == ODP_EVENT_PACKET_CRYPTO); + + return odp_packet_from_event(ev); +} + +odp_event_t odp_crypto_packet_to_event(odp_packet_t pkt) +{ + return odp_packet_to_event(pkt); +} + +static +odp_crypto_packet_result_t *get_op_result_from_packet(odp_packet_t pkt) +{ + odp_packet_hdr_t *hdr = packet_hdr(pkt); + + return &hdr->crypto_op_result; +} + +int odp_crypto_result(odp_crypto_packet_result_t *result, + odp_packet_t packet) +{ + odp_crypto_packet_result_t *op_result; + + ODP_ASSERT(odp_event_subtype(odp_packet_to_event(packet)) == + ODP_EVENT_PACKET_CRYPTO); + + op_result = get_op_result_from_packet(packet); + + memcpy(result, op_result, sizeof(*result)); + + return 0; +} + +static +int crypto_int(odp_packet_t pkt_in, + odp_packet_t *pkt_out, + const odp_crypto_packet_op_param_t *param) +{ + odp_crypto_generic_session_t *session; + odp_bool_t allocated = false; + odp_packet_t out_pkt = *pkt_out; + odp_crypto_packet_result_t *op_result; + odp_packet_hdr_t *pkt_hdr; + + session = (odp_crypto_generic_session_t *)(intptr_t)param->session; + + /* Resolve output buffer */ + if (ODP_PACKET_INVALID == out_pkt && + ODP_POOL_INVALID != session->p.output_pool) { + out_pkt = odp_packet_alloc(session->p.output_pool, + odp_packet_len(pkt_in)); + allocated = true; + } + + if (odp_unlikely(ODP_PACKET_INVALID == out_pkt)) { + ODP_DBG("Alloc failed.\n"); + return -1; + } + + if (pkt_in != out_pkt) { + int ret; + + ret = odp_packet_copy_from_pkt(out_pkt, + 0, + pkt_in, + 0, + odp_packet_len(pkt_in)); + if (odp_unlikely(ret < 0)) + goto err; + + _odp_packet_copy_md_to_packet(pkt_in, out_pkt); + odp_packet_free(pkt_in); + pkt_in = ODP_PACKET_INVALID; + } + + /* Fill in result */ + packet_subtype_set(out_pkt, ODP_EVENT_PACKET_CRYPTO); + op_result = get_op_result_from_packet(out_pkt); + op_result->cipher_status.alg_err = ODP_CRYPTO_ALG_ERR_NONE; + op_result->cipher_status.hw_err = ODP_CRYPTO_HW_ERR_NONE; + op_result->auth_status.alg_err = ODP_CRYPTO_ALG_ERR_NONE; + op_result->auth_status.hw_err = ODP_CRYPTO_HW_ERR_NONE; + op_result->ok = true; + + pkt_hdr = packet_hdr(out_pkt); + pkt_hdr->p.flags.crypto_err = !op_result->ok; + + /* Synchronous, simply return results */ + *pkt_out = out_pkt; + + return 0; + +err: + if (allocated) { + odp_packet_free(out_pkt); + *pkt_out = ODP_PACKET_INVALID; + } + + return -1; +} + +int odp_crypto_op(const odp_packet_t pkt_in[], + odp_packet_t pkt_out[], + const odp_crypto_packet_op_param_t param[], + int num_pkt) +{ + int i, rc; + odp_crypto_generic_session_t *session; + + session = (odp_crypto_generic_session_t *)(intptr_t)param->session; + ODP_ASSERT(ODP_CRYPTO_SYNC == session->p.op_mode); + + for (i = 0; i < num_pkt; i++) { + rc = crypto_int(pkt_in[i], &pkt_out[i], &param[i]); + if (rc < 0) + break; + } + + return i; +} + +int odp_crypto_op_enq(const odp_packet_t pkt_in[], + const odp_packet_t pkt_out[], + const odp_crypto_packet_op_param_t param[], + int num_pkt) +{ + odp_packet_t pkt; + odp_event_t event; + odp_crypto_generic_session_t *session; + int i, rc; + + session = (odp_crypto_generic_session_t *)(intptr_t)param->session; + ODP_ASSERT(ODP_CRYPTO_ASYNC == session->p.op_mode); + ODP_ASSERT(ODP_QUEUE_INVALID != session->p.compl_queue); + + for (i = 0; i < num_pkt; i++) { + pkt = pkt_out[i]; + rc = crypto_int(pkt_in[i], &pkt, &param[i]); + if (rc < 0) + break; + + event = odp_packet_to_event(pkt); + if (odp_queue_enq(session->p.compl_queue, event)) { + odp_event_free(event); + break; + } + } + + return i; +} diff --git a/platform/linux-generic/odp_crypto.c b/platform/linux-generic/odp_crypto_openssl.c similarity index 100% rename from platform/linux-generic/odp_crypto.c rename to platform/linux-generic/odp_crypto_openssl.c diff --git a/platform/linux-generic/odp_init.c b/platform/linux-generic/odp_init.c index 61f99e4d..28f94cd3 100644 --- a/platform/linux-generic/odp_init.c +++ b/platform/linux-generic/odp_init.c @@ -33,6 +33,7 @@ enum init_stage { SCHED_INIT, PKTIO_INIT, TIMER_INIT, + RANDOM_INIT, CRYPTO_INIT, CLASSIFICATION_INIT, TRAFFIC_MNGR_INIT, @@ -105,6 +106,9 @@ static int term_global(enum init_stage stage) } /* Fall through */ + case RANDOM_INIT: + /* Fall through */ + case TIMER_INIT: if (odp_timer_term_global()) { ODP_ERR("ODP timer term failed.\n"); @@ -302,6 +306,9 @@ int odp_init_global(odp_instance_t *instance, } stage = TIMER_INIT; + /* No init neeeded */ + stage = RANDOM_INIT; + if (odp_crypto_init_global()) { ODP_ERR("ODP crypto init failed.\n"); goto init_failed; @@ -391,6 +398,13 @@ static int term_local(enum init_stage stage) } /* Fall through */ + case RANDOM_INIT: + if (_odp_random_term_local()) { + ODP_ERR("ODP random local term failed.\n"); + rc = -1; + } + /* Fall through */ + case POOL_INIT: if (odp_pool_term_local()) { ODP_ERR("ODP buffer pool local term failed.\n"); @@ -450,6 +464,12 @@ int odp_init_local(odp_instance_t instance, odp_thread_type_t thr_type) } stage = PKTIO_INIT; + if (_odp_random_init_local()) { + ODP_ERR("ODP random local init failed.\n"); + goto init_fail; + } + stage = RANDOM_INIT; + if (_odp_crypto_init_local()) { ODP_ERR("ODP crypto local init failed.\n"); goto init_fail; diff --git a/platform/linux-generic/odp_random.c b/platform/linux-generic/odp_random_null.c similarity index 56% copy from platform/linux-generic/odp_random.c copy to platform/linux-generic/odp_random_null.c index 424243c2..d8ed78fe 100644 --- a/platform/linux-generic/odp_random.c +++ b/platform/linux-generic/odp_random_null.c @@ -8,47 +8,65 @@ #include <odp_posix_extensions.h> #include <stdint.h> +#include <stdlib.h> #include <odp/api/random.h> +#include <odp/api/cpu.h> +#include <odp_init_internal.h> -#include <openssl/rand.h> +#include <time.h> odp_random_kind_t odp_random_max_kind(void) { - return ODP_RANDOM_CRYPTO; + return ODP_RANDOM_BASIC; } -int32_t odp_random_data(uint8_t *buf, uint32_t len, odp_random_kind_t kind) -{ - int rc; - - switch (kind) { - case ODP_RANDOM_BASIC: - case ODP_RANDOM_CRYPTO: - rc = RAND_bytes(buf, len); - return (1 == rc) ? (int)len /*success*/: -1 /*failure*/; - - case ODP_RANDOM_TRUE: - default: - return -1; - } -} - -int32_t odp_random_test_data(uint8_t *buf, uint32_t len, uint64_t *seed) +static int32_t _random_data(uint8_t *buf, uint32_t len, uint32_t *seed) { union { uint32_t rand_word; uint8_t rand_byte[4]; } u; uint32_t i = 0, j; - uint32_t seed32 = (*seed) & 0xffffffff; while (i < len) { - u.rand_word = rand_r(&seed32); + u.rand_word = rand_r(seed); for (j = 0; j < 4 && i < len; j++, i++) *buf++ = u.rand_byte[j]; } + return len; +} + +int32_t odp_random_test_data(uint8_t *buf, uint32_t len, uint64_t *seed) +{ + uint32_t seed32 = (*seed) & 0xffffffff; + + _random_data(buf, len, &seed32); + *seed = seed32; return len; } + +static __thread uint32_t this_seed; + +int32_t odp_random_data(uint8_t *buf, uint32_t len, odp_random_kind_t kind) +{ + if (kind != ODP_RANDOM_BASIC) + return -1; + + return _random_data(buf, len, &this_seed); +} + +int _odp_random_init_local(void) +{ + this_seed = time(NULL); + this_seed ^= odp_cpu_id() << 16; + + return 0; +} + +int _odp_random_term_local(void) +{ + return 0; +} diff --git a/platform/linux-generic/odp_random.c b/platform/linux-generic/odp_random_openssl.c similarity index 88% rename from platform/linux-generic/odp_random.c rename to platform/linux-generic/odp_random_openssl.c index 424243c2..9c3006c6 100644 --- a/platform/linux-generic/odp_random.c +++ b/platform/linux-generic/odp_random_openssl.c @@ -9,6 +9,7 @@ #include <odp_posix_extensions.h> #include <stdint.h> #include <odp/api/random.h> +#include <odp_init_internal.h> #include <openssl/rand.h> @@ -52,3 +53,13 @@ int32_t odp_random_test_data(uint8_t *buf, uint32_t len, uint64_t *seed) *seed = seed32; return len; } + +int _odp_random_init_local(void) +{ + return 0; +} + +int _odp_random_term_local(void) +{ + return 0; +} commit bbb0829282ba766e26d334dd7afa05e723ec61e7 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Thu Jun 28 16:29:43 2018 +0300 linux-gen: fix calls to odp_random_data to use ODP_RANDOM_BASIC Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/pktio/tap.c b/platform/linux-generic/pktio/tap.c index dc87db2b..19067969 100644 --- a/platform/linux-generic/pktio/tap.c +++ b/platform/linux-generic/pktio/tap.c @@ -71,7 +71,7 @@ static inline pkt_tap_t *pkt_priv(pktio_entry_t *pktio_entry) static int gen_random_mac(unsigned char *mac) { mac[0] = 0x7a; /* not multicast and local assignment bit is set */ - if (odp_random_data(mac + 1, 5, false) < 5) { + if (odp_random_data(mac + 1, 5, ODP_RANDOM_BASIC) < 5) { ODP_ERR("odp_random_data failed.\n"); return -1; } diff --git a/platform/linux-generic/test/pktio_ipc/pktio_ipc1.c b/platform/linux-generic/test/pktio_ipc/pktio_ipc1.c index 1b4fba8e..e704d7a9 100644 --- a/platform/linux-generic/test/pktio_ipc/pktio_ipc1.c +++ b/platform/linux-generic/test/pktio_ipc/pktio_ipc1.c @@ -200,7 +200,12 @@ static int pktio_run_loop(odp_pool_t pool) } /* 3. emulate that pkts packets were received */ - odp_random_data((uint8_t *)&pkts, sizeof(pkts), 0); + ret = odp_random_data((uint8_t *)&pkts, sizeof(pkts), + ODP_RANDOM_BASIC); + if (ret != sizeof(pkts)) { + LOG_ABORT("random failed"); + break; + } pkts = ((pkts & 0xffff) % MAX_PKT_BURST) + 1; for (i = 0; i < pkts; i++) { commit 033ae0b58a72f828c608a557cafaf468f8d67b9a Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue Jun 26 15:10:37 2018 +0300 linux-gen: tm: use ODP_RANDOM_BASIC instead of hard-coding constant 1 (= CRYPTO) Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/odp_traffic_mngr.c b/platform/linux-generic/odp_traffic_mngr.c index a89c5a2b..af403b4b 100644 --- a/platform/linux-generic/odp_traffic_mngr.c +++ b/platform/linux-generic/odp_traffic_mngr.c @@ -180,7 +180,7 @@ static void tm_init_random_data(tm_random_data_t *tm_random_data) byte_cnt = 0; while (byte_cnt < 256) byte_cnt += odp_random_data(&tm_random_data->buf[byte_cnt], - 256 - byte_cnt, 1); + 256 - byte_cnt, ODP_RANDOM_BASIC); tm_random_data->next_random_byte = 0; } ----------------------------------------------------------------------- Summary of changes: .travis.yml | 1 + DEPENDENCIES | 6 + example/ipsec/Makefile.am | 17 +- example/ipsec/odp_ipsec.c | 28 + example/ipsec_api/Makefile.am | 17 +- example/ipsec_api/odp_ipsec.c | 34 ++ platform/linux-generic/Makefile.am | 12 +- platform/linux-generic/include/odp_init_internal.h | 3 + platform/linux-generic/m4/configure.m4 | 9 +- platform/linux-generic/odp_crypto_null.c | 573 +++++++++++++++++++++ .../{odp_crypto.c => odp_crypto_openssl.c} | 0 platform/linux-generic/odp_init.c | 20 + .../{odp_random.c => odp_random_null.c} | 60 ++- .../{odp_random.c => odp_random_openssl.c} | 11 + platform/linux-generic/odp_traffic_mngr.c | 2 +- platform/linux-generic/pktio/tap.c | 2 +- platform/linux-generic/test/pktio_ipc/pktio_ipc1.c | 7 +- 17 files changed, 765 insertions(+), 37 deletions(-) create mode 100644 platform/linux-generic/odp_crypto_null.c rename platform/linux-generic/{odp_crypto.c => odp_crypto_openssl.c} (100%) copy platform/linux-generic/{odp_random.c => odp_random_null.c} (56%) rename platform/linux-generic/{odp_random.c => odp_random_openssl.c} (88%) hooks/post-receive --

6 years, 12 months

[COMMIT] branch master updated. v1.19.0.1_tigermoth-106-geaf3b566

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 eaf3b566293fa2bc10bb5b99b38ad75f4914b1ab (commit) from 0ebd57ab0ea8e1a95cdb8a564fcaec4cad6231e7 (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 eaf3b566293fa2bc10bb5b99b38ad75f4914b1ab Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Tue Jun 26 23:52:35 2018 +0300 validatation: fix tm wred test under loaded system Fix following bug with skipping test result is CI env variable was set. Test failed at line 3139 in file traffic_mngr.c : (wred_pkt_cnts->min_cnt <= pkts_sent) && (pkts_sent <= wred_pkt_cnts->max_cnt) 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> diff --git a/test/validation/api/traffic_mngr/traffic_mngr.c b/test/validation/api/traffic_mngr/traffic_mngr.c index db6a16af..9b9e73b7 100644 --- a/test/validation/api/traffic_mngr/traffic_mngr.c +++ b/test/validation/api/traffic_mngr/traffic_mngr.c @@ -3070,6 +3070,7 @@ static int test_byte_wred(const char *wred_name, odp_tm_queue_t tm_queue; pkt_info_t pkt_info; uint32_t num_fill_pkts, num_test_pkts, pkts_sent; + int ret; /* Pick the tm_queue and set the tm_queue's wred profile to drop the * given percentage of traffic, then send 100 pkts and see how many @@ -3131,13 +3132,13 @@ static int test_byte_wred(const char *wred_name, flush_leftover_pkts(odp_tm_systems[0], rcv_pktin); CU_ASSERT(odp_tm_is_idle(odp_tm_systems[0])); - if ((wred_pkt_cnts->min_cnt <= pkts_sent) && - (pkts_sent <= wred_pkt_cnts->max_cnt)) - return 0; - - CU_ASSERT((wred_pkt_cnts->min_cnt <= pkts_sent) && - (pkts_sent <= wred_pkt_cnts->max_cnt)); - return 0; + ret = !((wred_pkt_cnts->min_cnt <= pkts_sent) && + (pkts_sent <= wred_pkt_cnts->max_cnt)); + if (ret) + LOG_DBG("min %" PRIu32 " pkts %" PRIu32" max %" PRIu32 "\n", + wred_pkt_cnts->min_cnt, pkts_sent, + wred_pkt_cnts->max_cnt); + return odp_cunit_ret(ret); } static int test_pkt_wred(const char *wred_name, ----------------------------------------------------------------------- Summary of changes: test/validation/api/traffic_mngr/traffic_mngr.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) hooks/post-receive --

6 years, 12 months

[COMMIT] branch master updated. v1.19.0.1_tigermoth-105-g0ebd57ab

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 0ebd57ab0ea8e1a95cdb8a564fcaec4cad6231e7 (commit) from a7c60d702466bc0f9de64993446e8ec39a16de88 (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 0ebd57ab0ea8e1a95cdb8a564fcaec4cad6231e7 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Mon Jun 25 11:18:51 2018 +0300 linux-gen: use common posix extensions header Use odp_posix_extensions.h inside ODP implementation to ensure that (when extensions are used) the same level of POSIX extensions is used everywhere. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/odp_traffic_mngr.c b/platform/linux-generic/odp_traffic_mngr.c index abd9cffc..a89c5a2b 100644 --- a/platform/linux-generic/odp_traffic_mngr.c +++ b/platform/linux-generic/odp_traffic_mngr.c @@ -7,10 +7,8 @@ */ #include "config.h" +#include <odp_posix_extensions.h> -#ifndef _GNU_SOURCE -#define _GNU_SOURCE -#endif #include <stdint.h> #include <string.h> #include <malloc.h> diff --git a/platform/linux-generic/pktio/ethtool_rss.c b/platform/linux-generic/pktio/ethtool_rss.c index e1ba33aa..1ad9c970 100644 --- a/platform/linux-generic/pktio/ethtool_rss.c +++ b/platform/linux-generic/pktio/ethtool_rss.c @@ -5,10 +5,7 @@ */ #include "config.h" - -#ifndef _GNU_SOURCE -#define _GNU_SOURCE -#endif +#include <odp_posix_extensions.h> #include <stdio.h> #include <stdlib.h> diff --git a/platform/linux-generic/pktio/socket_common.c b/platform/linux-generic/pktio/socket_common.c index edb4bcf3..f5bf9e00 100644 --- a/platform/linux-generic/pktio/socket_common.c +++ b/platform/linux-generic/pktio/socket_common.c @@ -4,10 +4,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ #include "config.h" - -#ifndef _GNU_SOURCE -#define _GNU_SOURCE -#endif +#include <odp_posix_extensions.h> #include <stdio.h> #include <stdlib.h> diff --git a/platform/linux-generic/pktio/stats/ethtool_stats.c b/platform/linux-generic/pktio/stats/ethtool_stats.c index fc04fd31..bfc2a60c 100644 --- a/platform/linux-generic/pktio/stats/ethtool_stats.c +++ b/platform/linux-generic/pktio/stats/ethtool_stats.c @@ -5,10 +5,8 @@ */ #include "config.h" +#include <odp_posix_extensions.h> -#ifndef _GNU_SOURCE -#define _GNU_SOURCE -#endif #include <sys/ioctl.h> #include <netinet/in.h> #include <linux/sockios.h> ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/odp_traffic_mngr.c | 4 +--- platform/linux-generic/pktio/ethtool_rss.c | 5 +---- platform/linux-generic/pktio/socket_common.c | 5 +---- platform/linux-generic/pktio/stats/ethtool_stats.c | 4 +--- 4 files changed, 4 insertions(+), 14 deletions(-) hooks/post-receive --

7 years

[COMMIT] branch master updated. v1.19.0.1_tigermoth-104-ga7c60d70

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 a7c60d702466bc0f9de64993446e8ec39a16de88 (commit) from 251fd5805122a257060a9de62a4c26bc1862a544 (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 a7c60d702466bc0f9de64993446e8ec39a16de88 Author: Matias Elo <matias.elo(a)nokia.com> Date: Mon Jun 25 15:36:31 2018 +0300 validation: crypto: replace invalid cipher/auth capability tests odp_crypto_cipher_capability() and odp_crypto_auth_capability() functions return the total number of capability structures. Use this information to dynamically allocate required test arrays. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/crypto/odp_crypto_test_inp.c b/test/validation/api/crypto/odp_crypto_test_inp.c index 83070290..1e06761c 100644 --- a/test/validation/api/crypto/odp_crypto_test_inp.c +++ b/test/validation/api/crypto/odp_crypto_test_inp.c @@ -11,8 +11,6 @@ #include <odp_cunit_common.h> #include "test_vectors.h" -#define MAX_ALG_CAPA 32 - #define PKT_POOL_NUM 64 #define PKT_POOL_LEN (1 * 1024) @@ -466,15 +464,20 @@ static void check_alg(odp_crypto_op_t op, odp_bool_t ovr_iv) { odp_crypto_capability_t capa; - odp_crypto_cipher_capability_t cipher_capa[MAX_ALG_CAPA]; - odp_crypto_auth_capability_t auth_capa[MAX_ALG_CAPA]; - int rc, cipher_num, auth_num, i; - odp_bool_t cipher_tested[MAX_ALG_CAPA]; - odp_bool_t auth_tested[MAX_ALG_CAPA]; + int rc, i; + int cipher_num = odp_crypto_cipher_capability(cipher_alg, NULL, 0); + int auth_num = odp_crypto_auth_capability(auth_alg, NULL, 0); + odp_crypto_cipher_capability_t cipher_capa[cipher_num]; + odp_crypto_auth_capability_t auth_capa[auth_num]; + odp_bool_t cipher_tested[cipher_num]; + odp_bool_t auth_tested[auth_num]; odp_bool_t cipher_ok = false; odp_bool_t auth_ok = false; size_t idx; + CU_ASSERT_FATAL(cipher_num > 0); + CU_ASSERT_FATAL(auth_num > 0); + rc = odp_crypto_capability(&capa); CU_ASSERT(!rc); @@ -546,21 +549,11 @@ static void check_alg(odp_crypto_op_t op, CU_ASSERT(!rc); CU_ASSERT((~capa.auths.all_bits & capa.hw_auths.all_bits) == 0); - cipher_num = odp_crypto_cipher_capability(cipher_alg, cipher_capa, - MAX_ALG_CAPA); - - CU_ASSERT(cipher_num > 0); - CU_ASSERT(cipher_num <= MAX_ALG_CAPA); - if (cipher_num > MAX_ALG_CAPA) - cipher_num = MAX_ALG_CAPA; - - auth_num = odp_crypto_auth_capability(auth_alg, auth_capa, - MAX_ALG_CAPA); + rc = odp_crypto_cipher_capability(cipher_alg, cipher_capa, cipher_num); + CU_ASSERT_FATAL(rc == cipher_num); - CU_ASSERT(auth_num > 0); - CU_ASSERT(auth_num <= MAX_ALG_CAPA); - if (auth_num > MAX_ALG_CAPA) - auth_num = MAX_ALG_CAPA; + rc = odp_crypto_auth_capability(auth_alg, auth_capa, auth_num); + CU_ASSERT_FATAL(rc == auth_num); memset(cipher_tested, 0, sizeof(cipher_tested)); memset(auth_tested, 0, sizeof(auth_tested)); ----------------------------------------------------------------------- Summary of changes: test/validation/api/crypto/odp_crypto_test_inp.c | 35 ++++++++++-------------- 1 file changed, 14 insertions(+), 21 deletions(-) hooks/post-receive --

7 years

[COMMIT] branch master updated. v1.19.0.1_tigermoth-103-g251fd580

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 251fd5805122a257060a9de62a4c26bc1862a544 (commit) via 8813bda68dac4f6ff448cf783b43e6deafff75ae (commit) via 3d79b95543b6043a9df9f523f81416a30052a9ce (commit) via 3c335400833959b9a96674984c797e8ec4734566 (commit) from dd7bcc7dead9bceba895ad877ad3ac7642d4e717 (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 251fd5805122a257060a9de62a4c26bc1862a544 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Wed Jun 20 13:31:59 2018 +0300 validation: queue: improve queue pair checks Output erroneous sequence number. Check that no events were lost. 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/validation/api/queue/queue.c b/test/validation/api/queue/queue.c index f8e0314f..0bd1a06a 100644 --- a/test/validation/api/queue/queue.c +++ b/test/validation/api/queue/queue.c @@ -428,7 +428,11 @@ static int queue_pair_work_loop(void *arg) retry = 0; buf = odp_buffer_from_event(ev); data = odp_buffer_addr(buf); - CU_ASSERT(*data == i); + if (*data != i) { + printf("Seq error: expected %u, recv %u\n", i, *data); + CU_FAIL("Sequence number error"); + } + i++; if (i == burst) i = 0; @@ -458,7 +462,7 @@ static void test_pair(odp_nonblocking_t nonblocking, odp_queue_param_t param; odp_queue_t queue; odp_queue_capability_t capa; - uint32_t max_burst; + uint32_t max_burst, num; odp_pool_t pool; odp_event_t ev; odp_shm_t shm; @@ -526,12 +530,21 @@ static void test_pair(odp_nonblocking_t nonblocking, CU_ASSERT(globals->pair.passed_a); CU_ASSERT(globals->pair.passed_b); - while ((ev = dequeue_event(globals->pair.queue_a)) != ODP_EVENT_INVALID) + num = 0; + + while ((ev = dequeue_event(globals->pair.queue_a)) + != ODP_EVENT_INVALID) { + num++; odp_event_free(ev); + } - while ((ev = dequeue_event(globals->pair.queue_b)) != ODP_EVENT_INVALID) + while ((ev = dequeue_event(globals->pair.queue_b)) + != ODP_EVENT_INVALID) { + num++; odp_event_free(ev); + } + CU_ASSERT(num == max_burst); CU_ASSERT(odp_queue_destroy(globals->pair.queue_a) == 0); CU_ASSERT(odp_queue_destroy(globals->pair.queue_b) == 0); } commit 8813bda68dac4f6ff448cf783b43e6deafff75ae Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Wed Jun 20 10:05:05 2018 +0300 validation: queue: add pair tests for lock-free queues Add queue pair test cases for lock-free queues. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/queue/queue.c b/test/validation/api/queue/queue.c index f009a24b..f8e0314f 100644 --- a/test/validation/api/queue/queue.c +++ b/test/validation/api/queue/queue.c @@ -556,6 +556,21 @@ static void queue_test_pair_spsc(void) test_pair(ODP_BLOCKING, ODP_QUEUE_OP_MT_UNSAFE, ODP_QUEUE_OP_MT_UNSAFE); } +static void queue_test_pair_lf(void) +{ + test_pair(ODP_NONBLOCKING_LF, ODP_QUEUE_OP_MT, ODP_QUEUE_OP_MT); +} + +static void queue_test_pair_lf_spmc(void) +{ + test_pair(ODP_NONBLOCKING_LF, ODP_QUEUE_OP_MT_UNSAFE, ODP_QUEUE_OP_MT); +} + +static void queue_test_pair_lf_mpsc(void) +{ + test_pair(ODP_NONBLOCKING_LF, ODP_QUEUE_OP_MT, ODP_QUEUE_OP_MT_UNSAFE); +} + static void queue_test_pair_lf_spsc(void) { test_pair(ODP_NONBLOCKING_LF, ODP_QUEUE_OP_MT_UNSAFE, @@ -944,6 +959,9 @@ odp_testinfo_t queue_suite[] = { ODP_TEST_INFO(queue_test_pair_spmc), ODP_TEST_INFO(queue_test_pair_mpsc), ODP_TEST_INFO(queue_test_pair_spsc), + ODP_TEST_INFO(queue_test_pair_lf), + ODP_TEST_INFO(queue_test_pair_lf_spmc), + ODP_TEST_INFO(queue_test_pair_lf_mpsc), ODP_TEST_INFO(queue_test_pair_lf_spsc), ODP_TEST_INFO(queue_test_param), ODP_TEST_INFO(queue_test_info), commit 3d79b95543b6043a9df9f523f81416a30052a9ce Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Wed Jun 20 13:03:18 2018 +0300 linux-gen: queue_lf: fix event ordering issue New enqueues may happen during a dequeue operation is searching for the lowest counter value. If the first enqueue (with lower counter value) added a node before the current dequeue search index and the second enqueue after the index, dequeue returned these events in wrong order. After finding the lowest counter value, dequeue needs to search nodes before that node again. Also change CAS operation memory model to acq-rel, so that the first enqueue from a thread is always visible before the second enqueue (from the same thread). Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/odp_queue_lf.c b/platform/linux-generic/odp_queue_lf.c index e4902a3f..3ec32524 100644 --- a/platform/linux-generic/odp_queue_lf.c +++ b/platform/linux-generic/odp_queue_lf.c @@ -36,25 +36,14 @@ static inline void atomic_zero_u128(u128_t *atomic) */ #include <odp_cpu.h> -static inline int atomic_cas_rel_u128(u128_t *atomic, u128_t old_val, - u128_t new_val) +static inline int atomic_cas_acq_rel_u128(u128_t *atomic, u128_t old_val, + u128_t new_val) { return __lockfree_compare_exchange_16((__int128 *)atomic, (__int128 *)&old_val, new_val, 0, - __ATOMIC_RELEASE, - __ATOMIC_RELAXED); -} - -static inline int atomic_cas_acq_u128(u128_t *atomic, u128_t old_val, - u128_t new_val) -{ - return __lockfree_compare_exchange_16((__int128 *)atomic, - (__int128 *)&old_val, - new_val, - 0, - __ATOMIC_ACQUIRE, + __ATOMIC_ACQ_REL, __ATOMIC_RELAXED); } @@ -75,21 +64,12 @@ static inline u128_t atomic_load_u128(u128_t *atomic) return __atomic_load_n(atomic, __ATOMIC_RELAXED); } -static inline int atomic_cas_rel_u128(u128_t *atomic, u128_t old_val, - u128_t new_val) +static inline int atomic_cas_acq_rel_u128(u128_t *atomic, u128_t old_val, + u128_t new_val) { return __atomic_compare_exchange_n(atomic, &old_val, new_val, 0 /* strong */, - __ATOMIC_RELEASE, - __ATOMIC_RELAXED); -} - -static inline int atomic_cas_acq_u128(u128_t *atomic, u128_t old_val, - u128_t new_val) -{ - return __atomic_compare_exchange_n(atomic, &old_val, new_val, - 0 /* strong */, - __ATOMIC_ACQUIRE, + __ATOMIC_ACQ_REL, __ATOMIC_RELAXED); } @@ -120,18 +100,17 @@ static inline void atomic_zero_u128(u128_t *atomic) atomic->u64[1] = 0; } -static inline int atomic_cas_rel_u128(u128_t *atomic, u128_t old_val, - u128_t new_val) +static inline int atomic_cas_acq_rel_u128(u128_t *atomic, u128_t old_val, + u128_t new_val) { - (void)old_val; - *atomic = new_val; - return 1; -} + if (atomic->u64[0] == old_val.u64[0] && + atomic->u64[1] == old_val.u64[1]) { + atomic->u64[0] = new_val.u64[0]; + atomic->u64[1] = new_val.u64[1]; + return 1; + } -static inline int atomic_cas_acq_u128(u128_t *atomic, u128_t old_val, - u128_t new_val) -{ - return atomic_cas_rel_u128(atomic, old_val, new_val); + return 0; } static inline int atomic_is_lockfree_u128(void) @@ -146,15 +125,12 @@ typedef union { u128_t u128; struct { - /* 0: empty, 1: data */ - uint64_t mark: 1; + /* Data with lowest counter value is the head. Empty node has + * counter value 0. */ + uint64_t counter; - /* A cache aligned pointer fits into 63 bits, since the least - * significant bits are zero. */ - uint64_t ptr: 63; - - /* Data with lowest counter value is the head. */ - uint64_t count; + /* Data pointer */ + uint64_t ptr; } s; } ring_lf_node_t; @@ -190,30 +166,31 @@ static int queue_lf_enq(void *q_int, odp_buffer_hdr_t *buf_hdr) { queue_entry_t *queue; queue_lf_t *queue_lf; - int i, j, i_node; + int i, j, idx; int found; ring_lf_node_t node_val; ring_lf_node_t new_val; ring_lf_node_t *node; - uint64_t counter; queue = q_int; queue_lf = queue->s.queue_lf; - i_node = 0; + new_val.s.ptr = (uintptr_t)buf_hdr; + new_val.s.counter = odp_atomic_fetch_inc_u64(&queue_lf->enq_counter); - counter = odp_atomic_fetch_inc_u64(&queue_lf->enq_counter); + idx = 0; for (j = 0; j < ENQ_RETRIES; j++) { found = 0; /* Find empty node */ for (i = 0; i < RING_LF_SIZE; i++) { - i_node = next_idx(i_node); - node = &queue_lf->node[i_node]; + node = &queue_lf->node[idx]; + idx = next_idx(idx); + node_val.u128 = atomic_load_u128(&node->u128); - if (node_val.s.mark == 0) { + if (node_val.s.counter == 0) { found = 1; break; } @@ -224,12 +201,8 @@ static int queue_lf_enq(void *q_int, odp_buffer_hdr_t *buf_hdr) return -1; /* Try to insert data */ - new_val.s.mark = 1; - new_val.s.count = counter; - new_val.s.ptr = ((uintptr_t)buf_hdr) >> 1; - - if (atomic_cas_rel_u128(&node->u128, node_val.u128, - new_val.u128)) + if (atomic_cas_acq_rel_u128(&node->u128, node_val.u128, + new_val.u128)) return 0; } @@ -251,15 +224,18 @@ static odp_buffer_hdr_t *queue_lf_deq(void *q_int) { queue_entry_t *queue; queue_lf_t *queue_lf; - int i, j, i_node; + int i, j, i_lowest; int found; ring_lf_node_t node_val, old_val, new_val; ring_lf_node_t *node, *old; - uint64_t lowest; + uint64_t lowest, counter; + odp_buffer_hdr_t *buf_hdr; queue = q_int; queue_lf = queue->s.queue_lf; - i_node = 0; + new_val.s.counter = 0; + new_val.s.ptr = 0; + old = NULL; for (j = 0; j < DEQ_RETRIES; j++) { found = 0; @@ -268,14 +244,15 @@ static odp_buffer_hdr_t *queue_lf_deq(void *q_int) /* Find the head node. The one with data and * the lowest counter. */ for (i = 0; i < RING_LF_SIZE; i++) { - i_node = next_idx(i_node); - node = &queue_lf->node[i_node]; + node = &queue_lf->node[i]; node_val.u128 = atomic_load_u128(&node->u128); + counter = node_val.s.counter; - if (node_val.s.mark == 1 && node_val.s.count < lowest) { + if (counter && counter < lowest) { old = node; old_val.u128 = node_val.u128; - lowest = node_val.s.count; + lowest = counter; + i_lowest = i; found = 1; } } @@ -284,13 +261,27 @@ static odp_buffer_hdr_t *queue_lf_deq(void *q_int) if (found == 0) return NULL; - /* Try to remove data */ - new_val.u128 = old_val.u128; - new_val.s.mark = 0; + /* New data may have been written to the area we searched before + * finding the current lowest. Check that there are no lower + * values. */ + for (i = 0; i < i_lowest; i++) { + node = &queue_lf->node[i]; + node_val.u128 = atomic_load_u128(&node->u128); + counter = node_val.s.counter; + + if (counter && counter < lowest) { + old = node; + old_val.u128 = node_val.u128; + lowest = counter; + } + } - if (atomic_cas_acq_u128(&old->u128, old_val.u128, - new_val.u128)) - return (void *)(((uintptr_t)old_val.s.ptr) << 1); + buf_hdr = (void *)(uintptr_t)old_val.s.ptr; + + /* Try to remove data */ + if (atomic_cas_acq_rel_u128(&old->u128, old_val.u128, + new_val.u128)) + return buf_hdr; } return NULL; @@ -363,7 +354,7 @@ static void init_queue(queue_lf_t *queue_lf) { int i; - odp_atomic_init_u64(&queue_lf->enq_counter, 0); + odp_atomic_init_u64(&queue_lf->enq_counter, 1); for (i = 0; i < RING_LF_SIZE; i++) atomic_zero_u128(&queue_lf->node[i].u128); commit 3c335400833959b9a96674984c797e8ec4734566 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Tue Jun 19 16:58:08 2018 +0300 linux-gen: queue: fix queue empty check SPSC and normal queues use different rings. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/odp_queue_basic.c b/platform/linux-generic/odp_queue_basic.c index f592ef6c..39e2d59c 100644 --- a/platform/linux-generic/odp_queue_basic.c +++ b/platform/linux-generic/odp_queue_basic.c @@ -383,6 +383,7 @@ void sched_cb_queue_set_status(uint32_t queue_index, int status) static int queue_destroy(odp_queue_t handle) { + int empty; queue_entry_t *queue; queue = qentry_from_handle(handle); @@ -400,7 +401,13 @@ static int queue_destroy(odp_queue_t handle) ODP_ERR("queue \"%s\" already destroyed\n", queue->s.name); return -1; } - if (ring_st_is_empty(&queue->s.ring_st) == 0) { + + if (queue->s.spsc) + empty = ring_spsc_is_empty(&queue->s.ring_spsc); + else + empty = ring_st_is_empty(&queue->s.ring_st); + + if (!empty) { UNLOCK(queue); ODP_ERR("queue \"%s\" not empty\n", queue->s.name); return -1; ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/odp_queue_basic.c | 9 ++- platform/linux-generic/odp_queue_lf.c | 133 ++++++++++++++----------------- test/validation/api/queue/queue.c | 39 ++++++++- 3 files changed, 105 insertions(+), 76 deletions(-) hooks/post-receive --

7 years

[COMMIT] branch master updated. v1.19.0.1_tigermoth-99-gdd7bcc7d

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 dd7bcc7dead9bceba895ad877ad3ac7642d4e717 (commit) from 7c33f29d51082d693c0653df84cb13f2b946eec8 (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 dd7bcc7dead9bceba895ad877ad3ac7642d4e717 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Thu Jun 21 14:01:25 2018 +0300 .travis.yml: upgrade DPDK to 17.11.3 -- latest stable release Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/.travis.yml b/.travis.yml index 886e40f0..3dca855c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -49,7 +49,7 @@ env: # for individual commit validation. But you you want to track tests history # you need generated new one at https://codecov.io specific for your repo. - CODECOV_TOKEN=a733c34c-5f5c-4ff1-af4b-e9f5edb1ab5e - - DPDK_VERS="17.11.2" + - DPDK_VERS="17.11.3" matrix: - CONF="" - CONF="--disable-abi-compat" ----------------------------------------------------------------------- Summary of changes: .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive --

7 years

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

git-lng-odp