git-lng-odp May 2018

git-lng-odp@lists.linaro.org

1 participants
23 discussions

[COMMIT] branch master updated. v1.19.0.1_tigermoth-47-g06b3650b

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 06b3650b581bf05ea2f015a02635382fb7c38fda (commit) via 678c2a149a3e7d48c4462fb2e6cc531a3cfed780 (commit) via c6cc6d3a79976bfe96cbb9ff192cf22daffc18c4 (commit) from 2a9d3323537d030c1b3385ed14b496bf9e2b20b3 (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 06b3650b581bf05ea2f015a02635382fb7c38fda Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Wed May 30 12:34:12 2018 +0300 linux-gen: time: use inlined functions internally Always use inlined time functions internally. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c index 5113eba2..4a91c08a 100644 --- a/platform/linux-generic/odp_packet_io.c +++ b/platform/linux-generic/odp_packet_io.c @@ -27,6 +27,7 @@ #include <odp_debug_internal.h> #include <odp_packet_io_ipc_internal.h> #include <odp/api/time.h> +#include <odp/api/plat/time_inlines.h> #include <odp_pcapng.h> #include <string.h> diff --git a/platform/linux-generic/odp_schedule_basic.c b/platform/linux-generic/odp_schedule_basic.c index 7311d13a..c81e417c 100644 --- a/platform/linux-generic/odp_schedule_basic.c +++ b/platform/linux-generic/odp_schedule_basic.c @@ -15,6 +15,7 @@ #include <odp/api/thread.h> #include <odp/api/plat/thread_inlines.h> #include <odp/api/time.h> +#include <odp/api/plat/time_inlines.h> #include <odp/api/spinlock.h> #include <odp/api/hints.h> #include <odp/api/cpu.h> diff --git a/platform/linux-generic/odp_schedule_scalable.c b/platform/linux-generic/odp_schedule_scalable.c index 155be5a2..826747ee 100644 --- a/platform/linux-generic/odp_schedule_scalable.c +++ b/platform/linux-generic/odp_schedule_scalable.c @@ -18,6 +18,7 @@ #include <odp/api/plat/thread_inlines.h> #include <odp/api/thrmask.h> #include <odp/api/time.h> +#include <odp/api/plat/time_inlines.h> #include <odp_config_internal.h> #include <odp_debug_internal.h> diff --git a/platform/linux-generic/odp_schedule_sp.c b/platform/linux-generic/odp_schedule_sp.c index 0f80452d..ac0b35fd 100644 --- a/platform/linux-generic/odp_schedule_sp.c +++ b/platform/linux-generic/odp_schedule_sp.c @@ -11,6 +11,7 @@ #include <odp/api/thread.h> #include <odp/api/plat/thread_inlines.h> #include <odp/api/time.h> +#include <odp/api/plat/time_inlines.h> #include <odp/api/schedule.h> #include <odp/api/shared_memory.h> #include <odp_schedule_if.h> diff --git a/platform/linux-generic/odp_traffic_mngr.c b/platform/linux-generic/odp_traffic_mngr.c index 79ba35b7..bf12a836 100644 --- a/platform/linux-generic/odp_traffic_mngr.c +++ b/platform/linux-generic/odp_traffic_mngr.c @@ -28,6 +28,8 @@ #include <odp_traffic_mngr_internal.h> #include <odp/api/plat/packet_inlines.h> #include <odp/api/plat/byteorder_inlines.h> +#include <odp/api/time.h> +#include <odp/api/plat/time_inlines.h> #include <odp_macros_internal.h> #include <odp_init_internal.h> #include <odp_errno_define.h> diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c index 803c514f..8d93b873 100644 --- a/platform/linux-generic/pktio/dpdk.c +++ b/platform/linux-generic/pktio/dpdk.c @@ -19,6 +19,8 @@ #include <odp/api/packet.h> #include <odp/api/plat/packet_inlines.h> +#include <odp/api/time.h> +#include <odp/api/plat/time_inlines.h> #include <odp_packet_io_internal.h> #include <odp_classification_internal.h> diff --git a/platform/linux-generic/pktio/netmap.c b/platform/linux-generic/pktio/netmap.c index 6cabf0ea..86a40229 100644 --- a/platform/linux-generic/pktio/netmap.c +++ b/platform/linux-generic/pktio/netmap.c @@ -12,6 +12,8 @@ #include <odp/api/packet.h> #include <odp/api/plat/packet_inlines.h> +#include <odp/api/time.h> +#include <odp/api/plat/time_inlines.h> #include <odp_packet_io_internal.h> #include <odp_packet_netmap.h> commit 678c2a149a3e7d48c4462fb2e6cc531a3cfed780 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Tue May 29 17:16:40 2018 +0300 linux-gen: time: inline diff, sum and cmp Inline small functions commonly used in time calculations. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/include/odp/api/plat/time_inlines.h b/platform/linux-generic/include/odp/api/plat/time_inlines.h index 1075a395..527490e3 100644 --- a/platform/linux-generic/include/odp/api/plat/time_inlines.h +++ b/platform/linux-generic/include/odp/api/plat/time_inlines.h @@ -9,6 +9,7 @@ #include <stdint.h> #include <odp/api/align.h> +#include <odp/api/hints.h> #include <odp/api/abi/cpu_time.h> @@ -48,6 +49,10 @@ static inline odp_time_t _odp_time_cur(void) #define _ODP_INLINE static inline #define odp_time_local __odp_time_local #define odp_time_global __odp_time_global + #define odp_time_cmp __odp_time_cmp + #define odp_time_diff __odp_time_diff + #define odp_time_sum __odp_time_sum + #else #define _ODP_INLINE #endif @@ -62,6 +67,35 @@ _ODP_INLINE odp_time_t odp_time_global(void) return _odp_time_cur(); } +_ODP_INLINE int odp_time_cmp(odp_time_t t2, odp_time_t t1) +{ + if (odp_likely(t2.u64 > t1.u64)) + return 1; + + if (t2.u64 < t1.u64) + return -1; + + return 0; +} + +_ODP_INLINE odp_time_t odp_time_diff(odp_time_t t2, odp_time_t t1) +{ + odp_time_t time; + + time.u64 = t2.u64 - t1.u64; + + return time; +} + +_ODP_INLINE odp_time_t odp_time_sum(odp_time_t t1, odp_time_t t2) +{ + odp_time_t time; + + time.u64 = t1.u64 + t2.u64; + + return time; +} + /** @endcond */ #endif diff --git a/platform/linux-generic/odp_time.c b/platform/linux-generic/odp_time.c index 065ad956..97886d6a 100644 --- a/platform/linux-generic/odp_time.c +++ b/platform/linux-generic/odp_time.c @@ -152,26 +152,6 @@ static inline uint64_t time_res(void) return time_spec_res(); } -static inline int time_cmp(odp_time_t t2, odp_time_t t1) -{ - if (odp_likely(t2.u64 > t1.u64)) - return 1; - - if (t2.u64 < t1.u64) - return -1; - - return 0; -} - -static inline odp_time_t time_sum(odp_time_t t1, odp_time_t t2) -{ - odp_time_t time; - - time.u64 = t1.u64 + t2.u64; - - return time; -} - static inline uint64_t time_to_ns(odp_time_t time) { if (_odp_time_glob.use_hw) @@ -194,16 +174,7 @@ static inline void time_wait_until(odp_time_t time) do { cur = _odp_time_cur(); - } while (time_cmp(time, cur) > 0); -} - -odp_time_t odp_time_diff(odp_time_t t2, odp_time_t t1) -{ - odp_time_t time; - - time.u64 = t2.u64 - t1.u64; - - return time; + } while (odp_time_cmp(time, cur) > 0); } uint64_t odp_time_diff_ns(odp_time_t t2, odp_time_t t1) @@ -230,16 +201,6 @@ odp_time_t odp_time_global_from_ns(uint64_t ns) return time_from_ns(ns); } -int odp_time_cmp(odp_time_t t2, odp_time_t t1) -{ - return time_cmp(t2, t1); -} - -odp_time_t odp_time_sum(odp_time_t t1, odp_time_t t2) -{ - return time_sum(t1, t2); -} - uint64_t odp_time_local_res(void) { return time_res(); @@ -254,7 +215,7 @@ void odp_time_wait_ns(uint64_t ns) { odp_time_t cur = _odp_time_cur(); odp_time_t wait = time_from_ns(ns); - odp_time_t end_time = time_sum(cur, wait); + odp_time_t end_time = odp_time_sum(cur, wait); time_wait_until(end_time); } commit c6cc6d3a79976bfe96cbb9ff192cf22daffc18c4 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Tue May 29 13:52:27 2018 +0300 linux-gen: time: inline arch cpu time on x86 Inline cpu HW time counter read function on x86. Time global data structure is visible to applications, but Posix types (timespec) or header files are not. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 30ba0476..8709e713 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -42,7 +42,8 @@ odpapiplatinclude_HEADERS = \ include/odp/api/plat/strong_types.h \ include/odp/api/plat/sync_inlines.h \ include/odp/api/plat/thread_inlines.h \ - include/odp/api/plat/ticketlock_inlines.h + include/odp/api/plat/ticketlock_inlines.h \ + include/odp/api/plat/time_inlines.h odpapiabiarchinclude_HEADERS += \ include-abi/odp/api/abi/align.h \ @@ -82,7 +83,6 @@ odpapiabiarchinclude_HEADERS += \ endif noinst_HEADERS = \ - arch/odp_arch_time_internal.h \ include/odp_align_internal.h \ include/odp_atomic_internal.h \ include/odp_bitmap_internal.h \ @@ -227,14 +227,16 @@ __LIB__libodp_linux_la_SOURCES += \ odp_std_clib_api.c \ odp_sync_api.c \ odp_thread_api.c \ - odp_ticketlock_api.c + odp_ticketlock_api.c \ + odp_time_api.c endif if ARCH_IS_ARM __LIB__libodp_linux_la_SOURCES += arch/default/odp_cpu_cycles.c \ arch/default/odp_global_time.c \ arch/default/odp_sysinfo_parse.c -odpapiabiarchinclude_HEADERS += arch/default/odp/api/abi/cpu_inlines.h +odpapiabiarchinclude_HEADERS += arch/default/odp/api/abi/cpu_inlines.h \ + arch/default/odp/api/abi/cpu_time.h if !ODP_ABI_COMPAT odpapiabiarchinclude_HEADERS += arch/arm/odp/api/abi/cpu.h endif @@ -247,7 +249,8 @@ if ARCH_IS_AARCH64 __LIB__libodp_linux_la_SOURCES += arch/default/odp_cpu_cycles.c \ arch/aarch64/odp_global_time.c \ arch/default/odp_sysinfo_parse.c -odpapiabiarchinclude_HEADERS += arch/default/odp/api/abi/cpu_inlines.h +odpapiabiarchinclude_HEADERS += arch/default/odp/api/abi/cpu_inlines.h \ + arch/default/odp/api/abi/cpu_time.h if !ODP_ABI_COMPAT odpapiabiarchinclude_HEADERS += arch/aarch64/odp/api/abi/cpu.h endif @@ -260,7 +263,8 @@ if ARCH_IS_DEFAULT __LIB__libodp_linux_la_SOURCES += arch/default/odp_cpu_cycles.c \ arch/default/odp_global_time.c \ arch/default/odp_sysinfo_parse.c -odpapiabiarchinclude_HEADERS += arch/default/odp/api/abi/cpu_inlines.h +odpapiabiarchinclude_HEADERS += arch/default/odp/api/abi/cpu_inlines.h \ + arch/default/odp/api/abi/cpu_time.h if !ODP_ABI_COMPAT odpapiabiarchinclude_HEADERS += arch/default/odp/api/abi/cpu.h endif @@ -271,7 +275,8 @@ if ARCH_IS_MIPS64 __LIB__libodp_linux_la_SOURCES += arch/mips64/odp_cpu_cycles.c \ arch/default/odp_global_time.c \ arch/mips64/odp_sysinfo_parse.c -odpapiabiarchinclude_HEADERS += arch/default/odp/api/abi/cpu_inlines.h +odpapiabiarchinclude_HEADERS += arch/default/odp/api/abi/cpu_inlines.h \ + arch/default/odp/api/abi/cpu_time.h if !ODP_ABI_COMPAT odpapiabiarchinclude_HEADERS += arch/mips64/odp/api/abi/cpu.h endif @@ -282,7 +287,8 @@ if ARCH_IS_POWERPC __LIB__libodp_linux_la_SOURCES += arch/default/odp_cpu_cycles.c \ arch/default/odp_global_time.c \ arch/powerpc/odp_sysinfo_parse.c -odpapiabiarchinclude_HEADERS += arch/default/odp/api/abi/cpu_inlines.h +odpapiabiarchinclude_HEADERS += arch/default/odp/api/abi/cpu_inlines.h \ + arch/default/odp/api/abi/cpu_time.h if !ODP_ABI_COMPAT odpapiabiarchinclude_HEADERS += arch/powerpc/odp/api/abi/cpu.h endif @@ -294,7 +300,9 @@ __LIB__libodp_linux_la_SOURCES += arch/x86/cpu_flags.c \ arch/x86/odp_cpu_cycles.c \ arch/x86/odp_global_time.c \ arch/x86/odp_sysinfo_parse.c -odpapiabiarchinclude_HEADERS += arch/x86/odp/api/abi/cpu_inlines.h +odpapiabiarchinclude_HEADERS += arch/x86/odp/api/abi/cpu_inlines.h \ + arch/x86/odp/api/abi/cpu_rdtsc.h \ + arch/x86/odp/api/abi/cpu_time.h if !ODP_ABI_COMPAT odpapiabiarchinclude_HEADERS += arch/x86/odp/api/abi/cpu.h endif diff --git a/platform/linux-generic/arch/aarch64/odp_global_time.c b/platform/linux-generic/arch/aarch64/odp_global_time.c index fac2088c..91e5c7a6 100644 --- a/platform/linux-generic/arch/aarch64/odp_global_time.c +++ b/platform/linux-generic/arch/aarch64/odp_global_time.c @@ -11,27 +11,11 @@ #include <time.h> #include <odp_debug_internal.h> -#include <odp_arch_time_internal.h> +#include <odp/api/abi/cpu_time.h> -int cpu_has_global_time(void) -{ - uint64_t hz = cpu_global_time_freq(); - - /* - * The system counter portion of the architected timer must - * provide a uniform view of system time to all processing - * elements in the system. This should hold true even for - * heterogeneous SoCs. - * - * Determine whether the system has 'global time' by checking - * whether a read of the architected timer frequency sys reg - * returns a sane value. Sane is considered to be within - * 1MHz and 6GHz (1us and .1667ns period). - */ - return hz >= 1000000 && hz <= 6000000000; -} +#include <odp/visibility_begin.h> -uint64_t cpu_global_time(void) +uint64_t _odp_cpu_global_time(void) { uint64_t cntvct; @@ -47,7 +31,27 @@ uint64_t cpu_global_time(void) return cntvct; } -uint64_t cpu_global_time_freq(void) +#include <odp/visibility_end.h> + +int _odp_cpu_has_global_time(void) +{ + uint64_t hz = _odp_cpu_global_time_freq(); + + /* + * The system counter portion of the architected timer must + * provide a uniform view of system time to all processing + * elements in the system. This should hold true even for + * heterogeneous SoCs. + * + * Determine whether the system has 'global time' by checking + * whether a read of the architected timer frequency sys reg + * returns a sane value. Sane is considered to be within + * 1MHz and 6GHz (1us and .1667ns period). + */ + return hz >= 1000000 && hz <= 6000000000; +} + +uint64_t _odp_cpu_global_time_freq(void) { uint64_t cntfrq; diff --git a/platform/linux-generic/arch/default/odp/api/abi/cpu_time.h b/platform/linux-generic/arch/default/odp/api/abi/cpu_time.h new file mode 100644 index 00000000..09138e70 --- /dev/null +++ b/platform/linux-generic/arch/default/odp/api/abi/cpu_time.h @@ -0,0 +1,24 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#ifndef ODP_ARCH_CPU_TIME_H_ +#define ODP_ARCH_CPU_TIME_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#include <stdint.h> + +int _odp_cpu_has_global_time(void); +uint64_t _odp_cpu_global_time(void); +uint64_t _odp_cpu_global_time_freq(void); + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/platform/linux-generic/arch/default/odp_global_time.c b/platform/linux-generic/arch/default/odp_global_time.c index faa0ec3f..facffea7 100644 --- a/platform/linux-generic/arch/default/odp_global_time.c +++ b/platform/linux-generic/arch/default/odp_global_time.c @@ -4,19 +4,23 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <odp_arch_time_internal.h> +#include <odp/api/abi/cpu_time.h> -int cpu_has_global_time(void) +#include <odp/visibility_begin.h> + +uint64_t _odp_cpu_global_time(void) { return 0; } -uint64_t cpu_global_time(void) +#include <odp/visibility_end.h> + +int _odp_cpu_has_global_time(void) { return 0; } -uint64_t cpu_global_time_freq(void) +uint64_t _odp_cpu_global_time_freq(void) { return 0; } diff --git a/platform/linux-generic/arch/odp_arch_time_internal.h b/platform/linux-generic/arch/odp_arch_time_internal.h deleted file mode 100644 index c3b90ac5..00000000 --- a/platform/linux-generic/arch/odp_arch_time_internal.h +++ /dev/null @@ -1,24 +0,0 @@ -/* Copyright (c) 2017-2018, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#ifndef ODP_ARCH_TIME_INTERNAL_H_ -#define ODP_ARCH_TIME_INTERNAL_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -#include <stdint.h> - -int cpu_has_global_time(void); -uint64_t cpu_global_time(void); -uint64_t cpu_global_time_freq(void); - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/platform/linux-generic/arch/x86/cpu_flags.c b/platform/linux-generic/arch/x86/cpu_flags.c index f5a744fd..935af2cb 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_arch_time_internal.h> +#include <odp/api/abi/cpu_time.h> #include <stdio.h> #include <stdint.h> @@ -361,7 +361,7 @@ void cpu_flags_print_all(void) ODP_PRINT("%s", str); } -int cpu_has_global_time(void) +int _odp_cpu_has_global_time(void) { if (cpu_get_flag_enabled(RTE_CPUFLAG_INVTSC) > 0) return 1; diff --git a/platform/linux-generic/arch/x86/odp/api/abi/cpu_inlines.h b/platform/linux-generic/arch/x86/odp/api/abi/cpu_inlines.h index 63be3da6..1eb8a956 100644 --- a/platform/linux-generic/arch/x86/odp/api/abi/cpu_inlines.h +++ b/platform/linux-generic/arch/x86/odp/api/abi/cpu_inlines.h @@ -8,6 +8,7 @@ #define ODP_ARCH_CPU_INLINES_H_ #include <stdint.h> +#include <odp/api/abi/cpu_rdtsc.h> _ODP_INLINE void odp_cpu_pause(void) { @@ -20,19 +21,7 @@ _ODP_INLINE void odp_cpu_pause(void) _ODP_INLINE uint64_t odp_cpu_cycles(void) { - union { - uint64_t tsc_64; - struct { - uint32_t lo_32; - uint32_t hi_32; - }; - } tsc; - - __asm__ __volatile__ ("rdtsc" : - "=a" (tsc.lo_32), - "=d" (tsc.hi_32) : : "memory"); - - return tsc.tsc_64; + return _odp_cpu_rdtsc(); } _ODP_INLINE uint64_t odp_cpu_cycles_max(void) diff --git a/platform/linux-generic/arch/x86/odp/api/abi/cpu_rdtsc.h b/platform/linux-generic/arch/x86/odp/api/abi/cpu_rdtsc.h new file mode 100644 index 00000000..ccc5f0f3 --- /dev/null +++ b/platform/linux-generic/arch/x86/odp/api/abi/cpu_rdtsc.h @@ -0,0 +1,29 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#ifndef ODP_ARCH_CPU_RDTSC_H_ +#define ODP_ARCH_CPU_RDTSC_H_ + +#include <stdint.h> + +static inline uint64_t _odp_cpu_rdtsc(void) +{ + union { + uint64_t tsc_64; + struct { + uint32_t lo_32; + uint32_t hi_32; + }; + } tsc; + + __asm__ __volatile__ ("rdtsc" : + "=a" (tsc.lo_32), + "=d" (tsc.hi_32) : : "memory"); + + return tsc.tsc_64; +} + +#endif diff --git a/platform/linux-generic/arch/x86/odp/api/abi/cpu_time.h b/platform/linux-generic/arch/x86/odp/api/abi/cpu_time.h new file mode 100644 index 00000000..05ff0db9 --- /dev/null +++ b/platform/linux-generic/arch/x86/odp/api/abi/cpu_time.h @@ -0,0 +1,29 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#ifndef ODP_ARCH_CPU_TIME_H_ +#define ODP_ARCH_CPU_TIME_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#include <stdint.h> +#include <odp/api/abi/cpu_rdtsc.h> + +static inline uint64_t _odp_cpu_global_time(void) +{ + return _odp_cpu_rdtsc(); +} + +int _odp_cpu_has_global_time(void); +uint64_t _odp_cpu_global_time_freq(void); + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/platform/linux-generic/arch/x86/odp_global_time.c b/platform/linux-generic/arch/x86/odp_global_time.c index da22d45a..e46a7586 100644 --- a/platform/linux-generic/arch/x86/odp_global_time.c +++ b/platform/linux-generic/arch/x86/odp_global_time.c @@ -10,24 +10,15 @@ #include <time.h> -#include <odp/api/cpu.h> #include <odp/api/hints.h> #include <odp_debug_internal.h> -#include <odp_arch_time_internal.h> - -/* Inlined API functions */ -#include <odp/api/plat/cpu_inlines.h> - -uint64_t cpu_global_time(void) -{ - return odp_cpu_cycles(); -} +#include <odp/api/abi/cpu_time.h> #define SEC_IN_NS 1000000000ULL /* Measure TSC frequency. Frequency information registers are defined for x86, * but those are often not enumerated. */ -uint64_t cpu_global_time_freq(void) +uint64_t _odp_cpu_global_time_freq(void) { struct timespec sleep, ts1, ts2; uint64_t t1, t2, ts_nsec, cycles, hz; @@ -49,7 +40,7 @@ uint64_t cpu_global_time_freq(void) return 0; } - t1 = cpu_global_time(); + t1 = _odp_cpu_global_time(); if (nanosleep(&sleep, NULL) < 0) { ODP_DBG("nanosleep failed\n"); @@ -61,7 +52,7 @@ uint64_t cpu_global_time_freq(void) return 0; } - t2 = cpu_global_time(); + t2 = _odp_cpu_global_time(); ts_nsec = (ts2.tv_sec - ts1.tv_sec) * SEC_IN_NS; ts_nsec += ts2.tv_nsec - ts1.tv_nsec; diff --git a/platform/linux-generic/include-abi/odp/api/abi/time.h b/platform/linux-generic/include-abi/odp/api/abi/time.h index a86a526d..e80e57b1 100644 --- a/platform/linux-generic/include-abi/odp/api/abi/time.h +++ b/platform/linux-generic/include-abi/odp/api/abi/time.h @@ -5,3 +5,6 @@ */ #include <odp/api/abi-default/time.h> + +/* Inlined functions for non-ABI compat mode */ +#include <odp/api/plat/time_inlines.h> diff --git a/platform/linux-generic/include/odp/api/plat/time_inlines.h b/platform/linux-generic/include/odp/api/plat/time_inlines.h new file mode 100644 index 00000000..1075a395 --- /dev/null +++ b/platform/linux-generic/include/odp/api/plat/time_inlines.h @@ -0,0 +1,67 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#ifndef ODP_PLAT_TIME_INLINES_H_ +#define ODP_PLAT_TIME_INLINES_H_ + +#include <stdint.h> +#include <odp/api/align.h> + +#include <odp/api/abi/cpu_time.h> + +/** @cond _ODP_HIDE_FROM_DOXYGEN_ */ + +#define _ODP_TIMESPEC_SIZE 16 + +typedef struct _odp_time_global_t { + /* Storage space for struct timespec. Posix headers are not included + * here to avoid application exposure. */ + uint8_t ODP_ALIGNED(_ODP_TIMESPEC_SIZE) timespec[_ODP_TIMESPEC_SIZE]; + + int use_hw; + uint64_t hw_start; + uint64_t hw_freq_hz; + +} _odp_time_global_t; + +extern _odp_time_global_t _odp_time_glob; + +odp_time_t _odp_timespec_cur(void); + +static inline odp_time_t _odp_time_cur(void) +{ + if (_odp_time_glob.use_hw) { + odp_time_t time; + + time.count = _odp_cpu_global_time() - _odp_time_glob.hw_start; + return time; + } + + return _odp_timespec_cur(); +} + +#ifndef _ODP_NO_INLINE + /* Inline functions by default */ + #define _ODP_INLINE static inline + #define odp_time_local __odp_time_local + #define odp_time_global __odp_time_global +#else + #define _ODP_INLINE +#endif + +_ODP_INLINE odp_time_t odp_time_local(void) +{ + return _odp_time_cur(); +} + +_ODP_INLINE odp_time_t odp_time_global(void) +{ + return _odp_time_cur(); +} + +/** @endcond */ + +#endif diff --git a/platform/linux-generic/odp_time.c b/platform/linux-generic/odp_time.c index 96308edc..065ad956 100644 --- a/platform/linux-generic/odp_time.c +++ b/platform/linux-generic/odp_time.c @@ -9,22 +9,21 @@ #include <odp_posix_extensions.h> #include <time.h> +#include <string.h> +#include <inttypes.h> + #include <odp/api/time.h> #include <odp/api/hints.h> #include <odp_debug_internal.h> #include <odp_init_internal.h> -#include <odp_arch_time_internal.h> -#include <string.h> -#include <inttypes.h> +#include <odp/api/plat/time_inlines.h> + +ODP_STATIC_ASSERT(_ODP_TIMESPEC_SIZE >= (sizeof(struct timespec)), + "_ODP_TIMESPEC_SIZE too small"); -typedef struct time_global_t { - struct timespec spec_start; - int use_hw; - uint64_t hw_start; - uint64_t hw_freq_hz; -} time_global_t; +#include <odp/visibility_begin.h> -static time_global_t global; +_odp_time_global_t _odp_time_glob; /* * Posix timespec based functions @@ -49,21 +48,26 @@ static inline uint64_t time_spec_diff_nsec(struct timespec *t2, return nsec; } -static inline odp_time_t time_spec_cur(void) +odp_time_t _odp_timespec_cur(void) { int ret; odp_time_t time; struct timespec sys_time; + struct timespec *start_time; + + start_time = (struct timespec *)(uintptr_t)&_odp_time_glob.timespec; ret = clock_gettime(CLOCK_MONOTONIC_RAW, &sys_time); if (odp_unlikely(ret != 0)) ODP_ABORT("clock_gettime failed\n"); - time.nsec = time_spec_diff_nsec(&sys_time, &global.spec_start); + time.nsec = time_spec_diff_nsec(&sys_time, start_time); return time; } +#include <odp/visibility_end.h> + static inline uint64_t time_spec_res(void) { int ret; @@ -94,24 +98,15 @@ static inline odp_time_t time_spec_from_ns(uint64_t ns) * HW time counter based functions */ -static inline odp_time_t time_hw_cur(void) -{ - odp_time_t time; - - time.count = cpu_global_time() - global.hw_start; - - return time; -} - static inline uint64_t time_hw_res(void) { - return global.hw_freq_hz; + return _odp_time_glob.hw_freq_hz; } static inline uint64_t time_hw_to_ns(odp_time_t time) { uint64_t nsec; - uint64_t freq_hz = global.hw_freq_hz; + uint64_t freq_hz = _odp_time_glob.hw_freq_hz; uint64_t count = time.count; uint64_t sec = 0; @@ -129,7 +124,7 @@ static inline odp_time_t time_hw_from_ns(uint64_t ns) { odp_time_t time; uint64_t count; - uint64_t freq_hz = global.hw_freq_hz; + uint64_t freq_hz = _odp_time_glob.hw_freq_hz; uint64_t sec = 0; if (ns >= ODP_TIME_SEC_IN_NS) { @@ -149,17 +144,9 @@ static inline odp_time_t time_hw_from_ns(uint64_t ns) * Common functions */ -static inline odp_time_t time_cur(void) -{ - if (global.use_hw) - return time_hw_cur(); - - return time_spec_cur(); -} - static inline uint64_t time_res(void) { - if (global.use_hw) + if (_odp_time_glob.use_hw) return time_hw_res(); return time_spec_res(); @@ -187,7 +174,7 @@ static inline odp_time_t time_sum(odp_time_t t1, odp_time_t t2) static inline uint64_t time_to_ns(odp_time_t time) { - if (global.use_hw) + if (_odp_time_glob.use_hw) return time_hw_to_ns(time); return time_spec_to_ns(time); @@ -195,7 +182,7 @@ static inline uint64_t time_to_ns(odp_time_t time) static inline odp_time_t time_from_ns(uint64_t ns) { - if (global.use_hw) + if (_odp_time_glob.use_hw) return time_hw_from_ns(ns); return time_spec_from_ns(ns); @@ -206,20 +193,10 @@ static inline void time_wait_until(odp_time_t time) odp_time_t cur; do { - cur = time_cur(); + cur = _odp_time_cur(); } while (time_cmp(time, cur) > 0); } -odp_time_t odp_time_local(void) -{ - return time_cur(); -} - -odp_time_t odp_time_global(void) -{ - return time_cur(); -} - odp_time_t odp_time_diff(odp_time_t t2, odp_time_t t1) { odp_time_t time; @@ -275,7 +252,7 @@ uint64_t odp_time_global_res(void) void odp_time_wait_ns(uint64_t ns) { - odp_time_t cur = time_cur(); + odp_time_t cur = _odp_time_cur(); odp_time_t wait = time_from_ns(ns); odp_time_t end_time = time_sum(cur, wait); @@ -289,28 +266,31 @@ void odp_time_wait_until(odp_time_t time) int odp_time_init_global(void) { + struct timespec *timespec; int ret = 0; + _odp_time_global_t *global = &_odp_time_glob; - memset(&global, 0, sizeof(time_global_t)); + memset(global, 0, sizeof(_odp_time_global_t)); - if (cpu_has_global_time()) { - global.use_hw = 1; - global.hw_freq_hz = cpu_global_time_freq(); + if (_odp_cpu_has_global_time()) { + global->use_hw = 1; + global->hw_freq_hz = _odp_cpu_global_time_freq(); - if (global.hw_freq_hz == 0) + if (global->hw_freq_hz == 0) return -1; printf("HW time counter freq: %" PRIu64 " hz\n\n", - global.hw_freq_hz); + global->hw_freq_hz); - global.hw_start = cpu_global_time(); + global->hw_start = _odp_cpu_global_time(); return 0; } - global.spec_start.tv_sec = 0; - global.spec_start.tv_nsec = 0; + timespec = (struct timespec *)(uintptr_t)global->timespec; + timespec->tv_sec = 0; + timespec->tv_nsec = 0; - ret = clock_gettime(CLOCK_MONOTONIC_RAW, &global.spec_start); + ret = clock_gettime(CLOCK_MONOTONIC_RAW, timespec); return ret; } diff --git a/platform/linux-generic/odp_time_api.c b/platform/linux-generic/odp_time_api.c new file mode 100644 index 00000000..cd547b23 --- /dev/null +++ b/platform/linux-generic/odp_time_api.c @@ -0,0 +1,13 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include "config.h" + +#include <odp/api/time.h> + +/* Non-inlined functions for ABI compat mode */ +#define _ODP_NO_INLINE +#include <odp/api/plat/time_inlines.h> diff --git a/platform/linux-generic/odp_timer.c b/platform/linux-generic/odp_timer.c index f46aa6e8..5fef5af2 100644 --- a/platform/linux-generic/odp_timer.c +++ b/platform/linux-generic/odp_timer.c @@ -53,8 +53,8 @@ #include <odp/api/std_types.h> #include <odp/api/sync.h> #include <odp/api/time.h> +#include <odp/api/plat/time_inlines.h> #include <odp/api/timer.h> -#include <odp_arch_time_internal.h> #include <odp_timer_internal.h> /* Inlined API functions */ ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/Makefile.am | 26 ++-- .../linux-generic/arch/aarch64/odp_global_time.c | 44 ++++--- .../arch/default/odp/api/abi/cpu_time.h | 24 ++++ .../linux-generic/arch/default/odp_global_time.c | 12 +- .../linux-generic/arch/odp_arch_time_internal.h | 24 ---- platform/linux-generic/arch/x86/cpu_flags.c | 4 +- .../arch/x86/odp/api/abi/cpu_inlines.h | 15 +-- .../linux-generic/arch/x86/odp/api/abi/cpu_rdtsc.h | 29 +++++ .../linux-generic/arch/x86/odp/api/abi/cpu_time.h | 29 +++++ platform/linux-generic/arch/x86/odp_global_time.c | 17 +-- .../linux-generic/include-abi/odp/api/abi/time.h | 3 + .../include/odp/api/plat/time_inlines.h | 101 +++++++++++++++ platform/linux-generic/odp_packet_io.c | 1 + platform/linux-generic/odp_schedule_basic.c | 1 + platform/linux-generic/odp_schedule_scalable.c | 1 + platform/linux-generic/odp_schedule_sp.c | 1 + platform/linux-generic/odp_time.c | 137 ++++++--------------- .../{odp_cpu_api.c => odp_time_api.c} | 4 +- platform/linux-generic/odp_timer.c | 2 +- platform/linux-generic/odp_traffic_mngr.c | 2 + platform/linux-generic/pktio/dpdk.c | 2 + platform/linux-generic/pktio/netmap.c | 2 + 22 files changed, 295 insertions(+), 186 deletions(-) create mode 100644 platform/linux-generic/arch/default/odp/api/abi/cpu_time.h delete mode 100644 platform/linux-generic/arch/odp_arch_time_internal.h create mode 100644 platform/linux-generic/arch/x86/odp/api/abi/cpu_rdtsc.h create mode 100644 platform/linux-generic/arch/x86/odp/api/abi/cpu_time.h create mode 100644 platform/linux-generic/include/odp/api/plat/time_inlines.h copy platform/linux-generic/{odp_cpu_api.c => odp_time_api.c} (76%) hooks/post-receive --

5 years, 10 months

[COMMIT] branch master updated. v1.19.0.1_tigermoth-44-g2a9d3323

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 2a9d3323537d030c1b3385ed14b496bf9e2b20b3 (commit) via a2fb09b3a4178398a5528eeab2c119cc9a107629 (commit) via b5982d00b9e2ff6fbcb86d8602ca249236c1f06c (commit) via 78b552f62a65c6a873ed021d5579675b4fd84e3a (commit) via 68f26e2a86eb206dcdda9324b20afa208067e6c2 (commit) from 42a8b2f0dbaee653953170cbd0a7fa659bc32b38 (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 2a9d3323537d030c1b3385ed14b496bf9e2b20b3 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Tue May 29 10:17:34 2018 +0300 linux-gen: queue: inline queue context Use common qentry offset structure to inline queue context function for both basic and scalable queue implementation. 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 e995479a..30ba0476 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -36,6 +36,8 @@ odpapiplatinclude_HEADERS = \ include/odp/api/plat/packet_inlines.h \ include/odp/api/plat/pktio_inlines.h \ include/odp/api/plat/pool_inline_types.h \ + include/odp/api/plat/queue_inlines.h \ + include/odp/api/plat/queue_inline_types.h \ include/odp/api/plat/std_clib_inlines.h \ include/odp/api/plat/strong_types.h \ include/odp/api/plat/sync_inlines.h \ @@ -221,6 +223,7 @@ __LIB__libodp_linux_la_SOURCES += \ odp_packet_api.c \ odp_packet_flags_api.c \ odp_pktio_api.c \ + odp_queue_api.c \ odp_std_clib_api.c \ odp_sync_api.c \ odp_thread_api.c \ diff --git a/platform/linux-generic/include-abi/odp/api/abi/queue.h b/platform/linux-generic/include-abi/odp/api/abi/queue.h index 41b44221..6ec92260 100644 --- a/platform/linux-generic/include-abi/odp/api/abi/queue.h +++ b/platform/linux-generic/include-abi/odp/api/abi/queue.h @@ -30,6 +30,9 @@ typedef ODP_HANDLE_T(odp_queue_t); #define ODP_QUEUE_NAME_LEN 32 +/* Inlined functions for non-ABI compat mode */ +#include <odp/api/plat/queue_inlines.h> + /** * @} */ diff --git a/platform/linux-generic/include/odp/api/plat/queue_inline_types.h b/platform/linux-generic/include/odp/api/plat/queue_inline_types.h new file mode 100644 index 00000000..3a8df7a4 --- /dev/null +++ b/platform/linux-generic/include/odp/api/plat/queue_inline_types.h @@ -0,0 +1,35 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#ifndef ODP_PLAT_QUEUE_INLINE_TYPES_H_ +#define ODP_PLAT_QUEUE_INLINE_TYPES_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#include <stdint.h> + +/** @cond _ODP_HIDE_FROM_DOXYGEN_ */ + +/* Queue entry field accessor */ +#define _odp_qentry_field(qentry, cast, field) \ + (*(cast *)(uintptr_t)((uint8_t *)qentry + \ + _odp_queue_inline_offset.field)) + +/* Queue entry field offsets for inline functions */ +typedef struct _odp_queue_inline_offset_t { + uint16_t context; + +} _odp_queue_inline_offset_t; + +/** @endcond */ + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/platform/linux-generic/include/odp/api/plat/queue_inlines.h b/platform/linux-generic/include/odp/api/plat/queue_inlines.h new file mode 100644 index 00000000..f802c96e --- /dev/null +++ b/platform/linux-generic/include/odp/api/plat/queue_inlines.h @@ -0,0 +1,36 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#ifndef ODP_PLAT_QUEUE_INLINES_H_ +#define ODP_PLAT_QUEUE_INLINES_H_ + +#include <odp/api/plat/queue_inline_types.h> + +/** @cond _ODP_HIDE_FROM_DOXYGEN_ */ + +extern _odp_queue_inline_offset_t _odp_queue_inline_offset; + +#ifndef _ODP_NO_INLINE + /* Inline functions by default */ + #define _ODP_INLINE static inline + #define odp_queue_context __odp_queue_context +#else + #define _ODP_INLINE +#endif + +_ODP_INLINE void *odp_queue_context(odp_queue_t handle) +{ + void *context; + void *qentry = (void *)handle; + + context = _odp_qentry_field(qentry, void *, context); + + return context; +} + +/** @endcond */ + +#endif diff --git a/platform/linux-generic/include/odp_queue_if.h b/platform/linux-generic/include/odp_queue_if.h index b9f4f03d..2eaf8771 100644 --- a/platform/linux-generic/include/odp_queue_if.h +++ b/platform/linux-generic/include/odp_queue_if.h @@ -27,7 +27,6 @@ typedef struct { int (*queue_capability)(odp_queue_capability_t *capa); int (*queue_context_set)(odp_queue_t queue, void *context, uint32_t len); - void *(*queue_context)(odp_queue_t queue); int (*queue_enq)(odp_queue_t queue, odp_event_t ev); int (*queue_enq_multi)(odp_queue_t queue, const odp_event_t events[], int num); diff --git a/platform/linux-generic/odp_queue_api.c b/platform/linux-generic/odp_queue_api.c new file mode 100644 index 00000000..34311857 --- /dev/null +++ b/platform/linux-generic/odp_queue_api.c @@ -0,0 +1,13 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include "config.h" + +#include <odp/api/queue.h> + +/* Non-inlined functions for ABI compat mode */ +#define _ODP_NO_INLINE +#include <odp/api/plat/queue_inlines.h> diff --git a/platform/linux-generic/odp_queue_basic.c b/platform/linux-generic/odp_queue_basic.c index aa3fb42e..f7715bc5 100644 --- a/platform/linux-generic/odp_queue_basic.c +++ b/platform/linux-generic/odp_queue_basic.c @@ -26,6 +26,7 @@ #include <odp/api/plat/sync_inlines.h> #include <odp/api/traffic_mngr.h> #include <odp_libconfig_internal.h> +#include <odp/api/plat/queue_inline_types.h> #define NUM_INTERNAL_QUEUES 64 @@ -44,6 +45,7 @@ static int queue_init(queue_entry_t *queue, const char *name, const odp_queue_param_t *param); queue_global_t *queue_glb; +extern _odp_queue_inline_offset_t _odp_queue_inline_offset; static inline queue_entry_t *qentry_from_handle(odp_queue_t handle) { @@ -129,6 +131,12 @@ static int queue_init_global(void) ODP_DBG("Starts...\n"); + /* Fill in queue entry field offsets for inline functions */ + memset(&_odp_queue_inline_offset, 0, + sizeof(_odp_queue_inline_offset_t)); + _odp_queue_inline_offset.context = offsetof(queue_entry_t, + s.param.context); + shm = odp_shm_reserve("_odp_queue_gbl", sizeof(queue_global_t), sizeof(queue_entry_t), 0); @@ -430,11 +438,6 @@ static int queue_context_set(odp_queue_t handle, void *context, return 0; } -static void *queue_context(odp_queue_t handle) -{ - return qentry_from_handle(handle)->s.param.context; -} - static odp_queue_t queue_lookup(const char *name) { uint32_t i; @@ -861,7 +864,6 @@ queue_api_t queue_basic_api = { .queue_lookup = queue_lookup, .queue_capability = queue_capability, .queue_context_set = queue_context_set, - .queue_context = queue_context, .queue_enq = queue_enq, .queue_enq_multi = queue_enq_multi, .queue_deq = queue_deq, diff --git a/platform/linux-generic/odp_queue_if.c b/platform/linux-generic/odp_queue_if.c index 912251b7..f3984542 100644 --- a/platform/linux-generic/odp_queue_if.c +++ b/platform/linux-generic/odp_queue_if.c @@ -13,6 +13,15 @@ #include <stdlib.h> #include <string.h> +#include <odp/api/align.h> +#include <odp/api/plat/queue_inline_types.h> + +#include <odp/visibility_begin.h> + +_odp_queue_inline_offset_t ODP_ALIGNED_CACHE _odp_queue_inline_offset; + +#include <odp/visibility_end.h> + extern const queue_api_t queue_scalable_api; extern const queue_fn_t queue_scalable_fn; @@ -47,11 +56,6 @@ int odp_queue_context_set(odp_queue_t queue, void *context, uint32_t len) return queue_api->queue_context_set(queue, context, len); } -void *odp_queue_context(odp_queue_t queue) -{ - return queue_api->queue_context(queue); -} - int odp_queue_enq(odp_queue_t queue, odp_event_t ev) { return queue_api->queue_enq(queue, ev); diff --git a/platform/linux-generic/odp_queue_scalable.c b/platform/linux-generic/odp_queue_scalable.c index 38880e7f..13e93bc1 100644 --- a/platform/linux-generic/odp_queue_scalable.c +++ b/platform/linux-generic/odp_queue_scalable.c @@ -26,6 +26,7 @@ #include <odp_schedule_if.h> #include <odp_ishm_internal.h> #include <odp_ishmpool_internal.h> +#include <odp/api/plat/queue_inline_types.h> #include <string.h> #include <inttypes.h> @@ -44,6 +45,7 @@ #define LOCK_INIT(a) odp_ticketlock_init(a) extern __thread sched_scalable_thread_state_t *sched_ts; +extern _odp_queue_inline_offset_t _odp_queue_inline_offset; typedef struct queue_table_t { queue_entry_t queue[ODP_CONFIG_QUEUES]; @@ -195,6 +197,12 @@ static int queue_init_global(void) ODP_DBG("Queue init ... "); + /* Fill in queue entry field offsets for inline functions */ + memset(&_odp_queue_inline_offset, 0, + sizeof(_odp_queue_inline_offset_t)); + _odp_queue_inline_offset.context = offsetof(queue_entry_t, + s.param.context); + /* Attach to the pool if it exists */ queue_shm_pool = _odp_ishm_pool_lookup("queue_shm_pool"); if (queue_shm_pool == NULL) { @@ -465,11 +473,6 @@ static int queue_context_set(odp_queue_t handle, void *context, return 0; } -static void *queue_context(odp_queue_t handle) -{ - return qentry_from_ext(handle)->s.param.context; -} - static odp_queue_t queue_lookup(const char *name) { uint32_t i; @@ -964,7 +967,6 @@ queue_api_t queue_scalable_api = { .queue_lookup = queue_lookup, .queue_capability = queue_capability, .queue_context_set = queue_context_set, - .queue_context = queue_context, .queue_enq = queue_enq, .queue_enq_multi = queue_enq_multi, .queue_deq = queue_deq, commit a2fb09b3a4178398a5528eeab2c119cc9a107629 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Tue May 29 10:43:50 2018 +0300 linux-gen: queue scalable: change queue handle to pointer Use queue entry pointer as queue handle. This allow easy inline of queue_context, etc 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/include/odp_queue_scalable_internal.h b/platform/linux-generic/include/odp_queue_scalable_internal.h index 37147aa9..71aaa3ba 100644 --- a/platform/linux-generic/include/odp_queue_scalable_internal.h +++ b/platform/linux-generic/include/odp_queue_scalable_internal.h @@ -77,7 +77,7 @@ static inline void *shm_pool_alloc_align(_odp_ishm_pool_t *pool, uint32_t size) static inline uint32_t queue_to_id(odp_queue_t handle) { - return _odp_typeval(handle) - 1; + return qentry_from_ext(handle)->s.index; } static inline queue_entry_t *qentry_from_int(void *handle) diff --git a/platform/linux-generic/odp_queue_scalable.c b/platform/linux-generic/odp_queue_scalable.c index 1cc318e3..38880e7f 100644 --- a/platform/linux-generic/odp_queue_scalable.c +++ b/platform/linux-generic/odp_queue_scalable.c @@ -52,11 +52,6 @@ typedef struct queue_table_t { static queue_table_t *queue_tbl; static _odp_ishm_pool_t *queue_shm_pool; -static inline odp_queue_t queue_from_id(uint32_t queue_id) -{ - return _odp_cast_scalar(odp_queue_t, queue_id + 1); -} - static void *queue_from_ext(odp_queue_t handle); static int _queue_enq(void *handle, odp_buffer_hdr_t *buf_hdr); static odp_buffer_hdr_t *_queue_deq(void *handle); @@ -72,7 +67,7 @@ static queue_entry_t *get_qentry(uint32_t queue_id) queue_entry_t *qentry_from_ext(odp_queue_t handle) { - return get_qentry(queue_to_id(handle)); + return (queue_entry_t *)(uintptr_t)handle; } static int _odp_queue_disable_enq(sched_elem_t *q) @@ -246,7 +241,7 @@ static int queue_init_global(void) queue = get_qentry(i); LOCK_INIT(&queue->s.lock); queue->s.index = i; - queue->s.handle = queue_from_id(i); + queue->s.handle = (odp_queue_t)queue; } ODP_DBG("done\n"); @@ -323,27 +318,27 @@ static int queue_capability(odp_queue_capability_t *capa) static odp_queue_type_t queue_type(odp_queue_t handle) { - return qentry_from_int(queue_from_ext(handle))->s.type; + return qentry_from_ext(handle)->s.type; } static odp_schedule_sync_t queue_sched_type(odp_queue_t handle) { - return qentry_from_int(queue_from_ext(handle))->s.param.sched.sync; + return qentry_from_ext(handle)->s.param.sched.sync; } static odp_schedule_prio_t queue_sched_prio(odp_queue_t handle) { - return qentry_from_int(queue_from_ext(handle))->s.param.sched.prio; + return qentry_from_ext(handle)->s.param.sched.prio; } static odp_schedule_group_t queue_sched_group(odp_queue_t handle) { - return qentry_from_int(queue_from_ext(handle))->s.param.sched.group; + return qentry_from_ext(handle)->s.param.sched.group; } static uint32_t queue_lock_count(odp_queue_t handle) { - queue_entry_t *queue = qentry_from_int(queue_from_ext(handle)); + queue_entry_t *queue = qentry_from_ext(handle); return queue->s.param.sched.sync == ODP_SCHED_SYNC_ORDERED ? queue->s.param.sched.lock_count : 0; @@ -392,7 +387,7 @@ static int queue_destroy(odp_queue_t handle) if (handle == ODP_QUEUE_INVALID) return -1; - queue = qentry_from_int(queue_from_ext(handle)); + queue = qentry_from_ext(handle); LOCK(&queue->s.lock); if (queue->s.status != QUEUE_STATUS_READY) { UNLOCK(&queue->s.lock); @@ -465,14 +460,14 @@ static int queue_context_set(odp_queue_t handle, void *context, uint32_t len ODP_UNUSED) { odp_mb_full(); - qentry_from_int(queue_from_ext(handle))->s.param.context = context; + qentry_from_ext(handle)->s.param.context = context; odp_mb_full(); return 0; } static void *queue_context(odp_queue_t handle) { - return qentry_from_int(queue_from_ext(handle))->s.param.context; + return qentry_from_ext(handle)->s.param.context; } static odp_queue_t queue_lookup(const char *name) @@ -663,7 +658,7 @@ static int queue_enq_multi(odp_queue_t handle, const odp_event_t ev[], int num) if (num > QUEUE_MULTI_MAX) num = QUEUE_MULTI_MAX; - queue = qentry_from_int(queue_from_ext(handle)); + queue = qentry_from_ext(handle); for (i = 0; i < num; i++) buf_hdr[i] = buf_hdl_to_hdr(odp_buffer_from_event(ev[i])); @@ -676,7 +671,7 @@ static int queue_enq(odp_queue_t handle, odp_event_t ev) odp_buffer_hdr_t *buf_hdr; queue_entry_t *queue; - queue = qentry_from_int(queue_from_ext(handle)); + queue = qentry_from_ext(handle); buf_hdr = buf_hdl_to_hdr(odp_buffer_from_event(ev)); return queue->s.enqueue(qentry_to_int(queue), buf_hdr); @@ -843,7 +838,7 @@ static int queue_deq_multi(odp_queue_t handle, odp_event_t ev[], int num) if (num > QUEUE_MULTI_MAX) num = QUEUE_MULTI_MAX; - queue = qentry_from_int(queue_from_ext(handle)); + queue = qentry_from_ext(handle); return queue->s.dequeue_multi(qentry_to_int(queue), (odp_buffer_hdr_t **)ev, num); } @@ -851,7 +846,7 @@ static odp_event_t queue_deq(odp_queue_t handle) { queue_entry_t *queue; - queue = qentry_from_int(queue_from_ext(handle)); + queue = qentry_from_ext(handle); return (odp_event_t)queue->s.dequeue(qentry_to_int(queue)); } @@ -954,15 +949,12 @@ static void queue_set_enq_deq_func(void *handle, static void *queue_from_ext(odp_queue_t handle) { - uint32_t queue_id; - - queue_id = queue_to_id(handle); - return qentry_to_int(get_qentry(queue_id)); + return (void *)handle; } static odp_queue_t queue_to_ext(void *handle) { - return qentry_from_int(handle)->s.handle; + return (odp_queue_t)handle; } /* API functions */ commit b5982d00b9e2ff6fbcb86d8602ca249236c1f06c Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Mon May 28 16:06:36 2018 +0300 linux-gen: queue: change queue handle to pointer Use queue entry pointer as queue handle. This allow easy inline of queue_context, etc 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/include/odp_queue_internal.h b/platform/linux-generic/include/odp_queue_internal.h index 1808fb73..6cc6ed28 100644 --- a/platform/linux-generic/include/odp_queue_internal.h +++ b/platform/linux-generic/include/odp_queue_internal.h @@ -74,19 +74,21 @@ typedef struct queue_global_t { extern queue_global_t *queue_glb; -static inline void *queue_index_to_qint(uint32_t queue_id) +static inline uint32_t queue_to_index(odp_queue_t handle) { - return &queue_glb->queue[queue_id]; + queue_entry_t *qentry = (queue_entry_t *)(uintptr_t)handle; + + return qentry->s.index; } -static inline uint32_t queue_to_index(odp_queue_t handle) +static inline queue_entry_t *qentry_from_index(uint32_t queue_id) { - return _odp_typeval(handle) - 1; + return &queue_glb->queue[queue_id]; } static inline odp_queue_t queue_from_index(uint32_t queue_id) { - return _odp_cast_scalar(odp_queue_t, queue_id + 1); + return (odp_queue_t)qentry_from_index(queue_id); } #ifdef __cplusplus diff --git a/platform/linux-generic/odp_queue_basic.c b/platform/linux-generic/odp_queue_basic.c index 4af819c3..aa3fb42e 100644 --- a/platform/linux-generic/odp_queue_basic.c +++ b/platform/linux-generic/odp_queue_basic.c @@ -45,16 +45,9 @@ static int queue_init(queue_entry_t *queue, const char *name, queue_global_t *queue_glb; -static inline queue_entry_t *get_qentry(uint32_t queue_id) +static inline queue_entry_t *qentry_from_handle(odp_queue_t handle) { - return &queue_glb->queue[queue_id]; -} - -static inline queue_entry_t *handle_to_qentry(odp_queue_t handle) -{ - uint32_t queue_id = queue_to_index(handle); - - return get_qentry(queue_id); + return (queue_entry_t *)(uintptr_t)handle; } static int queue_capa(odp_queue_capability_t *capa, int sched) @@ -149,10 +142,10 @@ static int queue_init_global(void) for (i = 0; i < ODP_CONFIG_QUEUES; i++) { /* init locks */ - queue_entry_t *queue = get_qentry(i); + queue_entry_t *queue = qentry_from_index(i); LOCK_INIT(queue); queue->s.index = i; - queue->s.handle = queue_from_index(i); + queue->s.handle = (odp_queue_t)queue; } if (read_config_file(queue_glb)) { @@ -208,7 +201,7 @@ static int queue_term_global(void) int i; for (i = 0; i < ODP_CONFIG_QUEUES; i++) { - queue = &queue_glb->queue[i]; + queue = qentry_from_index(i); LOCK(queue); if (queue->s.status != QUEUE_STATUS_FREE) { ODP_ERR("Not destroyed queue: %s\n", queue->s.name); @@ -239,27 +232,27 @@ static int queue_capability(odp_queue_capability_t *capa) static odp_queue_type_t queue_type(odp_queue_t handle) { - return handle_to_qentry(handle)->s.type; + return qentry_from_handle(handle)->s.type; } static odp_schedule_sync_t queue_sched_type(odp_queue_t handle) { - return handle_to_qentry(handle)->s.param.sched.sync; + return qentry_from_handle(handle)->s.param.sched.sync; } static odp_schedule_prio_t queue_sched_prio(odp_queue_t handle) { - return handle_to_qentry(handle)->s.param.sched.prio; + return qentry_from_handle(handle)->s.param.sched.prio; } static odp_schedule_group_t queue_sched_group(odp_queue_t handle) { - return handle_to_qentry(handle)->s.param.sched.group; + return qentry_from_handle(handle)->s.param.sched.group; } static uint32_t queue_lock_count(odp_queue_t handle) { - queue_entry_t *queue = handle_to_qentry(handle); + queue_entry_t *queue = qentry_from_handle(handle); return queue->s.param.sched.sync == ODP_SCHED_SYNC_ORDERED ? queue->s.param.sched.lock_count : 0; @@ -295,7 +288,7 @@ static odp_queue_t queue_create(const char *name, } for (i = 0; i < ODP_CONFIG_QUEUES; i++) { - queue = &queue_glb->queue[i]; + queue = qentry_from_index(i); if (queue->s.status != QUEUE_STATUS_FREE) continue; @@ -357,7 +350,7 @@ static odp_queue_t queue_create(const char *name, void sched_cb_queue_destroy_finalize(uint32_t queue_index) { - queue_entry_t *queue = get_qentry(queue_index); + queue_entry_t *queue = qentry_from_index(queue_index); LOCK(queue); @@ -370,7 +363,7 @@ void sched_cb_queue_destroy_finalize(uint32_t queue_index) void sched_cb_queue_set_status(uint32_t queue_index, int status) { - queue_entry_t *queue = get_qentry(queue_index); + queue_entry_t *queue = qentry_from_index(queue_index); LOCK(queue); @@ -382,7 +375,7 @@ void sched_cb_queue_set_status(uint32_t queue_index, int status) static int queue_destroy(odp_queue_t handle) { queue_entry_t *queue; - queue = handle_to_qentry(handle); + queue = qentry_from_handle(handle); if (handle == ODP_QUEUE_INVALID) return -1; @@ -432,14 +425,14 @@ static int queue_context_set(odp_queue_t handle, void *context, uint32_t len ODP_UNUSED) { odp_mb_full(); - handle_to_qentry(handle)->s.param.context = context; + qentry_from_handle(handle)->s.param.context = context; odp_mb_full(); return 0; } static void *queue_context(odp_queue_t handle) { - return handle_to_qentry(handle)->s.param.context; + return qentry_from_handle(handle)->s.param.context; } static odp_queue_t queue_lookup(const char *name) @@ -447,7 +440,7 @@ static odp_queue_t queue_lookup(const char *name) uint32_t i; for (i = 0; i < ODP_CONFIG_QUEUES; i++) { - queue_entry_t *queue = &queue_glb->queue[i]; + queue_entry_t *queue = qentry_from_index(i); if (queue->s.status == QUEUE_STATUS_FREE || queue->s.status == QUEUE_STATUS_DESTROYED) @@ -552,7 +545,7 @@ static int queue_int_enq(void *q_int, odp_buffer_hdr_t *buf_hdr) static int queue_enq_multi(odp_queue_t handle, const odp_event_t ev[], int num) { - queue_entry_t *queue = handle_to_qentry(handle); + queue_entry_t *queue = qentry_from_handle(handle); if (odp_unlikely(num == 0)) return 0; @@ -566,7 +559,7 @@ static int queue_enq_multi(odp_queue_t handle, const odp_event_t ev[], int num) static int queue_enq(odp_queue_t handle, odp_event_t ev) { - queue_entry_t *queue = handle_to_qentry(handle); + queue_entry_t *queue = qentry_from_handle(handle); return queue->s.enqueue(queue, (odp_buffer_hdr_t *)(uintptr_t)ev); @@ -641,7 +634,7 @@ static odp_buffer_hdr_t *queue_int_deq(void *q_int) static int queue_deq_multi(odp_queue_t handle, odp_event_t ev[], int num) { - queue_entry_t *queue = handle_to_qentry(handle); + queue_entry_t *queue = qentry_from_handle(handle); if (num > QUEUE_MULTI_MAX) num = QUEUE_MULTI_MAX; @@ -652,7 +645,7 @@ static int queue_deq_multi(odp_queue_t handle, odp_event_t ev[], int num) static odp_event_t queue_deq(odp_queue_t handle) { - queue_entry_t *queue = handle_to_qentry(handle); + queue_entry_t *queue = qentry_from_handle(handle); return (odp_event_t)queue->s.dequeue(queue); } @@ -739,7 +732,7 @@ static int queue_info(odp_queue_t handle, odp_queue_info_t *info) return -1; } - queue = get_qentry(queue_id); + queue = qentry_from_index(queue_id); LOCK(queue); status = queue->s.status; @@ -762,14 +755,14 @@ static int queue_info(odp_queue_t handle, odp_queue_info_t *info) int sched_cb_queue_deq_multi(uint32_t queue_index, odp_event_t ev[], int num, int update_status) { - queue_entry_t *qe = get_qentry(queue_index); + queue_entry_t *qe = qentry_from_index(queue_index); return deq_multi(qe, (odp_buffer_hdr_t **)ev, num, update_status); } int sched_cb_queue_empty(uint32_t queue_index) { - queue_entry_t *queue = get_qentry(queue_index); + queue_entry_t *queue = qentry_from_index(queue_index); int ret = 0; LOCK(queue); @@ -851,7 +844,7 @@ static void queue_set_enq_deq_func(void *q_int, static void *queue_from_ext(odp_queue_t handle) { - return handle_to_qentry(handle); + return qentry_from_handle(handle); } static odp_queue_t queue_to_ext(void *q_int) diff --git a/platform/linux-generic/odp_schedule_basic.c b/platform/linux-generic/odp_schedule_basic.c index 0fced5cf..7311d13a 100644 --- a/platform/linux-generic/odp_schedule_basic.c +++ b/platform/linux-generic/odp_schedule_basic.c @@ -798,7 +798,7 @@ static inline int poll_pktin(uint32_t qi, int stash) return num; } - q_int = queue_index_to_qint(qi); + q_int = qentry_from_index(qi); ret = queue_fn->enq_multi(q_int, b_hdr, num); commit 78b552f62a65c6a873ed021d5579675b4fd84e3a Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Mon May 28 15:10:34 2018 +0300 linux-gen: queue: remove extra conversion functions Remove unnecessary conversion functions between queue entry and void pointer types. 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/include/odp_queue_internal.h b/platform/linux-generic/include/odp_queue_internal.h index e227f26c..1808fb73 100644 --- a/platform/linux-generic/include/odp_queue_internal.h +++ b/platform/linux-generic/include/odp_queue_internal.h @@ -89,16 +89,6 @@ static inline odp_queue_t queue_from_index(uint32_t queue_id) return _odp_cast_scalar(odp_queue_t, queue_id + 1); } -static inline queue_entry_t *qentry_from_int(void *q_int) -{ - return (queue_entry_t *)q_int; -} - -static inline void *qentry_to_int(queue_entry_t *qentry) -{ - return qentry; -} - #ifdef __cplusplus } #endif diff --git a/platform/linux-generic/odp_queue_basic.c b/platform/linux-generic/odp_queue_basic.c index 7c1e1c84..4af819c3 100644 --- a/platform/linux-generic/odp_queue_basic.c +++ b/platform/linux-generic/odp_queue_basic.c @@ -495,7 +495,7 @@ static inline int enq_multi(void *q_int, odp_buffer_hdr_t *buf_hdr[], ring_st_t *ring_st; uint32_t buf_idx[num]; - queue = qentry_from_int(q_int); + queue = q_int; ring_st = &queue->s.ring_st; if (sched_fn->ord_enq_multi(q_int, (void **)buf_hdr, num, &ret)) @@ -560,7 +560,7 @@ static int queue_enq_multi(odp_queue_t handle, const odp_event_t ev[], int num) if (num > QUEUE_MULTI_MAX) num = QUEUE_MULTI_MAX; - return queue->s.enqueue_multi(qentry_to_int(queue), + return queue->s.enqueue_multi(queue, (odp_buffer_hdr_t **)(uintptr_t)ev, num); } @@ -568,7 +568,7 @@ static int queue_enq(odp_queue_t handle, odp_event_t ev) { queue_entry_t *queue = handle_to_qentry(handle); - return queue->s.enqueue(qentry_to_int(queue), + return queue->s.enqueue(queue, (odp_buffer_hdr_t *)(uintptr_t)ev); } @@ -620,14 +620,14 @@ static inline int deq_multi(queue_entry_t *queue, odp_buffer_hdr_t *buf_hdr[], static int queue_int_deq_multi(void *q_int, odp_buffer_hdr_t *buf_hdr[], int num) { - queue_entry_t *queue = qentry_from_int(q_int); + queue_entry_t *queue = q_int; return deq_multi(queue, buf_hdr, num, 0); } static odp_buffer_hdr_t *queue_int_deq(void *q_int) { - queue_entry_t *queue = qentry_from_int(q_int); + queue_entry_t *queue = q_int; odp_buffer_hdr_t *buf_hdr = NULL; int ret; @@ -646,7 +646,7 @@ static int queue_deq_multi(odp_queue_t handle, odp_event_t ev[], int num) if (num > QUEUE_MULTI_MAX) num = QUEUE_MULTI_MAX; - return queue->s.dequeue_multi(qentry_to_int(queue), + return queue->s.dequeue_multi(queue, (odp_buffer_hdr_t **)ev, num); } @@ -654,7 +654,7 @@ static odp_event_t queue_deq(odp_queue_t handle) { queue_entry_t *queue = handle_to_qentry(handle); - return (odp_event_t)queue->s.dequeue(qentry_to_int(queue)); + return (odp_event_t)queue->s.dequeue(queue); } static int queue_init(queue_entry_t *queue, const char *name, @@ -800,12 +800,14 @@ static uint64_t queue_to_u64(odp_queue_t hdl) static odp_pktout_queue_t queue_get_pktout(void *q_int) { - return qentry_from_int(q_int)->s.pktout; + queue_entry_t *qentry = q_int; + + return qentry->s.pktout; } static void queue_set_pktout(void *q_int, odp_pktio_t pktio, int index) { - queue_entry_t *qentry = qentry_from_int(q_int); + queue_entry_t *qentry = q_int; qentry->s.pktout.pktio = pktio; qentry->s.pktout.index = index; @@ -813,12 +815,14 @@ static void queue_set_pktout(void *q_int, odp_pktio_t pktio, int index) static odp_pktin_queue_t queue_get_pktin(void *q_int) { - return qentry_from_int(q_int)->s.pktin; + queue_entry_t *qentry = q_int; + + return qentry->s.pktin; } static void queue_set_pktin(void *q_int, odp_pktio_t pktio, int index) { - queue_entry_t *qentry = qentry_from_int(q_int); + queue_entry_t *qentry = q_int; qentry->s.pktin.pktio = pktio; qentry->s.pktin.index = index; @@ -830,7 +834,7 @@ static void queue_set_enq_deq_func(void *q_int, queue_deq_fn_t deq, queue_deq_multi_fn_t deq_multi) { - queue_entry_t *qentry = qentry_from_int(q_int); + queue_entry_t *qentry = q_int; if (enq) qentry->s.enqueue = enq; @@ -847,12 +851,14 @@ static void queue_set_enq_deq_func(void *q_int, static void *queue_from_ext(odp_queue_t handle) { - return qentry_to_int(handle_to_qentry(handle)); + return handle_to_qentry(handle); } static odp_queue_t queue_to_ext(void *q_int) { - return qentry_from_int(q_int)->s.handle; + queue_entry_t *qentry = q_int; + + return qentry->s.handle; } /* API functions */ diff --git a/platform/linux-generic/odp_queue_lf.c b/platform/linux-generic/odp_queue_lf.c index 4a8a5492..b3cfbdbe 100644 --- a/platform/linux-generic/odp_queue_lf.c +++ b/platform/linux-generic/odp_queue_lf.c @@ -144,7 +144,7 @@ static int queue_lf_enq(void *q_int, odp_buffer_hdr_t *buf_hdr) ring_lf_node_t *node; uint64_t counter; - queue = qentry_from_int(q_int); + queue = q_int; queue_lf = queue->s.queue_lf; i_node = 0; @@ -204,7 +204,7 @@ static odp_buffer_hdr_t *queue_lf_deq(void *q_int) ring_lf_node_t *node, *old; uint64_t lowest; - queue = qentry_from_int(q_int); + queue = q_int; queue_lf = queue->s.queue_lf; i_node = 0; diff --git a/platform/linux-generic/odp_schedule_basic.c b/platform/linux-generic/odp_schedule_basic.c index 57e958bb..0fced5cf 100644 --- a/platform/linux-generic/odp_schedule_basic.c +++ b/platform/linux-generic/odp_schedule_basic.c @@ -638,8 +638,7 @@ static inline void ordered_stash_release(void) buf_hdr = sched_local.ordered.stash[i].buf_hdr; num = sched_local.ordered.stash[i].num; - num_enq = queue_fn->enq_multi(qentry_to_int(queue_entry), - buf_hdr, num); + num_enq = queue_fn->enq_multi(queue_entry, buf_hdr, num); /* Drop packets that were not enqueued */ if (odp_unlikely(num_enq < num)) { @@ -719,7 +718,7 @@ static int schedule_ord_enq_multi(void *q_int, void *buf_hdr[], { int i; uint32_t stash_num = sched_local.ordered.stash_num; - queue_entry_t *dst_queue = qentry_from_int(q_int); + queue_entry_t *dst_queue = q_int; uint32_t src_queue = sched_local.ordered.src_queue; if ((src_queue == NULL_INDEX) || sched_local.ordered.in_order) diff --git a/platform/linux-generic/odp_schedule_iquery.c b/platform/linux-generic/odp_schedule_iquery.c index f0062b59..c1e51bb5 100644 --- a/platform/linux-generic/odp_schedule_iquery.c +++ b/platform/linux-generic/odp_schedule_iquery.c @@ -1142,8 +1142,7 @@ static inline void ordered_stash_release(void) buf_hdr = thread_local.ordered.stash[i].buf_hdr; num = thread_local.ordered.stash[i].num; - num_enq = queue_fn->enq_multi(qentry_to_int(queue_entry), - buf_hdr, num); + num_enq = queue_fn->enq_multi(queue_entry, buf_hdr, num); if (odp_unlikely(num_enq < num)) { if (odp_unlikely(num_enq < 0)) @@ -1208,7 +1207,7 @@ static int schedule_ord_enq_multi(void *q_int, void *buf_hdr[], { int i; uint32_t stash_num = thread_local.ordered.stash_num; - queue_entry_t *dst_queue = qentry_from_int(q_int); + queue_entry_t *dst_queue = q_int; uint32_t src_queue = thread_local.ordered.src_queue; if ((src_queue == NULL_INDEX) || thread_local.ordered.in_order) commit 68f26e2a86eb206dcdda9324b20afa208067e6c2 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Mon May 28 14:52:34 2018 +0300 linux-gen: queue: remove abstract internal queue type Implementation internal (queue) references are pointers. Remove additional (abstract) type from queue interface. Other modules use void pointer as (abstract) queue reference. Abstract type added complexity and confusion, as queue handles had three different formats API handle, internal abstract type and queue structure pointer. 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/include/odp_packet_internal.h b/platform/linux-generic/include/odp_packet_internal.h index 951903dd..cd2db2ec 100644 --- a/platform/linux-generic/include/odp_packet_internal.h +++ b/platform/linux-generic/include/odp_packet_internal.h @@ -105,7 +105,7 @@ typedef struct { odp_time_t timestamp; /* Classifier destination queue */ - queue_t dst_queue; + void *dst_queue; /* Result for crypto packet op */ odp_crypto_packet_result_t crypto_op_result; diff --git a/platform/linux-generic/include/odp_packet_io_internal.h b/platform/linux-generic/include/odp_packet_io_internal.h index 8019dfe9..880237a5 100644 --- a/platform/linux-generic/include/odp_packet_io_internal.h +++ b/platform/linux-generic/include/odp_packet_io_internal.h @@ -175,7 +175,7 @@ struct pktio_entry { struct { odp_queue_t queue; - queue_t queue_int; + void *queue_int; odp_pktin_queue_t pktin; } in_queue[PKTIO_MAX_QUEUES]; diff --git a/platform/linux-generic/include/odp_queue_if.h b/platform/linux-generic/include/odp_queue_if.h index ed8d6ca9..b9f4f03d 100644 --- a/platform/linux-generic/include/odp_queue_if.h +++ b/platform/linux-generic/include/odp_queue_if.h @@ -44,29 +44,23 @@ typedef struct { int (*queue_info)(odp_queue_t queue, odp_queue_info_t *info); } queue_api_t; -/* Internal abstract queue handle */ -typedef struct { char dummy; } _queue_t; -typedef _queue_t *queue_t; - -#define QUEUE_NULL ((queue_t)NULL) - typedef int (*queue_init_global_fn_t)(void); typedef int (*queue_term_global_fn_t)(void); typedef int (*queue_init_local_fn_t)(void); typedef int (*queue_term_local_fn_t)(void); -typedef queue_t (*queue_from_ext_fn_t)(odp_queue_t handle); -typedef odp_queue_t (*queue_to_ext_fn_t)(queue_t q_int); -typedef int (*queue_enq_fn_t)(queue_t q_int, odp_buffer_hdr_t *); -typedef int (*queue_enq_multi_fn_t)(queue_t q_int, odp_buffer_hdr_t **, int); -typedef odp_buffer_hdr_t *(*queue_deq_fn_t)(queue_t q_int); -typedef int (*queue_deq_multi_fn_t)(queue_t q_int, odp_buffer_hdr_t **, int); -typedef odp_pktout_queue_t (*queue_get_pktout_fn_t)(queue_t q_int); -typedef void (*queue_set_pktout_fn_t)(queue_t q_int, odp_pktio_t pktio, +typedef void *(*queue_from_ext_fn_t)(odp_queue_t handle); +typedef odp_queue_t (*queue_to_ext_fn_t)(void *q_int); +typedef int (*queue_enq_fn_t)(void *q_int, odp_buffer_hdr_t *); +typedef int (*queue_enq_multi_fn_t)(void *q_int, odp_buffer_hdr_t **, int); +typedef odp_buffer_hdr_t *(*queue_deq_fn_t)(void *q_int); +typedef int (*queue_deq_multi_fn_t)(void *q_int, odp_buffer_hdr_t **, int); +typedef odp_pktout_queue_t (*queue_get_pktout_fn_t)(void *q_int); +typedef void (*queue_set_pktout_fn_t)(void *q_int, odp_pktio_t pktio, int index); -typedef odp_pktin_queue_t (*queue_get_pktin_fn_t)(queue_t q_int); -typedef void (*queue_set_pktin_fn_t)(queue_t q_int, odp_pktio_t pktio, +typedef odp_pktin_queue_t (*queue_get_pktin_fn_t)(void *q_int); +typedef void (*queue_set_pktin_fn_t)(void *q_int, odp_pktio_t pktio, int index); -typedef void (*queue_set_enq_deq_fn_t)(queue_t q_int, +typedef void (*queue_set_enq_deq_fn_t)(void *q_int, queue_enq_fn_t enq, queue_enq_multi_fn_t enq_multi, queue_deq_fn_t deq, diff --git a/platform/linux-generic/include/odp_queue_internal.h b/platform/linux-generic/include/odp_queue_internal.h index 98e86fa0..e227f26c 100644 --- a/platform/linux-generic/include/odp_queue_internal.h +++ b/platform/linux-generic/include/odp_queue_internal.h @@ -4,13 +4,6 @@ * SPDX-License-Identifier: BSD-3-Clause */ - -/** - * @file - * - * ODP queue - implementation internal - */ - #ifndef ODP_QUEUE_INTERNAL_H_ #define ODP_QUEUE_INTERNAL_H_ @@ -81,9 +74,9 @@ typedef struct queue_global_t { extern queue_global_t *queue_glb; -static inline queue_t queue_index_to_qint(uint32_t queue_id) +static inline void *queue_index_to_qint(uint32_t queue_id) { - return (queue_t)&queue_glb->queue[queue_id]; + return &queue_glb->queue[queue_id]; } static inline uint32_t queue_to_index(odp_queue_t handle) @@ -96,14 +89,14 @@ static inline odp_queue_t queue_from_index(uint32_t queue_id) return _odp_cast_scalar(odp_queue_t, queue_id + 1); } -static inline queue_entry_t *qentry_from_int(queue_t q_int) +static inline queue_entry_t *qentry_from_int(void *q_int) { - return (queue_entry_t *)(void *)(q_int); + return (queue_entry_t *)q_int; } -static inline queue_t qentry_to_int(queue_entry_t *qentry) +static inline void *qentry_to_int(queue_entry_t *qentry) { - return (queue_t)(qentry); + return qentry; } #ifdef __cplusplus diff --git a/platform/linux-generic/include/odp_queue_scalable_internal.h b/platform/linux-generic/include/odp_queue_scalable_internal.h index b108346d..37147aa9 100644 --- a/platform/linux-generic/include/odp_queue_scalable_internal.h +++ b/platform/linux-generic/include/odp_queue_scalable_internal.h @@ -80,14 +80,14 @@ static inline uint32_t queue_to_id(odp_queue_t handle) return _odp_typeval(handle) - 1; } -static inline queue_entry_t *qentry_from_int(queue_t handle) +static inline queue_entry_t *qentry_from_int(void *handle) { - return (queue_entry_t *)(void *)(handle); + return (queue_entry_t *)handle; } -static inline queue_t qentry_to_int(queue_entry_t *qentry) +static inline void *qentry_to_int(queue_entry_t *qentry) { - return (queue_t)(qentry); + return qentry; } static inline odp_queue_t queue_get_handle(queue_entry_t *queue) diff --git a/platform/linux-generic/include/odp_schedule_if.h b/platform/linux-generic/include/odp_schedule_if.h index 4bd127a4..0d095262 100644 --- a/platform/linux-generic/include/odp_schedule_if.h +++ b/platform/linux-generic/include/odp_schedule_if.h @@ -32,7 +32,7 @@ typedef int (*schedule_init_queue_fn_t)(uint32_t queue_index, typedef void (*schedule_destroy_queue_fn_t)(uint32_t queue_index); typedef int (*schedule_sched_queue_fn_t)(uint32_t queue_index); typedef int (*schedule_unsched_queue_fn_t)(uint32_t queue_index); -typedef int (*schedule_ord_enq_multi_fn_t)(queue_t q_int, +typedef int (*schedule_ord_enq_multi_fn_t)(void *q_int, void *buf_hdr[], int num, int *ret); typedef int (*schedule_init_global_fn_t)(void); typedef int (*schedule_term_global_fn_t)(void); diff --git a/platform/linux-generic/include/odp_traffic_mngr_internal.h b/platform/linux-generic/include/odp_traffic_mngr_internal.h index aab6b911..919831a3 100644 --- a/platform/linux-generic/include/odp_traffic_mngr_internal.h +++ b/platform/linux-generic/include/odp_traffic_mngr_internal.h @@ -282,7 +282,7 @@ struct tm_queue_obj_s { uint8_t tm_idx; uint8_t delayed_cnt; uint8_t blocked_cnt; - queue_t tm_qentry; + void *tm_qentry; }; struct tm_node_obj_s { diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c index 81262a17..5113eba2 100644 --- a/platform/linux-generic/odp_packet_io.c +++ b/platform/linux-generic/odp_packet_io.c @@ -137,7 +137,7 @@ static void init_in_queues(pktio_entry_t *entry) for (i = 0; i < PKTIO_MAX_QUEUES; i++) { entry->s.in_queue[i].queue = ODP_QUEUE_INVALID; - entry->s.in_queue[i].queue_int = QUEUE_NULL; + entry->s.in_queue[i].queue_int = NULL; entry->s.in_queue[i].pktin = PKTIN_INVALID; } } @@ -327,7 +327,7 @@ static void destroy_in_queues(pktio_entry_t *entry, int num) if (entry->s.in_queue[i].queue != ODP_QUEUE_INVALID) { odp_queue_destroy(entry->s.in_queue[i].queue); entry->s.in_queue[i].queue = ODP_QUEUE_INVALID; - entry->s.in_queue[i].queue_int = QUEUE_NULL; + entry->s.in_queue[i].queue_int = NULL; } } } @@ -637,7 +637,7 @@ static inline int pktin_recv_buf(pktio_entry_t *entry, int pktin_index, return num_rx; } -static int pktout_enqueue(queue_t q_int, odp_buffer_hdr_t *buf_hdr) +static int pktout_enqueue(void *q_int, odp_buffer_hdr_t *buf_hdr) { odp_packet_t pkt = packet_from_buf_hdr(buf_hdr); int len = 1; @@ -650,7 +650,7 @@ static int pktout_enqueue(queue_t q_int, odp_buffer_hdr_t *buf_hdr) return (nbr == len ? 0 : -1); } -static int pktout_enq_multi(queue_t q_int, odp_buffer_hdr_t *buf_hdr[], int num) +static int pktout_enq_multi(void *q_int, odp_buffer_hdr_t *buf_hdr[], int num) { odp_packet_t pkt_tbl[QUEUE_MULTI_MAX]; int nbr; @@ -666,7 +666,7 @@ static int pktout_enq_multi(queue_t q_int, odp_buffer_hdr_t *buf_hdr[], int num) return nbr; } -static odp_buffer_hdr_t *pktin_dequeue(queue_t q_int) +static odp_buffer_hdr_t *pktin_dequeue(void *q_int) { odp_buffer_hdr_t *buf_hdr; odp_buffer_hdr_t *hdr_tbl[QUEUE_MULTI_MAX]; @@ -705,7 +705,7 @@ static odp_buffer_hdr_t *pktin_dequeue(queue_t q_int) return buf_hdr; } -static int pktin_deq_multi(queue_t q_int, odp_buffer_hdr_t *buf_hdr[], int num) +static int pktin_deq_multi(void *q_int, odp_buffer_hdr_t *buf_hdr[], int num) { int nbr; odp_buffer_hdr_t *hdr_tbl[QUEUE_MULTI_MAX]; @@ -765,7 +765,7 @@ int sched_cb_pktin_poll_one(int pktio_index, odp_packet_hdr_t *pkt_hdr; odp_buffer_hdr_t *buf_hdr; odp_packet_t packets[QUEUE_MULTI_MAX]; - queue_t queue; + void *q_int; if (odp_unlikely(entry->s.state != PKTIO_STATE_STARTED)) { if (entry->s.state < PKTIO_STATE_ACTIVE || @@ -785,9 +785,9 @@ int sched_cb_pktin_poll_one(int pktio_index, pkt = packets[i]; pkt_hdr = packet_hdr(pkt); if (odp_unlikely(pkt_hdr->p.input_flags.dst_queue)) { - queue = pkt_hdr->dst_queue; + q_int = pkt_hdr->dst_queue; buf_hdr = packet_to_buf_hdr(pkt); - if (queue_fn->enq_multi(queue, &buf_hdr, 1) < 0) { + if (queue_fn->enq_multi(q_int, &buf_hdr, 1) < 0) { /* Queue full? */ odp_packet_free(pkt); __atomic_fetch_add(&entry->s.stats.in_discards, @@ -836,7 +836,7 @@ int sched_cb_pktin_poll_old(int pktio_index, int num_queue, int index[]) } for (idx = 0; idx < num_queue; idx++) { - queue_t q_int; + void *q_int; int num_enq; num = pktin_recv_buf(entry, index[idx], hdr_tbl, @@ -1371,14 +1371,14 @@ int odp_pktio_stats_reset(odp_pktio_t pktio) return ret; } -static int abort_pktin_enqueue(queue_t q_int ODP_UNUSED, +static int abort_pktin_enqueue(void *q_int ODP_UNUSED, odp_buffer_hdr_t *buf_hdr ODP_UNUSED) { ODP_ABORT("attempted enqueue to a pktin queue"); return -1; } -static int abort_pktin_enq_multi(queue_t q_int ODP_UNUSED, +static int abort_pktin_enq_multi(void *q_int ODP_UNUSED, odp_buffer_hdr_t *buf_hdr[] ODP_UNUSED, int num ODP_UNUSED) { @@ -1386,13 +1386,13 @@ static int abort_pktin_enq_multi(queue_t q_int ODP_UNUSED, return 0; } -static odp_buffer_hdr_t *abort_pktout_dequeue(queue_t q_int ODP_UNUSED) +static odp_buffer_hdr_t *abort_pktout_dequeue(void *q_int ODP_UNUSED) { ODP_ABORT("attempted dequeue from a pktout queue"); return NULL; } -static int abort_pktout_deq_multi(queue_t q_int ODP_UNUSED, +static int abort_pktout_deq_multi(void *q_int ODP_UNUSED, odp_buffer_hdr_t *buf_hdr[] ODP_UNUSED, int num ODP_UNUSED) { @@ -1410,7 +1410,7 @@ int odp_pktin_queue_config(odp_pktio_t pktio, unsigned i; int rc; odp_queue_t queue; - queue_t q_int; + void *q_int; odp_pktin_queue_param_t default_param; if (param == NULL) { @@ -1506,7 +1506,7 @@ int odp_pktin_queue_config(odp_pktio_t pktio, } else { entry->s.in_queue[i].queue = ODP_QUEUE_INVALID; - entry->s.in_queue[i].queue_int = QUEUE_NULL; + entry->s.in_queue[i].queue_int = NULL; } entry->s.in_queue[i].pktin.index = i; @@ -1598,7 +1598,7 @@ int odp_pktout_queue_config(odp_pktio_t pktio, for (i = 0; i < num_queues; i++) { odp_queue_t queue; odp_queue_param_t queue_param; - queue_t q_int; + void *q_int; char name[ODP_QUEUE_NAME_LEN]; int pktio_id = odp_pktio_index(pktio); diff --git a/platform/linux-generic/odp_queue_basic.c b/platform/linux-generic/odp_queue_basic.c index 572441d0..7c1e1c84 100644 --- a/platform/linux-generic/odp_queue_basic.c +++ b/platform/linux-generic/odp_queue_basic.c @@ -485,7 +485,7 @@ static inline void buffer_index_to_buf(odp_buffer_hdr_t *buf_hdr[], } } -static inline int enq_multi(queue_t q_int, odp_buffer_hdr_t *buf_hdr[], +static inline int enq_multi(void *q_int, odp_buffer_hdr_t *buf_hdr[], int num) { int sched = 0; @@ -532,13 +532,13 @@ static inline int enq_multi(queue_t q_int, odp_buffer_hdr_t *buf_hdr[], return num_enq; } -static int queue_int_enq_multi(queue_t q_int, odp_buffer_hdr_t *buf_hdr[], +static int queue_int_enq_multi(void *q_int, odp_buffer_hdr_t *buf_hdr[], int num) { return enq_multi(q_int, buf_hdr, num); } -static int queue_int_enq(queue_t q_int, odp_buffer_hdr_t *buf_hdr) +static int queue_int_enq(void *q_int, odp_buffer_hdr_t *buf_hdr) { int ret; @@ -617,7 +617,7 @@ static inline int deq_multi(queue_entry_t *queue, odp_buffer_hdr_t *buf_hdr[], return num_deq; } -static int queue_int_deq_multi(queue_t q_int, odp_buffer_hdr_t *buf_hdr[], +static int queue_int_deq_multi(void *q_int, odp_buffer_hdr_t *buf_hdr[], int num) { queue_entry_t *queue = qentry_from_int(q_int); @@ -625,7 +625,7 @@ static int queue_int_deq_multi(queue_t q_int, odp_buffer_hdr_t *buf_hdr[], return deq_multi(queue, buf_hdr, num, 0); } -static odp_buffer_hdr_t *queue_int_deq(queue_t q_int) +static odp_buffer_hdr_t *queue_int_deq(void *q_int) { queue_entry_t *queue = qentry_from_int(q_int); odp_buffer_hdr_t *buf_hdr = NULL; @@ -798,12 +798,12 @@ static uint64_t queue_to_u64(odp_queue_t hdl) return _odp_pri(hdl); } -static odp_pktout_queue_t queue_get_pktout(queue_t q_int) +static odp_pktout_queue_t queue_get_pktout(void *q_int) { return qentry_from_int(q_int)->s.pktout; } -static void queue_set_pktout(queue_t q_int, odp_pktio_t pktio, int index) +static void queue_set_pktout(void *q_int, odp_pktio_t pktio, int index) { queue_entry_t *qentry = qentry_from_int(q_int); @@ -811,12 +811,12 @@ static void queue_set_pktout(queue_t q_int, odp_pktio_t pktio, int index) qentry->s.pktout.index = index; } -static odp_pktin_queue_t queue_get_pktin(queue_t q_int) +static odp_pktin_queue_t queue_get_pktin(void *q_int) { return qentry_from_int(q_int)->s.pktin; } -static void queue_set_pktin(queue_t q_int, odp_pktio_t pktio, int index) +static void queue_set_pktin(void *q_int, odp_pktio_t pktio, int index) { queue_entry_t *qentry = qentry_from_int(q_int); @@ -824,7 +824,7 @@ static void queue_set_pktin(queue_t q_int, odp_pktio_t pktio, int index) qentry->s.pktin.index = index; } -static void queue_set_enq_deq_func(queue_t q_int, +static void queue_set_enq_deq_func(void *q_int, queue_enq_fn_t enq, queue_enq_multi_fn_t enq_multi, queue_deq_fn_t deq, @@ -845,12 +845,12 @@ static void queue_set_enq_deq_func(queue_t q_int, qentry->s.dequeue_multi = deq_multi; } -static queue_t queue_from_ext(odp_queue_t handle) +static void *queue_from_ext(odp_queue_t handle) { return qentry_to_int(handle_to_qentry(handle)); } -static odp_queue_t queue_to_ext(queue_t q_int) +static odp_queue_t queue_to_ext(void *q_int) { return qentry_from_int(q_int)->s.handle; } diff --git a/platform/linux-generic/odp_queue_lf.c b/platform/linux-generic/odp_queue_lf.c index afe629d1..4a8a5492 100644 --- a/platform/linux-generic/odp_queue_lf.c +++ b/platform/linux-generic/odp_queue_lf.c @@ -133,7 +133,7 @@ static inline int next_idx(int idx) return next; } -static int queue_lf_enq(queue_t q_int, odp_buffer_hdr_t *buf_hdr) +static int queue_lf_enq(void *q_int, odp_buffer_hdr_t *buf_hdr) { queue_entry_t *queue; queue_lf_t *queue_lf; @@ -183,7 +183,7 @@ static int queue_lf_enq(queue_t q_int, odp_buffer_hdr_t *buf_hdr) return -1; } -static int queue_lf_enq_multi(queue_t q_int, odp_buffer_hdr_t **buf_hdr, +static int queue_lf_enq_multi(void *q_int, odp_buffer_hdr_t **buf_hdr, int num) { (void)num; @@ -194,7 +194,7 @@ static int queue_lf_enq_multi(queue_t q_int, odp_buffer_hdr_t **buf_hdr, return 0; } -static odp_buffer_hdr_t *queue_lf_deq(queue_t q_int) +static odp_buffer_hdr_t *queue_lf_deq(void *q_int) { queue_entry_t *queue; queue_lf_t *queue_lf; @@ -243,7 +243,7 @@ static odp_buffer_hdr_t *queue_lf_deq(queue_t q_int) return NULL; } -static int queue_lf_deq_multi(queue_t q_int, odp_buffer_hdr_t **buf_hdr, +static int queue_lf_deq_multi(void *q_int, odp_buffer_hdr_t **buf_hdr, int num) { odp_buffer_hdr_t *buf; diff --git a/platform/linux-generic/odp_queue_scalable.c b/platform/linux-generic/odp_queue_scalable.c index 578e6d22..1cc318e3 100644 --- a/platform/linux-generic/odp_queue_scalable.c +++ b/platform/linux-generic/odp_queue_scalable.c @@ -57,12 +57,12 @@ static inline odp_queue_t queue_from_id(uint32_t queue_id) return _odp_cast_scalar(odp_queue_t, queue_id + 1); } -static queue_t queue_from_ext(odp_queue_t handle); -static int _queue_enq(queue_t handle, odp_buffer_hdr_t *buf_hdr); -static odp_buffer_hdr_t *_queue_deq(queue_t handle); -static int _queue_enq_multi(queue_t handle, odp_buffer_hdr_t *buf_hdr[], +static void *queue_from_ext(odp_queue_t handle); +static int _queue_enq(void *handle, odp_buffer_hdr_t *buf_hdr); +static odp_buffer_hdr_t *_queue_deq(void *handle); +static int _queue_enq_multi(void *handle, odp_buffer_hdr_t *buf_hdr[], int num); -static int _queue_deq_multi(queue_t handle, odp_buffer_hdr_t *buf_hdr[], +static int _queue_deq_multi(void *handle, odp_buffer_hdr_t *buf_hdr[], int num); static queue_entry_t *get_qentry(uint32_t queue_id) @@ -612,7 +612,7 @@ int _odp_queue_enq_sp(sched_elem_t *q, return actual; } -static int _queue_enq_multi(queue_t handle, odp_buffer_hdr_t *buf_hdr[], +static int _queue_enq_multi(void *handle, odp_buffer_hdr_t *buf_hdr[], int num) { int actual; @@ -648,7 +648,7 @@ static int _queue_enq_multi(queue_t handle, odp_buffer_hdr_t *buf_hdr[], return actual; } -static int _queue_enq(queue_t handle, odp_buffer_hdr_t *buf_hdr) +static int _queue_enq(void *handle, odp_buffer_hdr_t *buf_hdr) { return odp_likely( _queue_enq_multi(handle, &buf_hdr, 1) == 1) ? 0 : -1; @@ -811,7 +811,7 @@ inline int _odp_queue_deq_mc(sched_elem_t *q, odp_event_t *evp, int num) return ret; } -static int _queue_deq_multi(queue_t handle, odp_buffer_hdr_t *buf_hdr[], +static int _queue_deq_multi(void *handle, odp_buffer_hdr_t *buf_hdr[], int num) { sched_elem_t *q; @@ -822,7 +822,7 @@ static int _queue_deq_multi(queue_t handle, odp_buffer_hdr_t *buf_hdr[], return _odp_queue_deq(q, buf_hdr, num); } -static odp_buffer_hdr_t *_queue_deq(queue_t handle) +static odp_buffer_hdr_t *_queue_deq(void *handle) { sched_elem_t *q; odp_buffer_hdr_t *buf_hdr; @@ -911,29 +911,29 @@ static uint64_t queue_to_u64(odp_queue_t hdl) return _odp_pri(hdl); } -static odp_pktout_queue_t queue_get_pktout(queue_t handle) +static odp_pktout_queue_t queue_get_pktout(void *handle) { return qentry_from_int(handle)->s.pktout; } -static void queue_set_pktout(queue_t handle, odp_pktio_t pktio, int index) +static void queue_set_pktout(void *handle, odp_pktio_t pktio, int index) { qentry_from_int(handle)->s.pktout.pktio = pktio; qentry_from_int(handle)->s.pktout.index = index; } -static odp_pktin_queue_t queue_get_pktin(queue_t handle) +static odp_pktin_queue_t queue_get_pktin(void *handle) { return qentry_from_int(handle)->s.pktin; } -static void queue_set_pktin(queue_t handle, odp_pktio_t pktio, int index) +static void queue_set_pktin(void *handle, odp_pktio_t pktio, int index) { qentry_from_int(handle)->s.pktin.pktio = pktio; qentry_from_int(handle)->s.pktin.index = index; } -static void queue_set_enq_deq_func(queue_t handle, +static void queue_set_enq_deq_func(void *handle, queue_enq_fn_t enq, queue_enq_multi_fn_t enq_multi, queue_deq_fn_t deq, @@ -952,7 +952,7 @@ static void queue_set_enq_deq_func(queue_t handle, qentry_from_int(handle)->s.dequeue_multi = deq_multi; } -static queue_t queue_from_ext(odp_queue_t handle) +static void *queue_from_ext(odp_queue_t handle) { uint32_t queue_id; @@ -960,7 +960,7 @@ static queue_t queue_from_ext(odp_queue_t handle) return qentry_to_int(get_qentry(queue_id)); } -static odp_queue_t queue_to_ext(queue_t handle) +static odp_queue_t queue_to_ext(void *handle) { return qentry_from_int(handle)->s.handle; } diff --git a/platform/linux-generic/odp_schedule_basic.c b/platform/linux-generic/odp_schedule_basic.c index ca291d15..57e958bb 100644 --- a/platform/linux-generic/odp_schedule_basic.c +++ b/platform/linux-generic/odp_schedule_basic.c @@ -714,7 +714,7 @@ static inline int copy_from_stash(odp_event_t out_ev[], unsigned int max) return i; } -static int schedule_ord_enq_multi(queue_t q_int, void *buf_hdr[], +static int schedule_ord_enq_multi(void *q_int, void *buf_hdr[], int num, int *ret) { int i; @@ -766,7 +766,7 @@ static inline int poll_pktin(uint32_t qi, int stash) odp_buffer_hdr_t *b_hdr[MAX_DEQ]; int pktio_index, pktin_index, num, num_pktin, i; int ret; - queue_t qint; + void *q_int; pktio_index = sched->queue[qi].pktio_index; pktin_index = sched->queue[qi].pktin_index; @@ -799,9 +799,9 @@ static inline int poll_pktin(uint32_t qi, int stash) return num; } - qint = queue_index_to_qint(qi); + q_int = queue_index_to_qint(qi); - ret = queue_fn->enq_multi(qint, b_hdr, num); + ret = queue_fn->enq_multi(q_int, b_hdr, num); /* Drop packets that were not enqueued */ if (odp_unlikely(ret < num)) { diff --git a/platform/linux-generic/odp_schedule_iquery.c b/platform/linux-generic/odp_schedule_iquery.c index b8d7e3b5..f0062b59 100644 --- a/platform/linux-generic/odp_schedule_iquery.c +++ b/platform/linux-generic/odp_schedule_iquery.c @@ -1203,7 +1203,7 @@ static inline void schedule_release_context(void) schedule_release_atomic(); } -static int schedule_ord_enq_multi(queue_t q_int, void *buf_hdr[], +static int schedule_ord_enq_multi(void *q_int, void *buf_hdr[], int num, int *ret) { int i; diff --git a/platform/linux-generic/odp_schedule_scalable.c b/platform/linux-generic/odp_schedule_scalable.c index ff24815c..155be5a2 100644 --- a/platform/linux-generic/odp_schedule_scalable.c +++ b/platform/linux-generic/odp_schedule_scalable.c @@ -2006,7 +2006,7 @@ static int sched_queue(uint32_t queue_index) return 0; } -static int ord_enq_multi(queue_t handle, void *buf_hdr[], int num, +static int ord_enq_multi(void *handle, void *buf_hdr[], int num, int *ret) { diff --git a/platform/linux-generic/odp_schedule_sp.c b/platform/linux-generic/odp_schedule_sp.c index 2cef0e82..0f80452d 100644 --- a/platform/linux-generic/odp_schedule_sp.c +++ b/platform/linux-generic/odp_schedule_sp.c @@ -414,7 +414,7 @@ static int sched_queue(uint32_t qi) return 0; } -static int ord_enq_multi(queue_t q_int, void *buf_hdr[], int num, +static int ord_enq_multi(void *q_int, void *buf_hdr[], int num, int *ret) { (void)q_int; diff --git a/platform/linux-generic/odp_traffic_mngr.c b/platform/linux-generic/odp_traffic_mngr.c index eeb1ea96..79ba35b7 100644 --- a/platform/linux-generic/odp_traffic_mngr.c +++ b/platform/linux-generic/odp_traffic_mngr.c @@ -108,7 +108,7 @@ static odp_bool_t tm_demote_pkt_desc(tm_system_t *tm_system, tm_shaper_obj_t *timer_shaper, pkt_desc_t *demoted_pkt_desc); -static int queue_tm_reenq(queue_t queue, odp_buffer_hdr_t *buf_hdr) +static int queue_tm_reenq(void *queue, odp_buffer_hdr_t *buf_hdr) { odp_tm_queue_t tm_queue = MAKE_ODP_TM_QUEUE((uint8_t *)queue - offsetof(tm_queue_obj_t, @@ -118,7 +118,7 @@ static int queue_tm_reenq(queue_t queue, odp_buffer_hdr_t *buf_hdr) return odp_tm_enq(tm_queue, pkt); } -static int queue_tm_reenq_multi(queue_t queue ODP_UNUSED, +static int queue_tm_reenq_multi(void *queue ODP_UNUSED, odp_buffer_hdr_t *buf[] ODP_UNUSED, int num ODP_UNUSED) { diff --git a/platform/linux-generic/pktio/loop.c b/platform/linux-generic/pktio/loop.c index 18fecf88..0bd1835c 100644 --- a/platform/linux-generic/pktio/loop.c +++ b/platform/linux-generic/pktio/loop.c @@ -79,7 +79,7 @@ static int loopback_recv(pktio_entry_t *pktio_entry, int index ODP_UNUSED, { int nbr, i; odp_buffer_hdr_t *hdr_tbl[QUEUE_MULTI_MAX]; - queue_t queue; + void *queue; odp_packet_hdr_t *pkt_hdr; odp_packet_t pkt; odp_time_t ts_val; @@ -260,7 +260,7 @@ static int loopback_send(pktio_entry_t *pktio_entry, int index ODP_UNUSED, const odp_packet_t pkt_tbl[], int num) { odp_buffer_hdr_t *hdr_tbl[QUEUE_MULTI_MAX]; - queue_t queue; + void *queue; int i; int ret; int nb_tx = 0; ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/Makefile.am | 3 + .../linux-generic/include-abi/odp/api/abi/queue.h | 3 + .../include/odp/api/plat/queue_inline_types.h | 35 ++++++ .../include/odp/api/plat/queue_inlines.h | 36 ++++++ .../linux-generic/include/odp_packet_internal.h | 2 +- .../linux-generic/include/odp_packet_io_internal.h | 2 +- platform/linux-generic/include/odp_queue_if.h | 29 ++--- .../linux-generic/include/odp_queue_internal.h | 27 +---- .../include/odp_queue_scalable_internal.h | 10 +- platform/linux-generic/include/odp_schedule_if.h | 2 +- .../include/odp_traffic_mngr_internal.h | 2 +- platform/linux-generic/odp_packet_io.c | 34 +++--- .../{odp_event_api.c => odp_queue_api.c} | 4 +- platform/linux-generic/odp_queue_basic.c | 125 +++++++++++---------- platform/linux-generic/odp_queue_if.c | 14 ++- platform/linux-generic/odp_queue_lf.c | 12 +- platform/linux-generic/odp_queue_scalable.c | 84 +++++++------- platform/linux-generic/odp_schedule_basic.c | 13 +-- platform/linux-generic/odp_schedule_iquery.c | 7 +- platform/linux-generic/odp_schedule_scalable.c | 2 +- platform/linux-generic/odp_schedule_sp.c | 2 +- platform/linux-generic/odp_traffic_mngr.c | 4 +- platform/linux-generic/pktio/loop.c | 4 +- 23 files changed, 254 insertions(+), 202 deletions(-) create mode 100644 platform/linux-generic/include/odp/api/plat/queue_inline_types.h create mode 100644 platform/linux-generic/include/odp/api/plat/queue_inlines.h copy platform/linux-generic/{odp_event_api.c => odp_queue_api.c} (75%) hooks/post-receive --

5 years, 11 months

[COMMIT] branch master updated. v1.19.0.1_tigermoth-39-g42a8b2f0

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 42a8b2f0dbaee653953170cbd0a7fa659bc32b38 (commit) via f4f4dcee96e534c0badc28258ad09ef50b35ec76 (commit) via d6e4b3df266ee1c847763ba50fa802d9e9e62b5e (commit) via bdc44eae6bac8aed26170d21cf05fe99ba9d84d6 (commit) via 170e93051d25ac491811f1ed66cd5552a0b26ec8 (commit) from 744d466a0fe5530bb6c036664413d799a3aeb871 (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 42a8b2f0dbaee653953170cbd0a7fa659bc32b38 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Fri May 25 11:25:15 2018 +0300 linux-gen: cpu: inline cpu_cycles_diff Moved the last function from .c file to inline header and removed .c file. 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/Makefile.am b/platform/linux-generic/Makefile.am index 218138f9..e995479a 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -149,7 +149,6 @@ __LIB__libodp_linux_la_SOURCES = \ odp_buffer.c \ odp_chksum.c \ odp_classification.c \ - odp_cpu.c \ odp_cpumask.c \ odp_cpumask_task.c \ odp_crypto.c \ diff --git a/platform/linux-generic/include/odp/api/plat/cpu_inlines.h b/platform/linux-generic/include/odp/api/plat/cpu_inlines.h index 29b6ca7a..054801e8 100644 --- a/platform/linux-generic/include/odp/api/plat/cpu_inlines.h +++ b/platform/linux-generic/include/odp/api/plat/cpu_inlines.h @@ -7,6 +7,8 @@ #ifndef ODP_PLAT_CPU_INLINES_H_ #define ODP_PLAT_CPU_INLINES_H_ +#include <odp/api/hints.h> + /** @cond _ODP_HIDE_FROM_DOXYGEN_ */ #ifndef _ODP_NO_INLINE @@ -16,12 +18,21 @@ #define odp_cpu_cycles __odp_cpu_cycles #define odp_cpu_cycles_max __odp_cpu_cycles_max #define odp_cpu_cycles_resolution __odp_cpu_cycles_resolution + #define odp_cpu_cycles_diff __odp_cpu_cycles_diff #else #define _ODP_INLINE #endif #include <odp/api/abi/cpu_inlines.h> +_ODP_INLINE uint64_t odp_cpu_cycles_diff(uint64_t c2, uint64_t c1) +{ + if (odp_likely(c2 >= c1)) + return c2 - c1; + + return c2 + (odp_cpu_cycles_max() - c1) + 1; +} + /** @endcond */ #endif diff --git a/platform/linux-generic/include/odp_ring_internal.h b/platform/linux-generic/include/odp_ring_internal.h index 8a01d461..03c0817e 100644 --- a/platform/linux-generic/include/odp_ring_internal.h +++ b/platform/linux-generic/include/odp_ring_internal.h @@ -12,6 +12,7 @@ extern "C" { #endif #include <odp/api/atomic.h> +#include <odp/api/cpu.h> #include <odp/api/hints.h> #include <odp_align_internal.h> #include <odp/api/plat/atomic_inlines.h> diff --git a/platform/linux-generic/odp_cpu.c b/platform/linux-generic/odp_cpu.c deleted file mode 100644 index cfdb1cfd..00000000 --- a/platform/linux-generic/odp_cpu.c +++ /dev/null @@ -1,18 +0,0 @@ -/* Copyright (c) 2015-2018, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#include "config.h" - -#include <odp/api/cpu.h> -#include <odp/api/hints.h> - -uint64_t odp_cpu_cycles_diff(uint64_t c2, uint64_t c1) -{ - if (odp_likely(c2 >= c1)) - return c2 - c1; - - return c2 + (odp_cpu_cycles_max() - c1) + 1; -} diff --git a/platform/linux-generic/odp_schedule_scalable_ordered.c b/platform/linux-generic/odp_schedule_scalable_ordered.c index f68a559d..e01120f1 100644 --- a/platform/linux-generic/odp_schedule_scalable_ordered.c +++ b/platform/linux-generic/odp_schedule_scalable_ordered.c @@ -8,6 +8,7 @@ #include <config.h> #include <odp/api/shared_memory.h> +#include <odp/api/cpu.h> #include <odp/api/plat/cpu_inlines.h> #include <odp_queue_scalable_internal.h> #include <odp_schedule_if.h> commit f4f4dcee96e534c0badc28258ad09ef50b35ec76 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Thu May 24 16:54:46 2018 +0300 linux-gen: cpu: inline cpu cycle functions on x86 Moved cpu cycle and pause functions into arch/x86/odp_arch_cpu_inlines.h. Uncommented pause function in spec file and removed it from ABI file. It's safer for ABI compat mode to not have code included into ABI spec files. Other architectures use the default odp_arch_cpu_inlines.h, which does not change the current implementation. 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/Makefile.inc b/Makefile.inc index c887b2ee..f9c4cae4 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -9,6 +9,7 @@ else ODP_INCLUDES += \ -I$(top_srcdir)/platform/@with_platform@/include \ -I$(top_srcdir)/platform/@with_platform@/arch/@ARCH_DIR@ \ + -I$(top_srcdir)/platform/@with_platform@/arch/default \ -I$(top_srcdir)/platform/@with_platform@/include-abi endif diff --git a/include/odp/api/spec/cpu.h b/include/odp/api/spec/cpu.h index d107f283..f6a7e656 100644 --- a/include/odp/api/spec/cpu.h +++ b/include/odp/api/spec/cpu.h @@ -161,14 +161,13 @@ uint64_t odp_cpu_cycles_max(void); uint64_t odp_cpu_cycles_resolution(void); /** - * @def odp_cpu_pause * Pause CPU execution for a short while * * This call is intended for tight loops which poll a shared resource. A short * pause within the loop may save energy and improve system performance as * CPU polling frequency is reduced. */ -/* void odp_cpu_pause(void); */ +void odp_cpu_pause(void); /** * @} diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/cpu.h b/include/odp/arch/x86_32-linux/odp/api/abi/cpu.h index 523fa99e..d7485c09 100644 --- a/include/odp/arch/x86_32-linux/odp/api/abi/cpu.h +++ b/include/odp/arch/x86_32-linux/odp/api/abi/cpu.h @@ -13,15 +13,6 @@ extern "C" { #define ODP_CACHE_LINE_SIZE 64 -static inline void odp_cpu_pause(void) -{ -#ifdef __SSE2__ - __asm__ __volatile__ ("pause"); -#else - __asm__ __volatile__ ("rep; nop"); -#endif -} - #ifdef __cplusplus } #endif diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/cpu.h b/include/odp/arch/x86_64-linux/odp/api/abi/cpu.h index d4fcf892..69b82eb0 100644 --- a/include/odp/arch/x86_64-linux/odp/api/abi/cpu.h +++ b/include/odp/arch/x86_64-linux/odp/api/abi/cpu.h @@ -13,11 +13,6 @@ extern "C" { #define ODP_CACHE_LINE_SIZE 64 -static inline void odp_cpu_pause(void) -{ - __asm__ __volatile__ ("pause"); -} - #ifdef __cplusplus } #endif diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 6269e578..218138f9 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -20,12 +20,16 @@ DISTCLEANFILES = include/odp_libconfig_config.h include/odp_libconfig_config.h: $(top_srcdir)/config/odp-$(with_platform).conf $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ +odpapiabiarchincludedir = $(archincludedir)/odp/api/abi +odpapiabiarchinclude_HEADERS = + if !ODP_ABI_COMPAT odpapiplatincludedir= $(includedir)/odp/api/plat odpapiplatinclude_HEADERS = \ include/odp/api/plat/atomic_inlines.h \ include/odp/api/plat/buffer_inline_types.h \ include/odp/api/plat/byteorder_inlines.h \ + include/odp/api/plat/cpu_inlines.h \ include/odp/api/plat/event_inlines.h \ include/odp/api/plat/packet_flag_inlines.h \ include/odp/api/plat/packet_inline_types.h \ @@ -38,8 +42,7 @@ odpapiplatinclude_HEADERS = \ include/odp/api/plat/thread_inlines.h \ include/odp/api/plat/ticketlock_inlines.h -odpapiabiarchincludedir = $(archincludedir)/odp/api/abi -odpapiabiarchinclude_HEADERS = \ +odpapiabiarchinclude_HEADERS += \ include-abi/odp/api/abi/align.h \ include-abi/odp/api/abi/atomic.h \ include-abi/odp/api/abi/barrier.h \ @@ -214,6 +217,7 @@ if ODP_ABI_COMPAT __LIB__libodp_linux_la_SOURCES += \ odp_atomic_api.c \ odp_byteorder_api.c \ + odp_cpu_api.c \ odp_event_api.c \ odp_packet_api.c \ odp_packet_flags_api.c \ @@ -228,32 +232,33 @@ if ARCH_IS_ARM __LIB__libodp_linux_la_SOURCES += arch/default/odp_cpu_cycles.c \ arch/default/odp_global_time.c \ arch/default/odp_sysinfo_parse.c +odpapiabiarchinclude_HEADERS += arch/default/odp/api/abi/cpu_inlines.h if !ODP_ABI_COMPAT odpapiabiarchinclude_HEADERS += arch/arm/odp/api/abi/cpu.h endif 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_cycles.c \ arch/aarch64/odp_global_time.c \ arch/default/odp_sysinfo_parse.c +odpapiabiarchinclude_HEADERS += arch/default/odp/api/abi/cpu_inlines.h if !ODP_ABI_COMPAT odpapiabiarchinclude_HEADERS += arch/aarch64/odp/api/abi/cpu.h endif 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_DEFAULT __LIB__libodp_linux_la_SOURCES += arch/default/odp_cpu_cycles.c \ arch/default/odp_global_time.c \ arch/default/odp_sysinfo_parse.c +odpapiabiarchinclude_HEADERS += arch/default/odp/api/abi/cpu_inlines.h if !ODP_ABI_COMPAT odpapiabiarchinclude_HEADERS += arch/default/odp/api/abi/cpu.h endif @@ -264,6 +269,7 @@ if ARCH_IS_MIPS64 __LIB__libodp_linux_la_SOURCES += arch/mips64/odp_cpu_cycles.c \ arch/default/odp_global_time.c \ arch/mips64/odp_sysinfo_parse.c +odpapiabiarchinclude_HEADERS += arch/default/odp/api/abi/cpu_inlines.h if !ODP_ABI_COMPAT odpapiabiarchinclude_HEADERS += arch/mips64/odp/api/abi/cpu.h endif @@ -274,6 +280,7 @@ if ARCH_IS_POWERPC __LIB__libodp_linux_la_SOURCES += arch/default/odp_cpu_cycles.c \ arch/default/odp_global_time.c \ arch/powerpc/odp_sysinfo_parse.c +odpapiabiarchinclude_HEADERS += arch/default/odp/api/abi/cpu_inlines.h if !ODP_ABI_COMPAT odpapiabiarchinclude_HEADERS += arch/powerpc/odp/api/abi/cpu.h endif @@ -285,11 +292,12 @@ __LIB__libodp_linux_la_SOURCES += arch/x86/cpu_flags.c \ arch/x86/odp_cpu_cycles.c \ arch/x86/odp_global_time.c \ arch/x86/odp_sysinfo_parse.c +odpapiabiarchinclude_HEADERS += arch/x86/odp/api/abi/cpu_inlines.h if !ODP_ABI_COMPAT odpapiabiarchinclude_HEADERS += arch/x86/odp/api/abi/cpu.h endif -noinst_HEADERS += arch/x86/cpu_flags.h -noinst_HEADERS += arch/default/odp_cpu.h \ +noinst_HEADERS += arch/x86/cpu_flags.h \ + arch/default/odp_cpu.h \ arch/default/odp_cpu_idling.h endif diff --git a/platform/linux-generic/arch/default/odp/api/abi/cpu_inlines.h b/platform/linux-generic/arch/default/odp/api/abi/cpu_inlines.h new file mode 100644 index 00000000..f9c2bae9 --- /dev/null +++ b/platform/linux-generic/arch/default/odp/api/abi/cpu_inlines.h @@ -0,0 +1,15 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#ifndef ODP_ARCH_CPU_INLINES_H_ +#define ODP_ARCH_CPU_INLINES_H_ + +#undef odp_cpu_pause +#undef odp_cpu_cycles +#undef odp_cpu_cycles_max +#undef odp_cpu_cycles_resolution + +#endif diff --git a/platform/linux-generic/arch/x86/odp/api/abi/cpu.h b/platform/linux-generic/arch/x86/odp/api/abi/cpu.h index 523fa99e..9224af9a 100644 --- a/platform/linux-generic/arch/x86/odp/api/abi/cpu.h +++ b/platform/linux-generic/arch/x86/odp/api/abi/cpu.h @@ -13,14 +13,8 @@ extern "C" { #define ODP_CACHE_LINE_SIZE 64 -static inline void odp_cpu_pause(void) -{ -#ifdef __SSE2__ - __asm__ __volatile__ ("pause"); -#else - __asm__ __volatile__ ("rep; nop"); -#endif -} +/* Inlined functions for non-ABI compat mode */ +#include <odp/api/plat/cpu_inlines.h> #ifdef __cplusplus } diff --git a/platform/linux-generic/arch/x86/odp/api/abi/cpu_inlines.h b/platform/linux-generic/arch/x86/odp/api/abi/cpu_inlines.h new file mode 100644 index 00000000..63be3da6 --- /dev/null +++ b/platform/linux-generic/arch/x86/odp/api/abi/cpu_inlines.h @@ -0,0 +1,48 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#ifndef ODP_ARCH_CPU_INLINES_H_ +#define ODP_ARCH_CPU_INLINES_H_ + +#include <stdint.h> + +_ODP_INLINE void odp_cpu_pause(void) +{ +#ifdef __SSE2__ + __asm__ __volatile__ ("pause"); +#else + __asm__ __volatile__ ("rep; nop"); +#endif +} + +_ODP_INLINE uint64_t odp_cpu_cycles(void) +{ + union { + uint64_t tsc_64; + struct { + uint32_t lo_32; + uint32_t hi_32; + }; + } tsc; + + __asm__ __volatile__ ("rdtsc" : + "=a" (tsc.lo_32), + "=d" (tsc.hi_32) : : "memory"); + + return tsc.tsc_64; +} + +_ODP_INLINE uint64_t odp_cpu_cycles_max(void) +{ + return UINT64_MAX; +} + +_ODP_INLINE uint64_t odp_cpu_cycles_resolution(void) +{ + return 1; +} + +#endif diff --git a/platform/linux-generic/arch/x86/odp_cpu_cycles.c b/platform/linux-generic/arch/x86/odp_cpu_cycles.c index 4e50b6da..c7d97a76 100644 --- a/platform/linux-generic/arch/x86/odp_cpu_cycles.c +++ b/platform/linux-generic/arch/x86/odp_cpu_cycles.c @@ -10,33 +10,6 @@ #include <odp_init_internal.h> #include <odp_debug_internal.h> -uint64_t odp_cpu_cycles(void) -{ - union { - uint64_t tsc_64; - struct { - uint32_t lo_32; - uint32_t hi_32; - }; - } tsc; - - __asm__ __volatile__ ("rdtsc" : - "=a" (tsc.lo_32), - "=d" (tsc.hi_32) : : "memory"); - - return tsc.tsc_64; -} - -uint64_t odp_cpu_cycles_max(void) -{ - return UINT64_MAX; -} - -uint64_t odp_cpu_cycles_resolution(void) -{ - return 1; -} - int _odp_cpu_cycles_init_global(void) { if (cpu_flags_has_rdtsc() == 0) { diff --git a/platform/linux-generic/arch/x86/odp_global_time.c b/platform/linux-generic/arch/x86/odp_global_time.c index 70a1a1a7..da22d45a 100644 --- a/platform/linux-generic/arch/x86/odp_global_time.c +++ b/platform/linux-generic/arch/x86/odp_global_time.c @@ -15,6 +15,9 @@ #include <odp_debug_internal.h> #include <odp_arch_time_internal.h> +/* Inlined API functions */ +#include <odp/api/plat/cpu_inlines.h> + uint64_t cpu_global_time(void) { return odp_cpu_cycles(); diff --git a/platform/linux-generic/include/odp/api/plat/cpu_inlines.h b/platform/linux-generic/include/odp/api/plat/cpu_inlines.h new file mode 100644 index 00000000..29b6ca7a --- /dev/null +++ b/platform/linux-generic/include/odp/api/plat/cpu_inlines.h @@ -0,0 +1,27 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#ifndef ODP_PLAT_CPU_INLINES_H_ +#define ODP_PLAT_CPU_INLINES_H_ + +/** @cond _ODP_HIDE_FROM_DOXYGEN_ */ + +#ifndef _ODP_NO_INLINE + /* Inline functions by default */ + #define _ODP_INLINE static inline + #define odp_cpu_pause __odp_cpu_pause + #define odp_cpu_cycles __odp_cpu_cycles + #define odp_cpu_cycles_max __odp_cpu_cycles_max + #define odp_cpu_cycles_resolution __odp_cpu_cycles_resolution +#else + #define _ODP_INLINE +#endif + +#include <odp/api/abi/cpu_inlines.h> + +/** @endcond */ + +#endif diff --git a/platform/linux-generic/include/odp/api/plat/ticketlock_inlines.h b/platform/linux-generic/include/odp/api/plat/ticketlock_inlines.h index e84ed88e..1d944bc1 100644 --- a/platform/linux-generic/include/odp/api/plat/ticketlock_inlines.h +++ b/platform/linux-generic/include/odp/api/plat/ticketlock_inlines.h @@ -8,6 +8,7 @@ #define _ODP_PLAT_TICKETLOCK_INLINES_H_ #include <odp/api/atomic.h> +#include <odp/api/cpu.h> /** @cond _ODP_HIDE_FROM_DOXYGEN_ */ @@ -21,6 +22,7 @@ #define odp_ticketlock_is_locked __odp_ticketlock_is_locked /* Inline atomic functions */ #include <odp/api/plat/atomic_inlines.h> + #include <odp/api/plat/cpu_inlines.h> #else #undef _ODP_INLINE #define _ODP_INLINE diff --git a/platform/linux-generic/include/odp_ring_internal.h b/platform/linux-generic/include/odp_ring_internal.h index b47c41e5..8a01d461 100644 --- a/platform/linux-generic/include/odp_ring_internal.h +++ b/platform/linux-generic/include/odp_ring_internal.h @@ -15,6 +15,7 @@ extern "C" { #include <odp/api/hints.h> #include <odp_align_internal.h> #include <odp/api/plat/atomic_inlines.h> +#include <odp/api/plat/cpu_inlines.h> /* Ring empty, not a valid data value. */ #define RING_EMPTY ((uint32_t)-1) diff --git a/platform/linux-generic/odp_barrier.c b/platform/linux-generic/odp_barrier.c index ec35d0ff..132ba370 100644 --- a/platform/linux-generic/odp_barrier.c +++ b/platform/linux-generic/odp_barrier.c @@ -12,6 +12,7 @@ #include <odp/api/atomic.h> #include <odp/api/plat/atomic_inlines.h> #include <odp/api/plat/sync_inlines.h> +#include <odp/api/plat/cpu_inlines.h> void odp_barrier_init(odp_barrier_t *barrier, int count) { diff --git a/platform/linux-generic/odp_cpu_api.c b/platform/linux-generic/odp_cpu_api.c new file mode 100644 index 00000000..2e856ec2 --- /dev/null +++ b/platform/linux-generic/odp_cpu_api.c @@ -0,0 +1,13 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include "config.h" + +#include <odp/api/cpu.h> + +/* Non-inlined functions for ABI compat mode */ +#define _ODP_NO_INLINE +#include <odp/api/plat/cpu_inlines.h> diff --git a/platform/linux-generic/odp_ipsec_sad.c b/platform/linux-generic/odp_ipsec_sad.c index 061b45f3..3b1686b8 100644 --- a/platform/linux-generic/odp_ipsec_sad.c +++ b/platform/linux-generic/odp_ipsec_sad.c @@ -7,7 +7,6 @@ #include "config.h" #include <odp/api/atomic.h> -#include <odp/api/plat/atomic_inlines.h> #include <odp/api/ipsec.h> #include <odp/api/random.h> #include <odp/api/shared_memory.h> @@ -16,6 +15,9 @@ #include <odp_debug_internal.h> #include <odp_ipsec_internal.h> +#include <odp/api/plat/atomic_inlines.h> +#include <odp/api/plat/cpu_inlines.h> + #include <string.h> #define IPSEC_SA_STATE_DISABLE 0x40000000 diff --git a/platform/linux-generic/odp_rwlock.c b/platform/linux-generic/odp_rwlock.c index 3a1086d2..e027a23b 100644 --- a/platform/linux-generic/odp_rwlock.c +++ b/platform/linux-generic/odp_rwlock.c @@ -8,10 +8,12 @@ #include <stdbool.h> #include <odp/api/atomic.h> -#include <odp/api/plat/atomic_inlines.h> #include <odp/api/rwlock.h> #include <odp/api/cpu.h> +#include <odp/api/plat/atomic_inlines.h> +#include <odp/api/plat/cpu_inlines.h> + void odp_rwlock_init(odp_rwlock_t *rwlock) { odp_atomic_init_u32(&rwlock->cnt, 0); diff --git a/platform/linux-generic/odp_schedule_scalable.c b/platform/linux-generic/odp_schedule_scalable.c index 9a0dea47..ff24815c 100644 --- a/platform/linux-generic/odp_schedule_scalable.c +++ b/platform/linux-generic/odp_schedule_scalable.c @@ -25,6 +25,7 @@ #include <odp_ishmpool_internal.h> #include <odp_align_internal.h> +#include <odp/api/plat/cpu_inlines.h> #include <odp_llqueue.h> #include <odp_queue_scalable_internal.h> #include <odp_schedule_if.h> diff --git a/platform/linux-generic/odp_schedule_scalable_ordered.c b/platform/linux-generic/odp_schedule_scalable_ordered.c index 2b3feaa1..f68a559d 100644 --- a/platform/linux-generic/odp_schedule_scalable_ordered.c +++ b/platform/linux-generic/odp_schedule_scalable_ordered.c @@ -8,6 +8,7 @@ #include <config.h> #include <odp/api/shared_memory.h> +#include <odp/api/plat/cpu_inlines.h> #include <odp_queue_scalable_internal.h> #include <odp_schedule_if.h> #include <odp_bitset.h> diff --git a/platform/linux-generic/odp_spinlock.c b/platform/linux-generic/odp_spinlock.c index 2e51aabc..54b7c713 100644 --- a/platform/linux-generic/odp_spinlock.c +++ b/platform/linux-generic/odp_spinlock.c @@ -10,6 +10,8 @@ #include <odp/api/cpu.h> #include <odp_atomic_internal.h> +#include <odp/api/plat/cpu_inlines.h> + void odp_spinlock_init(odp_spinlock_t *spinlock) { _odp_atomic_flag_init(&spinlock->lock, 0); diff --git a/platform/linux-generic/pktio/ring.c b/platform/linux-generic/pktio/ring.c index 778c2fac..518d940e 100644 --- a/platform/linux-generic/pktio/ring.c +++ b/platform/linux-generic/pktio/ring.c @@ -80,6 +80,8 @@ #include <odp_packet_io_ring_internal.h> #include <odp_errno_define.h> +#include <odp/api/plat/cpu_inlines.h> + static TAILQ_HEAD(, _ring) odp_ring_list; #define RING_VAL_IS_POWER_2(x) ((((x) - 1) & (x)) == 0) commit d6e4b3df266ee1c847763ba50fa802d9e9e62b5e Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Thu May 24 14:43:38 2018 +0300 linux-gen: cpu: add cpu cycles init global Add global init function to check e.g. if CPU cycle counter instruction is available on x86. 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/arch/default/odp_cpu_cycles.c b/platform/linux-generic/arch/default/odp_cpu_cycles.c index 3e3df087..88e70b2e 100644 --- a/platform/linux-generic/arch/default/odp_cpu_cycles.c +++ b/platform/linux-generic/arch/default/odp_cpu_cycles.c @@ -13,6 +13,7 @@ #include <odp/api/cpu.h> #include <odp_debug_internal.h> +#include <odp_init_internal.h> #define GIGA 1000000000 @@ -46,3 +47,8 @@ uint64_t odp_cpu_cycles_resolution(void) { return 1; } + +int _odp_cpu_cycles_init_global(void) +{ + return 0; +} diff --git a/platform/linux-generic/arch/mips64/odp_cpu_cycles.c b/platform/linux-generic/arch/mips64/odp_cpu_cycles.c index 26b92878..72a0e5b0 100644 --- a/platform/linux-generic/arch/mips64/odp_cpu_cycles.c +++ b/platform/linux-generic/arch/mips64/odp_cpu_cycles.c @@ -9,6 +9,7 @@ #include <odp/api/cpu.h> #include <odp/api/hints.h> #include <odp/api/system_info.h> +#include <odp_init_internal.h> uint64_t odp_cpu_cycles(void) { @@ -31,3 +32,8 @@ uint64_t odp_cpu_cycles_resolution(void) { return 1; } + +int _odp_cpu_cycles_init_global(void) +{ + return 0; +} diff --git a/platform/linux-generic/arch/x86/cpu_flags.c b/platform/linux-generic/arch/x86/cpu_flags.c index 0fcaa477..f5a744fd 100644 --- a/platform/linux-generic/arch/x86/cpu_flags.c +++ b/platform/linux-generic/arch/x86/cpu_flags.c @@ -368,3 +368,11 @@ int cpu_has_global_time(void) return 0; } + +int cpu_flags_has_rdtsc(void) +{ + if (cpu_get_flag_enabled(RTE_CPUFLAG_TSC) > 0) + return 1; + + return 0; +} diff --git a/platform/linux-generic/arch/x86/cpu_flags.h b/platform/linux-generic/arch/x86/cpu_flags.h index b0d26888..879c9aad 100644 --- a/platform/linux-generic/arch/x86/cpu_flags.h +++ b/platform/linux-generic/arch/x86/cpu_flags.h @@ -12,6 +12,7 @@ extern "C" { #endif void cpu_flags_print_all(void); +int cpu_flags_has_rdtsc(void); #ifdef __cplusplus } diff --git a/platform/linux-generic/arch/x86/odp_cpu_cycles.c b/platform/linux-generic/arch/x86/odp_cpu_cycles.c index 12af1c17..4e50b6da 100644 --- a/platform/linux-generic/arch/x86/odp_cpu_cycles.c +++ b/platform/linux-generic/arch/x86/odp_cpu_cycles.c @@ -6,6 +6,10 @@ #include <odp/api/cpu.h> +#include "cpu_flags.h" +#include <odp_init_internal.h> +#include <odp_debug_internal.h> + uint64_t odp_cpu_cycles(void) { union { @@ -32,3 +36,13 @@ uint64_t odp_cpu_cycles_resolution(void) { return 1; } + +int _odp_cpu_cycles_init_global(void) +{ + if (cpu_flags_has_rdtsc() == 0) { + ODP_ERR("RDTSC instruction not supported\n"); + return -1; + } + + return 0; +} diff --git a/platform/linux-generic/include/odp_init_internal.h b/platform/linux-generic/include/odp_init_internal.h index 86438938..3619d777 100644 --- a/platform/linux-generic/include/odp_init_internal.h +++ b/platform/linux-generic/include/odp_init_internal.h @@ -81,6 +81,8 @@ int _odp_ipsec_sad_term_global(void); int _odp_ipsec_events_init_global(void); int _odp_ipsec_events_term_global(void); +int _odp_cpu_cycles_init_global(void); + #ifdef __cplusplus } #endif diff --git a/platform/linux-generic/odp_init.c b/platform/linux-generic/odp_init.c index 7de3d689..b2b75f12 100644 --- a/platform/linux-generic/odp_init.c +++ b/platform/linux-generic/odp_init.c @@ -21,6 +21,7 @@ enum init_stage { NO_INIT = 0, /* No init stages completed */ LIBCONFIG_INIT, CPUMASK_INIT, + CPU_CYCLES_INIT, TIME_INIT, SYSINFO_INIT, ISHM_INIT, @@ -173,6 +174,8 @@ static int term_global(enum init_stage stage) } /* Fall through */ + case CPU_CYCLES_INIT: + /* Fall through */ case CPUMASK_INIT: if (odp_cpumask_term_global()) { ODP_ERR("ODP cpumask term failed.\n"); @@ -224,6 +227,12 @@ int odp_init_global(odp_instance_t *instance, } stage = CPUMASK_INIT; + if (_odp_cpu_cycles_init_global()) { + ODP_ERR("ODP cpu cycle init failed.\n"); + goto init_failed; + } + stage = CPU_CYCLES_INIT; + if (odp_time_init_global()) { ODP_ERR("ODP time init failed.\n"); goto init_failed; commit bdc44eae6bac8aed26170d21cf05fe99ba9d84d6 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Thu May 24 11:41:30 2018 +0300 linux-gen: init: split odp_internal.h odp_internal.h contained code for three different purposes. Split file into three different headers, so that it's no more a place for random type/function prototype additions. New files are: * odp_init_internal.h which holds global/local init function prototypes * odp_global_data.h which defines global data structure * odp_sysinfo_internal.h which contains system info internal function prototypes 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/Makefile.am b/platform/linux-generic/Makefile.am index fb212950..6269e578 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -91,7 +91,8 @@ noinst_HEADERS = \ include/odp_errno_define.h \ include/odp_fdserver_internal.h \ include/odp_forward_typedefs_internal.h \ - include/odp_internal.h \ + include/odp_global_data.h \ + include/odp_init_internal.h \ include/odp_ipsec_internal.h \ include/odp_ishm_internal.h \ include/odp_ishmphy_internal.h \ @@ -125,6 +126,7 @@ noinst_HEADERS = \ include/odp_schedule_scalable_ordered.h \ include/odp_shm_internal.h \ include/odp_sorted_list_internal.h \ + include/odp_sysinfo_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/default/odp_sysinfo_parse.c b/platform/linux-generic/arch/default/odp_sysinfo_parse.c index f1bad96c..49e94029 100644 --- a/platform/linux-generic/arch/default/odp_sysinfo_parse.c +++ b/platform/linux-generic/arch/default/odp_sysinfo_parse.c @@ -6,7 +6,7 @@ #include "config.h" -#include <odp_internal.h> +#include <odp_sysinfo_internal.h> #include <odp_debug_internal.h> #include <string.h> diff --git a/platform/linux-generic/arch/mips64/odp_sysinfo_parse.c b/platform/linux-generic/arch/mips64/odp_sysinfo_parse.c index fe600c55..339c6749 100644 --- a/platform/linux-generic/arch/mips64/odp_sysinfo_parse.c +++ b/platform/linux-generic/arch/mips64/odp_sysinfo_parse.c @@ -6,7 +6,7 @@ #include "config.h" -#include <odp_internal.h> +#include <odp_sysinfo_internal.h> #include <string.h> int cpuinfo_parser(FILE *file, system_info_t *sysinfo) diff --git a/platform/linux-generic/arch/powerpc/odp_sysinfo_parse.c b/platform/linux-generic/arch/powerpc/odp_sysinfo_parse.c index fd265920..810f3758 100644 --- a/platform/linux-generic/arch/powerpc/odp_sysinfo_parse.c +++ b/platform/linux-generic/arch/powerpc/odp_sysinfo_parse.c @@ -6,7 +6,7 @@ #include "config.h" -#include <odp_internal.h> +#include <odp_sysinfo_internal.h> #include <string.h> int cpuinfo_parser(FILE *file, system_info_t *sysinfo) diff --git a/platform/linux-generic/arch/x86/odp_sysinfo_parse.c b/platform/linux-generic/arch/x86/odp_sysinfo_parse.c index b334a276..d9f3a82d 100644 --- a/platform/linux-generic/arch/x86/odp_sysinfo_parse.c +++ b/platform/linux-generic/arch/x86/odp_sysinfo_parse.c @@ -6,7 +6,7 @@ #include "config.h" -#include <odp_internal.h> +#include <odp_sysinfo_internal.h> #include "cpu_flags.h" #include <string.h> diff --git a/platform/linux-generic/include/odp_debug_internal.h b/platform/linux-generic/include/odp_debug_internal.h index 58054e9e..2e92dd74 100644 --- a/platform/linux-generic/include/odp_debug_internal.h +++ b/platform/linux-generic/include/odp_debug_internal.h @@ -19,7 +19,7 @@ #include <stdio.h> #include <stdlib.h> #include <odp/api/debug.h> -#include <odp_internal.h> +#include <odp_global_data.h> #ifdef __cplusplus extern "C" { #endif diff --git a/platform/linux-generic/include/odp_global_data.h b/platform/linux-generic/include/odp_global_data.h new file mode 100644 index 00000000..a5c2abd1 --- /dev/null +++ b/platform/linux-generic/include/odp_global_data.h @@ -0,0 +1,68 @@ +/* Copyright (c) 2013-2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#ifndef ODP_GLOBAL_DATA_H_ +#define ODP_GLOBAL_DATA_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#include <odp/api/init.h> +#include <odp/api/cpumask.h> +#include <sys/types.h> +#include <pthread.h> +#include <stdint.h> +#include <libconfig.h> + +#define MAX_CPU_NUMBER 128 +#define UID_MAXLEN 30 + +typedef struct { + uint64_t cpu_hz_max[MAX_CPU_NUMBER]; + uint64_t page_size; + int cache_line_size; + int cpu_count; + char cpu_arch_str[128]; + char model_str[MAX_CPU_NUMBER][128]; +} system_info_t; + +typedef struct { + uint64_t default_huge_page_size; + char *default_huge_page_dir; +} hugepage_info_t; + +struct odp_global_data_s { + /* directory for odp mmaped files */ + char *shm_dir; + /* overload default with env */ + int shm_dir_from_env; + uint64_t shm_max_memory; + uint64_t shm_max_size; + pid_t main_pid; + char uid[UID_MAXLEN]; + odp_log_func_t log_fn; + odp_abort_func_t abort_fn; + system_info_t system_info; + hugepage_info_t hugepage_info; + odp_cpumask_t control_cpus; + odp_cpumask_t worker_cpus; + int num_cpus_installed; + config_t libconfig_default; + config_t libconfig_runtime; + int inotify_pcapng_fd; + int inotify_watch_fd; + pthread_t inotify_thread; + int inotify_pcapng_is_running; +}; + +extern struct odp_global_data_s odp_global_data; + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/platform/linux-generic/include/odp_internal.h b/platform/linux-generic/include/odp_init_internal.h similarity index 57% rename from platform/linux-generic/include/odp_internal.h rename to platform/linux-generic/include/odp_init_internal.h index 9695e77e..86438938 100644 --- a/platform/linux-generic/include/odp_internal.h +++ b/platform/linux-generic/include/odp_init_internal.h @@ -4,68 +4,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ -/** - * @file - * - * ODP HW system information - */ - -#ifndef ODP_INTERNAL_H_ -#define ODP_INTERNAL_H_ +#ifndef ODP_INIT_INTERNAL_H_ +#define ODP_INIT_INTERNAL_H_ #ifdef __cplusplus extern "C" { #endif #include <odp/api/init.h> -#include <odp/api/cpumask.h> #include <odp/api/thread.h> -#include <odp_errno_define.h> -#include <stdio.h> -#include <sys/types.h> -#include <libconfig.h> -#include <pthread.h> - -#define MAX_CPU_NUMBER 128 -#define UID_MAXLEN 30 - -typedef struct { - uint64_t cpu_hz_max[MAX_CPU_NUMBER]; - uint64_t page_size; - int cache_line_size; - int cpu_count; - char cpu_arch_str[128]; - char model_str[MAX_CPU_NUMBER][128]; -} system_info_t; - -typedef struct { - uint64_t default_huge_page_size; - char *default_huge_page_dir; -} hugepage_info_t; - -struct odp_global_data_s { - char *shm_dir; /*< directory for odp mmaped files */ - int shm_dir_from_env; /*< overload default with env */ - uint64_t shm_max_memory; - uint64_t shm_max_size; - pid_t main_pid; - char uid[UID_MAXLEN]; - odp_log_func_t log_fn; - odp_abort_func_t abort_fn; - system_info_t system_info; - hugepage_info_t hugepage_info; - odp_cpumask_t control_cpus; - odp_cpumask_t worker_cpus; - int num_cpus_installed; - config_t libconfig_default; - config_t libconfig_runtime; - int inotify_pcapng_fd; - int inotify_watch_fd; - pthread_t inotify_thread; - int inotify_pcapng_is_running; -}; - -extern struct odp_global_data_s odp_global_data; int odp_cpumask_init_global(const odp_init_t *params); int odp_cpumask_term_global(void); @@ -134,12 +81,6 @@ int _odp_ipsec_sad_term_global(void); int _odp_ipsec_events_init_global(void); int _odp_ipsec_events_term_global(void); -int cpuinfo_parser(FILE *file, system_info_t *sysinfo); -uint64_t odp_cpufreq_id(const char *filename, int id); -uint64_t odp_cpu_hz_current(int id); -uint64_t odp_cpu_arch_hz_current(int id); -void sys_info_print_arch(void); - #ifdef __cplusplus } #endif diff --git a/platform/linux-generic/include/odp_packet_io_ipc_internal.h b/platform/linux-generic/include/odp_packet_io_ipc_internal.h index 2af9bb34..01410dab 100644 --- a/platform/linux-generic/include/odp_packet_io_ipc_internal.h +++ b/platform/linux-generic/include/odp_packet_io_ipc_internal.h @@ -8,7 +8,6 @@ #include <odp_packet_io_internal.h> #include <odp/api/packet.h> #include <odp_packet_internal.h> -#include <odp_internal.h> #include <odp/api/shared_memory.h> #include <string.h> diff --git a/platform/linux-generic/include/odp_schedule_scalable_ordered.h b/platform/linux-generic/include/odp_schedule_scalable_ordered.h index 17d4f7ea..7e1984f6 100644 --- a/platform/linux-generic/include/odp_schedule_scalable_ordered.h +++ b/platform/linux-generic/include/odp_schedule_scalable_ordered.h @@ -11,7 +11,6 @@ #include <odp/api/shared_memory.h> -#include <odp_internal.h> #include <odp_align_internal.h> #include <odp_bitset.h> #include <odp_ishmpool_internal.h> diff --git a/platform/linux-generic/include/odp_sysinfo_internal.h b/platform/linux-generic/include/odp_sysinfo_internal.h new file mode 100644 index 00000000..d34087e2 --- /dev/null +++ b/platform/linux-generic/include/odp_sysinfo_internal.h @@ -0,0 +1,26 @@ +/* Copyright (c) 2013-2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#ifndef ODP_SYSINFO_INTERNAL_H_ +#define ODP_SYSINFO_INTERNAL_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#include <odp_global_data.h> + +int cpuinfo_parser(FILE *file, system_info_t *sysinfo); +uint64_t odp_cpufreq_id(const char *filename, int id); +uint64_t odp_cpu_hz_current(int id); +uint64_t odp_cpu_arch_hz_current(int id); +void sys_info_print_arch(void); + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/platform/linux-generic/include/odp_traffic_mngr_internal.h b/platform/linux-generic/include/odp_traffic_mngr_internal.h index e4a7dc29..aab6b911 100644 --- a/platform/linux-generic/include/odp_traffic_mngr_internal.h +++ b/platform/linux-generic/include/odp_traffic_mngr_internal.h @@ -26,7 +26,6 @@ extern "C" { #include <odp_timer_wheel_internal.h> #include <odp_pkt_queue_internal.h> #include <odp_sorted_list_internal.h> -#include <odp_internal.h> #include <odp_debug_internal.h> #include <odp_buffer_internal.h> #include <odp_queue_if.h> diff --git a/platform/linux-generic/odp_classification.c b/platform/linux-generic/odp_classification.c index 8b25cf4c..6e493bcd 100644 --- a/platform/linux-generic/odp_classification.c +++ b/platform/linux-generic/odp_classification.c @@ -10,7 +10,7 @@ #include <odp/api/align.h> #include <odp/api/queue.h> #include <odp/api/debug.h> -#include <odp_internal.h> +#include <odp_init_internal.h> #include <odp_debug_internal.h> #include <odp_packet_internal.h> #include <odp/api/packet_io.h> diff --git a/platform/linux-generic/odp_cpumask.c b/platform/linux-generic/odp_cpumask.c index 71f7d071..1b384d4e 100644 --- a/platform/linux-generic/odp_cpumask.c +++ b/platform/linux-generic/odp_cpumask.c @@ -14,6 +14,8 @@ #include <odp/api/cpumask.h> #include <odp/api/init.h> #include <odp_debug_internal.h> +#include <odp_global_data.h> +#include <odp_init_internal.h> #include <stdlib.h> #include <string.h> diff --git a/platform/linux-generic/odp_crypto.c b/platform/linux-generic/odp_crypto.c index 967b0bfd..8473bf5a 100644 --- a/platform/linux-generic/odp_crypto.c +++ b/platform/linux-generic/odp_crypto.c @@ -8,7 +8,7 @@ #include <odp_posix_extensions.h> #include <odp/api/crypto.h> -#include <odp_internal.h> +#include <odp_init_internal.h> #include <odp/api/spinlock.h> #include <odp/api/sync.h> #include <odp/api/debug.h> diff --git a/platform/linux-generic/odp_errno.c b/platform/linux-generic/odp_errno.c index d3b76654..071ca606 100644 --- a/platform/linux-generic/odp_errno.c +++ b/platform/linux-generic/odp_errno.c @@ -7,7 +7,6 @@ #include "config.h" #include <odp/api/errno.h> -#include <odp_internal.h> #include <string.h> #include <stdio.h> #include <odp_debug_internal.h> diff --git a/platform/linux-generic/odp_fdserver.c b/platform/linux-generic/odp_fdserver.c index 4b6fd088..0c9cc50e 100644 --- a/platform/linux-generic/odp_fdserver.c +++ b/platform/linux-generic/odp_fdserver.c @@ -39,7 +39,8 @@ */ #include <odp_posix_extensions.h> -#include <odp_internal.h> +#include <odp_global_data.h> +#include <odp_init_internal.h> #include <odp_debug_internal.h> #include <odp_fdserver_internal.h> #include <sys/prctl.h> diff --git a/platform/linux-generic/odp_init.c b/platform/linux-generic/odp_init.c index 60908f09..7de3d689 100644 --- a/platform/linux-generic/odp_init.c +++ b/platform/linux-generic/odp_init.c @@ -6,23 +6,16 @@ #include "config.h" +#include <odp_posix_extensions.h> + #include <odp/api/init.h> #include <odp_debug_internal.h> -#include <odp/api/debug.h> -#include <unistd.h> -#include <odp_internal.h> +#include <odp_init_internal.h> #include <odp_schedule_if.h> #include <odp_libconfig_internal.h> #include <string.h> #include <stdio.h> -#include <linux/limits.h> -#include <dirent.h> #include <unistd.h> -#include <string.h> -#include <stdlib.h> -#include <errno.h> -#include <sys/types.h> -#include <pwd.h> enum init_stage { NO_INIT = 0, /* No init stages completed */ diff --git a/platform/linux-generic/odp_ipsec.c b/platform/linux-generic/odp_ipsec.c index a72dee33..71258fe9 100644 --- a/platform/linux-generic/odp_ipsec.c +++ b/platform/linux-generic/odp_ipsec.c @@ -13,6 +13,7 @@ #include <odp/api/byteorder.h> #include <odp/api/plat/byteorder_inlines.h> +#include <odp_init_internal.h> #include <odp_debug_internal.h> #include <odp_packet_internal.h> #include <odp_ipsec_internal.h> diff --git a/platform/linux-generic/odp_ipsec_events.c b/platform/linux-generic/odp_ipsec_events.c index 247e9f8b..e3977649 100644 --- a/platform/linux-generic/odp_ipsec_events.c +++ b/platform/linux-generic/odp_ipsec_events.c @@ -9,6 +9,7 @@ #include <odp/api/ipsec.h> #include <odp/api/shared_memory.h> +#include <odp_init_internal.h> #include <odp_buffer_internal.h> #include <odp_debug_internal.h> #include <odp_ipsec_internal.h> diff --git a/platform/linux-generic/odp_ipsec_sad.c b/platform/linux-generic/odp_ipsec_sad.c index eea4ceb2..061b45f3 100644 --- a/platform/linux-generic/odp_ipsec_sad.c +++ b/platform/linux-generic/odp_ipsec_sad.c @@ -12,6 +12,7 @@ #include <odp/api/random.h> #include <odp/api/shared_memory.h> +#include <odp_init_internal.h> #include <odp_debug_internal.h> #include <odp_ipsec_internal.h> diff --git a/platform/linux-generic/odp_ishm.c b/platform/linux-generic/odp_ishm.c index cf4ec9cf..fc2f948c 100644 --- a/platform/linux-generic/odp_ishm.c +++ b/platform/linux-generic/odp_ishm.c @@ -49,11 +49,13 @@ */ #include <odp_posix_extensions.h> #include <odp_config_internal.h> -#include <odp_internal.h> +#include <odp_global_data.h> #include <odp/api/spinlock.h> #include <odp/api/align.h> #include <odp/api/system_info.h> #include <odp/api/debug.h> +#include <odp_init_internal.h> +#include <odp_errno_define.h> #include <odp_shm_internal.h> #include <odp_debug_internal.h> #include <odp_align_internal.h> diff --git a/platform/linux-generic/odp_ishmphy.c b/platform/linux-generic/odp_ishmphy.c index 6207ce75..cc547a1c 100644 --- a/platform/linux-generic/odp_ishmphy.c +++ b/platform/linux-generic/odp_ishmphy.c @@ -12,7 +12,6 @@ */ #include <odp_posix_extensions.h> #include <odp_config_internal.h> -#include <odp_internal.h> #include <odp/api/align.h> #include <odp/api/system_info.h> #include <odp/api/debug.h> diff --git a/platform/linux-generic/odp_ishmpool.c b/platform/linux-generic/odp_ishmpool.c index 04a0e535..46865371 100644 --- a/platform/linux-generic/odp_ishmpool.c +++ b/platform/linux-generic/odp_ishmpool.c @@ -44,7 +44,6 @@ #include "config.h" #include <odp_posix_extensions.h> -#include <odp_internal.h> #include <odp/api/spinlock.h> #include <odp/api/align.h> #include <odp/api/debug.h> diff --git a/platform/linux-generic/odp_libconfig.c b/platform/linux-generic/odp_libconfig.c index 316ed067..e0e99550 100644 --- a/platform/linux-generic/odp_libconfig.c +++ b/platform/linux-generic/odp_libconfig.c @@ -11,13 +11,11 @@ #include <libconfig.h> #include <odp/api/version.h> -#include <odp_internal.h> +#include <odp_global_data.h> #include <odp_debug_internal.h> #include <odp_libconfig_internal.h> #include <odp_libconfig_config.h> -extern struct odp_global_data_s odp_global_data; - int _odp_libconfig_init_global(void) { const char *filename; diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index e3204f88..11f8bd43 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -10,6 +10,7 @@ #include <odp/api/plat/packet_inlines.h> #include <odp_packet_internal.h> #include <odp_debug_internal.h> +#include <odp_errno_define.h> #include <odp/api/hints.h> #include <odp/api/byteorder.h> #include <odp/api/plat/byteorder_inlines.h> diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c index 8a5da105..81262a17 100644 --- a/platform/linux-generic/odp_packet_io.c +++ b/platform/linux-generic/odp_packet_io.c @@ -14,7 +14,8 @@ #include <odp/api/packet.h> #include <odp/api/plat/packet_inlines.h> #include <odp_packet_internal.h> -#include <odp_internal.h> +#include <odp_init_internal.h> +#include <odp_errno_define.h> #include <odp/api/spinlock.h> #include <odp/api/ticketlock.h> #include <odp/api/shared_memory.h> diff --git a/platform/linux-generic/odp_pool.c b/platform/linux-generic/odp_pool.c index 32c41427..01ee9234 100644 --- a/platform/linux-generic/odp_pool.c +++ b/platform/linux-generic/odp_pool.c @@ -14,7 +14,7 @@ #include <odp/api/plat/thread_inlines.h> #include <odp_pool_internal.h> -#include <odp_internal.h> +#include <odp_init_internal.h> #include <odp_packet_internal.h> #include <odp_config_internal.h> #include <odp_debug_internal.h> diff --git a/platform/linux-generic/odp_queue_basic.c b/platform/linux-generic/odp_queue_basic.c index 4b4434c2..572441d0 100644 --- a/platform/linux-generic/odp_queue_basic.c +++ b/platform/linux-generic/odp_queue_basic.c @@ -14,7 +14,7 @@ #include <odp/api/buffer.h> #include <odp_buffer_internal.h> #include <odp_pool_internal.h> -#include <odp_internal.h> +#include <odp_init_internal.h> #include <odp/api/shared_memory.h> #include <odp/api/schedule.h> #include <odp_schedule_if.h> diff --git a/platform/linux-generic/odp_queue_if.c b/platform/linux-generic/odp_queue_if.c index 08076ab3..912251b7 100644 --- a/platform/linux-generic/odp_queue_if.c +++ b/platform/linux-generic/odp_queue_if.c @@ -7,7 +7,7 @@ #include "config.h" #include <odp_queue_if.h> -#include <odp_internal.h> +#include <odp_init_internal.h> #include <odp_debug_internal.h> #include <stdlib.h> diff --git a/platform/linux-generic/odp_queue_scalable.c b/platform/linux-generic/odp_queue_scalable.c index 56ea98bc..578e6d22 100644 --- a/platform/linux-generic/odp_queue_scalable.c +++ b/platform/linux-generic/odp_queue_scalable.c @@ -17,7 +17,6 @@ #include <odp/api/plat/sync_inlines.h> #include <odp/api/traffic_mngr.h> -#include <odp_internal.h> #include <odp_config_internal.h> #include <odp_debug_internal.h> diff --git a/platform/linux-generic/odp_random.c b/platform/linux-generic/odp_random.c index 22894c47..424243c2 100644 --- a/platform/linux-generic/odp_random.c +++ b/platform/linux-generic/odp_random.c @@ -7,7 +7,7 @@ #include "config.h" #include <odp_posix_extensions.h> -#include <odp_internal.h> +#include <stdint.h> #include <odp/api/random.h> #include <openssl/rand.h> diff --git a/platform/linux-generic/odp_schedule_basic.c b/platform/linux-generic/odp_schedule_basic.c index f35c7b02..ca291d15 100644 --- a/platform/linux-generic/odp_schedule_basic.c +++ b/platform/linux-generic/odp_schedule_basic.c @@ -11,7 +11,6 @@ #include <odp_schedule_if.h> #include <odp/api/align.h> #include <odp/api/shared_memory.h> -#include <odp_internal.h> #include <odp_debug_internal.h> #include <odp/api/thread.h> #include <odp/api/plat/thread_inlines.h> diff --git a/platform/linux-generic/odp_schedule_if.c b/platform/linux-generic/odp_schedule_if.c index 08520852..df1ee2c2 100644 --- a/platform/linux-generic/odp_schedule_if.c +++ b/platform/linux-generic/odp_schedule_if.c @@ -7,7 +7,7 @@ #include "config.h" #include <odp_schedule_if.h> -#include <odp_internal.h> +#include <odp_init_internal.h> #include <odp_debug_internal.h> #include <stdlib.h> diff --git a/platform/linux-generic/odp_schedule_iquery.c b/platform/linux-generic/odp_schedule_iquery.c index a019157e..b8d7e3b5 100644 --- a/platform/linux-generic/odp_schedule_iquery.c +++ b/platform/linux-generic/odp_schedule_iquery.c @@ -11,7 +11,6 @@ #include <odp/api/align.h> #include <odp/api/queue.h> #include <odp/api/shared_memory.h> -#include <odp_internal.h> #include <odp_debug_internal.h> #include <odp_ring_internal.h> #include <odp_buffer_internal.h> diff --git a/platform/linux-generic/odp_schedule_scalable.c b/platform/linux-generic/odp_schedule_scalable.c index 1dbcb529..9a0dea47 100644 --- a/platform/linux-generic/odp_schedule_scalable.c +++ b/platform/linux-generic/odp_schedule_scalable.c @@ -19,7 +19,6 @@ #include <odp/api/thrmask.h> #include <odp/api/time.h> -#include <odp_internal.h> #include <odp_config_internal.h> #include <odp_debug_internal.h> #include <odp_ishm_internal.h> diff --git a/platform/linux-generic/odp_shared_memory.c b/platform/linux-generic/odp_shared_memory.c index edf261af..7bd323c9 100644 --- a/platform/linux-generic/odp_shared_memory.c +++ b/platform/linux-generic/odp_shared_memory.c @@ -12,7 +12,8 @@ #include <odp/api/shared_memory.h> #include <odp/api/plat/strong_types.h> #include <odp_ishm_internal.h> -#include <odp_internal.h> +#include <odp_init_internal.h> +#include <odp_global_data.h> #include <string.h> ODP_STATIC_ASSERT(ODP_CONFIG_SHM_BLOCKS >= ODP_CONFIG_POOLS, diff --git a/platform/linux-generic/odp_system_info.c b/platform/linux-generic/odp_system_info.c index d1cda1ea..8b2bfc5c 100644 --- a/platform/linux-generic/odp_system_info.c +++ b/platform/linux-generic/odp_system_info.c @@ -17,7 +17,9 @@ #include <odp/api/system_info.h> #include <odp/api/version.h> -#include <odp_internal.h> +#include <odp_global_data.h> +#include <odp_sysinfo_internal.h> +#include <odp_init_internal.h> #include <odp_debug_internal.h> #include <odp/api/align.h> #include <odp/api/cpu.h> diff --git a/platform/linux-generic/odp_thread.c b/platform/linux-generic/odp_thread.c index 998bad7c..a5f62ec7 100644 --- a/platform/linux-generic/odp_thread.c +++ b/platform/linux-generic/odp_thread.c @@ -11,8 +11,8 @@ #include <sched.h> #include <odp/api/thread.h> #include <odp/api/thrmask.h> -#include <odp_internal.h> #include <odp/api/spinlock.h> +#include <odp_init_internal.h> #include <odp_config_internal.h> #include <odp_debug_internal.h> #include <odp/api/shared_memory.h> diff --git a/platform/linux-generic/odp_time.c b/platform/linux-generic/odp_time.c index cfb4ac4a..96308edc 100644 --- a/platform/linux-generic/odp_time.c +++ b/platform/linux-generic/odp_time.c @@ -12,6 +12,7 @@ #include <odp/api/time.h> #include <odp/api/hints.h> #include <odp_debug_internal.h> +#include <odp_init_internal.h> #include <odp_arch_time_internal.h> #include <string.h> #include <inttypes.h> diff --git a/platform/linux-generic/odp_timer.c b/platform/linux-generic/odp_timer.c index 9085f1bb..f46aa6e8 100644 --- a/platform/linux-generic/odp_timer.c +++ b/platform/linux-generic/odp_timer.c @@ -45,7 +45,8 @@ #include <odp_debug_internal.h> #include <odp/api/event.h> #include <odp/api/hints.h> -#include <odp_internal.h> +#include <odp_init_internal.h> +#include <odp_errno_define.h> #include <odp/api/queue.h> #include <odp/api/shared_memory.h> #include <odp/api/spinlock.h> diff --git a/platform/linux-generic/odp_traffic_mngr.c b/platform/linux-generic/odp_traffic_mngr.c index f851a7b0..eeb1ea96 100644 --- a/platform/linux-generic/odp_traffic_mngr.c +++ b/platform/linux-generic/odp_traffic_mngr.c @@ -29,6 +29,8 @@ #include <odp/api/plat/packet_inlines.h> #include <odp/api/plat/byteorder_inlines.h> #include <odp_macros_internal.h> +#include <odp_init_internal.h> +#include <odp_errno_define.h> /* Local vars */ static const diff --git a/platform/linux-generic/odp_weak.c b/platform/linux-generic/odp_weak.c index 6977ef10..6632707f 100644 --- a/platform/linux-generic/odp_weak.c +++ b/platform/linux-generic/odp_weak.c @@ -6,7 +6,6 @@ #include "config.h" -#include <odp_internal.h> #include <odp/api/debug.h> #include <odp_debug_internal.h> #include <odp/api/hints.h> diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c index 1ecd7d58..803c514f 100644 --- a/platform/linux-generic/pktio/dpdk.c +++ b/platform/linux-generic/pktio/dpdk.c @@ -25,6 +25,7 @@ #include <odp_packet_dpdk.h> #include <odp_debug_internal.h> #include <odp_libconfig_internal.h> +#include <odp_errno_define.h> #include <protocols/eth.h> #include <protocols/udp.h> diff --git a/platform/linux-generic/pktio/ethtool.c b/platform/linux-generic/pktio/ethtool.c index 71651abf..784e8c3c 100644 --- a/platform/linux-generic/pktio/ethtool.c +++ b/platform/linux-generic/pktio/ethtool.c @@ -19,6 +19,7 @@ #include <odp_api.h> #include <odp_packet_socket.h> #include <odp_debug_internal.h> +#include <odp_errno_define.h> static struct ethtool_gstrings *get_stringset(int fd, struct ifreq *ifr) { diff --git a/platform/linux-generic/pktio/loop.c b/platform/linux-generic/pktio/loop.c index 5e30447f..18fecf88 100644 --- a/platform/linux-generic/pktio/loop.c +++ b/platform/linux-generic/pktio/loop.c @@ -13,6 +13,7 @@ #include <odp_classification_internal.h> #include <odp_ipsec_internal.h> #include <odp_debug_internal.h> +#include <odp_errno_define.h> #include <odp/api/plat/packet_flag_inlines.h> #include <odp/api/hints.h> #include <odp/api/plat/byteorder_inlines.h> diff --git a/platform/linux-generic/pktio/netmap.c b/platform/linux-generic/pktio/netmap.c index 45f717d5..6cabf0ea 100644 --- a/platform/linux-generic/pktio/netmap.c +++ b/platform/linux-generic/pktio/netmap.c @@ -17,6 +17,7 @@ #include <odp_packet_netmap.h> #include <odp_packet_socket.h> #include <odp_debug_internal.h> +#include <odp_errno_define.h> #include <protocols/eth.h> #include <sys/ioctl.h> diff --git a/platform/linux-generic/pktio/ring.c b/platform/linux-generic/pktio/ring.c index db6eb226..778c2fac 100644 --- a/platform/linux-generic/pktio/ring.c +++ b/platform/linux-generic/pktio/ring.c @@ -78,7 +78,7 @@ #include <stdbool.h> #include <inttypes.h> #include <odp_packet_io_ring_internal.h> -#include <odp_internal.h> +#include <odp_errno_define.h> static TAILQ_HEAD(, _ring) odp_ring_list; diff --git a/platform/linux-generic/pktio/socket.c b/platform/linux-generic/pktio/socket.c index d7753850..5be240ec 100644 --- a/platform/linux-generic/pktio/socket.c +++ b/platform/linux-generic/pktio/socket.c @@ -40,6 +40,7 @@ #include <odp_packet_io_internal.h> #include <odp_align_internal.h> #include <odp_debug_internal.h> +#include <odp_errno_define.h> #include <odp_classification_datamodel.h> #include <odp_classification_inlines.h> #include <odp_classification_internal.h> diff --git a/platform/linux-generic/pktio/socket_mmap.c b/platform/linux-generic/pktio/socket_mmap.c index 55fb20f4..eff22a7b 100644 --- a/platform/linux-generic/pktio/socket_mmap.c +++ b/platform/linux-generic/pktio/socket_mmap.c @@ -31,6 +31,7 @@ #include <odp_packet_internal.h> #include <odp_packet_io_internal.h> #include <odp_debug_internal.h> +#include <odp_errno_define.h> #include <odp_classification_datamodel.h> #include <odp_classification_inlines.h> #include <odp_classification_internal.h> diff --git a/platform/linux-generic/pktio/sysfs.c b/platform/linux-generic/pktio/sysfs.c index ec2bb949..c85a88e5 100644 --- a/platform/linux-generic/pktio/sysfs.c +++ b/platform/linux-generic/pktio/sysfs.c @@ -8,6 +8,7 @@ #include <odp_api.h> #include <odp_packet_io_internal.h> +#include <odp_errno_define.h> #include <errno.h> #include <string.h> #include <inttypes.h> diff --git a/platform/linux-generic/pktio/tap.c b/platform/linux-generic/pktio/tap.c index 032a8ecf..a3587f10 100644 --- a/platform/linux-generic/pktio/tap.c +++ b/platform/linux-generic/pktio/tap.c @@ -47,6 +47,7 @@ #include <odp_packet_internal.h> #include <odp_packet_io_internal.h> #include <odp_classification_internal.h> +#include <odp_errno_define.h> #define BUF_SIZE 65536 diff --git a/platform/linux-generic/test/ring/ring_basic.c b/platform/linux-generic/test/ring/ring_basic.c index 553e82b5..87fb18c3 100644 --- a/platform/linux-generic/test/ring/ring_basic.c +++ b/platform/linux-generic/test/ring/ring_basic.c @@ -19,6 +19,7 @@ #include <test_debug.h> #include <odp_cunit_common.h> #include <odp_packet_io_ring_internal.h> +#include <odp_errno_define.h> #include "ring_suites.h" commit 170e93051d25ac491811f1ed66cd5552a0b26ec8 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Thu May 24 10:13:42 2018 +0300 linux-gen: init: remove init.c internal types from header Moved types from header into c file. Changed internal functions to static and changed order of functions (prototypes not needed). 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_internal.h b/platform/linux-generic/include/odp_internal.h index f39b6152..9695e77e 100644 --- a/platform/linux-generic/include/odp_internal.h +++ b/platform/linux-generic/include/odp_internal.h @@ -65,35 +65,8 @@ struct odp_global_data_s { int inotify_pcapng_is_running; }; -enum init_stage { - NO_INIT = 0, /* No init stages completed */ - LIBCONFIG_INIT, - CPUMASK_INIT, - TIME_INIT, - SYSINFO_INIT, - ISHM_INIT, - FDSERVER_INIT, - THREAD_INIT, - POOL_INIT, - QUEUE_INIT, - SCHED_INIT, - PKTIO_INIT, - TIMER_INIT, - CRYPTO_INIT, - CLASSIFICATION_INIT, - TRAFFIC_MNGR_INIT, - NAME_TABLE_INIT, - IPSEC_EVENTS_INIT, - IPSEC_SAD_INIT, - IPSEC_INIT, - ALL_INIT /* All init stages completed */ -}; - extern struct odp_global_data_s odp_global_data; -int _odp_term_global(enum init_stage stage); -int _odp_term_local(enum init_stage stage); - int odp_cpumask_init_global(const odp_init_t *params); int odp_cpumask_term_global(void); diff --git a/platform/linux-generic/odp_init.c b/platform/linux-generic/odp_init.c index 0cd66ca3..60908f09 100644 --- a/platform/linux-generic/odp_init.c +++ b/platform/linux-generic/odp_init.c @@ -24,6 +24,30 @@ #include <sys/types.h> #include <pwd.h> +enum init_stage { + NO_INIT = 0, /* No init stages completed */ + LIBCONFIG_INIT, + CPUMASK_INIT, + TIME_INIT, + SYSINFO_INIT, + ISHM_INIT, + FDSERVER_INIT, + THREAD_INIT, + POOL_INIT, + QUEUE_INIT, + SCHED_INIT, + PKTIO_INIT, + TIMER_INIT, + CRYPTO_INIT, + CLASSIFICATION_INIT, + TRAFFIC_MNGR_INIT, + NAME_TABLE_INIT, + IPSEC_EVENTS_INIT, + IPSEC_SAD_INIT, + IPSEC_INIT, + ALL_INIT /* All init stages completed */ +}; + struct odp_global_data_s odp_global_data; void odp_init_param_init(odp_init_t *param) @@ -31,6 +55,152 @@ void odp_init_param_init(odp_init_t *param) memset(param, 0, sizeof(odp_init_t)); } +static int term_global(enum init_stage stage) +{ + int rc = 0; + + switch (stage) { + case ALL_INIT: + case IPSEC_INIT: + if (_odp_ipsec_term_global()) { + ODP_ERR("ODP IPsec term failed.\n"); + rc = -1; + } + /* Fall through */ + + case IPSEC_SAD_INIT: + if (_odp_ipsec_sad_term_global()) { + ODP_ERR("ODP IPsec SAD term failed.\n"); + rc = -1; + } + /* Fall through */ + + case IPSEC_EVENTS_INIT: + if (_odp_ipsec_events_term_global()) { + ODP_ERR("ODP IPsec events term failed.\n"); + rc = -1; + } + /* Fall through */ + + case NAME_TABLE_INIT: + if (_odp_int_name_tbl_term_global()) { + ODP_ERR("Name table term failed.\n"); + rc = -1; + } + /* Fall through */ + + case TRAFFIC_MNGR_INIT: + if (odp_tm_term_global()) { + ODP_ERR("TM term failed.\n"); + rc = -1; + } + /* Fall through */ + + case CLASSIFICATION_INIT: + if (odp_classification_term_global()) { + ODP_ERR("ODP classification term failed.\n"); + rc = -1; + } + /* Fall through */ + + case CRYPTO_INIT: + if (odp_crypto_term_global()) { + ODP_ERR("ODP crypto term failed.\n"); + rc = -1; + } + /* Fall through */ + + case TIMER_INIT: + if (odp_timer_term_global()) { + ODP_ERR("ODP timer term failed.\n"); + rc = -1; + } + /* Fall through */ + + case PKTIO_INIT: + if (odp_pktio_term_global()) { + ODP_ERR("ODP pktio term failed.\n"); + rc = -1; + } + /* Fall through */ + + case SCHED_INIT: + if (_odp_schedule_term_global()) { + ODP_ERR("ODP schedule term failed.\n"); + rc = -1; + } + /* Fall through */ + + case QUEUE_INIT: + if (_odp_queue_term_global()) { + ODP_ERR("ODP queue term failed.\n"); + rc = -1; + } + /* Fall through */ + + case POOL_INIT: + if (odp_pool_term_global()) { + ODP_ERR("ODP buffer pool term failed.\n"); + rc = -1; + } + /* Fall through */ + + case THREAD_INIT: + if (odp_thread_term_global()) { + ODP_ERR("ODP thread term failed.\n"); + rc = -1; + } + /* Fall through */ + + case FDSERVER_INIT: + if (_odp_fdserver_term_global()) { + ODP_ERR("ODP fdserver term failed.\n"); + rc = -1; + } + /* Fall through */ + + case ISHM_INIT: + if (_odp_ishm_term_global()) { + ODP_ERR("ODP ishm term failed.\n"); + rc = -1; + } + /* Fall through */ + + case SYSINFO_INIT: + if (odp_system_info_term()) { + ODP_ERR("ODP system info term failed.\n"); + rc = -1; + } + /* Fall through */ + + case TIME_INIT: + if (odp_time_term_global()) { + ODP_ERR("ODP time term failed.\n"); + rc = -1; + } + /* Fall through */ + + case CPUMASK_INIT: + if (odp_cpumask_term_global()) { + ODP_ERR("ODP cpumask term failed.\n"); + rc = -1; + } + /* Fall through */ + + case LIBCONFIG_INIT: + if (_odp_libconfig_term_global()) { + ODP_ERR("ODP runtime config term failed.\n"); + rc = -1; + } + /* Fall through */ + + case NO_INIT: + ; + } + + return rc; +} + int odp_init_global(odp_instance_t *instance, const odp_init_t *params, const odp_platform_init_t *platform_params ODP_UNUSED) @@ -168,7 +338,7 @@ int odp_init_global(odp_instance_t *instance, return 0; init_failed: - _odp_term_global(stage); + term_global(stage); return -1; } @@ -178,150 +348,65 @@ int odp_term_global(odp_instance_t instance) ODP_ERR("Bad instance.\n"); return -1; } - return _odp_term_global(ALL_INIT); + return term_global(ALL_INIT); } -int _odp_term_global(enum init_stage stage) +static int term_local(enum init_stage stage) { int rc = 0; + int rc_thd = 0; switch (stage) { case ALL_INIT: - case IPSEC_INIT: - if (_odp_ipsec_term_global()) { - ODP_ERR("ODP IPsec term failed.\n"); - rc = -1; - } - /* Fall through */ - - case IPSEC_SAD_INIT: - if (_odp_ipsec_sad_term_global()) { - ODP_ERR("ODP IPsec SAD term failed.\n"); - rc = -1; - } - /* Fall through */ - - case IPSEC_EVENTS_INIT: - if (_odp_ipsec_events_term_global()) { - ODP_ERR("ODP IPsec events term failed.\n"); - rc = -1; - } - /* Fall through */ - case NAME_TABLE_INIT: - if (_odp_int_name_tbl_term_global()) { - ODP_ERR("Name table term failed.\n"); - rc = -1; - } - /* Fall through */ - - case TRAFFIC_MNGR_INIT: - if (odp_tm_term_global()) { - ODP_ERR("TM term failed.\n"); + case SCHED_INIT: + if (sched_fn->term_local()) { + ODP_ERR("ODP schedule local term failed.\n"); rc = -1; } /* Fall through */ - case CLASSIFICATION_INIT: - if (odp_classification_term_global()) { - ODP_ERR("ODP classification term failed.\n"); + case QUEUE_INIT: + if (queue_fn->term_local()) { + ODP_ERR("ODP queue local term failed.\n"); rc = -1; } /* Fall through */ case CRYPTO_INIT: - if (odp_crypto_term_global()) { - ODP_ERR("ODP crypto term failed.\n"); - rc = -1; - } - /* Fall through */ - - case TIMER_INIT: - if (odp_timer_term_global()) { - ODP_ERR("ODP timer term failed.\n"); - rc = -1; - } - /* Fall through */ - - case PKTIO_INIT: - if (odp_pktio_term_global()) { - ODP_ERR("ODP pktio term failed.\n"); - rc = -1; - } - /* Fall through */ - - case SCHED_INIT: - if (_odp_schedule_term_global()) { - ODP_ERR("ODP schedule term failed.\n"); - rc = -1; - } - /* Fall through */ - - case QUEUE_INIT: - if (_odp_queue_term_global()) { - ODP_ERR("ODP queue term failed.\n"); + if (_odp_crypto_term_local()) { + ODP_ERR("ODP crypto local term failed.\n"); rc = -1; } /* Fall through */ case POOL_INIT: - if (odp_pool_term_global()) { - ODP_ERR("ODP buffer pool term failed.\n"); + if (odp_pool_term_local()) { + ODP_ERR("ODP buffer pool local term failed.\n"); rc = -1; } /* Fall through */ case THREAD_INIT: - if (odp_thread_term_global()) { - ODP_ERR("ODP thread term failed.\n"); - rc = -1; - } - /* Fall through */ - - case FDSERVER_INIT: - if (_odp_fdserver_term_global()) { - ODP_ERR("ODP fdserver term failed.\n"); + rc_thd = odp_thread_term_local(); + if (rc_thd < 0) { + ODP_ERR("ODP thread local term failed.\n"); rc = -1; + } else { + if (!rc) + rc = rc_thd; } /* Fall through */ case ISHM_INIT: - if (_odp_ishm_term_global()) { - ODP_ERR("ODP ishm term failed.\n"); - rc = -1; - } - /* Fall through */ - - case SYSINFO_INIT: - if (odp_system_info_term()) { - ODP_ERR("ODP system info term failed.\n"); - rc = -1; - } - /* Fall through */ - - case TIME_INIT: - if (odp_time_term_global()) { - ODP_ERR("ODP time term failed.\n"); - rc = -1; - } - /* Fall through */ - - case CPUMASK_INIT: - if (odp_cpumask_term_global()) { - ODP_ERR("ODP cpumask term failed.\n"); - rc = -1; - } - /* Fall through */ - - case LIBCONFIG_INIT: - if (_odp_libconfig_term_global()) { - ODP_ERR("ODP runtime config term failed.\n"); + if (_odp_ishm_term_local()) { + ODP_ERR("ODP ishm local term failed.\n"); rc = -1; } /* Fall through */ - case NO_INIT: - ; + default: + break; } return rc; @@ -381,72 +466,11 @@ int odp_init_local(odp_instance_t instance, odp_thread_type_t thr_type) return 0; init_fail: - _odp_term_local(stage); + term_local(stage); return -1; } int odp_term_local(void) { - return _odp_term_local(ALL_INIT); -} - -int _odp_term_local(enum init_stage stage) -{ - int rc = 0; - int rc_thd = 0; - - switch (stage) { - case ALL_INIT: - - case SCHED_INIT: - if (sched_fn->term_local()) { - ODP_ERR("ODP schedule local term failed.\n"); - rc = -1; - } - /* Fall through */ - - case QUEUE_INIT: - if (queue_fn->term_local()) { - ODP_ERR("ODP queue local term failed.\n"); - rc = -1; - } - /* Fall through */ - - case CRYPTO_INIT: - if (_odp_crypto_term_local()) { - ODP_ERR("ODP crypto 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"); - rc = -1; - } - /* Fall through */ - - case THREAD_INIT: - rc_thd = odp_thread_term_local(); - if (rc_thd < 0) { - ODP_ERR("ODP thread local term failed.\n"); - rc = -1; - } else { - if (!rc) - rc = rc_thd; - } - /* Fall through */ - - case ISHM_INIT: - if (_odp_ishm_term_local()) { - ODP_ERR("ODP ishm local term failed.\n"); - rc = -1; - } - /* Fall through */ - - default: - break; - } - - return rc; + return term_local(ALL_INIT); } ----------------------------------------------------------------------- Summary of changes: Makefile.inc | 1 + include/odp/api/spec/cpu.h | 3 +- include/odp/arch/x86_32-linux/odp/api/abi/cpu.h | 9 - include/odp/arch/x86_64-linux/odp/api/abi/cpu.h | 5 - platform/linux-generic/Makefile.am | 25 +- .../arch/default/odp/api/abi/cpu_inlines.h | 15 + .../linux-generic/arch/default/odp_cpu_cycles.c | 6 + .../linux-generic/arch/default/odp_sysinfo_parse.c | 2 +- .../linux-generic/arch/mips64/odp_cpu_cycles.c | 6 + .../linux-generic/arch/mips64/odp_sysinfo_parse.c | 2 +- .../linux-generic/arch/powerpc/odp_sysinfo_parse.c | 2 +- platform/linux-generic/arch/x86/cpu_flags.c | 8 + platform/linux-generic/arch/x86/cpu_flags.h | 1 + platform/linux-generic/arch/x86/odp/api/abi/cpu.h | 10 +- .../arch/x86/odp/api/abi/cpu_inlines.h | 48 +++ platform/linux-generic/arch/x86/odp_cpu_cycles.c | 31 +- platform/linux-generic/arch/x86/odp_global_time.c | 3 + .../linux-generic/arch/x86/odp_sysinfo_parse.c | 2 +- .../include/odp/api/plat/cpu_inlines.h | 38 ++ .../include/odp/api/plat/ticketlock_inlines.h | 2 + .../linux-generic/include/odp_debug_internal.h | 2 +- platform/linux-generic/include/odp_global_data.h | 68 ++++ .../{odp_internal.h => odp_init_internal.h} | 90 +---- .../include/odp_packet_io_ipc_internal.h | 1 - platform/linux-generic/include/odp_ring_internal.h | 2 + .../include/odp_schedule_scalable_ordered.h | 1 - .../linux-generic/include/odp_sysinfo_internal.h | 26 ++ .../include/odp_traffic_mngr_internal.h | 1 - platform/linux-generic/odp_barrier.c | 1 + platform/linux-generic/odp_classification.c | 2 +- platform/linux-generic/odp_cpu.c | 18 - .../{odp_event_api.c => odp_cpu_api.c} | 4 +- platform/linux-generic/odp_cpumask.c | 2 + platform/linux-generic/odp_crypto.c | 2 +- platform/linux-generic/odp_errno.c | 1 - platform/linux-generic/odp_fdserver.c | 3 +- platform/linux-generic/odp_init.c | 390 +++++++++++---------- platform/linux-generic/odp_ipsec.c | 1 + platform/linux-generic/odp_ipsec_events.c | 1 + platform/linux-generic/odp_ipsec_sad.c | 5 +- platform/linux-generic/odp_ishm.c | 4 +- platform/linux-generic/odp_ishmphy.c | 1 - platform/linux-generic/odp_ishmpool.c | 1 - platform/linux-generic/odp_libconfig.c | 4 +- platform/linux-generic/odp_packet.c | 1 + platform/linux-generic/odp_packet_io.c | 3 +- platform/linux-generic/odp_pool.c | 2 +- platform/linux-generic/odp_queue_basic.c | 2 +- platform/linux-generic/odp_queue_if.c | 2 +- platform/linux-generic/odp_queue_scalable.c | 1 - platform/linux-generic/odp_random.c | 2 +- platform/linux-generic/odp_rwlock.c | 4 +- platform/linux-generic/odp_schedule_basic.c | 1 - platform/linux-generic/odp_schedule_if.c | 2 +- platform/linux-generic/odp_schedule_iquery.c | 1 - platform/linux-generic/odp_schedule_scalable.c | 2 +- .../linux-generic/odp_schedule_scalable_ordered.c | 2 + platform/linux-generic/odp_shared_memory.c | 3 +- platform/linux-generic/odp_spinlock.c | 2 + platform/linux-generic/odp_system_info.c | 4 +- platform/linux-generic/odp_thread.c | 2 +- platform/linux-generic/odp_time.c | 1 + platform/linux-generic/odp_timer.c | 3 +- platform/linux-generic/odp_traffic_mngr.c | 2 + platform/linux-generic/odp_weak.c | 1 - platform/linux-generic/pktio/dpdk.c | 1 + platform/linux-generic/pktio/ethtool.c | 1 + platform/linux-generic/pktio/loop.c | 1 + platform/linux-generic/pktio/netmap.c | 1 + platform/linux-generic/pktio/ring.c | 4 +- platform/linux-generic/pktio/socket.c | 1 + platform/linux-generic/pktio/socket_mmap.c | 1 + platform/linux-generic/pktio/sysfs.c | 1 + platform/linux-generic/pktio/tap.c | 1 + platform/linux-generic/test/ring/ring_basic.c | 1 + 75 files changed, 527 insertions(+), 379 deletions(-) create mode 100644 platform/linux-generic/arch/default/odp/api/abi/cpu_inlines.h create mode 100644 platform/linux-generic/arch/x86/odp/api/abi/cpu_inlines.h create mode 100644 platform/linux-generic/include/odp/api/plat/cpu_inlines.h create mode 100644 platform/linux-generic/include/odp_global_data.h rename platform/linux-generic/include/{odp_internal.h => odp_init_internal.h} (50%) create mode 100644 platform/linux-generic/include/odp_sysinfo_internal.h delete mode 100644 platform/linux-generic/odp_cpu.c copy platform/linux-generic/{odp_event_api.c => odp_cpu_api.c} (75%) hooks/post-receive --

5 years, 11 months

[COMMIT] branch master updated. v1.19.0.1_tigermoth-34-g744d466a

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 744d466a0fe5530bb6c036664413d799a3aeb871 (commit) from 4eb5acde3012effceaaf9af4318d95b02551fffa (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 744d466a0fe5530bb6c036664413d799a3aeb871 Author: Brian Brooks <brian.brooks(a)linaro.org> Date: Thu May 24 15:39:03 2018 -0500 linux-generic: schedule: call timer_run() in scalable scheduler Signed-off-by: Brian Brooks <brian.brooks(a)linaro.org> Reported-by: David Nyström <david.c.nystrom(a)gmail.com> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/odp_schedule_scalable.c b/platform/linux-generic/odp_schedule_scalable.c index f26a7e59..1dbcb529 100644 --- a/platform/linux-generic/odp_schedule_scalable.c +++ b/platform/linux-generic/odp_schedule_scalable.c @@ -31,6 +31,7 @@ #include <odp_schedule_if.h> #include <odp_bitset.h> #include <odp_packet_io_internal.h> +#include <odp_timer_internal.h> #include <limits.h> #include <stdbool.h> @@ -889,6 +890,8 @@ static int _schedule(odp_queue_t *from, odp_event_t ev[], int num_evts) ts = sched_ts; atomq = ts->atomq; + timer_run(); + /* Once an atomic queue has been scheduled to a thread, it will stay * on that thread until empty or 'rotated' by WRR */ ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/odp_schedule_scalable.c | 3 +++ 1 file changed, 3 insertions(+) hooks/post-receive --

5 years, 11 months

[COMMIT] branch master updated. v1.19.0.1_tigermoth-33-g4eb5acde

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 4eb5acde3012effceaaf9af4318d95b02551fffa (commit) from 2315e146e19c937ff407f0a5aa0be1f8de655abf (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 4eb5acde3012effceaaf9af4318d95b02551fffa Author: Bogdan Pricope <bogdan.pricope(a)linaro.org> Date: Mon May 21 12:10:32 2018 +0300 example: generator: add UDP port range support Add options to generate UDP packets with source and destination ports in a range of values. This will simulate multiple packet flows. Signed-off-by: Bogdan Pricope <bogdan.pricope(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/example/generator/odp_generator.c b/example/generator/odp_generator.c index 4392fe5e..1a6bb911 100644 --- a/example/generator/odp_generator.c +++ b/example/generator/odp_generator.c @@ -74,7 +74,9 @@ typedef struct { unsigned int srcip; /**< src ip addr */ unsigned int dstip; /**< dest ip addr */ uint16_t srcport; /**< src udp port */ + uint16_t srcport_end; /**< src udp end port */ uint16_t dstport; /**< dest udp port */ + uint16_t dstport_end; /**< dest udp end port */ int mode; /**< work mode */ int number; /**< packets number to be sent */ int payload; /**< data len */ @@ -102,6 +104,17 @@ typedef struct { uint64_t ctr_icmp_reply_rcv; /**< icmp reply packets */ } counters_t; +/** UDP Packet processing function argument */ +typedef struct { + odp_bool_t multi_flow; + uint16_t srcport_crt; + uint16_t srcport_start; + uint16_t srcport_end; + uint16_t dstport_crt; + uint16_t dstport_start; + uint16_t dstport_end; +} udp_args_t; + /** * Thread specific arguments */ typedef struct { @@ -111,6 +124,7 @@ typedef struct { struct { odp_pktout_queue_t pktout; /**< Packet output queue */ odp_pktout_config_opt_t *pktout_cfg; /**< Packet output config*/ + udp_args_t udp_param; /**< UDP configuration */ } tx; struct { odp_pktin_queue_t pktin; /**< Packet input queue */ @@ -148,7 +162,7 @@ static odp_barrier_t barrier; typedef odp_packet_t (*setup_pkt_ref_fn_t)(odp_pool_t, odp_pktout_config_opt_t *); typedef int (*setup_pkt_fn_t)(odp_packet_t, odp_pktout_config_opt_t *, - counters_t *); + counters_t *, void *); /* helper funcs */ static void parse_args(int argc, char *argv[], appl_args_t *appl_args); @@ -266,12 +280,14 @@ static int setup_pkt_array(odp_pktout_config_opt_t *pktout_cfg, odp_packet_t *pkt_ref_array, odp_packet_t *pkt_array, int pkt_array_size, - setup_pkt_fn_t setup_pkt) + setup_pkt_fn_t setup_pkt, + void *setup_pkt_arg) { int i; for (i = 0; i < pkt_array_size; i++) { - if ((*setup_pkt)(pkt_ref_array[i], pktout_cfg, counters)) + if ((*setup_pkt)(pkt_ref_array[i], pktout_cfg, counters, + setup_pkt_arg)) break; pkt_array[i] = odp_packet_ref_static(pkt_ref_array[i]); @@ -361,11 +377,12 @@ static odp_packet_t setup_udp_pkt_ref(odp_pool_t pool, * @retval 0 on success, -1 on fail */ static int setup_udp_pkt(odp_packet_t pkt, odp_pktout_config_opt_t *pktout_cfg, - counters_t *counters) + counters_t *counters, void *arg) { char *buf; odph_ipv4hdr_t *ip; unsigned short seq; + udp_args_t *udp_arg = (udp_args_t *)arg; buf = (char *)odp_packet_data(pkt); @@ -379,6 +396,28 @@ static int setup_udp_pkt(odp_packet_t pkt, odp_pktout_config_opt_t *pktout_cfg, ip->chksum = ~odp_chksum_ones_comp16(ip, ODPH_IPV4HDR_LEN); } + if (udp_arg->multi_flow) { + odph_udphdr_t *udp = (odph_udphdr_t *)(buf + ODPH_ETHHDR_LEN + + ODPH_IPV4HDR_LEN); + + if (udp_arg->srcport_start != udp_arg->srcport_end) { + udp->src_port = odp_cpu_to_be_16(udp_arg->srcport_crt); + if (udp_arg->srcport_crt >= udp_arg->srcport_end) + udp_arg->srcport_crt = udp_arg->srcport_start; + else + udp_arg->srcport_crt++; + } + if (udp_arg->dstport_start != udp_arg->dstport_end) { + udp->dst_port = odp_cpu_to_be_16(udp_arg->dstport_crt); + if (udp_arg->dstport_crt >= udp_arg->dstport_end) + udp_arg->dstport_crt = udp_arg->dstport_start; + else + udp_arg->dstport_crt++; + } + + udp->chksum = 0; + } + if (pktout_cfg->bit.ipv4_chksum || pktout_cfg->bit.udp_chksum) { odp_packet_l2_offset_set(pkt, 0); odp_packet_l3_offset_set(pkt, ODPH_ETHHDR_LEN); @@ -458,7 +497,7 @@ static odp_packet_t setup_icmp_pkt_ref(odp_pool_t pool, */ static int setup_icmp_pkt(odp_packet_t pkt, odp_pktout_config_opt_t *pktout_cfg, - counters_t *counters) + counters_t *counters, void *arg ODP_UNUSED) { char *buf; odph_ipv4hdr_t *ip; @@ -676,6 +715,7 @@ static int gen_send_thread(void *arg) int burst_start, burst_size; setup_pkt_ref_fn_t setup_pkt_ref = NULL; setup_pkt_fn_t setup_pkt = NULL; + void *setup_pkt_arg = NULL; counters_t *counters; uint64_t pkt_count_max = 0; @@ -693,6 +733,7 @@ static int gen_send_thread(void *arg) if (args->appl.number != -1) pkt_count_max = args->appl.number / args->thread_cnt + (args->appl.number % args->thread_cnt ? 1 : 0); + setup_pkt_arg = &thr_args->tx.udp_param; } else if (args->appl.mode == APPL_MODE_PING) { setup_pkt_ref = setup_icmp_pkt_ref; setup_pkt = setup_icmp_pkt; @@ -730,7 +771,7 @@ static int gen_send_thread(void *arg) /* Setup TX burst*/ if (setup_pkt_array(pktout_cfg, counters, pkt_ref_array, pkt_array, - pkt_array_size, setup_pkt)) { + pkt_array_size, setup_pkt, setup_pkt_arg)) { EXAMPLE_ERR("[%02i] Error: failed to setup packets\n", thr); break; @@ -1333,6 +1374,17 @@ int main(int argc, char *argv[]) } else { int cpu = odp_cpumask_first(&cpumask); + udp_args_t *udp_param = NULL; + uint16_t sport_range = args->appl.srcport_end - + args->appl.srcport + 1; + uint16_t dport_range = args->appl.dstport_end - + args->appl.dstport + 1; + float sport_step = (float)(sport_range) / num_workers; + float dport_step = (float)(dport_range) / num_workers; + odp_bool_t multi_flow = false; + + if (sport_range > 1 || dport_range > 1) + multi_flow = true; for (i = 0; i < num_workers; ++i) { odp_cpumask_t thd_mask; @@ -1349,6 +1401,8 @@ int main(int argc, char *argv[]) args->thread[i].rx.pktin = ifs[if_idx].pktin[pktq_idx]; } else { + udp_param = &args->thread[i].tx.udp_param; + pktq_idx = (i / args->appl.if_count) % ifs[if_idx].pktout_count; start_seq = i * args->tx_burst_size; @@ -1357,6 +1411,22 @@ int main(int argc, char *argv[]) ifs[if_idx].pktout[pktq_idx]; args->thread[i].tx.pktout_cfg = &ifs[if_idx].config.pktout; + + udp_param->multi_flow = multi_flow; + udp_param->srcport_start = args->appl.srcport; + udp_param->srcport_end = args->appl.srcport_end; + udp_param->srcport_crt = args->appl.srcport; + if (sport_range > 1) + udp_param->srcport_crt += + (uint16_t)(i * sport_step); + + udp_param->dstport_start = args->appl.dstport; + udp_param->dstport_end = args->appl.dstport_end; + udp_param->dstport_crt = args->appl.dstport; + if (dport_range > 1) + udp_param->dstport_crt += + (uint16_t)(i * dport_step); + args->thread[i].counters.ctr_seq = start_seq; } tq = odp_queue_create("", NULL); @@ -1475,7 +1545,9 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args) {"srcip", required_argument, NULL, 's'}, {"dstip", required_argument, NULL, 'd'}, {"srcport", required_argument, NULL, 'e'}, + {"srcport_end", required_argument, NULL, 'j'}, {"dstport", required_argument, NULL, 'f'}, + {"dstport_end", required_argument, NULL, 'k'}, {"packetsize", required_argument, NULL, 'p'}, {"mode", required_argument, NULL, 'm'}, {"count", required_argument, NULL, 'n'}, @@ -1489,7 +1561,8 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args) {NULL, 0, NULL, 0} }; - static const char *shortopts = "+I:a:b:s:d:p:i:m:n:t:w:c:x:he:f:yr:z"; + static const char *shortopts = "+I:a:b:s:d:p:i:m:n:t:w:c:x:he:j:f:k" + ":yr:z"; /* let helper collect its own arguments (e.g. --odph_proc) */ argc = odph_parse_options(argc, argv); @@ -1502,7 +1575,9 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args) appl_args->udp_tx_burst = DEFAULT_UDP_TX_BURST; appl_args->rx_burst = DEFAULT_RX_BURST; appl_args->srcport = 0; + appl_args->srcport_end = 0; appl_args->dstport = 0; + appl_args->dstport_end = 0; appl_args->csum = 0; appl_args->sched = 0; @@ -1612,9 +1687,15 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args) case 'e': appl_args->srcport = (unsigned short)atoi(optarg); break; + case 'j': + appl_args->srcport_end = (unsigned short)atoi(optarg); + break; case 'f': appl_args->dstport = (unsigned short)atoi(optarg); break; + case 'k': + appl_args->dstport_end = (unsigned short)atoi(optarg); + break; case 'p': appl_args->payload = atoi(optarg); break; @@ -1672,6 +1753,14 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args) exit(EXIT_FAILURE); } + if ((appl_args->srcport != 0 && appl_args->srcport_end == 0) || + (appl_args->srcport_end < appl_args->srcport)) + appl_args->srcport_end = appl_args->srcport; + + if ((appl_args->dstport != 0 && appl_args->dstport_end == 0) || + (appl_args->dstport_end < appl_args->dstport)) + appl_args->dstport_end = appl_args->dstport; + optind = 1; /* reset 'extern optind' from the getopt lib */ } @@ -1732,8 +1821,14 @@ static void usage(char *progname) "\n" "Optional OPTIONS\n" " -h, --help Display help and exit.\n" - " -e, --srcport src udp port\n" - " -f, --dstport dst udp port\n" + " -e, --srcport udp source port start value\n" + " default is 0\n" + " -j, --srcport_end udp source port end value\n" + " default is udp source port start value\n" + " -f, --dstport udp destination port start value\n" + " default is 0\n" + " -k, --dstport_end udp destination port end value\n" + " default is udp destination port start value\n" " -p, --packetsize payload length of the packets\n" " -t, --timeout only for ping mode, wait ICMP reply timeout seconds\n" " -i, --interval wait interval ms between sending each packet\n" ----------------------------------------------------------------------- Summary of changes: example/generator/odp_generator.c | 113 +++++++++++++++++++++++++++++++++++--- 1 file changed, 104 insertions(+), 9 deletions(-) hooks/post-receive --

5 years, 11 months

[COMMIT] branch master updated. v1.19.0.1_tigermoth-32-g2315e146

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 2315e146e19c937ff407f0a5aa0be1f8de655abf (commit) via 46064619d9bd9d2733089dcff044a9a86277dbdd (commit) via ec41adeed9884621f242c8153612a3f2eaa5bcee (commit) via 758fdf094deae51597b5e9f5f70584c3dba92ff1 (commit) via c5b855df5b9e4388efd387810959b0f81f072fc9 (commit) via 7299adcc939a3d55b2c694744037ea9ea1dd7835 (commit) via 455230a4331e25a1bb68e6fe1c0058bd790c9d9b (commit) via a4d31373e5a0f72d028ff73ca9eae0fd6671f350 (commit) from 37390a88fd35d972a8e399fc934c612c1043ad77 (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 2315e146e19c937ff407f0a5aa0be1f8de655abf Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue May 15 10:58:31 2018 +0300 linux-gen: use inlined sync functions everywhere Make linux-gen platform code use inlined sync functions instead of doing proper functions calls. 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_barrier.c b/platform/linux-generic/odp_barrier.c index ebae98ec..ec35d0ff 100644 --- a/platform/linux-generic/odp_barrier.c +++ b/platform/linux-generic/odp_barrier.c @@ -11,6 +11,7 @@ #include <odp/api/cpu.h> #include <odp/api/atomic.h> #include <odp/api/plat/atomic_inlines.h> +#include <odp/api/plat/sync_inlines.h> void odp_barrier_init(odp_barrier_t *barrier, int count) { diff --git a/platform/linux-generic/odp_queue_basic.c b/platform/linux-generic/odp_queue_basic.c index 69fad639..4b4434c2 100644 --- a/platform/linux-generic/odp_queue_basic.c +++ b/platform/linux-generic/odp_queue_basic.c @@ -23,6 +23,7 @@ #include <odp_debug_internal.h> #include <odp/api/hints.h> #include <odp/api/sync.h> +#include <odp/api/plat/sync_inlines.h> #include <odp/api/traffic_mngr.h> #include <odp_libconfig_internal.h> diff --git a/platform/linux-generic/odp_queue_scalable.c b/platform/linux-generic/odp_queue_scalable.c index 8f956911..56ea98bc 100644 --- a/platform/linux-generic/odp_queue_scalable.c +++ b/platform/linux-generic/odp_queue_scalable.c @@ -14,6 +14,7 @@ #include <odp/api/schedule.h> #include <odp/api/shared_memory.h> #include <odp/api/sync.h> +#include <odp/api/plat/sync_inlines.h> #include <odp/api/traffic_mngr.h> #include <odp_internal.h> commit 46064619d9bd9d2733089dcff044a9a86277dbdd Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue May 15 10:58:31 2018 +0300 linux-gen: use inlined thread functions everywhere Make linux-gen platform code use inlined thread functions instead of doing proper functions calls. 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 0fce762a..967b0bfd 100644 --- a/platform/linux-generic/odp_crypto.c +++ b/platform/linux-generic/odp_crypto.c @@ -18,6 +18,7 @@ #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 */ diff --git a/platform/linux-generic/odp_pool.c b/platform/linux-generic/odp_pool.c index f030ff04..32c41427 100644 --- a/platform/linux-generic/odp_pool.c +++ b/platform/linux-generic/odp_pool.c @@ -11,6 +11,7 @@ #include <odp/api/align.h> #include <odp/api/ticketlock.h> #include <odp/api/system_info.h> +#include <odp/api/plat/thread_inlines.h> #include <odp_pool_internal.h> #include <odp_internal.h> diff --git a/platform/linux-generic/odp_schedule_basic.c b/platform/linux-generic/odp_schedule_basic.c index 540dc6a4..f35c7b02 100644 --- a/platform/linux-generic/odp_schedule_basic.c +++ b/platform/linux-generic/odp_schedule_basic.c @@ -14,6 +14,7 @@ #include <odp_internal.h> #include <odp_debug_internal.h> #include <odp/api/thread.h> +#include <odp/api/plat/thread_inlines.h> #include <odp/api/time.h> #include <odp/api/spinlock.h> #include <odp/api/hints.h> diff --git a/platform/linux-generic/odp_schedule_iquery.c b/platform/linux-generic/odp_schedule_iquery.c index 40f2e9fc..a019157e 100644 --- a/platform/linux-generic/odp_schedule_iquery.c +++ b/platform/linux-generic/odp_schedule_iquery.c @@ -17,6 +17,7 @@ #include <odp_buffer_internal.h> #include <odp_bitmap_internal.h> #include <odp/api/thread.h> +#include <odp/api/plat/thread_inlines.h> #include <odp/api/time.h> #include <odp/api/rwlock.h> #include <odp/api/hints.h> diff --git a/platform/linux-generic/odp_schedule_scalable.c b/platform/linux-generic/odp_schedule_scalable.c index 44629378..f26a7e59 100644 --- a/platform/linux-generic/odp_schedule_scalable.c +++ b/platform/linux-generic/odp_schedule_scalable.c @@ -15,6 +15,7 @@ #include <odp/api/shared_memory.h> #include <odp/api/sync.h> #include <odp/api/thread.h> +#include <odp/api/plat/thread_inlines.h> #include <odp/api/thrmask.h> #include <odp/api/time.h> diff --git a/platform/linux-generic/odp_schedule_sp.c b/platform/linux-generic/odp_schedule_sp.c index 84d16d3c..2cef0e82 100644 --- a/platform/linux-generic/odp_schedule_sp.c +++ b/platform/linux-generic/odp_schedule_sp.c @@ -9,6 +9,7 @@ #include <string.h> #include <odp/api/ticketlock.h> #include <odp/api/thread.h> +#include <odp/api/plat/thread_inlines.h> #include <odp/api/time.h> #include <odp/api/schedule.h> #include <odp/api/shared_memory.h> commit ec41adeed9884621f242c8153612a3f2eaa5bcee Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue May 15 10:58:31 2018 +0300 linux-gen: use inlined atomic functions everywhere Make linux-gen platform code use inlined atomic functions instead of doing proper functions calls. 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/include/odp/api/plat/packet_flag_inlines.h b/platform/linux-generic/include/odp/api/plat/packet_flag_inlines.h index cbb79758..6f32b46c 100644 --- a/platform/linux-generic/include/odp/api/plat/packet_flag_inlines.h +++ b/platform/linux-generic/include/odp/api/plat/packet_flag_inlines.h @@ -36,6 +36,7 @@ static inline uint64_t _odp_packet_input_flags(odp_packet_t pkt) #define odp_packet_has_ts __odp_packet_has_ts #define odp_packet_has_ipsec __odp_packet_has_ipsec #else + #undef _ODP_INLINE #define _ODP_INLINE #endif diff --git a/platform/linux-generic/include/odp/api/plat/ticketlock_inlines.h b/platform/linux-generic/include/odp/api/plat/ticketlock_inlines.h index eabf1f82..e84ed88e 100644 --- a/platform/linux-generic/include/odp/api/plat/ticketlock_inlines.h +++ b/platform/linux-generic/include/odp/api/plat/ticketlock_inlines.h @@ -19,7 +19,10 @@ #define odp_ticketlock_trylock __odp_ticketlock_trylock #define odp_ticketlock_unlock __odp_ticketlock_unlock #define odp_ticketlock_is_locked __odp_ticketlock_is_locked + /* Inline atomic functions */ + #include <odp/api/plat/atomic_inlines.h> #else + #undef _ODP_INLINE #define _ODP_INLINE #endif diff --git a/platform/linux-generic/include/odp_ring_internal.h b/platform/linux-generic/include/odp_ring_internal.h index 2db07548..b47c41e5 100644 --- a/platform/linux-generic/include/odp_ring_internal.h +++ b/platform/linux-generic/include/odp_ring_internal.h @@ -14,6 +14,7 @@ extern "C" { #include <odp/api/atomic.h> #include <odp/api/hints.h> #include <odp_align_internal.h> +#include <odp/api/plat/atomic_inlines.h> /* Ring empty, not a valid data value. */ #define RING_EMPTY ((uint32_t)-1) diff --git a/platform/linux-generic/odp_barrier.c b/platform/linux-generic/odp_barrier.c index 6006add5..ebae98ec 100644 --- a/platform/linux-generic/odp_barrier.c +++ b/platform/linux-generic/odp_barrier.c @@ -10,6 +10,7 @@ #include <odp/api/sync.h> #include <odp/api/cpu.h> #include <odp/api/atomic.h> +#include <odp/api/plat/atomic_inlines.h> void odp_barrier_init(odp_barrier_t *barrier, int count) { diff --git a/platform/linux-generic/odp_ipsec_sad.c b/platform/linux-generic/odp_ipsec_sad.c index c2126969..eea4ceb2 100644 --- a/platform/linux-generic/odp_ipsec_sad.c +++ b/platform/linux-generic/odp_ipsec_sad.c @@ -7,6 +7,7 @@ #include "config.h" #include <odp/api/atomic.h> +#include <odp/api/plat/atomic_inlines.h> #include <odp/api/ipsec.h> #include <odp/api/random.h> #include <odp/api/shared_memory.h> diff --git a/platform/linux-generic/odp_queue_lf.c b/platform/linux-generic/odp_queue_lf.c index 066e6a67..afe629d1 100644 --- a/platform/linux-generic/odp_queue_lf.c +++ b/platform/linux-generic/odp_queue_lf.c @@ -6,6 +6,7 @@ #include <odp/api/queue.h> #include <odp/api/atomic.h> +#include <odp/api/plat/atomic_inlines.h> #include <odp/api/shared_memory.h> #include <odp_queue_internal.h> #include <string.h> diff --git a/platform/linux-generic/odp_rwlock.c b/platform/linux-generic/odp_rwlock.c index 119ead89..3a1086d2 100644 --- a/platform/linux-generic/odp_rwlock.c +++ b/platform/linux-generic/odp_rwlock.c @@ -8,6 +8,7 @@ #include <stdbool.h> #include <odp/api/atomic.h> +#include <odp/api/plat/atomic_inlines.h> #include <odp/api/rwlock.h> #include <odp/api/cpu.h> diff --git a/platform/linux-generic/odp_ticketlock_api.c b/platform/linux-generic/odp_ticketlock_api.c index 1de55d90..ebbb8657 100644 --- a/platform/linux-generic/odp_ticketlock_api.c +++ b/platform/linux-generic/odp_ticketlock_api.c @@ -7,6 +7,7 @@ #include "config.h" #include <odp/api/ticketlock.h> +#include <odp/api/plat/atomic_inlines.h> #define _ODP_NO_INLINE #include <odp/api/plat/ticketlock_inlines.h> commit 758fdf094deae51597b5e9f5f70584c3dba92ff1 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue May 15 10:58:31 2018 +0300 linux-gen: pktio: use inlined packet functions 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_packet_io.c b/platform/linux-generic/odp_packet_io.c index 2f39b981..8a5da105 100644 --- a/platform/linux-generic/odp_packet_io.c +++ b/platform/linux-generic/odp_packet_io.c @@ -12,6 +12,7 @@ #include <odp/api/plat/pktio_inlines.h> #include <odp_packet_io_internal.h> #include <odp/api/packet.h> +#include <odp/api/plat/packet_inlines.h> #include <odp_packet_internal.h> #include <odp_internal.h> #include <odp/api/spinlock.h> commit c5b855df5b9e4388efd387810959b0f81f072fc9 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue May 15 00:26:21 2018 +0300 linux-gen: std clib: rework code to follow inlining style Rework std clib module to follow _ODP_INLINE style of code used by the rest of ODP codebase. 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 04c04f7c..fb212950 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -216,7 +216,7 @@ __LIB__libodp_linux_la_SOURCES += \ odp_packet_api.c \ odp_packet_flags_api.c \ odp_pktio_api.c \ - odp_std_clib.c \ + odp_std_clib_api.c \ odp_sync_api.c \ odp_thread_api.c \ odp_ticketlock_api.c diff --git a/platform/linux-generic/include/odp/api/plat/std_clib_inlines.h b/platform/linux-generic/include/odp/api/plat/std_clib_inlines.h index c07b57b7..4265eaf1 100644 --- a/platform/linux-generic/include/odp/api/plat/std_clib_inlines.h +++ b/platform/linux-generic/include/odp/api/plat/std_clib_inlines.h @@ -7,12 +7,20 @@ #ifndef ODP_PLAT_STD_CLIB_INLINE_H_ #define ODP_PLAT_STD_CLIB_INLINE_H_ -#ifdef __cplusplus -extern "C" { -#endif +/** @cond _ODP_HIDE_FROM_DOXYGEN_ */ #include <string.h> +#ifndef _ODP_NO_INLINE + /* Inline functions by default */ + #define _ODP_INLINE static inline + #define odp_memcpy __odp_memcpy + #define odp_memset __odp_memset + #define odp_memcmp __odp_memcmp +#else + #define _ODP_INLINE +#endif + _ODP_INLINE void *odp_memcpy(void *dst, const void *src, size_t num) { return memcpy(dst, src, num); @@ -28,8 +36,6 @@ _ODP_INLINE int odp_memcmp(const void *ptr1, const void *ptr2, size_t num) return memcmp(ptr1, ptr2, num); } -#ifdef __cplusplus -} -#endif +/** @endcond */ #endif diff --git a/platform/linux-generic/odp_std_clib.c b/platform/linux-generic/odp_std_clib_api.c similarity index 92% rename from platform/linux-generic/odp_std_clib.c rename to platform/linux-generic/odp_std_clib_api.c index f43f62c9..faa37847 100644 --- a/platform/linux-generic/odp_std_clib.c +++ b/platform/linux-generic/odp_std_clib_api.c @@ -9,5 +9,5 @@ #include <odp/api/std_clib.h> /* Include non-inlined versions of API functions */ -#define _ODP_INLINE +#define _ODP_NO_INLINE #include <odp/api/plat/std_clib_inlines.h> commit 7299adcc939a3d55b2c694744037ea9ea1dd7835 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue May 15 00:26:21 2018 +0300 linux-gen: sync: rework code to follow inlining style Rework sync module to follow _ODP_INLINE style of code used by the rest of ODP codebase. 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 96ddb33d..04c04f7c 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -217,7 +217,7 @@ __LIB__libodp_linux_la_SOURCES += \ odp_packet_flags_api.c \ odp_pktio_api.c \ odp_std_clib.c \ - odp_sync.c \ + odp_sync_api.c \ odp_thread_api.c \ odp_ticketlock_api.c endif diff --git a/platform/linux-generic/include/odp/api/plat/sync_inlines.h b/platform/linux-generic/include/odp/api/plat/sync_inlines.h index 34a74444..b6a96188 100644 --- a/platform/linux-generic/include/odp/api/plat/sync_inlines.h +++ b/platform/linux-generic/include/odp/api/plat/sync_inlines.h @@ -17,9 +17,17 @@ extern "C" { #endif -/** @ingroup odp_barrier - * @{ - */ +/** @cond _ODP_HIDE_FROM_DOXYGEN_ */ + +#ifndef _ODP_NO_INLINE + /* Inline functions by default */ + #define _ODP_INLINE static inline + #define odp_mb_release __odp_mb_release + #define odp_mb_acquire __odp_mb_acquire + #define odp_mb_full __odp_mb_full +#else + #define _ODP_INLINE +#endif _ODP_INLINE void odp_mb_release(void) { @@ -36,9 +44,7 @@ _ODP_INLINE void odp_mb_full(void) __atomic_thread_fence(__ATOMIC_SEQ_CST); } -/** - * @} - */ +/** @endcond */ #ifdef __cplusplus } diff --git a/platform/linux-generic/odp_sync.c b/platform/linux-generic/odp_sync_api.c similarity index 91% rename from platform/linux-generic/odp_sync.c rename to platform/linux-generic/odp_sync_api.c index a20278ce..6e91209a 100644 --- a/platform/linux-generic/odp_sync.c +++ b/platform/linux-generic/odp_sync_api.c @@ -9,5 +9,5 @@ #include <odp/api/sync.h> /* Include non-inlined versions of API functions */ -#define _ODP_INLINE +#define _ODP_NO_INLINE #include <odp/api/plat/sync_inlines.h> commit 455230a4331e25a1bb68e6fe1c0058bd790c9d9b Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue May 15 00:26:21 2018 +0300 linux-gen: packet: remove separate API inlining header 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 033f38a5..96ddb33d 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -30,7 +30,6 @@ odpapiplatinclude_HEADERS = \ include/odp/api/plat/packet_flag_inlines.h \ include/odp/api/plat/packet_inline_types.h \ include/odp/api/plat/packet_inlines.h \ - include/odp/api/plat/packet_inlines_api.h \ include/odp/api/plat/pktio_inlines.h \ include/odp/api/plat/pool_inline_types.h \ include/odp/api/plat/std_clib_inlines.h \ diff --git a/platform/linux-generic/include-abi/odp/api/abi/packet.h b/platform/linux-generic/include-abi/odp/api/abi/packet.h index 0b11d0bd..fe21c7d9 100644 --- a/platform/linux-generic/include-abi/odp/api/abi/packet.h +++ b/platform/linux-generic/include-abi/odp/api/abi/packet.h @@ -90,8 +90,6 @@ typedef enum { #define ODP_NUM_PACKET_COLORS 3 #include <odp/api/plat/packet_inlines.h> -#define _ODP_INLINE static inline -#include <odp/api/plat/packet_inlines_api.h> /** * @} 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 2b9c4322..e2c32728 100644 --- a/platform/linux-generic/include/odp/api/plat/packet_inlines.h +++ b/platform/linux-generic/include/odp/api/plat/packet_inlines.h @@ -28,6 +28,47 @@ /** @cond _ODP_HIDE_FROM_DOXYGEN_ */ +#ifndef _ODP_NO_INLINE + /* Inline functions by default */ + #define _ODP_INLINE static inline + #define odp_packet_data __odp_packet_data + #define odp_packet_seg_len __odp_packet_seg_len + #define odp_packet_data_seg_len __odp_packet_data_seg_len + #define odp_packet_len __odp_packet_len + #define odp_packet_headroom __odp_packet_headroom + #define odp_packet_tailroom __odp_packet_tailroom + #define odp_packet_pool __odp_packet_pool + #define odp_packet_input __odp_packet_input + #define odp_packet_input_index __odp_packet_input_index + #define odp_packet_num_segs __odp_packet_num_segs + #define odp_packet_user_ptr __odp_packet_user_ptr + #define odp_packet_user_area __odp_packet_user_area + #define odp_packet_user_area_size __odp_packet_user_area_size + #define odp_packet_l2_offset __odp_packet_l2_offset + #define odp_packet_l3_offset __odp_packet_l3_offset + #define odp_packet_l4_offset __odp_packet_l4_offset + #define odp_packet_l2_ptr __odp_packet_l2_ptr + #define odp_packet_l3_ptr __odp_packet_l3_ptr + #define odp_packet_l4_ptr __odp_packet_l4_ptr + #define odp_packet_flow_hash __odp_packet_flow_hash + #define odp_packet_ts __odp_packet_ts + #define odp_packet_head __odp_packet_head + #define odp_packet_is_segmented __odp_packet_is_segmented + #define odp_packet_first_seg __odp_packet_first_seg + #define odp_packet_last_seg __odp_packet_last_seg + #define odp_packet_next_seg __odp_packet_next_seg + #define odp_packet_prefetch __odp_packet_prefetch + #define odp_packet_copy_from_mem __odp_packet_copy_from_mem + #define odp_packet_copy_to_mem __odp_packet_copy_to_mem + #define odp_packet_from_event __odp_packet_from_event + #define odp_packet_to_event __odp_packet_to_event + #define odp_packet_from_event_multi __odp_packet_from_event_multi + #define odp_packet_to_event_multi __odp_packet_to_event_multi +#else + #undef _ODP_INLINE + #define _ODP_INLINE +#endif + void *_odp_packet_map(void *pkt_ptr, uint32_t offset, uint32_t *seg_len, int *seg_idx); @@ -53,63 +94,63 @@ static inline odp_packet_seg_t _odp_packet_seg_from_ndx(uint32_t ndx) } #endif -static inline void *_odp_packet_data(odp_packet_t pkt) +_ODP_INLINE void *odp_packet_data(odp_packet_t pkt) { return _odp_pkt_get(pkt, void *, data); } -static inline uint32_t _odp_packet_seg_len(odp_packet_t pkt) +_ODP_INLINE uint32_t odp_packet_seg_len(odp_packet_t pkt) { return _odp_pkt_get(pkt, uint32_t, seg_len); } -static inline void *_odp_packet_data_seg_len(odp_packet_t pkt, +_ODP_INLINE void *odp_packet_data_seg_len(odp_packet_t pkt, uint32_t *seg_len) { - *seg_len = _odp_packet_seg_len(pkt); - return _odp_packet_data(pkt); + *seg_len = odp_packet_seg_len(pkt); + return odp_packet_data(pkt); } -static inline uint32_t _odp_packet_len(odp_packet_t pkt) +_ODP_INLINE uint32_t odp_packet_len(odp_packet_t pkt) { return _odp_pkt_get(pkt, uint32_t, frame_len); } -static inline uint32_t _odp_packet_headroom(odp_packet_t pkt) +_ODP_INLINE uint32_t odp_packet_headroom(odp_packet_t pkt) { return _odp_pkt_get(pkt, uint16_t, headroom); } -static inline uint32_t _odp_packet_tailroom(odp_packet_t pkt) +_ODP_INLINE uint32_t odp_packet_tailroom(odp_packet_t pkt) { return _odp_pkt_get(pkt, uint16_t, tailroom); } -static inline odp_pool_t _odp_packet_pool(odp_packet_t pkt) +_ODP_INLINE odp_pool_t odp_packet_pool(odp_packet_t pkt) { void *pool = _odp_pkt_get(pkt, void *, pool); return _odp_pool_get(pool, odp_pool_t, pool_hdl); } -static inline odp_pktio_t _odp_packet_input(odp_packet_t pkt) +_ODP_INLINE odp_pktio_t odp_packet_input(odp_packet_t pkt) { return _odp_pkt_get(pkt, odp_pktio_t, input); } -static inline int _odp_packet_input_index(odp_packet_t pkt) +_ODP_INLINE int odp_packet_input_index(odp_packet_t pkt) { - odp_pktio_t pktio = _odp_packet_input(pkt); + odp_pktio_t pktio = odp_packet_input(pkt); return odp_pktio_index(pktio); } -static inline int _odp_packet_num_segs(odp_packet_t pkt) +_ODP_INLINE int odp_packet_num_segs(odp_packet_t pkt) { return _odp_pkt_get(pkt, uint8_t, segcount); } -static inline void *_odp_packet_user_ptr(odp_packet_t pkt) +_ODP_INLINE void *odp_packet_user_ptr(odp_packet_t pkt) { _odp_packet_flags_t flags; @@ -121,38 +162,38 @@ static inline void *_odp_packet_user_ptr(odp_packet_t pkt) return _odp_pkt_get(pkt, void *, user_ptr); } -static inline void *_odp_packet_user_area(odp_packet_t pkt) +_ODP_INLINE void *odp_packet_user_area(odp_packet_t pkt) { return _odp_pkt_get(pkt, void *, user_area); } -static inline uint32_t _odp_packet_user_area_size(odp_packet_t pkt) +_ODP_INLINE uint32_t odp_packet_user_area_size(odp_packet_t pkt) { void *pool = _odp_pkt_get(pkt, void *, pool); return _odp_pool_get(pool, uint32_t, uarea_size); } -static inline uint32_t _odp_packet_l2_offset(odp_packet_t pkt) +_ODP_INLINE uint32_t odp_packet_l2_offset(odp_packet_t pkt) { return _odp_pkt_get(pkt, uint16_t, l2_offset); } -static inline uint32_t _odp_packet_l3_offset(odp_packet_t pkt) +_ODP_INLINE uint32_t odp_packet_l3_offset(odp_packet_t pkt) { return _odp_pkt_get(pkt, uint16_t, l3_offset); } -static inline uint32_t _odp_packet_l4_offset(odp_packet_t pkt) +_ODP_INLINE uint32_t odp_packet_l4_offset(odp_packet_t pkt) { return _odp_pkt_get(pkt, uint16_t, l4_offset); } -static inline void *_odp_packet_l2_ptr(odp_packet_t pkt, uint32_t *len) +_ODP_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); + 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; @@ -166,11 +207,11 @@ static inline void *_odp_packet_l2_ptr(odp_packet_t pkt, uint32_t *len) return data + offset; } -static inline void *_odp_packet_l3_ptr(odp_packet_t pkt, uint32_t *len) +_ODP_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); + 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; @@ -184,11 +225,11 @@ static inline void *_odp_packet_l3_ptr(odp_packet_t pkt, uint32_t *len) return data + offset; } -static inline void *_odp_packet_l4_ptr(odp_packet_t pkt, uint32_t *len) +_ODP_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); + 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; @@ -202,53 +243,53 @@ static inline void *_odp_packet_l4_ptr(odp_packet_t pkt, uint32_t *len) return data + offset; } -static inline uint32_t _odp_packet_flow_hash(odp_packet_t pkt) +_ODP_INLINE uint32_t odp_packet_flow_hash(odp_packet_t pkt) { return _odp_pkt_get(pkt, uint32_t, flow_hash); } -static inline odp_time_t _odp_packet_ts(odp_packet_t pkt) +_ODP_INLINE odp_time_t odp_packet_ts(odp_packet_t pkt) { return _odp_pkt_get(pkt, odp_time_t, timestamp); } -static inline void *_odp_packet_head(odp_packet_t pkt) +_ODP_INLINE void *odp_packet_head(odp_packet_t pkt) { - return (uint8_t *)_odp_packet_data(pkt) - _odp_packet_headroom(pkt); + return (uint8_t *)odp_packet_data(pkt) - odp_packet_headroom(pkt); } -static inline int _odp_packet_is_segmented(odp_packet_t pkt) +_ODP_INLINE int odp_packet_is_segmented(odp_packet_t pkt) { return _odp_pkt_get(pkt, uint8_t, segcount) > 1; } -static inline odp_packet_seg_t _odp_packet_first_seg(odp_packet_t pkt) +_ODP_INLINE odp_packet_seg_t odp_packet_first_seg(odp_packet_t pkt) { (void)pkt; return _odp_packet_seg_from_ndx(0); } -static inline odp_packet_seg_t _odp_packet_last_seg(odp_packet_t pkt) +_ODP_INLINE odp_packet_seg_t odp_packet_last_seg(odp_packet_t pkt) { - return _odp_packet_seg_from_ndx(_odp_packet_num_segs(pkt) - 1); + return _odp_packet_seg_from_ndx(odp_packet_num_segs(pkt) - 1); } -static inline odp_packet_seg_t _odp_packet_next_seg(odp_packet_t pkt, +_ODP_INLINE odp_packet_seg_t odp_packet_next_seg(odp_packet_t pkt, odp_packet_seg_t seg) { if (odp_unlikely(_odp_packet_seg_to_ndx(seg) >= - _odp_packet_seg_to_ndx(_odp_packet_last_seg(pkt)))) + _odp_packet_seg_to_ndx(odp_packet_last_seg(pkt)))) return ODP_PACKET_SEG_INVALID; return seg + 1; } -static inline void _odp_packet_prefetch(odp_packet_t pkt, uint32_t offset, +_ODP_INLINE void odp_packet_prefetch(odp_packet_t pkt, uint32_t offset, uint32_t len) { - uint32_t seg_len = _odp_packet_seg_len(pkt); - uint8_t *data = (uint8_t *)_odp_packet_data(pkt); + uint32_t seg_len = odp_packet_seg_len(pkt); + uint8_t *data = (uint8_t *)odp_packet_data(pkt); (void)len; if (odp_unlikely(offset >= seg_len)) @@ -257,11 +298,11 @@ static inline void _odp_packet_prefetch(odp_packet_t pkt, uint32_t offset, odp_prefetch(data + offset); } -static inline int _odp_packet_copy_from_mem(odp_packet_t pkt, uint32_t offset, +_ODP_INLINE int odp_packet_copy_from_mem(odp_packet_t pkt, uint32_t offset, uint32_t len, const void *src) { - uint32_t seg_len = _odp_packet_seg_len(pkt); - uint8_t *data = (uint8_t *)_odp_packet_data(pkt); + uint32_t seg_len = odp_packet_seg_len(pkt); + uint8_t *data = (uint8_t *)odp_packet_data(pkt); if (odp_unlikely(offset + len > seg_len)) return _odp_packet_copy_from_mem_seg(pkt, offset, len, src); @@ -271,11 +312,11 @@ static inline int _odp_packet_copy_from_mem(odp_packet_t pkt, uint32_t offset, return 0; } -static inline int _odp_packet_copy_to_mem(odp_packet_t pkt, uint32_t offset, +_ODP_INLINE int odp_packet_copy_to_mem(odp_packet_t pkt, uint32_t offset, uint32_t len, void *dst) { - uint32_t seg_len = _odp_packet_seg_len(pkt); - uint8_t *data = (uint8_t *)_odp_packet_data(pkt); + uint32_t seg_len = odp_packet_seg_len(pkt); + uint8_t *data = (uint8_t *)odp_packet_data(pkt); if (odp_unlikely(offset + len > seg_len)) return _odp_packet_copy_to_mem_seg(pkt, offset, len, dst); @@ -285,33 +326,33 @@ static inline int _odp_packet_copy_to_mem(odp_packet_t pkt, uint32_t offset, return 0; } -static inline odp_packet_t _odp_packet_from_event(odp_event_t ev) +_ODP_INLINE odp_packet_t odp_packet_from_event(odp_event_t ev) { return (odp_packet_t)ev; } -static inline odp_event_t _odp_packet_to_event(odp_packet_t pkt) +_ODP_INLINE odp_event_t odp_packet_to_event(odp_packet_t pkt) { return (odp_event_t)pkt; } -static inline void _odp_packet_from_event_multi(odp_packet_t pkt[], +_ODP_INLINE void odp_packet_from_event_multi(odp_packet_t pkt[], const odp_event_t ev[], int num) { int i; for (i = 0; i < num; i++) - pkt[i] = _odp_packet_from_event(ev[i]); + pkt[i] = odp_packet_from_event(ev[i]); } -static inline void _odp_packet_to_event_multi(const odp_packet_t pkt[], +_ODP_INLINE void odp_packet_to_event_multi(const odp_packet_t pkt[], odp_event_t ev[], int num) { int i; for (i = 0; i < num; i++) - ev[i] = _odp_packet_to_event(pkt[i]); + ev[i] = odp_packet_to_event(pkt[i]); } /** @endcond */ 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 deleted file mode 100644 index 76210e00..00000000 --- a/platform/linux-generic/include/odp/api/plat/packet_inlines_api.h +++ /dev/null @@ -1,186 +0,0 @@ -/* Copyright (c) 2017-2018, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -/** - * @file - * - * Packet inline functions - */ - -#ifndef _ODP_PLAT_PACKET_INLINES_API_H_ -#define _ODP_PLAT_PACKET_INLINES_API_H_ - -_ODP_INLINE void *odp_packet_data(odp_packet_t pkt) -{ - return _odp_packet_data(pkt); -} - -_ODP_INLINE uint32_t odp_packet_seg_len(odp_packet_t pkt) -{ - return _odp_packet_seg_len(pkt); -} - -_ODP_INLINE void *odp_packet_data_seg_len(odp_packet_t pkt, uint32_t *seg_len) -{ - return _odp_packet_data_seg_len(pkt, seg_len); -} - -_ODP_INLINE uint32_t odp_packet_len(odp_packet_t pkt) -{ - return _odp_packet_len(pkt); -} - -_ODP_INLINE uint32_t odp_packet_headroom(odp_packet_t pkt) -{ - return _odp_packet_headroom(pkt); -} - -_ODP_INLINE uint32_t odp_packet_tailroom(odp_packet_t pkt) -{ - return _odp_packet_tailroom(pkt); -} - -_ODP_INLINE odp_pool_t odp_packet_pool(odp_packet_t pkt) -{ - return _odp_packet_pool(pkt); -} - -_ODP_INLINE odp_pktio_t odp_packet_input(odp_packet_t pkt) -{ - return _odp_packet_input(pkt); -} - -_ODP_INLINE int odp_packet_input_index(odp_packet_t pkt) -{ - return _odp_packet_input_index(pkt); -} - -_ODP_INLINE int odp_packet_num_segs(odp_packet_t pkt) -{ - return _odp_packet_num_segs(pkt); -} - -_ODP_INLINE void *odp_packet_user_ptr(odp_packet_t pkt) -{ - return _odp_packet_user_ptr(pkt); -} - -_ODP_INLINE void *odp_packet_user_area(odp_packet_t pkt) -{ - return _odp_packet_user_area(pkt); -} - -_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 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); -} - -_ODP_INLINE odp_time_t odp_packet_ts(odp_packet_t pkt) -{ - return _odp_packet_ts(pkt); -} - -_ODP_INLINE void *odp_packet_head(odp_packet_t pkt) -{ - return _odp_packet_head(pkt); -} - -_ODP_INLINE int odp_packet_is_segmented(odp_packet_t pkt) -{ - return _odp_packet_is_segmented(pkt); -} - -_ODP_INLINE odp_packet_seg_t odp_packet_first_seg(odp_packet_t pkt) -{ - return _odp_packet_first_seg(pkt); -} - -_ODP_INLINE odp_packet_seg_t odp_packet_last_seg(odp_packet_t pkt) -{ - return _odp_packet_last_seg(pkt); -} - -_ODP_INLINE odp_packet_seg_t odp_packet_next_seg(odp_packet_t pkt, - odp_packet_seg_t seg) -{ - return _odp_packet_next_seg(pkt, seg); -} - -_ODP_INLINE void odp_packet_prefetch(odp_packet_t pkt, uint32_t offset, - uint32_t len) -{ - return _odp_packet_prefetch(pkt, offset, len); -} - -_ODP_INLINE int odp_packet_copy_from_mem(odp_packet_t pkt, uint32_t offset, - uint32_t len, const void *src) -{ - return _odp_packet_copy_from_mem(pkt, offset, len, src); -} - -_ODP_INLINE int odp_packet_copy_to_mem(odp_packet_t pkt, uint32_t offset, - uint32_t len, void *dst) -{ - return _odp_packet_copy_to_mem(pkt, offset, len, dst); -} - -_ODP_INLINE odp_packet_t odp_packet_from_event(odp_event_t ev) -{ - return _odp_packet_from_event(ev); -} - -_ODP_INLINE odp_event_t odp_packet_to_event(odp_packet_t pkt) -{ - return _odp_packet_to_event(pkt); -} - -_ODP_INLINE void odp_packet_from_event_multi(odp_packet_t pkt[], - const odp_event_t ev[], int num) -{ - return _odp_packet_from_event_multi(pkt, ev, num); -} - -_ODP_INLINE void odp_packet_to_event_multi(const odp_packet_t pkt[], - odp_event_t ev[], int num) -{ - return _odp_packet_to_event_multi(pkt, ev, num); -} -#endif diff --git a/platform/linux-generic/include/odp/api/plat/pktio_inlines.h b/platform/linux-generic/include/odp/api/plat/pktio_inlines.h index e219952a..2a2f291b 100644 --- a/platform/linux-generic/include/odp/api/plat/pktio_inlines.h +++ b/platform/linux-generic/include/odp/api/plat/pktio_inlines.h @@ -18,6 +18,7 @@ extern "C" { #define _ODP_INLINE static inline #define odp_pktio_index __odp_pktio_index #else + #undef _ODP_INLINE #define _ODP_INLINE #endif diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index b3e1d150..e3204f88 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -1513,7 +1513,7 @@ int odp_packet_align(odp_packet_t *pkt, uint32_t offset, uint32_t len, return rc; (void)odp_packet_move_data(*pkt, 0, shift, - _odp_packet_len(*pkt) - shift); + odp_packet_len(*pkt) - shift); (void)odp_packet_trunc_tail(pkt, shift, NULL, NULL); return 1; @@ -1555,7 +1555,7 @@ int odp_packet_concat(odp_packet_t *dst, odp_packet_t src) int odp_packet_split(odp_packet_t *pkt, uint32_t len, odp_packet_t *tail) { - uint32_t pktlen = _odp_packet_len(*pkt); + uint32_t pktlen = odp_packet_len(*pkt); if (len >= pktlen || tail == NULL) return -1; @@ -1598,7 +1598,7 @@ odp_packet_t odp_packet_copy(odp_packet_t pkt, odp_pool_t pool) odp_packet_t odp_packet_copy_part(odp_packet_t pkt, uint32_t offset, uint32_t len, odp_pool_t pool) { - uint32_t pktlen = _odp_packet_len(pkt); + uint32_t pktlen = odp_packet_len(pkt); odp_packet_t newpkt; if (offset >= pktlen || offset + len > pktlen) diff --git a/platform/linux-generic/odp_packet_api.c b/platform/linux-generic/odp_packet_api.c index 8f9f8dee..6bc37db4 100644 --- a/platform/linux-generic/odp_packet_api.c +++ b/platform/linux-generic/odp_packet_api.c @@ -7,7 +7,6 @@ #include "config.h" #include <odp/api/packet.h> -#include <odp/api/plat/packet_inlines.h> #include <odp_packet_internal.h> #include <odp_debug_internal.h> #include <odp/api/hints.h> @@ -23,7 +22,9 @@ #include <stdio.h> #include <inttypes.h> +/* Prevent this header from being included again later */ +#include <odp/api/plat/pktio_inlines.h> + /* Include non-inlined versions of API functions */ -#undef _ODP_INLINE -#define _ODP_INLINE -#include <odp/api/plat/packet_inlines_api.h> +#define _ODP_NO_INLINE +#include <odp/api/plat/packet_inlines.h> diff --git a/platform/linux-generic/odp_traffic_mngr.c b/platform/linux-generic/odp_traffic_mngr.c index 6e741e01..f851a7b0 100644 --- a/platform/linux-generic/odp_traffic_mngr.c +++ b/platform/linux-generic/odp_traffic_mngr.c @@ -1931,7 +1931,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 @@ -1943,7 +1943,7 @@ static void egress_vlan_marking(tm_vlan_marking_t *vlan_marking, * correctness rather then performance. */ split_hdr = hdr_len < (_ODP_ETHHDR_LEN + _ODP_VLANHDR_LEN); if (split_hdr) { - _odp_packet_copy_to_mem(odp_pkt, _ODP_ETHHDR_LEN, + odp_packet_copy_to_mem(odp_pkt, _ODP_ETHHDR_LEN, _ODP_VLANHDR_LEN, &vlan_hdr); vlan_hdr_ptr = &vlan_hdr; } @@ -1958,7 +1958,7 @@ static void egress_vlan_marking(tm_vlan_marking_t *vlan_marking, vlan_hdr_ptr->tci = odp_cpu_to_be_16(new_tci); if (split_hdr) - _odp_packet_copy_from_mem(odp_pkt, _ODP_ETHHDR_LEN, + odp_packet_copy_from_mem(odp_pkt, _ODP_ETHHDR_LEN, _ODP_VLANHDR_LEN, &vlan_hdr); } @@ -1970,8 +1970,8 @@ 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); - ipv4_hdr_ptr = _odp_packet_l3_ptr(odp_pkt, &hdr_len); + 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 * for this odp (output) packet the IPv4 header is not all in the same @@ -1982,7 +1982,7 @@ static void egress_ipv4_tos_marking(tm_tos_marking_t *tos_marking, * correctness rather then performance. */ split_hdr = hdr_len < 12; if (split_hdr) { - _odp_packet_copy_to_mem(odp_pkt, l3_offset, + odp_packet_copy_to_mem(odp_pkt, l3_offset, _ODP_IPV4HDR_LEN, &ipv4_hdr); ipv4_hdr_ptr = &ipv4_hdr; } @@ -2024,7 +2024,7 @@ static void egress_ipv4_tos_marking(tm_tos_marking_t *tos_marking, ipv4_hdr_ptr->tos = new_tos; ipv4_hdr_ptr->chksum = odp_cpu_to_be_16((~ones_compl_sum) & 0xFFFF); if (split_hdr) - _odp_packet_copy_from_mem(odp_pkt, l3_offset, + odp_packet_copy_from_mem(odp_pkt, l3_offset, _ODP_IPV4HDR_LEN, &ipv4_hdr); } @@ -2036,8 +2036,8 @@ 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); - ipv6_hdr_ptr = _odp_packet_l3_ptr(odp_pkt, &hdr_len); + 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 * for this odp (output) packet the IPv6 header is not all in the same @@ -2048,7 +2048,7 @@ static void egress_ipv6_tc_marking(tm_tos_marking_t *tos_marking, * correctness rather then performance. */ split_hdr = hdr_len < 4; if (split_hdr) { - _odp_packet_copy_to_mem(odp_pkt, l3_offset, + odp_packet_copy_to_mem(odp_pkt, l3_offset, _ODP_IPV6HDR_LEN, &ipv6_hdr); ipv6_hdr_ptr = &ipv6_hdr; } @@ -2077,7 +2077,7 @@ static void egress_ipv6_tc_marking(tm_tos_marking_t *tos_marking, ipv6_hdr_ptr->ver_tc_flow = odp_cpu_to_be_32(new_ver_tc_flow); if (split_hdr) - _odp_packet_copy_from_mem(odp_pkt, l3_offset, + odp_packet_copy_from_mem(odp_pkt, l3_offset, _ODP_IPV6HDR_LEN, &ipv6_hdr); } diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c index 206a6a45..1ecd7d58 100644 --- a/platform/linux-generic/pktio/dpdk.c +++ b/platform/linux-generic/pktio/dpdk.c @@ -483,7 +483,7 @@ static inline int mbuf_to_pkt(pktio_entry_t *pktio_entry, pkt_hdr = packet_hdr(pkt); pull_tail(pkt_hdr, alloc_len - pkt_len); - if (_odp_packet_copy_from_mem(pkt, 0, pkt_len, data) != 0) + if (odp_packet_copy_from_mem(pkt, 0, pkt_len, data) != 0) goto fail; pkt_hdr->input = input; @@ -659,7 +659,7 @@ static inline int pkt_to_mbuf(pktio_entry_t *pktio_entry, /* Packet always fits in mbuf */ data = rte_pktmbuf_append(mbuf_table[i], pkt_len); - _odp_packet_copy_to_mem(pkt_table[i], 0, pkt_len, data); + odp_packet_copy_to_mem(pkt_table[i], 0, pkt_len, data); if (odp_unlikely(pktio_entry->s.chksum_insert_ena)) { odp_pktout_config_opt_t *pktout_capa = @@ -788,7 +788,7 @@ static inline int pkt_to_mbuf_zero(pktio_entry_t *pktio_entry, if (odp_unlikely(pktio_entry->s.chksum_insert_ena)) pkt_set_ol_tx(pktout_cfg, pktout_capa, pkt_hdr, - mbuf, _odp_packet_data(pkt)); + mbuf, odp_packet_data(pkt)); } else { pool_t *pool_entry = pkt_hdr->buf_hdr.pool_ptr; @@ -812,7 +812,7 @@ static inline int pkt_to_mbuf_zero(pktio_entry_t *pktio_entry, if (pktio_entry->s.chksum_insert_ena) pkt_set_ol_tx(pktout_cfg, pktout_capa, pkt_hdr, mbuf, - _odp_packet_data(pkt)); + odp_packet_data(pkt)); } } mbuf_table[i] = mbuf; diff --git a/platform/linux-generic/pktio/netmap.c b/platform/linux-generic/pktio/netmap.c index 1fb76d2a..45f717d5 100644 --- a/platform/linux-generic/pktio/netmap.c +++ b/platform/linux-generic/pktio/netmap.c @@ -715,7 +715,7 @@ static inline int netmap_pkt_to_odp(pktio_entry_t *pktio_entry, /* For now copy the data in the mbuf, worry about zero-copy later */ - if (_odp_packet_copy_from_mem(pkt, 0, len, slot.buf) != 0) + if (odp_packet_copy_from_mem(pkt, 0, len, slot.buf) != 0) goto fail; pkt_hdr->input = pktio_entry->s.handle; @@ -982,7 +982,7 @@ static int netmap_send(pktio_entry_t *pktio_entry, int index, for (nb_tx = 0; nb_tx < num; nb_tx++) { pkt = pkt_table[nb_tx]; - pkt_len = _odp_packet_len(pkt); + pkt_len = odp_packet_len(pkt); if (pkt_len > pkt_nm->mtu) { if (nb_tx == 0) @@ -1000,7 +1000,7 @@ static int netmap_send(pktio_entry_t *pktio_entry, int index, buf = NETMAP_BUF(ring, ring->slot[slot_id].buf_idx); - if (_odp_packet_copy_to_mem(pkt, 0, pkt_len, buf)) { + if (odp_packet_copy_to_mem(pkt, 0, pkt_len, buf)) { i = NM_INJECT_RETRIES; break; } diff --git a/platform/linux-generic/pktio/pcap.c b/platform/linux-generic/pktio/pcap.c index 530a1600..f1662930 100644 --- a/platform/linux-generic/pktio/pcap.c +++ b/platform/linux-generic/pktio/pcap.c @@ -250,7 +250,7 @@ static int pcapif_recv_pkt(pktio_entry_t *pktio_entry, int index ODP_UNUSED, pkt_hdr = packet_hdr(pkt); - if (_odp_packet_copy_from_mem(pkt, 0, hdr->caplen, data) != 0) { + if (odp_packet_copy_from_mem(pkt, 0, hdr->caplen, data) != 0) { ODP_ERR("failed to copy packet data\n"); break; } @@ -285,7 +285,7 @@ static int _pcapif_dump_pkt(pkt_pcap_t *pcap, odp_packet_t pkt) hdr.len = hdr.caplen; (void)gettimeofday(&hdr.ts, NULL); - if (_odp_packet_copy_to_mem(pkt, 0, hdr.len, pcap->buf) != 0) + if (odp_packet_copy_to_mem(pkt, 0, hdr.len, pcap->buf) != 0) return -1; pcap_dump(pcap->tx_dump, &hdr, pcap->buf); diff --git a/platform/linux-generic/pktio/socket_mmap.c b/platform/linux-generic/pktio/socket_mmap.c index 1731e60d..55fb20f4 100644 --- a/platform/linux-generic/pktio/socket_mmap.c +++ b/platform/linux-generic/pktio/socket_mmap.c @@ -245,7 +245,7 @@ static inline unsigned pkt_mmap_v2_rx(pktio_entry_t *pktio_entry, continue; } hdr = packet_hdr(pkt_table[nb_rx]); - ret = _odp_packet_copy_from_mem(pkt_table[nb_rx], 0, + ret = odp_packet_copy_from_mem(pkt_table[nb_rx], 0, pkt_len, pkt_buf); if (ret != 0) { odp_packet_free(pkt_table[nb_rx]); @@ -348,7 +348,7 @@ static inline unsigned pkt_mmap_v2_tx(int sock, struct ring *ring, buf = (uint8_t *)ppd.raw + TPACKET2_HDRLEN - sizeof(struct sockaddr_ll); - _odp_packet_copy_to_mem(pkt_table[i], 0, pkt_len, buf); + odp_packet_copy_to_mem(pkt_table[i], 0, pkt_len, buf); mmap_tx_user_ready(ppd.raw); diff --git a/platform/linux-generic/pktio/tap.c b/platform/linux-generic/pktio/tap.c index d2f5cea1..032a8ecf 100644 --- a/platform/linux-generic/pktio/tap.c +++ b/platform/linux-generic/pktio/tap.c @@ -274,7 +274,7 @@ static odp_packet_t pack_odp_pkt(pktio_entry_t *pktio_entry, const void *data, if (num != 1) return ODP_PACKET_INVALID; - if (_odp_packet_copy_from_mem(pkt, 0, len, data) < 0) { + if (odp_packet_copy_from_mem(pkt, 0, len, data) < 0) { ODP_ERR("failed to copy packet data\n"); odp_packet_free(pkt); return ODP_PACKET_INVALID; @@ -354,7 +354,7 @@ static int tap_pktio_send_lockless(pktio_entry_t *pktio_entry, break; } - if (_odp_packet_copy_to_mem(pkts[i], 0, pkt_len, buf) < 0) { + if (odp_packet_copy_to_mem(pkts[i], 0, pkt_len, buf) < 0) { ODP_ERR("failed to copy packet data\n"); break; } commit a4d31373e5a0f72d028ff73ca9eae0fd6671f350 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue May 15 00:26:21 2018 +0300 linux-gen: thread: remove separate API inlining header 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 373a1b10..033f38a5 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -37,7 +37,6 @@ odpapiplatinclude_HEADERS = \ include/odp/api/plat/strong_types.h \ include/odp/api/plat/sync_inlines.h \ include/odp/api/plat/thread_inlines.h \ - include/odp/api/plat/thread_inlines_api.h \ include/odp/api/plat/ticketlock_inlines.h odpapiabiarchincludedir = $(archincludedir)/odp/api/abi diff --git a/platform/linux-generic/include-abi/odp/api/abi/thread.h b/platform/linux-generic/include-abi/odp/api/abi/thread.h index 8cd36bda..d5628a74 100644 --- a/platform/linux-generic/include-abi/odp/api/abi/thread.h +++ b/platform/linux-generic/include-abi/odp/api/abi/thread.h @@ -6,6 +6,4 @@ #include <odp/api/abi-default/thread.h> -#define _ODP_INLINE static inline #include <odp/api/plat/thread_inlines.h> -#include <odp/api/plat/thread_inlines_api.h> diff --git a/platform/linux-generic/include/odp/api/plat/thread_inlines.h b/platform/linux-generic/include/odp/api/plat/thread_inlines.h index deecc653..ecab29e5 100644 --- a/platform/linux-generic/include/odp/api/plat/thread_inlines.h +++ b/platform/linux-generic/include/odp/api/plat/thread_inlines.h @@ -22,17 +22,27 @@ typedef struct { extern __thread _odp_thread_state_t *_odp_this_thread; -static inline int _odp_thread_id(void) +#ifndef _ODP_NO_INLINE + /* Inline functions by default */ + #define _ODP_INLINE static inline + #define odp_thread_id __odp_thread_id + #define odp_thread_type __odp_thread_type + #define odp_cpu_id __odp_cpu_id +#else + #define _ODP_INLINE +#endif + +_ODP_INLINE int odp_thread_id(void) { return _odp_this_thread->thr; } -static inline odp_thread_type_t _odp_thread_type(void) +_ODP_INLINE odp_thread_type_t odp_thread_type(void) { return _odp_this_thread->type; } -static inline int _odp_cpu_id(void) +_ODP_INLINE int odp_cpu_id(void) { return _odp_this_thread->cpu; } diff --git a/platform/linux-generic/include/odp/api/plat/thread_inlines_api.h b/platform/linux-generic/include/odp/api/plat/thread_inlines_api.h deleted file mode 100644 index 08193e2b..00000000 --- a/platform/linux-generic/include/odp/api/plat/thread_inlines_api.h +++ /dev/null @@ -1,41 +0,0 @@ -/* Copyright (c) 2018-2018, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -/** - * @file - */ - -#ifndef ODP_PLAT_THREAD_INLINES_API_H_ -#define ODP_PLAT_THREAD_INLINES_API_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -_ODP_INLINE int odp_thread_id(void) -{ - return _odp_thread_id(); -} - -_ODP_INLINE odp_thread_type_t odp_thread_type(void) -{ - return _odp_thread_type(); -} - -_ODP_INLINE int odp_cpu_id(void) -{ - return _odp_cpu_id(); -} - -/** - * @} - */ - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/platform/linux-generic/odp_rwlock_recursive.c b/platform/linux-generic/odp_rwlock_recursive.c index 397a054b..dac9ad19 100644 --- a/platform/linux-generic/odp_rwlock_recursive.c +++ b/platform/linux-generic/odp_rwlock_recursive.c @@ -23,7 +23,7 @@ void odp_rwlock_recursive_init(odp_rwlock_recursive_t *rlock) /* Multiple readers can recurse the lock concurrently */ void odp_rwlock_recursive_read_lock(odp_rwlock_recursive_t *rlock) { - int thr = _odp_thread_id(); + int thr = odp_thread_id(); if (rlock->rd_cnt[thr]) { rlock->rd_cnt[thr]++; @@ -37,7 +37,7 @@ void odp_rwlock_recursive_read_lock(odp_rwlock_recursive_t *rlock) /* Multiple readers can recurse the lock concurrently */ int odp_rwlock_recursive_read_trylock(odp_rwlock_recursive_t *rlock) { - int thr = _odp_thread_id(); + int thr = odp_thread_id(); if (rlock->rd_cnt[thr]) { rlock->rd_cnt[thr]++; @@ -54,7 +54,7 @@ int odp_rwlock_recursive_read_trylock(odp_rwlock_recursive_t *rlock) void odp_rwlock_recursive_read_unlock(odp_rwlock_recursive_t *rlock) { - int thr = _odp_thread_id(); + int thr = odp_thread_id(); rlock->rd_cnt[thr]--; @@ -67,7 +67,7 @@ void odp_rwlock_recursive_read_unlock(odp_rwlock_recursive_t *rlock) /* Only one writer can recurse the lock */ void odp_rwlock_recursive_write_lock(odp_rwlock_recursive_t *rlock) { - int thr = _odp_thread_id(); + int thr = odp_thread_id(); if (rlock->wr_owner == thr) { rlock->wr_cnt++; @@ -82,7 +82,7 @@ void odp_rwlock_recursive_write_lock(odp_rwlock_recursive_t *rlock) /* Only one writer can recurse the lock */ int odp_rwlock_recursive_write_trylock(odp_rwlock_recursive_t *rlock) { - int thr = _odp_thread_id(); + int thr = odp_thread_id(); if (rlock->wr_owner == thr) { rlock->wr_cnt++; diff --git a/platform/linux-generic/odp_spinlock_recursive.c b/platform/linux-generic/odp_spinlock_recursive.c index d5288969..59374268 100644 --- a/platform/linux-generic/odp_spinlock_recursive.c +++ b/platform/linux-generic/odp_spinlock_recursive.c @@ -21,7 +21,7 @@ void odp_spinlock_recursive_init(odp_spinlock_recursive_t *rlock) void odp_spinlock_recursive_lock(odp_spinlock_recursive_t *rlock) { - int thr = _odp_thread_id(); + int thr = odp_thread_id(); if (rlock->owner == thr) { rlock->cnt++; @@ -35,7 +35,7 @@ void odp_spinlock_recursive_lock(odp_spinlock_recursive_t *rlock) int odp_spinlock_recursive_trylock(odp_spinlock_recursive_t *rlock) { - int thr = _odp_thread_id(); + int thr = odp_thread_id(); if (rlock->owner == thr) { rlock->cnt++; @@ -64,7 +64,7 @@ void odp_spinlock_recursive_unlock(odp_spinlock_recursive_t *rlock) int odp_spinlock_recursive_is_locked(odp_spinlock_recursive_t *rlock) { - int thr = _odp_thread_id(); + int thr = odp_thread_id(); if (rlock->owner == thr) return 1; diff --git a/platform/linux-generic/odp_thread_api.c b/platform/linux-generic/odp_thread_api.c index 7f07f6a3..cfce705d 100644 --- a/platform/linux-generic/odp_thread_api.c +++ b/platform/linux-generic/odp_thread_api.c @@ -8,8 +8,7 @@ #include <odp/api/thread.h> #include <odp/api/cpu.h> -#include <odp/api/plat/thread_inlines.h> /* Include non-inlined versions of API functions */ -#define _ODP_INLINE -#include <odp/api/plat/thread_inlines_api.h> +#define _ODP_NO_INLINE +#include <odp/api/plat/thread_inlines.h> ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/Makefile.am | 6 +- .../linux-generic/include-abi/odp/api/abi/packet.h | 2 - .../linux-generic/include-abi/odp/api/abi/thread.h | 2 - .../include/odp/api/plat/packet_flag_inlines.h | 1 + .../include/odp/api/plat/packet_inlines.h | 153 ++++++++++------- .../include/odp/api/plat/packet_inlines_api.h | 186 --------------------- .../include/odp/api/plat/pktio_inlines.h | 1 + .../include/odp/api/plat/std_clib_inlines.h | 18 +- .../include/odp/api/plat/sync_inlines.h | 18 +- .../include/odp/api/plat/thread_inlines.h | 16 +- .../include/odp/api/plat/thread_inlines_api.h | 41 ----- .../include/odp/api/plat/ticketlock_inlines.h | 3 + platform/linux-generic/include/odp_ring_internal.h | 1 + platform/linux-generic/odp_barrier.c | 2 + platform/linux-generic/odp_crypto.c | 1 + platform/linux-generic/odp_ipsec_sad.c | 1 + platform/linux-generic/odp_packet.c | 6 +- platform/linux-generic/odp_packet_api.c | 9 +- platform/linux-generic/odp_packet_io.c | 1 + platform/linux-generic/odp_pool.c | 1 + platform/linux-generic/odp_queue_basic.c | 1 + platform/linux-generic/odp_queue_lf.c | 1 + platform/linux-generic/odp_queue_scalable.c | 1 + platform/linux-generic/odp_rwlock.c | 1 + platform/linux-generic/odp_rwlock_recursive.c | 10 +- platform/linux-generic/odp_schedule_basic.c | 1 + platform/linux-generic/odp_schedule_iquery.c | 1 + platform/linux-generic/odp_schedule_scalable.c | 1 + platform/linux-generic/odp_schedule_sp.c | 1 + platform/linux-generic/odp_spinlock_recursive.c | 6 +- .../{odp_std_clib.c => odp_std_clib_api.c} | 2 +- .../linux-generic/{odp_sync.c => odp_sync_api.c} | 2 +- platform/linux-generic/odp_thread_api.c | 5 +- platform/linux-generic/odp_ticketlock_api.c | 1 + platform/linux-generic/odp_traffic_mngr.c | 22 +-- platform/linux-generic/pktio/dpdk.c | 8 +- platform/linux-generic/pktio/netmap.c | 6 +- platform/linux-generic/pktio/pcap.c | 4 +- platform/linux-generic/pktio/socket_mmap.c | 4 +- platform/linux-generic/pktio/tap.c | 4 +- 40 files changed, 201 insertions(+), 350 deletions(-) delete mode 100644 platform/linux-generic/include/odp/api/plat/packet_inlines_api.h delete mode 100644 platform/linux-generic/include/odp/api/plat/thread_inlines_api.h rename platform/linux-generic/{odp_std_clib.c => odp_std_clib_api.c} (92%) rename platform/linux-generic/{odp_sync.c => odp_sync_api.c} (91%) hooks/post-receive --

5 years, 11 months

[COMMIT] branch master updated. v1.19.0.1_tigermoth-24-g37390a88

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 37390a88fd35d972a8e399fc934c612c1043ad77 (commit) via 4b895826e62b9b6e7512d76d05999752ffc93432 (commit) via 3ee54c088ec06a65b1ae7ece2dae8cfabfe90d12 (commit) via 9e1aad1fbffad60e849c9cac613e282fd3f80646 (commit) via 1da9bcf69a3f2c364eb1674b44ede4c0cf280f06 (commit) via d61545b5b2ad42d7e9fca34d3b077942fcc04c01 (commit) via f426dbf3b4dc5be7a1b56d9cc3c0dab00eb9787c (commit) from 40699694b24cceb86ed441308309393de84c3478 (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 37390a88fd35d972a8e399fc934c612c1043ad77 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue May 15 00:26:21 2018 +0300 linux-gen: byteorder: remove separate API inlining header 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 e084eb2c..373a1b10 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -26,7 +26,6 @@ odpapiplatinclude_HEADERS = \ include/odp/api/plat/atomic_inlines.h \ include/odp/api/plat/buffer_inline_types.h \ include/odp/api/plat/byteorder_inlines.h \ - include/odp/api/plat/byteorder_inlines_api.h \ include/odp/api/plat/event_inlines.h \ include/odp/api/plat/packet_flag_inlines.h \ include/odp/api/plat/packet_inline_types.h \ @@ -214,7 +213,7 @@ __LIB__libodp_linux_la_SOURCES = \ if ODP_ABI_COMPAT __LIB__libodp_linux_la_SOURCES += \ odp_atomic_api.c \ - odp_byteorder.c \ + odp_byteorder_api.c \ odp_event_api.c \ odp_packet_api.c \ odp_packet_flags_api.c \ diff --git a/platform/linux-generic/include-abi/odp/api/abi/byteorder.h b/platform/linux-generic/include-abi/odp/api/abi/byteorder.h index 8be28603..c0b5ebe0 100644 --- a/platform/linux-generic/include-abi/odp/api/abi/byteorder.h +++ b/platform/linux-generic/include-abi/odp/api/abi/byteorder.h @@ -75,9 +75,7 @@ typedef uint64_t __odp_bitwise odp_u64be_t; typedef uint16_t __odp_bitwise odp_u16sum_t; typedef uint32_t __odp_bitwise odp_u32sum_t; -#define _ODP_INLINE static inline #include <odp/api/plat/byteorder_inlines.h> -#include <odp/api/plat/byteorder_inlines_api.h> /** * @} diff --git a/platform/linux-generic/include/odp/api/plat/byteorder_inlines.h b/platform/linux-generic/include/odp/api/plat/byteorder_inlines.h index 56a2b31c..6cc2a9a1 100644 --- a/platform/linux-generic/include/odp/api/plat/byteorder_inlines.h +++ b/platform/linux-generic/include/odp/api/plat/byteorder_inlines.h @@ -17,13 +17,30 @@ extern "C" { #endif +/** @cond _ODP_HIDE_FROM_DOXYGEN_ */ + #ifndef __odp_force #define __odp_force #endif -/** @ingroup odp_compiler_optim - * @{ - */ +#ifndef _ODP_NO_INLINE + /* Inline functions by default */ + #define _ODP_INLINE static inline + #define odp_be_to_cpu_16 __odp_be_to_cpu_16 + #define odp_be_to_cpu_32 __odp_be_to_cpu_32 + #define odp_be_to_cpu_64 __odp_be_to_cpu_64 + #define odp_cpu_to_be_16 __odp_cpu_to_be_16 + #define odp_cpu_to_be_32 __odp_cpu_to_be_32 + #define odp_cpu_to_be_64 __odp_cpu_to_be_64 + #define odp_le_to_cpu_16 __odp_le_to_cpu_16 + #define odp_le_to_cpu_32 __odp_le_to_cpu_32 + #define odp_le_to_cpu_64 __odp_le_to_cpu_64 + #define odp_cpu_to_le_16 __odp_cpu_to_le_16 + #define odp_cpu_to_le_32 __odp_cpu_to_le_32 + #define odp_cpu_to_le_64 __odp_cpu_to_le_64 +#else + #define _ODP_INLINE +#endif /** @internal GNU compiler version */ #define GCC_VERSION (__GNUC__ * 10000 \ @@ -43,7 +60,7 @@ extern "C" { #define __odp_builtin_bswap16(u16) __builtin_bswap16(u16) #endif -static inline uint16_t _odp_be_to_cpu_16(odp_u16be_t be16) +_ODP_INLINE uint16_t odp_be_to_cpu_16(odp_u16be_t be16) { #if ODP_BYTE_ORDER == ODP_LITTLE_ENDIAN return __odp_builtin_bswap16((__odp_force uint16_t)be16); @@ -52,7 +69,7 @@ static inline uint16_t _odp_be_to_cpu_16(odp_u16be_t be16) #endif } -static inline uint32_t _odp_be_to_cpu_32(odp_u32be_t be32) +_ODP_INLINE uint32_t odp_be_to_cpu_32(odp_u32be_t be32) { #if ODP_BYTE_ORDER == ODP_LITTLE_ENDIAN return __builtin_bswap32((__odp_force uint32_t)be32); @@ -61,7 +78,7 @@ static inline uint32_t _odp_be_to_cpu_32(odp_u32be_t be32) #endif } -static inline uint64_t _odp_be_to_cpu_64(odp_u64be_t be64) +_ODP_INLINE uint64_t odp_be_to_cpu_64(odp_u64be_t be64) { #if ODP_BYTE_ORDER == ODP_LITTLE_ENDIAN return __builtin_bswap64((__odp_force uint64_t)be64); @@ -70,7 +87,7 @@ static inline uint64_t _odp_be_to_cpu_64(odp_u64be_t be64) #endif } -static inline odp_u16be_t _odp_cpu_to_be_16(uint16_t cpu16) +_ODP_INLINE odp_u16be_t odp_cpu_to_be_16(uint16_t cpu16) { #if ODP_BYTE_ORDER == ODP_LITTLE_ENDIAN return (__odp_force odp_u16be_t)__odp_builtin_bswap16(cpu16); @@ -79,7 +96,7 @@ static inline odp_u16be_t _odp_cpu_to_be_16(uint16_t cpu16) #endif } -static inline odp_u32be_t _odp_cpu_to_be_32(uint32_t cpu32) +_ODP_INLINE odp_u32be_t odp_cpu_to_be_32(uint32_t cpu32) { #if ODP_BYTE_ORDER == ODP_LITTLE_ENDIAN return (__odp_force odp_u32be_t)__builtin_bswap32(cpu32); @@ -88,7 +105,7 @@ static inline odp_u32be_t _odp_cpu_to_be_32(uint32_t cpu32) #endif } -static inline odp_u64be_t _odp_cpu_to_be_64(uint64_t cpu64) +_ODP_INLINE odp_u64be_t odp_cpu_to_be_64(uint64_t cpu64) { #if ODP_BYTE_ORDER == ODP_LITTLE_ENDIAN return (__odp_force odp_u64be_t)__builtin_bswap64(cpu64); @@ -97,7 +114,7 @@ static inline odp_u64be_t _odp_cpu_to_be_64(uint64_t cpu64) #endif } -static inline uint16_t _odp_le_to_cpu_16(odp_u16le_t le16) +_ODP_INLINE uint16_t odp_le_to_cpu_16(odp_u16le_t le16) { #if ODP_BYTE_ORDER == ODP_LITTLE_ENDIAN return (__odp_force uint16_t)le16; @@ -106,7 +123,7 @@ static inline uint16_t _odp_le_to_cpu_16(odp_u16le_t le16) #endif } -static inline uint32_t _odp_le_to_cpu_32(odp_u32le_t le32) +_ODP_INLINE uint32_t odp_le_to_cpu_32(odp_u32le_t le32) { #if ODP_BYTE_ORDER == ODP_LITTLE_ENDIAN return (__odp_force uint32_t)le32; @@ -115,7 +132,7 @@ static inline uint32_t _odp_le_to_cpu_32(odp_u32le_t le32) #endif } -static inline uint64_t _odp_le_to_cpu_64(odp_u64le_t le64) +_ODP_INLINE uint64_t odp_le_to_cpu_64(odp_u64le_t le64) { #if ODP_BYTE_ORDER == ODP_LITTLE_ENDIAN return (__odp_force uint64_t)le64; @@ -124,7 +141,7 @@ static inline uint64_t _odp_le_to_cpu_64(odp_u64le_t le64) #endif } -static inline odp_u16le_t _odp_cpu_to_le_16(uint16_t cpu16) +_ODP_INLINE odp_u16le_t odp_cpu_to_le_16(uint16_t cpu16) { #if ODP_BYTE_ORDER == ODP_LITTLE_ENDIAN return (__odp_force odp_u16le_t)cpu16; @@ -133,7 +150,7 @@ static inline odp_u16le_t _odp_cpu_to_le_16(uint16_t cpu16) #endif } -static inline odp_u32le_t _odp_cpu_to_le_32(uint32_t cpu32) +_ODP_INLINE odp_u32le_t odp_cpu_to_le_32(uint32_t cpu32) { #if ODP_BYTE_ORDER == ODP_LITTLE_ENDIAN return (__odp_force odp_u32le_t)cpu32; @@ -142,7 +159,7 @@ static inline odp_u32le_t _odp_cpu_to_le_32(uint32_t cpu32) #endif } -static inline odp_u64le_t _odp_cpu_to_le_64(uint64_t cpu64) +_ODP_INLINE odp_u64le_t odp_cpu_to_le_64(uint64_t cpu64) { #if ODP_BYTE_ORDER == ODP_LITTLE_ENDIAN return (__odp_force odp_u64le_t)cpu64; @@ -151,9 +168,7 @@ static inline odp_u64le_t _odp_cpu_to_le_64(uint64_t cpu64) #endif } -/** - * @} - */ +/** @endcond */ #ifdef __cplusplus } diff --git a/platform/linux-generic/include/odp/api/plat/byteorder_inlines_api.h b/platform/linux-generic/include/odp/api/plat/byteorder_inlines_api.h deleted file mode 100644 index f979f601..00000000 --- a/platform/linux-generic/include/odp/api/plat/byteorder_inlines_api.h +++ /dev/null @@ -1,88 +0,0 @@ -/* Copyright (c) 2018-2018, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -/** - * @file - * - * ODP byteorder - */ - -#ifndef ODP_PLAT_BYTEORDER_INLINES_API_H_ -#define ODP_PLAT_BYTEORDER_INLINES_API_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -_ODP_INLINE uint16_t odp_be_to_cpu_16(odp_u16be_t be16) -{ - return _odp_be_to_cpu_16(be16); -} - -_ODP_INLINE uint32_t odp_be_to_cpu_32(odp_u32be_t be32) -{ - return _odp_be_to_cpu_32(be32); -} - -_ODP_INLINE uint64_t odp_be_to_cpu_64(odp_u64be_t be64) -{ - return _odp_be_to_cpu_64(be64); -} - -_ODP_INLINE odp_u16be_t odp_cpu_to_be_16(uint16_t cpu16) -{ - return _odp_cpu_to_be_16(cpu16); -} - -_ODP_INLINE odp_u32be_t odp_cpu_to_be_32(uint32_t cpu32) -{ - return _odp_cpu_to_be_32(cpu32); -} - -_ODP_INLINE odp_u64be_t odp_cpu_to_be_64(uint64_t cpu64) -{ - return _odp_cpu_to_be_64(cpu64); -} - -_ODP_INLINE uint16_t odp_le_to_cpu_16(odp_u16le_t le16) -{ - return _odp_le_to_cpu_16(le16); -} - -_ODP_INLINE uint32_t odp_le_to_cpu_32(odp_u32le_t le32) -{ - return _odp_le_to_cpu_32(le32); -} - -_ODP_INLINE uint64_t odp_le_to_cpu_64(odp_u64le_t le64) -{ - return _odp_le_to_cpu_64(le64); -} - -_ODP_INLINE odp_u16le_t odp_cpu_to_le_16(uint16_t cpu16) -{ - return _odp_cpu_to_le_16(cpu16); -} - -_ODP_INLINE odp_u32le_t odp_cpu_to_le_32(uint32_t cpu32) -{ - return _odp_cpu_to_le_32(cpu32); -} - -_ODP_INLINE odp_u64le_t odp_cpu_to_le_64(uint64_t cpu64) -{ - return _odp_cpu_to_le_64(cpu64); -} - -/** - * @} - */ - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/platform/linux-generic/include/odp_classification_inlines.h b/platform/linux-generic/include/odp_classification_inlines.h index 3f1d9ce6..69819276 100644 --- a/platform/linux-generic/include/odp_classification_inlines.h +++ b/platform/linux-generic/include/odp_classification_inlines.h @@ -70,7 +70,7 @@ static inline int verify_pmr_ipv4_saddr(const uint8_t *pkt_addr, if (!pkt_hdr->p.input_flags.ipv4) return 0; ip = (const _odp_ipv4hdr_t *)(pkt_addr + pkt_hdr->p.l3_offset); - ipaddr = _odp_be_to_cpu_32(ip->src_addr); + ipaddr = odp_be_to_cpu_32(ip->src_addr); if (term_value->match.value == (ipaddr & term_value->match.mask)) return 1; @@ -86,7 +86,7 @@ static inline int verify_pmr_ipv4_daddr(const uint8_t *pkt_addr, if (!pkt_hdr->p.input_flags.ipv4) return 0; ip = (const _odp_ipv4hdr_t *)(pkt_addr + pkt_hdr->p.l3_offset); - ipaddr = _odp_be_to_cpu_32(ip->dst_addr); + ipaddr = odp_be_to_cpu_32(ip->dst_addr); if (term_value->match.value == (ipaddr & term_value->match.mask)) return 1; @@ -102,7 +102,7 @@ static inline int verify_pmr_tcp_sport(const uint8_t *pkt_addr, if (!pkt_hdr->p.input_flags.tcp) return 0; tcp = (const _odp_tcphdr_t *)(pkt_addr + pkt_hdr->p.l4_offset); - sport = _odp_be_to_cpu_16(tcp->src_port); + sport = odp_be_to_cpu_16(tcp->src_port); if (term_value->match.value == (sport & term_value->match.mask)) return 1; @@ -118,7 +118,7 @@ static inline int verify_pmr_tcp_dport(const uint8_t *pkt_addr, if (!pkt_hdr->p.input_flags.tcp) return 0; tcp = (const _odp_tcphdr_t *)(pkt_addr + pkt_hdr->p.l4_offset); - dport = _odp_be_to_cpu_16(tcp->dst_port); + dport = odp_be_to_cpu_16(tcp->dst_port); if (term_value->match.value == (dport & term_value->match.mask)) return 1; @@ -134,7 +134,7 @@ static inline int verify_pmr_udp_dport(const uint8_t *pkt_addr, if (!pkt_hdr->p.input_flags.udp) return 0; udp = (const _odp_udphdr_t *)(pkt_addr + pkt_hdr->p.l4_offset); - dport = _odp_be_to_cpu_16(udp->dst_port); + dport = odp_be_to_cpu_16(udp->dst_port); if (term_value->match.value == (dport & term_value->match.mask)) return 1; @@ -151,7 +151,7 @@ static inline int verify_pmr_udp_sport(const uint8_t *pkt_addr, if (!pkt_hdr->p.input_flags.udp) return 0; udp = (const _odp_udphdr_t *)(pkt_addr + pkt_hdr->p.l4_offset); - sport = _odp_be_to_cpu_16(udp->src_port); + sport = odp_be_to_cpu_16(udp->src_port); if (term_value->match.value == (sport & term_value->match.mask)) return 1; @@ -171,9 +171,9 @@ static inline int verify_pmr_dmac(const uint8_t *pkt_addr, eth = (const _odp_ethhdr_t *)(pkt_addr + pkt_hdr->p.l2_offset); memcpy(&dmac_be, eth->dst.addr, _ODP_ETHADDR_LEN); - dmac = _odp_be_to_cpu_64(dmac_be); + dmac = odp_be_to_cpu_64(dmac_be); /* since we are converting a 48 bit ethernet address from BE to cpu - format using _odp_be_to_cpu_64() the last 16 bits needs to be right + format using odp_be_to_cpu_64() the last 16 bits needs to be right shifted */ if (dmac_be != dmac) dmac = dmac >> (64 - (_ODP_ETHADDR_LEN * 8)); @@ -247,7 +247,7 @@ static inline int verify_pmr_vlan_id_0(const uint8_t *pkt_addr, eth = (const _odp_ethhdr_t *)(pkt_addr + pkt_hdr->p.l2_offset); vlan = (const _odp_vlanhdr_t *)(eth + 1); - tci = _odp_be_to_cpu_16(vlan->tci); + tci = odp_be_to_cpu_16(vlan->tci); vlan_id = tci & 0x0fff; if (term_value->match.value == (vlan_id & term_value->match.mask)) @@ -271,7 +271,7 @@ static inline int verify_pmr_vlan_id_x(const uint8_t *pkt_addr ODP_UNUSED, eth = (const _odp_ethhdr_t *)(pkt_addr + pkt_hdr->p.l2_offset); vlan = (const _odp_vlanhdr_t *)(eth + 1); vlan++; - tci = _odp_be_to_cpu_16(vlan->tci); + tci = odp_be_to_cpu_16(vlan->tci); vlan_id = tci & 0x0fff; if (term_value->match.value == (vlan_id & term_value->match.mask)) @@ -291,11 +291,11 @@ static inline int verify_pmr_ipsec_spi(const uint8_t *pkt_addr, if (pkt_hdr->p.input_flags.ipsec_ah) { const _odp_ahhdr_t *ahhdr = (const _odp_ahhdr_t *)pkt_addr; - spi = _odp_be_to_cpu_32(ahhdr->spi); + spi = odp_be_to_cpu_32(ahhdr->spi); } else if (pkt_hdr->p.input_flags.ipsec_esp) { const _odp_esphdr_t *esphdr = (const _odp_esphdr_t *)pkt_addr; - spi = _odp_be_to_cpu_32(esphdr->spi); + spi = odp_be_to_cpu_32(esphdr->spi); } else { return 0; } @@ -345,7 +345,7 @@ static inline int verify_pmr_eth_type_0(const uint8_t *pkt_addr, return 0; eth = (const _odp_ethhdr_t *)(pkt_addr + pkt_hdr->p.l2_offset); - ethtype = _odp_be_to_cpu_16(eth->type); + ethtype = odp_be_to_cpu_16(eth->type); if (term_value->match.value == (ethtype & term_value->match.mask)) return 1; @@ -366,7 +366,7 @@ static inline int verify_pmr_eth_type_x(const uint8_t *pkt_addr, eth = (const _odp_ethhdr_t *)(pkt_addr + pkt_hdr->p.l2_offset); vlan = (const _odp_vlanhdr_t *)(eth + 1); - ethtype = _odp_be_to_cpu_16(vlan->type); + ethtype = odp_be_to_cpu_16(vlan->type); if (term_value->match.value == (ethtype & term_value->match.mask)) return 1; diff --git a/platform/linux-generic/include/protocols/thash.h b/platform/linux-generic/include/protocols/thash.h index 0f10a3cb..2109c8a5 100644 --- a/platform/linux-generic/include/protocols/thash.h +++ b/platform/linux-generic/include/protocols/thash.h @@ -67,10 +67,10 @@ void thash_load_ipv6_addr(const _odp_ipv6hdr_t *ipv6, for (i = 0; i < 4; i++) { *(tuple->v6.src_addr.u32 + i) = - _odp_be_to_cpu_32(*(ipv6->src_addr.u32 + i)); + odp_be_to_cpu_32(*(ipv6->src_addr.u32 + i)); *(tuple->v6.dst_addr.u32 + i) = - _odp_be_to_cpu_32(*(ipv6->dst_addr.u32 + i)); + odp_be_to_cpu_32(*(ipv6->dst_addr.u32 + i)); } } @@ -83,9 +83,9 @@ uint32_t thash_softrss(uint32_t *tuple, uint8_t len, for (j = 0; j < len; j++) { for (i = 0; i < 32; i++) { if (tuple[j] & (1 << (31 - i))) { - ret ^= _odp_cpu_to_be_32(((const uint32_t *) + ret ^= odp_cpu_to_be_32(((const uint32_t *) key.u32)[j]) << i | (uint32_t)((uint64_t) - (_odp_cpu_to_be_32(((const uint32_t *)key.u32) + (odp_cpu_to_be_32(((const uint32_t *)key.u32) [j + 1])) >> (32 - i)); } } diff --git a/platform/linux-generic/odp_byteorder.c b/platform/linux-generic/odp_byteorder_api.c similarity index 79% rename from platform/linux-generic/odp_byteorder.c rename to platform/linux-generic/odp_byteorder_api.c index ec7d261d..7d8c9516 100644 --- a/platform/linux-generic/odp_byteorder.c +++ b/platform/linux-generic/odp_byteorder_api.c @@ -9,6 +9,5 @@ #include <odp/api/byteorder.h> /* Include non-inlined versions of API functions */ -#define _ODP_INLINE +#define _ODP_NO_INLINE #include <odp/api/plat/byteorder_inlines.h> -#include <odp/api/plat/byteorder_inlines_api.h> diff --git a/platform/linux-generic/odp_classification.c b/platform/linux-generic/odp_classification.c index ae4eb585..8b25cf4c 100644 --- a/platform/linux-generic/odp_classification.c +++ b/platform/linux-generic/odp_classification.c @@ -1133,7 +1133,7 @@ cos_t *match_qos_l2_cos(pmr_l2_cos_t *l2_cos, const uint8_t *pkt_addr, packet_hdr_has_eth(hdr)) { eth = (const _odp_ethhdr_t *)(pkt_addr + hdr->p.l2_offset); vlan = (const _odp_vlanhdr_t *)(eth + 1); - qos = _odp_be_to_cpu_16(vlan->tci); + qos = odp_be_to_cpu_16(vlan->tci); qos = ((qos >> 13) & 0x07); cos = l2_cos->cos[qos]; } diff --git a/platform/linux-generic/odp_ipsec.c b/platform/linux-generic/odp_ipsec.c index 7401f590..a72dee33 100644 --- a/platform/linux-generic/odp_ipsec.c +++ b/platform/linux-generic/odp_ipsec.c @@ -251,11 +251,11 @@ static int ipsec_parse_ipv4(ipsec_state_t *state, odp_packet_t pkt) odp_packet_copy_to_mem(pkt, state->ip_offset, _ODP_IPV4HDR_LEN, &ipv4hdr); - if (_ODP_IPV4HDR_IS_FRAGMENT(_odp_be_to_cpu_16(ipv4hdr.frag_offset))) + if (_ODP_IPV4HDR_IS_FRAGMENT(odp_be_to_cpu_16(ipv4hdr.frag_offset))) return -1; state->ip_hdr_len = ipv4_hdr_len(&ipv4hdr); - state->ip_tot_len = _odp_be_to_cpu_16(ipv4hdr.tot_len); + state->ip_tot_len = odp_be_to_cpu_16(ipv4hdr.tot_len); state->ip_next_hdr = ipv4hdr.proto; state->ip_next_hdr_offset = state->ip_offset + _ODP_IPV4HDR_PROTO_OFFSET; @@ -276,7 +276,7 @@ static int ipsec_parse_ipv6(ipsec_state_t *state, odp_packet_t pkt) state->ip_next_hdr = ipv6hdr.next_hdr; state->ip_next_hdr_offset = state->ip_offset + _ODP_IPV6HDR_NHDR_OFFSET; /* FIXME: Jumbo frames */ - state->ip_tot_len = _odp_be_to_cpu_16(ipv6hdr.payload_len) + + state->ip_tot_len = odp_be_to_cpu_16(ipv6hdr.payload_len) + _ODP_IPV6HDR_LEN; memcpy(state->ipv6_addr, &ipv6hdr.dst_addr, _ODP_IPV6ADDR_LEN); @@ -379,8 +379,8 @@ static int ipsec_in_esp(odp_packet_t *pkt, odp_packet_copy_to_mem(*pkt, ipsec_offset, _ODP_UDPHDR_LEN, &udp); - if (udp.dst_port != _odp_cpu_to_be_16(_ODP_UDP_IPSEC_PORT) || - udp.length != _odp_cpu_to_be_16(ip_data_len)) { + if (udp.dst_port != odp_cpu_to_be_16(_ODP_UDP_IPSEC_PORT) || + udp.length != odp_cpu_to_be_16(ip_data_len)) { status->error.proto = 1; return -1; } @@ -397,7 +397,7 @@ static int ipsec_in_esp(odp_packet_t *pkt, } ipsec_sa = ipsec_get_sa(sa, ODP_IPSEC_ESP, - _odp_be_to_cpu_32(esp.spi), + odp_be_to_cpu_32(esp.spi), state->is_ipv4 ? ODP_IPSEC_IPV4 : ODP_IPSEC_IPV6, &state->ipv4_addr, status); @@ -435,7 +435,7 @@ static int ipsec_in_esp(odp_packet_t *pkt, state->esp.aad.spi = esp.spi; state->esp.aad.seq_no = esp.seq_no; - state->in.seq_no = _odp_be_to_cpu_32(esp.seq_no); + state->in.seq_no = odp_be_to_cpu_32(esp.seq_no); param->aad_ptr = (uint8_t *)&state->esp.aad; @@ -500,7 +500,7 @@ static int ipsec_in_ah(odp_packet_t *pkt, } ipsec_sa = ipsec_get_sa(sa, ODP_IPSEC_AH, - _odp_be_to_cpu_32(ah.spi), + odp_be_to_cpu_32(ah.spi), state->is_ipv4 ? ODP_IPSEC_IPV4 : ODP_IPSEC_IPV6, &state->ipv4_addr, status); @@ -541,11 +541,11 @@ static int ipsec_in_ah(odp_packet_t *pkt, state->ah_ipv6.ver_tc_flow = ipv6hdr->ver_tc_flow; state->ah_ipv6.hop_limit = ipv6hdr->hop_limit; ipv6hdr->ver_tc_flow = - _odp_cpu_to_be_32(6 << _ODP_IPV6HDR_VERSION_SHIFT); + odp_cpu_to_be_32(6 << _ODP_IPV6HDR_VERSION_SHIFT); ipv6hdr->hop_limit = 0; } - state->in.seq_no = _odp_be_to_cpu_32(ah.seq_no); + state->in.seq_no = odp_be_to_cpu_32(ah.seq_no); param->auth_range.offset = state->ip_offset; param->auth_range.length = state->ip_tot_len; @@ -755,7 +755,7 @@ static ipsec_sa_t *ipsec_in_single(odp_packet_t pkt, _odp_ipv4hdr_t *ipv4hdr = odp_packet_l3_ptr(pkt, NULL); if (ODP_IPSEC_MODE_TRANSPORT == ipsec_sa->mode) - ipv4hdr->tot_len = _odp_cpu_to_be_16(state.ip_tot_len); + ipv4hdr->tot_len = odp_cpu_to_be_16(state.ip_tot_len); else ipv4hdr->ttl -= ipsec_sa->dec_ttl; _odp_packet_ipv4_chksum_insert(pkt); @@ -764,7 +764,7 @@ static ipsec_sa_t *ipsec_in_single(odp_packet_t pkt, if (ODP_IPSEC_MODE_TRANSPORT == ipsec_sa->mode) ipv6hdr->payload_len = - _odp_cpu_to_be_16(state.ip_tot_len - + odp_cpu_to_be_16(state.ip_tot_len - _ODP_IPV6HDR_LEN); else ipv6hdr->hop_limit -= ipsec_sa->dec_ttl; @@ -820,7 +820,7 @@ static int ipsec_out_tunnel_parse_ipv4(ipsec_state_t *state, ipsec_sa_t *ipsec_sa) { _odp_ipv4hdr_t *ipv4hdr = state->ip; - uint16_t flags = _odp_be_to_cpu_16(ipv4hdr->frag_offset); + uint16_t flags = odp_be_to_cpu_16(ipv4hdr->frag_offset); ipv4hdr->ttl -= ipsec_sa->dec_ttl; state->out_tunnel.ip_tos = ipv4hdr->tos; @@ -868,7 +868,7 @@ static int ipsec_out_tunnel_ipv4(odp_packet_t *pkt, state->ip_tot_len = odp_packet_len(*pkt) - state->ip_offset; state->ip_tot_len += _ODP_IPV4HDR_LEN; - out_ip.tot_len = _odp_cpu_to_be_16(state->ip_tot_len); + out_ip.tot_len = odp_cpu_to_be_16(state->ip_tot_len); /* No need to convert to BE: ID just should not be duplicated */ out_ip.id = odp_atomic_fetch_add_u32(&ipsec_sa->out.tun_ipv4.hdr_id, 1); @@ -876,7 +876,7 @@ static int ipsec_out_tunnel_ipv4(odp_packet_t *pkt, flags = state->out_tunnel.ip_df; else flags = ((uint16_t)ipv4_param->df) << 14; - out_ip.frag_offset = _odp_cpu_to_be_16(flags); + out_ip.frag_offset = odp_cpu_to_be_16(flags); out_ip.ttl = ipv4_param->ttl; /* Will be filled later by packet checksum update */ out_ip.chksum = 0; @@ -937,7 +937,7 @@ static int ipsec_out_tunnel_ipv6(odp_packet_t *pkt, out_ip.ver_tc_flow = odp_cpu_to_be_32(ver); state->ip_tot_len = odp_packet_len(*pkt) - state->ip_offset; - out_ip.payload_len = _odp_cpu_to_be_16(state->ip_tot_len); + out_ip.payload_len = odp_cpu_to_be_16(state->ip_tot_len); state->ip_tot_len += _ODP_IPV6HDR_LEN; out_ip.hop_limit = ipv6_param->hlimit; @@ -1054,9 +1054,9 @@ static int ipsec_out_esp(odp_packet_t *pkt, if (ipsec_sa->udp_encap) { hdr_len += _ODP_UDPHDR_LEN; proto = _ODP_IPPROTO_UDP; - udphdr.src_port = _odp_cpu_to_be_16(_ODP_UDP_IPSEC_PORT); - udphdr.dst_port = _odp_cpu_to_be_16(_ODP_UDP_IPSEC_PORT); - udphdr.length = _odp_cpu_to_be_16(ip_data_len + + udphdr.src_port = odp_cpu_to_be_16(_ODP_UDP_IPSEC_PORT); + udphdr.dst_port = odp_cpu_to_be_16(_ODP_UDP_IPSEC_PORT); + udphdr.length = odp_cpu_to_be_16(ip_data_len + hdr_len + trl_len); udphdr.chksum = 0; /* should be 0 by RFC */ } @@ -1075,8 +1075,8 @@ static int ipsec_out_esp(odp_packet_t *pkt, param->auth_iv_ptr = state->iv; memset(&esp, 0, sizeof(esp)); - esp.spi = _odp_cpu_to_be_32(ipsec_sa->spi); - esp.seq_no = _odp_cpu_to_be_32(ipsec_seq_no(ipsec_sa)); + esp.spi = odp_cpu_to_be_32(ipsec_sa->spi); + esp.seq_no = odp_cpu_to_be_32(ipsec_seq_no(ipsec_sa)); state->esp.aad.spi = esp.spi; state->esp.aad.seq_no = esp.seq_no; @@ -1092,11 +1092,11 @@ static int ipsec_out_esp(odp_packet_t *pkt, if (state->is_ipv4) { _odp_ipv4hdr_t *ipv4hdr = state->ip; - ipv4hdr->tot_len = _odp_cpu_to_be_16(state->ip_tot_len); + ipv4hdr->tot_len = odp_cpu_to_be_16(state->ip_tot_len); } else if (state->is_ipv6) { _odp_ipv6hdr_t *ipv6hdr = state->ip; - ipv6hdr->payload_len = _odp_cpu_to_be_16(state->ip_tot_len - + ipv6hdr->payload_len = odp_cpu_to_be_16(state->ip_tot_len - _ODP_IPV6HDR_LEN); } @@ -1205,8 +1205,8 @@ static int ipsec_out_ah(odp_packet_t *pkt, } memset(&ah, 0, sizeof(ah)); - ah.spi = _odp_cpu_to_be_32(ipsec_sa->spi); - ah.seq_no = _odp_cpu_to_be_32(ipsec_seq_no(ipsec_sa)); + ah.spi = odp_cpu_to_be_32(ipsec_sa->spi); + ah.seq_no = odp_cpu_to_be_32(ipsec_seq_no(ipsec_sa)); ah.next_header = state->ip_next_hdr; odp_packet_copy_from_mem(*pkt, state->ip_next_hdr_offset, 1, &proto); @@ -1223,19 +1223,19 @@ static int ipsec_out_ah(odp_packet_t *pkt, ipv4hdr->ttl = 0; hdr_len = IPSEC_PAD_LEN(hdr_len, 4); state->ip_tot_len += hdr_len; - ipv4hdr->tot_len = _odp_cpu_to_be_16(state->ip_tot_len); + ipv4hdr->tot_len = odp_cpu_to_be_16(state->ip_tot_len); } else { _odp_ipv6hdr_t *ipv6hdr = state->ip; state->ah_ipv6.ver_tc_flow = ipv6hdr->ver_tc_flow; state->ah_ipv6.hop_limit = ipv6hdr->hop_limit; ipv6hdr->ver_tc_flow = - _odp_cpu_to_be_32(6 << _ODP_IPV6HDR_VERSION_SHIFT); + odp_cpu_to_be_32(6 << _ODP_IPV6HDR_VERSION_SHIFT); ipv6hdr->hop_limit = 0; hdr_len = IPSEC_PAD_LEN(hdr_len, 8); state->ip_tot_len += hdr_len; - ipv6hdr->payload_len = _odp_cpu_to_be_16(state->ip_tot_len - + ipv6hdr->payload_len = odp_cpu_to_be_16(state->ip_tot_len - _ODP_IPV6HDR_LEN); } diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index 50dbdc45..b3e1d150 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -2036,16 +2036,16 @@ static inline uint16_t parse_eth(packet_parser_t *prs, const uint8_t **parseptr, input_flags.jumbo = 1; /* Handle Ethernet broadcast/multicast addresses */ - macaddr0 = _odp_be_to_cpu_16(*((const uint16_t *)(const void *)eth)); + macaddr0 = odp_be_to_cpu_16(*((const uint16_t *)(const void *)eth)); if (odp_unlikely((macaddr0 & 0x0100) == 0x0100)) input_flags.eth_mcast = 1; if (odp_unlikely(macaddr0 == 0xffff)) { macaddr2 = - _odp_be_to_cpu_16(*((const uint16_t *) + odp_be_to_cpu_16(*((const uint16_t *) (const void *)eth + 1)); macaddr4 = - _odp_be_to_cpu_16(*((const uint16_t *) + odp_be_to_cpu_16(*((const uint16_t *) (const void *)eth + 2)); if ((macaddr2 == 0xffff) && (macaddr4 == 0xffff)) @@ -2053,7 +2053,7 @@ static inline uint16_t parse_eth(packet_parser_t *prs, const uint8_t **parseptr, } /* Get Ethertype */ - ethtype = _odp_be_to_cpu_16(eth->type); + ethtype = odp_be_to_cpu_16(eth->type); *offset += sizeof(*eth); *parseptr += sizeof(*eth); @@ -2065,7 +2065,7 @@ static inline uint16_t parse_eth(packet_parser_t *prs, const uint8_t **parseptr, ethtype = 0; goto error; } - ethtype = _odp_be_to_cpu_16(*((const uint16_t *)(uintptr_t) + ethtype = odp_be_to_cpu_16(*((const uint16_t *)(uintptr_t) (parseptr + 6))); *offset += 8; *parseptr += 8; @@ -2077,7 +2077,7 @@ static inline uint16_t parse_eth(packet_parser_t *prs, const uint8_t **parseptr, input_flags.vlan = 1; vlan = (const _odp_vlanhdr_t *)*parseptr; - ethtype = _odp_be_to_cpu_16(vlan->type); + ethtype = odp_be_to_cpu_16(vlan->type); *offset += sizeof(_odp_vlanhdr_t); *parseptr += sizeof(_odp_vlanhdr_t); } @@ -2085,7 +2085,7 @@ static inline uint16_t parse_eth(packet_parser_t *prs, const uint8_t **parseptr, if (ethtype == _ODP_ETHTYPE_VLAN) { input_flags.vlan = 1; vlan = (const _odp_vlanhdr_t *)*parseptr; - ethtype = _odp_be_to_cpu_16(vlan->type); + ethtype = odp_be_to_cpu_16(vlan->type); *offset += sizeof(_odp_vlanhdr_t); *parseptr += sizeof(_odp_vlanhdr_t); } @@ -2105,9 +2105,9 @@ static inline uint8_t parse_ipv4(packet_parser_t *prs, const uint8_t **parseptr, uint32_t *l4_part_sum) { const _odp_ipv4hdr_t *ipv4 = (const _odp_ipv4hdr_t *)*parseptr; - uint32_t dstaddr = _odp_be_to_cpu_32(ipv4->dst_addr); - uint32_t l3_len = _odp_be_to_cpu_16(ipv4->tot_len); - uint16_t frag_offset = _odp_be_to_cpu_16(ipv4->frag_offset); + uint32_t dstaddr = odp_be_to_cpu_32(ipv4->dst_addr); + uint32_t l3_len = odp_be_to_cpu_16(ipv4->tot_len); + uint16_t frag_offset = odp_be_to_cpu_16(ipv4->frag_offset); uint8_t ver = _ODP_IPV4HDR_VER(ipv4->ver_ihl); uint8_t ihl = _ODP_IPV4HDR_IHL(ipv4->ver_ihl); @@ -2166,12 +2166,12 @@ static inline uint8_t parse_ipv6(packet_parser_t *prs, const uint8_t **parseptr, { const _odp_ipv6hdr_t *ipv6 = (const _odp_ipv6hdr_t *)*parseptr; const _odp_ipv6hdr_ext_t *ipv6ext; - uint32_t dstaddr0 = _odp_be_to_cpu_32(ipv6->dst_addr.u8[0]); - uint32_t l3_len = _odp_be_to_cpu_16(ipv6->payload_len) + + uint32_t dstaddr0 = odp_be_to_cpu_32(ipv6->dst_addr.u8[0]); + uint32_t l3_len = odp_be_to_cpu_16(ipv6->payload_len) + _ODP_IPV6HDR_LEN; /* Basic sanity checks on IPv6 header */ - if ((_odp_be_to_cpu_32(ipv6->ver_tc_flow) >> 28) != 6 || + if ((odp_be_to_cpu_32(ipv6->ver_tc_flow) >> 28) != 6 || l3_len > frame_len - *offset) { prs->flags.ip_err = 1; return 0; @@ -2205,7 +2205,7 @@ static inline uint8_t parse_ipv6(packet_parser_t *prs, const uint8_t **parseptr, *offset < seg_len); if (*offset >= prs->l3_offset + - _odp_be_to_cpu_16(ipv6->payload_len)) { + odp_be_to_cpu_16(ipv6->payload_len)) { prs->flags.ip_err = 1; return 0; } @@ -2259,8 +2259,8 @@ static inline void parse_udp(packet_parser_t *prs, const uint8_t **parseptr, uint32_t *l4_part_sum) { const _odp_udphdr_t *udp = (const _odp_udphdr_t *)*parseptr; - uint32_t udplen = _odp_be_to_cpu_16(udp->length); - uint16_t ipsec_port = _odp_cpu_to_be_16(_ODP_UDP_IPSEC_PORT); + uint32_t udplen = odp_be_to_cpu_16(udp->length); + uint16_t ipsec_port = odp_cpu_to_be_16(_ODP_UDP_IPSEC_PORT); if (odp_unlikely(udplen < sizeof(_odp_udphdr_t))) { prs->flags.udp_err = 1; @@ -2528,7 +2528,7 @@ static int _odp_packet_tcp_udp_chksum_insert(odp_packet_t pkt, uint16_t proto) #endif if (proto == _ODP_IPPROTO_TCP) { - sum += _odp_cpu_to_be_16(pkt_hdr->frame_len - + sum += odp_cpu_to_be_16(pkt_hdr->frame_len - pkt_hdr->p.l4_offset); chksum_offset = pkt_hdr->p.l4_offset + _ODP_UDP_CSUM_OFFSET; } else { diff --git a/platform/linux-generic/odp_traffic_mngr.c b/platform/linux-generic/odp_traffic_mngr.c index 96dde266..6e741e01 100644 --- a/platform/linux-generic/odp_traffic_mngr.c +++ b/platform/linux-generic/odp_traffic_mngr.c @@ -1948,7 +1948,7 @@ static void egress_vlan_marking(tm_vlan_marking_t *vlan_marking, vlan_hdr_ptr = &vlan_hdr; } - old_tci = _odp_be_to_cpu_16(vlan_hdr_ptr->tci); + old_tci = odp_be_to_cpu_16(vlan_hdr_ptr->tci); new_tci = old_tci; if (vlan_marking->drop_eligible_enabled) new_tci |= _ODP_VLANHDR_DEI_MASK; @@ -1956,7 +1956,7 @@ static void egress_vlan_marking(tm_vlan_marking_t *vlan_marking, if (new_tci == old_tci) return; - vlan_hdr_ptr->tci = _odp_cpu_to_be_16(new_tci); + vlan_hdr_ptr->tci = odp_cpu_to_be_16(new_tci); if (split_hdr) _odp_packet_copy_from_mem(odp_pkt, _ODP_ETHHDR_LEN, _ODP_VLANHDR_LEN, &vlan_hdr); @@ -2013,7 +2013,7 @@ static void egress_ipv4_tos_marking(tm_tos_marking_t *tos_marking, * in this specific case the carry out check does NOT need to be * repeated since it can be proven that the carry in sum cannot * cause another carry out. */ - old_chksum = (uint32_t)_odp_be_to_cpu_16(ipv4_hdr_ptr->chksum); + old_chksum = (uint32_t)odp_be_to_cpu_16(ipv4_hdr_ptr->chksum); ones_compl_sum = (~old_chksum) & 0xFFFF; tos_diff = ((uint32_t)new_tos) + ((~(uint32_t)old_tos) & 0xFFFF); ones_compl_sum += tos_diff; @@ -2022,7 +2022,7 @@ static void egress_ipv4_tos_marking(tm_tos_marking_t *tos_marking, (ones_compl_sum & 0xFFFF); ipv4_hdr_ptr->tos = new_tos; - ipv4_hdr_ptr->chksum = _odp_cpu_to_be_16((~ones_compl_sum) & 0xFFFF); + ipv4_hdr_ptr->chksum = odp_cpu_to_be_16((~ones_compl_sum) & 0xFFFF); if (split_hdr) _odp_packet_copy_from_mem(odp_pkt, l3_offset, _ODP_IPV4HDR_LEN, &ipv4_hdr); @@ -2053,7 +2053,7 @@ static void egress_ipv6_tc_marking(tm_tos_marking_t *tos_marking, ipv6_hdr_ptr = &ipv6_hdr; } - old_ver_tc_flow = _odp_be_to_cpu_32(ipv6_hdr_ptr->ver_tc_flow); + old_ver_tc_flow = odp_be_to_cpu_32(ipv6_hdr_ptr->ver_tc_flow); old_tc = (old_ver_tc_flow & _ODP_IPV6HDR_TC_MASK) >> _ODP_IPV6HDR_TC_SHIFT; new_tc = old_tc; @@ -2074,7 +2074,7 @@ static void egress_ipv6_tc_marking(tm_tos_marking_t *tos_marking, new_ver_tc_flow = (old_ver_tc_flow & ~_ODP_IPV6HDR_TC_MASK) | (new_tc << _ODP_IPV6HDR_TC_SHIFT); - ipv6_hdr_ptr->ver_tc_flow = _odp_cpu_to_be_32(new_ver_tc_flow); + ipv6_hdr_ptr->ver_tc_flow = odp_cpu_to_be_32(new_ver_tc_flow); if (split_hdr) _odp_packet_copy_from_mem(odp_pkt, l3_offset, diff --git a/platform/linux-generic/pktio/dpdk_parse.c b/platform/linux-generic/pktio/dpdk_parse.c index 155c6832..e9de0756 100644 --- a/platform/linux-generic/pktio/dpdk_parse.c +++ b/platform/linux-generic/pktio/dpdk_parse.c @@ -47,16 +47,16 @@ static inline uint16_t dpdk_parse_eth(packet_parser_t *prs, input_flags.jumbo = 1; /* Handle Ethernet broadcast/multicast addresses */ - macaddr0 = _odp_be_to_cpu_16(*((const uint16_t *)(const void *)eth)); + macaddr0 = odp_be_to_cpu_16(*((const uint16_t *)(const void *)eth)); if (odp_unlikely((macaddr0 & 0x0100) == 0x0100)) input_flags.eth_mcast = 1; if (odp_unlikely(macaddr0 == 0xffff)) { macaddr2 = - _odp_be_to_cpu_16(*((const uint16_t *) + odp_be_to_cpu_16(*((const uint16_t *) (const void *)eth + 1)); macaddr4 = - _odp_be_to_cpu_16(*((const uint16_t *) + odp_be_to_cpu_16(*((const uint16_t *) (const void *)eth + 2)); if ((macaddr2 == 0xffff) && (macaddr4 == 0xffff)) @@ -72,13 +72,13 @@ static inline uint16_t dpdk_parse_eth(packet_parser_t *prs, else if (RTE_ETH_IS_IPV6_HDR(mbuf_packet_type)) ethtype = _ODP_ETHTYPE_IPV6; else - ethtype = _odp_be_to_cpu_16(eth->type); + ethtype = odp_be_to_cpu_16(eth->type); break; case RTE_PTYPE_L2_ETHER_VLAN: ethtype = _ODP_ETHTYPE_VLAN; break; default: - ethtype = _odp_be_to_cpu_16(eth->type); + ethtype = odp_be_to_cpu_16(eth->type); } *offset += sizeof(*eth); @@ -92,7 +92,7 @@ static inline uint16_t dpdk_parse_eth(packet_parser_t *prs, ethtype = 0; goto error; } - ethtype = _odp_be_to_cpu_16(*((const uint16_t *)(uintptr_t) + ethtype = odp_be_to_cpu_16(*((const uint16_t *)(uintptr_t) (parseptr + 6))); *offset += 8; *parseptr += 8; @@ -104,7 +104,7 @@ static inline uint16_t dpdk_parse_eth(packet_parser_t *prs, input_flags.vlan = 1; vlan = (const _odp_vlanhdr_t *)*parseptr; - ethtype = _odp_be_to_cpu_16(vlan->type); + ethtype = odp_be_to_cpu_16(vlan->type); *offset += sizeof(_odp_vlanhdr_t); *parseptr += sizeof(_odp_vlanhdr_t); } @@ -112,7 +112,7 @@ static inline uint16_t dpdk_parse_eth(packet_parser_t *prs, if (ethtype == _ODP_ETHTYPE_VLAN) { input_flags.vlan = 1; vlan = (const _odp_vlanhdr_t *)*parseptr; - ethtype = _odp_be_to_cpu_16(vlan->type); + ethtype = odp_be_to_cpu_16(vlan->type); *offset += sizeof(_odp_vlanhdr_t); *parseptr += sizeof(_odp_vlanhdr_t); } @@ -134,8 +134,8 @@ static inline uint8_t dpdk_parse_ipv4(packet_parser_t *prs, uint32_t do_csum) { const _odp_ipv4hdr_t *ipv4 = (const _odp_ipv4hdr_t *)*parseptr; - uint32_t dstaddr = _odp_be_to_cpu_32(ipv4->dst_addr); - uint32_t l3_len = _odp_be_to_cpu_16(ipv4->tot_len); + uint32_t dstaddr = odp_be_to_cpu_32(ipv4->dst_addr); + uint32_t l3_len = odp_be_to_cpu_16(ipv4->tot_len); uint8_t ver = _ODP_IPV4HDR_VER(ipv4->ver_ihl); uint8_t ihl = _ODP_IPV4HDR_IHL(ipv4->ver_ihl); uint32_t l4_packet_type = mbuf_packet_type & RTE_PTYPE_L4_MASK; @@ -173,7 +173,7 @@ static inline uint8_t dpdk_parse_ipv4(packet_parser_t *prs, proto = _ODP_IPPROTO_TCP; } else { proto = ipv4->proto; - frag_offset = _odp_be_to_cpu_16(ipv4->frag_offset); + frag_offset = odp_be_to_cpu_16(ipv4->frag_offset); /* A packet is a fragment if: * "more fragments" flag is set (all fragments except the last) @@ -205,13 +205,13 @@ static inline uint8_t dpdk_parse_ipv6(packet_parser_t *prs, { const _odp_ipv6hdr_t *ipv6 = (const _odp_ipv6hdr_t *)*parseptr; const _odp_ipv6hdr_ext_t *ipv6ext; - uint32_t dstaddr0 = _odp_be_to_cpu_32(ipv6->dst_addr.u8[0]); - uint32_t l3_len = _odp_be_to_cpu_16(ipv6->payload_len) + + uint32_t dstaddr0 = odp_be_to_cpu_32(ipv6->dst_addr.u8[0]); + uint32_t l3_len = odp_be_to_cpu_16(ipv6->payload_len) + _ODP_IPV6HDR_LEN; uint32_t l4_packet_type = mbuf_packet_type & RTE_PTYPE_L4_MASK; /* Basic sanity checks on IPv6 header */ - if ((_odp_be_to_cpu_32(ipv6->ver_tc_flow) >> 28) != 6 || + if ((odp_be_to_cpu_32(ipv6->ver_tc_flow) >> 28) != 6 || l3_len > frame_len - *offset) { prs->flags.ip_err = 1; return 0; @@ -246,7 +246,7 @@ static inline uint8_t dpdk_parse_ipv6(packet_parser_t *prs, *offset < seg_len); if (*offset >= prs->l3_offset + - _odp_be_to_cpu_16(ipv6->payload_len)) { + odp_be_to_cpu_16(ipv6->payload_len)) { prs->flags.ip_err = 1; return 0; } @@ -303,8 +303,8 @@ static inline void dpdk_parse_udp(packet_parser_t *prs, uint32_t do_csum) { const _odp_udphdr_t *udp = (const _odp_udphdr_t *)*parseptr; - uint32_t udplen = _odp_be_to_cpu_16(udp->length); - uint16_t ipsec_port = _odp_cpu_to_be_16(_ODP_UDP_IPSEC_PORT); + uint32_t udplen = odp_be_to_cpu_16(udp->length); + uint16_t ipsec_port = odp_cpu_to_be_16(_ODP_UDP_IPSEC_PORT); if (odp_unlikely(udplen < sizeof(_odp_udphdr_t))) prs->flags.udp_err = 1; diff --git a/platform/linux-generic/pktio/loop.c b/platform/linux-generic/pktio/loop.c index 99b09e6a..5e30447f 100644 --- a/platform/linux-generic/pktio/loop.c +++ b/platform/linux-generic/pktio/loop.c @@ -188,7 +188,7 @@ static inline int check_proto(void *l3_hdr, if (l3_proto_ver == _ODP_IPV4 && l3_len >= _ODP_IPV4HDR_LEN) { _odp_ipv4hdr_t *ip = l3_hdr; - uint16_t frag_offset = _odp_be_to_cpu_16(ip->frag_offset); + uint16_t frag_offset = odp_be_to_cpu_16(ip->frag_offset); *l3_proto_v4 = 1; if (!_ODP_IPV4HDR_IS_FRAGMENT(frag_offset)) commit 4b895826e62b9b6e7512d76d05999752ffc93432 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue May 15 00:10:07 2018 +0300 linux-gen: ticketlock: drop unused @internal documentation 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/include/odp/api/plat/ticketlock_inlines.h b/platform/linux-generic/include/odp/api/plat/ticketlock_inlines.h index be38de8c..eabf1f82 100644 --- a/platform/linux-generic/include/odp/api/plat/ticketlock_inlines.h +++ b/platform/linux-generic/include/odp/api/plat/ticketlock_inlines.h @@ -4,17 +4,13 @@ * SPDX-License-Identifier: BSD-3-Clause */ -/** - * @file - * - * Ticketlock inline functions - */ - #ifndef _ODP_PLAT_TICKETLOCK_INLINES_H_ #define _ODP_PLAT_TICKETLOCK_INLINES_H_ #include <odp/api/atomic.h> +/** @cond _ODP_HIDE_FROM_DOXYGEN_ */ + #ifndef _ODP_NO_INLINE /* Inline functions by default */ #define _ODP_INLINE static inline @@ -33,11 +29,6 @@ _ODP_INLINE void odp_ticketlock_init(odp_ticketlock_t *ticketlock) odp_atomic_init_u32(&ticketlock->cur_ticket, 0); } -/** @internal - * Acquire ticket lock. - * - * @param ticketlock Pointer to a ticket lock - */ _ODP_INLINE void odp_ticketlock_lock(odp_ticketlock_t *ticketlock) { uint32_t ticket; @@ -53,14 +44,6 @@ _ODP_INLINE void odp_ticketlock_lock(odp_ticketlock_t *ticketlock) odp_cpu_pause(); } -/** @internal - * Try to acquire ticket lock. - * - * @param tklock Pointer to a ticket lock - * - * @retval 1 lock acquired - * @retval 0 lock not acquired - */ _ODP_INLINE int odp_ticketlock_trylock(odp_ticketlock_t *tklock) { /* We read 'next_ticket' and 'cur_ticket' non-atomically which should @@ -89,11 +72,6 @@ _ODP_INLINE int odp_ticketlock_trylock(odp_ticketlock_t *tklock) return 0; } -/** @internal - * Release ticket lock - * - * @param ticketlock Pointer to a ticket lock - */ _ODP_INLINE void odp_ticketlock_unlock(odp_ticketlock_t *ticketlock) { /* Release the lock by incrementing 'cur_ticket'. As we are the @@ -106,14 +84,6 @@ _ODP_INLINE void odp_ticketlock_unlock(odp_ticketlock_t *ticketlock) odp_atomic_store_rel_u32(&ticketlock->cur_ticket, cur + 1); } -/** @internal - * Check if ticket lock is locked - * - * @param ticketlock Pointer to a ticket lock - * - * @retval 1 the lock is busy (locked) - * @retval 0 the lock is available (unlocked) - */ _ODP_INLINE int odp_ticketlock_is_locked(odp_ticketlock_t *ticketlock) { /* Compare 'cur_ticket' with 'next_ticket'. Ideally we should read @@ -125,4 +95,6 @@ _ODP_INLINE int odp_ticketlock_is_locked(odp_ticketlock_t *ticketlock) odp_atomic_load_u32(&ticketlock->next_ticket); } +/** @endcond */ + #endif commit 3ee54c088ec06a65b1ae7ece2dae8cfabfe90d12 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Sun Apr 22 20:05:34 2018 +0300 linux-gen: ticketlock: remove separate API inlining header 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 586a0637..e084eb2c 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -39,8 +39,7 @@ odpapiplatinclude_HEADERS = \ include/odp/api/plat/sync_inlines.h \ include/odp/api/plat/thread_inlines.h \ include/odp/api/plat/thread_inlines_api.h \ - include/odp/api/plat/ticketlock_inlines.h \ - include/odp/api/plat/ticketlock_inlines_api.h + include/odp/api/plat/ticketlock_inlines.h odpapiabiarchincludedir = $(archincludedir)/odp/api/abi odpapiabiarchinclude_HEADERS = \ @@ -223,7 +222,7 @@ __LIB__libodp_linux_la_SOURCES += \ odp_std_clib.c \ odp_sync.c \ odp_thread_api.c \ - odp_ticketlock.c + odp_ticketlock_api.c endif if ARCH_IS_ARM diff --git a/platform/linux-generic/include-abi/odp/api/abi/ticketlock.h b/platform/linux-generic/include-abi/odp/api/abi/ticketlock.h index 5d335946..6543a1cf 100644 --- a/platform/linux-generic/include-abi/odp/api/abi/ticketlock.h +++ b/platform/linux-generic/include-abi/odp/api/abi/ticketlock.h @@ -30,9 +30,7 @@ typedef struct odp_ticketlock_s { } odp_ticketlock_t; /* Include inlined versions of API functions */ -#define _ODP_INLINE static inline #include <odp/api/plat/ticketlock_inlines.h> -#include <odp/api/plat/ticketlock_inlines_api.h> /** * @} diff --git a/platform/linux-generic/include/odp/api/plat/ticketlock_inlines.h b/platform/linux-generic/include/odp/api/plat/ticketlock_inlines.h index ac8031ae..be38de8c 100644 --- a/platform/linux-generic/include/odp/api/plat/ticketlock_inlines.h +++ b/platform/linux-generic/include/odp/api/plat/ticketlock_inlines.h @@ -15,12 +15,30 @@ #include <odp/api/atomic.h> +#ifndef _ODP_NO_INLINE + /* Inline functions by default */ + #define _ODP_INLINE static inline + #define odp_ticketlock_init __odp_ticketlock_init + #define odp_ticketlock_lock __odp_ticketlock_lock + #define odp_ticketlock_trylock __odp_ticketlock_trylock + #define odp_ticketlock_unlock __odp_ticketlock_unlock + #define odp_ticketlock_is_locked __odp_ticketlock_is_locked +#else + #define _ODP_INLINE +#endif + +_ODP_INLINE void odp_ticketlock_init(odp_ticketlock_t *ticketlock) +{ + odp_atomic_init_u32(&ticketlock->next_ticket, 0); + odp_atomic_init_u32(&ticketlock->cur_ticket, 0); +} + /** @internal * Acquire ticket lock. * * @param ticketlock Pointer to a ticket lock */ -static inline void _odp_ticketlock_lock(odp_ticketlock_t *ticketlock) +_ODP_INLINE void odp_ticketlock_lock(odp_ticketlock_t *ticketlock) { uint32_t ticket; @@ -43,7 +61,7 @@ static inline void _odp_ticketlock_lock(odp_ticketlock_t *ticketlock) * @retval 1 lock acquired * @retval 0 lock not acquired */ -static inline int _odp_ticketlock_trylock(odp_ticketlock_t *tklock) +_ODP_INLINE int odp_ticketlock_trylock(odp_ticketlock_t *tklock) { /* We read 'next_ticket' and 'cur_ticket' non-atomically which should * not be a problem as they are not independent of each other. @@ -76,7 +94,7 @@ static inline int _odp_ticketlock_trylock(odp_ticketlock_t *tklock) * * @param ticketlock Pointer to a ticket lock */ -static inline void _odp_ticketlock_unlock(odp_ticketlock_t *ticketlock) +_ODP_INLINE void odp_ticketlock_unlock(odp_ticketlock_t *ticketlock) { /* Release the lock by incrementing 'cur_ticket'. As we are the * lock owner and thus the only thread that is allowed to write @@ -96,7 +114,7 @@ static inline void _odp_ticketlock_unlock(odp_ticketlock_t *ticketlock) * @retval 1 the lock is busy (locked) * @retval 0 the lock is available (unlocked) */ -static inline int _odp_ticketlock_is_locked(odp_ticketlock_t *ticketlock) +_ODP_INLINE int odp_ticketlock_is_locked(odp_ticketlock_t *ticketlock) { /* Compare 'cur_ticket' with 'next_ticket'. Ideally we should read * both variables atomically but the information can become stale diff --git a/platform/linux-generic/odp_pool.c b/platform/linux-generic/odp_pool.c index 0df8aa3f..f030ff04 100644 --- a/platform/linux-generic/odp_pool.c +++ b/platform/linux-generic/odp_pool.c @@ -25,8 +25,8 @@ #include <odp/api/plat/pool_inline_types.h> #include <odp/api/plat/ticketlock_inlines.h> -#define LOCK(a) _odp_ticketlock_lock(a) -#define UNLOCK(a) _odp_ticketlock_unlock(a) +#define LOCK(a) odp_ticketlock_lock(a) +#define UNLOCK(a) odp_ticketlock_unlock(a) #define LOCK_INIT(a) odp_ticketlock_init(a) #define CACHE_BURST 32 diff --git a/platform/linux-generic/odp_queue_basic.c b/platform/linux-generic/odp_queue_basic.c index 764f39e8..69fad639 100644 --- a/platform/linux-generic/odp_queue_basic.c +++ b/platform/linux-generic/odp_queue_basic.c @@ -29,9 +29,9 @@ #define NUM_INTERNAL_QUEUES 64 #include <odp/api/plat/ticketlock_inlines.h> -#define LOCK(queue_ptr) _odp_ticketlock_lock(&((queue_ptr)->s.lock)) -#define UNLOCK(queue_ptr) _odp_ticketlock_unlock(&((queue_ptr)->s.lock)) -#define LOCK_INIT(queue_ptr) odp_ticketlock_init(&((queue_ptr)->s.lock)) +#define LOCK(queue_ptr) odp_ticketlock_lock(&((queue_ptr)->s.lock)) +#define UNLOCK(queue_ptr) odp_ticketlock_unlock(&((queue_ptr)->s.lock)) +#define LOCK_INIT(queue_ptr) odp_ticketlock_init(&((queue_ptr)->s.lock)) #include <string.h> #include <inttypes.h> diff --git a/platform/linux-generic/odp_queue_scalable.c b/platform/linux-generic/odp_queue_scalable.c index 05246410..8f956911 100644 --- a/platform/linux-generic/odp_queue_scalable.c +++ b/platform/linux-generic/odp_queue_scalable.c @@ -39,8 +39,8 @@ tmp_a < tmp_b ? tmp_a : tmp_b; \ }) -#define LOCK(a) _odp_ticketlock_lock(a) -#define UNLOCK(a) _odp_ticketlock_unlock(a) +#define LOCK(a) odp_ticketlock_lock(a) +#define UNLOCK(a) odp_ticketlock_unlock(a) #define LOCK_INIT(a) odp_ticketlock_init(a) extern __thread sched_scalable_thread_state_t *sched_ts; diff --git a/platform/linux-generic/odp_schedule_scalable.c b/platform/linux-generic/odp_schedule_scalable.c index 58d5190c..44629378 100644 --- a/platform/linux-generic/odp_schedule_scalable.c +++ b/platform/linux-generic/odp_schedule_scalable.c @@ -36,8 +36,8 @@ #include <string.h> #include <odp/api/plat/ticketlock_inlines.h> -#define LOCK(a) _odp_ticketlock_lock((a)) -#define UNLOCK(a) _odp_ticketlock_unlock((a)) +#define LOCK(a) odp_ticketlock_lock((a)) +#define UNLOCK(a) odp_ticketlock_unlock((a)) #define MAXTHREADS ATOM_BITSET_SIZE diff --git a/platform/linux-generic/odp_ticketlock.c b/platform/linux-generic/odp_ticketlock_api.c similarity index 60% rename from platform/linux-generic/odp_ticketlock.c rename to platform/linux-generic/odp_ticketlock_api.c index 1f1e1128..1de55d90 100644 --- a/platform/linux-generic/odp_ticketlock.c +++ b/platform/linux-generic/odp_ticketlock_api.c @@ -8,9 +8,5 @@ #include <odp/api/ticketlock.h> +#define _ODP_NO_INLINE #include <odp/api/plat/ticketlock_inlines.h> - -/* Include non-inlined versions of API functions */ -#undef _ODP_INLINE -#define _ODP_INLINE -#include <odp/api/plat/ticketlock_inlines_api.h> commit 9e1aad1fbffad60e849c9cac613e282fd3f80646 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Sun Apr 22 20:05:34 2018 +0300 linux-gen: atomic: remove separate API inlining header 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/include/odp/api/plat/atomic_inlines.h b/platform/linux-generic/include/odp/api/plat/atomic_inlines.h index 02eda195..5f0cba05 100644 --- a/platform/linux-generic/include/odp/api/plat/atomic_inlines.h +++ b/platform/linux-generic/include/odp/api/plat/atomic_inlines.h @@ -13,6 +13,79 @@ #ifndef _ODP_PLAT_ATOMIC_INLINES_H_ #define _ODP_PLAT_ATOMIC_INLINES_H_ +/** @cond _ODP_HIDE_FROM_DOXYGEN_ */ + +#ifndef _ODP_NO_INLINE + /* Inline functions by default */ + #define _ODP_INLINE static inline + #define odp_atomic_init_u32 __odp_atomic_init_u32 + #define odp_atomic_load_u32 __odp_atomic_load_u32 + #define odp_atomic_store_u32 __odp_atomic_store_u32 + #define odp_atomic_fetch_add_u32 __odp_atomic_fetch_add_u32 + #define odp_atomic_add_u32 __odp_atomic_add_u32 + #define odp_atomic_fetch_sub_u32 __odp_atomic_fetch_sub_u32 + #define odp_atomic_sub_u32 __odp_atomic_sub_u32 + #define odp_atomic_fetch_inc_u32 __odp_atomic_fetch_inc_u32 + #define odp_atomic_inc_u32 __odp_atomic_inc_u32 + #define odp_atomic_fetch_dec_u32 __odp_atomic_fetch_dec_u32 + #define odp_atomic_dec_u32 __odp_atomic_dec_u32 + #define odp_atomic_cas_u32 __odp_atomic_cas_u32 + #define odp_atomic_xchg_u32 __odp_atomic_xchg_u32 + #define odp_atomic_max_u32 __odp_atomic_max_u32 + #define odp_atomic_min_u32 __odp_atomic_min_u32 + #define odp_atomic_init_u64 __odp_atomic_init_u64 + #define odp_atomic_load_u64 __odp_atomic_load_u64 + #define odp_atomic_store_u64 __odp_atomic_store_u64 + #define odp_atomic_fetch_add_u64 __odp_atomic_fetch_add_u64 + #define odp_atomic_add_u64 __odp_atomic_add_u64 + #define odp_atomic_fetch_sub_u64 __odp_atomic_fetch_sub_u64 + #define odp_atomic_sub_u64 __odp_atomic_sub_u64 + #define odp_atomic_fetch_inc_u64 __odp_atomic_fetch_inc_u64 + #define odp_atomic_inc_u64 __odp_atomic_inc_u64 + #define odp_atomic_fetch_dec_u64 __odp_atomic_fetch_dec_u64 + #define odp_atomic_dec_u64 __odp_atomic_dec_u64 + #define odp_atomic_cas_u64 __odp_atomic_cas_u64 + #define odp_atomic_xchg_u64 __odp_atomic_xchg_u64 + #define odp_atomic_load_acq_u64 __odp_atomic_load_acq_u64 + #define odp_atomic_store_rel_u64 __odp_atomic_store_rel_u64 + #define odp_atomic_add_rel_u64 __odp_atomic_add_rel_u64 + #define odp_atomic_sub_rel_u64 __odp_atomic_sub_rel_u64 + #define odp_atomic_cas_acq_u64 __odp_atomic_cas_acq_u64 + #define odp_atomic_cas_rel_u64 __odp_atomic_cas_rel_u64 + #define odp_atomic_cas_acq_rel_u64 __odp_atomic_cas_acq_rel_u64 + #define odp_atomic_init_u64 __odp_atomic_init_u64 + #define odp_atomic_load_u64 __odp_atomic_load_u64 + #define odp_atomic_store_u64 __odp_atomic_store_u64 + #define odp_atomic_fetch_add_u64 __odp_atomic_fetch_add_u64 + #define odp_atomic_add_u64 __odp_atomic_add_u64 + #define odp_atomic_fetch_sub_u64 __odp_atomic_fetch_sub_u64 + #define odp_atomic_sub_u64 __odp_atomic_sub_u64 + #define odp_atomic_fetch_inc_u64 __odp_atomic_fetch_inc_u64 + #define odp_atomic_inc_u64 __odp_atomic_inc_u64 + #define odp_atomic_fetch_dec_u64 __odp_atomic_fetch_dec_u64 + #define odp_atomic_dec_u64 __odp_atomic_dec_u64 + #define odp_atomic_cas_u64 __odp_atomic_cas_u64 + #define odp_atomic_xchg_u64 __odp_atomic_xchg_u64 + #define odp_atomic_load_acq_u64 __odp_atomic_load_acq_u64 + #define odp_atomic_store_rel_u64 __odp_atomic_store_rel_u64 + #define odp_atomic_add_rel_u64 __odp_atomic_add_rel_u64 + #define odp_atomic_sub_rel_u64 __odp_atomic_sub_rel_u64 + #define odp_atomic_cas_acq_u64 __odp_atomic_cas_acq_u64 + #define odp_atomic_cas_rel_u64 __odp_atomic_cas_rel_u64 + #define odp_atomic_cas_acq_rel_u64 __odp_atomic_cas_acq_rel_u64 + #define odp_atomic_max_u64 __odp_atomic_max_u64 + #define odp_atomic_min_u64 __odp_atomic_min_u64 + #define odp_atomic_load_acq_u32 __odp_atomic_load_acq_u32 + #define odp_atomic_store_rel_u32 __odp_atomic_store_rel_u32 + #define odp_atomic_add_rel_u32 __odp_atomic_add_rel_u32 + #define odp_atomic_sub_rel_u32 __odp_atomic_sub_rel_u32 + #define odp_atomic_cas_acq_u32 __odp_atomic_cas_acq_u32 + #define odp_atomic_cas_rel_u32 __odp_atomic_cas_rel_u32 + #define odp_atomic_cas_acq_rel_u32 __odp_atomic_cas_acq_rel_u32 +#else + #define _ODP_INLINE +#endif + _ODP_INLINE void odp_atomic_init_u32(odp_atomic_u32_t *atom, uint32_t val) { __atomic_store_n(&atom->v, val, __ATOMIC_RELAXED); @@ -457,4 +530,6 @@ _ODP_INLINE int odp_atomic_cas_acq_rel_u32(odp_atomic_u32_t *atom, __ATOMIC_RELAXED); } +/** @endcond */ + #endif diff --git a/platform/linux-generic/odp_atomic_api.c b/platform/linux-generic/odp_atomic_api.c index d99f8052..72b55a8f 100644 --- a/platform/linux-generic/odp_atomic_api.c +++ b/platform/linux-generic/odp_atomic_api.c @@ -9,5 +9,5 @@ #include <odp/api/atomic.h> /* Include non-inlined versions of API functions */ -#define _ODP_INLINE +#define _ODP_NO_INLINE #include <odp/api/plat/atomic_inlines.h> diff --git a/platform/linux-generic/odp_ticketlock.c b/platform/linux-generic/odp_ticketlock.c index 6a2c3be6..1f1e1128 100644 --- a/platform/linux-generic/odp_ticketlock.c +++ b/platform/linux-generic/odp_ticketlock.c @@ -11,5 +11,6 @@ #include <odp/api/plat/ticketlock_inlines.h> /* Include non-inlined versions of API functions */ +#undef _ODP_INLINE #define _ODP_INLINE #include <odp/api/plat/ticketlock_inlines_api.h> commit 1da9bcf69a3f2c364eb1674b44ede4c0cf280f06 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue May 15 00:10:07 2018 +0300 linux-gen: packet_flags: drop unused @internal annotations 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/include/odp/api/plat/packet_flag_inlines.h b/platform/linux-generic/include/odp/api/plat/packet_flag_inlines.h index c366daa1..cbb79758 100644 --- a/platform/linux-generic/include/odp/api/plat/packet_flag_inlines.h +++ b/platform/linux-generic/include/odp/api/plat/packet_flag_inlines.h @@ -17,10 +17,10 @@ #include <odp/api/plat/packet_inline_types.h> #include <odp/api/hints.h> -/** @internal Inline function offsets */ +/** @cond _ODP_HIDE_FROM_DOXYGEN_ */ + extern const _odp_packet_inline_offset_t _odp_packet_inline; -/** @internal Inline function @param pkt @return */ static inline uint64_t _odp_packet_input_flags(odp_packet_t pkt) { return _odp_pkt_get(pkt, uint64_t, input_flags); @@ -39,7 +39,6 @@ static inline uint64_t _odp_packet_input_flags(odp_packet_t pkt) #define _ODP_INLINE #endif -/** @internal Inline function @param pkt @return */ _ODP_INLINE int odp_packet_has_l2(odp_packet_t pkt) { _odp_packet_input_flags_t flags; @@ -48,7 +47,6 @@ _ODP_INLINE int odp_packet_has_l2(odp_packet_t pkt) return flags.l2; } -/** @internal Inline function @param pkt @return */ _ODP_INLINE int odp_packet_has_eth(odp_packet_t pkt) { _odp_packet_input_flags_t flags; @@ -57,7 +55,6 @@ _ODP_INLINE int odp_packet_has_eth(odp_packet_t pkt) return flags.eth; } -/** @internal Inline function @param pkt @return */ _ODP_INLINE int odp_packet_has_jumbo(odp_packet_t pkt) { _odp_packet_input_flags_t flags; @@ -66,7 +63,6 @@ _ODP_INLINE int odp_packet_has_jumbo(odp_packet_t pkt) return flags.jumbo; } -/** @internal Inline function @param pkt @return */ _ODP_INLINE int odp_packet_has_flow_hash(odp_packet_t pkt) { _odp_packet_input_flags_t flags; @@ -75,7 +71,6 @@ _ODP_INLINE int odp_packet_has_flow_hash(odp_packet_t pkt) return flags.flow_hash; } -/** @internal Inline function @param pkt @return */ _ODP_INLINE int odp_packet_has_ts(odp_packet_t pkt) { _odp_packet_input_flags_t flags; @@ -84,7 +79,6 @@ _ODP_INLINE int odp_packet_has_ts(odp_packet_t pkt) return flags.timestamp; } -/** @internal Inline function @param pkt @return */ _ODP_INLINE int odp_packet_has_ipsec(odp_packet_t pkt) { _odp_packet_input_flags_t flags; @@ -93,4 +87,6 @@ _ODP_INLINE int odp_packet_has_ipsec(odp_packet_t pkt) return flags.ipsec; } +/** @endcond */ + #endif commit d61545b5b2ad42d7e9fca34d3b077942fcc04c01 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Sun Apr 22 20:05:34 2018 +0300 linux-gen: packet_flags: remove separate API inlining header 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 cb9ca6f3..586a0637 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -29,7 +29,6 @@ odpapiplatinclude_HEADERS = \ include/odp/api/plat/byteorder_inlines_api.h \ include/odp/api/plat/event_inlines.h \ include/odp/api/plat/packet_flag_inlines.h \ - include/odp/api/plat/packet_flag_inlines_api.h \ include/odp/api/plat/packet_inline_types.h \ include/odp/api/plat/packet_inlines.h \ include/odp/api/plat/packet_inlines_api.h \ diff --git a/platform/linux-generic/include-abi/odp/api/abi/packet_flags.h b/platform/linux-generic/include-abi/odp/api/abi/packet_flags.h index 58aee1f4..8e7b88ca 100644 --- a/platform/linux-generic/include-abi/odp/api/abi/packet_flags.h +++ b/platform/linux-generic/include-abi/odp/api/abi/packet_flags.h @@ -18,7 +18,6 @@ extern "C" { #endif #include <odp/api/plat/packet_flag_inlines.h> -#include <odp/api/plat/packet_flag_inlines_api.h> #ifdef __cplusplus } diff --git a/platform/linux-generic/include/odp/api/plat/packet_flag_inlines.h b/platform/linux-generic/include/odp/api/plat/packet_flag_inlines.h index b677cf45..c366daa1 100644 --- a/platform/linux-generic/include/odp/api/plat/packet_flag_inlines.h +++ b/platform/linux-generic/include/odp/api/plat/packet_flag_inlines.h @@ -14,7 +14,7 @@ #define _ODP_PLAT_PACKET_FLAG_INLINES_H_ #include <odp/api/abi/packet.h> -#include <odp/api/plat/packet_inlines.h> +#include <odp/api/plat/packet_inline_types.h> #include <odp/api/hints.h> /** @internal Inline function offsets */ @@ -26,8 +26,21 @@ static inline uint64_t _odp_packet_input_flags(odp_packet_t pkt) return _odp_pkt_get(pkt, uint64_t, input_flags); } +#ifndef _ODP_NO_INLINE + /* Inline functions by default */ + #define _ODP_INLINE static inline + #define odp_packet_has_l2 __odp_packet_has_l2 + #define odp_packet_has_eth __odp_packet_has_eth + #define odp_packet_has_jumbo __odp_packet_has_jumbo + #define odp_packet_has_flow_hash __odp_packet_has_flow_hash + #define odp_packet_has_ts __odp_packet_has_ts + #define odp_packet_has_ipsec __odp_packet_has_ipsec +#else + #define _ODP_INLINE +#endif + /** @internal Inline function @param pkt @return */ -static inline int _odp_packet_has_l2(odp_packet_t pkt) +_ODP_INLINE int odp_packet_has_l2(odp_packet_t pkt) { _odp_packet_input_flags_t flags; @@ -36,7 +49,7 @@ static inline int _odp_packet_has_l2(odp_packet_t pkt) } /** @internal Inline function @param pkt @return */ -static inline int _odp_packet_has_eth(odp_packet_t pkt) +_ODP_INLINE int odp_packet_has_eth(odp_packet_t pkt) { _odp_packet_input_flags_t flags; @@ -45,7 +58,7 @@ static inline int _odp_packet_has_eth(odp_packet_t pkt) } /** @internal Inline function @param pkt @return */ -static inline int _odp_packet_has_jumbo(odp_packet_t pkt) +_ODP_INLINE int odp_packet_has_jumbo(odp_packet_t pkt) { _odp_packet_input_flags_t flags; @@ -54,7 +67,7 @@ static inline int _odp_packet_has_jumbo(odp_packet_t pkt) } /** @internal Inline function @param pkt @return */ -static inline int _odp_packet_has_flow_hash(odp_packet_t pkt) +_ODP_INLINE int odp_packet_has_flow_hash(odp_packet_t pkt) { _odp_packet_input_flags_t flags; @@ -63,7 +76,7 @@ static inline int _odp_packet_has_flow_hash(odp_packet_t pkt) } /** @internal Inline function @param pkt @return */ -static inline int _odp_packet_has_ts(odp_packet_t pkt) +_ODP_INLINE int odp_packet_has_ts(odp_packet_t pkt) { _odp_packet_input_flags_t flags; @@ -72,7 +85,7 @@ static inline int _odp_packet_has_ts(odp_packet_t pkt) } /** @internal Inline function @param pkt @return */ -static inline int _odp_packet_has_ipsec(odp_packet_t pkt) +_ODP_INLINE int odp_packet_has_ipsec(odp_packet_t pkt) { _odp_packet_input_flags_t flags; diff --git a/platform/linux-generic/include/odp/api/plat/packet_flag_inlines_api.h b/platform/linux-generic/include/odp/api/plat/packet_flag_inlines_api.h deleted file mode 100644 index bbe5f68f..00000000 --- a/platform/linux-generic/include/odp/api/plat/packet_flag_inlines_api.h +++ /dev/null @@ -1,41 +0,0 @@ -/* Copyright (c) 2017-2018, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -/** - * @file - * - * Packet inline functions - */ - -#ifndef _ODP_PLAT_PACKET_FLAG_INLINES_API_H_ -#define _ODP_PLAT_PACKET_FLAG_INLINES_API_H_ - -_ODP_INLINE int odp_packet_has_l2(odp_packet_t pkt) -{ - return _odp_packet_has_l2(pkt); -} - -_ODP_INLINE int odp_packet_has_eth(odp_packet_t pkt) -{ - return _odp_packet_has_eth(pkt); -} - -_ODP_INLINE int odp_packet_has_jumbo(odp_packet_t pkt) -{ - return _odp_packet_has_jumbo(pkt); -} - -_ODP_INLINE int odp_packet_has_flow_hash(odp_packet_t pkt) -{ - return _odp_packet_has_flow_hash(pkt); -} - -_ODP_INLINE int odp_packet_has_ts(odp_packet_t pkt) -{ - return _odp_packet_has_ts(pkt); -} - -#endif diff --git a/platform/linux-generic/include/odp/api/plat/ticketlock_inlines_api.h b/platform/linux-generic/include/odp/api/plat/ticketlock_inlines_api.h deleted file mode 100644 index ee2613db..00000000 --- a/platform/linux-generic/include/odp/api/plat/ticketlock_inlines_api.h +++ /dev/null @@ -1,42 +0,0 @@ -/* Copyright (c) 2017-2018, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -/** - * @file - * - * Ticketlock inline functions - */ - -#ifndef _ODP_PLAT_TICKETLOCK_INLINES_API_H_ -#define _ODP_PLAT_TICKETLOCK_INLINES_API_H_ - -_ODP_INLINE void odp_ticketlock_lock(odp_ticketlock_t *lock) -{ - return _odp_ticketlock_lock(lock); -} - -_ODP_INLINE int odp_ticketlock_trylock(odp_ticketlock_t *lock) -{ - return _odp_ticketlock_trylock(lock); -} - -_ODP_INLINE void odp_ticketlock_unlock(odp_ticketlock_t *lock) -{ - _odp_ticketlock_unlock(lock); -} - -_ODP_INLINE int odp_ticketlock_is_locked(odp_ticketlock_t *lock) -{ - return _odp_ticketlock_is_locked(lock); -} - -_ODP_INLINE void odp_ticketlock_init(odp_ticketlock_t *ticketlock) -{ - odp_atomic_init_u32(&ticketlock->next_ticket, 0); - odp_atomic_init_u32(&ticketlock->cur_ticket, 0); -} - -#endif diff --git a/platform/linux-generic/odp_packet_flags.c b/platform/linux-generic/odp_packet_flags.c index efd564d0..48ebab10 100644 --- a/platform/linux-generic/odp_packet_flags.c +++ b/platform/linux-generic/odp_packet_flags.c @@ -116,11 +116,6 @@ int odp_packet_has_ipopt(odp_packet_t pkt) retflag(pkt, input_flags.ipopt); } -int odp_packet_has_ipsec(odp_packet_t pkt) -{ - retflag(pkt, input_flags.ipsec); -} - int odp_packet_has_udp(odp_packet_t pkt) { retflag(pkt, input_flags.udp); diff --git a/platform/linux-generic/odp_packet_flags_api.c b/platform/linux-generic/odp_packet_flags_api.c index e2bc217b..a4ecbc63 100644 --- a/platform/linux-generic/odp_packet_flags_api.c +++ b/platform/linux-generic/odp_packet_flags_api.c @@ -6,11 +6,9 @@ #include "config.h" -#include <odp/api/plat/packet_flag_inlines.h> #include <odp/api/packet_flags.h> #include <odp_packet_internal.h> /* Include non-inlined versions of API functions */ -#undef _ODP_INLINE -#define _ODP_INLINE -#include <odp/api/plat/packet_flag_inlines_api.h> +#define _ODP_NO_INLINE +#include <odp/api/plat/packet_flag_inlines.h> diff --git a/platform/linux-generic/pktio/loop.c b/platform/linux-generic/pktio/loop.c index f9faba5c..99b09e6a 100644 --- a/platform/linux-generic/pktio/loop.c +++ b/platform/linux-generic/pktio/loop.c @@ -161,7 +161,7 @@ static int loopback_recv(pktio_entry_t *pktio_entry, int index ODP_UNUSED, /* Try IPsec inline processing */ if (pktio_entry->s.config.inbound_ipsec && !pkt_hdr->p.flags.ip_err && - _odp_packet_has_ipsec(pkt)) + odp_packet_has_ipsec(pkt)) _odp_ipsec_try_inline(&pkt); pktio_entry->s.stats.in_octets += pkt_len; commit f426dbf3b4dc5be7a1b56d9cc3c0dab00eb9787c Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Sun Apr 22 20:05:34 2018 +0300 linux-gen: pktio: remove separate API inlining header 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 b904877c..cb9ca6f3 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -34,7 +34,6 @@ odpapiplatinclude_HEADERS = \ include/odp/api/plat/packet_inlines.h \ include/odp/api/plat/packet_inlines_api.h \ include/odp/api/plat/pktio_inlines.h \ - include/odp/api/plat/pktio_inlines_api.h \ include/odp/api/plat/pool_inline_types.h \ include/odp/api/plat/std_clib_inlines.h \ include/odp/api/plat/strong_types.h \ diff --git a/platform/linux-generic/include-abi/odp/api/abi/packet.h b/platform/linux-generic/include-abi/odp/api/abi/packet.h index ecac4737..0b11d0bd 100644 --- a/platform/linux-generic/include-abi/odp/api/abi/packet.h +++ b/platform/linux-generic/include-abi/odp/api/abi/packet.h @@ -89,8 +89,8 @@ typedef enum { #define ODP_NUM_PACKET_COLORS 3 -#define _ODP_INLINE static inline #include <odp/api/plat/packet_inlines.h> +#define _ODP_INLINE static inline #include <odp/api/plat/packet_inlines_api.h> /** diff --git a/platform/linux-generic/include-abi/odp/api/abi/packet_io.h b/platform/linux-generic/include-abi/odp/api/abi/packet_io.h index 41ea94a1..dcae5393 100644 --- a/platform/linux-generic/include-abi/odp/api/abi/packet_io.h +++ b/platform/linux-generic/include-abi/odp/api/abi/packet_io.h @@ -51,9 +51,7 @@ typedef struct odp_pktout_queue_t { * @} */ -#define _ODP_INLINE static inline #include <odp/api/plat/pktio_inlines.h> -#include <odp/api/plat/pktio_inlines_api.h> #ifdef __cplusplus } 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 ae90ec5b..2b9c4322 100644 --- a/platform/linux-generic/include/odp/api/plat/packet_inlines.h +++ b/platform/linux-generic/include/odp/api/plat/packet_inlines.h @@ -101,7 +101,7 @@ static inline int _odp_packet_input_index(odp_packet_t pkt) { odp_pktio_t pktio = _odp_packet_input(pkt); - return _odp_pktio_index(pktio); + return odp_pktio_index(pktio); } static inline int _odp_packet_num_segs(odp_packet_t pkt) diff --git a/platform/linux-generic/include/odp/api/plat/pktio_inlines.h b/platform/linux-generic/include/odp/api/plat/pktio_inlines.h index c7398dd5..e219952a 100644 --- a/platform/linux-generic/include/odp/api/plat/pktio_inlines.h +++ b/platform/linux-generic/include/odp/api/plat/pktio_inlines.h @@ -13,7 +13,15 @@ extern "C" { /** @cond _ODP_HIDE_FROM_DOXYGEN_ */ -static inline int _odp_pktio_index(odp_pktio_t pktio) +#ifndef _ODP_NO_INLINE + /* Inline functions by default */ + #define _ODP_INLINE static inline + #define odp_pktio_index __odp_pktio_index +#else + #define _ODP_INLINE +#endif + +_ODP_INLINE int odp_pktio_index(odp_pktio_t pktio) { return (int)(uintptr_t)pktio - 1; } diff --git a/platform/linux-generic/include/odp/api/plat/pktio_inlines_api.h b/platform/linux-generic/include/odp/api/plat/pktio_inlines_api.h deleted file mode 100644 index 6b264ea1..00000000 --- a/platform/linux-generic/include/odp/api/plat/pktio_inlines_api.h +++ /dev/null @@ -1,31 +0,0 @@ -/* Copyright (c) 2018-2018, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -/** - * @file - */ - -#ifndef ODP_PLAT_PKTIO_INLINES_API_H_ -#define ODP_PLAT_PKTIO_INLINES_API_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -_ODP_INLINE int odp_pktio_index(odp_pktio_t pktio) -{ - return _odp_pktio_index(pktio); -} - -/** - * @} - */ - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/platform/linux-generic/include/odp_packet_io_internal.h b/platform/linux-generic/include/odp_packet_io_internal.h index cf02476d..8019dfe9 100644 --- a/platform/linux-generic/include/odp_packet_io_internal.h +++ b/platform/linux-generic/include/odp_packet_io_internal.h @@ -260,7 +260,7 @@ static inline pktio_entry_t *get_pktio_entry(odp_pktio_t pktio) return NULL; } - idx = _odp_pktio_index(pktio); + idx = odp_pktio_index(pktio); return pktio_entry_ptr[idx]; } diff --git a/platform/linux-generic/odp_packet_api.c b/platform/linux-generic/odp_packet_api.c index f2e4f860..8f9f8dee 100644 --- a/platform/linux-generic/odp_packet_api.c +++ b/platform/linux-generic/odp_packet_api.c @@ -24,5 +24,6 @@ #include <inttypes.h> /* Include non-inlined versions of API functions */ +#undef _ODP_INLINE #define _ODP_INLINE #include <odp/api/plat/packet_inlines_api.h> diff --git a/platform/linux-generic/odp_packet_flags_api.c b/platform/linux-generic/odp_packet_flags_api.c index c9441bb4..e2bc217b 100644 --- a/platform/linux-generic/odp_packet_flags_api.c +++ b/platform/linux-generic/odp_packet_flags_api.c @@ -11,5 +11,6 @@ #include <odp_packet_internal.h> /* Include non-inlined versions of API functions */ +#undef _ODP_INLINE #define _ODP_INLINE #include <odp/api/plat/packet_flag_inlines_api.h> diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c index 1721cdec..2f39b981 100644 --- a/platform/linux-generic/odp_packet_io.c +++ b/platform/linux-generic/odp_packet_io.c @@ -513,7 +513,7 @@ int odp_pktio_start(odp_pktio_t hdl) } } - sched_fn->pktio_start(_odp_pktio_index(hdl), num, index, odpq); + sched_fn->pktio_start(odp_pktio_index(hdl), num, index, odpq); } ODP_DBG("interface: %s, input queues: %u, output queues: %u\n", @@ -1189,7 +1189,7 @@ void odp_pktio_print(odp_pktio_t hdl) len += snprintf(&str[len], n - len, " type %s\n", entry->s.ops->name); len += snprintf(&str[len], n - len, - " index %i\n", _odp_pktio_index(hdl)); + " index %i\n", odp_pktio_index(hdl)); len += snprintf(&str[len], n - len, " handle (u64) %" PRIu64 "\n", odp_pktio_to_u64(hdl)); @@ -1463,7 +1463,7 @@ int odp_pktin_queue_config(odp_pktio_t pktio, mode == ODP_PKTIN_MODE_SCHED) { odp_queue_param_t queue_param; char name[ODP_QUEUE_NAME_LEN]; - int pktio_id = _odp_pktio_index(pktio); + int pktio_id = odp_pktio_index(pktio); snprintf(name, sizeof(name), "odp-pktin-%i-%i", pktio_id, i); @@ -1598,7 +1598,7 @@ int odp_pktout_queue_config(odp_pktio_t pktio, odp_queue_param_t queue_param; queue_t q_int; char name[ODP_QUEUE_NAME_LEN]; - int pktio_id = _odp_pktio_index(pktio); + int pktio_id = odp_pktio_index(pktio); snprintf(name, sizeof(name), "odp-pktout-%i-%i", pktio_id, i); diff --git a/platform/linux-generic/odp_pktio_api.c b/platform/linux-generic/odp_pktio_api.c index 52f0b571..16c30743 100644 --- a/platform/linux-generic/odp_pktio_api.c +++ b/platform/linux-generic/odp_pktio_api.c @@ -7,8 +7,7 @@ #include "config.h" #include <odp/api/packet_io.h> -#include <odp/api/plat/pktio_inlines.h> /* Include non-inlined versions of API functions */ -#define _ODP_INLINE -#include <odp/api/plat/pktio_inlines_api.h> +#define _ODP_NO_INLINE +#include <odp/api/plat/pktio_inlines.h> ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/Makefile.am | 10 +-- .../include-abi/odp/api/abi/byteorder.h | 2 - .../linux-generic/include-abi/odp/api/abi/packet.h | 2 +- .../include-abi/odp/api/abi/packet_flags.h | 1 - .../include-abi/odp/api/abi/packet_io.h | 2 - .../include-abi/odp/api/abi/ticketlock.h | 2 - .../include/odp/api/plat/atomic_inlines.h | 75 ++++++++++++++++++ .../include/odp/api/plat/byteorder_inlines.h | 51 ++++++++----- .../include/odp/api/plat/byteorder_inlines_api.h | 88 ---------------------- .../include/odp/api/plat/packet_flag_inlines.h | 39 ++++++---- .../include/odp/api/plat/packet_flag_inlines_api.h | 41 ---------- .../include/odp/api/plat/packet_inlines.h | 2 +- .../include/odp/api/plat/pktio_inlines.h | 10 ++- .../include/odp/api/plat/pktio_inlines_api.h | 31 -------- .../include/odp/api/plat/ticketlock_inlines.h | 62 +++++++-------- .../include/odp/api/plat/ticketlock_inlines_api.h | 42 ----------- .../include/odp_classification_inlines.h | 28 +++---- .../linux-generic/include/odp_packet_io_internal.h | 2 +- platform/linux-generic/include/protocols/thash.h | 8 +- platform/linux-generic/odp_atomic_api.c | 2 +- .../{odp_byteorder.c => odp_byteorder_api.c} | 3 +- platform/linux-generic/odp_classification.c | 2 +- platform/linux-generic/odp_ipsec.c | 56 +++++++------- platform/linux-generic/odp_packet.c | 34 ++++----- platform/linux-generic/odp_packet_api.c | 1 + platform/linux-generic/odp_packet_flags.c | 5 -- platform/linux-generic/odp_packet_flags_api.c | 5 +- platform/linux-generic/odp_packet_io.c | 8 +- platform/linux-generic/odp_pktio_api.c | 5 +- platform/linux-generic/odp_pool.c | 4 +- platform/linux-generic/odp_queue_basic.c | 6 +- platform/linux-generic/odp_queue_scalable.c | 4 +- platform/linux-generic/odp_schedule_scalable.c | 4 +- .../{odp_ticketlock.c => odp_ticketlock_api.c} | 5 +- platform/linux-generic/odp_traffic_mngr.c | 12 +-- platform/linux-generic/pktio/dpdk_parse.c | 34 ++++----- platform/linux-generic/pktio/loop.c | 4 +- 37 files changed, 283 insertions(+), 409 deletions(-) delete mode 100644 platform/linux-generic/include/odp/api/plat/byteorder_inlines_api.h delete mode 100644 platform/linux-generic/include/odp/api/plat/packet_flag_inlines_api.h delete mode 100644 platform/linux-generic/include/odp/api/plat/pktio_inlines_api.h delete mode 100644 platform/linux-generic/include/odp/api/plat/ticketlock_inlines_api.h rename platform/linux-generic/{odp_byteorder.c => odp_byteorder_api.c} (79%) rename platform/linux-generic/{odp_ticketlock.c => odp_ticketlock_api.c} (64%) hooks/post-receive --

5 years, 11 months

[COMMIT] branch master updated. v1.19.0.1_tigermoth-17-g40699694

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 40699694b24cceb86ed441308309393de84c3478 (commit) from 215069d156f3612ff9e140a7e47232047c6870e6 (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 40699694b24cceb86ed441308309393de84c3478 Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Fri May 18 13:43:12 2018 +0300 codecov: disable check by patch Inside PRs there is check for code coverage for patch lines. There is no big reason for that check due to patch also can only remove lines. Only complete project has to be checked for code coverage. Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> diff --git a/.codecov.yml b/.codecov.yml index 327f6549..1e50776b 100644 --- a/.codecov.yml +++ b/.codecov.yml @@ -14,9 +14,7 @@ coverage: threshold: 5% patch: default: - enabled: yes - target: 70% - threshold: 5% + enabled: no changes: no parsers: ----------------------------------------------------------------------- Summary of changes: .codecov.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) hooks/post-receive --

5 years, 11 months

[COMMIT] branch master updated. v1.19.0.1_tigermoth-16-g215069d1

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 215069d156f3612ff9e140a7e47232047c6870e6 (commit) via a459233d0ac535d67e3141e21dee3e805c4e906f (commit) via 0e81876e6119fd76282f3de4bb50dad9e67ec6f2 (commit) from 713f9d5dee94b6eb81cdbbb929bf875f414d339c (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 215069d156f3612ff9e140a7e47232047c6870e6 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Thu May 17 16:14:03 2018 +0300 test: sched_pktio: add timeout statistics Record number of timeouts received. Timers are mostly reset when packets are received. So, timeout rate is low when packets are flowing. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/performance/odp_sched_pktio.c b/test/performance/odp_sched_pktio.c index 18fcc20a..d81994cd 100644 --- a/test/performance/odp_sched_pktio.c +++ b/test/performance/odp_sched_pktio.c @@ -45,6 +45,7 @@ typedef struct { typedef struct ODP_ALIGNED_CACHE { uint64_t rx_pkt; uint64_t tx_pkt; + uint64_t tmo; } worker_stat_t; typedef struct queue_context_t { @@ -289,6 +290,9 @@ static int worker_thread_timers(void *arg) queue_context->dst_pktio, queue_context->dst_queue, num_pkt, tmos); + if (odp_unlikely(test_global->opt.collect_stat && tmos)) + test_global->worker_stat[worker_id].tmo += tmos; + if (odp_unlikely(num_pkt == 0)) continue; @@ -527,37 +531,41 @@ static void print_config(test_global_t *test_global) static void print_stat(test_global_t *test_global, uint64_t nsec) { int i; - uint64_t rx, tx, drop; + uint64_t rx, tx, drop, tmo; uint64_t rx_sum = 0; uint64_t tx_sum = 0; + uint64_t tmo_sum = 0; double sec = 0.0; printf("\nTest statistics\n"); - printf(" worker rx_pkt tx_pkt dropped\n"); + printf(" worker rx_pkt tx_pkt dropped tmo\n"); for (i = 0; i < test_global->opt.num_worker; i++) { rx = test_global->worker_stat[i].rx_pkt; tx = test_global->worker_stat[i].tx_pkt; + tmo = test_global->worker_stat[i].tmo; rx_sum += rx; tx_sum += tx; + tmo_sum += tmo; - printf(" %6i %16" PRIu64 " %16" PRIu64 " %16" PRIu64 "\n", - i, rx, tx, rx - tx); + printf(" %6i %16" PRIu64 " %16" PRIu64 " %16" PRIu64 " %16" + PRIu64 "\n", i, rx, tx, rx - tx, tmo); } test_global->rx_pkt_sum = rx_sum; test_global->tx_pkt_sum = tx_sum; drop = rx_sum - tx_sum; - printf(" --------------------------------------------------\n"); - printf(" total %16" PRIu64 " %16" PRIu64 " %16" PRIu64 "\n\n", - rx_sum, tx_sum, drop); + printf(" -------------------------------------------------------------------\n"); + printf(" total %16" PRIu64 " %16" PRIu64 " %16" PRIu64 " %16" + PRIu64 "\n\n", rx_sum, tx_sum, drop, tmo_sum); sec = nsec / 1000000000.0; printf(" Total test time: %.2f sec\n", sec); printf(" Rx packet rate: %.2f pps\n", rx_sum / sec); printf(" Tx packet rate: %.2f pps\n", tx_sum / sec); - printf(" Drop rate: %.2f pps\n\n", drop / sec); + printf(" Drop rate: %.2f pps\n", drop / sec); + printf(" Timeout rate: %.2f per sec\n\n", tmo_sum / sec); } static int open_pktios(test_global_t *test_global) commit a459233d0ac535d67e3141e21dee3e805c4e906f Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Thu May 17 11:38:36 2018 +0300 test: sched_pktio: timer reset return codes Timer reset may fail since timer has been expired or it's about to expire. Return code ODP_TIMER_NOEVENT indicates this. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/performance/odp_sched_pktio.c b/test/performance/odp_sched_pktio.c index 8fa4cbb2..18fcc20a 100644 --- a/test/performance/odp_sched_pktio.c +++ b/test/performance/odp_sched_pktio.c @@ -246,8 +246,11 @@ static int worker_thread_timers(void *arg) ret = odp_timer_set_rel(timer, tick, &ev[i]); if (odp_unlikely(ret != ODP_TIMER_SUCCESS)) { - /* Should never happen */ - printf("Expired timer reset failed\n"); + /* Should never happen. Timeout event + * has been received, timer should be + * ready to be set again. */ + printf("Expired timer reset failed " + "%i\n", ret); odp_event_free(ev[i]); } @@ -265,11 +268,12 @@ static int worker_thread_timers(void *arg) ret = odp_timer_set_rel(timer, tick, NULL); if (odp_unlikely(ret != ODP_TIMER_SUCCESS && - ret != ODP_TIMER_TOOEARLY)) { - /* Should never happen. Reset should either - * succeed or be too close to timer expiration - * in which case timeout event will be received - * soon. */ + ret != ODP_TIMER_NOEVENT)) { + /* Tick period is too short or long. Normally, + * reset either succeeds or fails due to timer + * expiration, in which case timeout event will + * be received soon and reset will be done + * then. */ printf("Timer reset failed %i\n", ret); } } commit 0e81876e6119fd76282f3de4bb50dad9e67ec6f2 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Wed May 16 13:58:20 2018 +0300 test: sched_pktio: don't call pktout_send with 0 packets When only timouts are received from the scheduler, avoid odp_pktout_send() call with 0 packets. Rename variable to num_pkt to highlight difference between event count and packet count. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/performance/odp_sched_pktio.c b/test/performance/odp_sched_pktio.c index 109ae87e..8fa4cbb2 100644 --- a/test/performance/odp_sched_pktio.c +++ b/test/performance/odp_sched_pktio.c @@ -127,7 +127,7 @@ static inline void fill_eth_addr(odp_packet_t pkt[], int num, static int worker_thread(void *arg) { odp_event_t ev[BURST_SIZE]; - int num, sent, drop, out; + int num_pkt, sent, drop, out; odp_pktout_queue_t pktout; odp_queue_t queue; queue_context_t *queue_context; @@ -144,8 +144,8 @@ static int worker_thread(void *arg) while (1) { odp_packet_t pkt[BURST_SIZE]; - num = odp_schedule_multi(&queue, ODP_SCHED_NO_WAIT, - ev, BURST_SIZE); + num_pkt = odp_schedule_multi(&queue, ODP_SCHED_NO_WAIT, + ev, BURST_SIZE); polls++; @@ -155,7 +155,7 @@ static int worker_thread(void *arg) break; } - if (num <= 0) + if (num_pkt <= 0) continue; queue_context = odp_queue_context(queue); @@ -166,27 +166,27 @@ static int worker_thread(void *arg) queue_context->src_pktio, queue_context->src_queue, queue_context->dst_pktio, - queue_context->dst_queue, num); + queue_context->dst_queue, num_pkt); - odp_packet_from_event_multi(pkt, ev, num); + odp_packet_from_event_multi(pkt, ev, num_pkt); pktout = queue_context->dst_pktout; out = queue_context->dst_pktio; - fill_eth_addr(pkt, num, test_global, out); + fill_eth_addr(pkt, num_pkt, test_global, out); - sent = odp_pktout_send(pktout, pkt, num); + sent = odp_pktout_send(pktout, pkt, num_pkt); if (odp_unlikely(sent < 0)) sent = 0; - drop = num - sent; + drop = num_pkt - sent; if (odp_unlikely(drop)) odp_packet_free_multi(&pkt[sent], drop); if (odp_unlikely(test_global->opt.collect_stat)) { - test_global->worker_stat[worker_id].rx_pkt += num; + test_global->worker_stat[worker_id].rx_pkt += num_pkt; test_global->worker_stat[worker_id].tx_pkt += sent; } } @@ -199,7 +199,7 @@ static int worker_thread(void *arg) static int worker_thread_timers(void *arg) { odp_event_t ev[BURST_SIZE]; - int num, sent, drop, out, tmos, i, src_pktio, src_queue; + int num, num_pkt, sent, drop, out, tmos, i, src_pktio, src_queue; odp_pktout_queue_t pktout; odp_queue_t queue; queue_context_t *queue_context; @@ -274,7 +274,7 @@ static int worker_thread_timers(void *arg) } } - num = num - tmos; + num_pkt = num - tmos; if (DEBUG_PRINT) printf("worker %i: [%i/%i] -> [%i/%i], %i packets " @@ -283,25 +283,28 @@ static int worker_thread_timers(void *arg) queue_context->src_pktio, queue_context->src_queue, queue_context->dst_pktio, - queue_context->dst_queue, num, tmos); + queue_context->dst_queue, num_pkt, tmos); + + if (odp_unlikely(num_pkt == 0)) + continue; pktout = queue_context->dst_pktout; out = queue_context->dst_pktio; - fill_eth_addr(pkt, num, test_global, out); + fill_eth_addr(pkt, num_pkt, test_global, out); - sent = odp_pktout_send(pktout, pkt, num); + sent = odp_pktout_send(pktout, pkt, num_pkt); if (odp_unlikely(sent < 0)) sent = 0; - drop = num - sent; + drop = num_pkt - sent; if (odp_unlikely(drop)) odp_packet_free_multi(&pkt[sent], drop); if (odp_unlikely(test_global->opt.collect_stat)) { - test_global->worker_stat[worker_id].rx_pkt += num; + test_global->worker_stat[worker_id].rx_pkt += num_pkt; test_global->worker_stat[worker_id].tx_pkt += sent; } } ----------------------------------------------------------------------- Summary of changes: test/performance/odp_sched_pktio.c | 79 +++++++++++++++++++++++--------------- 1 file changed, 47 insertions(+), 32 deletions(-) hooks/post-receive --

5 years, 11 months

[COMMIT] branch master updated. v1.19.0.1_tigermoth-13-g713f9d5d

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 713f9d5dee94b6eb81cdbbb929bf875f414d339c (commit) via 0034b0c0c63194bd7aa227364b381d6b049631dc (commit) via 933a59910b2b95f579dbb11729192ccfcc26bcd7 (commit) via 894b80ee113440037b7899459eeb1c0f5c14b124 (commit) from 0ee8255c2555ed68721ea5e7679f26a2e53bd8b8 (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 713f9d5dee94b6eb81cdbbb929bf875f414d339c Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Sat Jan 13 05:37:11 2018 +0300 linux-gen: pktio: loop: support checksum parsing Add capability bits referencing support for IPv4 and UDP checksum validation for loop pktio device. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-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/platform/linux-generic/pktio/loop.c b/platform/linux-generic/pktio/loop.c index d75102dc..f9faba5c 100644 --- a/platform/linux-generic/pktio/loop.c +++ b/platform/linux-generic/pktio/loop.c @@ -357,6 +357,9 @@ static int loopback_init_capability(pktio_entry_t *pktio_entry) odp_pktio_config_init(&capa->config); capa->config.pktin.bit.ts_all = 1; capa->config.pktin.bit.ts_ptp = 1; + capa->config.pktin.bit.ipv4_chksum = 1; + capa->config.pktin.bit.tcp_chksum = 1; + capa->config.pktin.bit.udp_chksum = 1; capa->config.pktout.bit.ipv4_chksum = 1; capa->config.pktout.bit.tcp_chksum = 1; capa->config.pktout.bit.udp_chksum = 1; commit 0034b0c0c63194bd7aa227364b381d6b049631dc Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Sat Jan 13 05:36:28 2018 +0300 linux-gen: packet: check TCP/UDP checksums Add code to enable checking of TCP and UDP checksums. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-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/platform/linux-generic/include/odp/api/plat/packet_inline_types.h b/platform/linux-generic/include/odp/api/plat/packet_inline_types.h index 4b88d351..9a285fe4 100644 --- a/platform/linux-generic/include/odp/api/plat/packet_inline_types.h +++ b/platform/linux-generic/include/odp/api/plat/packet_inline_types.h @@ -98,6 +98,7 @@ typedef union { uint64_t l3_chksum_done:1; /* L3 checksum validation done */ uint64_t l4_chksum_done:1; /* L4 checksum validation done */ uint64_t ipsec_udp:1; /* UDP-encapsulated IPsec packet */ + uint64_t udp_chksum_zero:1; /* UDP header had 0 as chksum */ }; } _odp_packet_input_flags_t; diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index 77e00fce..50dbdc45 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -1999,6 +1999,22 @@ static uint32_t packet_sum16_32(odp_packet_hdr_t *pkt_hdr, return sum; } +static uint16_t packet_sum_ones_comp16(odp_packet_hdr_t *pkt_hdr, + uint32_t offset, + uint32_t len, + uint32_t l4_part_sum) +{ + uint32_t sum = l4_part_sum; + + sum += packet_sum16_32(pkt_hdr, offset, len); + + /* Not more than two additions */ + sum = (sum & 0xffff) + (sum >> 16); + sum = (sum & 0xffff) + (sum >> 16); + + return sum; +} + /** Parser helper function for Ethernet packets */ static inline uint16_t parse_eth(packet_parser_t *prs, const uint8_t **parseptr, uint32_t *offset, uint32_t frame_len) @@ -2085,7 +2101,8 @@ error: */ static inline uint8_t parse_ipv4(packet_parser_t *prs, const uint8_t **parseptr, uint32_t *offset, uint32_t frame_len, - odp_proto_chksums_t chksums) + odp_proto_chksums_t chksums, + uint32_t *l4_part_sum) { const _odp_ipv4hdr_t *ipv4 = (const _odp_ipv4hdr_t *)*parseptr; uint32_t dstaddr = _odp_be_to_cpu_32(ipv4->dst_addr); @@ -2113,6 +2130,10 @@ static inline uint8_t parse_ipv4(packet_parser_t *prs, const uint8_t **parseptr, *offset += ihl * 4; *parseptr += ihl * 4; + if (chksums.chksum.udp || chksums.chksum.tcp) + *l4_part_sum = segment_sum16_32((const uint8_t *)&ipv4->src_addr, + 2 * _ODP_IPV4ADDR_LEN, 0); + if (odp_unlikely(ihl > _ODP_IPV4HDR_IHL_MIN)) prs->input_flags.ipopt = 1; @@ -2139,7 +2160,9 @@ static inline uint8_t parse_ipv4(packet_parser_t *prs, const uint8_t **parseptr, */ static inline uint8_t parse_ipv6(packet_parser_t *prs, const uint8_t **parseptr, uint32_t *offset, uint32_t frame_len, - uint32_t seg_len) + uint32_t seg_len, + odp_proto_chksums_t chksums, + uint32_t *l4_part_sum) { const _odp_ipv6hdr_t *ipv6 = (const _odp_ipv6hdr_t *)*parseptr; const _odp_ipv6hdr_ext_t *ipv6ext; @@ -2162,6 +2185,10 @@ static inline uint8_t parse_ipv6(packet_parser_t *prs, const uint8_t **parseptr, *offset += sizeof(_odp_ipv6hdr_t); *parseptr += sizeof(_odp_ipv6hdr_t); + if (chksums.chksum.udp || chksums.chksum.tcp) + *l4_part_sum = segment_sum16_32((const uint8_t *)&ipv6->src_addr, + 2 * _ODP_IPV6ADDR_LEN, 0); + /* Skip past any IPv6 extension headers */ if (ipv6->next_hdr == _ODP_IPPROTO_HOPOPTS || ipv6->next_hdr == _ODP_IPPROTO_ROUTE) { @@ -2200,7 +2227,10 @@ static inline uint8_t parse_ipv6(packet_parser_t *prs, const uint8_t **parseptr, /** * Parser helper function for TCP */ -static inline void parse_tcp(packet_parser_t *prs, const uint8_t **parseptr) +static inline void parse_tcp(packet_parser_t *prs, const uint8_t **parseptr, + uint16_t tcp_len, + odp_proto_chksums_t chksums, + uint32_t *l4_part_sum) { const _odp_tcphdr_t *tcp = (const _odp_tcphdr_t *)*parseptr; uint32_t len = tcp->hl * 4; @@ -2208,20 +2238,51 @@ static inline void parse_tcp(packet_parser_t *prs, const uint8_t **parseptr) if (odp_unlikely(tcp->hl < sizeof(_odp_tcphdr_t) / sizeof(uint32_t))) prs->flags.tcp_err = 1; + if (chksums.chksum.tcp && + !prs->input_flags.ipfrag) { + *l4_part_sum += odp_cpu_to_be_16(tcp_len); +#if ODP_BYTE_ORDER == ODP_BIG_ENDIAN + *l4_part_sum += _ODP_IPPROTO_TCP; +#else + *l4_part_sum += _ODP_IPPROTO_TCP << 8; +#endif + } + *parseptr += len; } /** * Parser helper function for UDP */ -static inline void parse_udp(packet_parser_t *prs, const uint8_t **parseptr) +static inline void parse_udp(packet_parser_t *prs, const uint8_t **parseptr, + odp_proto_chksums_t chksums, + uint32_t *l4_part_sum) { const _odp_udphdr_t *udp = (const _odp_udphdr_t *)*parseptr; uint32_t udplen = _odp_be_to_cpu_16(udp->length); uint16_t ipsec_port = _odp_cpu_to_be_16(_ODP_UDP_IPSEC_PORT); - if (odp_unlikely(udplen < sizeof(_odp_udphdr_t))) + if (odp_unlikely(udplen < sizeof(_odp_udphdr_t))) { prs->flags.udp_err = 1; + return; + } + + if (chksums.chksum.udp && + !prs->input_flags.ipfrag) { + if (udp->chksum == 0) { + prs->input_flags.l4_chksum_done = 1; + prs->flags.l4_chksum_err = + (prs->input_flags.ipv4 != 1); + } else { + *l4_part_sum += udp->length; +#if ODP_BYTE_ORDER == ODP_BIG_ENDIAN + *l4_part_sum += _ODP_IPPROTO_UDP; +#else + *l4_part_sum += _ODP_IPPROTO_UDP << 8; +#endif + } + prs->input_flags.udp_chksum_zero = (udp->chksum == 0); + } if (odp_unlikely(ipsec_port == udp->dst_port && udplen > 4)) { uint32_t val; @@ -2241,7 +2302,8 @@ int packet_parse_common_l3_l4(packet_parser_t *prs, const uint8_t *parseptr, uint32_t offset, uint32_t frame_len, uint32_t seg_len, int layer, uint16_t ethtype, - odp_proto_chksums_t chksums) + odp_proto_chksums_t chksums, + uint32_t *l4_part_sum) { uint8_t ip_proto; @@ -2258,14 +2320,14 @@ int packet_parse_common_l3_l4(packet_parser_t *prs, const uint8_t *parseptr, case _ODP_ETHTYPE_IPV4: prs->input_flags.ipv4 = 1; ip_proto = parse_ipv4(prs, &parseptr, &offset, frame_len, - chksums); + chksums, l4_part_sum); prs->l4_offset = offset; break; case _ODP_ETHTYPE_IPV6: prs->input_flags.ipv6 = 1; ip_proto = parse_ipv6(prs, &parseptr, &offset, frame_len, - seg_len); + seg_len, chksums, l4_part_sum); prs->l4_offset = offset; break; @@ -2302,14 +2364,15 @@ int packet_parse_common_l3_l4(packet_parser_t *prs, const uint8_t *parseptr, if (odp_unlikely(offset + _ODP_TCPHDR_LEN > seg_len)) return -1; prs->input_flags.tcp = 1; - parse_tcp(prs, &parseptr); + parse_tcp(prs, &parseptr, frame_len - prs->l4_offset, chksums, + l4_part_sum); break; case _ODP_IPPROTO_UDP: if (odp_unlikely(offset + _ODP_UDPHDR_LEN > seg_len)) return -1; prs->input_flags.udp = 1; - parse_udp(prs, &parseptr); + parse_udp(prs, &parseptr, chksums, l4_part_sum); break; case _ODP_IPPROTO_AH: @@ -2351,6 +2414,7 @@ int packet_parse_common(packet_parser_t *prs, const uint8_t *ptr, uint32_t offset; uint16_t ethtype; const uint8_t *parseptr; + uint32_t l4_part_sum; parseptr = ptr; offset = 0; @@ -2364,7 +2428,8 @@ int packet_parse_common(packet_parser_t *prs, const uint8_t *ptr, ethtype = parse_eth(prs, &parseptr, &offset, frame_len); return packet_parse_common_l3_l4(prs, parseptr, offset, frame_len, - seg_len, layer, ethtype, chksums); + seg_len, layer, ethtype, chksums, + &l4_part_sum); } static inline int packet_ipv4_chksum(odp_packet_t pkt, @@ -2520,6 +2585,49 @@ int _odp_packet_udp_chksum_insert(odp_packet_t pkt) return _odp_packet_tcp_udp_chksum_insert(pkt, _ODP_IPPROTO_UDP); } +static int packet_l4_chksum(odp_packet_hdr_t *pkt_hdr, + odp_proto_chksums_t chksums, + uint32_t l4_part_sum) +{ + /* UDP chksum == 0 case is covered in parse_udp() */ + if (chksums.chksum.udp && + pkt_hdr->p.input_flags.udp && + !pkt_hdr->p.input_flags.ipfrag && + !pkt_hdr->p.input_flags.udp_chksum_zero) { + uint16_t sum = ~packet_sum_ones_comp16(pkt_hdr, + pkt_hdr->p.l4_offset, + pkt_hdr->frame_len - + pkt_hdr->p.l4_offset, + l4_part_sum); + + pkt_hdr->p.input_flags.l4_chksum_done = 1; + if (sum != 0) { + pkt_hdr->p.flags.l4_chksum_err = 1; + pkt_hdr->p.flags.udp_err = 1; + ODP_DBG("UDP chksum fail (%x)!\n", sum); + } + } + + if (chksums.chksum.tcp && + pkt_hdr->p.input_flags.tcp && + !pkt_hdr->p.input_flags.ipfrag) { + uint16_t sum = ~packet_sum_ones_comp16(pkt_hdr, + pkt_hdr->p.l4_offset, + pkt_hdr->frame_len - + pkt_hdr->p.l4_offset, + l4_part_sum); + + pkt_hdr->p.input_flags.l4_chksum_done = 1; + if (sum != 0) { + pkt_hdr->p.flags.l4_chksum_err = 1; + pkt_hdr->p.flags.tcp_err = 1; + ODP_DBG("TCP chksum fail (%x)!\n", sum); + } + } + + return pkt_hdr->p.flags.all_flags != 0; +} + /** * Simple packet parser */ @@ -2528,23 +2636,46 @@ int packet_parse_layer(odp_packet_hdr_t *pkt_hdr, odp_proto_chksums_t chksums) { uint32_t seg_len = packet_first_seg_len(pkt_hdr); - void *base = packet_data(pkt_hdr); + const uint8_t *base = packet_data(pkt_hdr); + uint32_t offset = 0; + uint16_t ethtype; + uint32_t l4_part_sum = 0; + int rc; - return packet_parse_common(&pkt_hdr->p, base, pkt_hdr->frame_len, - seg_len, layer, chksums); + if (odp_unlikely(layer == ODP_PROTO_LAYER_NONE)) + return 0; + + /* Assume valid L2 header, no CRC/FCS check in SW */ + pkt_hdr->p.l2_offset = offset; + + ethtype = parse_eth(&pkt_hdr->p, &base, &offset, pkt_hdr->frame_len); + + rc = packet_parse_common_l3_l4(&pkt_hdr->p, base, offset, + pkt_hdr->frame_len, + seg_len, layer, ethtype, chksums, + &l4_part_sum); + + if (rc != 0) + return rc; + + if (layer >= ODP_PKTIO_PARSER_LAYER_L4) + return packet_l4_chksum(pkt_hdr, chksums, l4_part_sum); + else + return 0; } int odp_packet_parse(odp_packet_t pkt, uint32_t offset, const odp_packet_parse_param_t *param) { odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); - void *data; + const uint8_t *data; uint32_t seg_len; uint32_t packet_len = pkt_hdr->frame_len; odp_proto_t proto = param->proto; odp_proto_layer_t layer = param->last_layer; int ret; uint16_t ethtype; + uint32_t l4_part_sum = 0; if (proto == ODP_PROTO_NONE || layer == ODP_PROTO_LAYER_NONE) return -1; @@ -2557,24 +2688,29 @@ int odp_packet_parse(odp_packet_t pkt, uint32_t offset, packet_parse_reset(pkt_hdr); if (proto == ODP_PROTO_ETH) { - ret = packet_parse_common(&pkt_hdr->p, data, packet_len, - seg_len, layer, - param->chksums); - - if (ret) - return -1; + /* Assume valid L2 header, no CRC/FCS check in SW */ + pkt_hdr->p.l2_offset = offset; + + ethtype = parse_eth(&pkt_hdr->p, &data, &offset, packet_len); + } else if (proto == ODP_PROTO_IPV4) { + ethtype = _ODP_ETHTYPE_IPV4; + } else if (proto == ODP_PROTO_IPV6) { + ethtype = _ODP_ETHTYPE_IPV6; } else { - if (proto == ODP_PROTO_IPV4) - ethtype = _ODP_ETHTYPE_IPV4; - else - ethtype = _ODP_ETHTYPE_IPV6; + ethtype = 0; /* Invalid */ + } - ret = packet_parse_common_l3_l4(&pkt_hdr->p, data, offset, - packet_len, seg_len, - layer, ethtype, - param->chksums); + ret = packet_parse_common_l3_l4(&pkt_hdr->p, data, offset, + packet_len, seg_len, + layer, ethtype, + param->chksums, + &l4_part_sum); + if (ret) + return -1; + if (layer >= ODP_PROTO_LAYER_L4) { + ret = packet_l4_chksum(pkt_hdr, param->chksums, l4_part_sum); if (ret) return -1; } commit 933a59910b2b95f579dbb11729192ccfcc26bcd7 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Sat Jan 13 05:23:55 2018 +0300 linux-gen: packet: add IPv4 checksum validation If configured, check IPv4 header checksum. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-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/platform/linux-generic/include/odp_packet_internal.h b/platform/linux-generic/include/odp_packet_internal.h index 933dd4be..951903dd 100644 --- a/platform/linux-generic/include/odp_packet_internal.h +++ b/platform/linux-generic/include/odp_packet_internal.h @@ -252,7 +252,8 @@ int packet_alloc_multi(odp_pool_t pool_hdl, uint32_t len, /* Perform packet parse up to a given protocol layer */ int packet_parse_layer(odp_packet_hdr_t *pkt_hdr, - odp_proto_layer_t layer); + odp_proto_layer_t layer, + odp_proto_chksums_t chksums); /* Reset parser metadata for a new parse */ void packet_parse_reset(odp_packet_hdr_t *pkt_hdr); @@ -293,7 +294,8 @@ static inline void packet_set_ts(odp_packet_hdr_t *pkt_hdr, odp_time_t *ts) } int packet_parse_common(packet_parser_t *pkt_hdr, const uint8_t *ptr, - uint32_t pkt_len, uint32_t seg_len, int layer); + uint32_t pkt_len, uint32_t seg_len, int layer, + odp_proto_chksums_t chksums); int _odp_cls_parse(odp_packet_hdr_t *pkt_hdr, const uint8_t *parseptr); diff --git a/platform/linux-generic/odp_classification.c b/platform/linux-generic/odp_classification.c index 46fcf67e..ae4eb585 100644 --- a/platform/linux-generic/odp_classification.c +++ b/platform/linux-generic/odp_classification.c @@ -998,7 +998,8 @@ int cls_classify_packet(pktio_entry_t *entry, const uint8_t *base, packet_set_len(pkt_hdr, pkt_len); packet_parse_common(&pkt_hdr->p, base, pkt_len, seg_len, - ODP_PROTO_LAYER_ALL); + ODP_PROTO_LAYER_ALL, + entry->s.in_chksums); } cos = cls_select_cos(entry, base, pkt_hdr); diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index e0635444..77e00fce 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -2084,7 +2084,8 @@ error: * Parser helper function for IPv4 */ static inline uint8_t parse_ipv4(packet_parser_t *prs, const uint8_t **parseptr, - uint32_t *offset, uint32_t frame_len) + uint32_t *offset, uint32_t frame_len, + odp_proto_chksums_t chksums) { const _odp_ipv4hdr_t *ipv4 = (const _odp_ipv4hdr_t *)*parseptr; uint32_t dstaddr = _odp_be_to_cpu_32(ipv4->dst_addr); @@ -2100,6 +2101,15 @@ static inline uint8_t parse_ipv4(packet_parser_t *prs, const uint8_t **parseptr, return 0; } + if (chksums.chksum.ipv4) { + prs->input_flags.l3_chksum_done = 1; + if (odp_chksum_ones_comp16(ipv4, ihl * 4) != 0xffff) { + prs->flags.ip_err = 1; + prs->flags.l3_chksum_err = 1; + return 0; + } + } + *offset += ihl * 4; *parseptr += ihl * 4; @@ -2230,7 +2240,8 @@ static inline int packet_parse_common_l3_l4(packet_parser_t *prs, const uint8_t *parseptr, uint32_t offset, uint32_t frame_len, uint32_t seg_len, - int layer, uint16_t ethtype) + int layer, uint16_t ethtype, + odp_proto_chksums_t chksums) { uint8_t ip_proto; @@ -2246,7 +2257,8 @@ int packet_parse_common_l3_l4(packet_parser_t *prs, const uint8_t *parseptr, switch (ethtype) { case _ODP_ETHTYPE_IPV4: prs->input_flags.ipv4 = 1; - ip_proto = parse_ipv4(prs, &parseptr, &offset, frame_len); + ip_proto = parse_ipv4(prs, &parseptr, &offset, frame_len, + chksums); prs->l4_offset = offset; break; @@ -2334,7 +2346,7 @@ int packet_parse_common_l3_l4(packet_parser_t *prs, const uint8_t *parseptr, */ int packet_parse_common(packet_parser_t *prs, const uint8_t *ptr, uint32_t frame_len, uint32_t seg_len, - int layer) + int layer, odp_proto_chksums_t chksums) { uint32_t offset; uint16_t ethtype; @@ -2352,7 +2364,7 @@ int packet_parse_common(packet_parser_t *prs, const uint8_t *ptr, ethtype = parse_eth(prs, &parseptr, &offset, frame_len); return packet_parse_common_l3_l4(prs, parseptr, offset, frame_len, - seg_len, layer, ethtype); + seg_len, layer, ethtype, chksums); } static inline int packet_ipv4_chksum(odp_packet_t pkt, @@ -2512,13 +2524,14 @@ int _odp_packet_udp_chksum_insert(odp_packet_t pkt) * Simple packet parser */ int packet_parse_layer(odp_packet_hdr_t *pkt_hdr, - odp_proto_layer_t layer) + odp_proto_layer_t layer, + odp_proto_chksums_t chksums) { uint32_t seg_len = packet_first_seg_len(pkt_hdr); void *base = packet_data(pkt_hdr); return packet_parse_common(&pkt_hdr->p, base, pkt_hdr->frame_len, - seg_len, layer); + seg_len, layer, chksums); } int odp_packet_parse(odp_packet_t pkt, uint32_t offset, @@ -2545,7 +2558,8 @@ int odp_packet_parse(odp_packet_t pkt, uint32_t offset, if (proto == ODP_PROTO_ETH) { ret = packet_parse_common(&pkt_hdr->p, data, packet_len, - seg_len, layer); + seg_len, layer, + param->chksums); if (ret) return -1; @@ -2557,7 +2571,9 @@ int odp_packet_parse(odp_packet_t pkt, uint32_t offset, ret = packet_parse_common_l3_l4(&pkt_hdr->p, data, offset, packet_len, seg_len, - layer, ethtype); + layer, ethtype, + param->chksums); + if (ret) return -1; diff --git a/platform/linux-generic/pktio/loop.c b/platform/linux-generic/pktio/loop.c index 779e4c62..d75102dc 100644 --- a/platform/linux-generic/pktio/loop.c +++ b/platform/linux-generic/pktio/loop.c @@ -151,7 +151,8 @@ static int loopback_recv(pktio_entry_t *pktio_entry, int index ODP_UNUSED, } } else { packet_parse_layer(pkt_hdr, - pktio_entry->s.config.parser.layer); + pktio_entry->s.config.parser.layer, + pktio_entry->s.in_chksums); } packet_set_ts(pkt_hdr, ts); diff --git a/platform/linux-generic/pktio/netmap.c b/platform/linux-generic/pktio/netmap.c index 567bc9f9..1fb76d2a 100644 --- a/platform/linux-generic/pktio/netmap.c +++ b/platform/linux-generic/pktio/netmap.c @@ -724,7 +724,8 @@ static inline int netmap_pkt_to_odp(pktio_entry_t *pktio_entry, copy_packet_cls_metadata(&parsed_hdr, pkt_hdr); else packet_parse_layer(pkt_hdr, - pktio_entry->s.config.parser.layer); + pktio_entry->s.config.parser.layer, + pktio_entry->s.in_chksums); packet_set_ts(pkt_hdr, ts); } diff --git a/platform/linux-generic/pktio/pcap.c b/platform/linux-generic/pktio/pcap.c index 3df7f960..530a1600 100644 --- a/platform/linux-generic/pktio/pcap.c +++ b/platform/linux-generic/pktio/pcap.c @@ -256,7 +256,8 @@ static int pcapif_recv_pkt(pktio_entry_t *pktio_entry, int index ODP_UNUSED, } packet_parse_layer(pkt_hdr, - pktio_entry->s.config.parser.layer); + pktio_entry->s.config.parser.layer, + pktio_entry->s.in_chksums); pktio_entry->s.stats.in_octets += pkt_hdr->frame_len; packet_set_ts(pkt_hdr, ts); diff --git a/platform/linux-generic/pktio/socket.c b/platform/linux-generic/pktio/socket.c index 8b7200e6..d7753850 100644 --- a/platform/linux-generic/pktio/socket.c +++ b/platform/linux-generic/pktio/socket.c @@ -682,7 +682,8 @@ static int sock_mmsg_recv(pktio_entry_t *pktio_entry, int index ODP_UNUSED, if (!pktio_cls_enabled(pktio_entry)) packet_parse_layer(pkt_hdr, - pktio_entry->s.config.parser.layer); + pktio_entry->s.config.parser.layer, + pktio_entry->s.in_chksums); pkt_hdr->input = pktio_entry->s.handle; packet_set_ts(pkt_hdr, ts); diff --git a/platform/linux-generic/pktio/socket_mmap.c b/platform/linux-generic/pktio/socket_mmap.c index 847eb71a..1731e60d 100644 --- a/platform/linux-generic/pktio/socket_mmap.c +++ b/platform/linux-generic/pktio/socket_mmap.c @@ -259,7 +259,8 @@ static inline unsigned pkt_mmap_v2_rx(pktio_entry_t *pktio_entry, copy_packet_cls_metadata(&parsed_hdr, hdr); else packet_parse_layer(hdr, - pktio_entry->s.config.parser.layer); + pktio_entry->s.config.parser.layer, + pktio_entry->s.in_chksums); packet_set_ts(hdr, ts); diff --git a/platform/linux-generic/pktio/tap.c b/platform/linux-generic/pktio/tap.c index af766e0d..d2f5cea1 100644 --- a/platform/linux-generic/pktio/tap.c +++ b/platform/linux-generic/pktio/tap.c @@ -286,7 +286,8 @@ static odp_packet_t pack_odp_pkt(pktio_entry_t *pktio_entry, const void *data, copy_packet_cls_metadata(&parsed_hdr, pkt_hdr); else packet_parse_layer(pkt_hdr, - pktio_entry->s.config.parser.layer); + pktio_entry->s.config.parser.layer, + pktio_entry->s.in_chksums); packet_set_ts(pkt_hdr, ts); pkt_hdr->input = pktio_entry->s.handle; commit 894b80ee113440037b7899459eeb1c0f5c14b124 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Sat Jan 13 05:18:31 2018 +0300 linux-gen: pktio: introduce checksum settings Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-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/platform/linux-generic/include/odp_packet_io_internal.h b/platform/linux-generic/include/odp_packet_io_internal.h index 4be4b151..cf02476d 100644 --- a/platform/linux-generic/include/odp_packet_io_internal.h +++ b/platform/linux-generic/include/odp_packet_io_internal.h @@ -155,6 +155,7 @@ struct pktio_entry { odp_pktio_config_t config; /**< Device configuration */ classifier_t cls; /**< classifier linked with this pktio*/ odp_pktio_stats_t stats; /**< statistic counters for pktio */ + odp_proto_chksums_t in_chksums; /**< Checksums validation settings */ enum { STATS_SYSFS = 0, STATS_ETHTOOL, diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c index 7b211c45..1721cdec 100644 --- a/platform/linux-generic/odp_packet_io.c +++ b/platform/linux-generic/odp_packet_io.c @@ -456,6 +456,12 @@ int odp_pktio_config(odp_pktio_t hdl, const odp_pktio_config_t *config) entry->s.config = *config; + entry->s.in_chksums.all_chksum = 0; + entry->s.in_chksums.chksum.ipv4 = config->pktin.bit.ipv4_chksum; + entry->s.in_chksums.chksum.tcp = config->pktin.bit.tcp_chksum; + entry->s.in_chksums.chksum.udp = config->pktin.bit.udp_chksum; + entry->s.in_chksums.chksum.sctp = config->pktin.bit.sctp_chksum; + if (entry->s.ops->config) res = entry->s.ops->config(entry, config); ----------------------------------------------------------------------- Summary of changes: .../include/odp/api/plat/packet_inline_types.h | 1 + .../linux-generic/include/odp_packet_internal.h | 6 +- .../linux-generic/include/odp_packet_io_internal.h | 1 + platform/linux-generic/odp_classification.c | 3 +- platform/linux-generic/odp_packet.c | 210 ++++++++++++++++++--- platform/linux-generic/odp_packet_io.c | 6 + platform/linux-generic/pktio/loop.c | 6 +- platform/linux-generic/pktio/netmap.c | 3 +- platform/linux-generic/pktio/pcap.c | 3 +- platform/linux-generic/pktio/socket.c | 3 +- platform/linux-generic/pktio/socket_mmap.c | 3 +- platform/linux-generic/pktio/tap.c | 3 +- 12 files changed, 210 insertions(+), 38 deletions(-) hooks/post-receive --

5 years, 11 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

git-lng-odp May 2018