git-lng-odp

git-lng-odp@lists.linaro.org

1 participants
1207 discussions

[COMMIT] branch next updated. v1.16.0.0-332-geb600e3f

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, next has been updated via eb600e3f40fe95b986ddee1ba80faed7c0953445 (commit) via 3b81cd95de391a0e846713adaf2df4ba73d48531 (commit) via 4e4dc3e4f331314f23eac818143cc82a4244b796 (commit) from de56e68c3d3b9206c105c2e3018294363ab2cd42 (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 eb600e3f40fe95b986ddee1ba80faed7c0953445 Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Thu Dec 28 11:15:46 2017 +0300 README: test are built by default No need additional options now to build tests. Userguades options is also corrected. Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> diff --git a/README b/README index beaef393..987d1481 100644 --- a/README +++ b/README @@ -26,12 +26,12 @@ Main git repository: To execute all the testcases, assuming CUnit is installed for the validation tests: ./bootstrap - ./configure --enable-test-perf --enable-test-vald + ./configure make check To generate the users guides: ./bootstrap - ./configure --enable-user-guide + ./configure --enable-user-guides make Patches tracking system: commit 3b81cd95de391a0e846713adaf2df4ba73d48531 Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Thu Dec 28 10:52:54 2017 +0300 configure.ac: update API and .so version to v1.17.0.0 Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> diff --git a/configure.ac b/configure.ac index 95e31602..177881a5 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ([2.5]) # Set correct API version ########################################################################## m4_define([odpapi_generation_version], [1]) -m4_define([odpapi_major_version], [16]) +m4_define([odpapi_major_version], [17]) m4_define([odpapi_minor_version], [0]) m4_define([odpapi_point_version], [0]) m4_define([odpapi_version], @@ -36,10 +36,10 @@ AM_SILENT_RULES([yes]) # 3. if interfaces were removed, then use C+1:0:0 ########################################################################## -ODP_LIBSO_VERSION=116:0:0 +ODP_LIBSO_VERSION=117:0:0 AC_SUBST(ODP_LIBSO_VERSION) -ODPHELPER_LIBSO_VERSION=113:1:1 +ODPHELPER_LIBSO_VERSION=113:2:1 AC_SUBST(ODPHELPER_LIBSO_VERSION) # Checks for programs. commit 4e4dc3e4f331314f23eac818143cc82a4244b796 Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Thu Dec 28 10:58:11 2017 +0300 docs: update git tree and bugs link Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> diff --git a/DEPENDENCIES b/DEPENDENCIES index 0805a183..6f374ca9 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -63,7 +63,7 @@ Prerequisites for building the OpenDataPlane (ODP) API $ make install # You may now build either 32 or 64 bit ODP - $ git clone git://git.linaro.org/lng/odp.git odp + $ git clone https://github.com/Linaro/odp.git odp $ cd odp $ ./bootstrap @@ -167,7 +167,7 @@ Prerequisites for building the OpenDataPlane (ODP) API $ sudo yum install numactl-devel Note: only packet I/O is accelerated with DPDK. Use - https://git.linaro.org/lng/odp-dpdk.git + https://github.com/Linaro/odp-dpdk.git for fully accelerated odp dpdk platform. 3.4.1 Building DPDK and ODP with DPDK pktio support diff --git a/README b/README index 4350b953..beaef393 100644 --- a/README +++ b/README @@ -7,7 +7,7 @@ OpenDataPlane (ODP) project source code. http://www.opendataplane.org/ Main git repository: - git://git.linaro.org/lng/odp.git + https://github.com/Linaro/odp.git How to build: Look in platform/linux-*/README for more detail how to build. @@ -35,7 +35,10 @@ Main git repository: make Patches tracking system: - http://patches.opendataplane.org/project/lng-odp/list/ + Patchwork: + http://patches.opendataplane.org/project/lng-odp/list/ + Github pull requests: + https://github.com/Linaro/odp/pulls Mailing list: lng-odp(a)lists.linaro.org diff --git a/doc/application-api-guide/odp.dox b/doc/application-api-guide/odp.dox index 57921794..72fcfb37 100644 --- a/doc/application-api-guide/odp.dox +++ b/doc/application-api-guide/odp.dox @@ -37,8 +37,8 @@ * * @section contact Contact Details * - The main web site is http://www.opendataplane.org/ - * - The git repo is https://git.linaro.org/lng/odp.git - * - Bug tracking is https://bugs.linaro.org/buglist.cgi?product=OpenDataPlane + * - The git repo is https://github.com/Linaro/odp.git + * - Bug tracking is https://bugs.linaro.org/describecomponents.cgi?product=OpenDataPlane%20-%20… * */ diff --git a/doc/helper-guide/odp.dox b/doc/helper-guide/odp.dox index 0a86d478..79f4121b 100644 --- a/doc/helper-guide/odp.dox +++ b/doc/helper-guide/odp.dox @@ -20,7 +20,7 @@ * * @section contact Contact Details * - The main web site is http://www.opendataplane.org/ - * - The git repo is https://git.linaro.org/lng/odp.git - * - Bug tracking is https://bugs.linaro.org/buglist.cgi?product=OpenDataPlane + * - The git repo is https://github.com/Linaro/odp.git + * - Bug tracking is https://bugs.linaro.org/describecomponents.cgi?product=OpenDataPlane%20-%20… * */ diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index fd5f72c1..7e40448b 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -1,5 +1,5 @@ # Uncomment this if you need to change the CUSTOM_STR string -#export CUSTOM_STR=https://git.linaro.org/lng/odp.git +#export CUSTOM_STR=https://github.com/Linaro/odp.git include $(top_srcdir)/platform/Makefile.inc ----------------------------------------------------------------------- Summary of changes: DEPENDENCIES | 4 ++-- README | 11 +++++++---- configure.ac | 6 +++--- doc/application-api-guide/odp.dox | 4 ++-- doc/helper-guide/odp.dox | 4 ++-- platform/linux-generic/Makefile.am | 2 +- 6 files changed, 17 insertions(+), 14 deletions(-) hooks/post-receive --

8 years, 2 months

[COMMIT] branch api-next updated. v1.16.0.0-760-g68735b31

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 68735b312926a44ddf42f9ecf96a0badd941a247 (commit) from a7b46491ca049998dc38b0a5b29213a407931523 (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 68735b312926a44ddf42f9ecf96a0badd941a247 Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Wed Dec 27 17:17:01 2017 +0300 test: cleanup makefile EXEEXTs that is already corrected in cherry-picked next branch, just place it here to make git diff review smaller. Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> diff --git a/test/validation/api/chksum/Makefile.am b/test/validation/api/chksum/Makefile.am index 46f3643e..3227294d 100644 --- a/test/validation/api/chksum/Makefile.am +++ b/test/validation/api/chksum/Makefile.am @@ -1,5 +1,5 @@ include ../Makefile.inc -test_PROGRAMS = chksum_main$(EXEEXT) +test_PROGRAMS = chksum_main chksum_main_SOURCES = chksum_main.c chksum.c chksum.h chksum_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/ipsec/Makefile.am b/test/validation/api/ipsec/Makefile.am index 5a4652f5..b300c8e8 100644 --- a/test/validation/api/ipsec/Makefile.am +++ b/test/validation/api/ipsec/Makefile.am @@ -11,10 +11,10 @@ libtestipsec_la_SOURCES = \ ipsec.c test_PROGRAMS = \ - ipsec_sync$(EXEEXT) \ - ipsec_async$(EXEEXT) \ - ipsec_inline_in$(EXEEXT) \ - ipsec_inline_out$(EXEEXT) + ipsec_sync \ + ipsec_async \ + ipsec_inline_in \ + ipsec_inline_out ipsec_sync_SOURCES = ipsec_sync.c ipsec_async_SOURCES = ipsec_async.c ----------------------------------------------------------------------- Summary of changes: test/validation/api/chksum/Makefile.am | 2 +- test/validation/api/ipsec/Makefile.am | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) hooks/post-receive --

8 years, 2 months

[COMMIT] branch api-next updated. v1.16.0.0-759-ga7b46491

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 a7b46491ca049998dc38b0a5b29213a407931523 (commit) via 4f2ebb270c30a46c97355da84587a2220281798c (commit) via 1f2bfb175ea39f6a358bb40d92efd21f709f1dd8 (commit) via 62f4a34301f57a39e4bdacab4b45f29596b76ede (commit) via dccf4d8fcba4f912d4844b6d4a30f045b1e12651 (commit) from bea7fcae31d525e7f1e991f301c807cf86095aef (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 a7b46491ca049998dc38b0a5b29213a407931523 Merge: bea7fcae 4f2ebb27 Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Wed Dec 27 17:14:02 2017 +0300 Merge branch 'master' into api-next diff --cc platform/linux-generic/Makefile.am index 4371e7a9,8152ea18..9f7993d8 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@@ -162,12 -150,8 +164,11 @@@ noinst_HEADERS = include/odp_ring_internal.h \ include/odp_queue_if.h \ include/odp_schedule_if.h \ + include/odp_schedule_scalable.h \ + include/odp_schedule_scalable_config.h \ + include/odp_schedule_scalable_ordered.h \ include/odp_sorted_list_internal.h \ include/odp_shm_internal.h \ - include/odp_time_internal.h \ include/odp_timer_internal.h \ include/odp_timer_wheel_internal.h \ include/odp_traffic_mngr_internal.h \ @@@ -255,36 -228,21 +255,33 @@@ __LIB__libodp_linux_la_SOURCES += arch/ arch/default/odp_global_time.c \ arch/default/odp_sysinfo_parse.c arch_odp_headers = arch/arm/odp/api/cpu_arch.h +noinst_HEADERS += arch/arm/odp_atomic.h \ + arch/arm/odp_cpu.h \ + arch/arm/odp_cpu_idling.h \ + arch/default/odp_cpu_idling.h \ + arch/arm/odp_llsc.h endif if ARCH_IS_AARCH64 - __LIB__libodp_linux_la_SOURCES += arch/default/odp_cpu_arch.c \ - arch/default/odp_cpu_cycles.c \ + __LIB__libodp_linux_la_SOURCES += arch/default/odp_cpu_cycles.c \ arch/aarch64/odp_global_time.c \ arch/default/odp_sysinfo_parse.c arch_odp_headers = arch/aarch64/odp/api/cpu_arch.h +noinst_HEADERS += arch/aarch64/odp_atomic.h \ + arch/aarch64/odp_cpu.h \ + arch/aarch64/odp_cpu_idling.h \ + arch/default/odp_cpu_idling.h \ + arch/aarch64/odp_llsc.h endif if ARCH_IS_MIPS64 - __LIB__libodp_linux_la_SOURCES += arch/mips64/odp_cpu_arch.c \ - arch/default/odp_cpu_cycles.c \ + __LIB__libodp_linux_la_SOURCES += arch/mips64/odp_cpu_cycles.c \ arch/default/odp_global_time.c \ arch/mips64/odp_sysinfo_parse.c arch_odp_headers = arch/mips64/odp/api/cpu_arch.h +noinst_HEADERS += arch/default/odp_cpu.h \ + arch/default/odp_cpu_idling.h endif if ARCH_IS_POWERPC - __LIB__libodp_linux_la_SOURCES += arch/default/odp_cpu_arch.c \ - arch/default/odp_cpu_cycles.c \ + __LIB__libodp_linux_la_SOURCES += arch/default/odp_cpu_cycles.c \ arch/default/odp_global_time.c \ arch/powerpc/odp_sysinfo_parse.c arch_odp_headers = arch/powerpc/odp/api/cpu_arch.h diff --cc platform/linux-generic/odp_timer.c index bee63383,70a9c97b..c52cf717 --- a/platform/linux-generic/odp_timer.c +++ b/platform/linux-generic/odp_timer.c @@@ -54,7 -54,6 +54,7 @@@ #include <odp/api/sync.h> #include <odp/api/time.h> #include <odp/api/timer.h> - #include <odp_time_internal.h> ++#include <odp_arch_time_internal.h> #include <odp_timer_internal.h> #define TMO_UNUSED ((uint64_t)0xFFFFFFFFFFFFFFFF) ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/Makefile.am | 18 ++++------ platform/linux-generic/_ishm.c | 21 +++++------ .../linux-generic/arch/aarch64/odp_global_time.c | 2 +- platform/linux-generic/arch/default/odp_cpu_arch.c | 38 -------------------- .../linux-generic/arch/default/odp_cpu_cycles.c | 29 +++++++++++++++ .../linux-generic/arch/default/odp_global_time.c | 13 +------ .../mips64/{odp_cpu_arch.c => odp_cpu_cycles.c} | 11 +++++- .../odp_arch_time_internal.h} | 4 +-- platform/linux-generic/arch/powerpc/odp_cpu_arch.c | 41 ---------------------- .../linux-generic/arch/powerpc/odp_global_time.c | 15 -------- platform/linux-generic/arch/x86/cpu_flags.c | 2 +- .../arch/x86/{odp_cpu_arch.c => odp_cpu_cycles.c} | 17 +++++---- platform/linux-generic/arch/x86/odp_global_time.c | 2 +- platform/linux-generic/odp_time.c | 2 +- platform/linux-generic/odp_timer.c | 2 +- 15 files changed, 75 insertions(+), 142 deletions(-) delete mode 100644 platform/linux-generic/arch/default/odp_cpu_arch.c rename platform/linux-generic/arch/mips64/{odp_cpu_arch.c => odp_cpu_cycles.c} (79%) rename platform/linux-generic/{include/odp_time_internal.h => arch/odp_arch_time_internal.h} (82%) delete mode 100644 platform/linux-generic/arch/powerpc/odp_cpu_arch.c delete mode 100644 platform/linux-generic/arch/powerpc/odp_global_time.c rename platform/linux-generic/arch/x86/{odp_cpu_arch.c => odp_cpu_cycles.c} (77%) hooks/post-receive --

8 years, 2 months

[COMMIT] branch master updated. v1.16.0.0-47-g4f2ebb27

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 4f2ebb270c30a46c97355da84587a2220281798c (commit) via 1f2bfb175ea39f6a358bb40d92efd21f709f1dd8 (commit) via 62f4a34301f57a39e4bdacab4b45f29596b76ede (commit) from dccf4d8fcba4f912d4844b6d4a30f045b1e12651 (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 4f2ebb270c30a46c97355da84587a2220281798c Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Thu Dec 14 16:24:58 2017 +0200 linux-gen: arch: single cpu cycles file CPU cycle functions were mixed over odp_cpu_cycles.c and odp_cpu_arch.c files. Implement all three cpu cycle API functions in odp_cpu_cycles.c. odp_cpu_arch.c is deleted. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> 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/Makefile.am b/platform/linux-generic/Makefile.am index d1b91629..8152ea18 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -224,37 +224,32 @@ __LIB__libodp_linux_la_SOURCES = \ odp_weak.c if ARCH_IS_ARM -__LIB__libodp_linux_la_SOURCES += arch/default/odp_cpu_arch.c \ - arch/default/odp_cpu_cycles.c \ +__LIB__libodp_linux_la_SOURCES += arch/default/odp_cpu_cycles.c \ arch/default/odp_global_time.c \ arch/default/odp_sysinfo_parse.c arch_odp_headers = arch/arm/odp/api/cpu_arch.h endif if ARCH_IS_AARCH64 -__LIB__libodp_linux_la_SOURCES += arch/default/odp_cpu_arch.c \ - arch/default/odp_cpu_cycles.c \ +__LIB__libodp_linux_la_SOURCES += arch/default/odp_cpu_cycles.c \ arch/aarch64/odp_global_time.c \ arch/default/odp_sysinfo_parse.c arch_odp_headers = arch/aarch64/odp/api/cpu_arch.h endif if ARCH_IS_MIPS64 -__LIB__libodp_linux_la_SOURCES += arch/mips64/odp_cpu_arch.c \ - arch/default/odp_cpu_cycles.c \ +__LIB__libodp_linux_la_SOURCES += arch/mips64/odp_cpu_cycles.c \ arch/default/odp_global_time.c \ arch/mips64/odp_sysinfo_parse.c arch_odp_headers = arch/mips64/odp/api/cpu_arch.h endif if ARCH_IS_POWERPC -__LIB__libodp_linux_la_SOURCES += arch/default/odp_cpu_arch.c \ - arch/default/odp_cpu_cycles.c \ +__LIB__libodp_linux_la_SOURCES += arch/default/odp_cpu_cycles.c \ arch/default/odp_global_time.c \ arch/powerpc/odp_sysinfo_parse.c arch_odp_headers = arch/powerpc/odp/api/cpu_arch.h endif if ARCH_IS_X86 __LIB__libodp_linux_la_SOURCES += arch/x86/cpu_flags.c \ - arch/x86/odp_cpu_arch.c \ - arch/default/odp_cpu_cycles.c \ + arch/x86/odp_cpu_cycles.c \ arch/x86/odp_global_time.c \ arch/x86/odp_sysinfo_parse.c arch_odp_headers = arch/x86/odp/api/cpu_arch.h diff --git a/platform/linux-generic/arch/default/odp_cpu_arch.c b/platform/linux-generic/arch/default/odp_cpu_arch.c deleted file mode 100644 index 8a8da744..00000000 --- a/platform/linux-generic/arch/default/odp_cpu_arch.c +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#include "config.h" - -#include <odp_posix_extensions.h> - -#include <stdlib.h> -#include <time.h> - -#include <odp/api/cpu.h> -#include <odp_debug_internal.h> - -#define GIGA 1000000000 - -uint64_t odp_cpu_cycles(void) -{ - struct timespec time; - uint64_t sec, ns, hz, cycles; - int ret; - - ret = clock_gettime(CLOCK_MONOTONIC_RAW, &time); - - if (ret != 0) - ODP_ABORT("clock_gettime failed\n"); - - hz = odp_cpu_hz_max(); - sec = (uint64_t)time.tv_sec; - ns = (uint64_t)time.tv_nsec; - - cycles = sec * hz; - cycles += (ns * hz) / GIGA; - - return cycles; -} diff --git a/platform/linux-generic/arch/default/odp_cpu_cycles.c b/platform/linux-generic/arch/default/odp_cpu_cycles.c index ccc58882..548aa817 100644 --- a/platform/linux-generic/arch/default/odp_cpu_cycles.c +++ b/platform/linux-generic/arch/default/odp_cpu_cycles.c @@ -6,7 +6,36 @@ #include "config.h" +#include <odp_posix_extensions.h> + +#include <stdlib.h> +#include <time.h> + #include <odp/api/cpu.h> +#include <odp_debug_internal.h> + +#define GIGA 1000000000 + +uint64_t odp_cpu_cycles(void) +{ + struct timespec time; + uint64_t sec, ns, hz, cycles; + int ret; + + ret = clock_gettime(CLOCK_MONOTONIC_RAW, &time); + + if (ret != 0) + ODP_ABORT("clock_gettime failed\n"); + + hz = odp_cpu_hz_max(); + sec = (uint64_t)time.tv_sec; + ns = (uint64_t)time.tv_nsec; + + cycles = sec * hz; + cycles += (ns * hz) / GIGA; + + return cycles; +} uint64_t odp_cpu_cycles_max(void) { diff --git a/platform/linux-generic/arch/mips64/odp_cpu_arch.c b/platform/linux-generic/arch/mips64/odp_cpu_cycles.c similarity index 79% rename from platform/linux-generic/arch/mips64/odp_cpu_arch.c rename to platform/linux-generic/arch/mips64/odp_cpu_cycles.c index 50ffc2e7..85a95f09 100644 --- a/platform/linux-generic/arch/mips64/odp_cpu_arch.c +++ b/platform/linux-generic/arch/mips64/odp_cpu_cycles.c @@ -21,3 +21,13 @@ uint64_t odp_cpu_cycles(void) return cycle; } + +uint64_t odp_cpu_cycles_max(void) +{ + return UINT64_MAX; +} + +uint64_t odp_cpu_cycles_resolution(void) +{ + return 1; +} diff --git a/platform/linux-generic/arch/x86/odp_cpu_arch.c b/platform/linux-generic/arch/x86/odp_cpu_cycles.c similarity index 77% rename from platform/linux-generic/arch/x86/odp_cpu_arch.c rename to platform/linux-generic/arch/x86/odp_cpu_cycles.c index a20d9173..a474ac25 100644 --- a/platform/linux-generic/arch/x86/odp_cpu_arch.c +++ b/platform/linux-generic/arch/x86/odp_cpu_cycles.c @@ -4,14 +4,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include "config.h" - -#include <odp_posix_extensions.h> - #include <odp/api/cpu.h> -#include <odp_debug_internal.h> - -#include <time.h> uint64_t odp_cpu_cycles(void) { @@ -29,3 +22,13 @@ uint64_t odp_cpu_cycles(void) return tsc.tsc_64; } + +uint64_t odp_cpu_cycles_max(void) +{ + return UINT64_MAX; +} + +uint64_t odp_cpu_cycles_resolution(void) +{ + return 1; +} commit 1f2bfb175ea39f6a358bb40d92efd21f709f1dd8 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Thu Dec 14 09:49:14 2017 +0200 linux-gen: arch: cpu arch specific time header Rename odp_time_internal.h to odp_arch_time_internal.h, and move it under arch directory. This header specifies internal CPU arch specific time counter functions. All architectures must implement these functions. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> 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/Makefile.am b/platform/linux-generic/Makefile.am index bbe6a21c..d1b91629 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -5,6 +5,7 @@ include $(top_srcdir)/platform/Makefile.inc AM_CPPFLAGS = -I$(srcdir)/include AM_CPPFLAGS += -I$(top_srcdir)/include +AM_CPPFLAGS += -I$(top_srcdir)/platform/$(with_platform)/arch AM_CPPFLAGS += -I$(top_srcdir)/include/odp/arch/@ARCH_ABI@ AM_CPPFLAGS += -I$(top_builddir)/include AM_CPPFLAGS += -Iinclude @@ -115,6 +116,7 @@ nodist_odpapiplatinclude_HEADERS = \ include/odp/api/plat/static_inline.h noinst_HEADERS = \ + arch/odp_arch_time_internal.h \ include/_fdserver_internal.h \ include/_ishm_internal.h \ include/_ishmphy_internal.h \ @@ -150,7 +152,6 @@ noinst_HEADERS = \ include/odp_schedule_if.h \ include/odp_sorted_list_internal.h \ include/odp_shm_internal.h \ - include/odp_time_internal.h \ include/odp_timer_internal.h \ include/odp_timer_wheel_internal.h \ include/odp_traffic_mngr_internal.h \ diff --git a/platform/linux-generic/arch/aarch64/odp_global_time.c b/platform/linux-generic/arch/aarch64/odp_global_time.c index 97444f7e..a1b48ea0 100644 --- a/platform/linux-generic/arch/aarch64/odp_global_time.c +++ b/platform/linux-generic/arch/aarch64/odp_global_time.c @@ -11,7 +11,7 @@ #include <time.h> #include <odp_debug_internal.h> -#include <odp_time_internal.h> +#include <odp_arch_time_internal.h> int cpu_has_global_time(void) { diff --git a/platform/linux-generic/arch/default/odp_global_time.c b/platform/linux-generic/arch/default/odp_global_time.c index 89cce1cf..ae8a6bbd 100644 --- a/platform/linux-generic/arch/default/odp_global_time.c +++ b/platform/linux-generic/arch/default/odp_global_time.c @@ -4,18 +4,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include "config.h" - -#include <odp_posix_extensions.h> - -#include <stdlib.h> -#include <time.h> - -#include <odp/api/cpu.h> -#include <odp/api/hints.h> -#include <odp/api/system_info.h> -#include <odp_debug_internal.h> -#include <odp_time_internal.h> +#include <odp_arch_time_internal.h> int cpu_has_global_time(void) { diff --git a/platform/linux-generic/arch/mips64/odp_cpu_arch.c b/platform/linux-generic/arch/mips64/odp_cpu_arch.c index 620a0104..50ffc2e7 100644 --- a/platform/linux-generic/arch/mips64/odp_cpu_arch.c +++ b/platform/linux-generic/arch/mips64/odp_cpu_arch.c @@ -9,7 +9,6 @@ #include <odp/api/cpu.h> #include <odp/api/hints.h> #include <odp/api/system_info.h> -#include <odp_time_internal.h> uint64_t odp_cpu_cycles(void) { diff --git a/platform/linux-generic/include/odp_time_internal.h b/platform/linux-generic/arch/odp_arch_time_internal.h similarity index 82% rename from platform/linux-generic/include/odp_time_internal.h rename to platform/linux-generic/arch/odp_arch_time_internal.h index 99ac7977..ce27101d 100644 --- a/platform/linux-generic/include/odp_time_internal.h +++ b/platform/linux-generic/arch/odp_arch_time_internal.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef ODP_TIME_INTERNAL_H_ -#define ODP_TIME_INTERNAL_H_ +#ifndef ODP_ARCH_TIME_INTERNAL_H_ +#define ODP_ARCH_TIME_INTERNAL_H_ #ifdef __cplusplus extern "C" { diff --git a/platform/linux-generic/arch/x86/cpu_flags.c b/platform/linux-generic/arch/x86/cpu_flags.c index e46c4ffb..fd880646 100644 --- a/platform/linux-generic/arch/x86/cpu_flags.c +++ b/platform/linux-generic/arch/x86/cpu_flags.c @@ -41,7 +41,7 @@ #include <cpu_flags.h> #include <odp_debug_internal.h> -#include <odp_time_internal.h> +#include <odp_arch_time_internal.h> #include <stdio.h> #include <stdint.h> diff --git a/platform/linux-generic/arch/x86/odp_global_time.c b/platform/linux-generic/arch/x86/odp_global_time.c index 3ed243cc..c372f089 100644 --- a/platform/linux-generic/arch/x86/odp_global_time.c +++ b/platform/linux-generic/arch/x86/odp_global_time.c @@ -13,7 +13,7 @@ #include <odp/api/cpu.h> #include <odp/api/hints.h> #include <odp_debug_internal.h> -#include <odp_time_internal.h> +#include <odp_arch_time_internal.h> uint64_t cpu_global_time(void) { diff --git a/platform/linux-generic/odp_time.c b/platform/linux-generic/odp_time.c index 0df4682c..1ec57c7c 100644 --- a/platform/linux-generic/odp_time.c +++ b/platform/linux-generic/odp_time.c @@ -12,7 +12,7 @@ #include <odp/api/time.h> #include <odp/api/hints.h> #include <odp_debug_internal.h> -#include <odp_time_internal.h> +#include <odp_arch_time_internal.h> #include <string.h> #include <inttypes.h> commit 62f4a34301f57a39e4bdacab4b45f29596b76ede Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Thu Dec 14 15:36:47 2017 +0200 linux-gen: arch: remove unused powerpc files These C files were not built. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> 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/arch/powerpc/odp_cpu_arch.c b/platform/linux-generic/arch/powerpc/odp_cpu_arch.c deleted file mode 100644 index 6a16f13a..00000000 --- a/platform/linux-generic/arch/powerpc/odp_cpu_arch.c +++ /dev/null @@ -1,41 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#include "config.h" - -#include <odp_posix_extensions.h> - -#include <stdlib.h> -#include <time.h> - -#include <odp/api/cpu.h> -#include <odp/api/hints.h> -#include <odp/api/system_info.h> -#include <odp_debug_internal.h> -#include <odp_time_internal.h> - -#define GIGA 1000000000 - -uint64_t odp_cpu_cycles(void) -{ - struct timespec time; - uint64_t sec, ns, hz, cycles; - int ret; - - ret = clock_gettime(CLOCK_MONOTONIC_RAW, &time); - - if (ret != 0) - ODP_ABORT("clock_gettime failed\n"); - - hz = odp_cpu_hz_max(); - sec = (uint64_t)time.tv_sec; - ns = (uint64_t)time.tv_nsec; - - cycles = sec * hz; - cycles += (ns * hz) / GIGA; - - return cycles; -} diff --git a/platform/linux-generic/arch/powerpc/odp_global_time.c b/platform/linux-generic/arch/powerpc/odp_global_time.c deleted file mode 100644 index d54ba6bc..00000000 --- a/platform/linux-generic/arch/powerpc/odp_global_time.c +++ /dev/null @@ -1,15 +0,0 @@ - -int cpu_has_global_time(void) -{ - return 0; -} - -uint64_t cpu_global_time(void) -{ - return 0; -} - -uint64_t cpu_global_time_freq(void) -{ - return 0; -} ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/Makefile.am | 18 ++++------ .../linux-generic/arch/aarch64/odp_global_time.c | 2 +- platform/linux-generic/arch/default/odp_cpu_arch.c | 38 -------------------- .../linux-generic/arch/default/odp_cpu_cycles.c | 29 +++++++++++++++ .../linux-generic/arch/default/odp_global_time.c | 13 +------ .../mips64/{odp_cpu_arch.c => odp_cpu_cycles.c} | 11 +++++- .../odp_arch_time_internal.h} | 4 +-- platform/linux-generic/arch/powerpc/odp_cpu_arch.c | 41 ---------------------- .../linux-generic/arch/powerpc/odp_global_time.c | 15 -------- platform/linux-generic/arch/x86/cpu_flags.c | 2 +- .../arch/x86/{odp_cpu_arch.c => odp_cpu_cycles.c} | 17 +++++---- platform/linux-generic/arch/x86/odp_global_time.c | 2 +- platform/linux-generic/odp_time.c | 2 +- 13 files changed, 63 insertions(+), 131 deletions(-) delete mode 100644 platform/linux-generic/arch/default/odp_cpu_arch.c rename platform/linux-generic/arch/mips64/{odp_cpu_arch.c => odp_cpu_cycles.c} (79%) rename platform/linux-generic/{include/odp_time_internal.h => arch/odp_arch_time_internal.h} (82%) delete mode 100644 platform/linux-generic/arch/powerpc/odp_cpu_arch.c delete mode 100644 platform/linux-generic/arch/powerpc/odp_global_time.c rename platform/linux-generic/arch/x86/{odp_cpu_arch.c => odp_cpu_cycles.c} (77%) hooks/post-receive --

8 years, 2 months

[COMMIT] branch api-next updated. v1.16.0.0-754-gbea7fcae

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 bea7fcae31d525e7f1e991f301c807cf86095aef (commit) via 7a88e1e111d09b5b4bcdc211cbc4ab7f9c94ccfe (commit) via dcdd06fbaffce7be63fc5f43bbe7792e3e1234fb (commit) from a5f07dbf95f982b7c5898434e56164ff976c0a0f (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 bea7fcae31d525e7f1e991f301c807cf86095aef Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Wed Dec 27 13:45:18 2017 +0300 linux-gen: crypto: fix fallthrough error GCC-7 will output "may fall through" error if fallthrough comment is present, but before preprocessor directive. Move these comments after endif directives. 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_crypto.c b/platform/linux-generic/odp_crypto.c index 69e6d0da..2038aa46 100644 --- a/platform/linux-generic/odp_crypto.c +++ b/platform/linux-generic/odp_crypto.c @@ -962,8 +962,8 @@ odp_crypto_session_create(odp_crypto_session_param_t *param, case ODP_AUTH_ALG_MD5_96: /* Fixed digest tag length with deprecated algo */ session->p.auth_digest_len = 96 / 8; - /* Fallthrough */ #endif + /* Fallthrough */ case ODP_AUTH_ALG_MD5_HMAC: rc = process_auth_param(session, 16, EVP_md5()); break; @@ -974,8 +974,8 @@ odp_crypto_session_create(odp_crypto_session_param_t *param, case ODP_AUTH_ALG_SHA256_128: /* Fixed digest tag length with deprecated algo */ session->p.auth_digest_len = 128 / 8; - /* Fallthrough */ #endif + /* Fallthrough */ case ODP_AUTH_ALG_SHA256_HMAC: rc = process_auth_param(session, 32, EVP_sha256()); break; @@ -988,8 +988,8 @@ odp_crypto_session_create(odp_crypto_session_param_t *param, aes_gcm = 1; /* Fixed digest tag length with deprecated algo */ session->p.auth_digest_len = 16; - /* Fallthrough */ #endif + /* Fallthrough */ case ODP_AUTH_ALG_AES_GCM: /* AES-GCM requires to do both auth and * cipher at the same time */ commit 7a88e1e111d09b5b4bcdc211cbc4ab7f9c94ccfe Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Wed Dec 27 13:45:11 2017 +0300 validation: drop obsolete Makefile.inc This make include file was removed long ago but got resurrected in one of merges with master branch. 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/test/validation/Makefile.inc b/test/validation/Makefile.inc deleted file mode 100644 index 4f946b8a..00000000 --- a/test/validation/Makefile.inc +++ /dev/null @@ -1,10 +0,0 @@ -include $(top_srcdir)/test/Makefile.inc - -COMMON_DIR = $(top_builddir)/test/common - -AM_CFLAGS += -I$(top_srcdir)/test/common - -LIBCUNIT_COMMON = $(COMMON_DIR)/libcunit_common.la -LIBCPUMASK_COMMON = $(COMMON_DIR)/libcpumask_common.la -LIBTHRMASK_COMMON = $(COMMON_DIR)/libthrmask_common.la -LIBODP = $(LIB)/libodphelper.la $(LIB)/libodp-linux.la diff --git a/test/validation/api/Makefile.inc b/test/validation/api/Makefile.inc index 2a9ec255..4af01000 100644 --- a/test/validation/api/Makefile.inc +++ b/test/validation/api/Makefile.inc @@ -1,6 +1,13 @@ -include $(top_srcdir)/test/validation/Makefile.inc +include $(top_srcdir)/test/Makefile.inc +COMMON_DIR = $(top_builddir)/test/common + +AM_CFLAGS += -I$(top_srcdir)/test/common AM_LDFLAGS += $(DPDK_PMDS) AM_CFLAGS += $(CUNIT_CFLAGS) +LIBCUNIT_COMMON = $(COMMON_DIR)/libcunit_common.la +LIBCPUMASK_COMMON = $(COMMON_DIR)/libcpumask_common.la +LIBTHRMASK_COMMON = $(COMMON_DIR)/libthrmask_common.la +LIBODP = $(LIB)/libodphelper.la $(LIB)/libodp-linux.la commit dcdd06fbaffce7be63fc5f43bbe7792e3e1234fb Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Wed Dec 27 13:45:02 2017 +0300 doc: drop driver-api-guide remnants Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/doc/driver-api-guide/Doxyfile b/doc/driver-api-guide/Doxyfile deleted file mode 100644 index 28794ef0..00000000 --- a/doc/driver-api-guide/Doxyfile +++ /dev/null @@ -1,9 +0,0 @@ -@INCLUDE = $(SRCDIR)/doc/Doxyfile_common - -PROJECT_NAME = "Driver Interface (drv) Reference Manual" -PROJECT_NUMBER = $(VERSION) -PROJECT_LOGO = $(SRCDIR)/doc/images/ODP-Logo-HQ.svg -INPUT = $(SRCDIR)/doc/driver-api-guide \ - $(SRCDIR)/include/odp/drv \ - $(SRCDIR)/platform/$(WITH_PLATFORM)/include/odp/drv \ - $(SRCDIR)/include/odp_drv.h ----------------------------------------------------------------------- Summary of changes: doc/driver-api-guide/Doxyfile | 9 --------- platform/linux-generic/odp_crypto.c | 6 +++--- test/validation/Makefile.inc | 10 ---------- test/validation/api/Makefile.inc | 9 ++++++++- 4 files changed, 11 insertions(+), 23 deletions(-) delete mode 100644 doc/driver-api-guide/Doxyfile delete mode 100644 test/validation/Makefile.inc hooks/post-receive --

8 years, 2 months

[COMMIT] branch master updated. v1.16.0.0-44-gdccf4d8f

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 dccf4d8fcba4f912d4844b6d4a30f045b1e12651 (commit) from cd289985b5247fe9f1d1f58753717bd5659bd7d0 (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 dccf4d8fcba4f912d4844b6d4a30f045b1e12651 Author: Ilias Apalodimas <ilias.apalodimas(a)linaro.org> Date: Sat Dec 23 13:49:01 2017 +0200 linux-gen: _ishm: proper alignment for current page size On systems compiled without hugetlb odp_init_global() failed. On systems with hugetlb alignment was superfluous. Fixes https://bugs.linaro.org/show_bug.cgi?id=3478 Signed-off-by: Ilias Apalodimas <ilias.apalodimas(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/_ishm.c b/platform/linux-generic/_ishm.c index 82465bc5..bce4e402 100644 --- a/platform/linux-generic/_ishm.c +++ b/platform/linux-generic/_ishm.c @@ -864,8 +864,8 @@ int _odp_ishm_reserve(const char *name, uint64_t size, int fd, * the same address every where, otherwise alignment may be * be wrong for some process */ hp_align = align; - if (hp_align <= odp_sys_huge_page_size()) - hp_align = odp_sys_huge_page_size(); + if (hp_align <= page_hp_size) + hp_align = page_hp_size; else flags |= _ODP_ISHM_SINGLE_VA; @@ -1441,6 +1441,8 @@ int _odp_ishm_init_global(void) void *spce_addr; int i; uid_t uid; + char *hp_dir = odp_global_data.hugepage_info.default_huge_page_dir; + uint64_t align; odp_global_data.main_pid = getpid(); odp_global_data.shm_dir = getenv("ODP_SHM_DIR"); @@ -1466,13 +1468,13 @@ int _odp_ishm_init_global(void) return -1; } - if (!odp_global_data.hugepage_info.default_huge_page_dir) + if (!hp_dir) { ODP_DBG("NOTE: No support for huge pages\n"); - else { - ODP_DBG("Huge pages mount point is: %s\n", - odp_global_data.hugepage_info.default_huge_page_dir); - _odp_ishm_cleanup_files( - odp_global_data.hugepage_info.default_huge_page_dir); + align = odp_sys_page_size(); + } else { + ODP_DBG("Huge pages mount point is: %s\n", hp_dir); + _odp_ishm_cleanup_files(hp_dir); + align = odp_sys_huge_page_size(); } _odp_ishm_cleanup_files(odp_global_data.shm_dir); @@ -1504,8 +1506,7 @@ int _odp_ishm_init_global(void) *reserve the address space for _ODP_ISHM_SINGLE_VA reserved blocks, * only address space! */ - spce_addr = _odp_ishmphy_book_va(ODP_CONFIG_ISHM_VA_PREALLOC_SZ, - odp_sys_huge_page_size()); + spce_addr = _odp_ishmphy_book_va(ODP_CONFIG_ISHM_VA_PREALLOC_SZ, align); if (!spce_addr) { ODP_ERR("unable to reserve virtual space\n."); goto init_glob_err3; ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/_ishm.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) hooks/post-receive --

8 years, 2 months

[COMMIT] branch caterpillar updated. v1.15.0.0-949-gbbbe6c0e

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, caterpillar has been updated via bbbe6c0ef65c16f6d7d327712f177fbf6740e96f (commit) from 63fd88635cc10caaa02fdccd3f52c9494487bdd2 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: platform/linux-dpdk/Makefile.am | 4 ++-- platform/linux-dpdk/buffer/dpdk.c | 1 - platform/linux-dpdk/include/odp_buffer_internal.h | 8 +++++--- platform/linux-dpdk/odp_packet.c | 2 -- 4 files changed, 7 insertions(+), 8 deletions(-) hooks/post-receive --

8 years, 2 months

[COMMIT] branch api-next updated. v1.16.0.0-751-ga5f07dbf

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 a5f07dbf95f982b7c5898434e56164ff976c0a0f (commit) via cd289985b5247fe9f1d1f58753717bd5659bd7d0 (commit) via 38fb73d6ed79d649fdec726ca4bacc93747daa9b (commit) via 5b915893c793ffb3d49152d480d084dba32a5a74 (commit) from 578ecf796dc0bf7bb230b3488d263dd455ed0a18 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: .../include/odp/api/plat/packet_inlines.h | 80 ++++++++++++++++++++++ .../include/odp/api/plat/packet_inlines_api.h | 30 ++++++++ .../include/odp/api/plat/packet_types.h | 6 ++ platform/linux-generic/odp_packet.c | 66 +++++------------- platform/linux-generic/odp_traffic_mngr.c | 11 +-- test/Makefile.am | 2 +- 6 files changed, 141 insertions(+), 54 deletions(-) hooks/post-receive --

8 years, 2 months

[COMMIT] branch next updated. v1.16.0.0-751-ga5f07dbf

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, next has been updated via a5f07dbf95f982b7c5898434e56164ff976c0a0f (commit) via cd289985b5247fe9f1d1f58753717bd5659bd7d0 (commit) via 38fb73d6ed79d649fdec726ca4bacc93747daa9b (commit) via 5b915893c793ffb3d49152d480d084dba32a5a74 (commit) via 578ecf796dc0bf7bb230b3488d263dd455ed0a18 (commit) via f1449d2555fbfa3d72aeb79d3ad6d2f199e83731 (commit) via 5d6aea3f7186a4533ffb7a2bc4858a1d339ebbb4 (commit) via 260ca880b76151b66919cf0f3c149c2ba9ede24e (commit) from 6ca5f5cb57de9f71ace37118a9b0788b2abf529e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: .travis.yml | 2 - .../include/odp/api/plat/packet_inlines.h | 80 ++++++++++++++++++++++ .../include/odp/api/plat/packet_inlines_api.h | 30 ++++++++ .../include/odp/api/plat/packet_types.h | 6 ++ platform/linux-generic/odp_packet.c | 66 +++++------------- platform/linux-generic/odp_traffic_mngr.c | 11 +-- test/Makefile.am | 2 +- test/common/odp_cunit_common.c | 14 ++++ test/common/odp_cunit_common.h | 2 - test/validation/api/packet/packet.c | 2 +- 10 files changed, 156 insertions(+), 59 deletions(-) hooks/post-receive --

8 years, 2 months

[COMMIT] branch master updated. v1.16.0.0-43-gcd289985

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 cd289985b5247fe9f1d1f58753717bd5659bd7d0 (commit) via 38fb73d6ed79d649fdec726ca4bacc93747daa9b (commit) from 5b915893c793ffb3d49152d480d084dba32a5a74 (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 cd289985b5247fe9f1d1f58753717bd5659bd7d0 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Thu Dec 21 17:13:12 2017 +0200 linux-gen: packet: inline layer pointers Inline L2/L3/L4 pointer functions. Packet map function is exported to backup the unlikely case when offset is not within the first segment. Always use the inlined version within the implementation itself. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/include/odp/api/plat/packet_inlines.h b/platform/linux-generic/include/odp/api/plat/packet_inlines.h index aa9ba812..4314619a 100644 --- a/platform/linux-generic/include/odp/api/plat/packet_inlines.h +++ b/platform/linux-generic/include/odp/api/plat/packet_inlines.h @@ -18,6 +18,11 @@ #include <odp/api/packet_io.h> #include <odp/api/hints.h> +/** @internal Inline function @param pkt_ptr @param offset @param seg_len + * @param seg_idx @return */ +void *_odp_packet_map(void *pkt_ptr, uint32_t offset, uint32_t *seg_len, + int *seg_idx); + /** @internal Inline function offsets */ extern const _odp_packet_inline_offset_t _odp_packet_inline; @@ -126,6 +131,63 @@ static inline uint32_t _odp_packet_l4_offset(odp_packet_t pkt) return _odp_pkt_get(pkt, uint16_t, l4_offset); } +/** @internal Inline function @param pkt @param len @return */ +static inline void *_odp_packet_l2_ptr(odp_packet_t pkt, uint32_t *len) +{ + uint32_t offset = _odp_packet_l2_offset(pkt); + uint32_t seg_len = _odp_packet_seg_len(pkt); + uint8_t *data = (uint8_t *)_odp_packet_data(pkt); + + if (odp_unlikely(offset >= seg_len)) { + void *pkt_hdr = (void *)pkt; + + return _odp_packet_map(pkt_hdr, offset, len, NULL); + } + + if (len) + *len = seg_len - offset; + + return data + offset; +} + +/** @internal Inline function @param pkt @param len @return */ +static inline void *_odp_packet_l3_ptr(odp_packet_t pkt, uint32_t *len) +{ + uint32_t offset = _odp_packet_l3_offset(pkt); + uint32_t seg_len = _odp_packet_seg_len(pkt); + uint8_t *data = (uint8_t *)_odp_packet_data(pkt); + + if (odp_unlikely(offset >= seg_len)) { + void *pkt_hdr = (void *)pkt; + + return _odp_packet_map(pkt_hdr, offset, len, NULL); + } + + if (len) + *len = seg_len - offset; + + return data + offset; +} + +/** @internal Inline function @param pkt @param len @return */ +static inline void *_odp_packet_l4_ptr(odp_packet_t pkt, uint32_t *len) +{ + uint32_t offset = _odp_packet_l4_offset(pkt); + uint32_t seg_len = _odp_packet_seg_len(pkt); + uint8_t *data = (uint8_t *)_odp_packet_data(pkt); + + if (odp_unlikely(offset >= seg_len)) { + void *pkt_hdr = (void *)pkt; + + return _odp_packet_map(pkt_hdr, offset, len, NULL); + } + + if (len) + *len = seg_len - offset; + + return data + offset; +} + /** @internal Inline function @param pkt @return */ static inline uint32_t _odp_packet_flow_hash(odp_packet_t pkt) { diff --git a/platform/linux-generic/include/odp/api/plat/packet_inlines_api.h b/platform/linux-generic/include/odp/api/plat/packet_inlines_api.h index 84b4f08a..c90a69c5 100644 --- a/platform/linux-generic/include/odp/api/plat/packet_inlines_api.h +++ b/platform/linux-generic/include/odp/api/plat/packet_inlines_api.h @@ -83,6 +83,21 @@ _ODP_INLINE uint32_t odp_packet_l4_offset(odp_packet_t pkt) return _odp_packet_l4_offset(pkt); } +_ODP_INLINE void *odp_packet_l2_ptr(odp_packet_t pkt, uint32_t *len) +{ + return _odp_packet_l2_ptr(pkt, len); +} + +_ODP_INLINE void *odp_packet_l3_ptr(odp_packet_t pkt, uint32_t *len) +{ + return _odp_packet_l3_ptr(pkt, len); +} + +_ODP_INLINE void *odp_packet_l4_ptr(odp_packet_t pkt, uint32_t *len) +{ + return _odp_packet_l4_ptr(pkt, len); +} + _ODP_INLINE uint32_t odp_packet_flow_hash(odp_packet_t pkt) { return _odp_packet_flow_hash(pkt); diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index 3f0d764f..446d8efa 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -278,11 +278,12 @@ static inline void packet_seg_copy_md(odp_packet_hdr_t *dst, */ } -static inline void *packet_map(odp_packet_hdr_t *pkt_hdr, - uint32_t offset, uint32_t *seg_len, int *seg_idx) +static inline void *packet_map(void *pkt_ptr, uint32_t offset, + uint32_t *seg_len, int *seg_idx) { void *addr; uint32_t len; + odp_packet_hdr_t *pkt_hdr = pkt_ptr; int seg_id = 0; int seg_count = pkt_hdr->buf_hdr.segcount; @@ -323,6 +324,18 @@ static inline void *packet_map(odp_packet_hdr_t *pkt_hdr, return addr; } +#include <odp/visibility_begin.h> + +/* This file uses the inlined version directly. Inlined API calls use this when + * offset does not point to the first segment. */ +void *_odp_packet_map(void *pkt_ptr, uint32_t offset, uint32_t *seg_len, + int *seg_idx) +{ + return packet_map(pkt_ptr, offset, seg_len, seg_idx); +} + +#include <odp/visibility_end.h> + void packet_parse_reset(odp_packet_hdr_t *pkt_hdr) { /* Reset parser metadata before new parse */ @@ -1207,15 +1220,6 @@ void odp_packet_user_ptr_set(odp_packet_t pkt, const void *ctx) packet_hdr(pkt)->buf_hdr.buf_cctx = ctx; } -void *odp_packet_l2_ptr(odp_packet_t pkt, uint32_t *len) -{ - odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); - - if (!packet_hdr_has_l2(pkt_hdr)) - return NULL; - return packet_map(pkt_hdr, pkt_hdr->p.l2_offset, len, NULL); -} - int odp_packet_l2_offset_set(odp_packet_t pkt, uint32_t offset) { odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); @@ -1228,13 +1232,6 @@ int odp_packet_l2_offset_set(odp_packet_t pkt, uint32_t offset) return 0; } -void *odp_packet_l3_ptr(odp_packet_t pkt, uint32_t *len) -{ - odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); - - return packet_map(pkt_hdr, pkt_hdr->p.l3_offset, len, NULL); -} - int odp_packet_l3_offset_set(odp_packet_t pkt, uint32_t offset) { odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); @@ -1246,13 +1243,6 @@ int odp_packet_l3_offset_set(odp_packet_t pkt, uint32_t offset) return 0; } -void *odp_packet_l4_ptr(odp_packet_t pkt, uint32_t *len) -{ - odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); - - return packet_map(pkt_hdr, pkt_hdr->p.l4_offset, len, NULL); -} - int odp_packet_l4_offset_set(odp_packet_t pkt, uint32_t offset) { odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); diff --git a/platform/linux-generic/odp_traffic_mngr.c b/platform/linux-generic/odp_traffic_mngr.c index e22a33f2..556b2a1f 100644 --- a/platform/linux-generic/odp_traffic_mngr.c +++ b/platform/linux-generic/odp_traffic_mngr.c @@ -1928,7 +1928,7 @@ static void egress_vlan_marking(tm_vlan_marking_t *vlan_marking, uint32_t hdr_len; uint16_t old_tci, new_tci; - ether_hdr_ptr = odp_packet_l2_ptr(odp_pkt, &hdr_len); + ether_hdr_ptr = _odp_packet_l2_ptr(odp_pkt, &hdr_len); vlan_hdr_ptr = (_odp_vlanhdr_t *)(ether_hdr_ptr + 1); /* If the split_hdr variable below is TRUE, then this indicates that @@ -1968,7 +1968,7 @@ static void egress_ipv4_tos_marking(tm_tos_marking_t *tos_marking, uint8_t old_tos, new_tos, ecn; l3_offset = _odp_packet_l3_offset(odp_pkt); - ipv4_hdr_ptr = odp_packet_l3_ptr(odp_pkt, &hdr_len); + ipv4_hdr_ptr = _odp_packet_l3_ptr(odp_pkt, &hdr_len); /* If the split_hdr variable below is TRUE, then this indicates that * for this odp (output) packet the IPv4 header is not all in the same @@ -2034,7 +2034,7 @@ static void egress_ipv6_tc_marking(tm_tos_marking_t *tos_marking, uint8_t old_tc, new_tc, ecn; l3_offset = _odp_packet_l3_offset(odp_pkt); - ipv6_hdr_ptr = odp_packet_l3_ptr(odp_pkt, &hdr_len); + ipv6_hdr_ptr = _odp_packet_l3_ptr(odp_pkt, &hdr_len); /* If the split_hdr variable below is TRUE, then this indicates that * for this odp (output) packet the IPv6 header is not all in the same commit 38fb73d6ed79d649fdec726ca4bacc93747daa9b Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Thu Dec 21 16:09:07 2017 +0200 linux-gen: packet: inline layer offsets Inline L2/L3/L4 offset read functions. Always use the inlined version within the implementation itself. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/include/odp/api/plat/packet_inlines.h b/platform/linux-generic/include/odp/api/plat/packet_inlines.h index c808f2d6..aa9ba812 100644 --- a/platform/linux-generic/include/odp/api/plat/packet_inlines.h +++ b/platform/linux-generic/include/odp/api/plat/packet_inlines.h @@ -108,6 +108,24 @@ static inline uint32_t _odp_packet_user_area_size(odp_packet_t pkt) return _odp_pool_get(pool, uint32_t, uarea_size); } +/** @internal Inline function @param pkt @return */ +static inline uint32_t _odp_packet_l2_offset(odp_packet_t pkt) +{ + return _odp_pkt_get(pkt, uint16_t, l2_offset); +} + +/** @internal Inline function @param pkt @return */ +static inline uint32_t _odp_packet_l3_offset(odp_packet_t pkt) +{ + return _odp_pkt_get(pkt, uint16_t, l3_offset); +} + +/** @internal Inline function @param pkt @return */ +static inline uint32_t _odp_packet_l4_offset(odp_packet_t pkt) +{ + return _odp_pkt_get(pkt, uint16_t, l4_offset); +} + /** @internal Inline function @param pkt @return */ static inline uint32_t _odp_packet_flow_hash(odp_packet_t pkt) { diff --git a/platform/linux-generic/include/odp/api/plat/packet_inlines_api.h b/platform/linux-generic/include/odp/api/plat/packet_inlines_api.h index 233bc876..84b4f08a 100644 --- a/platform/linux-generic/include/odp/api/plat/packet_inlines_api.h +++ b/platform/linux-generic/include/odp/api/plat/packet_inlines_api.h @@ -68,6 +68,21 @@ _ODP_INLINE uint32_t odp_packet_user_area_size(odp_packet_t pkt) return _odp_packet_user_area_size(pkt); } +_ODP_INLINE uint32_t odp_packet_l2_offset(odp_packet_t pkt) +{ + return _odp_packet_l2_offset(pkt); +} + +_ODP_INLINE uint32_t odp_packet_l3_offset(odp_packet_t pkt) +{ + return _odp_packet_l3_offset(pkt); +} + +_ODP_INLINE uint32_t odp_packet_l4_offset(odp_packet_t pkt) +{ + return _odp_packet_l4_offset(pkt); +} + _ODP_INLINE uint32_t odp_packet_flow_hash(odp_packet_t pkt) { return _odp_packet_flow_hash(pkt); diff --git a/platform/linux-generic/include/odp/api/plat/packet_types.h b/platform/linux-generic/include/odp/api/plat/packet_types.h index 009a3aa7..5b44c09c 100644 --- a/platform/linux-generic/include/odp/api/plat/packet_types.h +++ b/platform/linux-generic/include/odp/api/plat/packet_types.h @@ -94,6 +94,12 @@ typedef struct _odp_packet_inline_offset_t { /** @internal field offset */ uint16_t user_area; /** @internal field offset */ + uint16_t l2_offset; + /** @internal field offset */ + uint16_t l3_offset; + /** @internal field offset */ + uint16_t l4_offset; + /** @internal field offset */ uint16_t flow_hash; /** @internal field offset */ uint16_t timestamp; diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index 04f1f33b..3f0d764f 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -37,6 +37,9 @@ const _odp_packet_inline_offset_t _odp_packet_inline ODP_ALIGNED_CACHE = { .segcount = offsetof(odp_packet_hdr_t, buf_hdr.segcount), .user_ptr = offsetof(odp_packet_hdr_t, buf_hdr.buf_ctx), .user_area = offsetof(odp_packet_hdr_t, buf_hdr.uarea_addr), + .l2_offset = offsetof(odp_packet_hdr_t, p.l2_offset), + .l3_offset = offsetof(odp_packet_hdr_t, p.l3_offset), + .l4_offset = offsetof(odp_packet_hdr_t, p.l4_offset), .flow_hash = offsetof(odp_packet_hdr_t, flow_hash), .timestamp = offsetof(odp_packet_hdr_t, timestamp), .input_flags = offsetof(odp_packet_hdr_t, p.input_flags) @@ -1213,15 +1216,6 @@ void *odp_packet_l2_ptr(odp_packet_t pkt, uint32_t *len) return packet_map(pkt_hdr, pkt_hdr->p.l2_offset, len, NULL); } -uint32_t odp_packet_l2_offset(odp_packet_t pkt) -{ - odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); - - if (!packet_hdr_has_l2(pkt_hdr)) - return ODP_PACKET_OFFSET_INVALID; - return pkt_hdr->p.l2_offset; -} - int odp_packet_l2_offset_set(odp_packet_t pkt, uint32_t offset) { odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); @@ -1241,13 +1235,6 @@ void *odp_packet_l3_ptr(odp_packet_t pkt, uint32_t *len) return packet_map(pkt_hdr, pkt_hdr->p.l3_offset, len, NULL); } -uint32_t odp_packet_l3_offset(odp_packet_t pkt) -{ - odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); - - return pkt_hdr->p.l3_offset; -} - int odp_packet_l3_offset_set(odp_packet_t pkt, uint32_t offset) { odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); @@ -1266,13 +1253,6 @@ void *odp_packet_l4_ptr(odp_packet_t pkt, uint32_t *len) return packet_map(pkt_hdr, pkt_hdr->p.l4_offset, len, NULL); } -uint32_t odp_packet_l4_offset(odp_packet_t pkt) -{ - odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); - - return pkt_hdr->p.l4_offset; -} - int odp_packet_l4_offset_set(odp_packet_t pkt, uint32_t offset) { odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); diff --git a/platform/linux-generic/odp_traffic_mngr.c b/platform/linux-generic/odp_traffic_mngr.c index ab06b3c0..e22a33f2 100644 --- a/platform/linux-generic/odp_traffic_mngr.c +++ b/platform/linux-generic/odp_traffic_mngr.c @@ -26,6 +26,7 @@ #include <protocols/eth.h> #include <protocols/ip.h> #include <odp_traffic_mngr_internal.h> +#include <odp/api/plat/packet_inlines.h> /* Local vars */ static const @@ -1966,7 +1967,7 @@ static void egress_ipv4_tos_marking(tm_tos_marking_t *tos_marking, uint32_t hdr_len, l3_offset, old_chksum, ones_compl_sum, tos_diff; uint8_t old_tos, new_tos, ecn; - l3_offset = odp_packet_l3_offset(odp_pkt); + l3_offset = _odp_packet_l3_offset(odp_pkt); ipv4_hdr_ptr = odp_packet_l3_ptr(odp_pkt, &hdr_len); /* If the split_hdr variable below is TRUE, then this indicates that @@ -2032,7 +2033,7 @@ static void egress_ipv6_tc_marking(tm_tos_marking_t *tos_marking, uint32_t hdr_len, old_ver_tc_flow, new_ver_tc_flow, l3_offset; uint8_t old_tc, new_tc, ecn; - l3_offset = odp_packet_l3_offset(odp_pkt); + l3_offset = _odp_packet_l3_offset(odp_pkt); ipv6_hdr_ptr = odp_packet_l3_ptr(odp_pkt, &hdr_len); /* If the split_hdr variable below is TRUE, then this indicates that ----------------------------------------------------------------------- Summary of changes: .../include/odp/api/plat/packet_inlines.h | 80 ++++++++++++++++++++++ .../include/odp/api/plat/packet_inlines_api.h | 30 ++++++++ .../include/odp/api/plat/packet_types.h | 6 ++ platform/linux-generic/odp_packet.c | 66 +++++------------- platform/linux-generic/odp_traffic_mngr.c | 11 +-- 5 files changed, 140 insertions(+), 53 deletions(-) hooks/post-receive --

8 years, 2 months

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

git-lng-odp