git-lng-odp

git-lng-odp@lists.linaro.org

1203 discussions

[COMMIT] branch cloud-dev updated. v1.15.0.0-596-gd3fe76f2

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, cloud-dev has been updated via d3fe76f2af39af17a3661b866a442878abc31ddc (commit) via 083b31d9200f5cff4794511f2a9f865506c706ef (commit) from 0242ecfa64a663b7584054edcf02a8f9913391d6 (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 d3fe76f2af39af17a3661b866a442878abc31ddc Author: Kevin Wang <kevin.wang(a)arm.com> Date: Mon Aug 21 14:11:17 2017 +0800 linux-gen: buffer: add generic implementation module Signed-off-by: Kevin Wang <kevin.wang(a)arm.com> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Yi He <yi.he(a)linaro.org> diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index e904046e..3e3e0c22 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -242,7 +242,7 @@ __LIB__libodp_linux_la_SOURCES = \ odp_atomic.c \ odp_barrier.c \ odp_bitmap.c \ - odp_buffer.c \ + buffer/generic.c \ buffer/subsystem.c \ odp_byteorder.c \ odp_classification.c \ @@ -331,6 +331,7 @@ __LIB__libodp_linux_la_SOURCES += pktio/pcap.c endif pool/generic.lo: AM_CFLAGS += -DIM_ACTIVE_MODULE +buffer/generic.lo: AM_CFLAGS += -DIM_ACTIVE_MODULE # Build modular framework into odp-linux library modularframeworkdir = $(top_srcdir)/frameworks/modular diff --git a/platform/linux-generic/odp_buffer.c b/platform/linux-generic/buffer/generic.c similarity index 76% rename from platform/linux-generic/odp_buffer.c rename to platform/linux-generic/buffer/generic.c index b7ea88e6..c896e3d0 100644 --- a/platform/linux-generic/odp_buffer.c +++ b/platform/linux-generic/buffer/generic.c @@ -9,29 +9,30 @@ #include <odp_buffer_internal.h> #include <odp_buffer_inlines.h> #include <odp_debug_internal.h> +#include <odp_buffer_subsystem.h> #include <string.h> #include <stdio.h> #include <inttypes.h> -odp_buffer_t odp_buffer_from_event(odp_event_t ev) +static odp_buffer_t generic_buffer_from_event(odp_event_t ev) { return (odp_buffer_t)ev; } -odp_event_t odp_buffer_to_event(odp_buffer_t buf) +static odp_event_t generic_buffer_to_event(odp_buffer_t buf) { return (odp_event_t)buf; } -void *odp_buffer_addr(odp_buffer_t buf) +static void *generic_buffer_addr(odp_buffer_t buf) { odp_buffer_hdr_t *hdr = buf_hdl_to_hdr(buf); return hdr->seg[0].data; } -uint32_t odp_buffer_size(odp_buffer_t buf) +static uint32_t generic_buffer_size(odp_buffer_t buf) { odp_buffer_hdr_t *hdr = buf_hdl_to_hdr(buf); @@ -52,34 +53,34 @@ int odp_buffer_snprint(char *str, uint32_t n, odp_buffer_t buf) hdr = buf_hdl_to_hdr(buf); pool = hdr->pool_ptr; - len += snprintf(&str[len], n-len, + len += snprintf(&str[len], n - len, "Buffer\n"); - len += snprintf(&str[len], n-len, + len += snprintf(&str[len], n - len, " pool %" PRIu64 "\n", odp_pool_to_u64(pool->pool_hdl)); - len += snprintf(&str[len], n-len, + len += snprintf(&str[len], n - len, " addr %p\n", hdr->seg[0].data); - len += snprintf(&str[len], n-len, + len += snprintf(&str[len], n - len, " size %" PRIu32 "\n", hdr->size); - len += snprintf(&str[len], n-len, + len += snprintf(&str[len], n - len, " type %i\n", hdr->type); return len; } -void odp_buffer_print(odp_buffer_t buf) +static void generic_buffer_print(odp_buffer_t buf) { int max_len = 512; char str[max_len]; int len; - len = odp_buffer_snprint(str, max_len-1, buf); + len = odp_buffer_snprint(str, max_len - 1, buf); str[len] = 0; ODP_PRINT("\n%s\n", str); } -uint64_t odp_buffer_to_u64(odp_buffer_t hdl) +static uint64_t generic_buffer_to_u64(odp_buffer_t hdl) { return _odp_pri(hdl); } @@ -265,7 +266,7 @@ void buffer_free_multi(odp_buffer_hdr_t *buf_hdr[], int num_total) } } -odp_buffer_t odp_buffer_alloc(odp_pool_t pool_hdl) +static odp_buffer_t generic_buffer_alloc(odp_pool_t pool_hdl) { odp_buffer_t buf; pool_t *pool; @@ -282,7 +283,8 @@ odp_buffer_t odp_buffer_alloc(odp_pool_t pool_hdl) return ODP_BUFFER_INVALID; } -int odp_buffer_alloc_multi(odp_pool_t pool_hdl, odp_buffer_t buf[], int num) +static int generic_buffer_alloc_multi(odp_pool_t pool_hdl, + odp_buffer_t buf[], int num) { pool_t *pool; @@ -293,24 +295,24 @@ int odp_buffer_alloc_multi(odp_pool_t pool_hdl, odp_buffer_t buf[], int num) return buffer_alloc_multi(pool, (odp_buffer_hdr_t **)buf, num); } -void odp_buffer_free(odp_buffer_t buf) +static void generic_buffer_free(odp_buffer_t buf) { buffer_free_multi((odp_buffer_hdr_t **)&buf, 1); } -void odp_buffer_free_multi(const odp_buffer_t buf[], int num) +static void generic_buffer_free_multi(const odp_buffer_t buf[], int num) { buffer_free_multi((odp_buffer_hdr_t **)(uintptr_t)buf, num); } -odp_pool_t odp_buffer_pool(odp_buffer_t buf) +static odp_pool_t generic_buffer_pool(odp_buffer_t buf) { pool_t *pool = pool_from_buf(buf); return pool->pool_hdl; } -int odp_buffer_is_valid(odp_buffer_t buf) +static int generic_buffer_is_valid(odp_buffer_t buf) { pool_t *pool; @@ -327,3 +329,32 @@ int odp_buffer_is_valid(odp_buffer_t buf) return 1; } + +odp_buffer_module_t generic_buffer = { + .base = { + .name = "generic_buffer", + .init_local = NULL, + .term_local = NULL, + .init_global = NULL, + .term_global = NULL, + }, + .buffer_from_event = generic_buffer_from_event, + .buffer_to_event = generic_buffer_to_event, + .buffer_addr = generic_buffer_addr, + .buffer_alloc_multi = generic_buffer_alloc_multi, + .buffer_free_multi = generic_buffer_free_multi, + .buffer_alloc = generic_buffer_alloc, + .buffer_free = generic_buffer_free, + .buffer_size = generic_buffer_size, + .buffer_is_valid = generic_buffer_is_valid, + .buffer_pool = generic_buffer_pool, + .buffer_print = generic_buffer_print, + .buffer_to_u64 = generic_buffer_to_u64, +}; + +ODP_MODULE_CONSTRUCTOR(generic_buffer) +{ + odp_module_constructor(&generic_buffer); + odp_subsystem_register_module(buffer, &generic_buffer); +} + diff --git a/platform/linux-generic/buffer/subsystem.c b/platform/linux-generic/buffer/subsystem.c index 96ddb012..d47525cf 100644 --- a/platform/linux-generic/buffer/subsystem.c +++ b/platform/linux-generic/buffer/subsystem.c @@ -5,13 +5,112 @@ * * SPDX-License-Identifier: BSD-3-Clause */ +#include <odp/api/buffer.h> +#include <odp_buffer_subsystem.h> +#include <odp_debug_internal.h> #include <odp_module.h> -#define SUBSYSTEM_VERSION 0x00010000UL -ODP_SUBSYSTEM_DEFINE(buffer, "memory buffer public APIs", SUBSYSTEM_VERSION); +ODP_SUBSYSTEM_DEFINE(buffer, "memory buffer public APIs", + BUFFER_SUBSYSTEM_VERSION); ODP_SUBSYSTEM_CONSTRUCTOR(buffer) { odp_subsystem_constructor(buffer); } +odp_buffer_t odp_buffer_from_event(odp_event_t ev) +{ + odp_buffer_module_t *mod; + + mod = odp_subsystem_active_module(buffer, mod); + return mod->buffer_from_event(ev); +} + +odp_event_t odp_buffer_to_event(odp_buffer_t buf) +{ + odp_buffer_module_t *mod; + + mod = odp_subsystem_active_module(buffer, mod); + return mod->buffer_to_event(buf); +} + +void *odp_buffer_addr(odp_buffer_t buf) +{ + odp_buffer_module_t *mod; + + mod = odp_subsystem_active_module(buffer, mod); + return mod->buffer_addr(buf); +} + +uint32_t odp_buffer_size(odp_buffer_t buf) +{ + odp_buffer_module_t *mod; + + mod = odp_subsystem_active_module(buffer, mod); + return mod->buffer_size(buf); +} + +void odp_buffer_print(odp_buffer_t buf) +{ + odp_buffer_module_t *mod; + + mod = odp_subsystem_active_module(buffer, mod); + return mod->buffer_print(buf); +} + +uint64_t odp_buffer_to_u64(odp_buffer_t hdl) +{ + odp_buffer_module_t *mod; + + mod = odp_subsystem_active_module(buffer, mod); + return mod->buffer_to_u64(hdl); +} + +odp_buffer_t odp_buffer_alloc(odp_pool_t pool_hdl) +{ + odp_buffer_module_t *mod; + + mod = odp_subsystem_active_module(buffer, mod); + return mod->buffer_alloc(pool_hdl); +} + +int odp_buffer_alloc_multi(odp_pool_t pool_hdl, odp_buffer_t buf[], int num) +{ + odp_buffer_module_t *mod; + + mod = odp_subsystem_active_module(buffer, mod); + return mod->buffer_alloc_multi(pool_hdl, buf, num); +} + +void odp_buffer_free(odp_buffer_t buf) +{ + odp_buffer_module_t *mod; + + mod = odp_subsystem_active_module(buffer, mod); + return mod->buffer_free(buf); +} + +void odp_buffer_free_multi(const odp_buffer_t buf[], int num) +{ + odp_buffer_module_t *mod; + + mod = odp_subsystem_active_module(buffer, mod); + return mod->buffer_free_multi(buf, num); +} + +odp_pool_t odp_buffer_pool(odp_buffer_t buf) +{ + odp_buffer_module_t *mod; + + mod = odp_subsystem_active_module(buffer, mod); + return mod->buffer_pool(buf); +} + +int odp_buffer_is_valid(odp_buffer_t buf) +{ + odp_buffer_module_t *mod; + + mod = odp_subsystem_active_module(buffer, mod); + return mod->buffer_is_valid(buf); +} + diff --git a/platform/linux-generic/include/odp_buffer_subsystem.h b/platform/linux-generic/include/odp_buffer_subsystem.h index 60f8b646..6b69c06f 100644 --- a/platform/linux-generic/include/odp_buffer_subsystem.h +++ b/platform/linux-generic/include/odp_buffer_subsystem.h @@ -16,6 +16,8 @@ extern "C" { #include <odp_module.h> #include <odp/api/buffer.h> +#define BUFFER_SUBSYSTEM_VERSION 0x00010000UL + /* ODP buffer public APIs subsystem */ ODP_SUBSYSTEM_DECLARE(buffer); commit 083b31d9200f5cff4794511f2a9f865506c706ef Author: Kevin Wang <kevin.wang(a)arm.com> Date: Mon Aug 14 11:16:40 2017 +0800 linux-gen: buffer: apply modular framework and create subsystem Signed-off-by: Kevin Wang <kevin.wang(a)arm.com> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Yi He <yi.he(a)linaro.org> diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 36d9290c..e904046e 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -171,6 +171,7 @@ noinst_HEADERS = \ ${srcdir}/include/odp_bitmap_internal.h \ ${srcdir}/include/odp_bitset.h \ ${srcdir}/include/odp_buffer_internal.h \ + ${srcdir}/include/odp_buffer_subsystem.h \ ${srcdir}/include/odp_classification_datamodel.h \ ${srcdir}/include/odp_classification_inlines.h \ ${srcdir}/include/odp_classification_internal.h \ @@ -242,6 +243,7 @@ __LIB__libodp_linux_la_SOURCES = \ odp_barrier.c \ odp_bitmap.c \ odp_buffer.c \ + buffer/subsystem.c \ odp_byteorder.c \ odp_classification.c \ odp_cpu.c \ diff --git a/platform/linux-generic/buffer/subsystem.c b/platform/linux-generic/buffer/subsystem.c new file mode 100644 index 00000000..96ddb012 --- /dev/null +++ b/platform/linux-generic/buffer/subsystem.c @@ -0,0 +1,17 @@ +/* Copyright (c) 2017, ARM Limited. All rights reserved. + * + * Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ +#include <odp_module.h> + +#define SUBSYSTEM_VERSION 0x00010000UL +ODP_SUBSYSTEM_DEFINE(buffer, "memory buffer public APIs", SUBSYSTEM_VERSION); + +ODP_SUBSYSTEM_CONSTRUCTOR(buffer) +{ + odp_subsystem_constructor(buffer); +} + diff --git a/platform/linux-generic/include/odp_buffer_subsystem.h b/platform/linux-generic/include/odp_buffer_subsystem.h new file mode 100644 index 00000000..60f8b646 --- /dev/null +++ b/platform/linux-generic/include/odp_buffer_subsystem.h @@ -0,0 +1,60 @@ +/* Copyright (c) 2017, ARM Limited. All rights reserved. + * + * Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#ifndef ODP_BUFFER_SUBSYSTEM_H_ +#define ODP_BUFFER_SUBSYSTEM_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#include <odp_module.h> +#include <odp/api/buffer.h> + +/* ODP buffer public APIs subsystem */ +ODP_SUBSYSTEM_DECLARE(buffer); + +/* Subsystem APIs declarations */ +ODP_SUBSYSTEM_API(buffer, odp_buffer_t, buffer_from_event, odp_event_t ev); +ODP_SUBSYSTEM_API(buffer, odp_event_t, buffer_to_event, odp_buffer_t buf); +ODP_SUBSYSTEM_API(buffer, void *, buffer_addr, odp_buffer_t buf); +ODP_SUBSYSTEM_API(buffer, uint32_t, buffer_size, odp_buffer_t buf); +ODP_SUBSYSTEM_API(buffer, int, buffer_is_valid, odp_buffer_t buf); +ODP_SUBSYSTEM_API(buffer, odp_pool_t, buffer_pool, odp_buffer_t buf); +ODP_SUBSYSTEM_API(buffer, odp_buffer_t, buffer_alloc, odp_pool_t pool_hdl); +ODP_SUBSYSTEM_API(buffer, int, buffer_alloc_multi, odp_pool_t pool_hdl, + odp_buffer_t buf[], int num); +ODP_SUBSYSTEM_API(buffer, void, buffer_free, odp_buffer_t buf); +ODP_SUBSYSTEM_API(buffer, void, buffer_free_multi, + const odp_buffer_t buf[], int num); +ODP_SUBSYSTEM_API(buffer, void, buffer_print, odp_buffer_t buf); +ODP_SUBSYSTEM_API(buffer, uint64_t, buffer_to_u64, odp_buffer_t hdl); + +typedef ODP_MODULE_CLASS(buffer) { + odp_module_base_t base; + + odp_api_proto(buffer, buffer_from_event) buffer_from_event; + odp_api_proto(buffer, buffer_to_event) buffer_to_event; + odp_api_proto(buffer, buffer_addr) buffer_addr; + odp_api_proto(buffer, buffer_alloc_multi) buffer_alloc_multi; + odp_api_proto(buffer, buffer_free_multi) buffer_free_multi; + odp_api_proto(buffer, buffer_alloc) buffer_alloc; + odp_api_proto(buffer, buffer_free) buffer_free; + odp_api_proto(buffer, buffer_size) buffer_size; + odp_api_proto(buffer, buffer_is_valid) buffer_is_valid; + odp_api_proto(buffer, buffer_pool) buffer_pool; + odp_api_proto(buffer, buffer_print) buffer_print; + odp_api_proto(buffer, buffer_to_u64) buffer_to_u64; +} odp_buffer_module_t; + +#ifdef __cplusplus +} +#endif + +#endif + ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/Makefile.am | 5 +- .../{odp_buffer.c => buffer/generic.c} | 67 ++++++++---- platform/linux-generic/buffer/subsystem.c | 116 +++++++++++++++++++++ .../linux-generic/include/odp_buffer_subsystem.h | 62 +++++++++++ 4 files changed, 231 insertions(+), 19 deletions(-) rename platform/linux-generic/{odp_buffer.c => buffer/generic.c} (76%) create mode 100644 platform/linux-generic/buffer/subsystem.c create mode 100644 platform/linux-generic/include/odp_buffer_subsystem.h hooks/post-receive --

7 years, 9 months

[COMMIT] branch master updated. v1.15.0.0-160-g42184679

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 42184679185ce0c979e065349360167e3fce6ca0 (commit) from 120e914768f731f18083afd950fba6a6793cca45 (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 42184679185ce0c979e065349360167e3fce6ca0 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Wed Aug 30 10:47:45 2017 +0300 helper: chksum: add few guarding conditions Add few guarding conditions, otherwise bad packet can hang up ODP code. Noted by one of the corner case tests for IPsec. 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/helper/include/odp/helper/ip.h b/helper/include/odp/helper/ip.h index e0d5c3bf..fb7e5ddc 100644 --- a/helper/include/odp/helper/ip.h +++ b/helper/include/odp/helper/ip.h @@ -100,10 +100,12 @@ static inline int odph_ipv4_csum(odp_packet_t pkt, odph_ipv4hdr_t *ip, odp_u16sum_t *chksum) { - int nleft = ODPH_IPV4HDR_IHL(ip->ver_ihl) * 4; + unsigned nleft = ODPH_IPV4HDR_IHL(ip->ver_ihl) * 4; uint16_t buf[nleft / 2]; int res; + if (odp_unlikely(nleft < sizeof(*ip))) + return -1; ip->chksum = 0; memcpy(buf, ip, sizeof(*ip)); res = odp_packet_copy_to_mem(pkt, offset + sizeof(*ip), @@ -135,7 +137,9 @@ static inline int odph_ipv4_csum_valid(odp_packet_t pkt) if (offset == ODP_PACKET_OFFSET_INVALID) return 0; - odp_packet_copy_to_mem(pkt, offset, sizeof(odph_ipv4hdr_t), &ip); + res = odp_packet_copy_to_mem(pkt, offset, sizeof(odph_ipv4hdr_t), &ip); + if (odp_unlikely(res < 0)) + return 0; chksum = ip.chksum; ----------------------------------------------------------------------- Summary of changes: helper/include/odp/helper/ip.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) hooks/post-receive --

7 years, 9 months

[COMMIT] branch master updated. v1.15.0.0-159-g120e9147

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 120e914768f731f18083afd950fba6a6793cca45 (commit) via de32602f12e563b2d5ff10b786c6fd506e74776f (commit) via 8a939edfa992620cf7a5cb495ce44dbc15c709c6 (commit) via 40a2663668ce995e4b6b410ca0d3bf3578d02a67 (commit) via 03203ea8b1c3d142b41f5c332527f20ed29c3040 (commit) via 60105f079350405920462a4b0d59c7e78d9a8492 (commit) via 6e02ad50626de86804cbd62ae467104ae7850220 (commit) via da905ec07e1e50b4d34975a81ea289ec96eba503 (commit) via 29139f725a7d6f2bd9e57a60abf1e55f4ac64c97 (commit) from 7508c5ac906bb7cb1d339b4c5e924f3a18e504ca (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 120e914768f731f18083afd950fba6a6793cca45 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Wed Aug 30 18:19:24 2017 +0300 configure, travis: switch to pkg-config to locate CUnit Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/.travis.yml b/.travis.yml index 45ffa396..a14974c4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -108,6 +108,7 @@ before_install: sudo make install popd fi + - export PKG_CONFIG_PATH="$HOME/cunit-install/$CROSS_ARCH/lib/pkgconfig:${PKG_CONFIG_PATH}" - find $HOME/cunit-install install: @@ -154,7 +155,7 @@ script: --enable-user-guides --with-dpdk-path=`pwd`/dpdk/${TARGET} --with-netmap-path=`pwd`/netmap - --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH $CONF + $CONF --enable-debug=full --enable-helper-linux - make -j $(nproc) @@ -165,10 +166,10 @@ script: - echo "Checking linking and run from install..." - pushd $HOME - echo "Dynamic link.." - - ${CC} ${OLDPWD}/example/hello/odp_hello.c -o odp_hello_inst `PKG_CONFIG_PATH=${HOME}/odp-install/lib/pkgconfig pkg-config --cflags --libs libodp-linux` + - ${CC} ${OLDPWD}/example/hello/odp_hello.c -o odp_hello_inst `PKG_CONFIG_PATH=${HOME}/odp-install/lib/pkgconfig:${PKG_CONFIG_PATH} pkg-config --cflags --libs libodp-linux` - LD_LIBRARY_PATH="${HOME}/odp-install/lib:$LD_LIBRARY_PATH" ./odp_hello_inst - echo "Static link.." - - ${CC} ${OLDPWD}/example/hello/odp_hello.c -o odp_hello_inst `PKG_CONFIG_PATH=${HOME}/odp-install/lib/pkgconfig pkg-config --cflags --libs libodp-linux --static` -static + - ${CC} ${OLDPWD}/example/hello/odp_hello.c -o odp_hello_inst `PKG_CONFIG_PATH=${HOME}/odp-install/lib/pkgconfig:${PKG_CONFIG_PATH} pkg-config --cflags --libs libodp-linux --static` -static - ./odp_hello_inst - ccache -s @@ -184,7 +185,6 @@ jobs: --enable-debug=full --disable-test-cpp --enable-helper-linux - --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH - make -j $(nproc) - stage: test compiler: "\"clang-3.8 --target=aarch64-linux-gnu\"" @@ -196,7 +196,6 @@ jobs: --enable-debug=full --disable-test-cpp --enable-helper-linux - --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH - make -j $(nproc) - stage: test compiler: arm-linux-gnueabihf-gcc @@ -208,7 +207,6 @@ jobs: --enable-debug=full --disable-test-cpp --enable-helper-linux - --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH - make -j $(nproc) - stage: test compiler: "\"clang-3.8 --target=arm-linux-gnueabihf\"" @@ -220,7 +218,6 @@ jobs: --enable-debug=full --disable-test-cpp --enable-helper-linux - --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH - make -j $(nproc) - stage: test compiler: powerpc-linux-gnu-gcc @@ -232,7 +229,6 @@ jobs: --enable-debug=full --disable-test-cpp --enable-helper-linux - --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH - make -j $(nproc) - stage: test compiler: "\"clang-3.8 --target=powerpc-linux-gnu\"" @@ -244,7 +240,6 @@ jobs: --enable-debug=full --disable-test-cpp --enable-helper-linux - --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH - make -j $(nproc) - stage: test env: TEST=coverage @@ -256,7 +251,6 @@ jobs: --with-dpdk-path=`pwd`/dpdk/${TARGET} --with-netmap-path=`pwd`/netmap CFLAGS="-O0 -coverage" - --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH CXXFLAGS="-O0 -coverage" LDFLAGS="--coverage" --enable-debug=full --enable-helper-linux @@ -269,8 +263,7 @@ jobs: - ./bootstrap - ./configure --prefix=$HOME/odp-install --enable-user-guides - --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH - - sudo PATH="$PATH" LD_LIBRARY_PATH="$HOME/cunit-install/$CROSS_ARCH/lib:$LD_LIBRARY_PATH" make distcheck DISTCHECK_CONFIGURE_FLAGS="--with-cunit-path=$HOME/cunit-install/$CROSS_ARCH" + - sudo PATH="$PATH" LD_LIBRARY_PATH="$HOME/cunit-install/$CROSS_ARCH/lib:$LD_LIBRARY_PATH" make distcheck - stage: test env: TEST=doxygen compiler: gcc diff --git a/test/Makefile.inc b/test/Makefile.inc index 0fbc3c42..728868df 100644 --- a/test/Makefile.inc +++ b/test/Makefile.inc @@ -16,7 +16,7 @@ INCFLAGS = \ -I$(top_builddir)/include AM_CFLAGS += $(INCFLAGS) -AM_CPPFLAGS += $(CUNIT_CPPFLAGS) +AM_CFLAGS += $(CUNIT_CFLAGS) AM_CXXFLAGS = $(INCFLAGS) AM_LDFLAGS += -L$(LIB) diff --git a/test/common_plat/m4/validation.m4 b/test/common_plat/m4/validation.m4 index b2a2f75d..e303f8f2 100644 --- a/test/common_plat/m4/validation.m4 +++ b/test/common_plat/m4/validation.m4 @@ -8,43 +8,11 @@ AC_ARG_ENABLE([test_vald], AM_CONDITIONAL([test_vald], [test x$test_vald = xyes ]) ########################################################################## -# Set optional CUnit path -########################################################################## -cunit_support=$test_vald -AC_ARG_WITH([cunit-path], -AC_HELP_STRING([--with-cunit-path=DIR], - [path to CUnit libs and headers (if not present at default path)]), - [CUNIT_PATH=$withval - CUNIT_CPPFLAGS="-I$CUNIT_PATH/include" - CUNIT_LIBS="-L$CUNIT_PATH/lib" - cunit_support=yes],[]) - -########################################################################## -# Save and set temporary compilation flags -########################################################################## -OLD_LIBS=$LIBS -OLD_CPPFLAGS=$CPPFLAGS -LIBS="$CUNIT_LIBS $LIBS" -CPPFLAGS="$CUNIT_CPPFLAGS $CPPFLAGS" - -########################################################################## # Check for CUnit availability ########################################################################## -if test x$cunit_support = xyes -then - AC_CHECK_LIB([cunit],[CU_get_error], [CUNIT_LIBS="$CUNIT_LIBS -lcunit"], - [AC_MSG_ERROR([CUnit libraries required])]) - AC_CHECK_HEADERS([CUnit/Basic.h], [], - [AC_MSG_FAILURE(["can't find cunit headers"])]) -else - cunit_support=no -fi +cunit_support=$test_vald +AS_IF([test "x$cunit_support" = "xyes"], + [PKG_CHECK_MODULES([CUNIT], [cunit])]) -AC_SUBST([CUNIT_CPPFLAGS]) +AC_SUBST([CUNIT_CFLAGS]) AC_SUBST([CUNIT_LIBS]) - -########################################################################## -# Restore old saved variables -########################################################################## -LIBS=$OLD_LIBS -CPPFLAGS=$OLD_CPPFLAGS diff --git a/test/common_plat/validation/api/Makefile.inc b/test/common_plat/validation/api/Makefile.inc index 767526ed..a9448b17 100644 --- a/test/common_plat/validation/api/Makefile.inc +++ b/test/common_plat/validation/api/Makefile.inc @@ -6,7 +6,7 @@ AM_CFLAGS += -I$(top_srcdir)/test/common_plat/common AM_LDFLAGS += -static AM_LDFLAGS += $(DPDK_PMDS) -AM_CPPFLAGS += $(CUNIT_CPPFLAGS) +AM_CFLAGS += $(CUNIT_PFLAGS) LIBCUNIT_COMMON = $(COMMON_DIR)/libcunit_common.la LIBCPUMASK_COMMON = $(COMMON_DIR)/libcpumask_common.la diff --git a/test/linux-generic/Makefile.inc b/test/linux-generic/Makefile.inc index 30b56e26..ff99fbc9 100644 --- a/test/linux-generic/Makefile.inc +++ b/test/linux-generic/Makefile.inc @@ -4,7 +4,7 @@ AM_LDFLAGS += -static -AM_CPPFLAGS += $(CUNIT_CPPFLAGS) +AM_CFLAGS += $(CUNIT_CFLAGS) LIBCUNIT_COMMON = $(top_builddir)/test/common_plat/common/libcunit_common.la LIB = $(top_builddir)/lib commit de32602f12e563b2d5ff10b786c6fd506e74776f Author: Bill Fischofer <bill.fischofer(a)linaro.org> Date: Tue Aug 29 13:53:28 2017 -0500 travis: add --enable-helper-linux test variants The ODP helper modules can explicitly expose linux variants via the --enable-helper-linux configuration option, so add that into the test options as well to ensure full coverage. [DES: just enable this option instead of adding another entry into build matrix.] Signed-off-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/.travis.yml b/.travis.yml index 05cddbc3..45ffa396 100644 --- a/.travis.yml +++ b/.travis.yml @@ -156,6 +156,7 @@ script: --with-netmap-path=`pwd`/netmap --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH $CONF --enable-debug=full + --enable-helper-linux - make -j $(nproc) - mkdir /dev/shm/odp - sudo LD_LIBRARY_PATH="$HOME/cunit-install/$CROSS_ARCH/lib:$LD_LIBRARY_PATH" ODP_SHM_DIR=/dev/shm/odp make check @@ -182,6 +183,7 @@ jobs: - ./configure --prefix=$HOME/odp-install $CROSS --enable-debug=full --disable-test-cpp + --enable-helper-linux --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH - make -j $(nproc) - stage: test @@ -193,6 +195,7 @@ jobs: - ./configure --prefix=$HOME/odp/odp-install $CROSS --enable-debug=full --disable-test-cpp + --enable-helper-linux --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH - make -j $(nproc) - stage: test @@ -204,6 +207,7 @@ jobs: - ./configure --prefix=$HOME/odp-install $CROSS --enable-debug=full --disable-test-cpp + --enable-helper-linux --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH - make -j $(nproc) - stage: test @@ -215,6 +219,7 @@ jobs: - ./configure --prefix=$HOME/odp-install $CROSS --enable-debug=full --disable-test-cpp + --enable-helper-linux --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH - make -j $(nproc) - stage: test @@ -226,6 +231,7 @@ jobs: - ./configure --prefix=$HOME/odp-install $CROSS --enable-debug=full --disable-test-cpp + --enable-helper-linux --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH - make -j $(nproc) - stage: test @@ -237,6 +243,7 @@ jobs: - ./configure --prefix=$HOME/odp-install $CROSS --enable-debug=full --disable-test-cpp + --enable-helper-linux --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH - make -j $(nproc) - stage: test @@ -252,6 +259,7 @@ jobs: --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH CXXFLAGS="-O0 -coverage" LDFLAGS="--coverage" --enable-debug=full + --enable-helper-linux - sudo LD_LIBRARY_PATH="$HOME/cunit-install/$CROSS_ARCH/lib:$LD_LIBRARY_PATH" PATH=${PATH//:\.\/node_modules\/\.bin/} make check - find . -type f -iname '*.[ch]' -not -path ".git/*" -execdir gcov {} \; ; bash <(curl -s https://codecov.io/bash) -X coveragepy - stage: test commit 8a939edfa992620cf7a5cb495ce44dbc15c709c6 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Wed Aug 30 15:05:49 2017 +0300 travis: enable full debug option The --enable-debug=full option allows expansion of ODP_DBG() and ODPH_DBG() debugging statements throughout ODP. Add this option to .travis.yml to ensure that these are properly tested as part of regressions. Cc: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/.travis.yml b/.travis.yml index bd2e3e32..05cddbc3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -155,7 +155,7 @@ script: --with-dpdk-path=`pwd`/dpdk/${TARGET} --with-netmap-path=`pwd`/netmap --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH $CONF - --enable-debug + --enable-debug=full - make -j $(nproc) - mkdir /dev/shm/odp - sudo LD_LIBRARY_PATH="$HOME/cunit-install/$CROSS_ARCH/lib:$LD_LIBRARY_PATH" ODP_SHM_DIR=/dev/shm/odp make check @@ -180,7 +180,7 @@ jobs: script: - ./bootstrap - ./configure --prefix=$HOME/odp-install $CROSS - --enable-debug + --enable-debug=full --disable-test-cpp --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH - make -j $(nproc) @@ -191,7 +191,7 @@ jobs: script: - ./bootstrap - ./configure --prefix=$HOME/odp/odp-install $CROSS - --enable-debug + --enable-debug=full --disable-test-cpp --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH - make -j $(nproc) @@ -202,7 +202,7 @@ jobs: script: - ./bootstrap - ./configure --prefix=$HOME/odp-install $CROSS - --enable-debug + --enable-debug=full --disable-test-cpp --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH - make -j $(nproc) @@ -213,7 +213,7 @@ jobs: script: - ./bootstrap - ./configure --prefix=$HOME/odp-install $CROSS - --enable-debug + --enable-debug=full --disable-test-cpp --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH - make -j $(nproc) @@ -224,7 +224,7 @@ jobs: script: - ./bootstrap - ./configure --prefix=$HOME/odp-install $CROSS - --enable-debug + --enable-debug=full --disable-test-cpp --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH - make -j $(nproc) @@ -235,7 +235,7 @@ jobs: script: - ./bootstrap - ./configure --prefix=$HOME/odp-install $CROSS - --enable-debug + --enable-debug=full --disable-test-cpp --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH - make -j $(nproc) @@ -251,7 +251,7 @@ jobs: -coverage" --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH CXXFLAGS="-O0 -coverage" LDFLAGS="--coverage" - --enable-debug + --enable-debug=full - sudo LD_LIBRARY_PATH="$HOME/cunit-install/$CROSS_ARCH/lib:$LD_LIBRARY_PATH" PATH=${PATH//:\.\/node_modules\/\.bin/} make check - find . -type f -iname '*.[ch]' -not -path ".git/*" -execdir gcov {} \; ; bash <(curl -s https://codecov.io/bash) -X coveragepy - stage: test commit 40a2663668ce995e4b6b410ca0d3bf3578d02a67 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Wed Aug 30 15:03:02 2017 +0300 travis: drop configure options enabled by default Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/.travis.yml b/.travis.yml index 478d4200..bd2e3e32 100644 --- a/.travis.yml +++ b/.travis.yml @@ -151,13 +151,7 @@ install: script: - ./bootstrap - ./configure --prefix=$HOME/odp-install - --enable-test-cpp - --enable-test-vald - --enable-test-helper - --enable-test-perf --enable-user-guides - --enable-test-perf-proc - --enable-test-example --with-dpdk-path=`pwd`/dpdk/${TARGET} --with-netmap-path=`pwd`/netmap --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH $CONF @@ -188,11 +182,6 @@ jobs: - ./configure --prefix=$HOME/odp-install $CROSS --enable-debug --disable-test-cpp - --enable-test-vald - --enable-test-helper - --enable-test-perf - --enable-test-perf-proc - --enable-test-example --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH - make -j $(nproc) - stage: test @@ -204,11 +193,6 @@ jobs: - ./configure --prefix=$HOME/odp/odp-install $CROSS --enable-debug --disable-test-cpp - --enable-test-vald - --enable-test-helper - --enable-test-perf - --enable-test-perf-proc - --enable-test-example --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH - make -j $(nproc) - stage: test @@ -220,11 +204,6 @@ jobs: - ./configure --prefix=$HOME/odp-install $CROSS --enable-debug --disable-test-cpp - --enable-test-vald - --enable-test-helper - --enable-test-perf - --enable-test-perf-proc - --enable-test-example --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH - make -j $(nproc) - stage: test @@ -236,11 +215,6 @@ jobs: - ./configure --prefix=$HOME/odp-install $CROSS --enable-debug --disable-test-cpp - --enable-test-vald - --enable-test-helper - --enable-test-perf - --enable-test-perf-proc - --enable-test-example --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH - make -j $(nproc) - stage: test @@ -252,11 +226,6 @@ jobs: - ./configure --prefix=$HOME/odp-install $CROSS --enable-debug --disable-test-cpp - --enable-test-vald - --enable-test-helper - --enable-test-perf - --enable-test-perf-proc - --enable-test-example --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH - make -j $(nproc) - stage: test @@ -268,11 +237,6 @@ jobs: - ./configure --prefix=$HOME/odp-install $CROSS --enable-debug --disable-test-cpp - --enable-test-vald - --enable-test-helper - --enable-test-perf - --enable-test-perf-proc - --enable-test-example --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH - make -j $(nproc) - stage: test @@ -281,13 +245,7 @@ jobs: script: - ./bootstrap - ./configure --prefix=$HOME/odp-install - --enable-test-cpp - --enable-test-vald - --enable-test-helper - --enable-test-perf --enable-user-guides - --enable-test-perf-proc - --enable-test-example --with-dpdk-path=`pwd`/dpdk/${TARGET} --with-netmap-path=`pwd`/netmap CFLAGS="-O0 -coverage" @@ -302,13 +260,7 @@ jobs: script: - ./bootstrap - ./configure --prefix=$HOME/odp-install - --enable-test-cpp - --enable-test-vald - --enable-test-helper - --enable-test-perf --enable-user-guides - --enable-test-perf-proc - --enable-test-example --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH - sudo PATH="$PATH" LD_LIBRARY_PATH="$HOME/cunit-install/$CROSS_ARCH/lib:$LD_LIBRARY_PATH" make distcheck DISTCHECK_CONFIGURE_FLAGS="--with-cunit-path=$HOME/cunit-install/$CROSS_ARCH" - stage: test commit 03203ea8b1c3d142b41f5c332527f20ed29c3040 Author: Bill Fischofer <bill.fischofer(a)linaro.org> Date: Mon Aug 28 16:50:22 2017 -0500 travis: split configure commands into individual options Avoid long configure command lines by splitting it into individual lines for each option. This permits easy future option maintenance without running into checkpatch line length checks. Signed-off-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/.travis.yml b/.travis.yml index 245ade2a..478d4200 100644 --- a/.travis.yml +++ b/.travis.yml @@ -150,7 +150,17 @@ install: script: - ./bootstrap - - ./configure --prefix=$HOME/odp-install --enable-test-cpp --enable-test-vald --enable-test-helper --enable-test-perf --enable-user-guides --enable-test-perf-proc --enable-test-example --with-dpdk-path=`pwd`/dpdk/${TARGET} --with-netmap-path=`pwd`/netmap --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH $CONF + - ./configure --prefix=$HOME/odp-install + --enable-test-cpp + --enable-test-vald + --enable-test-helper + --enable-test-perf + --enable-user-guides + --enable-test-perf-proc + --enable-test-example + --with-dpdk-path=`pwd`/dpdk/${TARGET} + --with-netmap-path=`pwd`/netmap + --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH $CONF --enable-debug - make -j $(nproc) - mkdir /dev/shm/odp @@ -175,8 +185,15 @@ jobs: install: true script: - ./bootstrap - - ./configure --prefix=$HOME/odp-install $CROSS --enable-debug - --disable-test-cpp --enable-test-vald --enable-test-helper --enable-test-perf --enable-test-perf-proc --enable-test-example --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH + - ./configure --prefix=$HOME/odp-install $CROSS + --enable-debug + --disable-test-cpp + --enable-test-vald + --enable-test-helper + --enable-test-perf + --enable-test-perf-proc + --enable-test-example + --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH - make -j $(nproc) - stage: test compiler: "\"clang-3.8 --target=aarch64-linux-gnu\"" @@ -184,8 +201,15 @@ jobs: install: true script: - ./bootstrap - - ./configure --prefix=$HOME/odp/odp-install $CROSS --enable-debug - --disable-test-cpp --enable-test-vald --enable-test-helper --enable-test-perf --enable-test-perf-proc --enable-test-example --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH + - ./configure --prefix=$HOME/odp/odp-install $CROSS + --enable-debug + --disable-test-cpp + --enable-test-vald + --enable-test-helper + --enable-test-perf + --enable-test-perf-proc + --enable-test-example + --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH - make -j $(nproc) - stage: test compiler: arm-linux-gnueabihf-gcc @@ -193,8 +217,15 @@ jobs: install: true script: - ./bootstrap - - ./configure --prefix=$HOME/odp-install $CROSS --enable-debug - --disable-test-cpp --enable-test-vald --enable-test-helper --enable-test-perf --enable-test-perf-proc --enable-test-example --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH + - ./configure --prefix=$HOME/odp-install $CROSS + --enable-debug + --disable-test-cpp + --enable-test-vald + --enable-test-helper + --enable-test-perf + --enable-test-perf-proc + --enable-test-example + --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH - make -j $(nproc) - stage: test compiler: "\"clang-3.8 --target=arm-linux-gnueabihf\"" @@ -202,8 +233,15 @@ jobs: install: true script: - ./bootstrap - - ./configure --prefix=$HOME/odp-install $CROSS --enable-debug - --disable-test-cpp --enable-test-vald --enable-test-helper --enable-test-perf --enable-test-perf-proc --enable-test-example --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH + - ./configure --prefix=$HOME/odp-install $CROSS + --enable-debug + --disable-test-cpp + --enable-test-vald + --enable-test-helper + --enable-test-perf + --enable-test-perf-proc + --enable-test-example + --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH - make -j $(nproc) - stage: test compiler: powerpc-linux-gnu-gcc @@ -211,8 +249,15 @@ jobs: install: true script: - ./bootstrap - - ./configure --prefix=$HOME/odp-install $CROSS --enable-debug - --disable-test-cpp --enable-test-vald --enable-test-helper --enable-test-perf --enable-test-perf-proc --enable-test-example --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH + - ./configure --prefix=$HOME/odp-install $CROSS + --enable-debug + --disable-test-cpp + --enable-test-vald + --enable-test-helper + --enable-test-perf + --enable-test-perf-proc + --enable-test-example + --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH - make -j $(nproc) - stage: test compiler: "\"clang-3.8 --target=powerpc-linux-gnu\"" @@ -220,15 +265,34 @@ jobs: install: true script: - ./bootstrap - - ./configure --prefix=$HOME/odp-install $CROSS --enable-debug - --disable-test-cpp --enable-test-vald --enable-test-helper --enable-test-perf --enable-test-perf-proc --enable-test-example --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH + - ./configure --prefix=$HOME/odp-install $CROSS + --enable-debug + --disable-test-cpp + --enable-test-vald + --enable-test-helper + --enable-test-perf + --enable-test-perf-proc + --enable-test-example + --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH - make -j $(nproc) - stage: test env: TEST=coverage compiler: gcc script: - ./bootstrap - - ./configure --prefix=$HOME/odp-install --enable-test-cpp --enable-test-vald --enable-test-helper --enable-test-perf --enable-user-guides --enable-test-perf-proc --enable-test-example --with-dpdk-path=`pwd`/dpdk/${TARGET} --with-netmap-path=`pwd`/netmap CFLAGS="-O0 -coverage" --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH CXXFLAGS="-O0 -coverage" LDFLAGS="--coverage" + - ./configure --prefix=$HOME/odp-install + --enable-test-cpp + --enable-test-vald + --enable-test-helper + --enable-test-perf + --enable-user-guides + --enable-test-perf-proc + --enable-test-example + --with-dpdk-path=`pwd`/dpdk/${TARGET} + --with-netmap-path=`pwd`/netmap CFLAGS="-O0 + -coverage" + --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH + CXXFLAGS="-O0 -coverage" LDFLAGS="--coverage" --enable-debug - sudo LD_LIBRARY_PATH="$HOME/cunit-install/$CROSS_ARCH/lib:$LD_LIBRARY_PATH" PATH=${PATH//:\.\/node_modules\/\.bin/} make check - find . -type f -iname '*.[ch]' -not -path ".git/*" -execdir gcov {} \; ; bash <(curl -s https://codecov.io/bash) -X coveragepy @@ -237,7 +301,15 @@ jobs: compiler: gcc script: - ./bootstrap - - ./configure --prefix=$HOME/odp-install --enable-test-cpp --enable-test-vald --enable-test-helper --enable-test-perf --enable-user-guides --enable-test-perf-proc --enable-test-example --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH + - ./configure --prefix=$HOME/odp-install + --enable-test-cpp + --enable-test-vald + --enable-test-helper + --enable-test-perf + --enable-user-guides + --enable-test-perf-proc + --enable-test-example + --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH - sudo PATH="$PATH" LD_LIBRARY_PATH="$HOME/cunit-install/$CROSS_ARCH/lib:$LD_LIBRARY_PATH" make distcheck DISTCHECK_CONFIGURE_FLAGS="--with-cunit-path=$HOME/cunit-install/$CROSS_ARCH" - stage: test env: TEST=doxygen commit 60105f079350405920462a4b0d59c7e78d9a8492 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Wed Aug 30 14:44:02 2017 +0300 configure: provide a way to enable all debugging options at once Adding --enable-debug=full to configure will enable all debugging options. 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/configure.ac b/configure.ac index dcf14629..df0a0f61 100644 --- a/configure.ac +++ b/configure.ac @@ -239,39 +239,40 @@ DX_INIT_DOXYGEN($PACKAGE_NAME, ${builddir}/doc/driver-api-guide/output) ########################################################################## +# Enable/disable ODP_DEBUG +########################################################################## +AC_ARG_ENABLE([debug], + [AS_HELP_STRING([--enable-debug], + [include additional debugging code ] + [(set to 'full' to enable all --enable-*-debug-* options)])]) + +AS_IF([test "x$enable_debug" != "xno"], [ODP_DEBUG=1], + [ODP_DEBUG=0]) +AC_DEFINE_UNQUOTED([ODP_DEBUG], [$ODP_DEBUG], + [Define to 1 to include additional debug code]) + +########################################################################## # Enable/disable ODP_DEBUG_PRINT ########################################################################## -ODP_DEBUG_PRINT=0 AC_ARG_ENABLE([debug-print], - [ --enable-debug-print display debugging information], - [if test "x$enableval" = "xyes"; then - ODP_DEBUG_PRINT=1 - fi]) + [AS_HELP_STRING([--enable-debug-print], [display debugging information])], + [], [AS_IF([test "x$enable_debug" = "xfull"], [enable_debug_print=yes], + [enable_debug_print=no])]) +AS_IF([test "x$enable_debug_print" != "xno"], [ODP_DEBUG_PRINT=1], + [ODP_DEBUG_PRINT=0]) AC_DEFINE_UNQUOTED([ODP_DEBUG_PRINT], [$ODP_DEBUG_PRINT], [Define to 1 to display debug information]) -ODPH_DEBUG_PRINT=0 AC_ARG_ENABLE([helper-debug-print], - [ --enable-helper-debug-print display helper debugging information], - [if test "x$enableval" = "xyes"; then - ODPH_DEBUG_PRINT=1 - fi]) + [AS_HELP_STRING([--enable-helper-debug-print], [display helper debugging information])], + [], [AS_IF([test "x$enable_debug" = "xfull"], [enable_helper_debug_print=yes], + [enable_helper_debug_print=no])]) +AS_IF([test "x$enable_helper_debug_print" != "xno"], [ODPH_DEBUG_PRINT=1], + [ODPH_DEBUG_PRINT=0]) AC_DEFINE_UNQUOTED([ODPH_DEBUG_PRINT], [$ODPH_DEBUG_PRINT], [Define to 1 to display helper debug information]) ########################################################################## -# Enable/disable ODP_DEBUG -########################################################################## -ODP_DEBUG=0 -AC_ARG_ENABLE([debug], - [ --enable-debug include additional code], - [if test "x$enableval" = "xyes"; then - ODP_DEBUG=1 - fi]) -AC_DEFINE_UNQUOTED([ODP_DEBUG], [$ODP_DEBUG], - [Define to 1 to include additional debug code]) - -########################################################################## # Enable/disable ABI compatible build ########################################################################## ODP_ABI_COMPAT=1 commit 6e02ad50626de86804cbd62ae467104ae7850220 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Wed Aug 30 14:27:49 2017 +0300 configure: enable helper-linux in distcheck options 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/Makefile.am b/Makefile.am index 7398499c..6c43679e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,6 @@ ACLOCAL_AMFLAGS=-I m4 AM_DISTCHECK_CONFIGURE_FLAGS = --enable-user-guides \ + --enable-helper-linux \ --with-testdir #@with_platform@ works alone in subdir but not as part of a path??? commit da905ec07e1e50b4d34975a81ea289ec96eba503 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Wed Aug 30 14:26:52 2017 +0300 configure: rework with-testdir check Rework with-testdir option handling to follow the rest of configure options. 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/configure.ac b/configure.ac index c076b4cc..dcf14629 100644 --- a/configure.ac +++ b/configure.ac @@ -200,19 +200,18 @@ AC_SUBST(SDK_INSTALL_PATH) # Set the install directory for test binaries/scripts ########################################################################## AC_ARG_WITH([testdir], - AC_HELP_STRING([--with-testdir=DIR installation directory for tests]), - [if test "$withval" = "yes"; then - testdir=$libdir/odp/tests - else - testdir=$withval - fi], []) + [AC_HELP_STRING([--with-testdir=DIR], [installation directory for tests])], + [testdir=$withval], + [testdir=no]) +AS_IF([test "x$testdir" = "xyes"], [testdir=$libdir/odp/tests], + [test "x$testdir" = "xno"], [testdir=]) AC_SUBST([testdir]) +AM_CONDITIONAL([test_installdir], [test "x$testdir" != "xno"]) ########################################################################## # Set conditionals as computed within platform specific files ########################################################################## AM_CONDITIONAL([SDK_INSTALL_PATH_], [test "x${SDK_INSTALL_PATH_}" = "x1"]) -AM_CONDITIONAL([test_installdir], [test "$testdir" != ""]) AM_CONDITIONAL([cunit_support], [test x$cunit_support = xyes ]) AM_CONDITIONAL([HAVE_DOXYGEN], [test "x${DOXYGEN}" = "xdoxygen"]) AM_CONDITIONAL([user_guide], [test "x${user_guides}" = "xyes" ]) commit 29139f725a7d6f2bd9e57a60abf1e55f4ac64c97 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue Aug 29 16:22:17 2017 +0300 configure: enable all tests by default 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/Makefile.am b/Makefile.am index e1ea07d5..7398499c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,11 +1,5 @@ ACLOCAL_AMFLAGS=-I m4 -AM_DISTCHECK_CONFIGURE_FLAGS = --enable-test-cpp \ - --enable-test-example \ - --enable-test-helper \ - --enable-test-perf \ - --enable-test-perf-proc \ - --enable-test-vald \ - --enable-user-guides \ +AM_DISTCHECK_CONFIGURE_FLAGS = --enable-user-guides \ --with-testdir #@with_platform@ works alone in subdir but not as part of a path??? diff --git a/configure.ac b/configure.ac index c1811003..c076b4cc 100644 --- a/configure.ac +++ b/configure.ac @@ -214,12 +214,6 @@ AC_SUBST([testdir]) AM_CONDITIONAL([SDK_INSTALL_PATH_], [test "x${SDK_INSTALL_PATH_}" = "x1"]) AM_CONDITIONAL([test_installdir], [test "$testdir" != ""]) AM_CONDITIONAL([cunit_support], [test x$cunit_support = xyes ]) -AM_CONDITIONAL([test_vald], [test x$test_vald = xyes ]) -AM_CONDITIONAL([test_perf], [test x$test_perf = xyes ]) -AM_CONDITIONAL([test_perf_proc], [test x$test_perf_proc = xyes ]) -AM_CONDITIONAL([test_cpp], [test x$test_cpp = xyes ]) -AM_CONDITIONAL([test_helper], [test x$test_helper = xyes ]) -AM_CONDITIONAL([test_example], [test x$test_example = xyes ]) AM_CONDITIONAL([HAVE_DOXYGEN], [test "x${DOXYGEN}" = "xdoxygen"]) AM_CONDITIONAL([user_guide], [test "x${user_guides}" = "xyes" ]) AM_CONDITIONAL([HAVE_MSCGEN], [test "x${MSCGEN}" = "xmscgen"]) diff --git a/example/m4/configure.m4 b/example/m4/configure.m4 index 18218d05..cab7f8b8 100644 --- a/example/m4/configure.m4 +++ b/example/m4/configure.m4 @@ -1,14 +1,11 @@ ########################################################################## # Enable/disable test-example ########################################################################## -test_example=no AC_ARG_ENABLE([test-example], - [ --enable-test-example run basic test against examples], - [if test "x$enableval" = "xyes"; then - test_example=yes - else - test_example=no - fi]) + [AS_HELP_STRING([--enable-test-example], [run basic test against examples])], + [test_example=$enableval], + [test_example=yes]) +AM_CONDITIONAL([test_example], [test x$test_example = xyes ]) AC_CONFIG_FILES([example/classifier/Makefile example/generator/Makefile diff --git a/helper/m4/configure.m4 b/helper/m4/configure.m4 index 343f5e3c..2e2943d1 100644 --- a/helper/m4/configure.m4 +++ b/helper/m4/configure.m4 @@ -1,12 +1,11 @@ ########################################################################## # Enable/disable test-helper ########################################################################## -test_helper=no AC_ARG_ENABLE([test-helper], - [ --enable-test-helper run test in helper/test], - [if test "x$enableval" = "xyes"; then - test_helper=yes - fi]) + [AS_HELP_STRING([--enable-test-helper], [run test in helper/test])], + [test_helper=$enableval], + [test_helper=yes]) +AM_CONDITIONAL([test_helper], [test x$test_helper = xyes ]) ########################################################################## # Enable/disable helper-ext diff --git a/test/common_plat/m4/miscellaneous.m4 b/test/common_plat/m4/miscellaneous.m4 index cc881edb..dac236a6 100644 --- a/test/common_plat/m4/miscellaneous.m4 +++ b/test/common_plat/m4/miscellaneous.m4 @@ -1,9 +1,8 @@ ########################################################################## # Enable/disable test-cpp ########################################################################## -test_cpp=no AC_ARG_ENABLE([test-cpp], - [ --enable-test-cpp run basic test aginast cpp], - [if test "x$enableval" = "xyes"; then - test_cpp=yes - fi]) + [AS_HELP_STRING([--disable-test-cpp], [run basic test aginast cpp])], + [test_cpp=$enableval], + [test_cpp=yes]) +AM_CONDITIONAL([test_cpp], [test x$test_cpp = xyes ]) diff --git a/test/common_plat/m4/performance.m4 b/test/common_plat/m4/performance.m4 index 1e2000d9..34270e8d 100644 --- a/test/common_plat/m4/performance.m4 +++ b/test/common_plat/m4/performance.m4 @@ -1,9 +1,8 @@ ########################################################################## # Enable/disable test-perf ########################################################################## -test_perf=no AC_ARG_ENABLE([test-perf], - [ --enable-test-perf run test in test/performance], - [if test "x$enableval" = "xyes"; then - test_perf=yes - fi]) + [AS_HELP_STRING([--enable-test-perf], [run test in test/performance])], + [test_perf=$enableval], + [test_perf=yes]) +AM_CONDITIONAL([test_perf], [test x$test_perf = xyes ]) diff --git a/test/common_plat/m4/validation.m4 b/test/common_plat/m4/validation.m4 index 67edac7a..b2a2f75d 100644 --- a/test/common_plat/m4/validation.m4 +++ b/test/common_plat/m4/validation.m4 @@ -1,30 +1,19 @@ ########################################################################## # Enable/disable Unit tests ########################################################################## -cunit_support=no -test_vald=no AC_ARG_ENABLE([test_vald], - [ --enable-test-vald run test in test/validation], - [if test x$enableval = xyes; then - test_vald=yes - cunit_support=yes - fi]) - -########################################################################## -# Enable/disable Unit tests -########################################################################## -AC_ARG_ENABLE([cunit_support], - [ --enable-cunit-support include cunit infrastructure], - [if test x$enableval = xyes; then - cunit_support=yes - fi]) + [AS_HELP_STRING([--enable-test-vald], [run test in test/validation])], + [test_vald=$enableval], + [test_vald=yes]) +AM_CONDITIONAL([test_vald], [test x$test_vald = xyes ]) ########################################################################## # Set optional CUnit path ########################################################################## +cunit_support=$test_vald AC_ARG_WITH([cunit-path], -AC_HELP_STRING([--with-cunit-path=DIR path to CUnit libs and headers], - [(or in the default path if not specified).]), +AC_HELP_STRING([--with-cunit-path=DIR], + [path to CUnit libs and headers (if not present at default path)]), [CUNIT_PATH=$withval CUNIT_CPPFLAGS="-I$CUNIT_PATH/include" CUNIT_LIBS="-L$CUNIT_PATH/lib" diff --git a/test/linux-generic/m4/performance.m4 b/test/linux-generic/m4/performance.m4 index 7f54b96d..05b3a990 100644 --- a/test/linux-generic/m4/performance.m4 +++ b/test/linux-generic/m4/performance.m4 @@ -1,9 +1,8 @@ ########################################################################## # Enable/disable test-perf-proc ########################################################################## -test_perf_proc=no AC_ARG_ENABLE([test-perf-proc], - [ --enable-test-perf-proc run test in test/performance in process mode], - [if test "x$enableval" = "xyes"; then - test_perf_proc=yes - fi]) + [AS_HELP_STRING([--enable-test-perf-proc], [run test in test/performance in process mode])], + [test_perf_proc=$enableval], + [test_perf_proc=yes]) +AM_CONDITIONAL([test_perf_proc], [test x$test_perf_proc = xyes ]) ----------------------------------------------------------------------- Summary of changes: .travis.yml | 65 +++++++++++++++++++--------- Makefile.am | 9 +--- configure.ac | 64 +++++++++++++-------------- example/m4/configure.m4 | 11 ++--- helper/m4/configure.m4 | 9 ++-- test/Makefile.inc | 2 +- test/common_plat/m4/miscellaneous.m4 | 9 ++-- test/common_plat/m4/performance.m4 | 9 ++-- test/common_plat/m4/validation.m4 | 59 ++++--------------------- test/common_plat/validation/api/Makefile.inc | 2 +- test/linux-generic/Makefile.inc | 2 +- test/linux-generic/m4/performance.m4 | 9 ++-- 12 files changed, 107 insertions(+), 143 deletions(-) hooks/post-receive --

7 years, 9 months

[COMMIT] branch master updated. v1.15.0.0-150-g7508c5ac

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 7508c5ac906bb7cb1d339b4c5e924f3a18e504ca (commit) via 87fbe7fbf2debf8bc44bfffc3d3a2d1827208452 (commit) via a7463a692a4e2dc311c2d383595adafd01433fa4 (commit) from 11fed684507a320fbb79dc86769c8f1755d0276f (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 7508c5ac906bb7cb1d339b4c5e924f3a18e504ca Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Thu Aug 24 14:51:08 2017 +0300 helper: chksum: verify odph_ipv4_chksum_x() functions Fixes: https://bugs.linaro.org/show_bug.cgi?id=2976 Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Signed-off-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/helper/test/chksum.c b/helper/test/chksum.c index 914eab04..9eb7ee06 100644 --- a/helper/test/chksum.c +++ b/helper/test/chksum.c @@ -110,9 +110,17 @@ int main(int argc ODPH_UNUSED, char *argv[] ODPH_UNUSED) ODPH_IPV4HDR_LEN); ip->proto = ODPH_IPPROTO_UDP; ip->id = odp_cpu_to_be_16(1); - ip->chksum = 0; odp_packet_has_ipv4_set(test_packet, 1); - odph_ipv4_csum_update(test_packet); + if (odph_ipv4_csum_update(test_packet) < 0) + status = -1; + + if (!odph_ipv4_csum_valid(test_packet)) + status = -1; + + printf("IP chksum = 0x%x\n", odp_be_to_cpu_16(ip->chksum)); + + if (odp_be_to_cpu_16(ip->chksum) != 0x3965) + status = -1; /* udp */ odp_packet_l4_offset_set(test_packet, ODPH_ETHHDR_LEN commit 87fbe7fbf2debf8bc44bfffc3d3a2d1827208452 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Fri Aug 18 03:21:43 2017 +0300 helper: ip: correct ipv4 header checksum calculation Current code for IPv4 header checksum calculation assumes that packet data is aligned on 2-byte boundary, that there are no optional headers, etc. Rewrite checksumming code to properly copy & process headers. https://bugs.linaro.org/show_bug.cgi?id=2976 Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Signed-off-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/helper/include/odp/helper/ip.h b/helper/include/odp/helper/ip.h index 91776fad..e0d5c3bf 100644 --- a/helper/include/odp/helper/ip.h +++ b/helper/include/odp/helper/ip.h @@ -74,6 +74,9 @@ extern "C" { /** @internal Returns true if IPv4 packet is a fragment */ #define ODPH_IPV4HDR_IS_FRAGMENT(frag_offset) ((frag_offset) & 0x3fff) +/** @internal Checksum offset in IPv4 header */ +#define ODPH_IPV4HDR_CSUM_OFFSET 10 + /** IPv4 header */ typedef struct ODP_PACKED { uint8_t ver_ihl; /**< Version / Header length */ @@ -92,6 +95,28 @@ typedef struct ODP_PACKED { ODP_STATIC_ASSERT(sizeof(odph_ipv4hdr_t) == ODPH_IPV4HDR_LEN, "ODPH_IPV4HDR_T__SIZE_ERROR"); +static inline int odph_ipv4_csum(odp_packet_t pkt, + uint32_t offset, + odph_ipv4hdr_t *ip, + odp_u16sum_t *chksum) +{ + int nleft = ODPH_IPV4HDR_IHL(ip->ver_ihl) * 4; + uint16_t buf[nleft / 2]; + int res; + + ip->chksum = 0; + memcpy(buf, ip, sizeof(*ip)); + res = odp_packet_copy_to_mem(pkt, offset + sizeof(*ip), + nleft - sizeof(*ip), + buf + sizeof(*ip) / 2); + if (odp_unlikely(res < 0)) + return res; + + *chksum = odph_chksum(buf, nleft); + + return 0; +} + /** * Check if IPv4 checksum is valid * @@ -102,11 +127,9 @@ ODP_STATIC_ASSERT(sizeof(odph_ipv4hdr_t) == ODPH_IPV4HDR_LEN, static inline int odph_ipv4_csum_valid(odp_packet_t pkt) { uint32_t offset; - odp_u16be_t res = 0; - uint16_t *w; - int nleft = sizeof(odph_ipv4hdr_t); + int res; odph_ipv4hdr_t ip; - odp_u16be_t chksum; + odp_u16sum_t chksum, cur_chksum; offset = odp_packet_l3_offset(pkt); if (offset == ODP_PACKET_OFFSET_INVALID) @@ -114,37 +137,45 @@ static inline int odph_ipv4_csum_valid(odp_packet_t pkt) odp_packet_copy_to_mem(pkt, offset, sizeof(odph_ipv4hdr_t), &ip); - w = (uint16_t *)(void *)&ip; chksum = ip.chksum; - ip.chksum = 0x0; - res = odph_chksum(w, nleft); - return (res == chksum) ? 1 : 0; + res = odph_ipv4_csum(pkt, offset, &ip, &cur_chksum); + if (odp_unlikely(res < 0)) + return 0; + + return (cur_chksum == chksum) ? 1 : 0; } /** * Calculate and fill in IPv4 checksum * - * @note when using this api to populate data destined for the wire - * odp_cpu_to_be_16() can be used to remove sparse warnings - * * @param pkt ODP packet * - * @return IPv4 checksum in host cpu order, or 0 on failure + * @retval 0 on success + * @retval <0 on failure */ -static inline odp_u16sum_t odph_ipv4_csum_update(odp_packet_t pkt) +static inline int odph_ipv4_csum_update(odp_packet_t pkt) { - uint16_t *w; - odph_ipv4hdr_t *ip; - int nleft = sizeof(odph_ipv4hdr_t); + uint32_t offset; + odph_ipv4hdr_t ip; + odp_u16sum_t chksum; + int res; - ip = (odph_ipv4hdr_t *)odp_packet_l3_ptr(pkt, NULL); - if (ip == NULL) - return 0; + offset = odp_packet_l3_offset(pkt); + if (offset == ODP_PACKET_OFFSET_INVALID) + return -1; + + res = odp_packet_copy_to_mem(pkt, offset, sizeof(ip), &ip); + if (odp_unlikely(res < 0)) + return res; + + res = odph_ipv4_csum(pkt, offset, &ip, &chksum); + if (odp_unlikely(res < 0)) + return res; - w = (uint16_t *)(void *)ip; - ip->chksum = odph_chksum(w, nleft); - return ip->chksum; + return odp_packet_copy_from_mem(pkt, + offset + ODPH_IPV4HDR_CSUM_OFFSET, + 2, &chksum); } /** IPv6 version */ diff --git a/test/common_plat/validation/api/classification/odp_classification_common.c b/test/common_plat/validation/api/classification/odp_classification_common.c index e0c0808e..60e20ea8 100644 --- a/test/common_plat/validation/api/classification/odp_classification_common.c +++ b/test/common_plat/validation/api/classification/odp_classification_common.c @@ -317,8 +317,7 @@ odp_packet_t create_packet(cls_packet_info_t pkt_info) ip->src_addr = odp_cpu_to_be_32(addr); ip->ver_ihl = ODPH_IPV4 << 4 | ODPH_IPV4HDR_IHL_MIN; ip->id = odp_cpu_to_be_16(seqno); - ip->chksum = 0; - ip->chksum = odph_ipv4_csum_update(pkt); + odph_ipv4_csum_update(pkt); ip->proto = next_hdr; ip->tot_len = odp_cpu_to_be_16(l3_len); ip->ttl = DEFAULT_TTL; diff --git a/test/common_plat/validation/api/classification/odp_classification_test_pmr.c b/test/common_plat/validation/api/classification/odp_classification_test_pmr.c index 15b76033..87d04b6b 100644 --- a/test/common_plat/validation/api/classification/odp_classification_test_pmr.c +++ b/test/common_plat/validation/api/classification/odp_classification_test_pmr.c @@ -1678,7 +1678,7 @@ static void classification_test_pmr_term_daddr(void) odp_pktio_mac_addr(pktio, eth->dst.addr, ODPH_ETHADDR_LEN); ip = (odph_ipv4hdr_t *)odp_packet_l3_ptr(pkt, NULL); ip->dst_addr = odp_cpu_to_be_32(addr); - ip->chksum = odph_ipv4_csum_update(pkt); + odph_ipv4_csum_update(pkt); seqno = cls_pkt_get_seq(pkt); CU_ASSERT(seqno != TEST_SEQ_INVALID); diff --git a/test/common_plat/validation/api/classification/odp_classification_tests.c b/test/common_plat/validation/api/classification/odp_classification_tests.c index 1b044509..c7f5d0d4 100644 --- a/test/common_plat/validation/api/classification/odp_classification_tests.c +++ b/test/common_plat/validation/api/classification/odp_classification_tests.c @@ -239,8 +239,7 @@ void test_cls_pmr_chain(void) ip = (odph_ipv4hdr_t *)odp_packet_l3_ptr(pkt, NULL); parse_ipv4_string(CLS_PMR_CHAIN_SADDR, &addr, &mask); ip->src_addr = odp_cpu_to_be_32(addr); - ip->chksum = 0; - ip->chksum = odph_ipv4_csum_update(pkt); + odph_ipv4_csum_update(pkt); set_first_supported_pmr_port(pkt, CLS_PMR_CHAIN_PORT); @@ -262,8 +261,7 @@ void test_cls_pmr_chain(void) ip = (odph_ipv4hdr_t *)odp_packet_l3_ptr(pkt, NULL); parse_ipv4_string(CLS_PMR_CHAIN_SADDR, &addr, &mask); ip->src_addr = odp_cpu_to_be_32(addr); - ip->chksum = 0; - ip->chksum = odph_ipv4_csum_update(pkt); + odph_ipv4_csum_update(pkt); enqueue_pktio_interface(pkt, pktio_loop); pkt = receive_packet(&queue, ODP_TIME_SEC_IN_NS); @@ -670,8 +668,7 @@ void test_pktio_pmr_composite_cos(void) ip = (odph_ipv4hdr_t *)odp_packet_l3_ptr(pkt, NULL); parse_ipv4_string(CLS_PMR_SET_SADDR, &addr, &mask); ip->src_addr = odp_cpu_to_be_32(addr); - ip->chksum = 0; - ip->chksum = odph_ipv4_csum_update(pkt); + odph_ipv4_csum_update(pkt); set_first_supported_pmr_port(pkt, CLS_PMR_SET_PORT); enqueue_pktio_interface(pkt, pktio_loop); commit a7463a692a4e2dc311c2d383595adafd01433fa4 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Thu Aug 24 14:32:08 2017 +0300 helper: chksum: odph_chksum returns value in network byte order All examples and usecases assumed network byte order for odph_chksum() return value. Instead of changing this convention, rather document that odph_chksum returns value in network byte order. https://bugs.linaro.org/show_bug.cgi?id=2976 Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Signed-off-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/helper/include/odp/helper/chksum.h b/helper/include/odp/helper/chksum.h index 520e9275..1bf950c8 100644 --- a/helper/include/odp/helper/chksum.h +++ b/helper/include/odp/helper/chksum.h @@ -40,7 +40,7 @@ typedef enum { * @param buffer calculate chksum for buffer * @param len buffer length * - * @return checksum value in host cpu order + * @return checksum value in network order */ static inline odp_u16sum_t odph_chksum(void *buffer, int len) { ----------------------------------------------------------------------- Summary of changes: helper/include/odp/helper/chksum.h | 2 +- helper/include/odp/helper/ip.h | 75 +++++++++++++++------- helper/test/chksum.c | 12 +++- .../api/classification/odp_classification_common.c | 3 +- .../classification/odp_classification_test_pmr.c | 2 +- .../api/classification/odp_classification_tests.c | 9 +-- 6 files changed, 69 insertions(+), 34 deletions(-) hooks/post-receive --

7 years, 10 months

[COMMIT] branch api-next updated. v1.15.0.0-607-g91c0b58f

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, api-next has been updated via 91c0b58fc87ba0431241818758cea94438cd5498 (commit) via 4c8578a2105e37e645e3606622fd8c6e46b77443 (commit) via 1bc3a176474ccb199caba9a05cbfaf713ed00707 (commit) via d5bd5c2634af91c1088a1de931f7a72666e8993e (commit) via 11fed684507a320fbb79dc86769c8f1755d0276f (commit) from b2270c5b1d2badb93dd7e6dc743191c04c562ad1 (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 91c0b58fc87ba0431241818758cea94438cd5498 Merge: b2270c5b 4c8578a2 Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Mon Aug 28 23:26:04 2017 +0300 Merge branch 'master' into api-next commit 4c8578a2105e37e645e3606622fd8c6e46b77443 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Thu Aug 24 14:51:08 2017 +0300 helper: chksum: verify odph_ipv4_chksum_*() functions Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> diff --git a/helper/test/chksum.c b/helper/test/chksum.c index 914eab04..9eb7ee06 100644 --- a/helper/test/chksum.c +++ b/helper/test/chksum.c @@ -110,9 +110,17 @@ int main(int argc ODPH_UNUSED, char *argv[] ODPH_UNUSED) ODPH_IPV4HDR_LEN); ip->proto = ODPH_IPPROTO_UDP; ip->id = odp_cpu_to_be_16(1); - ip->chksum = 0; odp_packet_has_ipv4_set(test_packet, 1); - odph_ipv4_csum_update(test_packet); + if (odph_ipv4_csum_update(test_packet) < 0) + status = -1; + + if (!odph_ipv4_csum_valid(test_packet)) + status = -1; + + printf("IP chksum = 0x%x\n", odp_be_to_cpu_16(ip->chksum)); + + if (odp_be_to_cpu_16(ip->chksum) != 0x3965) + status = -1; /* udp */ odp_packet_l4_offset_set(test_packet, ODPH_ETHHDR_LEN commit 1bc3a176474ccb199caba9a05cbfaf713ed00707 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Fri Aug 18 03:21:43 2017 +0300 helper: ip: correct ipv4 header checksum calculation Current code for IPv4 header checksum calculation assumes that packet data is aligned on 2-byte boundary, that there are no optional headers, etc. Rewrite checksumming code to properly copy & process headers. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> diff --git a/helper/include/odp/helper/ip.h b/helper/include/odp/helper/ip.h index 91776fad..e0d5c3bf 100644 --- a/helper/include/odp/helper/ip.h +++ b/helper/include/odp/helper/ip.h @@ -74,6 +74,9 @@ extern "C" { /** @internal Returns true if IPv4 packet is a fragment */ #define ODPH_IPV4HDR_IS_FRAGMENT(frag_offset) ((frag_offset) & 0x3fff) +/** @internal Checksum offset in IPv4 header */ +#define ODPH_IPV4HDR_CSUM_OFFSET 10 + /** IPv4 header */ typedef struct ODP_PACKED { uint8_t ver_ihl; /**< Version / Header length */ @@ -92,6 +95,28 @@ typedef struct ODP_PACKED { ODP_STATIC_ASSERT(sizeof(odph_ipv4hdr_t) == ODPH_IPV4HDR_LEN, "ODPH_IPV4HDR_T__SIZE_ERROR"); +static inline int odph_ipv4_csum(odp_packet_t pkt, + uint32_t offset, + odph_ipv4hdr_t *ip, + odp_u16sum_t *chksum) +{ + int nleft = ODPH_IPV4HDR_IHL(ip->ver_ihl) * 4; + uint16_t buf[nleft / 2]; + int res; + + ip->chksum = 0; + memcpy(buf, ip, sizeof(*ip)); + res = odp_packet_copy_to_mem(pkt, offset + sizeof(*ip), + nleft - sizeof(*ip), + buf + sizeof(*ip) / 2); + if (odp_unlikely(res < 0)) + return res; + + *chksum = odph_chksum(buf, nleft); + + return 0; +} + /** * Check if IPv4 checksum is valid * @@ -102,11 +127,9 @@ ODP_STATIC_ASSERT(sizeof(odph_ipv4hdr_t) == ODPH_IPV4HDR_LEN, static inline int odph_ipv4_csum_valid(odp_packet_t pkt) { uint32_t offset; - odp_u16be_t res = 0; - uint16_t *w; - int nleft = sizeof(odph_ipv4hdr_t); + int res; odph_ipv4hdr_t ip; - odp_u16be_t chksum; + odp_u16sum_t chksum, cur_chksum; offset = odp_packet_l3_offset(pkt); if (offset == ODP_PACKET_OFFSET_INVALID) @@ -114,37 +137,45 @@ static inline int odph_ipv4_csum_valid(odp_packet_t pkt) odp_packet_copy_to_mem(pkt, offset, sizeof(odph_ipv4hdr_t), &ip); - w = (uint16_t *)(void *)&ip; chksum = ip.chksum; - ip.chksum = 0x0; - res = odph_chksum(w, nleft); - return (res == chksum) ? 1 : 0; + res = odph_ipv4_csum(pkt, offset, &ip, &cur_chksum); + if (odp_unlikely(res < 0)) + return 0; + + return (cur_chksum == chksum) ? 1 : 0; } /** * Calculate and fill in IPv4 checksum * - * @note when using this api to populate data destined for the wire - * odp_cpu_to_be_16() can be used to remove sparse warnings - * * @param pkt ODP packet * - * @return IPv4 checksum in host cpu order, or 0 on failure + * @retval 0 on success + * @retval <0 on failure */ -static inline odp_u16sum_t odph_ipv4_csum_update(odp_packet_t pkt) +static inline int odph_ipv4_csum_update(odp_packet_t pkt) { - uint16_t *w; - odph_ipv4hdr_t *ip; - int nleft = sizeof(odph_ipv4hdr_t); + uint32_t offset; + odph_ipv4hdr_t ip; + odp_u16sum_t chksum; + int res; - ip = (odph_ipv4hdr_t *)odp_packet_l3_ptr(pkt, NULL); - if (ip == NULL) - return 0; + offset = odp_packet_l3_offset(pkt); + if (offset == ODP_PACKET_OFFSET_INVALID) + return -1; + + res = odp_packet_copy_to_mem(pkt, offset, sizeof(ip), &ip); + if (odp_unlikely(res < 0)) + return res; + + res = odph_ipv4_csum(pkt, offset, &ip, &chksum); + if (odp_unlikely(res < 0)) + return res; - w = (uint16_t *)(void *)ip; - ip->chksum = odph_chksum(w, nleft); - return ip->chksum; + return odp_packet_copy_from_mem(pkt, + offset + ODPH_IPV4HDR_CSUM_OFFSET, + 2, &chksum); } /** IPv6 version */ diff --git a/test/common_plat/validation/api/classification/odp_classification_common.c b/test/common_plat/validation/api/classification/odp_classification_common.c index e0c0808e..60e20ea8 100644 --- a/test/common_plat/validation/api/classification/odp_classification_common.c +++ b/test/common_plat/validation/api/classification/odp_classification_common.c @@ -317,8 +317,7 @@ odp_packet_t create_packet(cls_packet_info_t pkt_info) ip->src_addr = odp_cpu_to_be_32(addr); ip->ver_ihl = ODPH_IPV4 << 4 | ODPH_IPV4HDR_IHL_MIN; ip->id = odp_cpu_to_be_16(seqno); - ip->chksum = 0; - ip->chksum = odph_ipv4_csum_update(pkt); + odph_ipv4_csum_update(pkt); ip->proto = next_hdr; ip->tot_len = odp_cpu_to_be_16(l3_len); ip->ttl = DEFAULT_TTL; diff --git a/test/common_plat/validation/api/classification/odp_classification_test_pmr.c b/test/common_plat/validation/api/classification/odp_classification_test_pmr.c index 15b76033..87d04b6b 100644 --- a/test/common_plat/validation/api/classification/odp_classification_test_pmr.c +++ b/test/common_plat/validation/api/classification/odp_classification_test_pmr.c @@ -1678,7 +1678,7 @@ static void classification_test_pmr_term_daddr(void) odp_pktio_mac_addr(pktio, eth->dst.addr, ODPH_ETHADDR_LEN); ip = (odph_ipv4hdr_t *)odp_packet_l3_ptr(pkt, NULL); ip->dst_addr = odp_cpu_to_be_32(addr); - ip->chksum = odph_ipv4_csum_update(pkt); + odph_ipv4_csum_update(pkt); seqno = cls_pkt_get_seq(pkt); CU_ASSERT(seqno != TEST_SEQ_INVALID); diff --git a/test/common_plat/validation/api/classification/odp_classification_tests.c b/test/common_plat/validation/api/classification/odp_classification_tests.c index 1b044509..c7f5d0d4 100644 --- a/test/common_plat/validation/api/classification/odp_classification_tests.c +++ b/test/common_plat/validation/api/classification/odp_classification_tests.c @@ -239,8 +239,7 @@ void test_cls_pmr_chain(void) ip = (odph_ipv4hdr_t *)odp_packet_l3_ptr(pkt, NULL); parse_ipv4_string(CLS_PMR_CHAIN_SADDR, &addr, &mask); ip->src_addr = odp_cpu_to_be_32(addr); - ip->chksum = 0; - ip->chksum = odph_ipv4_csum_update(pkt); + odph_ipv4_csum_update(pkt); set_first_supported_pmr_port(pkt, CLS_PMR_CHAIN_PORT); @@ -262,8 +261,7 @@ void test_cls_pmr_chain(void) ip = (odph_ipv4hdr_t *)odp_packet_l3_ptr(pkt, NULL); parse_ipv4_string(CLS_PMR_CHAIN_SADDR, &addr, &mask); ip->src_addr = odp_cpu_to_be_32(addr); - ip->chksum = 0; - ip->chksum = odph_ipv4_csum_update(pkt); + odph_ipv4_csum_update(pkt); enqueue_pktio_interface(pkt, pktio_loop); pkt = receive_packet(&queue, ODP_TIME_SEC_IN_NS); @@ -670,8 +668,7 @@ void test_pktio_pmr_composite_cos(void) ip = (odph_ipv4hdr_t *)odp_packet_l3_ptr(pkt, NULL); parse_ipv4_string(CLS_PMR_SET_SADDR, &addr, &mask); ip->src_addr = odp_cpu_to_be_32(addr); - ip->chksum = 0; - ip->chksum = odph_ipv4_csum_update(pkt); + odph_ipv4_csum_update(pkt); set_first_supported_pmr_port(pkt, CLS_PMR_SET_PORT); enqueue_pktio_interface(pkt, pktio_loop); commit d5bd5c2634af91c1088a1de931f7a72666e8993e Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Thu Aug 24 14:32:08 2017 +0300 helper: chksum: odph_chksum returns value in network byte order All examples and usecases assumed network byte order for odph_chksum() return value. Instead of changing this convention, rather document that odph_chksum returns value in network byte order. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> diff --git a/helper/include/odp/helper/chksum.h b/helper/include/odp/helper/chksum.h index 520e9275..1bf950c8 100644 --- a/helper/include/odp/helper/chksum.h +++ b/helper/include/odp/helper/chksum.h @@ -40,7 +40,7 @@ typedef enum { * @param buffer calculate chksum for buffer * @param len buffer length * - * @return checksum value in host cpu order + * @return checksum value in network order */ static inline odp_u16sum_t odph_chksum(void *buffer, int len) { ----------------------------------------------------------------------- Summary of changes: helper/Makefile.am | 4 +- helper/include/odp/helper/chksum.h | 2 +- helper/include/odp/helper/ip.h | 75 +++++++++++++++------- helper/{ => include}/odph_debug.h | 0 helper/{ => include}/odph_list_internal.h | 0 helper/test/chksum.c | 12 +++- .../api/classification/odp_classification_common.c | 3 +- .../classification/odp_classification_test_pmr.c | 2 +- .../api/classification/odp_classification_tests.c | 9 +-- 9 files changed, 71 insertions(+), 36 deletions(-) rename helper/{ => include}/odph_debug.h (100%) rename helper/{ => include}/odph_list_internal.h (100%) hooks/post-receive --

7 years, 10 months

[COMMIT] branch master updated. v1.15.0.0-147-g11fed684

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 11fed684507a320fbb79dc86769c8f1755d0276f (commit) from 6a360e61978d03d12dbfff8c34c20cf95170a1c3 (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 11fed684507a320fbb79dc86769c8f1755d0276f Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Mon Aug 28 15:55:34 2017 +0300 helper: move include files to helper/include Repair build with --enable-helper-linux option. https://bugs.linaro.org/show_bug.cgi?id=3216 Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/helper/Makefile.am b/helper/Makefile.am index 2c5452dc..c69fd678 100644 --- a/helper/Makefile.am +++ b/helper/Makefile.am @@ -42,8 +42,8 @@ helperlinuxinclude_HEADERS = \ endif noinst_HEADERS = \ - $(srcdir)/odph_debug.h \ - $(srcdir)/odph_list_internal.h + $(srcdir)/include/odph_debug.h \ + $(srcdir)/include/odph_list_internal.h __LIB__libodphelper_la_SOURCES = \ eth.c \ diff --git a/helper/odph_debug.h b/helper/include/odph_debug.h similarity index 100% rename from helper/odph_debug.h rename to helper/include/odph_debug.h diff --git a/helper/odph_list_internal.h b/helper/include/odph_list_internal.h similarity index 100% rename from helper/odph_list_internal.h rename to helper/include/odph_list_internal.h ----------------------------------------------------------------------- Summary of changes: helper/Makefile.am | 4 ++-- helper/{ => include}/odph_debug.h | 0 helper/{ => include}/odph_list_internal.h | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename helper/{ => include}/odph_debug.h (100%) rename helper/{ => include}/odph_list_internal.h (100%) hooks/post-receive --

7 years, 10 months

[COMMIT] branch api-next updated. v1.15.0.0-602-gb2270c5b

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, api-next has been updated via b2270c5b1d2badb93dd7e6dc743191c04c562ad1 (commit) via 1e1ee0b03cc481e027b1cb911cce1b16fb2fee9a (commit) via 6a360e61978d03d12dbfff8c34c20cf95170a1c3 (commit) via 933b8cdc4832c05a9f81e748f73d8507673cc370 (commit) via 3f02e970482ca203c8f98c1b20b2a3813312df63 (commit) via 87361c8c9017ccd3d18fdf52b9e7ba845baeb1aa (commit) via 15de2926e800a451edc3cbbe970930fc0e64ee7b (commit) via dcb74c5cce2dd3c383730a29e396b76923f201f3 (commit) via c835e02fc287286d86377a9eb8937f8711a7d3cf (commit) via 820571cc1332e06191c7a75c28eb5d908561a533 (commit) via c6bfc6805796795df8f7a124a146365a11638351 (commit) via bc3b618ab85c8404f131ef071488791b97255166 (commit) via e4fe9119bb8a18f2eab6b1d45e532c8d1c41bcc7 (commit) via 1bcd97bb1f67d96d81e4e49a77089c6b17fba8ca (commit) via 512cfde208241f21b5cdbab848be81f43823810a (commit) via a811ff57407a6b9427b225793a75c03cb386e6c9 (commit) via 7a78aa2f6113789d5f6df0ddaff360f10fc859d7 (commit) via b675c825f9dc84df533381a4018663a4c6997882 (commit) via 9dd1357dc936c3b9e44753ce2373f6bb71629e34 (commit) via ffdd8c7e423503b3e85b7fdfd844ad10692795d5 (commit) via cd17794642638d6ee65b97bed9df5ddcd2cb2520 (commit) via 0a7686e47e40db0f5f6b862d16e8b021da23f90b (commit) via 36a7c389d3e00d4c3987236bd8229c54d812f533 (commit) via 26e1a355c7312e2fcc7196eb82ef49c74232035b (commit) via 6a9971dd8dd1cf982e7ae34ae2b62ccdadaed1c9 (commit) via f637a36cd2a7fc125a2d90ed5a93933007987e95 (commit) from 0b2b26281c0d1d8d00d69f9829e32c9a99b7af0f (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 b2270c5b1d2badb93dd7e6dc743191c04c562ad1 Merge: 1e1ee0b0 0b2b2628 Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Mon Aug 28 16:25:34 2017 +0300 Merge branch 'api-next-859293ad' into api-next commit 1e1ee0b03cc481e027b1cb911cce1b16fb2fee9a Merge: 859293ad 6a360e61 Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Fri Aug 25 17:17:34 2017 +0300 Merge branch 'master' into api-next Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --cc platform/linux-generic/Makefile.am index cfccaa98,8f0618f4..7556b9ad --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@@ -8,10 -8,7 +8,9 @@@ AM_CFLAGS += -I$(srcdir)/includ AM_CFLAGS += -I$(top_srcdir)/include AM_CFLAGS += -I$(top_srcdir)/include/odp/arch/@ARCH_ABI@ AM_CFLAGS += -I$(top_builddir)/include +AM_CFLAGS += -I$(top_srcdir)/arch/@ARCH_DIR@ AM_CFLAGS += -Iinclude +AM_CFLAGS += -DSYSCONFDIR=\"@sysconfdir@\" - AM_CFLAGS += -D_ODP_PKTIO_IPC AM_CPPFLAGS += $(OPENSSL_CPPFLAGS) AM_CPPFLAGS += $(DPDK_CPPFLAGS) diff --cc platform/linux-generic/_ishmpool.c index 064d78e8,00000000..f196a6d8 mode 100644,000000..100644 --- a/platform/linux-generic/_ishmpool.c +++ b/platform/linux-generic/_ishmpool.c @@@ -1,807 -1,0 +1,808 @@@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +/* This file gathers the buddy and slab allocation functionality provided + * by _ishm. + * _odp_ishmpool_create() can be used to create a pool for buddy/slab + * allocation. _odp_ishmpool_create() will allocate a memory area using + * ishm_reserve() for both the control part (needed for tracking + * allocation/free...) and the user memory itself (part of which will be given + * at each ishmpool_alloc()). + * The element size provided at pool creation time determines whether + * to pool will of type buddy or slab. + * For buddy, all allocations are rounded to the nearest power of 2. + * + * The implementation of the buddy allocator is very traditional: it + * maintains N lists of free buffers. + * The control part actually contains these N queue heads, (N-M are actually + * used), the free buffers themselves being used for chaining (the chaining info + * is in the buffers: as they are "free" they should not be touched by the + * user). The control part also contains a array of bytes for remembering + * the size (actually the order) of the allocated buffers: + * There are 2^(N-M) such bytes, this number being the maximum number of + * allocated buffers (when all allocation are <= 2^M bytes) + * Buddy allocators handle fragmentation by splitting or merging blocks by 2. + * They guarantee a minimum efficiency of 50%, at worse case fragmentation. + * + * Slab implementation is even simpler, all free elements being queued in + * one single queue at init, taken from this queue when allocated and + * returned to this same queue when freed. + * + * The reason for not using malloc() is that malloc does not guarantee + * memory sharability between ODP threads (regardless of their implememtation) + * which ishm_reserve() can do. see the comments around + * _odp_ishmbud_pool_create() and ishm_reserve() for more details. + * + * This file is divided in 3 sections: the first one regroups functions + * needed by the buddy allocation. + * The second one regroups the functions needed by the slab allocator. + * The third section regroups the common functions exported externally. + */ ++#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> +#include <odp/drv/shm.h> +#include <odp_shm_internal.h> +#include <odp_debug_internal.h> +#include <odp_align_internal.h> +#include <_ishm_internal.h> +#include <_ishmpool_internal.h> +#include <stdlib.h> +#include <stdio.h> +#include <unistd.h> +#include <string.h> +#include <inttypes.h> + +#define BUDDY_MIN_SIZE 32 /* minimal buddy allocation size */ + +typedef _odp_ishm_pool_t pool_t; /* for shorter writing */ + +/* array of ishm block index used for pools. only used for pool + * lookup by name */ +#define MAX_NB_POOL 100 +static int pool_blk_idx[MAX_NB_POOL]; + +/* section 1: functions for buddy allocation: */ + +/* free buddy blocks contains the following structure, used to link the + * free blocks together. + */ +typedef struct bblock_t { + struct bblock_t *next; + uint32_t order; +} bblock_t; + +/* value set in the 'order' table when the block is not allocated: */ +#define BBLOCK_FREE 0 + +/* compute ceil(log2(size)) */ +static uint8_t clog2(uint64_t size) +{ + uint64_t sz; + uint32_t bit; + uint8_t res; + + sz = size; /* we start by computing res = log2(sz)... */ + res = 0; + for (bit = 32; bit ; bit >>= 1) { + if (sz >= ((uint64_t)1 << bit)) { + sz >>= bit; + res += bit; + } + } + if (((uint64_t)1 << res) < size) /* ...and then ceil(x) */ + res++; + + return res; +} + +/* + * given a bblock address, and an order value, returns the address + * of the buddy bblock (the other "half") + */ +static inline bblock_t *get_bblock_buddy(pool_t *bpool, bblock_t *addr, + uint8_t order) +{ + uintptr_t b; + + b = ((uintptr_t)addr - (uintptr_t)bpool->ctrl.user_addr); + b ^= 1 << order; + return (void *)(b + (uintptr_t)bpool->ctrl.user_addr); +} + +/* + * given a buddy block address, return its number (used for busy flags): + */ +static inline uintptr_t get_bblock_nr(pool_t *bpool, void *addr) +{ + uintptr_t b; + uint8_t min_order; + + min_order = bpool->ctrl.min_order; + b = ((uintptr_t)addr - (uintptr_t)bpool->ctrl.user_addr) >> min_order; + return b; +} + +/* remove bblock from the list for bblocks of rank order. The bblock to be + * removed is really expected to be on the list: not finding it is an error */ +static inline void remove_from_list(pool_t *bpool, uint8_t order, + bblock_t *bblock) +{ + bblock_t *curr; /* current bblock (when parsing list) */ + bblock_t *prev; /* previous bblock (when parsing list) */ + + curr = bpool->ctrl.free_heads[order]; + if (!curr) + goto remove_from_list_error; + + if (curr == bblock) { + bpool->ctrl.free_heads[order] = curr->next; + return; + } + + while (curr) { + if (curr == bblock) { + prev->next = curr->next; + return; + } + prev = curr; + curr = curr->next; + } + +remove_from_list_error: + ODP_ERR("List corrupted\n"); +} + +/* + * create a buddy memory pool of given size (actually nearest power of 2), + * where allocation will never be smaller than min_alloc. + * returns a pointer to the created buddy_pool + * The allocated area contains: + * - The _odp_ishm_pool_ctrl_t structure + * - The array of ((order - min_order) of free list heads + * - The array of 'order' values, remembering sizes of allocated bblocks + * - alignment to cache line + * - The user memory + */ +static pool_t *_odp_ishmbud_pool_create(const char *pool_name, int store_idx, + uint64_t size, + uint64_t min_alloc, int flags) +{ + uint8_t order; /* pool order = ceil(log2(size)) */ + uint8_t min_order; /* pool min_order = ceil(log2(min_alloc))*/ + uint32_t max_nb_bblock; /* max number of bblock, when smallest */ + uint32_t control_sz; /* size of control area */ + uint32_t free_head_sz; /* mem area needed for list heads */ + uint32_t saved_order_sz; /* mem area to remember given sizes */ + uint64_t user_sz; /* 2^order bytes */ + uint64_t total_sz; /* total size to request */ + int blk_idx; /* as returned by _ishm_resrve() */ + pool_t *bpool; + int i; + bblock_t *first_block; + + /* a bblock_t must fit in the buffers for linked chain! */ + if (min_alloc < sizeof(bblock_t)) + min_alloc = sizeof(bblock_t); + + /* pool order is such that 2^order = size. same for min_order */ + order = clog2(size); + min_order = clog2(min_alloc); + + /* check parameters obvious wishes: */ + if (order >= 64) + return NULL; + if (order < min_order) + return NULL; + + /* at worst case, all bblocks have smallest (2^min_order) size */ + max_nb_bblock = (1 << (order - min_order)); + + /* space needed for the control area (padded to cache line size)*/ + control_sz = ROUNDUP_CACHE_LINE(sizeof(_odp_ishm_pool_ctrl_t)); + + /* space needed for 'order' free bblock list heads: */ + /* Note that only lists from min_order to order are really used.*/ + free_head_sz = ROUNDUP_CACHE_LINE(sizeof(void *) * (order + 1)); + + /* space needed for order -i.e. size- storage of alloc'd bblock:*/ + saved_order_sz = ROUNDUP_CACHE_LINE(max_nb_bblock * sizeof(uint8_t)); + + /* space needed for user area is 2^order bytes: */ + user_sz = 1 << order; + + total_sz = control_sz + + free_head_sz + + saved_order_sz + + user_sz; + + /* allocate required memory: */ + blk_idx = _odp_ishm_reserve(pool_name, total_sz, -1, + ODP_CACHE_LINE_SIZE, flags, 0); + if (blk_idx < 0) { + ODP_ERR("_odp_ishm_reserve failed."); + return NULL; + } + + bpool = _odp_ishm_address(blk_idx); + if (bpool == NULL) { + ODP_ERR("_odp_ishm_address failed."); + return NULL; + } + + /* store in pool array (needed for look up): */ + pool_blk_idx[store_idx] = blk_idx; + + /* remember block index, needed when pool is destroyed */ + bpool->ctrl.ishm_blk_idx = blk_idx; + + /* remember element size: 0 means unknown size, i.e. buddy alloation*/ + bpool->ctrl.element_sz = 0; + + /* prepare mutex: */ + odp_spinlock_init(&bpool->ctrl.lock); + + /* initialise pointers and things... */ + bpool->ctrl.order = order; + bpool->ctrl.min_order = min_order; + bpool->ctrl.free_heads = + (void *)((uintptr_t)bpool + control_sz); + bpool->ctrl.alloced_order = + (uint8_t *)((uintptr_t)bpool->ctrl.free_heads + free_head_sz); + bpool->ctrl.user_addr = + (void *)((uintptr_t)bpool->ctrl.alloced_order + saved_order_sz); + + /* initialize all free list to NULL, except the top biggest element:*/ + for (i = 0; i < (order - min_order); i++) + bpool->ctrl.free_heads[i] = NULL; + bpool->ctrl.free_heads[order] = bpool->ctrl.user_addr; + first_block = (bblock_t *)bpool->ctrl.user_addr; + first_block->next = NULL; + first_block->order = order; + + /* set all 'order' of allocated bblocks to free: */ + memset(bpool->ctrl.alloced_order, BBLOCK_FREE, saved_order_sz); + + return bpool; +} + +/* allocated memory from the given buddy pool */ +static void *_odp_ishmbud_alloc(pool_t *bpool, uint64_t size) +{ + uint32_t rq_order; /* requested order */ + uint32_t try_order; + bblock_t *bblock; + bblock_t *buddy; + uintptr_t nr; + + /* if size is zero or too big reject: */ + if ((!size) && (size > (1U << bpool->ctrl.order))) { + ODP_ERR("Invalid alloc size (0 or larger than whole pool)\n"); + return NULL; + } + + /* compute ceil(log2(size)), to get the requested block order: */ + rq_order = clog2(size); + + /* make sure the requested order is bigger (or same) as minimum! */ + if (rq_order < bpool->ctrl.min_order) + rq_order = bpool->ctrl.min_order; + + /* mutex from here: */ + odp_spinlock_lock(&bpool->ctrl.lock); + + /* now, start trying to allocate a bblock of rq_order. If that + * fails keep trying larger orders until pool order is reached */ + bblock = NULL; + for (try_order = rq_order; try_order <= bpool->ctrl.order; + try_order++) { + if (bpool->ctrl.free_heads[try_order]) { + /* remove from list: */ + bblock = + (bblock_t *)(bpool->ctrl.free_heads[try_order]); + bpool->ctrl.free_heads[try_order] = bblock->next; + break; + } + } + + if (!bblock) { + odp_spinlock_unlock(&bpool->ctrl.lock); + ODP_ERR("Out of memory. (Buddy pool full)\n"); + return NULL; + } + + /* OK: we got a block, but possibbly too large (if try_order>rq_order) + * return the extra halves to the pool hence splitting the bblock at + * each 'extra' order: */ + while (try_order-- > rq_order) { + /* split: */ + buddy = (bblock_t *)((uintptr_t)bblock + (1 << try_order)); + buddy->order = try_order; + /* add to list: */ + buddy->next = bpool->ctrl.free_heads[try_order]; + bpool->ctrl.free_heads[try_order] = buddy; + /* mark as free (non allocated block get size 0): */ + nr = get_bblock_nr(bpool, buddy); + bpool->ctrl.alloced_order[nr] = BBLOCK_FREE; + } + + /* remember the size if the allocated block: */ + nr = get_bblock_nr(bpool, bblock); + bpool->ctrl.alloced_order[nr] = rq_order; + + /* and return the allocated block! */ + odp_spinlock_unlock(&bpool->ctrl.lock); + return (void *)bblock; +} + +/* free a previously allocated buffer from a given buddy pool */ +static int _odp_ishmbud_free(pool_t *bpool, void *addr) +{ + uintptr_t user_start; /* start of user area */ + uintptr_t user_stop; /* stop of user area */ + uintptr_t mask; /* 2^min_order - 1 */ + bblock_t *bblock; /* bblock being freed */ + bblock_t *buddy; /* buddy bblock of bblock being freed */ + uint8_t order; /* order of block being freed */ + uintptr_t nr; /* block number */ + + /* freeing NULL is regarded as OK, though without any effect: */ + if (!addr) + return 0; + + user_start = (uintptr_t)bpool->ctrl.user_addr; + user_stop = user_start + ((uintptr_t)1 << bpool->ctrl.order); + mask = ((uintptr_t)1 << bpool->ctrl.min_order) - 1; + + /* some sanity checks: check that given address is within pool and + * that relative address has 2^min_order granularity: */ + if (((uintptr_t)addr < user_start) || + ((uintptr_t)addr > user_stop) || + (((uintptr_t)addr - user_start) & mask)) { + ODP_ERR("Invalid address to be freed\n"); + return -1; + } + + /* mutex from here: */ + odp_spinlock_lock(&bpool->ctrl.lock); + + /* collect saved block order and make sure bblock was allocated */ + bblock = (bblock_t *)addr; + nr = get_bblock_nr(bpool, bblock); + order = bpool->ctrl.alloced_order[nr]; + if (order == BBLOCK_FREE) { + ODP_ERR("Double free error\n"); + odp_spinlock_unlock(&bpool->ctrl.lock); + return -1; + } + + /* this looks like a valid free, mark at least this as free: */ + bpool->ctrl.alloced_order[nr] = BBLOCK_FREE; + + /* go up in orders, trying to merge buddies... */ + while (order < bpool->ctrl.order) { + buddy = get_bblock_buddy(bpool, bblock, order); + /*if buddy is not free: no further merge possible */ + nr = get_bblock_nr(bpool, buddy); + if (bpool->ctrl.alloced_order[nr] != BBLOCK_FREE) + break; + /*merge only bblock of same order:*/ + if (buddy->order != order) + break; + /*merge: remove buddy from free list: */ + remove_from_list(bpool, order, buddy); + /*merge: make sure we point at start of block: */ + if (bblock > buddy) + bblock = buddy; + /*merge: size of bloack has dubbled: increse order: */ + order++; + } + + /* insert the bblock into its correct free block list: */ + bblock->next = bpool->ctrl.free_heads[order]; + bpool->ctrl.free_heads[order] = bblock; + + /* remember the (possibly now merged) block order: */ + bblock->order = order; + + odp_spinlock_unlock(&bpool->ctrl.lock); + return 0; +} + +/* print buddy pool status and performs sanity checks */ +static int _odp_ishmbud_pool_status(const char *title, pool_t *bpool) +{ + uint8_t order, pool_order, pool_min_order; + uint64_t free_q_nb_bblocks[64]; + uint64_t allocated_nb_bblocks[64]; + uint64_t free_q_nb_bblocks_bytes[64]; + uint64_t allocated_nb_bblocks_bytes[64]; + uint64_t total_bytes_free; + uint64_t total_bytes_allocated; + uint64_t nr; + bblock_t *bblock; + int res = 0; + + odp_spinlock_lock(&bpool->ctrl.lock); + + pool_order = bpool->ctrl.order; + pool_min_order = bpool->ctrl.min_order; + + ODP_DBG("\n%s\n", title); + ODP_DBG("Pool Type: BUDDY\n"); + ODP_DBG("pool size: %" PRIu64 " (bytes)\n", (1UL << pool_order)); + ODP_DBG("pool order: %d\n", (int)pool_order); + ODP_DBG("pool min_order: %d\n", (int)pool_min_order); + + /* a pool wholse order is more than 64 cannot even be reached on 64 + * bit machines! */ + if (pool_order > 64) { + odp_spinlock_unlock(&bpool->ctrl.lock); + return -1; + } + + total_bytes_free = 0; + total_bytes_allocated = 0; + + /* for each queue */ + for (order = pool_min_order; order <= pool_order; order++) { + free_q_nb_bblocks[order] = 0; + free_q_nb_bblocks_bytes[order] = 0; + allocated_nb_bblocks[order] = 0; + allocated_nb_bblocks_bytes[order] = 0; + + /* get the number of buffs in the free queue for this order: */ + bblock = bpool->ctrl.free_heads[order]; + while (bblock) { + free_q_nb_bblocks[order]++; + free_q_nb_bblocks_bytes[order] += (1 << order); + bblock = bblock->next; + } + + total_bytes_free += free_q_nb_bblocks_bytes[order]; + + /* get the number of allocated buffers of this order */ + for (nr = 0; + nr < (1U << (pool_order - pool_min_order)); nr++) { + if (bpool->ctrl.alloced_order[nr] == order) + allocated_nb_bblocks[order]++; + } + + allocated_nb_bblocks_bytes[order] = + allocated_nb_bblocks[order] * (1 << order); + + total_bytes_allocated += allocated_nb_bblocks_bytes[order]; + + ODP_DBG("Order %d => Free: %" PRIu64 " buffers " + "(%" PRIu64" bytes) " + "Allocated %" PRIu64 " buffers (%" PRIu64 " bytes) " + "Total: %" PRIu64 " bytes\n", + (int)order, free_q_nb_bblocks[order], + free_q_nb_bblocks_bytes[order], + allocated_nb_bblocks[order], + allocated_nb_bblocks_bytes[order], + free_q_nb_bblocks_bytes[order] + + allocated_nb_bblocks_bytes[order]); + } + + ODP_DBG("Allocated space: %" PRIu64 " (bytes)\n", + total_bytes_allocated); + ODP_DBG("Free space: %" PRIu64 " (bytes)\n", total_bytes_free); + + if (total_bytes_free + total_bytes_allocated != (1U << pool_order)) { + ODP_DBG("Lost bytes on this pool!\n"); + res = -1; + } + + if (res) + ODP_DBG("Pool inconsistent!\n"); + + odp_spinlock_unlock(&bpool->ctrl.lock); + return res; +} + +/* section 2: functions for slab allocation: */ + +/* free slab blocks contains the following structure, used to link the + * free blocks together. + */ +typedef struct sblock_t { + struct sblock_t *next; +} sblock_t; + +/* + * create a slab memory pool of given size (rounded up to the nearest integer + * number of element, where each element has size 'elt_size'). + * returns a pointer to the created slab pool. + * The allocated area contains: + * - The _odp_ishm_pool_ctrl_t structure + * - alignment to cache line + * - The user memory + */ +static pool_t *_odp_ishmslab_pool_create(const char *pool_name, int store_idx, + uint64_t size, + uint64_t elt_size, int flags) +{ + uint32_t nb_sblock; /* number of elements in the pool */ + uint32_t control_sz; /* size of control area */ + uint64_t total_sz; /* total size to request */ + uint64_t user_sz; /* 2^order bytes */ + int blk_idx; /* as returned by _ishm_reserve() */ + pool_t *spool; + unsigned int i; + sblock_t *block; + + /* a sblock_t must fit in the buffers for linked chain! */ + if (elt_size < sizeof(bblock_t)) { + elt_size = sizeof(bblock_t); + size = size * (sizeof(bblock_t) / elt_size + + ((sizeof(bblock_t) % elt_size) ? 1 : 0)); + } + + /* nb of element fitting in the pool is just ceil(size/elt_size)*/ + nb_sblock = (size / elt_size) + ((size % elt_size) ? 1 : 0); + + /* space needed for the control area (padded to cache line size)*/ + control_sz = ROUNDUP_CACHE_LINE(sizeof(_odp_ishm_pool_ctrl_t)); + + /* space needed for user area is : */ + user_sz = nb_sblock * elt_size; + + total_sz = control_sz + + user_sz; + + /* allocate required memory: */ + blk_idx = _odp_ishm_reserve(pool_name, total_sz, -1, + ODP_CACHE_LINE_SIZE, flags, 0); + if (blk_idx < 0) { + ODP_ERR("_odp_ishm_reserve failed."); + return NULL; + } + + spool = _odp_ishm_address(blk_idx); + if (spool == NULL) { + ODP_ERR("_odp_ishm_address failed."); + return NULL; + } + + /* store in pool array (needed for look up): */ + pool_blk_idx[store_idx] = blk_idx; + + /* remember block index, needed when pool is destroyed */ + spool->ctrl.ishm_blk_idx = blk_idx; + + /* remember element (sblock) size and their number: */ + spool->ctrl.element_sz = elt_size; + spool->ctrl.nb_elem = nb_sblock; + + /* prepare mutex: */ + odp_spinlock_init(&spool->ctrl.lock); + + /* initialise pointers and things... */ + spool->ctrl.user_addr = + (void *)((uintptr_t)spool + control_sz); + + /* initialise the free list with the list of all elements:*/ + spool->ctrl.free_head = spool->ctrl.user_addr; + for (i = 0; i < nb_sblock - 1; i++) { + block = (sblock_t *)((uintptr_t)spool->ctrl.user_addr + + i * (uintptr_t)elt_size); + block->next = (sblock_t *)((uintptr_t)block + + (uintptr_t)elt_size); + } + block = (sblock_t *)((uintptr_t)spool->ctrl.user_addr + + (nb_sblock - 1) * (uintptr_t)elt_size); + block->next = NULL; + + return spool; +} + +/* allocated memory from the given slab pool */ +static void *_odp_ishmslab_alloc(pool_t *spool, uint64_t size) +{ + void *ret; + sblock_t *block; + + if (size > spool->ctrl.element_sz) + return NULL; + + odp_spinlock_lock(&spool->ctrl.lock); + ret = spool->ctrl.free_head; + if (!ret) { + odp_spinlock_unlock(&spool->ctrl.lock); + ODP_ERR("Out of memory. (Slab pool full)\n"); + return NULL; + } + + block = (sblock_t *)ret; + spool->ctrl.free_head = block->next; + + odp_spinlock_unlock(&spool->ctrl.lock); + return ret; +} + +/* free a previously allocated buffer from a given slab pool */ +static int _odp_ishmslab_free(pool_t *spool, void *addr) +{ + uintptr_t user_start; /* start of user area */ + uintptr_t user_stop; /* stop of user area */ + sblock_t *block; + + /* freeing NULL is regarded as OK, though without any effect: */ + if (!addr) + return 0; + + user_start = (uintptr_t)spool->ctrl.user_addr; + user_stop = user_start + spool->ctrl.element_sz * spool->ctrl.nb_elem; + + /* some sanity checks: check that given address is within pool and + * that relative address has element_sz granularity: */ + if (((uintptr_t)addr < user_start) || + ((uintptr_t)addr > user_stop) || + (((uintptr_t)addr - user_start) % spool->ctrl.element_sz)) { + ODP_ERR("Invalid address to be freed\n"); + return -1; + } + + odp_spinlock_lock(&spool->ctrl.lock); + block = (sblock_t *)addr; + block->next = (sblock_t *)spool->ctrl.free_head; + spool->ctrl.free_head = addr; + odp_spinlock_unlock(&spool->ctrl.lock); + + return 0; +} + +/* print slab pool status and performs sanity checks */ +static int _odp_ishmslab_pool_status(const char *title, pool_t *spool) +{ + sblock_t *sblock; + uint64_t nb_free_elts; /* number of free elements */ + + odp_spinlock_lock(&spool->ctrl.lock); + + ODP_DBG("\n%s\n", title); + ODP_DBG("Pool Type: FIXED SIZE\n"); + ODP_DBG("pool size: %" PRIu64 " (bytes)\n", + spool->ctrl.nb_elem * spool->ctrl.element_sz); + + /* count the number of free elements in the free list: */ + nb_free_elts = 0; + sblock = (sblock_t *)spool->ctrl.free_head; + while (sblock) { + nb_free_elts++; + sblock = sblock->next; + } + + ODP_DBG("%" PRIu64 "/%" PRIu64 " available elements.\n", + nb_free_elts, spool->ctrl.nb_elem); + + odp_spinlock_unlock(&spool->ctrl.lock); + return 0; +} + +/* section 3: common, external functions: */ + +/* create a pool: either with fixed alloc size (if max_alloc/min_alloc<2) or + * of variable block size (if max_alloc == 0) */ +pool_t *_odp_ishm_pool_create(const char *pool_name, uint64_t size, + uint64_t min_alloc, uint64_t max_alloc, int flags) +{ + int store_idx; + uint64_t real_pool_sz; + + if (min_alloc > max_alloc) { + ODP_ERR("invalid parameter: min_alloc > max_alloc"); + return NULL; + } + + /* search for a free index in pool_blk_idx for the pool */ + for (store_idx = 0; store_idx < MAX_NB_POOL; store_idx++) { + if (pool_blk_idx[store_idx] < 0) + break; + } + if (store_idx == MAX_NB_POOL) { + ODP_ERR("Max number of pool reached (MAX_NB_POOL)"); + return NULL; + } + + if ((min_alloc == 0) || ((max_alloc / min_alloc) > 2)) { + /* alloc variation is not constant enough: we go for a buddy + * allocator. The pool efficiency may go as low as 50% + * so we double the required size to make sure we can satisfy + * the user request */ + real_pool_sz = 2 * size; + return _odp_ishmbud_pool_create(pool_name, store_idx, + real_pool_sz, + BUDDY_MIN_SIZE, flags); + } else { + /* min and max are close enough so we go for constant size + * allocator: + * make sure the pool can fit the required size, even when + * only min_alloc allocation are performed: */ + real_pool_sz = ((size / min_alloc) + + ((size % min_alloc) ? 1 : 0)) + * max_alloc; + return _odp_ishmslab_pool_create(pool_name, store_idx, + real_pool_sz, + max_alloc, flags); + } +} + +/* destroy a pool. everything goes away. no operation on the pool should + * follow. */ +int _odp_ishm_pool_destroy(pool_t *pool) +{ + int store_idx; + + for (store_idx = 0; store_idx < MAX_NB_POOL; store_idx++) { + if (pool_blk_idx[store_idx] == pool->ctrl.ishm_blk_idx) { + pool_blk_idx[store_idx] = -1; + break; + } + } + + return _odp_ishm_free_by_index(pool->ctrl.ishm_blk_idx); +} + +/* allocated a buffer from a pool */ +void *_odp_ishm_pool_alloc(_odp_ishm_pool_t *pool, uint64_t size) +{ + if (!pool->ctrl.element_sz) + return _odp_ishmbud_alloc(pool, size); + else + return _odp_ishmslab_alloc(pool, size); +} + +/* free a previously allocated buffer from a pool */ +int _odp_ishm_pool_free(_odp_ishm_pool_t *pool, void *addr) +{ + if (!pool->ctrl.element_sz) + return _odp_ishmbud_free(pool, addr); + else + return _odp_ishmslab_free(pool, addr); +} + +/* Print a pool status */ +int _odp_ishm_pool_status(const char *title, _odp_ishm_pool_t *pool) +{ + if (!pool->ctrl.element_sz) + return _odp_ishmbud_pool_status(title, pool); + else + return _odp_ishmslab_pool_status(title, pool); +} + +void _odp_ishm_pool_init(void) +{ + int i; + + for (i = 0; i < MAX_NB_POOL; i++) + pool_blk_idx[i] = -1; +} + +_odp_ishm_pool_t *_odp_ishm_pool_lookup(const char *pool_name) +{ + int block_idx; + int store_idx; + + /* search for a _ishm block with the given name */ + block_idx = _odp_ishm_lookup_by_name(pool_name); + if (block_idx < 0) + return NULL; + + /* a block with that name exists: make sure it is within + * the registered pools */ + for (store_idx = 0; store_idx < MAX_NB_POOL; store_idx++) { + if (pool_blk_idx[store_idx] == block_idx) + return _odp_ishm_address(block_idx); + } + + return NULL; +} diff --cc platform/linux-generic/_modules.c index 6bb854e9,00000000..8fe1df19 mode 100644,000000..100644 --- a/platform/linux-generic/_modules.c +++ b/platform/linux-generic/_modules.c @@@ -1,53 -1,0 +1,54 @@@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ ++#include <config.h> + +#include <odp_config_internal.h> + +#include <odp/api/std_types.h> +#include <odp/api/debug.h> +#include <odp_debug_internal.h> +#include <libconfig.h> +#include <dlfcn.h> + +static int load_modules(void) +{ + config_t *cf; + const config_setting_t *modules_section; + int module_count; + int i; + const char *module_name; + + cf = &odp_global_data.configuration; + modules_section = config_lookup(cf, "module.modules"); + if (!modules_section) + return 0; + + module_count = config_setting_length(modules_section); + if (!module_count) + return 0; + + for (i = 0; i < module_count; i++) { + module_name = config_setting_get_string_elem(modules_section, + i); + if (dlopen(module_name, RTLD_NOW) == NULL) { + ODP_ERR("dlopen failed for %s: %s\n", + module_name, dlerror()); + return -1; + } + ODP_DBG("module %s loaded.\n", module_name); + } + + return 0; +} + +int _odp_modules_init_global(void) +{ + /* load modules (enumerator and drivers...) */ + if (load_modules()) + return -1; + + return 0; +} diff --cc platform/linux-generic/m4/odp_schedule.m4 index d862b8b2,bb3980ca..087cff87 --- a/platform/linux-generic/m4/odp_schedule.m4 +++ b/platform/linux-generic/m4/odp_schedule.m4 @@@ -1,44 -1,15 +1,23 @@@ - # Checks for --enable-schedule-sp and defines ODP_SCHEDULE_SP and adds - # -DODP_SCHEDULE_SP to CFLAGS. - AC_ARG_ENABLE( - [schedule_sp], - [AC_HELP_STRING([--enable-schedule-sp], - [enable strict priority scheduler])], - [if test "x$enableval" = xyes; then - schedule_sp=true - ODP_CFLAGS="$ODP_CFLAGS -DODP_SCHEDULE_SP" - else - schedule_sp=false - fi], - [schedule_sp=false]) - AM_CONDITIONAL([ODP_SCHEDULE_SP], [test x$schedule_sp = xtrue]) + AC_ARG_ENABLE([schedule-sp], + [ --enable-schedule-sp enable strict priority scheduler], + [if test x$enableval = xyes; then + schedule_sp_enabled=yes + AC_DEFINE([ODP_SCHEDULE_SP], [1], + [Define to 1 to enable strict priority scheduler]) + fi]) - # Checks for --enable-schedule-iquery and defines ODP_SCHEDULE_IQUERY and adds - # -DODP_SCHEDULE_IQUERY to CFLAGS. - AC_ARG_ENABLE( - [schedule_iquery], - [AC_HELP_STRING([--enable-schedule-iquery], - [enable interests query (sparse bitmap) scheduler])], - [if test "x$enableval" = xyes; then - schedule_iquery=true - ODP_CFLAGS="$ODP_CFLAGS -DODP_SCHEDULE_IQUERY" - else - schedule_iquery=false - fi], - [schedule_iquery=false]) - AM_CONDITIONAL([ODP_SCHEDULE_IQUERY], [test x$schedule_iquery = xtrue]) + AC_ARG_ENABLE([schedule-iquery], + [ --enable-schedule-iquery enable interests query (sparse bitmap) scheduler], + [if test x$enableval = xyes; then + schedule_iquery_enabled=yes + AC_DEFINE([ODP_SCHEDULE_IQUERY], [1], + [Define to 1 to enable interests query scheduler]) + fi]) + - # Checks for --enable-schedule-scalable and defines ODP_SCHEDULE_SCALABLE and - # adds -DODP_SCHEDULE_SCALABLE to CFLAGS. - AC_ARG_ENABLE( - [schedule_scalable], - [AC_HELP_STRING([--enable-schedule-scalable], - [enable scalable scheduler])], - [if test "x$enableval" = xyes; then - schedule_scalable=true - ODP_CFLAGS="$ODP_CFLAGS -DODP_SCHEDULE_SCALABLE" - else - schedule_scalable=false - fi], - [schedule_scalable=false]) - AM_CONDITIONAL([ODP_SCHEDULE_SCALABLE], [test x$schedule_scalable = xtrue]) ++AC_ARG_ENABLE([schedule_scalable], ++ [ --enable-schedule-scalable enable scalable scheduler], ++ [if test x$enableval = xyes; then ++ schedule_scalable_enabled=yes ++ AC_DEFINE([ODP_SCHEDULE_SCALABLE], [1], ++ [Define to 1 to enable scalable scheduler]) ++ fi]) diff --cc platform/linux-generic/odp_queue_if.c index d7471dfc,5c3b863a..44fda0d6 --- a/platform/linux-generic/odp_queue_if.c +++ b/platform/linux-generic/odp_queue_if.c @@@ -4,11 -4,10 +4,13 @@@ * SPDX-License-Identifier: BSD-3-Clause */ + #include "config.h" + #include <odp_queue_if.h> +extern const queue_api_t queue_scalable_api; +extern const queue_fn_t queue_scalable_fn; + extern const queue_api_t queue_default_api; extern const queue_fn_t queue_default_fn; diff --cc platform/linux-generic/odp_queue_scalable.c index 79148060,00000000..bcda2195 mode 100644,000000..100644 --- a/platform/linux-generic/odp_queue_scalable.c +++ b/platform/linux-generic/odp_queue_scalable.c @@@ -1,997 -1,0 +1,998 @@@ +/* Copyright (c) 2017, ARM Limited. All rights reserved. + * + * Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ ++#include <config.h> + +#include <odp/api/hints.h> +#include <odp/api/plat/ticketlock_inlines.h> +#include <odp/api/queue.h> +#include <odp/api/schedule.h> +#include <odp/api/shared_memory.h> +#include <odp/api/sync.h> +#include <odp/api/traffic_mngr.h> + +#include <odp_internal.h> +#include <odp_config_internal.h> +#include <odp_debug_internal.h> + +#include <odp_buffer_inlines.h> +#include <odp_packet_io_internal.h> +#include <odp_pool_internal.h> +#include <odp_queue_scalable_internal.h> +#include <odp_schedule_if.h> +#include <_ishm_internal.h> +#include <_ishmpool_internal.h> + +#include <string.h> +#include <inttypes.h> + +#define NUM_INTERNAL_QUEUES 64 + +#define MIN(a, b) \ + ({ \ + __typeof__(a) tmp_a = (a); \ + __typeof__(b) tmp_b = (b); \ + tmp_a < tmp_b ? tmp_a : tmp_b; \ + }) + +#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; + +typedef struct queue_table_t { + queue_entry_t queue[ODP_CONFIG_QUEUES]; +} 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 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[], + int num); +static int _queue_deq_multi(queue_t handle, odp_buffer_hdr_t *buf_hdr[], + int num); + +static queue_entry_t *get_qentry(uint32_t queue_id) +{ + return &queue_tbl->queue[queue_id]; +} + +static int _odp_queue_disable_enq(sched_elem_t *q) +{ + ringidx_t old_read, old_write, new_write; + uint32_t size; + + old_write = q->prod_write; + size = q->prod_mask + 1; + do { + /* Need __atomic_load to avoid compiler reordering */ + old_read = __atomic_load_n(&q->prod_read, __ATOMIC_ACQUIRE); + if (old_write != old_read) { + /* Queue is not empty, cannot claim all elements + * Cannot disable enqueue. + */ + return -1; + } + /* Claim all elements in ring */ + new_write = old_write + size; + } while (!__atomic_compare_exchange_n(&q->prod_write, + &old_write, /* Updated on failure */ + new_write, + true, + __ATOMIC_RELAXED, + __ATOMIC_RELAXED)); + /* All remaining elements claimed, no one else can enqueue */ + return 0; +} + +static int queue_init(queue_entry_t *queue, const char *name, + const odp_queue_param_t *param) +{ + ringidx_t ring_idx; + sched_elem_t *sched_elem; + uint32_t ring_size; + odp_buffer_hdr_t **ring; + uint32_t size; + + sched_elem = &queue->s.sched_elem; + ring_size = param->size > 0 ? + ROUNDUP_POWER2_U32(param->size) : CONFIG_QUEUE_SIZE; + strncpy(queue->s.name, name ? name : "", ODP_QUEUE_NAME_LEN - 1); + queue->s.name[ODP_QUEUE_NAME_LEN - 1] = 0; + memcpy(&queue->s.param, param, sizeof(odp_queue_param_t)); + + size = ring_size * sizeof(odp_buffer_hdr_t *); + ring = (odp_buffer_hdr_t **)shm_pool_alloc_align(queue_shm_pool, size); + if (NULL == ring) + return -1; + + for (ring_idx = 0; ring_idx < ring_size; ring_idx++) + ring[ring_idx] = NULL; + + queue->s.type = queue->s.param.type; + queue->s.enqueue = _queue_enq; + queue->s.dequeue = _queue_deq; + queue->s.enqueue_multi = _queue_enq_multi; + queue->s.dequeue_multi = _queue_deq_multi; + queue->s.pktin = PKTIN_INVALID; + + sched_elem->node.next = NULL; +#ifdef CONFIG_QSCHST_LOCK + LOCK_INIT(&sched_elem->qschlock); +#endif + sched_elem->qschst.numevts = 0; + sched_elem->qschst.wrr_budget = CONFIG_WRR_WEIGHT; + sched_elem->qschst.cur_ticket = 0; + sched_elem->qschst.nxt_ticket = 0; + sched_elem->pop_deficit = 0; + if (queue->s.type == ODP_QUEUE_TYPE_SCHED) + sched_elem->qschst_type = queue->s.param.sched.sync; + else + sched_elem->qschst_type = ODP_NO_SCHED_QUEUE; + /* 2nd cache line - enqueue */ + sched_elem->prod_read = 0; + sched_elem->prod_write = 0; + sched_elem->prod_ring = ring; + sched_elem->prod_mask = ring_size - 1; + /* 3rd cache line - dequeue */ + sched_elem->cons_read = 0; + sched_elem->cons_write = 0; + sched_elem->rwin = NULL; + sched_elem->schedq = NULL; + sched_elem->user_ctx = queue->s.param.context; +#ifdef CONFIG_SPLIT_PRODCONS + sched_elem->cons_ring = ring; + sched_elem->cons_mask = ring_size - 1; + sched_elem->cons_type = sched_elem->qschst_type; +#endif + + /* Queue initialized successfully, add it to the sched group */ + if (queue->s.type == ODP_QUEUE_TYPE_SCHED) { + if (queue->s.param.sched.sync == ODP_SCHED_SYNC_ORDERED) { + sched_elem->rwin = + rwin_alloc(queue_shm_pool, + queue->s.param.sched.lock_count); + if (sched_elem->rwin == NULL) { + ODP_ERR("Reorder window not created\n"); + goto rwin_create_failed; + } + } + sched_elem->schedq = + schedq_from_sched_group(param->sched.group, + param->sched.prio); + } + + return 0; + +rwin_create_failed: + _odp_ishm_pool_free(queue_shm_pool, ring); + + return -1; +} + +static int queue_init_global(void) +{ + uint32_t i; + uint64_t pool_size; + uint64_t min_alloc; + uint64_t max_alloc; + + ODP_DBG("Queue init ... "); + + /* Attach to the pool if it exists */ + queue_shm_pool = _odp_ishm_pool_lookup("queue_shm_pool"); + if (queue_shm_pool == NULL) { + /* Create shared memory pool to allocate shared memory for the + * queues. Use the default queue size. + */ + /* Add size of the array holding the queues */ + pool_size = sizeof(queue_table_t); + /* Add storage required for queues */ + pool_size += (CONFIG_QUEUE_SIZE * sizeof(odp_buffer_hdr_t *)) * + ODP_CONFIG_QUEUES; + /* Add the reorder window size */ + pool_size += sizeof(reorder_window_t) * ODP_CONFIG_QUEUES; + /* Choose min_alloc and max_alloc such that buddy allocator is + * is selected. + */ + min_alloc = 0; + max_alloc = CONFIG_QUEUE_SIZE * sizeof(odp_buffer_hdr_t *); + queue_shm_pool = _odp_ishm_pool_create("queue_shm_pool", + pool_size, + min_alloc, max_alloc, + _ODP_ISHM_SINGLE_VA); + if (queue_shm_pool == NULL) { + ODP_ERR("Failed to allocate shared memory pool for" + " queues\n"); + goto queue_shm_pool_create_failed; + } + } + + queue_tbl = (queue_table_t *) + shm_pool_alloc_align(queue_shm_pool, + sizeof(queue_table_t)); + if (queue_tbl == NULL) { + ODP_ERR("Failed to reserve shared memory for queue table\n"); + goto queue_tbl_ishm_alloc_failed; + } + + memset(queue_tbl, 0, sizeof(queue_table_t)); + + for (i = 0; i < ODP_CONFIG_QUEUES; i++) { + /* init locks */ + queue_entry_t *queue; + + queue = get_qentry(i); + LOCK_INIT(&queue->s.lock); + queue->s.index = i; + queue->s.handle = queue_from_id(i); + } + + ODP_DBG("done\n"); + ODP_DBG("Queue init global\n"); + ODP_DBG(" struct queue_entry_s size %zu\n", + sizeof(struct queue_entry_s)); + ODP_DBG(" queue_entry_t size %zu\n", + sizeof(queue_entry_t)); + ODP_DBG("\n"); + + return 0; + +queue_shm_pool_create_failed: + +queue_tbl_ishm_alloc_failed: + _odp_ishm_pool_destroy(queue_shm_pool); + + return -1; +} + +static int queue_term_global(void) +{ + int ret = 0; + int rc = 0; + queue_entry_t *queue; + int i; + + for (i = 0; i < ODP_CONFIG_QUEUES; i++) { + queue = &queue_tbl->queue[i]; + if (__atomic_load_n(&queue->s.status, + __ATOMIC_RELAXED) != QUEUE_STATUS_FREE) { + ODP_ERR("Not destroyed queue: %s\n", queue->s.name); + rc = -1; + } + } + + _odp_ishm_pool_free(queue_shm_pool, queue_tbl); + + ret = _odp_ishm_pool_destroy(queue_shm_pool); + if (ret < 0) { + ODP_ERR("Failed to destroy shared memory pool for queues\n"); + rc = -1; + } + + return rc; +} + +static int queue_init_local(void) +{ + return 0; +} + +static int queue_term_local(void) +{ + return 0; +} + +static int queue_capability(odp_queue_capability_t *capa) +{ + memset(capa, 0, sizeof(odp_queue_capability_t)); + + /* Reserve some queues for internal use */ + capa->max_queues = ODP_CONFIG_QUEUES - NUM_INTERNAL_QUEUES; + capa->max_ordered_locks = sched_fn->max_ordered_locks(); + capa->max_sched_groups = sched_fn->num_grps(); + capa->sched_prios = odp_schedule_num_prio(); + capa->plain.max_num = ODP_CONFIG_QUEUES - NUM_INTERNAL_QUEUES; + capa->plain.max_size = 0; + capa->sched.max_num = ODP_CONFIG_QUEUES - NUM_INTERNAL_QUEUES; + capa->sched.max_size = 0; + + return 0; +} + +static odp_queue_type_t queue_type(odp_queue_t handle) +{ + return qentry_from_int(queue_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; +} + +static odp_schedule_prio_t queue_sched_prio(odp_queue_t handle) +{ + return qentry_from_int(queue_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; +} + +static int queue_lock_count(odp_queue_t handle) +{ + queue_entry_t *queue = qentry_from_int(queue_from_ext(handle)); + + return queue->s.param.sched.sync == ODP_SCHED_SYNC_ORDERED ? + (int)queue->s.param.sched.lock_count : -1; +} + +static odp_queue_t queue_create(const char *name, + const odp_queue_param_t *param) +{ + int queue_idx; + odp_queue_t handle = ODP_QUEUE_INVALID; + queue_entry_t *queue; + odp_queue_param_t default_param; + + if (param == NULL) { + odp_queue_param_init(&default_param); + param = &default_param; + } + + for (queue_idx = 0; queue_idx < ODP_CONFIG_QUEUES; queue_idx++) { + queue = &queue_tbl->queue[queue_idx]; + + if (queue->s.status != QUEUE_STATUS_FREE) + continue; + + LOCK(&queue->s.lock); + if (queue->s.status == QUEUE_STATUS_FREE) { + if (queue_init(queue, name, param)) { + UNLOCK(&queue->s.lock); + return handle; + } + queue->s.status = QUEUE_STATUS_READY; + handle = queue->s.handle; + UNLOCK(&queue->s.lock); + break; + } + UNLOCK(&queue->s.lock); + } + return handle; +} + +static int queue_destroy(odp_queue_t handle) +{ + queue_entry_t *queue; + sched_elem_t *q; + + if (handle == ODP_QUEUE_INVALID) + return -1; + + queue = qentry_from_int(queue_from_ext(handle)); + LOCK(&queue->s.lock); + if (queue->s.status != QUEUE_STATUS_READY) { + UNLOCK(&queue->s.lock); + return -1; + } + q = &queue->s.sched_elem; + +#ifdef CONFIG_QSCHST_LOCK + LOCK(&q->qschlock); +#endif + if (_odp_queue_disable_enq(q)) { + /* Producer side not empty */ +#ifdef CONFIG_QSCHST_LOCK + UNLOCK(&q->qschlock); +#endif + UNLOCK(&queue->s.lock); + return -1; + } + /* Enqueue is now disabled */ + if (q->cons_read != q->cons_write) { + /* Consumer side is not empty + * Roll back previous change, enable enqueue again. + */ + uint32_t size; + + size = q->prod_mask + 1; + __atomic_fetch_sub(&q->prod_write, size, __ATOMIC_RELAXED); +#ifdef CONFIG_QSCHST_LOCK + UNLOCK(&q->qschlock); +#endif + UNLOCK(&queue->s.lock); + return -1; + } +#ifdef CONFIG_QSCHST_LOCK + UNLOCK(&q->qschlock); +#endif + /* Producer and consumer sides empty, enqueue disabled + * Now wait until schedq state is empty and no outstanding tickets + */ + while (__atomic_load_n(&q->qschst.numevts, __ATOMIC_RELAXED) != 0 || + __atomic_load_n(&q->qschst.cur_ticket, __ATOMIC_RELAXED) != + __atomic_load_n(&q->qschst.nxt_ticket, __ATOMIC_RELAXED)) { + sevl(); + while (wfe() && monitor32((uint32_t *)&q->qschst.numevts, + __ATOMIC_RELAXED) != 0) + doze(); + } + + /* Adjust the spread factor for the queues in the schedule group */ + if (queue->s.type == ODP_QUEUE_TYPE_SCHED) + sched_group_xcount_dec(queue->s.param.sched.group, + queue->s.param.sched.prio); + + _odp_ishm_pool_free(queue_shm_pool, q->prod_ring); + + if (queue->s.param.sched.sync == ODP_SCHED_SYNC_ORDERED) { + if (rwin_free(queue_shm_pool, q->rwin) < 0) { + ODP_ERR("Failed to free reorder window\n"); + UNLOCK(&queue->s.lock); + return -1; + } + } + queue->s.status = QUEUE_STATUS_FREE; + UNLOCK(&queue->s.lock); + return 0; +} + +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; + odp_mb_full(); + return 0; +} + +static void *queue_context(odp_queue_t handle) +{ + return qentry_from_int(queue_from_ext(handle))->s.param.context; +} + +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_tbl->queue[i]; + + if (queue->s.status == QUEUE_STATUS_FREE || + queue->s.status == QUEUE_STATUS_DESTROYED) + continue; + + LOCK(&queue->s.lock); + if (strcmp(name, queue->s.name) == 0) { + /* found it */ + UNLOCK(&queue->s.lock); + return queue->s.handle; + } + UNLOCK(&queue->s.lock); + } + + return ODP_QUEUE_INVALID; +} + +#ifndef CONFIG_QSCHST_LOCK +static inline int _odp_queue_enq(sched_elem_t *q, + odp_buffer_hdr_t *buf_hdr[], + int num) +{ + ringidx_t old_read; + ringidx_t old_write; + ringidx_t new_write; + int actual; + uint32_t mask; + odp_buffer_hdr_t **ring; + + mask = q->prod_mask; + ring = q->prod_ring; + + /* Load producer ring state (read & write index) */ + old_write = __atomic_load_n(&q->prod_write, __ATOMIC_RELAXED); + do { + /* Consumer does store-release prod_read, we need + * load-acquire. + */ + old_read = __atomic_load_n(&q->prod_read, __ATOMIC_ACQUIRE); + + actual = MIN(num, (int)((mask + 1) - (old_write - old_read))); + if (odp_unlikely(actual <= 0)) + return 0; + + new_write = old_write + actual; + } while (!__atomic_compare_exchange_n(&q->prod_write, + &old_write, /* Updated on failure */ + new_write, + true, + __ATOMIC_RELAXED, + __ATOMIC_RELAXED)); + +#ifdef CONFIG_SPLIT_PRODCONS + __builtin_prefetch(&q->cons_write, 0, 0); +#endif + /* Store our event(s) in the ring */ + do { + ring[old_write & mask] = *buf_hdr++; + } while (++old_write != new_write); + old_write -= actual; + +#ifdef CONFIG_SPLIT_PRODCONS + __builtin_prefetch(&q->node, 1, 0); +#endif + /* Wait for our turn to signal consumers */ + if (odp_unlikely(__atomic_load_n(&q->cons_write, + __ATOMIC_RELAXED) != old_write)) { + sevl(); + while (wfe() && monitor32(&q->cons_write, + __ATOMIC_RELAXED) != old_write) + doze(); + } + + /* Signal consumers that events are available (release events) + * Enable other producers to continue + */ + /* Wait for writes (to ring slots) to complete */ + atomic_store_release(&q->cons_write, new_write, /*readonly=*/false); + + return actual; +} + +#else + +static inline int _odp_queue_enq_sp(sched_elem_t *q, + odp_buffer_hdr_t *buf_hdr[], + int num) +{ + ringidx_t old_read; + ringidx_t old_write; + ringidx_t new_write; + int actual; + uint32_t mask; + odp_buffer_hdr_t **ring; + + mask = q->prod_mask; + ring = q->prod_ring; + + /* Load producer ring state (read & write index) */ + old_write = q->prod_write; + /* Consumer does store-release prod_read, we need load-acquire */ + old_read = __atomic_load_n(&q->prod_read, __ATOMIC_ACQUIRE); + actual = MIN(num, (int)((mask + 1) - (old_write - old_read))); + if (odp_unlikely(actual <= 0)) + return 0; + + new_write = old_write + actual; + q->prod_write = new_write; + + /* Store our event(s) in the ring */ + do { + ring[old_write & mask] = *buf_hdr++; + } while (++old_write != new_write); + old_write -= actual; + +#ifdef CONFIG_SPLIT_PRODCONS + __builtin_prefetch(&q->node, 1, 0); +#endif + + /* Signal consumers that events are available (release events) + * Enable other producers to continue + */ +#ifdef CONFIG_QSCHST_LOCK + q->cons_write = new_write; +#else + atomic_store_release(&q->cons_write, new_write, /*readonly=*/false); +#endif + + return actual; +} +#endif + +static int _queue_enq_multi(queue_t handle, odp_buffer_hdr_t *buf_hdr[], + int num) +{ + int actual; + queue_entry_t *queue; + sched_scalable_thread_state_t *ts; + + queue = qentry_from_int(handle); + ts = sched_ts; + if (ts && odp_unlikely(ts->out_of_order)) { + actual = rctx_save(queue, buf_hdr, num); + return actual; + } + +#ifdef CONFIG_QSCHST_LOCK + LOCK(&queue->s.sched_elem.qschlock); + actual = _odp_queue_enq_sp(&queue->s.sched_elem, buf_hdr, num); +#else + actual = _odp_queue_enq(&queue->s.sched_elem, buf_hdr, num); +#endif + + if (odp_likely(queue->s.sched_elem.schedq != NULL && actual != 0)) { + /* Perform scheduler related updates. */ +#ifdef CONFIG_QSCHST_LOCK + sched_update_enq_sp(&queue->s.sched_elem, actual); +#else + sched_update_enq(&queue->s.sched_elem, actual); +#endif + } + +#ifdef CONFIG_QSCHST_LOCK + UNLOCK(&queue->s.sched_elem.qschlock); +#endif + return actual; +} + +static int _queue_enq(queue_t handle, odp_buffer_hdr_t *buf_hdr) +{ + return odp_likely( + _queue_enq_multi(handle, &buf_hdr, 1) == 1) ? 0 : -1; +} + +static int queue_enq_multi(odp_queue_t handle, const odp_event_t ev[], int num) +{ + odp_buffer_hdr_t *buf_hdr[QUEUE_MULTI_MAX]; + queue_entry_t *queue; + int i; + + if (num > QUEUE_MULTI_MAX) + num = QUEUE_MULTI_MAX; + + queue = qentry_from_int(queue_from_ext(handle)); + + for (i = 0; i < num; i++) + buf_hdr[i] = buf_hdl_to_hdr(odp_buffer_from_event(ev[i])); + + return queue->s.enqueue_multi(qentry_to_int(queue), buf_hdr, num); +} + +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)); + buf_hdr = buf_hdl_to_hdr(odp_buffer_from_event(ev)); + + return queue->s.enqueue(qentry_to_int(queue), buf_hdr); +} + +/* Single-consumer dequeue. */ +int _odp_queue_deq_sc(sched_elem_t *q, odp_event_t *evp, int num) +{ + int actual; + ringidx_t old_read; + ringidx_t old_write; + ringidx_t new_read; + uint32_t mask; + odp_buffer_hdr_t **ring; + + /* Load consumer ring state (read & write index). */ + old_read = q->cons_read; + /* Producer does store-release cons_write, we need load-acquire */ + old_write = __atomic_load_n(&q->cons_write, __ATOMIC_ACQUIRE); + actual = MIN(num, (int)(old_write - old_read)); + + if (odp_unlikely(actual <= 0)) + return 0; + +#ifdef CONFIG_SPLIT_PRODCONS + __builtin_prefetch(&q->node, 1, 0); +#endif + new_read = old_read + actual; + q->cons_read = new_read; + + mask = q->cons_mask; + ring = q->cons_ring; + do { + *evp++ = odp_buffer_to_event( + buf_from_buf_hdr(ring[old_read & mask])); + } while (++old_read != new_read); + + /* Signal producers that empty slots are available + * (release ring slots). Enable other consumers to continue. + */ +#ifdef CONFIG_QSCHST_LOCK + q->prod_read = new_read; +#else + /* Wait for loads (from ring slots) to complete. */ + atomic_store_release(&q->prod_read, new_read, /*readonly=*/true); +#endif + return actual; +} + +inline int _odp_queue_deq(sched_elem_t *q, odp_buffer_hdr_t *buf_hdr[], int num) +{ + int actual; + ringidx_t old_read; + ringidx_t old_write; + ringidx_t new_read; + uint32_t mask; + odp_buffer_hdr_t **ring; + odp_buffer_hdr_t **p_buf_hdr; + + mask = q->cons_mask; + ring = q->cons_ring; + + /* Load consumer ring state (read & write index) */ + old_read = __atomic_load_n(&q->cons_read, __ATOMIC_RELAXED); + do { + /* Need __atomic_load to avoid compiler reordering + * Producer does store-release cons_write, we need + * load-acquire. + */ + old_write = __atomic_load_n(&q->cons_write, __ATOMIC_ACQUIRE); + /* Prefetch ring buffer array */ + __builtin_prefetch(&q->cons_ring[old_read & mask], 0, 0); + + actual = MIN(num, (int)(old_write - old_read)); + if (odp_unlikely(actual <= 0)) + return 0; + + /* Attempt to free ring slot(s) */ + new_read = old_read + actual; + } while (!__atomic_compare_exchange_n(&q->cons_read, + &old_read, /* Updated on failure */ + new_read, + true, + __ATOMIC_RELAXED, + __ATOMIC_RELAXED)); +#ifdef CONFIG_SPLIT_PRODCONS + __builtin_prefetch(&q->prod_read, 0, 0); +#endif + p_buf_hdr = buf_hdr; + do { + *p_buf_hdr++ = ring[old_read & mask]; + } while (++old_read != new_read); + old_read -= actual; + +#ifdef CONFIG_SPLIT_PRODCONS + __builtin_prefetch(&q->node, 1, 0); +#endif + /* Wait for our turn to signal producers */ + if (odp_unlikely(__atomic_load_n(&q->prod_read, __ATOMIC_RELAXED) != + old_read)) { + sevl(); + while (wfe() && monitor32(&q->prod_read, + __ATOMIC_RELAXED) != old_read) + doze(); + } + + /* Signal producers that empty slots are available + * (release ring slots) + * Enable other consumers to continue + */ + /* Wait for loads (from ring slots) to complete */ + atomic_store_release(&q->prod_read, new_read, /*readonly=*/true); + + return actual; +} + +inline int _odp_queue_deq_mc(sched_elem_t *q, odp_event_t *evp, int num) +{ + int ret, evt_idx; + odp_buffer_hdr_t *hdr_tbl[QUEUE_MULTI_MAX]; + + if (num > QUEUE_MULTI_MAX) + num = QUEUE_MULTI_MAX; + + ret = _odp_queue_deq(q, hdr_tbl, num); + if (odp_likely(ret != 0)) { + for (evt_idx = 0; evt_idx < num; evt_idx++) + evp[evt_idx] = odp_buffer_to_event( + buf_from_buf_hdr(hdr_tbl[evt_idx])); + } + + return ret; +} + +static int _queue_deq_multi(queue_t handle, odp_buffer_hdr_t *buf_hdr[], + int num) +{ + sched_elem_t *q; + queue_entry_t *queue; + + queue = qentry_from_int(handle); + q = &queue->s.sched_elem; + return _odp_queue_deq(q, buf_hdr, num); +} + +static odp_buffer_hdr_t *_queue_deq(queue_t handle) +{ + sched_elem_t *q; + odp_buffer_hdr_t *buf_hdr; + queue_entry_t *queue; + + queue = qentry_from_int(handle); + q = &queue->s.sched_elem; + if (_odp_queue_deq(q, &buf_hdr, 1) == 1) + return buf_hdr; + else + return NULL; +} + +static int queue_deq_multi(odp_queue_t handle, odp_event_t ev[], int num) +{ + queue_entry_t *queue; + + if (num > QUEUE_MULTI_MAX) + num = QUEUE_MULTI_MAX; + + queue = qentry_from_int(queue_from_ext(handle)); + return queue->s.dequeue_multi(qentry_to_int(queue), (odp_buffer_hdr_t **)ev, num); +} + +static odp_event_t queue_deq(odp_queue_t handle) +{ + queue_entry_t *queue; + + queue = qentry_from_int(queue_from_ext(handle)); + return (odp_event_t)queue->s.dequeue(qentry_to_int(queue)); +} + +static void queue_param_init(odp_queue_param_t *params) +{ + memset(params, 0, sizeof(odp_queue_param_t)); + params->type = ODP_QUEUE_TYPE_PLAIN; + params->enq_mode = ODP_QUEUE_OP_MT; + params->deq_mode = ODP_QUEUE_OP_MT; + params->sched.prio = ODP_SCHED_PRIO_DEFAULT; + params->sched.sync = ODP_SCHED_SYNC_PARALLEL; + params->sched.group = ODP_SCHED_GROUP_ALL; +} + +static int queue_info(odp_queue_t handle, odp_queue_info_t *info) +{ + uint32_t queue_id; + queue_entry_t *queue; + int status; + + if (odp_unlikely(info == NULL)) { + ODP_ERR("Unable to store info, NULL ptr given\n"); + return -1; + } + + queue_id = queue_to_id(handle); + + if (odp_unlikely(queue_id >= ODP_CONFIG_QUEUES)) { + ODP_ERR("Invalid queue handle:%" PRIu64 "\n", + odp_queue_to_u64(handle)); + return -1; + } + + queue = get_qentry(queue_id); + + LOCK(&queue->s.lock); + status = queue->s.status; + + if (odp_unlikely(status == QUEUE_STATUS_FREE || + status == QUEUE_STATUS_DESTROYED)) { + UNLOCK(&queue->s.lock); + ODP_ERR("Invalid queue status:%d\n", status); + return -1; + } + + info->name = queue->s.name; + info->param = queue->s.param; + + UNLOCK(&queue->s.lock); + + return 0; +} + +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) +{ + return qentry_from_int(handle)->s.pktout; +} + +static void queue_set_pktout(queue_t 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) +{ + return qentry_from_int(handle)->s.pktin; +} + +static void queue_set_pktin(queue_t 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, + queue_enq_fn_t enq, + queue_enq_multi_fn_t enq_multi, + queue_deq_fn_t deq, + queue_deq_multi_fn_t deq_multi) +{ + if (enq) + qentry_from_int(handle)->s.enqueue = enq; + + if (enq_multi) + qentry_from_int(handle)->s.enqueue_multi = enq_multi; + + if (deq) + qentry_from_int(handle)->s.dequeue = deq; + + if (deq_multi) + qentry_from_int(handle)->s.dequeue_multi = deq_multi; +} + +static queue_t 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)); +} + +static odp_queue_t queue_to_ext(queue_t handle) +{ + return qentry_from_int(handle)->s.handle; +} + +/* API functions */ +queue_api_t queue_scalable_api = { + .queue_create = queue_create, + .queue_destroy = queue_destroy, + .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, + .queue_deq_multi = queue_deq_multi, + .queue_type = queue_type, + .queue_sched_type = queue_sched_type, + .queue_sched_prio = queue_sched_prio, + .queue_sched_group = queue_sched_group, + .queue_lock_count = queue_lock_count, + .queue_to_u64 = queue_to_u64, + .queue_param_init = queue_param_init, + .queue_info = queue_info +}; + +/* Functions towards internal components */ +queue_fn_t queue_scalable_fn = { + .init_global = queue_init_global, + .term_global = queue_term_global, + .init_local = queue_init_local, + .term_local = queue_term_local, + .from_ext = queue_from_ext, + .to_ext = queue_to_ext, + .enq = _queue_enq, + .enq_multi = _queue_enq_multi, + .deq = _queue_deq, + .deq_multi = _queue_deq_multi, + .get_pktout = queue_get_pktout, + .set_pktout = queue_set_pktout, + .get_pktin = queue_get_pktin, + .set_pktin = queue_set_pktin, + .set_enq_deq_fn = queue_set_enq_deq_func +}; diff --cc platform/linux-generic/odp_schedule_scalable.c index a289a7d7,00000000..765326e8 mode 100644,000000..100644 --- a/platform/linux-generic/odp_schedule_scalable.c +++ b/platform/linux-generic/odp_schedule_scalable.c @@@ -1,1980 -1,0 +1,1981 @@@ +/* Copyright (c) 2017, ARM Limited. All rights reserved. + * + * Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ ++#include <config.h> + +#include <odp/api/align.h> +#include <odp/api/atomic.h> +#include <odp/api/cpu.h> +#include <odp/api/hints.h> +#include <odp/api/schedule.h> +#include <odp/api/shared_memory.h> +#include <odp/api/sync.h> +#include <odp/api/thread.h> +#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 <_ishm_internal.h> +#include <_ishmpool_internal.h> + +#include <odp_align_internal.h> +#include <odp_buffer_inlines.h> +#include <odp_llqueue.h> +#include <odp_queue_scalable_internal.h> +#include <odp_schedule_if.h> +#include <odp_bitset.h> +#include <odp_packet_io_internal.h> + +#include <limits.h> +#include <stdbool.h> +#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 TAG_EMPTY 0U +#define TAG_USED (1U << 15) +#define TAG_BUSY (1U << 31) +#define PKTIO_QUEUE_2_TAG(p, q) ((p) << 16 | (q) | TAG_USED) +#define TAG_2_PKTIO(t) (((t) >> 16) & 0x7FFF) +#define TAG_2_QUEUE(t) ((t) & 0x7FFF) +#define TAG_IS_READY(t) (((t) & (TAG_USED | TAG_BUSY)) == TAG_USED) +#define PKTIN_MAX (ODP_CONFIG_PKTIO_ENTRIES * PKTIO_MAX_QUEUES) +#define MAXTHREADS ATOM_BITSET_SIZE + +static _odp_ishm_pool_t *sched_shm_pool; +static uint32_t pktin_num; +static uint32_t pktin_hi; +static uint16_t pktin_count[ODP_CONFIG_PKTIO_ENTRIES]; +static uint32_t pktin_tags[PKTIN_MAX] ODP_ALIGNED_CACHE; + +#define __atomic_fetch_max(var, v, mo) do { \ + /* Evalulate 'v' once */ \ + __typeof__(v) tmp_v = (v); \ + __typeof__(*var) old_var = \ + __atomic_load_n((var), __ATOMIC_RELAXED); \ + while (tmp_v > old_var) { \ + /* Attempt to store 'v' in '*var' */ \ + if (__atomic_compare_exchange_n((var), &old_var, \ + tmp_v, true, (mo), \ + (mo))) \ + break; \ + } \ + /* v <= old_var, nothing to do */ \ + } while (0) + +ODP_STATIC_ASSERT(ODP_SCHED_PRIO_LOWEST == (ODP_SCHED_PRIO_NUM - 1), + "lowest_prio_does_not_match_with_num_prios"); + +ODP_STATIC_ASSERT((ODP_SCHED_PRIO_NORMAL > 0) && + (ODP_SCHED_PRIO_NORMAL < (ODP_SCHED_PRIO_NUM - 1)), + "normal_prio_is_not_between_highest_and_lowest"); + +ODP_STATIC_ASSERT(CHECK_IS_POWER2(ODP_CONFIG_QUEUES), + "Number_of_queues_is_not_power_of_two"); + +/* + * Scheduler group related variables. + */ +/* Currently used scheduler groups */ +static sched_group_mask_t sg_free; +static sched_group_t *sg_vec[MAX_SCHED_GROUP]; +/* Group lock for MT-safe APIs */ +static odp_spinlock_t sched_grp_lock; + +#define SCHED_GROUP_JOIN 0 +#define SCHED_GROUP_LEAVE 1 + +/* + * Per thread state + */ +static sched_scalable_thread_state_t thread_state[MAXTHREADS]; +__thread sched_scalable_thread_state_t *sched_ts; + +/* + * Forward declarations. + */ +static int thread_state_init(int tidx) +{ + sched_scalable_thread_state_t *ts; + uint32_t i; + + ODP_ASSERT(tidx < MAXTHREADS); + ts = &thread_state[tidx]; + ts->atomq = NULL; + ts->rctx = NULL; + ts->pause = false; + ts->out_of_order = false; + ts->tidx = tidx; + ts->dequeued = 0; + ts->pktin_next = 0; + ts->pktin_poll_cnts = 0; + ts->ticket = TICKET_INVALID; + ts->priv_rvec_free = 0; + ts->rvec_free = (1ULL << TS_RVEC_SIZE) - 1; + ts->num_schedq = 0; + ts->sg_sem = 1; /* Start with sched group semaphore changed */ + memset(ts->sg_actual, 0, sizeof(ts->sg_actual)); + for (i = 0; i < TS_RVEC_SIZE; i++) { + ts->rvec[i].rvec_free = &ts->rvec_free; + ts->rvec[i].idx = i; + } + sched_ts = ts; + + return 0; +} + +static void insert_schedq_in_list(sched_scalable_thread_state_t *ts, + sched_queue_t *schedq) +{ + /* Find slot for schedq */ + for (uint32_t i = 0; i < ts->num_schedq; i++) { + /* Lower value is higher priority and closer to start of list */ + if (schedq->prio <= ts->schedq_list[i]->prio) { + /* This is the slot! */ + sched_queue_t *tmp; + + tmp = ts->schedq_list[i]; + ts->schedq_list[i] = schedq; + schedq = tmp; + /* Continue the insertion procedure with the + * new schedq. + */ + } + } + if (ts->num_schedq == SCHEDQ_PER_THREAD) + ODP_ABORT("Too many schedqs\n"); + ts->schedq_list[ts->num_schedq++] = schedq; +} + +static void remove_schedq_from_list(sched_scalable_thread_state_t *ts, + sched_queue_t *schedq) +{ + /* Find schedq */ + for (uint32_t i = 0; i < ts->num_schedq; i++) + if (ts->schedq_list[i] == schedq) { + /* Move remaining schedqs */ + for (uint32_t j = i + 1; j < ts->num_schedq; j++) + ts->schedq_list[j - 1] = ts->schedq_list[j]; + ts->num_schedq--; + return; + } + ODP_ABORT("Cannot find schedq\n"); +} + +/******************************************************************************* + * Scheduler queues + ******************************************************************************/ +#ifndef odp_container_of +#define odp_container_of(pointer, type, member) \ + ((type *)(void *)(((char *)pointer) - offsetof(type, member))) +#endif + +static inline void schedq_init(sched_queue_t *schedq, uint32_t prio) +{ + llqueue_init(&schedq->llq); + schedq->prio = prio; +} + +static inline sched_elem_t *schedq_peek(sched_queue_t *schedq) +{ + struct llnode *ptr; + + ptr = llq_head(&schedq->llq); + return odp_container_of(ptr, sched_elem_t, node); +} + +static inline odp_bool_t schedq_cond_pop(sched_queue_t *schedq, + sched_elem_t *elem) +{ + return llq_dequeue_cond(&schedq->llq, &elem->node); +} + +static inline void schedq_push(sched_queue_t *schedq, sched_elem_t *elem) +{ + llq_enqueue(&schedq->llq, &elem->node); +} + +static inline odp_bool_t schedq_cond_rotate(sched_queue_t *schedq, + sched_elem_t *elem) +{ + return llq_cond_rotate(&schedq->llq, &elem->node); +} + +static inline bool schedq_elem_on_queue(sched_elem_t *elem) +{ + return llq_on_queue(&elem->node); +} + +/******************************************************************************* + * Shared metadata btwn scheduler and queue + ******************************************************************************/ + +void sched_update_enq(sched_elem_t *q, uint32_t actual) +{ + qschedstate_t oss, nss; + uint32_t ticket; + + oss = q->qschst; + /* Update event counter, optionally taking a ticket. */ + do { + ticket = TICKET_INVALID; + nss = oss; + nss.numevts += actual; + if (odp_unlikely(oss.numevts <= 0 && nss.numevts > 0)) + /* E -> NE transition */ + if (q->qschst_type != ODP_SCHED_SYNC_ATOMIC || + oss.cur_ticket == oss.nxt_ticket) + /* Parallel or ordered queues: always take + * ticket. + * Atomic queue: only take ticket if one is + * immediately available. + * Otherwise ticket already taken => queue + * processed by some thread. + */ + ticket = nss.nxt_ticket++; + /* Else queue already was non-empty. */ + /* Attempt to update numevts counter and optionally take ticket. */ + } while (!__atomic_compare_exchange( + &q->qschst, &oss, &nss, + true, __ATOMIC_RELAXED, __ATOMIC_RELAXED)); + + if (odp_unlikely(ticket != TICKET_INVALID)) { + /* Wait for our turn to update schedq. */ + if (odp_unlikely( + __atomic_load_n(&q->qschst.cur_ticket, + __ATOMIC_ACQUIRE) != ticket)) { + sevl(); + while (wfe() && + monitor8(&q->qschst.cur_ticket, + __ATOMIC_ACQUIRE) != ticket) + doze(); + } + /* Enqueue at end of scheduler queue */ + /* We are here because of empty-to-non-empty transition + * This means queue must be pushed to schedq if possible + * but we can't do that if it already is on the schedq + */ + if (odp_likely(!schedq_elem_on_queue(q) && + q->pop_deficit == 0)) { + /* Queue not already on schedq and no pop deficit means + * we can push queue to schedq */ + schedq_push(q->schedq, q); + } else { + /* Missed push => cancels one missed pop */ + q->pop_deficit--; + } + atomic_store_release(&q->qschst.cur_ticket, ticket + 1, + /*readonly=*/false); + } + /* Else queue was not empty or atomic queue already busy. */ +} + +void sched_update_enq_sp(sched_elem_t *q, uint32_t actual) +{ + qschedstate_t oss, nss; + uint32_t ticket; + + oss = q->qschst; + /* Update event counter, optionally taking a ticket. */ + ticket = TICKET_INVALID; + nss = oss; + nss.numevts += actual; + if (odp_unlikely(oss.numevts <= 0 && nss.numevts > 0)) { + /* E -> NE transition */ + if (q->qschst_type != ODP_SCHED_SYNC_ATOMIC || + oss.cur_ticket == oss.nxt_ticket) { + /* Parallel or ordered queues: always take + * ticket. + * Atomic queue: only take ticket if one is + * immediately available. Otherwise ticket already + * taken => queue owned/processed by some thread + */ + ticket = nss.nxt_ticket++; + } + } + /* Else queue already was non-empty. */ + /* Attempt to update numevts counter and optionally take ticket. */ + q->qschst = nss; + + if (odp_unlikely(ticket != TICKET_INVALID)) { + /* Enqueue at end of scheduler queue */ + /* We are here because of empty-to-non-empty transition + * This means queue must be pushed to schedq if possible + * but we can't do that if it already is on the schedq + */ + if (odp_likely(!schedq_elem_on_queue(q) && + q->pop_deficit == 0)) { + /* Queue not already on schedq and no pop deficit means + * we can push queue to schedq */ + schedq_push(q->schedq, q); + } else { + /* Missed push => cancels one missed pop */ + q->pop_deficit--; + } + q->qschst.cur_ticket = ticket + 1; + } + /* Else queue was not empty or atomic queue already busy. */ +} + +#ifndef CONFIG_QSCHST_LOCK +/* The scheduler is the only entity that performs the dequeue from a queue. */ +static void +sched_update_deq(sched_elem_t *q, + uint32_t actual, + bool atomic) __attribute__((always_inline)); +static inline void +sched_update_deq(sched_elem_t *q, + uint32_t actual, bool atomic) +{ + qschedstate_t oss, nss; + uint32_t ticket; + + if (atomic) { + bool pushed = false; + + /* We own this atomic queue, only we can dequeue from it and + * thus decrease numevts. Other threads may enqueue and thus + * increase numevts. + * This means that numevts can't unexpectedly become 0 and + * invalidate a push operation already performed + */ + oss = q->qschst; + do { + ODP_ASSERT(oss.cur_ticket == sched_ts->ticket); + nss = oss; + nss.numevts -= actual; + if (nss.numevts > 0 && !pushed) { + schedq_push(q->schedq, q); + pushed = true; + } + /* Attempt to release ticket expecting our view of + * numevts to be correct + * Unfortunately nxt_ticket will also be included in + * the CAS operation + */ + nss.cur_ticket = sched_ts->ticket + 1; + } while (odp_unlikely(!__atomic_compare_exchange( + &q->qschst, + &oss, &nss, + true, + __ATOMIC_RELEASE, + __ATOMIC_RELAXED))); + return; + } + + oss = q->qschst; + do { + ticket = TICKET_INVALID; + nss = oss; + nss.numevts -= actual; + nss.wrr_budget -= actual; + if ((oss.numevts > 0 && nss.numevts <= 0) || + oss.wrr_budget <= actual) { + /* If we have emptied parallel/ordered queue or + * exchausted its WRR budget, we need a ticket + * for a later pop. + */ + ticket = nss.nxt_ticket++; + /* Reset wrr_budget as we might also push the + * queue to the schedq. + */ + nss.wrr_budget = CONFIG_WRR_WEIGHT; + } + /* Attempt to update numevts and optionally take ticket. */ + } while (!__atomic_compare_exchange( + &q->qschst, &oss, &nss, + true, __ATOMIC_RELAXED, __ATOMIC_RELAXED)); + + if (odp_unlikely(ticket != TICKET_INVALID)) { + ODP_ASSERT(q->qschst_type != ODP_SCHED_SYNC_ATOMIC); + /* Wait for our turn to update schedq. */ + if (odp_unlikely( + __atomic_load_n(&q->qschst.cur_ticket, + __ATOMIC_ACQUIRE) != ticket)) { + sevl(); + while (wfe() && + monitor8(&q->qschst.cur_ticket, + __ATOMIC_ACQUIRE) != ticket) + doze(); + } + /* We are here because of non-empty-to-empty transition or + * WRR budget exhausted + * This means the queue must be popped from the schedq, now or + * later + * If there was no NE->E transition but instead the WRR budget + * was exhausted, the queue needs to be moved (popped and + * pushed) to the tail of the schedq + */ + if (oss.numevts > 0 && nss.numevts <= 0) { + /* NE->E transition, need to pop */ + if (!schedq_elem_on_queue(q) || + !schedq_cond_pop(q->schedq, q)) { + /* Queue not at head, failed to dequeue + * Missed a pop. + */ + q->pop_deficit++; + } + } else { + /* WRR budget exhausted + * Need to move queue to tail of schedq if possible + */ + if (odp_likely(schedq_elem_on_queue(q))) { + /* Queue is on schedq, try to move it to + * the tail + */ + (void)schedq_cond_rotate(q->schedq, q); + } + /* Else queue not on schedq or not at head of schedq + * No pop => no push + */ + } + atomic_store_release(&q->qschst.cur_ticket, ticket + 1, + /*readonly=*/false); + } +} +#endif + +#ifdef CONFIG_QSCHST_LOCK +static void +sched_update_deq_sc(sched_elem_t *q, + uint32_t actual, + bool atomic) __attribute__((always_inline)); +static inline void +sched_update_deq_sc(sched_elem_t *q, + uint32_t actual, bool atomic) +{ + qschedstate_t oss, nss; + uint32_t ticket; + + if (atomic) { + ODP_ASSERT(q->qschst.cur_ticket == sched_ts->ticket); + ODP_ASSERT(q->qschst.cur_ticket != q->qschst.nxt_ticket); + q->qschst.numevts -= actual; + q->qschst.cur_ticket = sched_ts->ticket + 1; + if (q->qschst.numevts > 0) + schedq_push(q->schedq, q); + return; + } + + oss = q->qschst; + ticket = TICKET_INVALID; + nss = oss; + nss.numevts -= actual; + nss.wrr_budget -= actual; + if ((oss.numevts > 0 && nss.numevts <= 0) || oss.wrr_budget <= actual) { + /* If we emptied the queue or + * if we have served the maximum number of events + * then we need a ticket for a later pop. + */ + ticket = nss.nxt_ticket++; + /* Also reset wrr_budget as we might also push the + * queue to the schedq. + */ + nss.wrr_budget = CONFIG_WRR_WEIGHT; + } + q->qschst = nss; + + if (ticket != TICKET_INVALID) { + if (oss.numevts > 0 && nss.numevts <= 0) { + /* NE->E transition, need to pop */ + if (!schedq_elem_on_queue(q) || + !schedq_cond_pop(q->schedq, q)) { + /* Queue not at head, failed to dequeue. + * Missed a pop. + */ + q->pop_deficit++; + } + } else { + /* WRR budget exhausted + * Need to move queue to tail of schedq if possible + */ + if (odp_likely(schedq_elem_on_queue(q))) { + /* Queue is on schedq, try to move it to + * the tail + */ + (void)schedq_cond_rotate(q->schedq, q); + } + /* Else queue not on schedq or not at head of schedq + * No pop => no push + */ + } + q->qschst.cur_ticket = ticket + 1; + } +} +#endif + +static inline void sched_update_popd_sc(sched_elem_t *elem) +{ + if (elem->pop_deficit != 0 && + schedq_elem_on_queue(elem) && + schedq_cond_pop(elem->schedq, elem)) + elem->pop_deficit--; +} + +#ifndef CONFIG_QSCHST_LOCK +static inline void sched_update_popd(sched_elem_t *elem) +{ + uint32_t ticket = __atomic_fetch_add(&elem->qschst.nxt_ticket, + 1, + __ATOMIC_RELAXED); + if (odp_unlikely(__atomic_load_n(&elem->qschst.cur_ticket, + __ATOMIC_ACQUIRE) != ticket)) { + sevl(); + while (wfe() && monitor8(&elem->qschst.cur_ticket, + __ATOMIC_ACQUIRE) != ticket) + doze(); + } + sched_update_popd_sc(elem); + atomic_store_release(&elem->qschst.cur_ticket, ticket + 1, + /*readonly=*/false); +} +#endif + +sched_queue_t *schedq_from_sched_group(odp_schedule_group_t grp, uint32_t prio) +{ + uint32_t sgi; + sched_group_t *sg; + uint32_t x; + + ODP_ASSERT(grp >= 0 && grp < (odp_schedule_group_t)MAX_SCHED_GROUP); + ODP_ASSERT((sg_free & (1ULL << grp)) == 0); + ODP_ASSERT(prio < ODP_SCHED_PRIO_NUM); + + sgi = grp; + sg = sg_vec[sgi]; + + /* Use xcount to spread queues over the xfactor schedq's + * per priority. + */ + x = __atomic_fetch_add(&sg->xcount[prio], 1, __ATOMIC_RELAXED); + if (x == 0) { + /* First ODP queue for this priority + * Notify all threads in sg->thr_wanted that they + * should join. + */ + sched_group_mask_t thrds = sg->thr_wanted; + + while (!bitset_is_null(thrds)) { + uint32_t thr; + + thr = bitset_ffs(thrds) - 1; + thrds = bitset_clr(thrds, thr); + /* Notify the thread about membership in this + * group/priority. + */ + atom_bitset_set(&thread_state[thr].sg_wanted[prio], + sgi, __ATOMIC_RELEASE); + __atomic_store_n(&thread_state[thr].sg_sem, 1, + __ATOMIC_RELEASE); + } + } + return &sg->schedq[prio * sg->xfactor + x % sg->xfactor]; +} + +void sched_group_xcount_dec(odp_schedule_group_t grp, uint32_t prio) +{ + uint32_t sgi; + sched_group_t *sg; + uint32_t x; + + ODP_ASSERT(grp >= 0 && grp < (odp_schedule_group_t)MAX_SCHED_GROUP); + ODP_ASSERT((sg_free & (1ULL << grp)) == 0); + ODP_ASSERT(prio < ODP_SCHED_PRIO_NUM); + + sgi = grp; + sg = sg_vec[sgi]; + x = __atomic_sub_fetch(&sg->xcount[prio], 1, __ATOMIC_RELAXED); + + if (x == 0) { + /* Last ODP queue for this priority + * Notify all threads in sg->thr_wanted that they + * should leave. + */ + sched_group_mask_t thrds = sg->thr_wanted; + + while (!bitset_is_null(thrds)) { + uint32_t thr; + + thr = bitset_ffs(thrds) - 1; + thrds = bitset_clr(thrds, thr); + /* Notify the thread about membership in this + * group/priority. + */ + atom_bitset_clr(&thread_state[thr].sg_wanted[prio], + sgi, __ATOMIC_RELEASE); + __atomic_store_n(&thread_state[thr].sg_sem, 1, + __ATOMIC_RELEASE); + } + } +} + +static void update_sg_membership(sched_scalable_thread_state_t *ts) +{ + uint32_t p; + sched_group_mask_t sg_wanted; + sched_group_mask_t added; + sched_group_mask_t removed; + uint32_t sgi; + sched_group_t *sg; + uint32_t x; + + for (p = 0; p < ODP_SCHED_PRIO_NUM; p++) { + sg_wanted = atom_bitset_load(&ts->sg_wanted[p], + __ATOMIC_ACQUIRE); + if (!bitset_is_eql(ts->sg_actual[p], sg_wanted)) { + /* Our sched_group membership has changed */ + added = bitset_andn(sg_wanted, ts->sg_actual[p]); + while (!bitset_is_null(added)) { + sgi = bitset_ffs(added) - 1; + sg = sg_vec[sgi]; + for (x = 0; x < sg->xfactor; x++) { + /* Include our thread index to shift + * (rotate) the order of schedq's + */ + insert_schedq_in_list + (ts, + &sg->schedq[p * sg->xfactor + + (x + ts->tidx) % sg->xfactor]); + } + atom_bitset_set(&sg->thr_actual[p], ts->tidx, + __ATOMIC_RELAXED); + added = bitset_clr(added, sgi); + } + removed = bitset_andn(ts->sg_actual[p], sg_wanted); + while (!bitset_is_null(removed)) { + sgi = bitset_ffs(removed) - 1; + sg = sg_vec[sgi]; + for (x = 0; x < sg->xfactor; x++) { + remove_schedq_from_list + (ts, + &sg->schedq[p * + sg->xfactor + x]); + } + atom_bitset_clr(&sg->thr_actual[p], ts->tidx, + __ATOMIC_RELAXED); + removed = bitset_clr(removed, sgi); + } + ts->sg_actual[p] = sg_wanted; + } + } +} + +/******************************************************************************* + * Scheduler + ******************************************************************************/ + +static inline void _schedule_release_atomic(sched_scalable_thread_state_t *ts) +{ +#ifdef CONFIG_QSCHST_LOCK + sched_update_deq_sc(ts->atomq, ts->dequeued, true); + ODP_ASSERT(ts->atomq->qschst.cur_ticket != ts->ticket); + ODP_ASSERT(ts->atomq->qschst.cur_ticket == + ts->atomq->qschst.nxt_ticket); +#else + sched_update_deq(ts->atomq, ts->dequeued, true); +#endif + ts->atomq = NULL; + ts->ticket = TICKET_INVALID; +} + +static inline void _schedule_release_ordered(sched_scalable_thread_state_t *ts) +{ + ts->out_of_order = false; + rctx_release(ts->rctx); + ts->rctx = NULL; +} + +static void pktin_poll(sched_scalable_thread_state_t *ts) +{ + uint32_t i, tag, hi, npolls = 0; + int pktio_index, queue_index; + + hi = __atomic_load_n(&pktin_hi, __ATOMIC_RELAXED); + if (hi == 0) + return; + + for (i = ts->pktin_next; npolls != hi; i = (i + 1) % hi, npolls++) { + tag = __atomic_load_n(&pktin_tags[i], __ATOMIC_RELAXED); + if (!TAG_IS_READY(tag)) + continue; + if (!__atomic_compare_exchange_n(&pktin_tags[i], &tag, + tag | TAG_BUSY, + true, + __ATOMIC_ACQUIRE, + __ATOMIC_RELAXED)) + continue; + /* Tag grabbed */ + pktio_index = TAG_2_PKTIO(tag); + queue_index = TAG_2_QUEUE(tag); + if (odp_unlikely(sched_cb_pktin_poll(pktio_index, + 1, &queue_index))) { + /* Pktio stopped or closed + * Remove tag from pktin_tags + */ + __atomic_store_n(&pktin_tags[i], + TAG_EMPTY, __ATOMIC_RELAXED); + __atomic_fetch_sub(&pktin_num, + 1, __ATOMIC_RELEASE); + /* Call stop_finalize when all queues + * of the pktio have been removed + */ + if (__atomic_sub_fetch(&pktin_count[pktio_index], 1, + __ATOMIC_RELAXED) == 0) + sched_cb_pktio_stop_finalize(pktio_index); + } else { + /* We don't know whether any packets were found and enqueued + * Write back original tag value to release pktin queue + */ + __atomic_store_n(&pktin_tags[i], tag, __ATOMIC_RELAXED); + /* Do not iterate through all pktin queues every time */ + if ((ts->pktin_poll_cnts & 0xf) != 0) + break; + } + } + ODP_ASSERT(i < hi); + ts->pktin_poll_cnts++; + ts->pktin_next = i; +} + +static int _schedule(odp_queue_t *from, odp_event_t ev[], int num_evts) +{ + sched_scalable_thread_state_t *ts; + sched_elem_t *atomq; + int num; + uint32_t i; + + ts = sched_ts; + atomq = ts->atomq; + + /* Once an atomic queue has been scheduled to a thread, it will stay + * on that thread until empty or 'rotated' by WRR + */ + if (atomq != NULL) { + ODP_ASSERT(ts->ticket != TICKET_INVALID); +#ifdef CONFIG_QSCHST_LOCK + LOCK(&atomq->qschlock); +#endif +dequeue_atomic: + ODP_ASSERT(ts->ticket == atomq->qschst.cur_ticket); + ODP_ASSERT(ts->ticket != atomq->qschst.nxt_ticket); + /* Atomic queues can be dequeued without lock since this thread + * has the only reference to the atomic queue being processed. + */ + if (ts->dequeued < atomq->qschst.wrr_budget) { + num = _odp_queue_deq_sc(atomq, ev, num_evts); + if (odp_likely(num != 0)) { +#ifdef CONFIG_QSCHST_LOCK + UNLOCK(&atomq->qschlock); +#endif + ts->dequeued += num; + /* Allow this thread to continue to 'own' this + * atomic queue until all events have been + * processed and the thread re-invokes the + * scheduler. + */ + if (from) + *from = queue_get_handle( + (queue_entry_t *)atomq); + return num; + } + } + /* Atomic queue was empty or interrupted by WRR, release it. */ + _schedule_release_atomic(ts); +#ifdef CONFIG_QSCHST_LOCK + UNLOCK(&atomq->qschlock); +#endif + } + + /* Release any previous reorder context. */ + if (ts->rctx != NULL) + _schedule_release_ordered(ts); + + /* Check for and perform any scheduler group updates. */ + if (odp_unlikely(__atomic_load_n(&ts->sg_sem, __ATOMIC_RELAXED) != 0)) { + (void)__atomic_load_n(&ts->sg_sem, __ATOMIC_ACQUIRE); + ts->sg_sem = 0; + update_sg_membership(ts); + } + + /* Scan our schedq list from beginning to end */ + for (i = 0; i < ts->num_schedq; i++) { + sched_queue_t *schedq = ts->schedq_list[i]; + sched_elem_t *elem; +restart_same: + elem = schedq_peek(schedq); + if (odp_unlikely(elem == NULL)) { + /* Schedq empty, look at next one. */ + continue; + } + + if (elem->cons_type == ODP_SCHED_SYNC_ATOMIC) { + /* Dequeue element only if it is still at head + * of schedq. + */ + if (odp_unlikely(!schedq_cond_pop(schedq, elem))) { + /* Queue not at head of schedq anymore, some + * other thread popped it. + */ + goto restart_same; + } + ts->atomq = elem; + atomq = elem; + ts->dequeued = 0; +#ifdef CONFIG_QSCHST_LOCK + LOCK(&atomq->qschlock); + ts->ticket = atomq->qschst.nxt_ticket++; + ODP_ASSERT(atomq->qschst.cur_ticket == ts->ticket); +#else + /* Dequeued atomic queue from the schedq, only we + * can process it and any qschst updates are our + * responsibility. + */ + /* The ticket taken below will signal producers */ + ts->ticket = __atomic_fetch_add( + &atomq->qschst.nxt_ticket, 1, __ATOMIC_RELAXED); + while (__atomic_load_n( + &atomq->qschst.cur_ticket, + __ATOMIC_ACQUIRE) != ts->ticket) { + /* No need to use WFE, spinning here seems + * very infrequent. + */ + odp_cpu_pause(); + } +#endif + goto dequeue_atomic; + } else if (elem->cons_type == ODP_SCHED_SYNC_PARALLEL) { +#ifdef CONFIG_QSCHST_LOCK + LOCK(&elem->qschlock); + num = _odp_queue_deq_sc(elem, ev, num_evts); + if (odp_likely(num != 0)) { + sched_update_deq_sc(elem, num, false); + UNLOCK(&elem->qschlock); + if (from) + *from = + queue_get_handle((queue_entry_t *)elem); + return num; + } + UNLOCK(&elem->qschlock); +#else + num = _odp_queue_deq_mc(elem, ev, num_evts); + if (odp_likely(num != 0)) { + sched_update_deq(elem, num, false); + if (from) + *from = + queue_get_handle((queue_entry_t *)elem); + return num; + } +#endif + } else if (elem->cons_type == ODP_SCHED_SYNC_ORDERED) { + reorder_window_t *rwin; + reorder_context_t *rctx; + uint32_t sn; + uint32_t idx; + + /* The ordered queue has a reorder window so requires + * order restoration. We must use a reorder context to + * collect all outgoing events. Ensure there is at least + * one available reorder context. + */ + if (odp_unlikely(bitset_is_null(ts->priv_rvec_free))) { + ts->priv_rvec_free = atom_bitset_xchg( + &ts->rvec_free, 0, + __ATOMIC_RELAXED); + if (odp_unlikely(bitset_is_null( + ts->priv_rvec_free))) { + /* No free reorder contexts for + * this thread. Look at next schedq, + * hope we find non-ordered queue. + */ + continue; + } + } + /* rwin_reserve and odp_queue_deq must be atomic or + * there will be a potential race condition. + * Allocate a slot in the reorder window. + */ + rwin = queue_get_rwin((queue_entry_t *)elem); + ODP_ASSERT(rwin != NULL); + if (odp_unlikely(!rwin_reserve(rwin, &sn))) { + /* Reorder window full */ + /* Look at next schedq, find other queue */ + continue; + } + /* Wait for our turn to dequeue */ + if (odp_unlikely(__atomic_load_n(&rwin->turn, + __ATOMIC_ACQUIRE) + != sn)) { + sevl(); + while (wfe() && + monitor32(&rwin->turn, __ATOMIC_ACQUIRE) + != sn) + doze(); + } +#ifdef CONFIG_QSCHST_LOCK + LOCK(&elem->qschlock); +#endif + num = _odp_queue_deq_sc(elem, ev, num_evts); + /* Wait for prod_read write in _odp_queue_dequeue_sc() + * to complete before we signal the next consumer + */ + atomic_store_release(&rwin->turn, sn + 1, + /*readonly=*/false); + /* Find and initialise an unused reorder context. */ + idx = bitset_ffs(ts->priv_rvec_free) - 1; + ts->priv_rvec_free = + bitset_clr(ts->priv_rvec_free, idx); + rctx = &ts->rvec[idx]; + /* Need to initialise reorder context or we can't + * release it later. + */ + rctx_init(rctx, idx, rwin, sn); + + /* Was dequeue successful? */ + if (odp_likely(num != 0)) { + /* Perform scheduler related updates */ +#ifdef CONFIG_QSCHST_LOCK + sched_update_deq_sc(elem, num, + /*atomic=*/false); + UNLOCK(&elem->qschlock); +#else + sched_update_deq(elem, num, /*atomic=*/false); +#endif + + /* Are we in-order or out-of-order? */ + ts->out_of_order = sn != rwin->hc.head; + + ts->rctx = rctx; + if (from) + *from = queue_get_handle( + (queue_entry_t *)elem); + return num; + } +#ifdef CONFIG_QSCHST_LOCK + UNLOCK(&elem->qschlock); +#endif + /* Since a slot was reserved in the reorder window, + * the reorder context needs to be released and + * inserted into the reorder window. + */ + rctx_release(rctx); + ODP_ASSERT(ts->rctx == NULL); + } + /* Dequeue from parallel/ordered queue failed + * Check if we have a queue at the head of the schedq that needs + * to be popped + */ + if (odp_unlikely(__atomic_load_n(&elem->pop_deficit, + __ATOMIC_RELAXED) != 0)) { +#ifdef CONFIG_QSCHST_LOCK + LOCK(&elem->qschlock); + sched_update_popd_sc(elem); + UNLOCK(&elem->qschlock); +#else + sched_update_popd(elem); +#endif + } + } + + pktin_poll(ts); + return 0; +} + +/******************************************************************************/ + +static void schedule_order_lock(unsigned lock_index) +{ + struct reorder_context *rctx = sched_ts->rctx; + + if (odp_unlikely(rctx == NULL || + rctx->rwin == NULL || + lock_index >= rctx->rwin->lock_count)) { + ODP_ERR("Invalid call to odp_schedule_order_lock\n"); + return; + } + if (odp_unlikely(__atomic_load_n(&rctx->rwin->olock[lock_index], + __ATOMIC_ACQUIRE) != rctx->sn)) { + sevl(); + while (wfe() && + monitor32(&rctx->rwin->olock[lock_index], + __ATOMIC_ACQUIRE) != rctx->sn) + doze(); + } +} + +static void schedule_order_unlock(unsigned lock_index) +{ + struct reorder_context *rctx; + + rctx = sched_ts->rctx; + if (odp_unlikely(rctx == NULL || + rctx->rwin == NULL || + lock_index >= rctx->rwin->lock_count || + rctx->rwin->olock[lock_index] != rctx->sn)) { + ODP_ERR("Invalid call to odp_schedule_order_unlock\n"); + return; + } + atomic_store_release(&rctx->rwin->olock[lock_index], + rctx->sn + 1, + /*readonly=*/false); + rctx->olock_flags |= 1U << lock_index; +} + +static void schedule_release_atomic(void) +{ + sched_scalable_thread_state_t *ts; + + ts = sched_ts; + if (odp_likely(ts->atomq != NULL)) { +#ifdef CONFIG_QSCHST_LOCK + sched_elem_t *atomq; + + atomq = ts->atomq; + LOCK(&atomq->qschlock); +#endif + _schedule_release_atomic(ts); +#ifdef CONFIG_QSCHST_LOCK + UNLOCK(&atomq->qschlock); +#endif + } +} + +static void schedule_release_ordered(void) +{ + sched_scalable_thread_state_t *ts; + + ts = sched_ts; + if (ts->rctx != NULL) + _schedule_release_ordered(ts); +} + +static int schedule_multi(odp_queue_t *from, uint64_t wait, odp_event_t ev[], + int num) +{ + sched_scalable_thread_state_t *ts; + int n; + odp_time_t start; + odp_time_t delta; + odp_time_t deadline; + + ts = sched_ts; + if (odp_unlikely(ts->pause)) { + if (ts->atomq != NULL) { +#ifdef CONFIG_QSCHST_LOCK + sched_elem_t *atomq; + + atomq = ts->atomq; + LOCK(&atomq->qschlock); +#endif + _schedule_release_atomic(ts); +#ifdef CONFIG_QSCHST_LOCK + UNLOCK(&atomq->qschlock); +#endif + } else if (ts->rctx != NULL) { + _schedule_release_ordered(ts); + } + return 0; + } + + if (wait == ODP_SCHED_NO_WAIT) + return _schedule(from, ev, num); + + if (wait == ODP_SCHED_WAIT) { + for (;;) { + n = _schedule(from, ev, num); + if (odp_likely(n > 0)) + return n; + } + } + + start = odp_time_local(); + + n = _schedule(from, ev, num); + if (odp_likely(n > 0)) + return n; + + delta = odp_time_local_from_ns(wait); + deadline = odp_time_sum(start, delta); + + while (odp_time_cmp(deadline, odp_time_local()) > 0) { + n = _schedule(from, ev, num); + if (odp_likely(n > 0)) + return n; + } + + return 0; +} + +static odp_event_t schedule(odp_queue_t *from, uint64_t wait) +{ + odp_event_t ev = ODP_EVENT_INVALID; + const int num = 1; + sched_scalable_thread_state_t *ts; + int n; + odp_time_t start; + odp_time_t delta; + odp_time_t deadline; + + ts = sched_ts; + if (odp_unlikely(ts->pause)) { + if (ts->atomq != NULL) { +#ifdef CONFIG_QSCHST_LOCK + sched_elem_t *atomq; + + atomq = ts->atomq; + LOCK(&atomq->qschlock); +#endif + _schedule_release_atomic(ts); +#ifdef CONFIG_QSCHST_LOCK + UNLOCK(&atomq->qschlock); +#endif + } else if (ts->rctx != NULL) { + _schedule_release_ordered(ts); + } + return ev; + } + + if (wait == ODP_SCHED_NO_WAIT) { + (void)_schedule(from, &ev, num); + return ev; + } + + if (wait == ODP_SCHED_WAIT) { + for (;;) { + n = _schedule(from, &ev, num); + if (odp_likely(n > 0)) + return ev; + } + } + + start = odp_time_local(); + + n = _schedule(from, &ev, num); + if (odp_likely(n > 0)) + return ev; + + delta = odp_time_local_from_ns(wait); + deadline = odp_time_sum(start, delta); + + while (odp_time_cmp(deadline, odp_time_local()) > 0) { + n = _schedule(from, &ev, num); + if (odp_likely(n > 0)) + return ev; + } + + return ev; +} + +static void schedule_pause(void) +{ + sched_ts->pause = true; +} + +static void schedule_resume(void) +{ + sched_ts->pause = false; +} + +static uint64_t schedule_wait_time(uint64_t ns) +{ + return ns; +} + +static int schedule_num_prio(void) +{ + return ODP_SCHED_PRIO_NUM; +} + +static int schedule_group_update(sched_group_t *sg, + uint32_t sgi, + const odp_thrmask_t *mask, + int join_leave) +{ + int thr; + uint32_t p; + + /* Internal function, do not validate inputs */ + + /* Notify relevant threads about the change */ + thr = odp_thrmask_first(mask); + while (0 <= thr) { + /* Add thread to scheduler group's wanted thread mask */ + if (join_leave == SCHED_GROUP_JOIN) + atom_bitset_set(&sg->thr_wanted, thr, __ATOMIC_RELAXED); + else + atom_bitset_clr(&sg->thr_wanted, thr, __ATOMIC_RELAXED); + for (p = 0; p < ODP_SCHED_PRIO_NUM; p++) { + if (sg->xcount[p] != 0) { + /* This priority level has ODP queues + * Notify the thread about membership in + * this group/priority + */ + if (join_leave == SCHED_GROUP_JOIN) + atom_bitset_set( + &thread_state[thr].sg_wanted[p], + sgi, + __ATOMIC_RELEASE); + else + atom_bitset_clr( + &thread_state[thr].sg_wanted[p], + sgi, + __ATOMIC_RELEASE); + __atomic_store_n(&thread_state[thr].sg_sem, + 1, + __ATOMIC_RELEASE); + } + } + thr = odp_thrmask_next(mask, thr); + } + + return 0; +} + +static int _schedule_group_thrmask(sched_group_t *sg, odp_thrmask_t *mask) +{ + bitset_t bs; + uint32_t bit; + + /* Internal function, do not validate inputs */ + + odp_thrmask_zero(mask); + bs = sg->thr_wanted; + while (!bitset_is_null(bs)) { + bit = bitset_ffs(bs) - 1; + bs = bitset_clr(bs, bit); + odp_thrmask_set(mask, bit); + } + + return 0; +} + +static odp_schedule_group_t schedule_group_create(const char *name, + const odp_thrmask_t *mask) +{ + uint32_t sgi; + sched_group_mask_t free; + uint32_t xfactor; + sched_group_t *sg; + uint32_t p; + uint32_t x; + uint32_t size; + + /* Validate inputs */ + if (mask == NULL) + ODP_ABORT("mask is NULL\n"); + + odp_spinlock_lock(&sched_grp_lock); + + /* Allocate a scheduler group */ + free = atom_bitset_load(&sg_free, __ATOMIC_RELAXED); + do { + /* All sched_groups in use */ + if (bitset_is_null(free)) + goto no_free_sched_group; + + sgi = bitset_ffs(free) - 1; + /* All sched_groups in use */ + if (sgi >= MAX_SCHED_GROUP) + goto no_free_sched_group; + } while (!atom_bitset_cmpxchg(&sg_free, + &free, + bitset_clr(free, sgi), + true, + __ATOMIC_ACQUIRE, + __ATOMIC_ACQUIRE)); + + /* Compute xfactor (spread factor) from the number of threads + * present in the thread mask. Preferable this would be an + * explicit parameter. + */ + xfactor = odp_thrmask_count(mask); + if (xfactor < 1) + xfactor = CONFIG_DEFAULT_XFACTOR; + + size = sizeof(sched_group_t) + + (ODP_SCHED_PRIO_NUM * xfactor - 1) * sizeof(sched_queue_t); + sg = (sched_group_t *)shm_pool_alloc_align(sched_shm_pool, size); + if (sg == NULL) + goto shm_pool_alloc_failed; + + strncpy(sg->name, name ? name : "", ODP_SCHED_GROUP_NAME_LEN - 1); + sg_vec[sgi] = sg; + memset(sg->thr_actual, 0, sizeof(sg->thr_actual)); + sg->thr_wanted = bitset_null(); + sg->xfactor = xfactor; + for (p = 0; p < ODP_SCHED_PRIO_NUM; p++) { + sg->xcount[p] = 0; + for (x = 0; x < xfactor; x++) + schedq_init(&sg->schedq[p * xfactor + x], p); + } + if (odp_thrmask_count(mask) != 0) + schedule_group_update(sg, sgi, mask, SCHED_GROUP_JOIN); + + odp_spinlock_unlock(&sched_grp_lock); + + return (odp_schedule_group_t)(sgi); + +shm_pool_alloc_failed: + /* Free the allocated group index */ + atom_bitset_set(&sg_free, sgi, __ATOMIC_RELAXED); + +no_free_sched_group: + odp_spinlock_unlock(&sched_grp_lock); + + return ODP_SCHED_GROUP_INVALID; +} + +static int schedule_group_destroy(odp_schedule_group_t group) +{ + uint32_t sgi; + sched_group_t *sg; + uint32_t p; + int ret = 0; + + /* Validate inputs */ + if (group < 0 || group >= (odp_schedule_group_t)MAX_SCHED_GROUP) { + ret = -1; + goto invalid_group; + } + + if (sched_ts && + odp_unlikely(__atomic_load_n(&sched_ts->sg_sem, + __ATOMIC_RELAXED) != 0)) { + (void)__atomic_load_n(&sched_ts->sg_sem, + __ATOMIC_ACQUIRE); + sched_ts->sg_sem = 0; + update_sg_membership(sched_ts); + } + odp_spinlock_lock(&sched_grp_lock); + + sgi = (uint32_t)group; + if (bitset_is_set(sg_free, sgi)) { + ret = -1; + goto group_not_found; + } + + sg = sg_vec[sgi]; + /* First ensure all threads have processed group_join/group_leave + * requests. + */ + for (p = 0; p < ODP_SCHED_PRIO_NUM; p++) { + if (sg->xcount[p] != 0) { + bitset_t wanted = atom_bitset_load( + &sg->thr_wanted, __ATOMIC_RELAXED); + + sevl(); + while (wfe() && + !bitset_is_eql(wanted, + bitset_monitor(&sg->thr_actual[p], + __ATOMIC_RELAXED))) + doze(); + } + /* Else ignore because no ODP queues on this prio */ + } + + /* Check if all threads/queues have left the group */ + for (p = 0; p < ODP_SCHED_PRIO_NUM; p++) { + if (!bitset_is_null(sg->thr_actual[p])) { + ODP_ERR("Group has threads\n"); + ret = -1; + goto thrd_q_present_in_group; + } + if (sg->xcount[p] != 0) { + ODP_ERR("Group has queues\n"); + ret = -1; + goto thrd_q_present_in_group; + } + } + + _odp_ishm_pool_free(sched_shm_pool, sg); + sg_vec[sgi] = NULL; + atom_bitset_set(&sg_free, sgi, __ATOMIC_RELEASE); + + odp_spinlock_unlock(&sched_grp_lock); + + return ret; + +thrd_q_present_in_group: + +group_not_found: + odp_spinlock_unlock(&sched_grp_lock); + +invalid_group: + + return ret; +} + +static odp_schedule_group_t schedule_group_lookup(const char *name) +{ + uint32_t sgi; + odp_schedule_group_t group; + + /* Validate inputs */ + if (name == NULL) + ODP_ABORT("name or mask is NULL\n"); + + group = ODP_SCHED_GROUP_INVALID; + + odp_spinlock_lock(&sched_grp_lock); + + /* Scan through the schedule group array */ + for (sgi = 0; sgi < MAX_SCHED_GROUP; sgi++) { + if ((sg_vec[sgi] != NULL) && + (strncmp(name, sg_vec[sgi]->name, + ODP_SCHED_GROUP_NAME_LEN) == 0)) { + group = (odp_schedule_group_t)sgi; + break; + } + } + + odp_spinlock_unlock(&sched_grp_lock); + + return group; +} + +static int schedule_group_join(odp_schedule_group_t group, + const odp_thrmask_t *mask) +{ + uint32_t sgi; + sched_group_t *sg; + int ret; + + /* Validate inputs */ + if (group < 0 || group >= ((odp_schedule_group_t)MAX_SCHED_GROUP)) + return -1; + + if (mask == NULL) + ODP_ABORT("name or mask is NULL\n"); + + odp_spinlock_lock(&sched_grp_lock); + + sgi = (uint32_t)group; + if (bitset_is_set(sg_free, sgi)) { + odp_spinlock_unlock(&sched_grp_lock); + return -1; + } + + sg = sg_vec[sgi]; + ret = schedule_group_update(sg, sgi, mask, SCHED_GROUP_JOIN); + + odp_spinlock_unlock(&sched_grp_lock); + + return ret; +} + +static int schedule_group_leave(odp_schedule_group_t group, + const odp_thrmask_t *mask) +{ + uint32_t sgi; + sched_group_t *sg; + int ret = 0; + + /* Validate inputs */ + if (group < 0 || group >= (odp_schedule_group_t)MAX_SCHED_GROUP) { + ret = -1; + goto invalid_group; + } + + if (mask == NULL) + ODP_ABORT("name or mask is NULL\n"); + + odp_spinlock_lock(&sched_grp_lock); + + sgi = (uint32_t)group; + if (bitset_is_set(sg_free, sgi)) { + ret = -1; + goto group_not_found; + } + + sg = sg_vec[sgi]; + + ret = schedule_group_update(sg, sgi, mask, SCHED_GROUP_LEAVE); + + odp_spinlock_unlock(&sched_grp_lock); + + return ret; + +group_not_found: + odp_spinlock_unlock(&sched_grp_lock); + +invalid_group: + return ret; +} + +static int schedule_group_thrmask(odp_schedule_group_t group, + odp_thrmask_t *mask) +{ + uint32_t sgi; + sched_group_t *sg; + int ret = 0; + + /* Validate inputs */ + if (group < 0 || group >= ((odp_schedule_group_t)MAX_SCHED_GROUP)) { + ret = -1; + goto invalid_group; + } + + if (mask == NULL) + ODP_ABORT("name or mask is NULL\n"); + + odp_spinlock_lock(&sched_grp_lock); + + sgi = (uint32_t)group; + if (bitset_is_set(sg_free, sgi)) { + ret = -1; + goto group_not_found; + } + + sg = sg_vec[sgi]; + ret = _schedule_group_thrmask(sg, mask); + + odp_spinlock_unlock(&sched_grp_lock); + + return ret; + +group_not_found: + odp_spinlock_unlock(&sched_grp_lock); + +invalid_group: + return ret; +} + +static int schedule_group_info(odp_schedule_group_t group, + odp_schedule_group_info_t *info) +{ + uint32_t sgi; + sched_group_t *sg; + int ret = 0; + + /* Validate inputs */ + if (group < 0 || group >= ((odp_schedule_group_t)MAX_SCHED_GROUP)) { + ret = -1; + goto invalid_group; + } + + if (info == NULL) + ODP_ABORT("name or mask is NULL\n"); + + odp_spinlock_lock(&sched_grp_lock); + + sgi = (uint32_t)group; + if (bitset_is_set(sg_free, sgi)) { + ret = -1; + goto group_not_found; + } + + sg = sg_vec[sgi]; + + ret = _schedule_group_thrmask(sg, &info->thrmask); + + info->name = sg->name; + + odp_spinlock_unlock(&sched_grp_lock); + + return ret; + +group_not_found: + odp_spinlock_unlock(&sched_grp_lock); + +invalid_group: + return ret; +} + +static int schedule_init_global(void) +{ + odp_thrmask_t mask; + odp_schedule_group_t tmp_all; + odp_schedule_group_t tmp_wrkr; + odp_schedule_group_t tmp_ctrl; + uint32_t bits; + uint32_t pool_size; + uint64_t min_alloc; + uint64_t max_alloc; + + /* Attach to the pool if it exists */ + sched_shm_pool = _odp_ishm_pool_lookup("sched_shm_pool"); + if (sched_shm_pool == NULL) { + /* Add storage required for sched groups. Assume worst case + * xfactor of MAXTHREADS. + */ + pool_size = (sizeof(sched_group_t) + + (ODP_SCHED_PRIO_NUM * MAXTHREADS - 1) * + sizeof(sched_queue_t)) * MAX_SCHED_GROUP; + /* Choose min_alloc and max_alloc such that slab allocator + * is selected. + */ + min_alloc = sizeof(sched_group_t) + + (ODP_SCHED_PRIO_NUM * MAXTHREADS - 1) * + sizeof(sched_queue_t); + max_alloc = min_alloc; + sched_shm_pool = _odp_ishm_pool_create("sched_shm_pool", + pool_size, + min_alloc, max_alloc, + _ODP_ISHM_SINGLE_VA); + if (sched_shm_pool == NULL) { + ODP_ERR("Failed to allocate shared memory pool " + "for sched\n"); + goto failed_sched_shm_pool_create; + } + } + + odp_spinlock_init(&sched_grp_lock); + + bits = MAX_SCHED_GROUP; + if (MAX_SCHED_GROUP == sizeof(sg_free) * CHAR_BIT) + sg_free = ~0; + else + sg_free = (1 << bits) - 1; + + for (uint32_t i = 0; i < MAX_SCHED_GROUP; i++) + sg_vec[i] = NULL; + for (uint32_t i = 0; i < MAXTHREADS; i++) { + thread_state[i].sg_sem = 0; + for (uint32_t j = 0; j < ODP_SCHED_PRIO_NUM; j++) + thread_state[i].sg_wanted[j] = bitset_null(); + } + + /* Create sched groups for default GROUP_ALL, GROUP_WORKER and + * GROUP_CONTROL groups. + */ + odp_thrmask_zero(&mask); + tmp_all = odp_schedule_group_create("__group_all", &mask); + if (tmp_all != ODP_SCHED_GROUP_ALL) { + ODP_ERR("Could not create ODP_SCHED_GROUP_ALL()\n"); + goto failed_create_group_all; + } + + tmp_wrkr = odp_schedule_group_create("__group_worker", &mask); + if (tmp_wrkr != ODP_SCHED_GROUP_WORKER) { + ODP_ERR("Could not create ODP_SCHED_GROUP_WORKER()\n"); + goto failed_create_group_worker; + } + + tmp_ctrl = odp_schedule_group_create("__group_control", &mask); + if (tmp_ctrl != ODP_SCHED_GROUP_CONTROL) { + ODP_ERR("Could not create ODP_SCHED_GROUP_CONTROL()\n"); + goto failed_create_group_control; + } + + return 0; + +failed_create_group_control: + if (tmp_ctrl != ODP_SCHED_GROUP_INVALID) + odp_schedule_group_destroy(ODP_SCHED_GROUP_CONTROL); + +failed_create_group_worker: + if (tmp_wrkr != ODP_SCHED_GROUP_INVALID) + odp_schedule_group_destroy(ODP_SCHED_GROUP_WORKER); + +failed_create_group_all: + if (tmp_all != ODP_SCHED_GROUP_INVALID) + odp_schedule_group_destroy(ODP_SCHED_GROUP_ALL); + +failed_sched_shm_pool_create: + + return -1; +} + +static int schedule_term_global(void) +{ + /* Destroy sched groups for default GROUP_ALL, GROUP_WORKER and + * GROUP_CONTROL groups. + */ + if (odp_schedule_group_destroy(ODP_SCHED_GROUP_ALL) != 0) + ODP_ERR("Failed to destroy ODP_SCHED_GROUP_ALL\n"); + if (odp_schedule_group_destroy(ODP_SCHED_GROUP_WORKER) != 0) + ODP_ERR("Failed to destroy ODP_SCHED_GROUP_WORKER\n"); + if (odp_schedule_group_destroy(ODP_SCHED_GROUP_CONTROL) != 0) + ODP_ERR("Failed to destroy ODP_SCHED_GROUP_CONTROL\n"); + + _odp_ishm_pool_destroy(sched_shm_pool); + + return 0; +} + +static int schedule_init_local(void) +{ + int thr_id; + odp_thread_type_t thr_type; + odp_thrmask_t mask; + + thr_id = odp_thread_id(); + if (thread_state_init(thr_id)) + goto failed_to_init_ts; + + /* Add this thread to default schedule groups */ + thr_type = odp_thread_type(); + odp_thrmask_zero(&mask); + odp_thrmask_set(&mask, thr_id); + + if (odp_schedule_group_join(ODP_SCHED_GROUP_ALL, &mask) != 0) { + ODP_ERR("Failed to join ODP_SCHED_GROUP_ALL\n"); + goto failed_to_join_grp_all; + } + if (thr_type == ODP_THREAD_CONTROL) { + if (odp_schedule_group_join(ODP_SCHED_GROUP_CONTROL, + &mask) != 0) { + ODP_ERR("Failed to join ODP_SCHED_GROUP_CONTROL\n"); + goto failed_to_join_grp_ctrl; + } + } else { + if (odp_schedule_group_join(ODP_SCHED_GROUP_WORKER, + &mask) != 0) { + ODP_ERR("Failed to join ODP_SCHED_GROUP_WORKER\n"); + goto failed_to_join_grp_wrkr; + } + } + + return 0; + +failed_to_join_grp_wrkr: + +failed_to_join_grp_ctrl: + odp_schedule_group_leave(ODP_SCHED_GROUP_ALL, &mask); + +failed_to_join_grp_all: +failed_to_init_ts: + + return -1; +} + +static int schedule_term_local(void) +{ + int thr_id; + odp_thread_type_t thr_type; + odp_thrmask_t mask; + int rc = 0; + + /* Remove this thread from default schedule groups */ + thr_id = odp_thread_id(); + thr_type = odp_thread_type(); + odp_thrmask_zero(&mask); + odp_thrmask_set(&mask, thr_id); + + if (odp_schedule_group_leave(ODP_SCHED_GROUP_ALL, &mask) != 0) + ODP_ERR("Failed to leave ODP_SCHED_GROUP_ALL\n"); + if (thr_type == ODP_THREAD_CONTROL) { + if (odp_schedule_group_leave(ODP_SCHED_GROUP_CONTROL, + &mask) != 0) + ODP_ERR("Failed to leave ODP_SCHED_GROUP_CONTROL\n"); + } else { + if (odp_schedule_group_leave(ODP_SCHED_GROUP_WORKER, + &mask) != 0) + ODP_ERR("Failed to leave ODP_SCHED_GROUP_WORKER\n"); + } + + update_sg_membership(sched_ts); + + /* Check if the thread is still part of any groups */ + if (sched_ts->num_schedq != 0) { + ODP_ERR("Thread %d still part of scheduler group(s)\n", + sched_ts->tidx); + rc = -1; + } + + return rc; +} + +static void pktio_start(int pktio_index, int num_in_queue, int in_queue_idx[]) +{ + int i; + uint32_t old, tag, j; + + for (i = 0; i < num_in_queue; i++) { + /* Try to reserve a slot */ + if (__atomic_fetch_add(&pktin_num, + 1, __ATOMIC_RELAXED) >= PKTIN_MAX) { + __atomic_fetch_sub(&pktin_num, 1, __ATOMIC_RELAXED); + ODP_ABORT("Too many pktio in queues for scheduler\n"); + } + /* A slot has been reserved, now we need to find an empty one */ + for (j = 0; ; j = (j + 1) % PKTIN_MAX) { + if (__atomic_load_n(&pktin_tags[j], + __ATOMIC_RELAXED) != TAG_EMPTY) + /* Slot used, continue with next */ + continue; + /* Empty slot found */ + old = TAG_EMPTY; + tag = PKTIO_QUEUE_2_TAG(pktio_index, in_queue_idx[i]); + if (__atomic_compare_exchange_n(&pktin_tags[j], + &old, + tag, + true, + __ATOMIC_RELEASE, + __ATOMIC_RELAXED)) { + /* Success grabbing slot,update high + * watermark + */ + __atomic_fetch_max(&pktin_hi, + j + 1, __ATOMIC_RELAXED); + /* One more tag (queue) for this pktio + * instance + */ + __atomic_fetch_add(&pktin_count[pktio_index], + 1, __ATOMIC_RELAXED); + /* Continue with next RX queue */ + break; + } + /* Failed to grab slot */ + } + } +} + +static int num_grps(void) +{ + return MAX_SCHED_GROUP; +} + +/* + * Stubs for internal scheduler abstraction layer due to absence of NULL + * checking before calling the function pointer. + */ + +static int thr_add(odp_schedule_group_t group, int thr) +{ + /* This function is a schedule_init_local duplicate. */ + (void)group; + (void)thr; + return 0; +} + +static int thr_rem(odp_schedule_group_t group, int thr) +{ + /* This function is a schedule_term_local duplicate. */ + (void)group; + (void)thr; + return 0; +} + +static int init_queue(uint32_t queue_index, + const odp_schedule_param_t *sched_param) +{ + /* Not used in scalable scheduler. */ + (void)queue_index; + (void)sched_param; + return 0; +} + +static void destroy_queue(uint32_t queue_index) +{ + /* Not used in scalable scheduler. */ + (void)queue_index; +} + +static int sched_queue(uint32_t queue_index) +{ + /* Not used in scalable scheduler. */ + (void)queue_index; + return 0; +} + +static int ord_enq_multi(queue_t handle, void *buf_hdr[], int num, + int *ret) + +{ + queue_entry_t *queue; + sched_scalable_thread_state_t *ts; + int actual; + + ts = sched_ts; + if (ts && odp_unlikely(ts->out_of_order)) { + queue = qentry_from_int(handle); + actual = rctx_save(queue, (odp_buffer_hdr_t **)buf_hdr, num); + *ret = actual; + return 1; + } + return 0; +} + +static void schedule_prefetch(int num) +{ + (void)num; +} + +/* Wait until we are in-order (when processing an ordered queue) + * Note: this function may be called also when processing other queue types + */ +static void order_lock(void) +{ + sched_scalable_thread_state_t *ts; + reorder_window_t *rwin; + uint32_t sn; + + ts = sched_ts; + if (odp_unlikely(ts->out_of_order)) { + /* We are processing ordered queue and are currently + * out-of-order. + * We are in-order when our reorder window slot number (sn) + * equals the head of the reorder window. + */ + ODP_ASSERT(ts->rctx != NULL); + rwin = ts->rctx->rwin; + sn = ts->rctx->sn; + sevl(); + /* Use acquire ordering to be on the safe side even if + * this isn't an acquire/release situation (aka lock). + */ + while (wfe() && + monitor32(&rwin->hc.head, __ATOMIC_ACQUIRE) != sn) + doze(); + } +} + +/* This function is unnecessary. + * The next thread becomes in-order when we release our reorder context + * (i.e. when odp_schedule() is called again. + */ +static void order_unlock(void) +{ +} + +static unsigned schedule_max_ordered_locks(void) +{ + return CONFIG_QUEUE_MAX_ORD_LOCKS; +} + +const schedule_fn_t schedule_scalable_fn = { + .pktio_start = pktio_start, + .thr_add = thr_add, + .thr_rem = thr_rem, + .num_grps = num_grps, + .init_queue = init_queue, + .destroy_queue = destroy_queue, + .sched_queue = sched_queue, + .ord_enq_multi = ord_enq_multi, + .init_global = schedule_init_global, + .term_global = schedule_term_global, + .init_local = schedule_init_local, + .term_local = schedule_term_local, + .order_lock = order_lock, + .order_unlock = order_unlock, + .max_ordered_locks = schedule_max_ordered_locks, +}; + +const schedule_api_t schedule_scalable_api = { + .schedule_wait_time = schedule_wait_time, + .schedule = schedule, + .schedule_multi = schedule_multi, + .schedule_pause = schedule_pause, + .schedule_resume = schedule_resume, + .schedule_release_atomic = schedule_release_atomic, + .schedule_release_ordered = schedule_release_ordered, + .schedule_prefetch = schedule_prefetch, + .schedule_num_prio = schedule_num_prio, + .schedule_group_create = schedule_group_create, + .schedule_group_destroy = schedule_group_destroy, + .schedule_group_lookup = schedule_group_lookup, + .schedule_group_join = schedule_group_join, + .schedule_group_leave = schedule_group_leave, + .schedule_group_thrmask = schedule_group_thrmask, + .schedule_group_info = schedule_group_info, + .schedule_order_lock = schedule_order_lock, + .schedule_order_unlock = schedule_order_unlock, +}; diff --cc platform/linux-generic/odp_schedule_scalable_ordered.c index e4468a90,00000000..80ff2490 mode 100644,000000..100644 --- a/platform/linux-generic/odp_schedule_scalable_ordered.c +++ b/platform/linux-generic/odp_schedule_scalable_ordered.c @@@ -1,346 -1,0 +1,347 @@@ +/* Copyright (c) 2017, ARM Limited. All rights reserved. + * + * Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ ++#include <config.h> + +#include <odp/api/shared_memory.h> +#include <odp_queue_scalable_internal.h> +#include <odp_schedule_if.h> +#include <odp_bitset.h> + +#include <string.h> + +extern __thread sched_scalable_thread_state_t *sched_ts; + +reorder_window_t *rwin_alloc(_odp_ishm_pool_t *pool, unsigned lock_count) +{ + reorder_window_t *rwin; + uint32_t i; + + rwin = (reorder_window_t *) + shm_pool_alloc_align(pool, sizeof(reorder_window_t)); + if (rwin == NULL) + return NULL; + + rwin->hc.head = 0; + rwin->hc.chgi = 0; + rwin->winmask = RWIN_SIZE - 1; + rwin->tail = 0; + rwin->turn = 0; + rwin->lock_count = (uint16_t)lock_count; + memset(rwin->olock, 0, sizeof(rwin->olock)); + for (i = 0; i < RWIN_SIZE; i++) + rwin->ring[i] = NULL; + + return rwin; +} + +int rwin_free(_odp_ishm_pool_t *pool, reorder_window_t *rwin) +{ + return _odp_ishm_pool_free(pool, rwin); +} + +bool rwin_reserve(reorder_window_t *rwin, uint32_t *sn) +{ + uint32_t head; + uint32_t oldt; + uint32_t newt; + uint32_t winmask; + + /* Read head and tail separately */ + oldt = rwin->tail; + winmask = rwin->winmask; + do { + /* Need __atomic_load to avoid compiler reordering */ + head = __atomic_load_n(&rwin->hc.head, __ATOMIC_RELAXED); + if (odp_unlikely(oldt - head >= winmask)) + return false; + + newt = oldt + 1; + } while (!__atomic_compare_exchange(&rwin->tail, + &oldt, + &newt, + true, + __ATOMIC_RELAXED, + __ATOMIC_RELAXED)); + *sn = oldt; + + return true; +} + +static void rwin_insert(reorder_window_t *rwin, + reorder_context_t *rctx, + uint32_t sn, + void (*callback)(reorder_context_t *)) +{ + /* Initialise to silence scan-build */ + hc_t old = {0, 0}; + hc_t new; + uint32_t winmask; + + __atomic_load(&rwin->hc, &old, __ATOMIC_ACQUIRE); + winmask = rwin->winmask; + if (old.head != sn) { + /* We are out-of-order. Store context in reorder window, + * releasing its content. + */ + ODP_ASSERT(rwin->ring[sn & winmask] == NULL); + atomic_store_release(&rwin->ring[sn & winmask], + rctx, + /*readonly=*/false); + rctx = NULL; + do { + hc_t new; + + new.head = old.head; + new.chgi = old.chgi + 1; /* Changed value */ + /* Update head & chgi, fail if any has changed */ + if (__atomic_compare_exchange(&rwin->hc, + /* Updated on fail */ + &old, + &new, + true, + /* Rel our ring update */ + __ATOMIC_RELEASE, + __ATOMIC_ACQUIRE)) + /* CAS succeeded => head same (we are not + * in-order), chgi updated. + */ + return; + /* CAS failed => head and/or chgi changed. + * We might not be out-of-order anymore. + */ + } while (old.head != sn); + } + + /* old.head == sn => we are now in-order! */ + ODP_ASSERT(old.head == sn); + /* We are in-order so our responsibility to retire contexts */ + new.head = old.head; + new.chgi = old.chgi + 1; + + /* Retire our in-order context (if we still have it) */ + if (rctx != NULL) { + callback(rctx); + new.head++; + } + + /* Retire in-order contexts in the ring + * The first context might actually be ours (if we were originally + * out-of-order) + */ + do { + for (;;) { + rctx = __atomic_load_n(&rwin->ring[new.head & winmask], + __ATOMIC_ACQUIRE); + if (rctx == NULL) + break; + /* We are the only thread that are in-order + * (until head updated) so don't have to use + * atomic load-and-clear (exchange) + */ + rwin->ring[new.head & winmask] = NULL; + callback(rctx); + new.head++; + } + /* Update head&chgi, fail if chgi has changed (head cannot change) */ + } while (!__atomic_compare_exchange(&rwin->hc, + &old, /* Updated on failure */ + &new, + false, /* weak */ + __ATOMIC_RELEASE, /* Release our ring updates */ + __ATOMIC_ACQUIRE)); +} + +void rctx_init(reorder_context_t *rctx, uint16_t idx, + reorder_window_t *rwin, uint32_t sn) +{ + /* rctx->rvec_free and rctx->idx already initialised in + * thread_state_init function. + */ + ODP_ASSERT(rctx->idx == idx); + rctx->rwin = rwin; + rctx->sn = sn; + rctx->olock_flags = 0; + /* First => no next reorder context */ + rctx->next_idx = idx; + /* Where to store next event */ + rctx->cur_idx = idx; + rctx->numevts = 0; +} + +static inline void rctx_free(const reorder_context_t *rctx) +{ + const reorder_context_t *const base = &rctx[-(int)rctx->idx]; + const uint32_t first = rctx->idx; + uint32_t next_idx; + + next_idx = rctx->next_idx; + + ODP_ASSERT(rctx->rwin != NULL); + /* Set free bit */ + if (rctx->rvec_free == &sched_ts->rvec_free) + /* Since it is our own reorder context, we can instead + * perform a non-atomic and relaxed update on our private + * rvec_free. + */ + sched_ts->priv_rvec_free = + bitset_set(sched_ts->priv_rvec_free, rctx->idx); + else + atom_bitset_set(rctx->rvec_free, rctx->idx, __ATOMIC_RELEASE); + + /* Can't dereference rctx after the corresponding free bit is set */ + while (next_idx != first) { + rctx = &base[next_idx]; + next_idx = rctx->next_idx; + /* Set free bit */ + if (rctx->rvec_free == &sched_ts->rvec_free) + sched_ts->priv_rvec_free = + bitset_set(sched_ts->priv_rvec_free, rctx->idx); + else + atom_bitset_set(rctx->rvec_free, rctx->idx, + __ATOMIC_RELEASE); + } +} + +static inline void olock_unlock(const reorder_context_t *rctx, + reorder_window_t *rwin, + uint32_t lock_index) +{ + if ((rctx->olock_flags & (1U << lock_index)) == 0) { + /* Use relaxed ordering, we are not releasing any updates */ + rwin->olock[lock_index] = rctx->sn + 1; + } +} + +static void olock_release(const reorder_context_t *rctx) +{ + reorder_window_t *rwin; + int i; + + rwin = rctx->rwin; + + for (i = 0; i < rwin->lock_count; i++) + olock_unlock(rctx, rwin, i); +} + +static void blocking_enqueue(queue_entry_t *q, odp_buffer_hdr_t **evts, int num) +{ + int actual; + + /* Iterate until all events have been successfully enqueued */ + for (;;) { + /* Attempt to enqueue remaining events */ + actual = q->s.enqueue_multi(qentry_to_int(q), evts, num); + if (odp_unlikely(actual < 0)) + ODP_ERR("Failed to enqueue deferred events\n"); + /* Update for potential partial success */ + evts += actual; + num -= actual; + if (num == 0) + break; + /* Back-off to decrease load on the system */ + odp_cpu_pause(); + } +} + +static void rctx_retire(reorder_context_t *first) +{ + reorder_context_t *rctx; + queue_entry_t *q; + uint32_t i; + uint32_t j; + uint32_t num; + + rctx = first; + do { + /* Process all events in this reorder context */ + for (i = 0; i < rctx->numevts;) { + q = rctx->destq[i]; + /* Find index of next different destq */ + j = i + 1; + while (j < rctx->numevts && rctx->destq[j] == q) + j++; + num = j - i; + /* Blocking enqueue of events to this destq */ + blocking_enqueue(q, &rctx->events[i], num); + i += num; + } + /* Update rctx pointer to point to 'next_idx' element */ + rctx += (int)rctx->next_idx - (int)rctx->idx; + } while (rctx != first); + olock_release(first); + rctx_free(first); +} + +void rctx_release(reorder_context_t *rctx) +{ + /* Insert reorder context into reorder window, potentially calling the + * rctx_retire function for all pending reorder_contexts. + */ + rwin_insert(rctx->rwin, rctx, rctx->sn, rctx_retire); +} + +/* Save destination queue and events in the reorder context for deferred + * enqueue. + */ +int rctx_save(queue_entry_t *queue, odp_buffer_hdr_t *buf_hdr[], int num) +{ + int i; + sched_scalable_thread_state_t *ts; + reorder_context_t *first; + reorder_context_t *cur; + bitset_t next_idx; + + ts = sched_ts; + first = ts->rctx; + ODP_ASSERT(ts->rctx != NULL); + cur = &first[(int)first->cur_idx - (int)first->idx]; + for (i = 0; i < num; i++) { + if (odp_unlikely(cur->numevts == RC_EVT_SIZE)) { + /* No more space in current reorder context + * Try to allocate another. + */ + if (odp_unlikely( + bitset_is_null(ts->priv_rvec_free))) { + ts->priv_rvec_free = + atom_bitset_xchg( + &ts->rvec_free, + 0, + __ATOMIC_RELAXED); + if (odp_unlikely(bitset_is_null( + ts->priv_rvec_free))) + /* Out of reorder contexts. + * Return the number of events + * stored so far. + */ + return i; + } + next_idx = bitset_ffs(ts->priv_rvec_free) - 1; + ts->priv_rvec_free = + bitset_clr(ts->priv_rvec_free, + next_idx); + /* Link current to next (for eventual + * retiring) + */ + cur->next_idx = next_idx; + /* Link first to next (for next call to + * queue_enq_multi()) + */ + first->cur_idx = next_idx; + /* Update current to next */ + cur = &ts->rvec[next_idx]; + rctx_init(cur, next_idx, NULL, 0); + /* The last rctx (so far) */ + cur->next_idx = first->idx; + } + cur->events[cur->numevts] = buf_hdr[i]; + cur->destq[cur->numevts] = queue; + cur->numevts++; + } + /* All events stored. */ + return num; +} ----------------------------------------------------------------------- Summary of changes: .gitignore | 3 + .travis.yml | 2 +- Makefile.am | 1 - configure.ac | 66 ++++++++++++---------- helper/.gitignore | 3 - helper/chksum.c | 2 + helper/cuckootable.c | 2 + helper/eth.c | 2 + helper/hashtable.c | 3 + helper/ip.c | 2 + helper/iplookuptable.c | 2 + helper/lineartable.c | 2 + helper/linux/thread.c | 2 + helper/test/chksum.c | 2 + helper/test/cuckootable.c | 2 + helper/test/iplookuptable.c | 2 + helper/test/linux/process.c | 2 + helper/test/linux/pthread.c | 2 + helper/test/odpthreads.c | 2 + helper/test/parse.c | 2 + helper/test/table.c | 2 + helper/threads.c | 2 + m4/ax_check_compile_flag.m4 | 12 ++-- platform/linux-generic/Makefile.am | 1 - platform/linux-generic/_fdserver.c | 2 + platform/linux-generic/_ishm.c | 2 + platform/linux-generic/_ishmphy.c | 2 + platform/linux-generic/_ishmpool.c | 1 + platform/linux-generic/_modules.c | 1 + platform/linux-generic/arch/arm/odp_cpu_arch.c | 2 + .../linux-generic/arch/arm/odp_sysinfo_parse.c | 2 + platform/linux-generic/arch/default/odp_cpu_arch.c | 2 + .../linux-generic/arch/default/odp_sysinfo_parse.c | 2 + platform/linux-generic/arch/mips64/odp_cpu_arch.c | 2 + .../linux-generic/arch/mips64/odp_sysinfo_parse.c | 2 + platform/linux-generic/arch/powerpc/odp_cpu_arch.c | 2 + .../linux-generic/arch/powerpc/odp_sysinfo_parse.c | 2 + platform/linux-generic/arch/x86/cpu_flags.c | 4 +- platform/linux-generic/arch/x86/odp_cpu_arch.c | 2 + .../linux-generic/arch/x86/odp_sysinfo_parse.c | 4 +- .../linux-generic/include/odp_buffer_internal.h | 3 +- platform/linux-generic/m4/odp_dpdk.m4 | 6 +- platform/linux-generic/m4/odp_netmap.m4 | 3 +- platform/linux-generic/m4/odp_pcap.m4 | 2 +- platform/linux-generic/m4/odp_schedule.m4 | 63 +++++++-------------- platform/linux-generic/odp_atomic.c | 2 + platform/linux-generic/odp_barrier.c | 2 + platform/linux-generic/odp_bitmap.c | 2 + platform/linux-generic/odp_buffer.c | 2 + platform/linux-generic/odp_byteorder.c | 2 + platform/linux-generic/odp_classification.c | 2 + platform/linux-generic/odp_cpu.c | 2 + platform/linux-generic/odp_cpumask.c | 2 + platform/linux-generic/odp_cpumask_task.c | 2 + platform/linux-generic/odp_crypto.c | 2 + platform/linux-generic/odp_errno.c | 2 + platform/linux-generic/odp_event.c | 2 + platform/linux-generic/odp_hash.c | 2 + platform/linux-generic/odp_impl.c | 2 + platform/linux-generic/odp_init.c | 3 + platform/linux-generic/odp_name_table.c | 2 + platform/linux-generic/odp_packet.c | 2 + platform/linux-generic/odp_packet_flags.c | 2 + platform/linux-generic/odp_packet_io.c | 3 + platform/linux-generic/odp_pkt_queue.c | 2 + platform/linux-generic/odp_pool.c | 4 +- platform/linux-generic/odp_queue.c | 2 + platform/linux-generic/odp_queue_if.c | 2 + platform/linux-generic/odp_queue_scalable.c | 1 + platform/linux-generic/odp_rwlock.c | 2 + platform/linux-generic/odp_rwlock_recursive.c | 2 + platform/linux-generic/odp_schedule.c | 2 + platform/linux-generic/odp_schedule_if.c | 2 + platform/linux-generic/odp_schedule_iquery.c | 2 + platform/linux-generic/odp_schedule_scalable.c | 1 + .../linux-generic/odp_schedule_scalable_ordered.c | 1 + platform/linux-generic/odp_schedule_sp.c | 2 + platform/linux-generic/odp_shared_memory.c | 2 + platform/linux-generic/odp_sorted_list.c | 2 + platform/linux-generic/odp_spinlock.c | 2 + platform/linux-generic/odp_spinlock_recursive.c | 2 + platform/linux-generic/odp_std_clib.c | 2 + platform/linux-generic/odp_sync.c | 2 + platform/linux-generic/odp_system_info.c | 2 + platform/linux-generic/odp_thread.c | 2 + platform/linux-generic/odp_thrmask.c | 2 + platform/linux-generic/odp_ticketlock.c | 2 + platform/linux-generic/odp_time.c | 2 + platform/linux-generic/odp_timer.c | 2 + platform/linux-generic/odp_timer_wheel.c | 2 + platform/linux-generic/odp_traffic_mngr.c | 4 ++ platform/linux-generic/odp_version.c | 2 + platform/linux-generic/odp_weak.c | 2 + platform/linux-generic/pktio/dpdk.c | 2 + platform/linux-generic/pktio/ethtool.c | 14 +++-- platform/linux-generic/pktio/io_ops.c | 4 +- platform/linux-generic/pktio/ipc.c | 3 + platform/linux-generic/pktio/loop.c | 2 + platform/linux-generic/pktio/netmap.c | 2 + platform/linux-generic/pktio/pcap.c | 2 + platform/linux-generic/pktio/pktio_common.c | 2 + platform/linux-generic/pktio/ring.c | 6 ++ platform/linux-generic/pktio/socket.c | 2 + platform/linux-generic/pktio/socket_mmap.c | 2 + platform/linux-generic/pktio/sysfs.c | 2 + platform/linux-generic/pktio/tap.c | 2 + test/common_plat/common/Makefile.am | 1 - test/common_plat/common/mask_common.c | 2 + test/common_plat/common/odp_cunit_common.c | 4 +- test/common_plat/performance/odp_bench_packet.c | 2 + test/common_plat/performance/odp_crypto.c | 2 + test/common_plat/performance/odp_l2fwd.c | 2 + test/common_plat/performance/odp_pktio_ordered.c | 4 +- test/common_plat/performance/odp_pktio_perf.c | 3 + test/common_plat/performance/odp_sched_latency.c | 2 + test/common_plat/performance/odp_scheduling.c | 2 + test/common_plat/validation/api/Makefile.inc | 5 -- test/common_plat/validation/api/atomic/atomic.c | 2 + .../validation/api/atomic/atomic_main.c | 2 + test/common_plat/validation/api/barrier/barrier.c | 2 + .../validation/api/barrier/barrier_main.c | 2 + test/common_plat/validation/api/buffer/buffer.c | 2 + .../validation/api/buffer/buffer_main.c | 3 + .../validation/api/classification/classification.c | 2 + .../api/classification/classification_main.c | 2 + .../api/classification/odp_classification_basic.c | 2 + .../api/classification/odp_classification_common.c | 2 + .../classification/odp_classification_test_pmr.c | 2 + .../api/classification/odp_classification_tests.c | 2 + test/common_plat/validation/api/cpumask/cpumask.c | 2 + .../validation/api/cpumask/cpumask_main.c | 3 + test/common_plat/validation/api/crypto/crypto.c | 2 + .../validation/api/crypto/crypto_main.c | 2 + .../validation/api/crypto/odp_crypto_test_inp.c | 2 + test/common_plat/validation/api/errno/errno.c | 2 + test/common_plat/validation/api/errno/errno_main.c | 2 + test/common_plat/validation/api/hash/hash.c | 2 + test/common_plat/validation/api/hash/hash_main.c | 2 + test/common_plat/validation/api/init/init.c | 2 + .../validation/api/init/init_main_abort.c | 3 + .../validation/api/init/init_main_log.c | 3 + .../common_plat/validation/api/init/init_main_ok.c | 3 + test/common_plat/validation/api/lock/lock.c | 2 + test/common_plat/validation/api/lock/lock_main.c | 2 + test/common_plat/validation/api/packet/packet.c | 2 + .../validation/api/packet/packet_main.c | 2 + test/common_plat/validation/api/pktio/parser.c | 3 + test/common_plat/validation/api/pktio/pktio.c | 3 + test/common_plat/validation/api/pktio/pktio_main.c | 2 + test/common_plat/validation/api/pool/pool.c | 2 + test/common_plat/validation/api/pool/pool_main.c | 2 + test/common_plat/validation/api/queue/queue.c | 2 + test/common_plat/validation/api/queue/queue_main.c | 2 + test/common_plat/validation/api/random/random.c | 2 + .../validation/api/random/random_main.c | 2 + .../validation/api/scheduler/scheduler.c | 2 + .../validation/api/scheduler/scheduler_main.c | 2 + test/common_plat/validation/api/shmem/shmem.c | 2 + test/common_plat/validation/api/shmem/shmem_main.c | 2 + .../common_plat/validation/api/std_clib/std_clib.c | 2 + .../validation/api/std_clib/std_clib_main.c | 2 + test/common_plat/validation/api/system/system.c | 2 + .../validation/api/system/system_main.c | 2 + test/common_plat/validation/api/thread/thread.c | 2 + .../validation/api/thread/thread_main.c | 2 + test/common_plat/validation/api/time/time.c | 2 + test/common_plat/validation/api/time/time_main.c | 2 + test/common_plat/validation/api/timer/timer.c | 2 + test/common_plat/validation/api/timer/timer_main.c | 2 + .../validation/api/traffic_mngr/traffic_mngr.c | 4 ++ .../api/traffic_mngr/traffic_mngr_main.c | 2 + test/linux-generic/mmap_vlan_ins/mmap_vlan_ins.c | 2 + test/linux-generic/pktio_ipc/ipc_common.c | 2 + test/linux-generic/pktio_ipc/ipc_common.h | 2 + test/linux-generic/pktio_ipc/pktio_ipc1.c | 2 + test/linux-generic/pktio_ipc/pktio_ipc2.c | 2 + test/linux-generic/ring/Makefile.am | 1 + test/linux-generic/ring/ring_basic.c | 2 + test/linux-generic/ring/ring_main.c | 2 + test/linux-generic/ring/ring_stress.c | 4 ++ test/linux-generic/ring/ring_suites.c | 2 + .../linux-generic/validation/api/shmem/Makefile.am | 1 + .../validation/api/shmem/shmem_linux.c | 2 + .../validation/api/shmem/shmem_odp1.c | 2 + .../validation/api/shmem/shmem_odp2.c | 2 + 185 files changed, 446 insertions(+), 106 deletions(-) delete mode 100644 helper/.gitignore hooks/post-receive --

7 years, 10 months

[COMMIT] branch api-next updated. v1.15.0.0-576-g0b2b2628

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, api-next has been updated via 0b2b26281c0d1d8d00d69f9829e32c9a99b7af0f (commit) via 1bc1b6fed4c75b3bd9305d2c9e646efc50de5fb3 (commit) from 859293ad9b3c862264bb0fbfe8e7037b5e04d084 (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 0b2b26281c0d1d8d00d69f9829e32c9a99b7af0f Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Thu Aug 24 04:58:46 2017 +0300 test: performance: crypto: free crypto-out queue Free crypto-out queue if it was created. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/common_plat/performance/odp_crypto.c b/test/common_plat/performance/odp_crypto.c index 8449f1fc..9fc13400 100644 --- a/test/common_plat/performance/odp_crypto.c +++ b/test/common_plat/performance/odp_crypto.c @@ -835,6 +835,8 @@ int main(int argc, char *argv[]) } } + if (cargs.schedule || cargs.poll) + odp_queue_destroy(out_queue); if (odp_pool_destroy(pool)) { app_err("Error: pool destroy\n"); exit(EXIT_FAILURE); commit 1bc1b6fed4c75b3bd9305d2c9e646efc50de5fb3 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Thu Aug 24 04:58:46 2017 +0300 test: performance: crypto: fix packet freeing With new packet reference code, ODP has become stricter on packet double free errors, highlighting several bugs in packet handling code in crypto performance test. Fix packet double-free errors. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/common_plat/performance/odp_crypto.c b/test/common_plat/performance/odp_crypto.c index 7a25ffdc..8449f1fc 100644 --- a/test/common_plat/performance/odp_crypto.c +++ b/test/common_plat/performance/odp_crypto.c @@ -560,6 +560,8 @@ run_measure_one(crypto_args_t *cargs, if (rc <= 0) { app_err("failed odp_crypto_packet_op_enq: rc = %d\n", rc); + if (!cargs->reuse_packet) + odp_packet_free(pkt); break; } packets_sent += rc; @@ -569,6 +571,8 @@ run_measure_one(crypto_args_t *cargs, if (rc <= 0) { app_err("failed odp_crypto_packet_op: rc = %d\n", rc); + if (!cargs->reuse_packet) + odp_packet_free(pkt); break; } packets_sent += rc; @@ -582,16 +586,14 @@ run_measure_one(crypto_args_t *cargs, config->session. auth_digest_len); } - if (!cargs->in_place) { - if (cargs->reuse_packet) - pkt = out_pkt; - else - odp_packet_free(out_pkt); - } + if (cargs->reuse_packet) + pkt = out_pkt; + else + odp_packet_free(out_pkt); } } - if (out_queue != ODP_QUEUE_INVALID) { + if (cargs->schedule || cargs->poll) { odp_event_t ev; odp_crypto_packet_result_t result; odp_packet_t out_pkt; @@ -646,7 +648,7 @@ run_measure_one(crypto_args_t *cargs, cargs->iteration_count; } - if (ODP_PACKET_INVALID != pkt) + if (cargs->reuse_packet) odp_packet_free(pkt); return rc < 0 ? rc : 0; ----------------------------------------------------------------------- Summary of changes: test/common_plat/performance/odp_crypto.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) hooks/post-receive --

7 years, 10 months

[COMMIT] branch master updated. v1.15.0.0-146-g6a360e61

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 6a360e61978d03d12dbfff8c34c20cf95170a1c3 (commit) via 933b8cdc4832c05a9f81e748f73d8507673cc370 (commit) via 3f02e970482ca203c8f98c1b20b2a3813312df63 (commit) via 87361c8c9017ccd3d18fdf52b9e7ba845baeb1aa (commit) via 15de2926e800a451edc3cbbe970930fc0e64ee7b (commit) via dcb74c5cce2dd3c383730a29e396b76923f201f3 (commit) via c835e02fc287286d86377a9eb8937f8711a7d3cf (commit) via 820571cc1332e06191c7a75c28eb5d908561a533 (commit) via c6bfc6805796795df8f7a124a146365a11638351 (commit) via bc3b618ab85c8404f131ef071488791b97255166 (commit) via e4fe9119bb8a18f2eab6b1d45e532c8d1c41bcc7 (commit) via 1bcd97bb1f67d96d81e4e49a77089c6b17fba8ca (commit) via 512cfde208241f21b5cdbab848be81f43823810a (commit) via a811ff57407a6b9427b225793a75c03cb386e6c9 (commit) via 7a78aa2f6113789d5f6df0ddaff360f10fc859d7 (commit) via b675c825f9dc84df533381a4018663a4c6997882 (commit) via 9dd1357dc936c3b9e44753ce2373f6bb71629e34 (commit) via ffdd8c7e423503b3e85b7fdfd844ad10692795d5 (commit) via cd17794642638d6ee65b97bed9df5ddcd2cb2520 (commit) via 0a7686e47e40db0f5f6b862d16e8b021da23f90b (commit) via 36a7c389d3e00d4c3987236bd8229c54d812f533 (commit) via 26e1a355c7312e2fcc7196eb82ef49c74232035b (commit) via 6a9971dd8dd1cf982e7ae34ae2b62ccdadaed1c9 (commit) via f637a36cd2a7fc125a2d90ed5a93933007987e95 (commit) from 8705e548f330d23173283fcca62f4afb835a6380 (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 6a360e61978d03d12dbfff8c34c20cf95170a1c3 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue Aug 22 13:33:52 2017 +0300 configure: reenable compiler fallthrough warning Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/configure.ac b/configure.ac index 164149a2..c1811003 100644 --- a/configure.ac +++ b/configure.ac @@ -331,7 +331,6 @@ ODP_CHECK_CFLAG([-Wformat-nonliteral]) ODP_CHECK_CFLAG([-Wformat-security]) ODP_CHECK_CFLAG([-Wundef]) ODP_CHECK_CFLAG([-Wwrite-strings]) -ODP_CHECK_CFLAG([-Wimplicit-fallthrough=0]) ODP_CHECK_CFLAG([-Wformat-truncation=0]) ODP_CHECK_CFLAG([-Wformat-overflow=0]) diff --git a/platform/linux-generic/pktio/ring.c b/platform/linux-generic/pktio/ring.c index dff7d685..3b708f72 100644 --- a/platform/linux-generic/pktio/ring.c +++ b/platform/linux-generic/pktio/ring.c @@ -100,8 +100,10 @@ static TAILQ_HEAD(, _ring) odp_ring_list; switch (n & 0x3) { \ case 3: \ r->ring[idx++] = obj_table[i++]; \ + /* fallthrough */ \ case 2: \ r->ring[idx++] = obj_table[i++]; \ + /* fallthrough */ \ case 1: \ r->ring[idx++] = obj_table[i++]; \ } \ @@ -129,8 +131,10 @@ static TAILQ_HEAD(, _ring) odp_ring_list; switch (n & 0x3) { \ case 3: \ obj_table[i++] = r->ring[idx++]; \ + /* fallthrough */ \ case 2: \ obj_table[i++] = r->ring[idx++]; \ + /* fallthrough */ \ case 1: \ obj_table[i++] = r->ring[idx++]; \ } \ commit 933b8cdc4832c05a9f81e748f73d8507673cc370 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Mon Aug 21 16:54:18 2017 +0300 travis: pass cunit path to distcheck options directly Rather then overriding CFLAGS/LDFLAGS, pass --with-cunit-path to make distcheck directly. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/.travis.yml b/.travis.yml index 7a74bdb7..245ade2a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -238,7 +238,7 @@ jobs: script: - ./bootstrap - ./configure --prefix=$HOME/odp-install --enable-test-cpp --enable-test-vald --enable-test-helper --enable-test-perf --enable-user-guides --enable-test-perf-proc --enable-test-example --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH - - sudo PATH="$PATH" LD_LIBRARY_PATH="$HOME/cunit-install/$CROSS_ARCH/lib:$LD_LIBRARY_PATH" make distcheck CFLAGS="-I$HOME/cunit-install/$CROSS_ARCH/include" LDFLAGS="-L$HOME/cunit-install/$CROSS_ARCH/lib" + - sudo PATH="$PATH" LD_LIBRARY_PATH="$HOME/cunit-install/$CROSS_ARCH/lib:$LD_LIBRARY_PATH" make distcheck DISTCHECK_CONFIGURE_FLAGS="--with-cunit-path=$HOME/cunit-install/$CROSS_ARCH" - stage: test env: TEST=doxygen compiler: gcc commit 3f02e970482ca203c8f98c1b20b2a3813312df63 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Mon Aug 21 15:33:21 2017 +0300 configure: drop AC_FUNC_MALLOC test AC_FUNC_MALLOC interacts badly with cross-compilation. Instead of hacking around our cross-compilation setup just replace this macro with plain AC_CHECK_FUNCS test. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/configure.ac b/configure.ac index 5e5e8639..164149a2 100644 --- a/configure.ac +++ b/configure.ac @@ -63,9 +63,10 @@ AC_SUBST([LIBTOOL_DEPS]) AM_PROG_LIBTOOL # Checks for library functions. -AC_FUNC_MALLOC +dnl breaks cross-compilation and malloc(0) behaviour is not that important +dnl AC_FUNC_MALLOC AC_FUNC_MMAP -AC_CHECK_FUNCS([bzero clock_gettime gethostbyname getpagesize gettimeofday memset munmap socket strchr strerror strrchr strstr strtoull]) +AC_CHECK_FUNCS([bzero clock_gettime gethostbyname getpagesize gettimeofday malloc memset munmap socket strchr strerror strrchr strstr strtoull]) # Checks for header files. AC_HEADER_RESOLV commit 87361c8c9017ccd3d18fdf52b9e7ba845baeb1aa Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Wed Aug 16 19:49:46 2017 +0300 configure: pass all compiler options through acceptance check Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/configure.ac b/configure.ac index ac36ee89..5e5e8639 100644 --- a/configure.ac +++ b/configure.ac @@ -308,23 +308,33 @@ AC_SUBST(ODP_DEPRECATED_API) ########################################################################## # Default warning setup ########################################################################## -ODP_CFLAGS="$ODP_CFLAGS -W -Wall -Werror -Wstrict-prototypes -Wmissing-prototypes" -ODP_CFLAGS="$ODP_CFLAGS -Wmissing-declarations -Wold-style-definition -Wpointer-arith" -ODP_CFLAGS="$ODP_CFLAGS -Wcast-align -Wnested-externs -Wcast-qual -Wformat-nonliteral" -ODP_CFLAGS="$ODP_CFLAGS -Wformat-security -Wundef -Wwrite-strings" -ODP_CFLAGS="$ODP_CFLAGS -std=c99" +ODP_CFLAGS="$ODP_CFLAGS -W -Wall -Werror" dnl Use -Werror in the checks below since Clang emits a warning instead of dnl an error when it encounters an unknown warning option. -AX_CHECK_COMPILE_FLAG([-Wimplicit-fallthrough=0], - [ODP_CFLAGS="$ODP_CFLAGS -Wimplicit-fallthrough=0"], - [], [-Werror]) -AX_CHECK_COMPILE_FLAG([-Wformat-truncation=0], - [ODP_CFLAGS="$ODP_CFLAGS -Wformat-truncation=0"], - [], [-Werror]) -AX_CHECK_COMPILE_FLAG([-Wformat-overflow=0], - [ODP_CFLAGS="$ODP_CFLAGS -Wformat-overflow=0"], - [], [-Werror]) +AC_DEFUN([ODP_CHECK_CFLAG], + [AX_CHECK_COMPILE_FLAG([$1], + [ODP_CFLAGS="$ODP_CFLAGS $1"], + [], [-W -Wall -Werror], + [AC_LANG_SOURCE([int main(void) + {return 0;}])])]) +ODP_CHECK_CFLAG([-Wstrict-prototypes]) +ODP_CHECK_CFLAG([-Wmissing-prototypes]) +ODP_CHECK_CFLAG([-Wmissing-declarations]) +ODP_CHECK_CFLAG([-Wold-style-definition]) +ODP_CHECK_CFLAG([-Wpointer-arith]) +ODP_CHECK_CFLAG([-Wcast-align]) +ODP_CHECK_CFLAG([-Wnested-externs]) +ODP_CHECK_CFLAG([-Wcast-qual]) +ODP_CHECK_CFLAG([-Wformat-nonliteral]) +ODP_CHECK_CFLAG([-Wformat-security]) +ODP_CHECK_CFLAG([-Wundef]) +ODP_CHECK_CFLAG([-Wwrite-strings]) +ODP_CHECK_CFLAG([-Wimplicit-fallthrough=0]) +ODP_CHECK_CFLAG([-Wformat-truncation=0]) +ODP_CHECK_CFLAG([-Wformat-overflow=0]) + +ODP_CFLAGS="$ODP_CFLAGS -std=c99" # Extra flags for example to suppress certain warning types ODP_CFLAGS="$ODP_CFLAGS $ODP_CFLAGS_EXTRA" diff --git a/m4/ax_check_compile_flag.m4 b/m4/ax_check_compile_flag.m4 index c3a8d695..ca363971 100644 --- a/m4/ax_check_compile_flag.m4 +++ b/m4/ax_check_compile_flag.m4 @@ -4,7 +4,7 @@ # # SYNOPSIS # -# AX_CHECK_COMPILE_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS]) +# AX_CHECK_COMPILE_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS], [INPUT]) # # DESCRIPTION # @@ -19,6 +19,8 @@ # the flags: "CFLAGS EXTRA-FLAGS FLAG". This can for example be used to # force the compiler to issue an error when a bad flag is given. # +# INPUT gives an alternative input source to AC_COMPILE_IFELSE. +# # NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this # macro in sync with AX_CHECK_{PREPROC,LINK}_FLAG. # @@ -53,19 +55,19 @@ # modified version of the Autoconf Macro, you may extend this special # exception to the GPL to apply to your modified version as well. -#serial 2 +#serial 4 AC_DEFUN([AX_CHECK_COMPILE_FLAG], -[AC_PREREQ(2.59)dnl for _AC_LANG_PREFIX +[AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [ ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1" - AC_COMPILE_IFELSE([AC_LANG_PROGRAM()], + AC_COMPILE_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])], [AS_VAR_SET(CACHEVAR,[yes])], [AS_VAR_SET(CACHEVAR,[no])]) _AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags]) -AS_IF([test x"AS_VAR_GET(CACHEVAR)" = xyes], +AS_VAR_IF(CACHEVAR,yes, [m4_default([$2], :)], [m4_default([$3], :)]) AS_VAR_POPDEF([CACHEVAR])dnl commit 15de2926e800a451edc3cbbe970930fc0e64ee7b Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Wed Aug 16 18:43:10 2017 +0300 linux-gen: drop _ODP_PKTIO_IPC define Since 39b3a1681097638 ("linux-gen: remove pktio ipc option from configure") IPC pktio is enabled unconditionally. Drop define guarding conditional compilation of several remaining bits. Signed-off-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 26eba284..8f0618f4 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -9,7 +9,6 @@ AM_CFLAGS += -I$(top_srcdir)/include AM_CFLAGS += -I$(top_srcdir)/include/odp/arch/@ARCH_ABI@ AM_CFLAGS += -I$(top_builddir)/include AM_CFLAGS += -Iinclude -AM_CFLAGS += -D_ODP_PKTIO_IPC AM_CPPFLAGS += $(OPENSSL_CPPFLAGS) AM_CPPFLAGS += $(DPDK_CPPFLAGS) diff --git a/platform/linux-generic/include/odp_buffer_internal.h b/platform/linux-generic/include/odp_buffer_internal.h index a580c82d..e20d1c8d 100644 --- a/platform/linux-generic/include/odp_buffer_internal.h +++ b/platform/linux-generic/include/odp_buffer_internal.h @@ -86,8 +86,7 @@ struct odp_buffer_hdr_t { /* Burst table */ struct odp_buffer_hdr_t *burst[BUFFER_BURST_SIZE]; - /* Used only if _ODP_PKTIO_IPC is set. - * ipc mapped process can not walk over pointers, + /* ipc mapped process can not walk over pointers, * offset has to be used */ uint64_t ipc_data_offset; diff --git a/platform/linux-generic/odp_pool.c b/platform/linux-generic/odp_pool.c index 34a38475..01edff8b 100644 --- a/platform/linux-generic/odp_pool.c +++ b/platform/linux-generic/odp_pool.c @@ -536,10 +536,8 @@ odp_pool_t odp_pool_create(const char *name, odp_pool_param_t *params) if (check_params(params)) return ODP_POOL_INVALID; -#ifdef _ODP_PKTIO_IPC if (params && (params->type == ODP_POOL_PACKET)) shm_flags = ODP_SHM_PROC; -#endif return pool_create(name, params, shm_flags); } diff --git a/platform/linux-generic/pktio/io_ops.c b/platform/linux-generic/pktio/io_ops.c index 89d6203e..40d7c164 100644 --- a/platform/linux-generic/pktio/io_ops.c +++ b/platform/linux-generic/pktio/io_ops.c @@ -23,9 +23,7 @@ const pktio_if_ops_t * const pktio_if_ops[] = { #ifdef HAVE_PCAP &pcap_pktio_ops, #endif -#ifdef _ODP_PKTIO_IPC &ipc_pktio_ops, -#endif &tap_pktio_ops, &sock_mmap_pktio_ops, &sock_mmsg_pktio_ops, commit dcb74c5cce2dd3c383730a29e396b76923f201f3 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue Aug 15 23:40:24 2017 +0300 automake: move nostdinc Automake option to configure.ac It is quite logical to enable nostdinc option non global level instead of defining it only for some of the tests. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/configure.ac b/configure.ac index 4016176b..ac36ee89 100644 --- a/configure.ac +++ b/configure.ac @@ -19,7 +19,7 @@ AC_SUBST(ODP_VERSION_API_MINOR) AC_CONFIG_FILES([include/odp/api/spec/version.h include/odp/api/spec/deprecated.h]) -AM_INIT_AUTOMAKE([1.9 tar-pax subdir-objects foreign]) +AM_INIT_AUTOMAKE([1.9 tar-pax subdir-objects foreign nostdinc]) AC_CONFIG_SRCDIR([include/odp/api/spec/init.h]) AM_CONFIG_HEADER([include/config.h]) diff --git a/platform/linux-generic/arch/x86/cpu_flags.c b/platform/linux-generic/arch/x86/cpu_flags.c index 690a084e..e46c4ffb 100644 --- a/platform/linux-generic/arch/x86/cpu_flags.c +++ b/platform/linux-generic/arch/x86/cpu_flags.c @@ -39,7 +39,7 @@ #include "config.h" -#include <arch/x86/cpu_flags.h> +#include <cpu_flags.h> #include <odp_debug_internal.h> #include <odp_time_internal.h> #include <stdio.h> diff --git a/platform/linux-generic/arch/x86/odp_sysinfo_parse.c b/platform/linux-generic/arch/x86/odp_sysinfo_parse.c index f4a90ecd..f7918d40 100644 --- a/platform/linux-generic/arch/x86/odp_sysinfo_parse.c +++ b/platform/linux-generic/arch/x86/odp_sysinfo_parse.c @@ -7,7 +7,7 @@ #include "config.h" #include <odp_internal.h> -#include <arch/x86/cpu_flags.h> +#include <cpu_flags.h> #include <string.h> int cpuinfo_parser(FILE *file, system_info_t *sysinfo) diff --git a/test/common_plat/common/odp_cunit_common.c b/test/common_plat/common/odp_cunit_common.c index a83c3026..08bf1f26 100644 --- a/test/common_plat/common/odp_cunit_common.c +++ b/test/common_plat/common/odp_cunit_common.c @@ -8,7 +8,7 @@ #include <string.h> #include <odp_api.h> -#include <odp_cunit_common.h> +#include "odp_cunit_common.h" #include <odp/helper/odph_api.h> /* Globals */ static odph_odpthread_t thread_tbl[MAX_WORKERS]; diff --git a/test/common_plat/performance/odp_pktio_ordered.c b/test/common_plat/performance/odp_pktio_ordered.c index b08fa852..e772411a 100644 --- a/test/common_plat/performance/odp_pktio_ordered.c +++ b/test/common_plat/performance/odp_pktio_ordered.c @@ -24,7 +24,7 @@ #include <inttypes.h> #include <test_debug.h> -#include <dummy_crc.h> +#include "dummy_crc.h" #include <odp_api.h> #include <odp/helper/threads.h> diff --git a/test/common_plat/validation/api/Makefile.inc b/test/common_plat/validation/api/Makefile.inc index 177d2ac3..767526ed 100644 --- a/test/common_plat/validation/api/Makefile.inc +++ b/test/common_plat/validation/api/Makefile.inc @@ -2,11 +2,6 @@ include $(top_srcdir)/test/Makefile.inc COMMON_DIR = $(top_builddir)/test/common_plat/common -#the following option ensure that option '-I.' is not passed to gcc, -#therefore distinguishing between '#include "X"' and '#include <X>'. -#It allows common filenames (such as 'errno.h') to be used locally. -AUTOMAKE_OPTIONS = nostdinc - AM_CFLAGS += -I$(top_srcdir)/test/common_plat/common AM_LDFLAGS += -static AM_LDFLAGS += $(DPDK_PMDS) diff --git a/test/linux-generic/ring/Makefile.am b/test/linux-generic/ring/Makefile.am index c0865848..14f60b85 100644 --- a/test/linux-generic/ring/Makefile.am +++ b/test/linux-generic/ring/Makefile.am @@ -7,6 +7,7 @@ libtestring_la_CFLAGS = $(AM_CFLAGS) $(INCCUNIT_COMMON) $(INCODP) test_PROGRAMS = ring_main$(EXEEXT) dist_ring_main_SOURCES = ring_main.c +ring_main_CFLAGS = $(AM_CFLAGS) -I$(top_builddir)/include ring_main_LDFLAGS = $(AM_LDFLAGS) ring_main_LDADD = libtestring.la $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/linux-generic/validation/api/shmem/Makefile.am b/test/linux-generic/validation/api/shmem/Makefile.am index b0ae6273..e330d633 100644 --- a/test/linux-generic/validation/api/shmem/Makefile.am +++ b/test/linux-generic/validation/api/shmem/Makefile.am @@ -7,6 +7,7 @@ test_extradir = $(testdir) #shmem_linux is stand alone, pure linux (no ODP): dist_shmem_linux_SOURCES = shmem_linux.c +shmem_linux_CFLAGS = $(AM_CFLAGS) -I$(top_builddir)/include shmem_linux_LDFLAGS = $(AM_LDFLAGS) -lrt #shmem_odp1 and shmem_odp2 are the 2 ODP processes: commit c835e02fc287286d86377a9eb8937f8711a7d3cf Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue Aug 15 23:37:22 2017 +0300 automake: move foreign Automake option to configure.ac Instead of specifying foreign Automake option on a per-dir bases, move that option to toplevel configure.ac, making it global at the same time. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/Makefile.am b/Makefile.am index 76ceb851..e1ea07d5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,4 @@ ACLOCAL_AMFLAGS=-I m4 -AUTOMAKE_OPTIONS = foreign AM_DISTCHECK_CONFIGURE_FLAGS = --enable-test-cpp \ --enable-test-example \ --enable-test-helper \ diff --git a/configure.ac b/configure.ac index 0ab8f585..4016176b 100644 --- a/configure.ac +++ b/configure.ac @@ -19,7 +19,7 @@ AC_SUBST(ODP_VERSION_API_MINOR) AC_CONFIG_FILES([include/odp/api/spec/version.h include/odp/api/spec/deprecated.h]) -AM_INIT_AUTOMAKE([1.9 tar-pax subdir-objects]) +AM_INIT_AUTOMAKE([1.9 tar-pax subdir-objects foreign]) AC_CONFIG_SRCDIR([include/odp/api/spec/init.h]) AM_CONFIG_HEADER([include/config.h]) diff --git a/test/common_plat/common/Makefile.am b/test/common_plat/common/Makefile.am index 7d88d2ea..9fd08ee8 100644 --- a/test/common_plat/common/Makefile.am +++ b/test/common_plat/common/Makefile.am @@ -1,4 +1,3 @@ -AUTOMAKE_OPTIONS = foreign include $(top_srcdir)/test/Makefile.inc noinst_LTLIBRARIES = libcunit_common.la libcpumask_common.la libthrmask_common.la commit 820571cc1332e06191c7a75c28eb5d908561a533 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue Aug 15 12:20:26 2017 +0300 configure: AC_DEFINE(ODP_PKTIO_DPDK)/AC_DEFINE(ODP_DPDK_ZERO_COPY) Use Autoconf macros instead of defining macro by hand. Signed-off-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/m4/odp_dpdk.m4 b/platform/linux-generic/m4/odp_dpdk.m4 index cebf1028..b6554165 100644 --- a/platform/linux-generic/m4/odp_dpdk.m4 +++ b/platform/linux-generic/m4/odp_dpdk.m4 @@ -47,7 +47,11 @@ then done AS_VAR_APPEND([DPDK_PMDS], [--no-whole-archive]) - ODP_CFLAGS="$ODP_CFLAGS -DODP_PKTIO_DPDK -DODP_DPDK_ZERO_COPY=$zero_copy" + AC_DEFINE([ODP_PKTIO_DPDK], [1], + [Define to 1 to enable DPDK packet I/O support]) + AC_DEFINE_UNQUOTED([ODP_DPDK_ZERO_COPY], [$zero_copy], + [Define to 1 to enable DPDK zero copy support]) + DPDK_LIBS="-L$DPDK_PATH/lib -ldpdk -lpthread -ldl -lpcap -lm" AC_SUBST([DPDK_CPPFLAGS]) AC_SUBST([DPDK_LIBS]) commit c6bfc6805796795df8f7a124a146365a11638351 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue Aug 15 12:20:26 2017 +0300 configure: AC_DEFINE(ODP_NETMAP) Use Autoconf macros instead of defining macro by hand. Signed-off-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/m4/odp_netmap.m4 b/platform/linux-generic/m4/odp_netmap.m4 index dea80626..bd04824b 100644 --- a/platform/linux-generic/m4/odp_netmap.m4 +++ b/platform/linux-generic/m4/odp_netmap.m4 @@ -31,7 +31,8 @@ if test x$netmap_support = xyes then AC_CHECK_HEADERS([net/netmap_user.h], [], [AC_MSG_FAILURE(["can't find netmap header"])]) - ODP_CFLAGS="$ODP_CFLAGS -DODP_NETMAP" + AC_DEFINE([ODP_NETMAP], [1], + [Define to 1 to enable netmap IO support]) AC_SUBST([NETMAP_CPPFLAGS]) else netmap_support=no commit bc3b618ab85c8404f131ef071488791b97255166 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue Aug 15 12:20:26 2017 +0300 configure: AC_DEFINE(ODP_SCHEDULE_IQUERY) Use Autoconf macros instead of defining macro by hand. Signed-off-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/m4/odp_schedule.m4 b/platform/linux-generic/m4/odp_schedule.m4 index 14b278bf..bb3980ca 100644 --- a/platform/linux-generic/m4/odp_schedule.m4 +++ b/platform/linux-generic/m4/odp_schedule.m4 @@ -10,5 +10,6 @@ AC_ARG_ENABLE([schedule-iquery], [ --enable-schedule-iquery enable interests query (sparse bitmap) scheduler], [if test x$enableval = xyes; then schedule_iquery_enabled=yes - ODP_CFLAGS="$ODP_CFLAGS -DODP_SCHEDULE_IQUERY" + AC_DEFINE([ODP_SCHEDULE_IQUERY], [1], + [Define to 1 to enable interests query scheduler]) fi]) commit e4fe9119bb8a18f2eab6b1d45e532c8d1c41bcc7 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue Aug 15 12:20:26 2017 +0300 configure: AC_DEFINE(ODP_SCHEDULE_SP) Use Autoconf macros instead of defining macro by hand. Signed-off-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/m4/odp_schedule.m4 b/platform/linux-generic/m4/odp_schedule.m4 index 91c19f21..14b278bf 100644 --- a/platform/linux-generic/m4/odp_schedule.m4 +++ b/platform/linux-generic/m4/odp_schedule.m4 @@ -2,7 +2,8 @@ AC_ARG_ENABLE([schedule-sp], [ --enable-schedule-sp enable strict priority scheduler], [if test x$enableval = xyes; then schedule_sp_enabled=yes - ODP_CFLAGS="$ODP_CFLAGS -DODP_SCHEDULE_SP" + AC_DEFINE([ODP_SCHEDULE_SP], [1], + [Define to 1 to enable strict priority scheduler]) fi]) AC_ARG_ENABLE([schedule-iquery], commit 1bcd97bb1f67d96d81e4e49a77089c6b17fba8ca Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue Aug 15 12:20:26 2017 +0300 configure: AC_DEFINE(HAVE_PCAP) Use Autoconf macros instead of defining macro by hand. Signed-off-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/m4/odp_pcap.m4 b/platform/linux-generic/m4/odp_pcap.m4 index d7295f21..0b5b8a2e 100644 --- a/platform/linux-generic/m4/odp_pcap.m4 +++ b/platform/linux-generic/m4/odp_pcap.m4 @@ -9,7 +9,7 @@ AC_CHECK_HEADER(pcap/pcap.h, []) if test "$have_pcap" = "yes"; then - ODP_CFLAGS="$AM_CFLAGS -DHAVE_PCAP" + AC_DEFINE([HAVE_PCAP], 1, [Define to 1 if you have pcap library]) PCAP_LIBS="-lpcap" fi commit 512cfde208241f21b5cdbab848be81f43823810a Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue Aug 15 12:20:26 2017 +0300 configure: AC_DEFINE_UNQUOTED(ODP_DEBUG) Use Autoconf macros instead of defining macro by hand. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/configure.ac b/configure.ac index 9300c87b..0ab8f585 100644 --- a/configure.ac +++ b/configure.ac @@ -273,10 +273,9 @@ AC_ARG_ENABLE([debug], [ --enable-debug include additional code], [if test "x$enableval" = "xyes"; then ODP_DEBUG=1 - else - ODP_DEBUG=0 fi]) -ODP_CFLAGS="$ODP_CFLAGS -DODP_DEBUG=$ODP_DEBUG" +AC_DEFINE_UNQUOTED([ODP_DEBUG], [$ODP_DEBUG], + [Define to 1 to include additional debug code]) ########################################################################## # Enable/disable ABI compatible build commit a811ff57407a6b9427b225793a75c03cb386e6c9 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue Aug 15 12:20:26 2017 +0300 configure: AC_DEFINE_UNQUOTED(ODPH_DEBUG_PRINT) Use Autoconf macros instead of defining macro by hand. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/configure.ac b/configure.ac index 16c22321..9300c87b 100644 --- a/configure.ac +++ b/configure.ac @@ -261,10 +261,9 @@ AC_ARG_ENABLE([helper-debug-print], [ --enable-helper-debug-print display helper debugging information], [if test "x$enableval" = "xyes"; then ODPH_DEBUG_PRINT=1 - else - ODPH_DEBUG_PRINT=0 fi]) -ODP_CFLAGS="$ODP_CFLAGS -DODPH_DEBUG_PRINT=$ODPH_DEBUG_PRINT" +AC_DEFINE_UNQUOTED([ODPH_DEBUG_PRINT], [$ODPH_DEBUG_PRINT], + [Define to 1 to display helper debug information]) ########################################################################## # Enable/disable ODP_DEBUG commit 7a78aa2f6113789d5f6df0ddaff360f10fc859d7 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue Aug 15 12:20:26 2017 +0300 configure: AC_DEFINE_UNQUOTED(ODP_DEBUG_PRINT) Use Autoconf macros instead of defining macro by hand. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/configure.ac b/configure.ac index 329c91e8..16c22321 100644 --- a/configure.ac +++ b/configure.ac @@ -252,10 +252,9 @@ AC_ARG_ENABLE([debug-print], [ --enable-debug-print display debugging information], [if test "x$enableval" = "xyes"; then ODP_DEBUG_PRINT=1 - else - ODP_DEBUG_PRINT=0 fi]) -ODP_CFLAGS="$ODP_CFLAGS -DODP_DEBUG_PRINT=$ODP_DEBUG_PRINT" +AC_DEFINE_UNQUOTED([ODP_DEBUG_PRINT], [$ODP_DEBUG_PRINT], + [Define to 1 to display debug information]) ODPH_DEBUG_PRINT=0 AC_ARG_ENABLE([helper-debug-print], commit b675c825f9dc84df533381a4018663a4c6997882 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue Aug 15 12:20:26 2017 +0300 configure: AC_DEFINE_UNQUOTED(IMPLEMENTATION_NAME) Use Autoconf macros instead of defining macro by hand. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/configure.ac b/configure.ac index 8791905b..329c91e8 100644 --- a/configure.ac +++ b/configure.ac @@ -174,7 +174,8 @@ else exit 1 fi -ODP_CFLAGS="$ODP_CFLAGS -DIMPLEMENTATION_NAME=$IMPLEMENTATION_NAME" +AC_DEFINE_UNQUOTED([IMPLEMENTATION_NAME], ["$IMPLEMENTATION_NAME"], + [Define to the name of the implementation]) ########################################################################## # Include m4 files commit 9dd1357dc936c3b9e44753ce2373f6bb71629e34 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue Aug 15 12:34:35 2017 +0300 test: use config.h header Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/common_plat/common/mask_common.c b/test/common_plat/common/mask_common.c index b31534c6..5f872f3e 100644 --- a/test/common_plat/common/mask_common.c +++ b/test/common_plat/common/mask_common.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include <odp_api.h> #include "odp_cunit_common.h" diff --git a/test/common_plat/common/odp_cunit_common.c b/test/common_plat/common/odp_cunit_common.c index d3328af6..a83c3026 100644 --- a/test/common_plat/common/odp_cunit_common.c +++ b/test/common_plat/common/odp_cunit_common.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include <string.h> #include <odp_api.h> #include <odp_cunit_common.h> diff --git a/test/common_plat/performance/odp_bench_packet.c b/test/common_plat/performance/odp_bench_packet.c index c4cd6139..327b9b2c 100644 --- a/test/common_plat/performance/odp_bench_packet.c +++ b/test/common_plat/performance/odp_bench_packet.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + /** * @file * diff --git a/test/common_plat/performance/odp_crypto.c b/test/common_plat/performance/odp_crypto.c index c3dd6d38..a65e4449 100644 --- a/test/common_plat/performance/odp_crypto.c +++ b/test/common_plat/performance/odp_crypto.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #ifndef _GNU_SOURCE #define _GNU_SOURCE #endif /* _GNU_SOURCE */ diff --git a/test/common_plat/performance/odp_l2fwd.c b/test/common_plat/performance/odp_l2fwd.c index 25a92cc3..dd69cde4 100644 --- a/test/common_plat/performance/odp_l2fwd.c +++ b/test/common_plat/performance/odp_l2fwd.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + /** * @file * diff --git a/test/common_plat/performance/odp_pktio_ordered.c b/test/common_plat/performance/odp_pktio_ordered.c index 4bb0bef9..b08fa852 100644 --- a/test/common_plat/performance/odp_pktio_ordered.c +++ b/test/common_plat/performance/odp_pktio_ordered.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + /** * @file * diff --git a/test/common_plat/performance/odp_pktio_perf.c b/test/common_plat/performance/odp_pktio_perf.c index 09463081..a170e128 100644 --- a/test/common_plat/performance/odp_pktio_perf.c +++ b/test/common_plat/performance/odp_pktio_perf.c @@ -20,6 +20,9 @@ * a single packet rate can be specified on the command line. * */ + +#include "config.h" + #include <odp_api.h> #include <odp/helper/odph_api.h> diff --git a/test/common_plat/performance/odp_sched_latency.c b/test/common_plat/performance/odp_sched_latency.c index 026f2f6c..fc286051 100644 --- a/test/common_plat/performance/odp_sched_latency.c +++ b/test/common_plat/performance/odp_sched_latency.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + /** * @file * diff --git a/test/common_plat/performance/odp_scheduling.c b/test/common_plat/performance/odp_scheduling.c index 38e76257..308ed410 100644 --- a/test/common_plat/performance/odp_scheduling.c +++ b/test/common_plat/performance/odp_scheduling.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + /** * @file * diff --git a/test/common_plat/validation/api/atomic/atomic.c b/test/common_plat/validation/api/atomic/atomic.c index db9484bc..5bf2fe87 100644 --- a/test/common_plat/validation/api/atomic/atomic.c +++ b/test/common_plat/validation/api/atomic/atomic.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include <malloc.h> #include <odp_api.h> #include <CUnit/Basic.h> diff --git a/test/common_plat/validation/api/atomic/atomic_main.c b/test/common_plat/validation/api/atomic/atomic_main.c index db035373..b6028393 100644 --- a/test/common_plat/validation/api/atomic/atomic_main.c +++ b/test/common_plat/validation/api/atomic/atomic_main.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include "atomic.h" int main(int argc, char *argv[]) diff --git a/test/common_plat/validation/api/barrier/barrier.c b/test/common_plat/validation/api/barrier/barrier.c index 79ee82b3..b75d6204 100644 --- a/test/common_plat/validation/api/barrier/barrier.c +++ b/test/common_plat/validation/api/barrier/barrier.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include <malloc.h> #include <odp_api.h> #include <CUnit/Basic.h> diff --git a/test/common_plat/validation/api/barrier/barrier_main.c b/test/common_plat/validation/api/barrier/barrier_main.c index 064decf6..28df6afa 100644 --- a/test/common_plat/validation/api/barrier/barrier_main.c +++ b/test/common_plat/validation/api/barrier/barrier_main.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include "barrier.h" int main(int argc, char *argv[]) diff --git a/test/common_plat/validation/api/buffer/buffer.c b/test/common_plat/validation/api/buffer/buffer.c index 7c723d4f..bcc09d48 100644 --- a/test/common_plat/validation/api/buffer/buffer.c +++ b/test/common_plat/validation/api/buffer/buffer.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include <odp_api.h> #include "odp_cunit_common.h" #include "buffer.h" diff --git a/test/common_plat/validation/api/buffer/buffer_main.c b/test/common_plat/validation/api/buffer/buffer_main.c index 47168f8b..8642560d 100644 --- a/test/common_plat/validation/api/buffer/buffer_main.c +++ b/test/common_plat/validation/api/buffer/buffer_main.c @@ -3,6 +3,9 @@ * * SPDX-License-Identifier: BSD-3-Clause */ + +#include "config.h" + #include "buffer.h" int main(int argc, char *argv[]) diff --git a/test/common_plat/validation/api/classification/classification.c b/test/common_plat/validation/api/classification/classification.c index 1032e7f1..a0d290ec 100644 --- a/test/common_plat/validation/api/classification/classification.c +++ b/test/common_plat/validation/api/classification/classification.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include <odp_api.h> #include <odp_cunit_common.h> #include "odp_classification_testsuites.h" diff --git a/test/common_plat/validation/api/classification/classification_main.c b/test/common_plat/validation/api/classification/classification_main.c index 8902463c..51909d00 100644 --- a/test/common_plat/validation/api/classification/classification_main.c +++ b/test/common_plat/validation/api/classification/classification_main.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include "classification.h" int main(int argc, char *argv[]) diff --git a/test/common_plat/validation/api/classification/odp_classification_basic.c b/test/common_plat/validation/api/classification/odp_classification_basic.c index 3f4a82ed..c31a7530 100644 --- a/test/common_plat/validation/api/classification/odp_classification_basic.c +++ b/test/common_plat/validation/api/classification/odp_classification_basic.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include <odp_cunit_common.h> #include "odp_classification_testsuites.h" #include "classification.h" diff --git a/test/common_plat/validation/api/classification/odp_classification_common.c b/test/common_plat/validation/api/classification/odp_classification_common.c index de8a9327..e0c0808e 100644 --- a/test/common_plat/validation/api/classification/odp_classification_common.c +++ b/test/common_plat/validation/api/classification/odp_classification_common.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include "odp_classification_testsuites.h" #include "classification.h" #include <odp_cunit_common.h> diff --git a/test/common_plat/validation/api/classification/odp_classification_test_pmr.c b/test/common_plat/validation/api/classification/odp_classification_test_pmr.c index 0acf2cf7..15b76033 100644 --- a/test/common_plat/validation/api/classification/odp_classification_test_pmr.c +++ b/test/common_plat/validation/api/classification/odp_classification_test_pmr.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include "odp_classification_testsuites.h" #include "classification.h" #include <odp_cunit_common.h> diff --git a/test/common_plat/validation/api/classification/odp_classification_tests.c b/test/common_plat/validation/api/classification/odp_classification_tests.c index a0f73e39..1b044509 100644 --- a/test/common_plat/validation/api/classification/odp_classification_tests.c +++ b/test/common_plat/validation/api/classification/odp_classification_tests.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include "odp_classification_testsuites.h" #include "classification.h" #include <odp_cunit_common.h> diff --git a/test/common_plat/validation/api/cpumask/cpumask.c b/test/common_plat/validation/api/cpumask/cpumask.c index a0cb559f..e6ac8394 100644 --- a/test/common_plat/validation/api/cpumask/cpumask.c +++ b/test/common_plat/validation/api/cpumask/cpumask.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include <odp_api.h> #include "odp_cunit_common.h" diff --git a/test/common_plat/validation/api/cpumask/cpumask_main.c b/test/common_plat/validation/api/cpumask/cpumask_main.c index 39e3171c..77fdd228 100644 --- a/test/common_plat/validation/api/cpumask/cpumask_main.c +++ b/test/common_plat/validation/api/cpumask/cpumask_main.c @@ -3,6 +3,9 @@ * * SPDX-License-Identifier: BSD-3-Clause */ + +#include "config.h" + #include "cpumask.h" int main(int argc, char *argv[]) diff --git a/test/common_plat/validation/api/crypto/crypto.c b/test/common_plat/validation/api/crypto/crypto.c index 94beb2f1..ea661241 100644 --- a/test/common_plat/validation/api/crypto/crypto.c +++ b/test/common_plat/validation/api/crypto/crypto.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include <odp_api.h> #include <odp_cunit_common.h> #include "odp_crypto_test_inp.h" diff --git a/test/common_plat/validation/api/crypto/crypto_main.c b/test/common_plat/validation/api/crypto/crypto_main.c index d8c26fa2..2d5c6c7e 100644 --- a/test/common_plat/validation/api/crypto/crypto_main.c +++ b/test/common_plat/validation/api/crypto/crypto_main.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include "crypto.h" int main(int argc, char *argv[]) diff --git a/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c b/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c index ae600e23..442336d0 100644 --- a/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c +++ b/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include <odp_api.h> #include <CUnit/Basic.h> #include <odp_cunit_common.h> diff --git a/test/common_plat/validation/api/errno/errno.c b/test/common_plat/validation/api/errno/errno.c index e3b6ced5..929e0f40 100644 --- a/test/common_plat/validation/api/errno/errno.c +++ b/test/common_plat/validation/api/errno/errno.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include <odp_api.h> #include "odp_cunit_common.h" #include "errno.h" diff --git a/test/common_plat/validation/api/errno/errno_main.c b/test/common_plat/validation/api/errno/errno_main.c index 0138279e..2f2e3155 100644 --- a/test/common_plat/validation/api/errno/errno_main.c +++ b/test/common_plat/validation/api/errno/errno_main.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include "errno.h" int main(int argc, char *argv[]) diff --git a/test/common_plat/validation/api/hash/hash.c b/test/common_plat/validation/api/hash/hash.c index b353fcec..886df502 100644 --- a/test/common_plat/validation/api/hash/hash.c +++ b/test/common_plat/validation/api/hash/hash.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include <odp_api.h> #include <odp_cunit_common.h> #include "hash.h" diff --git a/test/common_plat/validation/api/hash/hash_main.c b/test/common_plat/validation/api/hash/hash_main.c index f9818b7b..089b1f95 100644 --- a/test/common_plat/validation/api/hash/hash_main.c +++ b/test/common_plat/validation/api/hash/hash_main.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include "hash.h" int main(int argc, char *argv[]) diff --git a/test/common_plat/validation/api/init/init.c b/test/common_plat/validation/api/init/init.c index 61055fad..d44ff234 100644 --- a/test/common_plat/validation/api/init/init.c +++ b/test/common_plat/validation/api/init/init.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include <stdarg.h> #include <stdlib.h> #include <odp_api.h> diff --git a/test/common_plat/validation/api/init/init_main_abort.c b/test/common_plat/validation/api/init/init_main_abort.c index 2e0faafb..1b043154 100644 --- a/test/common_plat/validation/api/init/init_main_abort.c +++ b/test/common_plat/validation/api/init/init_main_abort.c @@ -3,6 +3,9 @@ * * SPDX-License-Identifier: BSD-3-Clause */ + +#include "config.h" + #include "init.h" int main(int argc, char *argv[]) diff --git a/test/common_plat/validation/api/init/init_main_log.c b/test/common_plat/validation/api/init/init_main_log.c index 41dd00d7..d5d1ba6d 100644 --- a/test/common_plat/validation/api/init/init_main_log.c +++ b/test/common_plat/validation/api/init/init_main_log.c @@ -3,6 +3,9 @@ * * SPDX-License-Identifier: BSD-3-Clause */ + +#include "config.h" + #include "init.h" int main(int argc, char *argv[]) diff --git a/test/common_plat/validation/api/init/init_main_ok.c b/test/common_plat/validation/api/init/init_main_ok.c index 6053ec18..bb205f6d 100644 --- a/test/common_plat/validation/api/init/init_main_ok.c +++ b/test/common_plat/validation/api/init/init_main_ok.c @@ -3,6 +3,9 @@ * * SPDX-License-Identifier: BSD-3-Clause */ + +#include "config.h" + #include "init.h" int main(int argc, char *argv[]) diff --git a/test/common_plat/validation/api/lock/lock.c b/test/common_plat/validation/api/lock/lock.c index f8a1d8c0..48a659e8 100644 --- a/test/common_plat/validation/api/lock/lock.c +++ b/test/common_plat/validation/api/lock/lock.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include <malloc.h> #include <odp_api.h> #include <CUnit/Basic.h> diff --git a/test/common_plat/validation/api/lock/lock_main.c b/test/common_plat/validation/api/lock/lock_main.c index 5a30f02b..e182f77a 100644 --- a/test/common_plat/validation/api/lock/lock_main.c +++ b/test/common_plat/validation/api/lock/lock_main.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include "lock.h" int main(int argc, char *argv[]) diff --git a/test/common_plat/validation/api/packet/packet.c b/test/common_plat/validation/api/packet/packet.c index 284aaeb5..28bc12b0 100644 --- a/test/common_plat/validation/api/packet/packet.c +++ b/test/common_plat/validation/api/packet/packet.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include <stdlib.h> #include <odp_api.h> diff --git a/test/common_plat/validation/api/packet/packet_main.c b/test/common_plat/validation/api/packet/packet_main.c index 511bb104..a80e29a2 100644 --- a/test/common_plat/validation/api/packet/packet_main.c +++ b/test/common_plat/validation/api/packet/packet_main.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include "packet.h" int main(int argc, char *argv[]) diff --git a/test/common_plat/validation/api/pktio/parser.c b/test/common_plat/validation/api/pktio/parser.c index ad7101d0..dd293a44 100644 --- a/test/common_plat/validation/api/pktio/parser.c +++ b/test/common_plat/validation/api/pktio/parser.c @@ -3,6 +3,9 @@ * * SPDX-License-Identifier: BSD-3-Clause */ + +#include "config.h" + #include <odp_api.h> #include <odp_cunit_common.h> diff --git a/test/common_plat/validation/api/pktio/pktio.c b/test/common_plat/validation/api/pktio/pktio.c index c476a712..6a085729 100644 --- a/test/common_plat/validation/api/pktio/pktio.c +++ b/test/common_plat/validation/api/pktio/pktio.c @@ -3,6 +3,9 @@ * * SPDX-License-Identifier: BSD-3-Clause */ + +#include "config.h" + #include <odp_api.h> #include <odp_cunit_common.h> diff --git a/test/common_plat/validation/api/pktio/pktio_main.c b/test/common_plat/validation/api/pktio/pktio_main.c index 2928e1b8..13d2407a 100644 --- a/test/common_plat/validation/api/pktio/pktio_main.c +++ b/test/common_plat/validation/api/pktio/pktio_main.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include "pktio.h" int main(int argc, char *argv[]) diff --git a/test/common_plat/validation/api/pool/pool.c b/test/common_plat/validation/api/pool/pool.c index 8687941f..e633137a 100644 --- a/test/common_plat/validation/api/pool/pool.c +++ b/test/common_plat/validation/api/pool/pool.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include <odp_api.h> #include "odp_cunit_common.h" #include "pool.h" diff --git a/test/common_plat/validation/api/pool/pool_main.c b/test/common_plat/validation/api/pool/pool_main.c index bf06585b..c1eb7b7c 100644 --- a/test/common_plat/validation/api/pool/pool_main.c +++ b/test/common_plat/validation/api/pool/pool_main.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include "pool.h" int main(int argc, char *argv[]) diff --git a/test/common_plat/validation/api/queue/queue.c b/test/common_plat/validation/api/queue/queue.c index f08d811f..94d0a2fd 100644 --- a/test/common_plat/validation/api/queue/queue.c +++ b/test/common_plat/validation/api/queue/queue.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include <odp_api.h> #include <odp_cunit_common.h> #include "queue.h" diff --git a/test/common_plat/validation/api/queue/queue_main.c b/test/common_plat/validation/api/queue/queue_main.c index b461b860..7ed05411 100644 --- a/test/common_plat/validation/api/queue/queue_main.c +++ b/test/common_plat/validation/api/queue/queue_main.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include "queue.h" int main(int argc, char *argv[]) diff --git a/test/common_plat/validation/api/random/random.c b/test/common_plat/validation/api/random/random.c index a0e2ef72..071c265f 100644 --- a/test/common_plat/validation/api/random/random.c +++ b/test/common_plat/validation/api/random/random.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include <odp_api.h> #include <odp_cunit_common.h> #include "random.h" diff --git a/test/common_plat/validation/api/random/random_main.c b/test/common_plat/validation/api/random/random_main.c index 8f38a84c..ca9f5262 100644 --- a/test/common_plat/validation/api/random/random_main.c +++ b/test/common_plat/validation/api/random/random_main.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include "random.h" int main(int argc, char *argv[]) diff --git a/test/common_plat/validation/api/scheduler/scheduler.c b/test/common_plat/validation/api/scheduler/scheduler.c index 4f99435c..963275be 100644 --- a/test/common_plat/validation/api/scheduler/scheduler.c +++ b/test/common_plat/validation/api/scheduler/scheduler.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include <odp_api.h> #include "odp_cunit_common.h" #include "scheduler.h" diff --git a/test/common_plat/validation/api/scheduler/scheduler_main.c b/test/common_plat/validation/api/scheduler/scheduler_main.c index 57cfa5fc..73f3cedd 100644 --- a/test/common_plat/validation/api/scheduler/scheduler_main.c +++ b/test/common_plat/validation/api/scheduler/scheduler_main.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include "scheduler.h" int main(int argc, char *argv[]) diff --git a/test/common_plat/validation/api/shmem/shmem.c b/test/common_plat/validation/api/shmem/shmem.c index 0e757a70..08587940 100644 --- a/test/common_plat/validation/api/shmem/shmem.c +++ b/test/common_plat/validation/api/shmem/shmem.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include <odp_api.h> #include <odp_cunit_common.h> #include "shmem.h" diff --git a/test/common_plat/validation/api/shmem/shmem_main.c b/test/common_plat/validation/api/shmem/shmem_main.c index 4c691305..d51d4d83 100644 --- a/test/common_plat/validation/api/shmem/shmem_main.c +++ b/test/common_plat/validation/api/shmem/shmem_main.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include "shmem.h" int main(int argc, char *argv[]) diff --git a/test/common_plat/validation/api/std_clib/std_clib.c b/test/common_plat/validation/api/std_clib/std_clib.c index 7f089eab..33128eef 100644 --- a/test/common_plat/validation/api/std_clib/std_clib.c +++ b/test/common_plat/validation/api/std_clib/std_clib.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include <odp_api.h> #include <odp_cunit_common.h> #include "std_clib.h" diff --git a/test/common_plat/validation/api/std_clib/std_clib_main.c b/test/common_plat/validation/api/std_clib/std_clib_main.c index ef6f2736..dc63bb5b 100644 --- a/test/common_plat/validation/api/std_clib/std_clib_main.c +++ b/test/common_plat/validation/api/std_clib/std_clib_main.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include "std_clib.h" int main(int argc, char *argv[]) diff --git a/test/common_plat/validation/api/system/system.c b/test/common_plat/validation/api/system/system.c index 5b7ca01a..6873fcc4 100644 --- a/test/common_plat/validation/api/system/system.c +++ b/test/common_plat/validation/api/system/system.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include <ctype.h> #include <odp_api.h> #include <odp/api/cpumask.h> diff --git a/test/common_plat/validation/api/system/system_main.c b/test/common_plat/validation/api/system/system_main.c index 50d202a8..01720c6a 100644 --- a/test/common_plat/validation/api/system/system_main.c +++ b/test/common_plat/validation/api/system/system_main.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include "system.h" int main(int argc, char *argv[]) diff --git a/test/common_plat/validation/api/thread/thread.c b/test/common_plat/validation/api/thread/thread.c index 24f1c458..ada4affc 100644 --- a/test/common_plat/validation/api/thread/thread.c +++ b/test/common_plat/validation/api/thread/thread.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include <odp_api.h> #include <odp_cunit_common.h> #include <mask_common.h> diff --git a/test/common_plat/validation/api/thread/thread_main.c b/test/common_plat/validation/api/thread/thread_main.c index 53c75655..2e832836 100644 --- a/test/common_plat/validation/api/thread/thread_main.c +++ b/test/common_plat/validation/api/thread/thread_main.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include "thread.h" int main(int argc, char *argv[]) diff --git a/test/common_plat/validation/api/time/time.c b/test/common_plat/validation/api/time/time.c index e2ca2e17..ef137257 100644 --- a/test/common_plat/validation/api/time/time.c +++ b/test/common_plat/validation/api/time/time.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include <odp_api.h> #include "odp_cunit_common.h" #include "time_test.h" diff --git a/test/common_plat/validation/api/time/time_main.c b/test/common_plat/validation/api/time/time_main.c index bf1cfe7b..c39a0ea1 100644 --- a/test/common_plat/validation/api/time/time_main.c +++ b/test/common_plat/validation/api/time/time_main.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include "time_test.h" int main(int argc, char *argv[]) diff --git a/test/common_plat/validation/api/timer/timer.c b/test/common_plat/validation/api/timer/timer.c index b7d84c64..e88f21a7 100644 --- a/test/common_plat/validation/api/timer/timer.c +++ b/test/common_plat/validation/api/timer/timer.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + /** * @file */ diff --git a/test/common_plat/validation/api/timer/timer_main.c b/test/common_plat/validation/api/timer/timer_main.c index c318763f..f65c1e3a 100644 --- a/test/common_plat/validation/api/timer/timer_main.c +++ b/test/common_plat/validation/api/timer/timer_main.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include "timer.h" int main(int argc, char *argv[]) diff --git a/test/common_plat/validation/api/traffic_mngr/traffic_mngr.c b/test/common_plat/validation/api/traffic_mngr/traffic_mngr.c index a21ff8a1..fb7bb461 100644 --- a/test/common_plat/validation/api/traffic_mngr/traffic_mngr.c +++ b/test/common_plat/validation/api/traffic_mngr/traffic_mngr.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #ifndef _GNU_SOURCE #define _GNU_SOURCE #endif diff --git a/test/common_plat/validation/api/traffic_mngr/traffic_mngr_main.c b/test/common_plat/validation/api/traffic_mngr/traffic_mngr_main.c index 1fc1f78d..ec4555e6 100644 --- a/test/common_plat/validation/api/traffic_mngr/traffic_mngr_main.c +++ b/test/common_plat/validation/api/traffic_mngr/traffic_mngr_main.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include "traffic_mngr.h" int main(int argc, char *argv[]) diff --git a/test/linux-generic/mmap_vlan_ins/mmap_vlan_ins.c b/test/linux-generic/mmap_vlan_ins/mmap_vlan_ins.c index e91a9d0d..3238f9af 100644 --- a/test/linux-generic/mmap_vlan_ins/mmap_vlan_ins.c +++ b/test/linux-generic/mmap_vlan_ins/mmap_vlan_ins.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include <stdlib.h> #include <stdio.h> #include <getopt.h> diff --git a/test/linux-generic/pktio_ipc/ipc_common.c b/test/linux-generic/pktio_ipc/ipc_common.c index 85cbc8b4..2004c7d2 100644 --- a/test/linux-generic/pktio_ipc/ipc_common.c +++ b/test/linux-generic/pktio_ipc/ipc_common.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include "ipc_common.h" /** Run time in seconds */ diff --git a/test/linux-generic/pktio_ipc/pktio_ipc1.c b/test/linux-generic/pktio_ipc/pktio_ipc1.c index 5d8434bf..b1ed21b8 100644 --- a/test/linux-generic/pktio_ipc/pktio_ipc1.c +++ b/test/linux-generic/pktio_ipc/pktio_ipc1.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include "ipc_common.h" /** diff --git a/test/linux-generic/pktio_ipc/pktio_ipc2.c b/test/linux-generic/pktio_ipc/pktio_ipc2.c index 95d69e80..062ed9b7 100644 --- a/test/linux-generic/pktio_ipc/pktio_ipc2.c +++ b/test/linux-generic/pktio_ipc/pktio_ipc2.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + /** * @file * diff --git a/test/linux-generic/ring/ring_basic.c b/test/linux-generic/ring/ring_basic.c index 926dc465..62382bec 100644 --- a/test/linux-generic/ring/ring_basic.c +++ b/test/linux-generic/ring/ring_basic.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + /** * @file * diff --git a/test/linux-generic/ring/ring_main.c b/test/linux-generic/ring/ring_main.c index 71526884..b1f59a9b 100644 --- a/test/linux-generic/ring/ring_main.c +++ b/test/linux-generic/ring/ring_main.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include "ring_suites.h" int main(int argc, char *argv[]) diff --git a/test/linux-generic/ring/ring_stress.c b/test/linux-generic/ring/ring_stress.c index f4f573e6..115d130e 100644 --- a/test/linux-generic/ring/ring_stress.c +++ b/test/linux-generic/ring/ring_stress.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + /** * @file * diff --git a/test/linux-generic/ring/ring_suites.c b/test/linux-generic/ring/ring_suites.c index f321a762..153826ff 100644 --- a/test/linux-generic/ring/ring_suites.c +++ b/test/linux-generic/ring/ring_suites.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include <stdlib.h> #include <stdio.h> #include <string.h> diff --git a/test/linux-generic/validation/api/shmem/shmem_linux.c b/test/linux-generic/validation/api/shmem/shmem_linux.c index fe11a7db..10bbb6a4 100644 --- a/test/linux-generic/validation/api/shmem/shmem_linux.c +++ b/test/linux-generic/validation/api/shmem/shmem_linux.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + /* this test makes sure that odp shared memory created with the ODP_SHM_PROC * flag is visible under linux, and checks that memory created with the * ODP_SHM_EXPORT flag is visible by other ODP instances. diff --git a/test/linux-generic/validation/api/shmem/shmem_odp1.c b/test/linux-generic/validation/api/shmem/shmem_odp1.c index 0ced4554..8cd89c8f 100644 --- a/test/linux-generic/validation/api/shmem/shmem_odp1.c +++ b/test/linux-generic/validation/api/shmem/shmem_odp1.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include <odp.h> #include <linux/limits.h> #include <sys/types.h> diff --git a/test/linux-generic/validation/api/shmem/shmem_odp2.c b/test/linux-generic/validation/api/shmem/shmem_odp2.c index 0144407b..4f4fc3fe 100644 --- a/test/linux-generic/validation/api/shmem/shmem_odp2.c +++ b/test/linux-generic/validation/api/shmem/shmem_odp2.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include <odp.h> #include <linux/limits.h> #include <sys/types.h> commit ffdd8c7e423503b3e85b7fdfd844ad10692795d5 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue Aug 15 23:37:08 2017 +0300 test: don't redefine _GNU_SOURCE Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/common_plat/validation/api/traffic_mngr/traffic_mngr.c b/test/common_plat/validation/api/traffic_mngr/traffic_mngr.c index 88a7d8c7..a21ff8a1 100644 --- a/test/common_plat/validation/api/traffic_mngr/traffic_mngr.c +++ b/test/common_plat/validation/api/traffic_mngr/traffic_mngr.c @@ -4,7 +4,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#ifndef _GNU_SOURCE #define _GNU_SOURCE +#endif #include <stdlib.h> #include <stddef.h> diff --git a/test/linux-generic/pktio_ipc/ipc_common.h b/test/linux-generic/pktio_ipc/ipc_common.h index ca78b684..334788f3 100644 --- a/test/linux-generic/pktio_ipc/ipc_common.h +++ b/test/linux-generic/pktio_ipc/ipc_common.h @@ -6,7 +6,9 @@ #define _POSIX_C_SOURCE 200809L +#ifndef _GNU_SOURCE #define _GNU_SOURCE +#endif #include <sched.h> #include <stdlib.h> diff --git a/test/linux-generic/ring/ring_stress.c b/test/linux-generic/ring/ring_stress.c index b6ddb34e..f4f573e6 100644 --- a/test/linux-generic/ring/ring_stress.c +++ b/test/linux-generic/ring/ring_stress.c @@ -10,7 +10,9 @@ * ODP ring stress test */ +#ifndef _GNU_SOURCE #define _GNU_SOURCE +#endif #include <stdlib.h> #include <stdio.h> commit cd17794642638d6ee65b97bed9df5ddcd2cb2520 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Mon Aug 21 17:15:12 2017 +0300 helper: use config.h header Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/helper/chksum.c b/helper/chksum.c index ae70d97e..f8303b4e 100644 --- a/helper/chksum.c +++ b/helper/chksum.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include <odp.h> #include <odp/helper/ip.h> #include <odp/helper/udp.h> diff --git a/helper/cuckootable.c b/helper/cuckootable.c index 32800911..4707191d 100644 --- a/helper/cuckootable.c +++ b/helper/cuckootable.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + /*- * BSD LICENSE * diff --git a/helper/eth.c b/helper/eth.c index 9a151fa2..b7c2c6b7 100644 --- a/helper/eth.c +++ b/helper/eth.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include <odp/helper/eth.h> #include <stdio.h> diff --git a/helper/hashtable.c b/helper/hashtable.c index f26b18b2..b124c2d7 100644 --- a/helper/hashtable.c +++ b/helper/hashtable.c @@ -3,6 +3,9 @@ * * SPDX-License-Identifier: BSD-3-Clause */ + +#include "config.h" + #include <stdio.h> #include <string.h> #include <malloc.h> diff --git a/helper/ip.c b/helper/ip.c index eb73e5a0..463a45d0 100644 --- a/helper/ip.c +++ b/helper/ip.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include <odp/helper/ip.h> #include <stdio.h> diff --git a/helper/iplookuptable.c b/helper/iplookuptable.c index ac7d0587..7ca68de2 100644 --- a/helper/iplookuptable.c +++ b/helper/iplookuptable.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include <string.h> #include <stdint.h> #include <errno.h> diff --git a/helper/lineartable.c b/helper/lineartable.c index dd4a5995..831eb11b 100644 --- a/helper/lineartable.c +++ b/helper/lineartable.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include <stdio.h> #include <string.h> #include <malloc.h> diff --git a/helper/linux/thread.c b/helper/linux/thread.c index 52d4efc5..94ab83a9 100644 --- a/helper/linux/thread.c +++ b/helper/linux/thread.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #ifndef _GNU_SOURCE #define _GNU_SOURCE #endif diff --git a/helper/test/chksum.c b/helper/test/chksum.c index 1beae47f..914eab04 100644 --- a/helper/test/chksum.c +++ b/helper/test/chksum.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include "odph_debug.h" #include <odp_api.h> #include <odp/helper/odph_api.h> diff --git a/helper/test/cuckootable.c b/helper/test/cuckootable.c index be655911..ebe79167 100644 --- a/helper/test/cuckootable.c +++ b/helper/test/cuckootable.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + /*- * BSD LICENSE * diff --git a/helper/test/iplookuptable.c b/helper/test/iplookuptable.c index b5d774cb..e56e22c4 100644 --- a/helper/test/iplookuptable.c +++ b/helper/test/iplookuptable.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include <stdio.h> #include <stdint.h> #include <string.h> diff --git a/helper/test/linux/process.c b/helper/test/linux/process.c index e1ab8c83..12504d01 100644 --- a/helper/test/linux/process.c +++ b/helper/test/linux/process.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include <odph_debug.h> #include <odp_api.h> #include <odp/helper/linux/pthread.h> diff --git a/helper/test/linux/pthread.c b/helper/test/linux/pthread.c index 3422751f..a50df027 100644 --- a/helper/test/linux/pthread.c +++ b/helper/test/linux/pthread.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include <odph_debug.h> #include <odp_api.h> #include <odp/helper/linux/pthread.h> diff --git a/helper/test/odpthreads.c b/helper/test/odpthreads.c index ab890cb3..9ac269e8 100644 --- a/helper/test/odpthreads.c +++ b/helper/test/odpthreads.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + /* * This program tests the ability of the linux helper to create ODP threads, * either implemented as linux pthreads or as linux processes, depending on diff --git a/helper/test/parse.c b/helper/test/parse.c index 0429f2cc..d5f7b251 100644 --- a/helper/test/parse.c +++ b/helper/test/parse.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include <odph_debug.h> #include <odp_api.h> diff --git a/helper/test/table.c b/helper/test/table.c index ac454da5..b3d17e1f 100644 --- a/helper/test/table.c +++ b/helper/test/table.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier:BSD-3-Clause */ +#include "config.h" + #include <odph_debug.h> #include <odp/helper/odph_api.h> #include <odp_api.h> diff --git a/helper/threads.c b/helper/threads.c index cb747e5b..a83014d4 100644 --- a/helper/threads.c +++ b/helper/threads.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #ifndef _GNU_SOURCE #define _GNU_SOURCE #endif commit 0a7686e47e40db0f5f6b862d16e8b021da23f90b Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue Aug 15 12:01:28 2017 +0300 linux-gen: use config.h header Signed-off-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/_fdserver.c b/platform/linux-generic/_fdserver.c index d1b16f62..d15ddbec 100644 --- a/platform/linux-generic/_fdserver.c +++ b/platform/linux-generic/_fdserver.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + /* * This file implements a file descriptor sharing server enabling * sharing of file descriptors between processes, regardless of fork time. diff --git a/platform/linux-generic/_ishm.c b/platform/linux-generic/_ishm.c index 892e889b..82465bc5 100644 --- a/platform/linux-generic/_ishm.c +++ b/platform/linux-generic/_ishm.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + /* This file handles the internal shared memory: internal shared memory * is memory which is sharable by all ODP threads regardless of how the * ODP thread is implemented (pthread or process) and regardless of fork() diff --git a/platform/linux-generic/_ishmphy.c b/platform/linux-generic/_ishmphy.c index d519af60..76ec5728 100644 --- a/platform/linux-generic/_ishmphy.c +++ b/platform/linux-generic/_ishmphy.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + /* * This file handles the lower end of the ishm memory allocator: * It performs the physical mappings. diff --git a/platform/linux-generic/arch/arm/odp_cpu_arch.c b/platform/linux-generic/arch/arm/odp_cpu_arch.c index 28ee508b..6622e619 100644 --- a/platform/linux-generic/arch/arm/odp_cpu_arch.c +++ b/platform/linux-generic/arch/arm/odp_cpu_arch.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include <odp_posix_extensions.h> #include <stdlib.h> diff --git a/platform/linux-generic/arch/arm/odp_sysinfo_parse.c b/platform/linux-generic/arch/arm/odp_sysinfo_parse.c index 8ae2022a..1e9db418 100644 --- a/platform/linux-generic/arch/arm/odp_sysinfo_parse.c +++ b/platform/linux-generic/arch/arm/odp_sysinfo_parse.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include <odp_internal.h> #include <odp_debug_internal.h> #include <string.h> diff --git a/platform/linux-generic/arch/default/odp_cpu_arch.c b/platform/linux-generic/arch/default/odp_cpu_arch.c index c31f9084..fab351fe 100644 --- a/platform/linux-generic/arch/default/odp_cpu_arch.c +++ b/platform/linux-generic/arch/default/odp_cpu_arch.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include <odp_posix_extensions.h> #include <stdlib.h> diff --git a/platform/linux-generic/arch/default/odp_sysinfo_parse.c b/platform/linux-generic/arch/default/odp_sysinfo_parse.c index 8ae2022a..1e9db418 100644 --- a/platform/linux-generic/arch/default/odp_sysinfo_parse.c +++ b/platform/linux-generic/arch/default/odp_sysinfo_parse.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include <odp_internal.h> #include <odp_debug_internal.h> #include <string.h> diff --git a/platform/linux-generic/arch/mips64/odp_cpu_arch.c b/platform/linux-generic/arch/mips64/odp_cpu_arch.c index f7eafa0f..143867ea 100644 --- a/platform/linux-generic/arch/mips64/odp_cpu_arch.c +++ b/platform/linux-generic/arch/mips64/odp_cpu_arch.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include <odp/api/cpu.h> #include <odp/api/hints.h> #include <odp/api/system_info.h> diff --git a/platform/linux-generic/arch/mips64/odp_sysinfo_parse.c b/platform/linux-generic/arch/mips64/odp_sysinfo_parse.c index d6f75f28..2a37ae70 100644 --- a/platform/linux-generic/arch/mips64/odp_sysinfo_parse.c +++ b/platform/linux-generic/arch/mips64/odp_sysinfo_parse.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include <odp_internal.h> #include <string.h> diff --git a/platform/linux-generic/arch/powerpc/odp_cpu_arch.c b/platform/linux-generic/arch/powerpc/odp_cpu_arch.c index c31f9084..fab351fe 100644 --- a/platform/linux-generic/arch/powerpc/odp_cpu_arch.c +++ b/platform/linux-generic/arch/powerpc/odp_cpu_arch.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include <odp_posix_extensions.h> #include <stdlib.h> diff --git a/platform/linux-generic/arch/powerpc/odp_sysinfo_parse.c b/platform/linux-generic/arch/powerpc/odp_sysinfo_parse.c index bd4b9b42..29c97613 100644 --- a/platform/linux-generic/arch/powerpc/odp_sysinfo_parse.c +++ b/platform/linux-generic/arch/powerpc/odp_sysinfo_parse.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include <odp_internal.h> #include <string.h> diff --git a/platform/linux-generic/arch/x86/cpu_flags.c b/platform/linux-generic/arch/x86/cpu_flags.c index a492a35b..690a084e 100644 --- a/platform/linux-generic/arch/x86/cpu_flags.c +++ b/platform/linux-generic/arch/x86/cpu_flags.c @@ -37,6 +37,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "config.h" + #include <arch/x86/cpu_flags.h> #include <odp_debug_internal.h> #include <odp_time_internal.h> diff --git a/platform/linux-generic/arch/x86/odp_cpu_arch.c b/platform/linux-generic/arch/x86/odp_cpu_arch.c index b1da428b..50fbbac6 100644 --- a/platform/linux-generic/arch/x86/odp_cpu_arch.c +++ b/platform/linux-generic/arch/x86/odp_cpu_arch.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include <odp_posix_extensions.h> #include <odp/api/cpu.h> diff --git a/platform/linux-generic/arch/x86/odp_sysinfo_parse.c b/platform/linux-generic/arch/x86/odp_sysinfo_parse.c index d77165a4..f4a90ecd 100644 --- a/platform/linux-generic/arch/x86/odp_sysinfo_parse.c +++ b/platform/linux-generic/arch/x86/odp_sysinfo_parse.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include <odp_internal.h> #include <arch/x86/cpu_flags.h> #include <string.h> diff --git a/platform/linux-generic/odp_atomic.c b/platform/linux-generic/odp_atomic.c index 0e40cda5..53123b67 100644 --- a/platform/linux-generic/odp_atomic.c +++ b/platform/linux-generic/odp_atomic.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include <odp/api/atomic.h> #if ODP_ABI_COMPAT == 1 #include <odp/api/plat/atomic_inlines.h> diff --git a/platform/linux-generic/odp_barrier.c b/platform/linux-generic/odp_barrier.c index a2c62676..5eb354de 100644 --- a/platform/linux-generic/odp_barrier.c +++ b/platform/linux-generic/odp_barrier.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include <odp/api/barrier.h> #include <odp/api/sync.h> #include <odp/api/cpu.h> diff --git a/platform/linux-generic/odp_bitmap.c b/platform/linux-generic/odp_bitmap.c index a29b9ef2..b43c8fb9 100644 --- a/platform/linux-generic/odp_bitmap.c +++ b/platform/linux-generic/odp_bitmap.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include <string.h> #include <unistd.h> #include <odp/api/std_types.h> diff --git a/platform/linux-generic/odp_buffer.c b/platform/linux-generic/odp_buffer.c index 9c7dc1f5..1b148489 100644 --- a/platform/linux-generic/odp_buffer.c +++ b/platform/linux-generic/odp_buffer.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include <odp/api/buffer.h> #include <odp_pool_internal.h> #include <odp_buffer_internal.h> diff --git a/platform/linux-generic/odp_byteorder.c b/platform/linux-generic/odp_byteorder.c index a344c53f..a3d1f981 100644 --- a/platform/linux-generic/odp_byteorder.c +++ b/platform/linux-generic/odp_byteorder.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include <odp/api/byteorder.h> #if ODP_ABI_COMPAT == 1 #include <odp/api/plat/byteorder_inlines.h> diff --git a/platform/linux-generic/odp_classification.c b/platform/linux-generic/odp_classification.c index 5e9173dc..3dabb387 100644 --- a/platform/linux-generic/odp_classification.c +++ b/platform/linux-generic/odp_classification.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include <odp/api/classification.h> #include <odp/api/align.h> #include <odp/api/queue.h> diff --git a/platform/linux-generic/odp_cpu.c b/platform/linux-generic/odp_cpu.c index 282defd4..d208331d 100644 --- a/platform/linux-generic/odp_cpu.c +++ b/platform/linux-generic/odp_cpu.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include <odp/api/cpu.h> #include <odp/api/hints.h> diff --git a/platform/linux-generic/odp_cpumask.c b/platform/linux-generic/odp_cpumask.c index 64559a6d..ed5cb432 100644 --- a/platform/linux-generic/odp_cpumask.c +++ b/platform/linux-generic/odp_cpumask.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include <odp_posix_extensions.h> #include <sched.h> diff --git a/platform/linux-generic/odp_cpumask_task.c b/platform/linux-generic/odp_cpumask_task.c index 10885ce6..d05ae6d0 100644 --- a/platform/linux-generic/odp_cpumask_task.c +++ b/platform/linux-generic/odp_cpumask_task.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include <odp_posix_extensions.h> #include <sched.h> diff --git a/platform/linux-generic/odp_crypto.c b/platform/linux-generic/odp_crypto.c index ab42132a..563e919e 100644 --- a/platform/linux-generic/odp_crypto.c +++ b/platform/linux-generic/odp_crypto.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include <odp_posix_extensions.h> #include <odp/api/crypto.h> #include <odp_internal.h> diff --git a/platform/linux-generic/odp_errno.c b/platform/linux-generic/odp_errno.c index 408a4b95..57726d17 100644 --- a/platform/linux-generic/odp_errno.c +++ b/platform/linux-generic/odp_errno.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include <odp/api/errno.h> #include <odp_internal.h> #include <string.h> diff --git a/platform/linux-generic/odp_event.c b/platform/linux-generic/odp_event.c index d71f4464..c6e7bb45 100644 --- a/platform/linux-generic/odp_event.c +++ b/platform/linux-generic/odp_event.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include <odp/api/event.h> #include <odp/api/buffer.h> #include <odp/api/crypto.h> diff --git a/platform/linux-generic/odp_hash.c b/platform/linux-generic/odp_hash.c index 55876c33..4c7c83e8 100644 --- a/platform/linux-generic/odp_hash.c +++ b/platform/linux-generic/odp_hash.c @@ -37,6 +37,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "config.h" + #include <odp/api/hash.h> #include <odp/api/std_types.h> diff --git a/platform/linux-generic/odp_impl.c b/platform/linux-generic/odp_impl.c index 3fc2d6ab..5b452fba 100644 --- a/platform/linux-generic/odp_impl.c +++ b/platform/linux-generic/odp_impl.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + /** * @file diff --git a/platform/linux-generic/odp_init.c b/platform/linux-generic/odp_init.c index 7d029950..92a58370 100644 --- a/platform/linux-generic/odp_init.c +++ b/platform/linux-generic/odp_init.c @@ -3,6 +3,9 @@ * * SPDX-License-Identifier: BSD-3-Clause */ + +#include "config.h" + #include <odp/api/init.h> #include <odp_debug_internal.h> #include <odp/api/debug.h> diff --git a/platform/linux-generic/odp_name_table.c b/platform/linux-generic/odp_name_table.c index b116904d..3ff46b34 100644 --- a/platform/linux-generic/odp_name_table.c +++ b/platform/linux-generic/odp_name_table.c @@ -6,6 +6,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include <stdint.h> #include <string.h> #include <malloc.h> diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index f18bd4dd..1fc715ca 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include <odp/api/plat/packet_inlines.h> #include <odp/api/packet.h> #include <odp_packet_internal.h> diff --git a/platform/linux-generic/odp_packet_flags.c b/platform/linux-generic/odp_packet_flags.c index 72df1ecf..2e26ad60 100644 --- a/platform/linux-generic/odp_packet_flags.c +++ b/platform/linux-generic/odp_packet_flags.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include <odp/api/plat/packet_flag_inlines.h> #include <odp/api/packet_flags.h> #include <odp_packet_internal.h> diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c index 9419adf6..5cf94a14 100644 --- a/platform/linux-generic/odp_packet_io.c +++ b/platform/linux-generic/odp_packet_io.c @@ -3,6 +3,9 @@ * * SPDX-License-Identifier: BSD-3-Clause */ + +#include "config.h" + #include <odp_posix_extensions.h> #include <odp/api/packet_io.h> diff --git a/platform/linux-generic/odp_pkt_queue.c b/platform/linux-generic/odp_pkt_queue.c index f1086096..613e39dd 100644 --- a/platform/linux-generic/odp_pkt_queue.c +++ b/platform/linux-generic/odp_pkt_queue.c @@ -6,6 +6,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include <stdint.h> #include <string.h> #include <malloc.h> diff --git a/platform/linux-generic/odp_pool.c b/platform/linux-generic/odp_pool.c index 35e39f5d..34a38475 100644 --- a/platform/linux-generic/odp_pool.c +++ b/platform/linux-generic/odp_pool.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include <odp/api/pool.h> #include <odp/api/shared_memory.h> #include <odp/api/align.h> diff --git a/platform/linux-generic/odp_queue.c b/platform/linux-generic/odp_queue.c index 7ad346ad..d941accc 100644 --- a/platform/linux-generic/odp_queue.c +++ b/platform/linux-generic/odp_queue.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include <odp/api/queue.h> #include <odp_queue_internal.h> #include <odp_queue_if.h> diff --git a/platform/linux-generic/odp_queue_if.c b/platform/linux-generic/odp_queue_if.c index c91f00eb..5c3b863a 100644 --- a/platform/linux-generic/odp_queue_if.c +++ b/platform/linux-generic/odp_queue_if.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include <odp_queue_if.h> extern const queue_api_t queue_default_api; diff --git a/platform/linux-generic/odp_rwlock.c b/platform/linux-generic/odp_rwlock.c index 5bef13a4..55d717e8 100644 --- a/platform/linux-generic/odp_rwlock.c +++ b/platform/linux-generic/odp_rwlock.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include <stdbool.h> #include <odp/api/atomic.h> #include <odp/api/rwlock.h> diff --git a/platform/linux-generic/odp_rwlock_recursive.c b/platform/linux-generic/odp_rwlock_recursive.c index 6b022814..1f93df35 100644 --- a/platform/linux-generic/odp_rwlock_recursive.c +++ b/platform/linux-generic/odp_rwlock_recursive.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include <odp/api/rwlock_recursive.h> #include <odp/api/thread.h> #include <string.h> diff --git a/platform/linux-generic/odp_schedule.c b/platform/linux-generic/odp_schedule.c index 79b21ac7..debbb74e 100644 --- a/platform/linux-generic/odp_schedule.c +++ b/platform/linux-generic/odp_schedule.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include <string.h> #include <odp/api/schedule.h> #include <odp_schedule_if.h> diff --git a/platform/linux-generic/odp_schedule_if.c b/platform/linux-generic/odp_schedule_if.c index a9ede98d..bb99be8f 100644 --- a/platform/linux-generic/odp_schedule_if.c +++ b/platform/linux-generic/odp_schedule_if.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include <odp_schedule_if.h> extern const schedule_fn_t schedule_sp_fn; diff --git a/platform/linux-generic/odp_schedule_iquery.c b/platform/linux-generic/odp_schedule_iquery.c index c38c7c01..3702e58a 100644 --- a/platform/linux-generic/odp_schedule_iquery.c +++ b/platform/linux-generic/odp_schedule_iquery.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include <odp/api/schedule.h> #include <odp_schedule_if.h> #include <odp/api/align.h> diff --git a/platform/linux-generic/odp_schedule_sp.c b/platform/linux-generic/odp_schedule_sp.c index d2ba539c..e29c2646 100644 --- a/platform/linux-generic/odp_schedule_sp.c +++ b/platform/linux-generic/odp_schedule_sp.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include <string.h> #include <odp/api/ticketlock.h> #include <odp/api/thread.h> diff --git a/platform/linux-generic/odp_shared_memory.c b/platform/linux-generic/odp_shared_memory.c index a6faff6e..ccd25c8c 100644 --- a/platform/linux-generic/odp_shared_memory.c +++ b/platform/linux-generic/odp_shared_memory.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include <odp_config_internal.h> #include <odp/api/debug.h> #include <odp/api/std_types.h> diff --git a/platform/linux-generic/odp_sorted_list.c b/platform/linux-generic/odp_sorted_list.c index 8a1dc3ac..df604242 100644 --- a/platform/linux-generic/odp_sorted_list.c +++ b/platform/linux-generic/odp_sorted_list.c @@ -6,6 +6,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include <stdint.h> #include <string.h> #include <malloc.h> diff --git a/platform/linux-generic/odp_spinlock.c b/platform/linux-generic/odp_spinlock.c index cb0f0533..8ce7b173 100644 --- a/platform/linux-generic/odp_spinlock.c +++ b/platform/linux-generic/odp_spinlock.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include <odp/api/spinlock.h> #include <odp/api/cpu.h> #include <odp_atomic_internal.h> diff --git a/platform/linux-generic/odp_spinlock_recursive.c b/platform/linux-generic/odp_spinlock_recursive.c index 5ed481c4..5293c04b 100644 --- a/platform/linux-generic/odp_spinlock_recursive.c +++ b/platform/linux-generic/odp_spinlock_recursive.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include <odp/api/spinlock_recursive.h> #include <odp/api/thread.h> diff --git a/platform/linux-generic/odp_std_clib.c b/platform/linux-generic/odp_std_clib.c index 24df249d..ed7c6446 100644 --- a/platform/linux-generic/odp_std_clib.c +++ b/platform/linux-generic/odp_std_clib.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include <odp/api/std_clib.h> #if ODP_ABI_COMPAT == 1 #include <odp/api/plat/std_clib_inlines.h> diff --git a/platform/linux-generic/odp_sync.c b/platform/linux-generic/odp_sync.c index b7eb503c..7acdc92d 100644 --- a/platform/linux-generic/odp_sync.c +++ b/platform/linux-generic/odp_sync.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include <odp/api/sync.h> #if ODP_ABI_COMPAT == 1 #include <odp/api/plat/sync_inlines.h> diff --git a/platform/linux-generic/odp_system_info.c b/platform/linux-generic/odp_system_info.c index 40ffca07..d6eeb786 100644 --- a/platform/linux-generic/odp_system_info.c +++ b/platform/linux-generic/odp_system_info.c @@ -11,6 +11,8 @@ * All rights reserved. */ +#include "config.h" + #include <odp_posix_extensions.h> #include <odp/api/system_info.h> diff --git a/platform/linux-generic/odp_thread.c b/platform/linux-generic/odp_thread.c index 33a8a7f3..ffc247a4 100644 --- a/platform/linux-generic/odp_thread.c +++ b/platform/linux-generic/odp_thread.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include <odp_posix_extensions.h> #include <sched.h> diff --git a/platform/linux-generic/odp_thrmask.c b/platform/linux-generic/odp_thrmask.c index c176a5c6..f2144287 100644 --- a/platform/linux-generic/odp_thrmask.c +++ b/platform/linux-generic/odp_thrmask.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include <odp/api/thrmask.h> #include <odp/api/cpumask.h> diff --git a/platform/linux-generic/odp_ticketlock.c b/platform/linux-generic/odp_ticketlock.c index f73dd9ab..0c94f8ae 100644 --- a/platform/linux-generic/odp_ticketlock.c +++ b/platform/linux-generic/odp_ticketlock.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include <odp/api/plat/ticketlock_inlines.h> #include <odp/api/spec/ticketlock.h> diff --git a/platform/linux-generic/odp_time.c b/platform/linux-generic/odp_time.c index a831cc51..0df4682c 100644 --- a/platform/linux-generic/odp_time.c +++ b/platform/linux-generic/odp_time.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include <odp_posix_extensions.h> #include <time.h> diff --git a/platform/linux-generic/odp_timer.c b/platform/linux-generic/odp_timer.c index cf610bfa..3a8cfcdd 100644 --- a/platform/linux-generic/odp_timer.c +++ b/platform/linux-generic/odp_timer.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + /** * @file * diff --git a/platform/linux-generic/odp_timer_wheel.c b/platform/linux-generic/odp_timer_wheel.c index f2c802a8..1d0640c5 100644 --- a/platform/linux-generic/odp_timer_wheel.c +++ b/platform/linux-generic/odp_timer_wheel.c @@ -6,6 +6,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include <stdint.h> #include <string.h> #include <malloc.h> diff --git a/platform/linux-generic/odp_traffic_mngr.c b/platform/linux-generic/odp_traffic_mngr.c index 923f75a2..6d957326 100644 --- a/platform/linux-generic/odp_traffic_mngr.c +++ b/platform/linux-generic/odp_traffic_mngr.c @@ -6,6 +6,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #ifndef _GNU_SOURCE #define _GNU_SOURCE #endif diff --git a/platform/linux-generic/odp_version.c b/platform/linux-generic/odp_version.c index 7b704d05..84547acd 100644 --- a/platform/linux-generic/odp_version.c +++ b/platform/linux-generic/odp_version.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include <odp/api/version.h> const char *odp_version_api_str(void) diff --git a/platform/linux-generic/odp_weak.c b/platform/linux-generic/odp_weak.c index 0fbf6645..e8273009 100644 --- a/platform/linux-generic/odp_weak.c +++ b/platform/linux-generic/odp_weak.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include <odp_internal.h> #include <odp/api/debug.h> #include <odp_debug_internal.h> diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c index 19310651..b6d072ab 100644 --- a/platform/linux-generic/pktio/dpdk.c +++ b/platform/linux-generic/pktio/dpdk.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #ifdef ODP_PKTIO_DPDK #include <odp_posix_extensions.h> diff --git a/platform/linux-generic/pktio/ethtool.c b/platform/linux-generic/pktio/ethtool.c index 8f3c7e69..7d9869bf 100644 --- a/platform/linux-generic/pktio/ethtool.c +++ b/platform/linux-generic/pktio/ethtool.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #ifndef _GNU_SOURCE #define _GNU_SOURCE #endif diff --git a/platform/linux-generic/pktio/io_ops.c b/platform/linux-generic/pktio/io_ops.c index fbf30ca7..89d6203e 100644 --- a/platform/linux-generic/pktio/io_ops.c +++ b/platform/linux-generic/pktio/io_ops.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include <odp_packet_io_internal.h> /* Ops for all implementation of pktio. diff --git a/platform/linux-generic/pktio/ipc.c b/platform/linux-generic/pktio/ipc.c index 8c7db84e..a7f346ae 100644 --- a/platform/linux-generic/pktio/ipc.c +++ b/platform/linux-generic/pktio/ipc.c @@ -3,6 +3,9 @@ * * SPDX-License-Identifier: BSD-3-Clause */ + +#include "config.h" + #include <odp_packet_io_ipc_internal.h> #include <odp_debug_internal.h> #include <odp_packet_io_internal.h> diff --git a/platform/linux-generic/pktio/loop.c b/platform/linux-generic/pktio/loop.c index 68abb6d8..428b6ceb 100644 --- a/platform/linux-generic/pktio/loop.c +++ b/platform/linux-generic/pktio/loop.c @@ -5,6 +5,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include <odp_api.h> #include <odp_packet_internal.h> #include <odp_packet_io_internal.h> diff --git a/platform/linux-generic/pktio/netmap.c b/platform/linux-generic/pktio/netmap.c index 928bb00a..4d771fcb 100644 --- a/platform/linux-generic/pktio/netmap.c +++ b/platform/linux-generic/pktio/netmap.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #ifdef ODP_NETMAP #include <odp_posix_extensions.h> diff --git a/platform/linux-generic/pktio/pcap.c b/platform/linux-generic/pktio/pcap.c index a467b640..783b85a9 100644 --- a/platform/linux-generic/pktio/pcap.c +++ b/platform/linux-generic/pktio/pcap.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + /** * @file * diff --git a/platform/linux-generic/pktio/pktio_common.c b/platform/linux-generic/pktio/pktio_common.c index 611bb451..94add061 100644 --- a/platform/linux-generic/pktio/pktio_common.c +++ b/platform/linux-generic/pktio/pktio_common.c @@ -5,6 +5,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include <odp_packet_io_internal.h> #include <odp_classification_internal.h> #include <errno.h> diff --git a/platform/linux-generic/pktio/ring.c b/platform/linux-generic/pktio/ring.c index e3c73d1c..dff7d685 100644 --- a/platform/linux-generic/pktio/ring.c +++ b/platform/linux-generic/pktio/ring.c @@ -69,6 +69,8 @@ * ***************************************************************************/ +#include "config.h" + #include <odp_api.h> #include <fcntl.h> #include <stdio.h> diff --git a/platform/linux-generic/pktio/socket.c b/platform/linux-generic/pktio/socket.c index a383adc6..130c60d2 100644 --- a/platform/linux-generic/pktio/socket.c +++ b/platform/linux-generic/pktio/socket.c @@ -5,6 +5,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include <odp_posix_extensions.h> #include <sys/socket.h> diff --git a/platform/linux-generic/pktio/socket_mmap.c b/platform/linux-generic/pktio/socket_mmap.c index 6fc4b4cc..f7118023 100644 --- a/platform/linux-generic/pktio/socket_mmap.c +++ b/platform/linux-generic/pktio/socket_mmap.c @@ -5,6 +5,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include <odp_posix_extensions.h> #include <odp_packet_io_internal.h> diff --git a/platform/linux-generic/pktio/sysfs.c b/platform/linux-generic/pktio/sysfs.c index be0822dd..c3d4faea 100644 --- a/platform/linux-generic/pktio/sysfs.c +++ b/platform/linux-generic/pktio/sysfs.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include <odp_api.h> #include <odp_packet_io_internal.h> #include <errno.h> diff --git a/platform/linux-generic/pktio/tap.c b/platform/linux-generic/pktio/tap.c index 650c12a7..917db006 100644 --- a/platform/linux-generic/pktio/tap.c +++ b/platform/linux-generic/pktio/tap.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + /** * @file * commit 36a7c389d3e00d4c3987236bd8229c54d812f533 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue Aug 15 12:05:53 2017 +0300 linux-gen: pktio: ethtool: don't include linux/if.h net/if.h together with _USE_MISC (from _GNU_SOURCE) includes necessary definitions, so no point in including platform-specific linux/if.h. Signed-off-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/pktio/ethtool.c b/platform/linux-generic/pktio/ethtool.c index 482af5b6..8f3c7e69 100644 --- a/platform/linux-generic/pktio/ethtool.c +++ b/platform/linux-generic/pktio/ethtool.c @@ -4,10 +4,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#ifndef _GNU_SOURCE +#define _GNU_SOURCE +#endif #include <sys/ioctl.h> #include <netinet/in.h> #include <linux/sockios.h> -#include <linux/if.h> #include <linux/ethtool.h> #include <errno.h> #include <net/if.h> commit 26e1a355c7312e2fcc7196eb82ef49c74232035b Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue Aug 15 12:04:52 2017 +0300 linux-gen: tm: do not redefine _GNU_SOURCE Signed-off-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_traffic_mngr.c b/platform/linux-generic/odp_traffic_mngr.c index 53e10471..923f75a2 100644 --- a/platform/linux-generic/odp_traffic_mngr.c +++ b/platform/linux-generic/odp_traffic_mngr.c @@ -6,7 +6,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#ifndef _GNU_SOURCE #define _GNU_SOURCE +#endif #include <stdint.h> #include <string.h> #include <malloc.h> commit 6a9971dd8dd1cf982e7ae34ae2b62ccdadaed1c9 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue Aug 15 11:38:48 2017 +0300 linux-gen: pktio: ethtool: add void pointer type casts It makes sense to convert ifr_data to void pointer, since exact type is implementation-defined. Signed-off-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/pktio/ethtool.c b/platform/linux-generic/pktio/ethtool.c index d8f9e12c..482af5b6 100644 --- a/platform/linux-generic/pktio/ethtool.c +++ b/platform/linux-generic/pktio/ethtool.c @@ -30,13 +30,13 @@ static struct ethtool_gstrings *get_stringset(int fd, struct ifreq *ifr) sset_info.hdr.cmd = ETHTOOL_GSSET_INFO; sset_info.hdr.reserved = 0; sset_info.hdr.sset_mask = 1ULL << ETH_SS_STATS; - ifr->ifr_data = &sset_info; + ifr->ifr_data = (void *)&sset_info; if (ioctl(fd, SIOCETHTOOL, ifr) == 0) { len = sset_info.hdr.sset_mask ? sset_info.hdr.data[0] : 0; } else if (errno == EOPNOTSUPP && drvinfo_offset != 0) { /* Fallback for old kernel versions */ drvinfo.cmd = ETHTOOL_GDRVINFO; - ifr->ifr_data = &drvinfo; + ifr->ifr_data = (void *)&drvinfo; if (ioctl(fd, SIOCETHTOOL, ifr)) { __odp_errno = errno; ODP_ERR("Cannot get stats information\n"); @@ -62,7 +62,7 @@ static struct ethtool_gstrings *get_stringset(int fd, struct ifreq *ifr) strings->cmd = ETHTOOL_GSTRINGS; strings->string_set = ETH_SS_STATS; strings->len = len; - ifr->ifr_data = strings; + ifr->ifr_data = (void *)strings; if (ioctl(fd, SIOCETHTOOL, ifr)) { __odp_errno = errno; ODP_ERR("Cannot get stats information\n"); @@ -101,7 +101,7 @@ static int ethtool_stats(int fd, struct ifreq *ifr, odp_pktio_stats_t *stats) estats->cmd = ETHTOOL_GSTATS; estats->n_stats = n_stats; - ifr->ifr_data = estats; + ifr->ifr_data = (void *)estats; err = ioctl(fd, SIOCETHTOOL, ifr); if (err < 0) { __odp_errno = errno; commit f637a36cd2a7fc125a2d90ed5a93933007987e95 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue Aug 15 11:38:00 2017 +0300 configure: move configure header to include dir It does not make sense to have config.h just in helper tree. It should be also used by the rest of the code. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/.gitignore b/.gitignore index cce24282..1652a814 100644 --- a/.gitignore +++ b/.gitignore @@ -34,6 +34,9 @@ depcomp doc/output dpdk/ install-sh +include/config.h.in +include/config.h +include/stamp-h1 lib/ libtool ltmain.sh diff --git a/configure.ac b/configure.ac index 51dd9352..8791905b 100644 --- a/configure.ac +++ b/configure.ac @@ -20,8 +20,8 @@ AC_CONFIG_FILES([include/odp/api/spec/version.h include/odp/api/spec/deprecated.h]) AM_INIT_AUTOMAKE([1.9 tar-pax subdir-objects]) -AC_CONFIG_SRCDIR([helper/config.h.in]) -AM_CONFIG_HEADER([helper/config.h]) +AC_CONFIG_SRCDIR([include/odp/api/spec/init.h]) +AM_CONFIG_HEADER([include/config.h]) AC_USE_SYSTEM_EXTENSIONS AC_SYS_LARGEFILE diff --git a/helper/.gitignore b/helper/.gitignore deleted file mode 100644 index f282c157..00000000 --- a/helper/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -config.h.in -config.h -stamp-h1 ----------------------------------------------------------------------- Summary of changes: .gitignore | 3 + .travis.yml | 2 +- Makefile.am | 1 - configure.ac | 66 ++++++++++++---------- helper/.gitignore | 3 - helper/chksum.c | 2 + helper/cuckootable.c | 2 + helper/eth.c | 2 + helper/hashtable.c | 3 + helper/ip.c | 2 + helper/iplookuptable.c | 2 + helper/lineartable.c | 2 + helper/linux/thread.c | 2 + helper/test/chksum.c | 2 + helper/test/cuckootable.c | 2 + helper/test/iplookuptable.c | 2 + helper/test/linux/process.c | 2 + helper/test/linux/pthread.c | 2 + helper/test/odpthreads.c | 2 + helper/test/parse.c | 2 + helper/test/table.c | 2 + helper/threads.c | 2 + m4/ax_check_compile_flag.m4 | 12 ++-- platform/linux-generic/Makefile.am | 1 - platform/linux-generic/_fdserver.c | 2 + platform/linux-generic/_ishm.c | 2 + platform/linux-generic/_ishmphy.c | 2 + platform/linux-generic/arch/arm/odp_cpu_arch.c | 2 + .../linux-generic/arch/arm/odp_sysinfo_parse.c | 2 + platform/linux-generic/arch/default/odp_cpu_arch.c | 2 + .../linux-generic/arch/default/odp_sysinfo_parse.c | 2 + platform/linux-generic/arch/mips64/odp_cpu_arch.c | 2 + .../linux-generic/arch/mips64/odp_sysinfo_parse.c | 2 + platform/linux-generic/arch/powerpc/odp_cpu_arch.c | 2 + .../linux-generic/arch/powerpc/odp_sysinfo_parse.c | 2 + platform/linux-generic/arch/x86/cpu_flags.c | 4 +- platform/linux-generic/arch/x86/odp_cpu_arch.c | 2 + .../linux-generic/arch/x86/odp_sysinfo_parse.c | 4 +- .../linux-generic/include/odp_buffer_internal.h | 3 +- platform/linux-generic/m4/odp_dpdk.m4 | 6 +- platform/linux-generic/m4/odp_netmap.m4 | 3 +- platform/linux-generic/m4/odp_pcap.m4 | 2 +- platform/linux-generic/m4/odp_schedule.m4 | 6 +- platform/linux-generic/odp_atomic.c | 2 + platform/linux-generic/odp_barrier.c | 2 + platform/linux-generic/odp_bitmap.c | 2 + platform/linux-generic/odp_buffer.c | 2 + platform/linux-generic/odp_byteorder.c | 2 + platform/linux-generic/odp_classification.c | 2 + platform/linux-generic/odp_cpu.c | 2 + platform/linux-generic/odp_cpumask.c | 2 + platform/linux-generic/odp_cpumask_task.c | 2 + platform/linux-generic/odp_crypto.c | 2 + platform/linux-generic/odp_errno.c | 2 + platform/linux-generic/odp_event.c | 2 + platform/linux-generic/odp_hash.c | 2 + platform/linux-generic/odp_impl.c | 2 + platform/linux-generic/odp_init.c | 3 + platform/linux-generic/odp_name_table.c | 2 + platform/linux-generic/odp_packet.c | 2 + platform/linux-generic/odp_packet_flags.c | 2 + platform/linux-generic/odp_packet_io.c | 3 + platform/linux-generic/odp_pkt_queue.c | 2 + platform/linux-generic/odp_pool.c | 4 +- platform/linux-generic/odp_queue.c | 2 + platform/linux-generic/odp_queue_if.c | 2 + platform/linux-generic/odp_rwlock.c | 2 + platform/linux-generic/odp_rwlock_recursive.c | 2 + platform/linux-generic/odp_schedule.c | 2 + platform/linux-generic/odp_schedule_if.c | 2 + platform/linux-generic/odp_schedule_iquery.c | 2 + platform/linux-generic/odp_schedule_sp.c | 2 + platform/linux-generic/odp_shared_memory.c | 2 + platform/linux-generic/odp_sorted_list.c | 2 + platform/linux-generic/odp_spinlock.c | 2 + platform/linux-generic/odp_spinlock_recursive.c | 2 + platform/linux-generic/odp_std_clib.c | 2 + platform/linux-generic/odp_sync.c | 2 + platform/linux-generic/odp_system_info.c | 2 + platform/linux-generic/odp_thread.c | 2 + platform/linux-generic/odp_thrmask.c | 2 + platform/linux-generic/odp_ticketlock.c | 2 + platform/linux-generic/odp_time.c | 2 + platform/linux-generic/odp_timer.c | 2 + platform/linux-generic/odp_timer_wheel.c | 2 + platform/linux-generic/odp_traffic_mngr.c | 4 ++ platform/linux-generic/odp_version.c | 2 + platform/linux-generic/odp_weak.c | 2 + platform/linux-generic/pktio/dpdk.c | 2 + platform/linux-generic/pktio/ethtool.c | 14 +++-- platform/linux-generic/pktio/io_ops.c | 4 +- platform/linux-generic/pktio/ipc.c | 3 + platform/linux-generic/pktio/loop.c | 2 + platform/linux-generic/pktio/netmap.c | 2 + platform/linux-generic/pktio/pcap.c | 2 + platform/linux-generic/pktio/pktio_common.c | 2 + platform/linux-generic/pktio/ring.c | 6 ++ platform/linux-generic/pktio/socket.c | 2 + platform/linux-generic/pktio/socket_mmap.c | 2 + platform/linux-generic/pktio/sysfs.c | 2 + platform/linux-generic/pktio/tap.c | 2 + test/common_plat/common/Makefile.am | 1 - test/common_plat/common/mask_common.c | 2 + test/common_plat/common/odp_cunit_common.c | 4 +- test/common_plat/performance/odp_bench_packet.c | 2 + test/common_plat/performance/odp_crypto.c | 2 + test/common_plat/performance/odp_l2fwd.c | 2 + test/common_plat/performance/odp_pktio_ordered.c | 4 +- test/common_plat/performance/odp_pktio_perf.c | 3 + test/common_plat/performance/odp_sched_latency.c | 2 + test/common_plat/performance/odp_scheduling.c | 2 + test/common_plat/validation/api/Makefile.inc | 5 -- test/common_plat/validation/api/atomic/atomic.c | 2 + .../validation/api/atomic/atomic_main.c | 2 + test/common_plat/validation/api/barrier/barrier.c | 2 + .../validation/api/barrier/barrier_main.c | 2 + test/common_plat/validation/api/buffer/buffer.c | 2 + .../validation/api/buffer/buffer_main.c | 3 + .../validation/api/classification/classification.c | 2 + .../api/classification/classification_main.c | 2 + .../api/classification/odp_classification_basic.c | 2 + .../api/classification/odp_classification_common.c | 2 + .../classification/odp_classification_test_pmr.c | 2 + .../api/classification/odp_classification_tests.c | 2 + test/common_plat/validation/api/cpumask/cpumask.c | 2 + .../validation/api/cpumask/cpumask_main.c | 3 + test/common_plat/validation/api/crypto/crypto.c | 2 + .../validation/api/crypto/crypto_main.c | 2 + .../validation/api/crypto/odp_crypto_test_inp.c | 2 + test/common_plat/validation/api/errno/errno.c | 2 + test/common_plat/validation/api/errno/errno_main.c | 2 + test/common_plat/validation/api/hash/hash.c | 2 + test/common_plat/validation/api/hash/hash_main.c | 2 + test/common_plat/validation/api/init/init.c | 2 + .../validation/api/init/init_main_abort.c | 3 + .../validation/api/init/init_main_log.c | 3 + .../common_plat/validation/api/init/init_main_ok.c | 3 + test/common_plat/validation/api/lock/lock.c | 2 + test/common_plat/validation/api/lock/lock_main.c | 2 + test/common_plat/validation/api/packet/packet.c | 2 + .../validation/api/packet/packet_main.c | 2 + test/common_plat/validation/api/pktio/parser.c | 3 + test/common_plat/validation/api/pktio/pktio.c | 3 + test/common_plat/validation/api/pktio/pktio_main.c | 2 + test/common_plat/validation/api/pool/pool.c | 2 + test/common_plat/validation/api/pool/pool_main.c | 2 + test/common_plat/validation/api/queue/queue.c | 2 + test/common_plat/validation/api/queue/queue_main.c | 2 + test/common_plat/validation/api/random/random.c | 2 + .../validation/api/random/random_main.c | 2 + .../validation/api/scheduler/scheduler.c | 2 + .../validation/api/scheduler/scheduler_main.c | 2 + test/common_plat/validation/api/shmem/shmem.c | 2 + test/common_plat/validation/api/shmem/shmem_main.c | 2 + .../common_plat/validation/api/std_clib/std_clib.c | 2 + .../validation/api/std_clib/std_clib_main.c | 2 + test/common_plat/validation/api/system/system.c | 2 + .../validation/api/system/system_main.c | 2 + test/common_plat/validation/api/thread/thread.c | 2 + .../validation/api/thread/thread_main.c | 2 + test/common_plat/validation/api/time/time.c | 2 + test/common_plat/validation/api/time/time_main.c | 2 + test/common_plat/validation/api/timer/timer.c | 2 + test/common_plat/validation/api/timer/timer_main.c | 2 + .../validation/api/traffic_mngr/traffic_mngr.c | 4 ++ .../api/traffic_mngr/traffic_mngr_main.c | 2 + test/linux-generic/mmap_vlan_ins/mmap_vlan_ins.c | 2 + test/linux-generic/pktio_ipc/ipc_common.c | 2 + test/linux-generic/pktio_ipc/ipc_common.h | 2 + test/linux-generic/pktio_ipc/pktio_ipc1.c | 2 + test/linux-generic/pktio_ipc/pktio_ipc2.c | 2 + test/linux-generic/ring/Makefile.am | 1 + test/linux-generic/ring/ring_basic.c | 2 + test/linux-generic/ring/ring_main.c | 2 + test/linux-generic/ring/ring_stress.c | 4 ++ test/linux-generic/ring/ring_suites.c | 2 + .../linux-generic/validation/api/shmem/Makefile.am | 1 + .../validation/api/shmem/shmem_linux.c | 2 + .../validation/api/shmem/shmem_odp1.c | 2 + .../validation/api/shmem/shmem_odp2.c | 2 + 180 files changed, 424 insertions(+), 66 deletions(-) delete mode 100644 helper/.gitignore hooks/post-receive --

7 years, 10 months

[COMMIT] branch cloud-dev updated. v1.15.0.0-594-g0242ecfa

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, cloud-dev has been updated via 0242ecfa64a663b7584054edcf02a8f9913391d6 (commit) from 3cdc8a07993b93b145dc3b4a373b5ebc33bae882 (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 0242ecfa64a663b7584054edcf02a8f9913391d6 Author: Balakrishna Garapati <balakrishna.garapati(a)linaro.org> Date: Tue Aug 22 11:19:00 2017 +0200 linux-dpdk: introduce pool modular framework Signed-off-by: Balakrishna Garapati <balakrishna.garapati(a)linaro.org> Reviewed-by: Brian Brooks <brian.brooks(a)arm.com> Reviewed-by: Yi He <yi.he(a)linaro.org> diff --git a/platform/linux-dpdk/Makefile.am b/platform/linux-dpdk/Makefile.am index 3789da3d..6e7f0b1d 100644 --- a/platform/linux-dpdk/Makefile.am +++ b/platform/linux-dpdk/Makefile.am @@ -17,6 +17,7 @@ endif AM_CFLAGS += $(PLAT_CFLAGS) AM_CFLAGS += -I$(srcdir)/include AM_CFLAGS += -I$(top_srcdir)/platform/linux-generic/include +AM_CFLAGS += -I$(top_srcdir)/frameworks/modular AM_CFLAGS += -I$(top_srcdir)/include/odp/arch/@ARCH_ABI@ AM_CFLAGS += -I$(top_srcdir)/include AM_CFLAGS += -I$(top_builddir)/include @@ -196,6 +197,7 @@ noinst_HEADERS = \ ${top_srcdir}/platform/linux-generic/include/odp_packet_socket.h \ ${top_srcdir}/platform/linux-generic/include/odp_pkt_queue_internal.h \ ${srcdir}/include/odp_pool_internal.h \ + ${top_srcdir}/platform/linux-generic/include/odp_pool_subsystem.h \ ${srcdir}/include/odp_posix_extensions.h \ ${top_srcdir}/platform/linux-generic/include/odp_queue_internal.h \ ${top_srcdir}/platform/linux-generic/include/odp_queue_if.h \ @@ -243,11 +245,12 @@ __LIB__libodp_dpdk_la_SOURCES = \ ../linux-generic/odp_packet_io.c \ ../linux-generic/pktio/loop.c \ ../linux-generic/odp_pkt_queue.c \ - odp_pool.c \ + pool/dpdk.c \ ../linux-generic/odp_queue.c \ ../linux-generic/odp_queue_if.c \ ../linux-generic/odp_rwlock.c \ ../linux-generic/odp_rwlock_recursive.c \ + ../linux-generic/pool/subsystem.c \ ../linux-generic/odp_schedule.c \ ../linux-generic/odp_schedule_if.c \ ../linux-generic/odp_schedule_iquery.c \ @@ -291,6 +294,8 @@ __LIB__libodp_dpdk_la_SOURCES += arch/x86/cpu_flags.c \ arch/x86/odp_sysinfo_parse.c endif +pool/dpdk.lo: AM_CFLAGS += -DIM_ACTIVE_MODULE + # Build modular framework into odp-linux library modularframeworkdir = $(top_srcdir)/frameworks/modular noinst_HEADERS += $(modularframeworkdir)/list.h \ diff --git a/platform/linux-dpdk/include/odp_pool_internal.h b/platform/linux-dpdk/include/odp_pool_internal.h index 0c157592..b49cc114 100644 --- a/platform/linux-dpdk/include/odp_pool_internal.h +++ b/platform/linux-dpdk/include/odp_pool_internal.h @@ -20,6 +20,7 @@ extern "C" { #include <odp/api/std_types.h> #include <odp/api/pool.h> +#include <odp_pool_subsystem.h> #include <odp_buffer_internal.h> #include <odp/api/packet_io.h> #include <odp/api/align.h> diff --git a/platform/linux-dpdk/odp_buffer.c b/platform/linux-dpdk/odp_buffer.c index 5207f253..3c71fef8 100644 --- a/platform/linux-dpdk/odp_buffer.c +++ b/platform/linux-dpdk/odp_buffer.c @@ -106,3 +106,8 @@ uint64_t odp_buffer_to_u64(odp_buffer_t hdl) { return _odp_pri(hdl); } + +odp_pool_t odp_buffer_pool(odp_buffer_t buf) +{ + return buf_hdl_to_hdr(buf)->pool_hdl; +} diff --git a/platform/linux-dpdk/odp_pool.c b/platform/linux-dpdk/pool/dpdk.c similarity index 90% rename from platform/linux-dpdk/odp_pool.c rename to platform/linux-dpdk/pool/dpdk.c index b67c2aa8..1209553b 100644 --- a/platform/linux-dpdk/odp_pool.c +++ b/platform/linux-dpdk/pool/dpdk.c @@ -48,15 +48,13 @@ typedef struct pool_table_t { odp_shm_t shm; } pool_table_t; - /* The pool table ptr - resides in shared memory */ static pool_table_t *pool_tbl; /* Pool entry pointers (for inlining) */ void *pool_entry_ptr[ODP_CONFIG_POOLS]; - -int odp_pool_init_global(void) +static int dpdk_pool_init_global(void) { uint32_t i; odp_shm_t shm; @@ -76,6 +74,7 @@ int odp_pool_init_global(void) for (i = 0; i < ODP_CONFIG_POOLS; i++) { /* init locks */ pool_entry_t *pool = &pool_tbl->pool[i]; + LOCK_INIT(&pool->s.lock); pool->s.pool_hdl = pool_index_to_handle(i); @@ -91,12 +90,12 @@ int odp_pool_init_global(void) return 0; } -int odp_pool_init_local(void) +static int dpdk_pool_init_local(void) { return 0; } -int odp_pool_term_global(void) +static int dpdk_pool_term_global(void) { int ret; @@ -107,12 +106,12 @@ int odp_pool_term_global(void) return ret; } -int odp_pool_term_local(void) +static int dpdk_pool_term_local(void) { return 0; } -int odp_pool_capability(odp_pool_capability_t *capa) +static int dpdk_pool_capability(odp_pool_capability_t *capa) { memset(capa, 0, sizeof(odp_pool_capability_t)); @@ -163,8 +162,8 @@ odp_dpdk_mbuf_pool_ctor(struct rte_mempool *mp, if (mp->private_data_size < sizeof(struct mbuf_pool_ctor_arg)) { ODP_ERR("(%s) private_data_size %d < %d", - mp->name, (int) mp->private_data_size, - (int) sizeof(struct mbuf_pool_ctor_arg)); + mp->name, (int)mp->private_data_size, + (int)sizeof(struct mbuf_pool_ctor_arg)); return; } mbp_priv = rte_mempool_get_priv(mp); @@ -205,6 +204,7 @@ odp_dpdk_mbuf_ctor(struct rte_mempool *mp, /* keep some headroom between start of buffer and data */ if (mb_ctor_arg->type == ODP_POOL_PACKET) { odp_packet_hdr_t *pkt_hdr; + mb->data_off = RTE_PKTMBUF_HEADROOM; mb->nb_segs = 1; mb->port = 0xff; @@ -299,7 +299,8 @@ static int check_params(odp_pool_param_t *params) return 0; } -odp_pool_t odp_pool_create(const char *name, odp_pool_param_t *params) +static odp_pool_t dpdk_pool_create(const char *name, + odp_pool_param_t *params) { struct mbuf_pool_ctor_arg mbp_ctor_arg; struct mbuf_ctor_arg mb_ctor_arg; @@ -325,7 +326,7 @@ odp_pool_t odp_pool_create(const char *name, odp_pool_param_t *params) pool_name[ODP_POOL_NAME_LEN - 1] = 0; } - /* Find an unused buffer pool slot and initalize it as requested */ + /* Find an unused buffer pool slot and initialize it as requested */ for (i = 0; i < ODP_CONFIG_POOLS; i++) { uint32_t num; struct rte_mempool *mp; @@ -424,7 +425,6 @@ odp_pool_t odp_pool_create(const char *name, odp_pool_param_t *params) params->type); UNLOCK(&pool->s.lock); return ODP_POOL_INVALID; - break; } mb_ctor_arg.seg_buf_offset = @@ -448,7 +448,7 @@ odp_pool_t odp_pool_create(const char *name, odp_pool_param_t *params) break; } if (odp_unlikely(cache_size > RTE_MEMPOOL_CACHE_MAX_SIZE || - (uint32_t) cache_size * 1.5 > num)) { + (uint32_t)cache_size * 1.5 > num)) { ODP_ERR("cache_size calc failure: %d\n", cache_size); cache_size = 0; } @@ -506,8 +506,7 @@ odp_pool_t odp_pool_create(const char *name, odp_pool_param_t *params) return pool_hdl; } - -odp_pool_t odp_pool_lookup(const char *name) +static odp_pool_t dpdk_pool_lookup(const char *name) { struct rte_mempool *mp = NULL; odp_pool_t pool_hdl = ODP_POOL_INVALID; @@ -519,6 +518,7 @@ odp_pool_t odp_pool_lookup(const char *name) for (i = 0; i < ODP_CONFIG_POOLS; i++) { pool_entry_t *pool = get_pool_entry(i); + LOCK(&pool->s.lock); if (pool->s.rte_mempool != mp) { UNLOCK(&pool->s.lock); @@ -530,7 +530,6 @@ odp_pool_t odp_pool_lookup(const char *name) return pool_hdl; } - static odp_buffer_t buffer_alloc(pool_entry_t *pool) { odp_buffer_t buffer; @@ -546,10 +545,10 @@ static odp_buffer_t buffer_alloc(pool_entry_t *pool) if ((struct rte_mbuf *)buffer == NULL) { rte_errno = ENOMEM; return ODP_BUFFER_INVALID; - } else { - buf_hdl_to_hdr(buffer)->next = NULL; - return buffer; } + + buf_hdl_to_hdr(buffer)->next = NULL; + return buffer; } odp_buffer_t odp_buffer_alloc(odp_pool_t pool_hdl) @@ -595,16 +594,18 @@ void odp_buffer_free_multi(const odp_buffer_t buf[], int num) } } -void odp_pool_print(odp_pool_t pool_hdl) +static void dpdk_pool_print(odp_pool_t pool_hdl) { uint32_t pool_id = pool_handle_to_index(pool_hdl); pool_entry_t *pool = get_pool_entry(pool_id); + rte_mempool_dump(stdout, pool->s.rte_mempool); } -int odp_pool_info(odp_pool_t pool_hdl, odp_pool_info_t *info) +static int dpdk_pool_info(odp_pool_t pool_hdl, odp_pool_info_t *info) { uint32_t pool_id = pool_handle_to_index(pool_hdl); + pool_entry_t *pool = get_pool_entry(pool_id); if (pool == NULL || info == NULL) @@ -618,15 +619,15 @@ int odp_pool_info(odp_pool_t pool_hdl, odp_pool_info_t *info) /* * DPDK doesn't support pool destroy at the moment. Instead we should improve - * odp_pool_create() to try to reuse pools + * dpdk_pool_create() to try to reuse pools */ -int odp_pool_destroy(odp_pool_t pool_hdl) +static int dpdk_pool_destroy(odp_pool_t pool_hdl) { uint32_t pool_id = pool_handle_to_index(pool_hdl); pool_entry_t *pool = get_pool_entry(pool_id); - struct rte_mempool *mp; + struct rte_mempool *mp = rte_mempool_lookup(pool->s.name); - if ((mp = rte_mempool_lookup(pool->s.name)) == NULL) { + if (mp == NULL) { ODP_ERR("Can't find pool with this name!\n"); return -1; } @@ -637,18 +638,36 @@ int odp_pool_destroy(odp_pool_t pool_hdl) return 0; } -odp_pool_t odp_buffer_pool(odp_buffer_t buf) -{ - return buf_hdl_to_hdr(buf)->pool_hdl; -} - -void odp_pool_param_init(odp_pool_param_t *params) +static void dpdk_pool_param_init(odp_pool_param_t *params) { memset(params, 0, sizeof(odp_pool_param_t)); } -uint64_t odp_pool_to_u64(odp_pool_t hdl) +static uint64_t dpdk_pool_to_u64(odp_pool_t hdl) { return _odp_pri(hdl); } +pool_module_t dpdk_pool = { + .base = { + .name = "dpdk_pool", + .init_local = dpdk_pool_init_local, + .term_local = dpdk_pool_term_local, + .init_global = dpdk_pool_init_global, + .term_global = dpdk_pool_term_global, + }, + .capability = dpdk_pool_capability, + .create = dpdk_pool_create, + .destroy = dpdk_pool_destroy, + .lookup = dpdk_pool_lookup, + .info = dpdk_pool_info, + .print = dpdk_pool_print, + .to_u64 = dpdk_pool_to_u64, + .param_init = dpdk_pool_param_init, +}; + +ODP_MODULE_CONSTRUCTOR(dpdk_pool) +{ + odp_module_constructor(&dpdk_pool); + odp_subsystem_register_module(pool, &dpdk_pool); +} ----------------------------------------------------------------------- Summary of changes: platform/linux-dpdk/Makefile.am | 7 ++- platform/linux-dpdk/include/odp_pool_internal.h | 1 + platform/linux-dpdk/odp_buffer.c | 5 ++ platform/linux-dpdk/{odp_pool.c => pool/dpdk.c} | 83 +++++++++++++++---------- 4 files changed, 63 insertions(+), 33 deletions(-) rename platform/linux-dpdk/{odp_pool.c => pool/dpdk.c} (90%) hooks/post-receive --

7 years, 10 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

git-lng-odp