git-lng-odp July 2017

git-lng-odp@lists.linaro.org

1 participants
35 discussions

[COMMIT] branch master updated. v1.15.0.0-73-gfa9550ca

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 fa9550ca8f4f0a77baf6d156b441fa2d703bbdf8 (commit) via 063d713d0c167c56b4497be566b2310a5a2daf42 (commit) from 3eeb249a4774f12d2d16ca349a591654eae620ae (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 fa9550ca8f4f0a77baf6d156b441fa2d703bbdf8 Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Wed Jul 19 16:15:23 2017 +0000 helper: add missing pool param inits Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> diff --git a/helper/cuckootable.c b/helper/cuckootable.c index 0d46300e..32800911 100644 --- a/helper/cuckootable.c +++ b/helper/cuckootable.c @@ -240,6 +240,7 @@ odph_cuckoo_table_create( if (pool != ODP_POOL_INVALID) odp_pool_destroy(pool); + odp_pool_param_init(&param); param.type = ODP_POOL_BUFFER; param.buf.size = kv_entry_size; param.buf.align = ODP_CACHE_LINE_SIZE; diff --git a/helper/iplookuptable.c b/helper/iplookuptable.c index 37d31e36..ac7d0587 100644 --- a/helper/iplookuptable.c +++ b/helper/iplookuptable.c @@ -192,6 +192,7 @@ cache_alloc_new_pool( uint32_t size = 0, num = 0; /* Create new pool (new free buffers). */ + odp_pool_param_init(&param); param.type = ODP_POOL_BUFFER; param.buf.align = ODP_CACHE_LINE_SIZE; if (type == CACHE_TYPE_SUBTREE) { commit 063d713d0c167c56b4497be566b2310a5a2daf42 Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Wed Jul 19 15:51:55 2017 +0000 linux-gen: ishm fix defining directory for shm files Code missed getenv() return code check and did not use value of env variable to change default derection. Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> diff --git a/platform/linux-generic/_ishm.c b/platform/linux-generic/_ishm.c index cde2dbc3..892e889b 100644 --- a/platform/linux-generic/_ishm.c +++ b/platform/linux-generic/_ishm.c @@ -1442,9 +1442,15 @@ int _odp_ishm_init_global(void) odp_global_data.main_pid = getpid(); odp_global_data.shm_dir = getenv("ODP_SHM_DIR"); - odp_global_data.shm_dir = - calloc(1, sizeof(ISHM_FILENAME_NORMAL_PAGE_DIR)); - sprintf(odp_global_data.shm_dir, "%s", ISHM_FILENAME_NORMAL_PAGE_DIR); + if (odp_global_data.shm_dir) { + odp_global_data.shm_dir_from_env = 1; + } else { + odp_global_data.shm_dir = + calloc(1, sizeof(ISHM_FILENAME_NORMAL_PAGE_DIR)); + sprintf(odp_global_data.shm_dir, "%s", + ISHM_FILENAME_NORMAL_PAGE_DIR); + odp_global_data.shm_dir_from_env = 0; + } ODP_DBG("ishm: using dir %s\n", odp_global_data.shm_dir); @@ -1661,7 +1667,8 @@ int _odp_ishm_term_global(void) if (_odp_ishmphy_unbook_va()) ret |= -1; - free(odp_global_data.shm_dir); + if (!odp_global_data.shm_dir_from_env) + free(odp_global_data.shm_dir); return ret; } diff --git a/platform/linux-generic/include/odp_internal.h b/platform/linux-generic/include/odp_internal.h index dd3374b7..ec17b199 100644 --- a/platform/linux-generic/include/odp_internal.h +++ b/platform/linux-generic/include/odp_internal.h @@ -43,6 +43,7 @@ typedef struct { struct odp_global_data_s { char *shm_dir; /*< directory for odp mmaped files */ + int shm_dir_from_env; /*< overload default with env */ pid_t main_pid; char uid[UID_MAXLEN]; odp_log_func_t log_fn; ----------------------------------------------------------------------- Summary of changes: helper/cuckootable.c | 1 + helper/iplookuptable.c | 1 + platform/linux-generic/_ishm.c | 15 +++++++++++---- platform/linux-generic/include/odp_internal.h | 1 + 4 files changed, 14 insertions(+), 4 deletions(-) hooks/post-receive --

7 years, 6 months

[COMMIT] branch monarch_lts updated. v1.11.0.0_monarch-17-ga28e0db6

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, monarch_lts has been updated via a28e0db6cdae7eb4f047cd79698ceadf96feff7f (commit) from c24c425cf4842125f8702fa7624563417bb41e40 (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 a28e0db6cdae7eb4f047cd79698ceadf96feff7f Author: Matias Elo <matias.elo(a)nokia.com> Date: Thu Apr 27 14:29:54 2017 +0300 linux-gen: pktio: fix valgrind warnings Fix valgrind warnings about syscall params pointing to uninitialised bytes. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/pktio/ethtool.c b/platform/linux-generic/pktio/ethtool.c index 1b0f25b2..d8f9e12c 100644 --- a/platform/linux-generic/pktio/ethtool.c +++ b/platform/linux-generic/pktio/ethtool.c @@ -158,6 +158,7 @@ int ethtool_stats_get_fd(int fd, const char *name, odp_pktio_stats_t *stats) { struct ifreq ifr; + memset(&ifr, 0, sizeof(ifr)); snprintf(ifr.ifr_name, IF_NAMESIZE, "%s", name); return ethtool_stats(fd, &ifr, stats); diff --git a/platform/linux-generic/pktio/socket.c b/platform/linux-generic/pktio/socket.c index 624104de..bcb123c1 100644 --- a/platform/linux-generic/pktio/socket.c +++ b/platform/linux-generic/pktio/socket.c @@ -231,6 +231,7 @@ static inline int get_rss_hash_options(int fd, const char *name, struct ifreq ifr; struct ethtool_rxnfc rsscmd; + memset(&ifr, 0, sizeof(ifr)); memset(&rsscmd, 0, sizeof(rsscmd)); *options = 0; ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/pktio/ethtool.c | 1 + platform/linux-generic/pktio/socket.c | 1 + 2 files changed, 2 insertions(+) hooks/post-receive --

7 years, 6 months

[COMMIT] branch master updated. v1.15.0.0-71-g3eeb249a

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 3eeb249a4774f12d2d16ca349a591654eae620ae (commit) via 4d2cf5b4a536c243089f41ade86d5dc60844f3d3 (commit) via 3a79862d2a8f9ea8eaa53d408f0763e44e522da7 (commit) from 95ba4b394009d92c29c2e22f0776e90bb4c6edec (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 3eeb249a4774f12d2d16ca349a591654eae620ae Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue Jun 27 16:07:36 2017 +0300 travis: add clang cross-compilation checks 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 30f4ac7a..42c2c963 100644 --- a/.travis.yml +++ b/.travis.yml @@ -156,6 +156,15 @@ jobs: --disable-test-cpp --enable-test-vald --enable-test-helper --enable-test-perf --enable-test-perf-proc --enable-test-example - make -j $(nproc) - stage: test + compiler: "\"clang-3.8 --target=aarch64-linux-gnu\"" + env: TEST="clang-3.8 aarch64-linux-gnu" CROSS_ARCH="arm64" + install: true + script: + - ./bootstrap + - ./configure --prefix=$HOME/odp-install $CROSS + --disable-test-cpp --enable-test-vald --enable-test-helper --enable-test-perf --enable-test-perf-proc --enable-test-example + - make -j $(nproc) + - stage: test compiler: arm-linux-gnueabihf-gcc env: TEST="arm-linux-gnueabihf" CROSS_ARCH="armhf" install: true @@ -165,6 +174,15 @@ jobs: --disable-test-cpp --enable-test-vald --enable-test-helper --enable-test-perf --enable-test-perf-proc --enable-test-example - make -j $(nproc) - stage: test + compiler: "\"clang-3.8 --target=arm-linux-gnueabihf\"" + env: TEST="clang-3.8 arm-linux-gnueabihf" CROSS_ARCH="armhf" CFLAGS="-march=armv7-a" + install: true + script: + - ./bootstrap + - ./configure --prefix=$HOME/odp-install $CROSS + --disable-test-cpp --enable-test-vald --enable-test-helper --enable-test-perf --enable-test-perf-proc --enable-test-example + - make -j $(nproc) + - stage: test compiler: powerpc-linux-gnu-gcc env: TEST="powerpc-linux-gnueabihf" CROSS_ARCH="powerpc" install: true @@ -174,6 +192,15 @@ jobs: --disable-test-cpp --enable-test-vald --enable-test-helper --enable-test-perf --enable-test-perf-proc --enable-test-example - make -j $(nproc) - stage: test + compiler: "\"clang-3.8 --target=powerpc-linux-gnu\"" + env: TEST="clang-3.8 powerpc-linux-gnu" CROSS_ARCH="powerpc" + install: true + script: + - ./bootstrap + - ./configure --prefix=$HOME/odp-install $CROSS + --disable-test-cpp --enable-test-vald --enable-test-helper --enable-test-perf --enable-test-perf-proc --enable-test-example + - make -j $(nproc) + - stage: test env: TEST=coverage compiler: gcc script: commit 4d2cf5b4a536c243089f41ade86d5dc60844f3d3 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Wed Jul 12 12:16:39 2017 +0300 travis: simplify cross-compilation setup Following Maxim's idea use apt-get to download and install cross-packages. 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 a1306206..30f4ac7a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,10 +43,6 @@ addons: - clang-3.8 - automake autoconf libtool libssl-dev graphviz mscgen doxygen - libpcap-dev - - dpkg-cross equivs - - gcc-aarch64-linux-gnu pkg-config-aarch64-linux-gnu libc6-dev-arm64-cross - - gcc-arm-linux-gnueabihf pkg-config-arm-linux-gnueabihf libc6-dev-armhf-cross - - gcc-powerpc-linux-gnu pkg-config-powerpc-linux-gnu libc6-dev-powerpc-cross # coverity_scan: # project: # name: "$TRAVIS_REPO_SLUG" @@ -67,7 +63,24 @@ env: - CONF="--enable-dpdk-zero-copy" before_install: -# Install cunit for the validation tests because distro version is too old and fails C99 compile + + # Install cross toolchains, etc + # apt-get update may fail thanks to Ubuntu removing Packages/indices while not removing relevant parts of Release file + - if [ -n "$CROSS_ARCH" ] ; + then + BUILD_GNU_TYPE=`dpkg-architecture -a"$CROSS_ARCH" -qDEB_BUILD_GNU_TYPE` ; + CROSS_GNU_TYPE=`dpkg-architecture -a"$CROSS_ARCH" -qDEB_HOST_GNU_TYPE` ; + CROSS_MULTIARCH=`dpkg-architecture -a"$CROSS_ARCH" -qDEB_HOST_MULTIARCH` ; + CROSS="--host="$CROSS_GNU_TYPE" --build="$BUILD_GNU_TYPE" --prefix=/usr --includedir=/usr/include/"$CROSS_MULTIARCH" --libdir=/usr/lib/"$CROSS_MULTIARCH" --libexecdir=/usr/lib/"$CROSS_MULTIARCH"" ; + sudo dpkg --add-architecture "$CROSS_ARCH" ; + sudo -E apt-add-repository -y "deb http://ports.ubuntu.com trusty main" ; + sudo -E apt-add-repository -y "deb http://ports.ubuntu.com trusty-updates main" ; + sudo -E apt-get -y update || true ; + sudo -E apt-get -y --no-install-suggests --no-install-recommends --force-yes install build-essential gcc-"$CROSS_GNU_TYPE" pkg-config-"$CROSS_GNU_TYPE" ; + sudo -E apt-get -y --no-install-suggests --no-install-recommends --force-yes install libc6-dev:"$CROSS_ARCH" libssl-dev:"$CROSS_ARCH" zlib1g-dev:"$CROSS_ARCH" libconfig-dev:"$CROSS_ARCH" ; + fi + + # Install cunit for the validation tests because distro version is too old and fails C99 compile - sudo apt-get remove libcunit1-dev libcunit1 - export CUNIT_VERSION=2.1-3 - curl -sSOL https://github.com/Linaro/libcunit/releases/download/${CUNIT_VERSION}/CUnit… @@ -135,63 +148,27 @@ jobs: include: - stage: test compiler: aarch64-linux-gnu-gcc - env: TEST="aarch64-linux-gnu" CROSS="--host=aarch64-linux-gnu --prefix=/usr/aarch64-linux-gnu" + env: TEST="aarch64-linux-gnu" CROSS_ARCH="arm64" install: true script: - - mkdir cross - - pushd cross - # one can not include colon in the command or bad things will happen, so mimic it - - env echo -e 'Provides\x3a multiarch-support, debconf, debconf-2.0' > dummy - - equivs-build -a arm64 dummy - - wget - http://ports.ubuntu.com/pool/main/o/openssl/libssl-dev_1.0.1f-1ubuntu2.22_a… - http://ports.ubuntu.com/pool/main/o/openssl/libssl1.0.0_1.0.1f-1ubuntu2.22_… - http://ports.ubuntu.com/pool/main/z/zlib/zlib1g-dev_1.2.8.dfsg-1ubuntu1_arm… - http://ports.ubuntu.com/pool/main/z/zlib/zlib1g_1.2.8.dfsg-1ubuntu1_arm64.d… - - sudo dpkg-cross -i -M -A -a arm64 *.deb - - popd - ./bootstrap - ./configure --prefix=$HOME/odp-install $CROSS --disable-test-cpp --enable-test-vald --enable-test-helper --enable-test-perf --enable-test-perf-proc --enable-test-example - make -j $(nproc) - stage: test compiler: arm-linux-gnueabihf-gcc - env: TEST="arm-linux-gnueabihf" CROSS="--host=arm-linux-gnueabihf --prefix=/usr/arm-linux-gnueabihf" + env: TEST="arm-linux-gnueabihf" CROSS_ARCH="armhf" install: true script: - - mkdir cross - - pushd cross - # one can not include colon in the command or bad things will happen, so mimic it - - env echo -e 'Provides\x3a multiarch-support, debconf, debconf-2.0' > dummy - - equivs-build -a armhf dummy - - wget - http://ports.ubuntu.com/pool/main/o/openssl/libssl-dev_1.0.1f-1ubuntu2.22_a… - http://ports.ubuntu.com/pool/main/o/openssl/libssl1.0.0_1.0.1f-1ubuntu2.22_… - http://ports.ubuntu.com/pool/main/z/zlib/zlib1g-dev_1.2.8.dfsg-1ubuntu1_arm… - http://ports.ubuntu.com/pool/main/z/zlib/zlib1g_1.2.8.dfsg-1ubuntu1_armhf.d… - - sudo dpkg-cross -i -M -A -a armhf *.deb - - popd - ./bootstrap - ./configure --prefix=$HOME/odp-install $CROSS --disable-test-cpp --enable-test-vald --enable-test-helper --enable-test-perf --enable-test-perf-proc --enable-test-example - make -j $(nproc) - stage: test compiler: powerpc-linux-gnu-gcc - env: TEST="powerpc-linux-gnu" CROSS="--host=powerpc-linux-gnu --prefix=/usr/powerpc-linux-gnu" + env: TEST="powerpc-linux-gnueabihf" CROSS_ARCH="powerpc" install: true script: - - mkdir cross - - pushd cross - # one can not include colon in the command or bad things will happen, so mimic it - - env echo -e 'Provides\x3a multiarch-support, debconf, debconf-2.0' > dummy - - equivs-build -a powerpc dummy - - wget - http://ports.ubuntu.com/pool/main/o/openssl/libssl-dev_1.0.1f-1ubuntu2.22_p… - http://ports.ubuntu.com/pool/main/o/openssl/libssl1.0.0_1.0.1f-1ubuntu2.22_… - http://ports.ubuntu.com/pool/main/z/zlib/zlib1g-dev_1.2.8.dfsg-1ubuntu1_pow… - http://ports.ubuntu.com/pool/main/z/zlib/zlib1g_1.2.8.dfsg-1ubuntu1_powerpc… - - sudo dpkg-cross -i -M -A -a powerpc *.deb - - popd - ./bootstrap - ./configure --prefix=$HOME/odp-install $CROSS --disable-test-cpp --enable-test-vald --enable-test-helper --enable-test-perf --enable-test-perf-proc --enable-test-example commit 3a79862d2a8f9ea8eaa53d408f0763e44e522da7 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Wed Jul 12 14:27:36 2017 +0300 example: ipfragreass: fix compilation with clang Clang 3.8 is stricter than GCC wrt register allocation vs 128-bit variables. Sometimes it can not understand using 128-bit var in place of 64-bit register resulting in the following errors: /odp_ipfragreass_atomics_arm.h:18:51: error: value size does not match register size specified by the constraint and modifier [-Werror,-Wasm-operand-widths] __asm__ volatile("ldaxp %0, %H0, [%1]" : "=&r" (old) ^ ./odp_ipfragreass_atomics_arm.h:18:27: note: use constraint modifier "w" __asm__ volatile("ldaxp %0, %H0, [%1]" : "=&r" (old) Explicitly pass low and high parts of 128-bit variable in separate assembly parameters. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Brian Brooks <brian.brooks(a)arm.com> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/example/ipfragreass/odp_ipfragreass_atomics_arm.h b/example/ipfragreass/odp_ipfragreass_atomics_arm.h index 99c37a77..e75ae588 100644 --- a/example/ipfragreass/odp_ipfragreass_atomics_arm.h +++ b/example/ipfragreass/odp_ipfragreass_atomics_arm.h @@ -13,26 +13,33 @@ static inline __int128 lld(__int128 *var, int mo) { __int128 old; + uint64_t lo, hi; if (mo == __ATOMIC_ACQUIRE) - __asm__ volatile("ldaxp %0, %H0, [%1]" : "=&r" (old) + __asm__ volatile("ldaxp %0, %1, [%2]" : "=&r" (lo), "=&r" (hi) : "r" (var) : "memory"); else /* mo == __ATOMIC_RELAXED */ - __asm__ volatile("ldxp %0, %H0, [%1]" : "=&r" (old) + __asm__ volatile("ldxp %0, %1, [%2]" : "=&r" (lo), "=&r" (hi) : "r" (var) : ); + old = hi; + old <<= 64; + old |= lo; + return old; + } static inline uint32_t scd(__int128 *var, __int128 neu, int mo) { uint32_t ret; + uint64_t lo = neu, hi = neu >> 64; if (mo == __ATOMIC_RELEASE) - __asm__ volatile("stlxp %w0, %1, %H1, [%2]" : "=&r" (ret) - : "r" (neu), "r" (var) : "memory"); + __asm__ volatile("stlxp %w0, %1, %2, [%3]" : "=&r" (ret) + : "r" (lo), "r" (hi), "r" (var) : "memory"); else /* mo == __ATOMIC_RELAXED */ - __asm__ volatile("stxp %w0, %1, %H1, [%2]" : "=&r" (ret) - : "r" (neu), "r" (var) : ); + __asm__ volatile("stxp %w0, %1, %2, [%3]" : "=&r" (ret) + : "r" (lo), "r" (hi), "r" (var) : "memory"); return ret; } ----------------------------------------------------------------------- Summary of changes: .travis.yml | 92 ++++++++++++----------- example/ipfragreass/odp_ipfragreass_atomics_arm.h | 19 +++-- 2 files changed, 61 insertions(+), 50 deletions(-) hooks/post-receive --

7 years, 6 months

[COMMIT] branch monarch_lts updated. v1.11.0.0_monarch-16-gc24c425c

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, monarch_lts has been updated via c24c425cf4842125f8702fa7624563417bb41e40 (commit) via b5dca2f1b0fff412fc56ba8bafba25507dcf1d64 (commit) via 4e8595151c075074744b8a1ad689a052df18c27e (commit) via e48559aa65e369d25f8f1c5e63a98939e881f367 (commit) via 8bda226cc547acb81e3c17f09348c6ff4a6f4356 (commit) via d3a984a9e86177215246d0925b4a86f9ade9d22a (commit) via 53b23b8e017db60c3635ac68b3894081448ea132 (commit) via f3bc64fcadb9b8dbe034507be81f0f06feb335ab (commit) via 461780c9df581b952d837ca72717f516d99da963 (commit) from 0c15c40db40834f1df217191c4b6a06303ab0872 (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 c24c425cf4842125f8702fa7624563417bb41e40 Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Wed Jul 12 17:53:24 2017 +0300 travis: port travis checks from master Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 00000000..6a845e97 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,226 @@ +# Copyright (c) 2016, Linaro Limited +# All rights reserved. +# SPDX-License-Identifier: BSD-3-Clause +# +# Please update xxxx for your coverity token and notification email if required +# pushing to github/master will run make check +# pushing to github/coverity_scan will also launch a static analysis +# See https://scan.coverity.com/travis_ci + +language: c +sudo: required +dist: trusty +group: deprecated-2017Q2 +env: + global: + # COVERITY_SCAN_TOKEN + # ** specific to your project ** + # Note: + # You should have a github account and travis linked travis account. + # The secure key to be filled below is the 685 character long encrypted + # token you can find as follow from your coverity dashboard + # (at https://scan.coverity.com/dashboard): + # Click on the github project (<you>/odp) + # Click on "submit build" + # Click on "Configure Travis CI" + # Look at the COVERITY_SCAN_TOKEN in the env: global: section + # of the configuration example. + # copy the secure:<key> below + # + - secure: "xxxx" + # + # By default Linaro CODECOV_TOKEN token is used. It's ok to use it to see + # for individual commit validation. But you you want to track tests history + # you need generated new one at https://codecov.io specific for your repo. + - CODECOV_TOKEN=8e1c0fd8-62ff-411e-a79f-5839f6662c11 + +addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - gcc + - clang-3.8 + - automake autoconf libtool libssl-dev graphviz mscgen doxygen + - libpcap-dev + - dpkg-cross equivs + - gcc-aarch64-linux-gnu pkg-config-aarch64-linux-gnu libc6-dev-arm64-cross + - gcc-arm-linux-gnueabihf pkg-config-arm-linux-gnueabihf libc6-dev-armhf-cross + - gcc-powerpc-linux-gnu pkg-config-powerpc-linux-gnu libc6-dev-powerpc-cross +# coverity_scan: +# project: +# name: "$TRAVIS_REPO_SLUG" +# notification_email: xxxx +# build_command_prepend: "./bootstrap && ./configure --enable-test-cpp --enable-test-vald --enable-test-helper --enable-test-perf --enable-user-guides --enable-test-perf-proc --enable-test-example" +# build_command: "make" +# branch_pattern: coverity_scan + +compiler: + - gcc + - clang-3.8 + +env: + - CONF="" + - CONF="--enable-schedule-sp" + +before_install: +# Install cunit for the validation tests because distro version is too old and fails C99 compile + - sudo apt-get remove libcunit1-dev libcunit1 + - export CUNIT_VERSION=2.1-3 + - curl -sSOL https://github.com/Linaro/libcunit/releases/download/${CUNIT_VERSION}/CUnit… + - tar -jxf *.bz2 + - pushd CUnit* + - libtoolize --force --copy + - aclocal + - autoheader + - automake --add-missing --include-deps --copy + - autoconf + - ./configure --enable-debug --enable-automated --enable-basic --enable-console --enable-examples --enable-test $CROSS || cat config.log + - make + - sudo make install + - popd + - export LD_LIBRARY_PATH="/usr/local/lib:$LD_LIBRARY_PATH" + +install: + - echo 1000 | sudo tee /proc/sys/vm/nr_hugepages + - sudo mkdir -p /mnt/huge + - sudo mount -t hugetlbfs nodev /mnt/huge + + - sudo apt-get -qq update + - sudo apt-get install linux-headers-`uname -r` + - gem install asciidoctor + - PATH=${PATH//:\.\/node_modules\/\.bin/} + +# DPDK pktio + - TARGET=${TARGET:-"x86_64-native-linuxapp-gcc"} + - git -c advice.detachedHead=false clone -q --depth=1 --single-branch --branch=v16.04 http://dpdk.org/git/dpdk dpdk + - pushd dpdk + - git log --oneline --decorate + - make config T=${TARGET} O=${TARGET} + - pushd ${TARGET} + - sed -ri 's,(CONFIG_RTE_LIBRTE_PMD_PCAP=).*,\1y,' .config + - popd + - make install T=${TARGET} EXTRA_CFLAGS="-fPIC" + - popd + +# Netmap pktio + - git -c advice.detachedHead=false clone -q --depth=1 --single-branch --branch=v11.2 https://github.com/luigirizzo/netmap.git + - pushd netmap/LINUX + - ./configure + - make + - sudo insmod ./netmap.ko + - popd + +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 $CONF + - make -j $(nproc) + - make install + - echo "Checking linking and run from install..." + - pushd $HOME + - echo "Dynamic link.." + - ${CC} ${OLDPWD}/example/hello/odp_hello.c -o odp_hello_inst -I${HOME}/odp-install/include -L${HOME}/odp-install/lib -lodp-linux -L${OLDPWD}/dpdk/x86_64-native-linuxapp-gcc/lib -lrt -ldpdk -lpthread -lcrypto -lpcap -ldl + - 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 -I${HOME}/odp-install/include -L${HOME}/odp-install/lib -lodp-linux -L${OLDPWD}/dpdk/x86_64-native-linuxapp-gcc/lib -lrt -ldpdk -lpthread -lcrypto -lpcap -ldl -static + - ./odp_hello_inst + - popd + - sudo git clean -f -d -x + - ./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 $CONF + - make -j $(nproc) + - sudo LD_LIBRARY_PATH="/usr/local/lib:$LD_LIBRARY_PATH" make check + +jobs: + include: + - stage: test + compiler: aarch64-linux-gnu-gcc + env: TEST="aarch64-linux-gnu" CROSS="--host=aarch64-linux-gnu --prefix=/usr/aarch64-linux-gnu" + install: true + script: + - mkdir cross + - pushd cross + # one can not include colon in the command or bad things will happen, so mimic it + - env echo -e 'Provides\x3a multiarch-support, debconf, debconf-2.0' > dummy + - equivs-build -a arm64 dummy + - wget + http://ports.ubuntu.com/pool/main/o/openssl/libssl-dev_1.0.1f-1ubuntu2.22_a… + http://ports.ubuntu.com/pool/main/o/openssl/libssl1.0.0_1.0.1f-1ubuntu2.22_… + http://ports.ubuntu.com/pool/main/z/zlib/zlib1g-dev_1.2.8.dfsg-1ubuntu1_arm… + http://ports.ubuntu.com/pool/main/z/zlib/zlib1g_1.2.8.dfsg-1ubuntu1_arm64.d… + - sudo dpkg-cross -i -M -A -a arm64 *.deb + - popd + - ./bootstrap + - ./configure --prefix=$HOME/odp-install $CROSS + --disable-test-cpp --enable-test-vald --enable-test-helper --enable-test-perf --enable-test-perf-proc --enable-test-example + - make -j $(nproc) + - stage: test + compiler: arm-linux-gnueabihf-gcc + env: TEST="arm-linux-gnueabihf" CROSS="--host=arm-linux-gnueabihf --prefix=/usr/arm-linux-gnueabihf" + install: true + script: + - mkdir cross + - pushd cross + # one can not include colon in the command or bad things will happen, so mimic it + - env echo -e 'Provides\x3a multiarch-support, debconf, debconf-2.0' > dummy + - equivs-build -a armhf dummy + - wget + http://ports.ubuntu.com/pool/main/o/openssl/libssl-dev_1.0.1f-1ubuntu2.22_a… + http://ports.ubuntu.com/pool/main/o/openssl/libssl1.0.0_1.0.1f-1ubuntu2.22_… + http://ports.ubuntu.com/pool/main/z/zlib/zlib1g-dev_1.2.8.dfsg-1ubuntu1_arm… + http://ports.ubuntu.com/pool/main/z/zlib/zlib1g_1.2.8.dfsg-1ubuntu1_armhf.d… + - sudo dpkg-cross -i -M -A -a armhf *.deb + - popd + - ./bootstrap + - ./configure --prefix=$HOME/odp-install $CROSS + --disable-test-cpp --enable-test-vald --enable-test-helper --enable-test-perf --enable-test-perf-proc --enable-test-example + - make -j $(nproc) + - stage: test + compiler: powerpc-linux-gnu-gcc + env: TEST="powerpc-linux-gnu" CROSS="--host=powerpc-linux-gnu --prefix=/usr/powerpc-linux-gnu" + install: true + script: + - mkdir cross + - pushd cross + # one can not include colon in the command or bad things will happen, so mimic it + - env echo -e 'Provides\x3a multiarch-support, debconf, debconf-2.0' > dummy + - equivs-build -a powerpc dummy + - wget + http://ports.ubuntu.com/pool/main/o/openssl/libssl-dev_1.0.1f-1ubuntu2.22_p… + http://ports.ubuntu.com/pool/main/o/openssl/libssl1.0.0_1.0.1f-1ubuntu2.22_… + http://ports.ubuntu.com/pool/main/z/zlib/zlib1g-dev_1.2.8.dfsg-1ubuntu1_pow… + http://ports.ubuntu.com/pool/main/z/zlib/zlib1g_1.2.8.dfsg-1ubuntu1_powerpc… + - sudo dpkg-cross -i -M -A -a powerpc *.deb + - popd + - ./bootstrap + - ./configure --prefix=$HOME/odp-install $CROSS + --disable-test-cpp --enable-test-vald --enable-test-helper --enable-test-perf --enable-test-perf-proc --enable-test-example + - make -j $(nproc) + - stage: test + env: TEST=distcheck + 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 + - sudo PATH="$PATH" LD_LIBRARY_PATH="/usr/local/lib:$LD_LIBRARY_PATH" make distcheck + - stage: test + env: TEST=doxygen + compiler: gcc + script: + # doxygen does not trap on warnings, check for them here. + - ./bootstrap + - ./configure + - make doxygen-doc |tee doxygen.log + - fgrep -rvq warning ./doxygen.log + - stage: test + env: TEST=checkpatch + compiler: gcc + script: + - echo ${TRAVIS_COMMIT_RANGE}; + - ODP_PATCHES=`echo ${TRAVIS_COMMIT_RANGE} | sed 's/\.//'`; + - if [ -z "${ODP_PATCHES}" ]; then env; exit 1; fi; + - ./scripts/ci-checkpatches.sh ${ODP_PATCHES}; + +after_failure: + - cat config.log + - find . -name 'test-suite.log' -execdir grep -il "FAILED" {} \; -exec echo {} \; -exec cat {} \; diff --git a/scripts/ci-checkpatches.sh b/scripts/ci-checkpatches.sh new file mode 100755 index 00000000..cb1c4e65 --- /dev/null +++ b/scripts/ci-checkpatches.sh @@ -0,0 +1,17 @@ +#!/bin/bash + +PATCHES=$1 +echo "Run checkpatch for ${PATCHES}" +# Generate patches provided with $1. +# In case of force push and range is broken +# validate only the latest commit if it's not merge commit. +git format-patch ${PATCHES} +if [ $? -ne 0 ]; then + git show --summary HEAD| grep -q '^Merge:'; + if [ $? -ne 0 ]; then + git format-patch HEAD^; + perl ./scripts/checkpatch.pl *.patch; + fi; +else + perl ./scripts/checkpatch.pl *.patch; +fi commit b5dca2f1b0fff412fc56ba8bafba25507dcf1d64 Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Fri Oct 14 14:51:25 2016 +0300 test: skip pktio_perf tests on 1 and 2 cpus machines Make check should skip the test instead of failing it. Test splits RX and TX cores for packet processing. Core 0 bind to control thread. So running machine should have at least 2 worker threads which is not enough on 1 and 2 cpus machine. CUnit uses special value 77 to mark test as SKIPPED and not fail on it. Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> Reviewed-by: Mike Holmes <mike.holmes(a)linaro.org> diff --git a/test/performance/odp_pktio_perf.c b/test/performance/odp_pktio_perf.c index 18a1aa2a..988f298b 100644 --- a/test/performance/odp_pktio_perf.c +++ b/test/performance/odp_pktio_perf.c @@ -34,6 +34,8 @@ #include <inttypes.h> #include <test_debug.h> +#define TEST_SKIP 77 + #define PKT_BUF_NUM 8192 #define MAX_NUM_IFACES 2 #define TEST_HDR_MAGIC 0x92749451 @@ -558,7 +560,7 @@ static int setup_txrx_masks(odp_cpumask_t *thd_mask_tx, gbl_args->args.cpu_count); if (num_workers < 2) { LOG_ERR("Need at least two cores\n"); - return -1; + return TEST_SKIP; } if (gbl_args->args.num_tx_workers) { @@ -659,7 +661,7 @@ static int run_test_single(odp_cpumask_t *thd_mask_tx, static int run_test(void) { - int ret = 1; + int ret; int i; odp_cpumask_t txmask, rxmask; test_status_t status = { @@ -669,8 +671,9 @@ static int run_test(void) .warmup = 1, }; - if (setup_txrx_masks(&txmask, &rxmask) != 0) - return -1; + ret = setup_txrx_masks(&txmask, &rxmask); + if (ret) + return ret; printf("Starting test with params:\n"); printf("\tTransmit workers: \t%d\n", odp_cpumask_count(&txmask)); @@ -691,8 +694,11 @@ static int run_test(void) run_test_single(&txmask, &rxmask, &status); status.warmup = 0; - while (ret > 0) + while (1) { ret = run_test_single(&txmask, &rxmask, &status); + if (ret <= 0) + break; + } return ret; } commit 4e8595151c075074744b8a1ad689a052df18c27e Author: Brian Brooks <brian.brooks(a)arm.com> Date: Tue Jun 27 15:35:58 2017 -0500 build: fix 64-bit atomics detection Use uint64_t instead of int type. This resolves ipfragreass build breakage with clang on 32-bit systems. Signed-off-by: Brian Brooks <brian.brooks(a)arm.com> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/m4/configure.m4 b/platform/linux-generic/m4/configure.m4 index efa29e5e..5d6f4482 100644 --- a/platform/linux-generic/m4/configure.m4 +++ b/platform/linux-generic/m4/configure.m4 @@ -34,10 +34,11 @@ use_libatomic=no AC_MSG_CHECKING(whether -latomic is needed for 64-bit atomic built-ins) AC_LINK_IFELSE( [AC_LANG_SOURCE([[ - static int loc; + #include <stdint.h> + static uint64_t loc; int main(void) { - int prev = __atomic_exchange_n(&loc, 7, __ATOMIC_RELAXED); + uint64_t prev = __atomic_exchange_n(&loc, 7, __ATOMIC_RELAXED); return 0; } ]])], commit e48559aa65e369d25f8f1c5e63a98939e881f367 Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Thu Jun 15 18:56:06 2017 +0300 configure.ac: do not trap if libatomic is not found Idea if check was to detect if libatomic is needed or not, not trap configure on not case Fixes Linaro CI compilation for: gcc-linaro-5.3-2016.02-x86_64_arm-linux-gnueabih Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> diff --git a/platform/linux-generic/m4/configure.m4 b/platform/linux-generic/m4/configure.m4 index 98885f5f..efa29e5e 100644 --- a/platform/linux-generic/m4/configure.m4 +++ b/platform/linux-generic/m4/configure.m4 @@ -65,7 +65,7 @@ AC_LINK_IFELSE( AC_CHECK_LIB( [atomic], [__atomic_exchange_16], [use_libatomic=yes], - [AC_MSG_FAILURE([cannot detect support for 128-bit atomics])]) + [AC_MSG_CHECKING([cannot detect support for 128-bit atomics])]) ]) if test "x$use_libatomic" = "xyes"; then commit 8bda226cc547acb81e3c17f09348c6ff4a6f4356 Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Mon Jun 26 18:00:16 2017 +0300 configure: remove dependency of autoconf-archive autoconf-archive is not available on some build environment Number of projects simple have local copy of this file. Do the same thing. Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> diff --git a/DEPENDENCIES b/DEPENDENCIES index e344826e..a5266c9e 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -8,14 +8,13 @@ Prerequisites for building the OpenDataPlane (ODP) API automake autoconf - autoconf-archive libtool On Debian/Ubuntu systems: - $ sudo apt-get install automake autoconf autoconf-archive libtool + $ sudo apt-get install automake autoconf libtool On CentOS/RedHat/Fedora systems: - $ sudo yum install automake autoconf autoconf-archive libtool + $ sudo yum install automake autoconf libtool 3. Required libraries diff --git a/m4/ax_check_compile_flag.m4 b/m4/ax_check_compile_flag.m4 new file mode 100644 index 00000000..c3a8d695 --- /dev/null +++ b/m4/ax_check_compile_flag.m4 @@ -0,0 +1,72 @@ +# =========================================================================== +# http://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_COMPILE_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS]) +# +# DESCRIPTION +# +# Check whether the given FLAG works with the current language's compiler +# or gives an error. (Warnings, however, are ignored) +# +# ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on +# success/failure. +# +# If EXTRA-FLAGS is defined, it is added to the current language's default +# flags (e.g. CFLAGS) when the check is done. The check is thus made with +# 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. +# +# NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this +# macro in sync with AX_CHECK_{PREPROC,LINK}_FLAG. +# +# LICENSE +# +# Copyright (c) 2008 Guido U. Draheim <guidod(a)gmx.de> +# Copyright (c) 2011 Maarten Bosmans <mkbosmans(a)gmail.com> +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation, either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see <http://www.gnu.org/licenses/>. +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# 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 + +AC_DEFUN([AX_CHECK_COMPILE_FLAG], +[AC_PREREQ(2.59)dnl for _AC_LANG_PREFIX +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()], + [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], + [m4_default([$2], :)], + [m4_default([$3], :)]) +AS_VAR_POPDEF([CACHEVAR])dnl +])dnl AX_CHECK_COMPILE_FLAGS commit d3a984a9e86177215246d0925b4a86f9ade9d22a Author: Mike Holmes <mike.holmes(a)linaro.org> Date: Fri Oct 21 14:40:17 2016 -0400 configure: the version cannot use a script Use of a script in the autotools breaks github CI Define the API version in configure and reuse it in the code Benefits: removes dependence on scripts to build removes scripts and the make file from odp/scripts removes generated .scmversion file places api versioning right next to lib versioning in the configure.ac allows github to auto build odp repos Signed-off-by: Mike Holmes <mike.holmes(a)linaro.org> Reviewed-by: Brian Brooks <brian.brooks(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/.gitignore b/.gitignore index d4e7d02e..fbc0eab9 100644 --- a/.gitignore +++ b/.gitignore @@ -12,7 +12,6 @@ .deps/ .dirstamp .libs/ -.scmversion CUnit-Memory-Dump.xml ID Makefile diff --git a/.scmversion b/.scmversion new file mode 100644 index 00000000..dc7bf3df --- /dev/null +++ b/.scmversion @@ -0,0 +1 @@ +1.11.0.1_monarch.git10.g7106d8b0 \ No newline at end of file diff --git a/Makefile.am b/Makefile.am index 625748af..2a9a658d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -11,9 +11,8 @@ SUBDIRS = @platform_with_platform@ \ test \ helper/test \ doc \ - example \ - scripts + example @DX_RULES@ -EXTRA_DIST = bootstrap $(DX_CONFIG) CHANGELOG config/README .scmversion +EXTRA_DIST = bootstrap $(DX_CONFIG) CHANGELOG config/README diff --git a/configure.ac b/configure.ac index 08cc375d..efb9f7ed 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,23 @@ AC_PREREQ([2.5]) -AC_INIT([OpenDataPlane], m4_esyscmd_s(./scripts/git_hash.sh .), [lng-odp(a)lists.linaro.org]) +########################################################################## +# Set correct API version +########################################################################## +m4_define([odpapi_generation_version], [1]) +m4_define([odpapi_major_version], [11]) +m4_define([odpapi_minor_version], [0]) +m4_define([odpapi_point_version], [1]) +m4_define([odpapi_version], + [odpapi_generation_version.odpapi_major_version.odpapi_minor_version.odpapi_point_version]) +AC_INIT([OpenDataPlane],[odpapi_version],[lng-odp(a)lists.linaro.org]) + +ODP_VERSION_API_GENERATION=odpapi_generation_version +AC_SUBST(ODP_VERSION_API_GENERATION) +ODP_VERSION_API_MAJOR=odpapi_major_version +AC_SUBST(ODP_VERSION_API_MAJOR) +ODP_VERSION_API_MINOR=odpapi_minor_version +AC_SUBST(ODP_VERSION_API_MINOR) +AC_CONFIG_FILES([include/odp/api/spec/version.h]) + AM_INIT_AUTOMAKE([1.9 tar-pax subdir-objects]) AC_CONFIG_SRCDIR([helper/config.h.in]) AM_CONFIG_HEADER([helper/config.h]) @@ -267,7 +285,6 @@ AC_CONFIG_FILES([Makefile helper/test/Makefile pkgconfig/libodp-linux.pc pkgconfig/libodphelper-linux.pc - scripts/Makefile ]) AC_SEARCH_LIBS([timer_create],[rt posix4]) diff --git a/include/odp/api/spec/.gitignore b/include/odp/api/spec/.gitignore new file mode 100644 index 00000000..67020331 --- /dev/null +++ b/include/odp/api/spec/.gitignore @@ -0,0 +1 @@ +version.h diff --git a/include/odp/api/spec/version.h b/include/odp/api/spec/version.h.in similarity index 93% rename from include/odp/api/spec/version.h rename to include/odp/api/spec/version.h.in index 1ddb9cea..4b16dcc5 100644 --- a/include/odp/api/spec/version.h +++ b/include/odp/api/spec/version.h.in @@ -37,7 +37,7 @@ extern "C" { * very significant changes to the API. APIs with different * versions are likely not backward compatible. */ -#define ODP_VERSION_API_GENERATION 1 +#define ODP_VERSION_API_GENERATION @ODP_VERSION_API_GENERATION@ /** * ODP API major version @@ -45,7 +45,7 @@ extern "C" { * Introduction of major new features or changes. APIs with different major * versions are likely not backward compatible. */ -#define ODP_VERSION_API_MAJOR 11 +#define ODP_VERSION_API_MAJOR @ODP_VERSION_API_MAJOR@ /** * ODP API minor version @@ -54,7 +54,7 @@ extern "C" { * to the API. For an API with common generation and major version, but with * different minor numbers the two versions are backward compatible. */ -#define ODP_VERSION_API_MINOR 0 +#define ODP_VERSION_API_MINOR @ODP_VERSION_API_MINOR@ /** * ODP API version string diff --git a/platform/Makefile.inc b/platform/Makefile.inc index 053bd121..4a0e68b7 100644 --- a/platform/Makefile.inc +++ b/platform/Makefile.inc @@ -10,8 +10,7 @@ lib_LTLIBRARIES = $(LIB)/libodp-linux.la AM_LDFLAGS += -version-number '$(ODP_LIBSO_VERSION)' -GIT_DESC = `$(top_srcdir)/scripts/get_impl_str.sh $(top_srcdir)` -AM_CFLAGS += "-DGIT_HASH=$(GIT_DESC)" +AM_CFLAGS += "-DGIT_HASH=$(VERSION)" AM_CFLAGS += $(VISIBILITY_CFLAGS) #The implementation will need to retain the deprecated implementation diff --git a/scripts/Makefile.am b/scripts/Makefile.am deleted file mode 100644 index 189b3efc..00000000 --- a/scripts/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -EXTRA_DIST = get_impl_str.sh git_hash.sh diff --git a/scripts/get_impl_str.sh b/scripts/get_impl_str.sh deleted file mode 100755 index d765a531..00000000 --- a/scripts/get_impl_str.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -if [ -z ${1} ]; then - echo "should be called with a path" - exit -fi -ROOTDIR=${1} - -CUSTOM_STR=${CUSTOM_STR:-https://git.linaro.org/lng/odp.git} - -echo -n "'${CUSTOM_STR}' ($(cat ${ROOTDIR}/.scmversion))" commit 53b23b8e017db60c3635ac68b3894081448ea132 Author: Brian Brooks <brian.brooks(a)arm.com> Date: Tue Jul 11 16:18:12 2017 -0500 pktio: GCC 7 fixes The GCC 7 series introduces changes that expose ODP compilation issues. These include case statement fall through warnings, and stricter checks on potential string overflows and other semantic analysis. Fixes: https://bugs.linaro.org/show_bug.cgi?id=3027 Signed-off-by: Brian Brooks <brian.brooks(a)arm.com> Signed-off-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/pktio/pktio.c b/test/validation/pktio/pktio.c index 4e93e9b4..1b73697a 100644 --- a/test/validation/pktio/pktio.c +++ b/test/validation/pktio/pktio.c @@ -1410,7 +1410,9 @@ int pktio_check_statistics_counters(void) void pktio_test_statistics_counters(void) { odp_pktio_t pktio_rx, pktio_tx; - odp_pktio_t pktio[MAX_NUM_IFACES]; + odp_pktio_t pktio[MAX_NUM_IFACES] = { + ODP_PKTIO_INVALID, ODP_PKTIO_INVALID + }; odp_packet_t pkt; odp_packet_t tx_pkt[1000]; uint32_t pkt_seq[1000]; commit f3bc64fcadb9b8dbe034507be81f0f06feb335ab Author: Brian Brooks <brian.brooks(a)arm.com> Date: Tue Jul 11 16:18:11 2017 -0500 build: GCC 7 fixes The GCC 7 series introduces changes that expose ODP compilation issues. These include case statement fall through warnings, and stricter checks on potential string overflows and other semantic analysis. Fixes: https://bugs.linaro.org/show_bug.cgi?id=3027 Signed-off-by: Brian Brooks <brian.brooks(a)arm.com> Reviewed-by: Ola Liljedahl <ola.liljedahl(a)arm.com> Reviewed-by: Honnappa Nagarahalli <honnappa.nagarahalli(a)arm.com> Signed-off-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/DEPENDENCIES b/DEPENDENCIES index a5266c9e..e344826e 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -8,13 +8,14 @@ Prerequisites for building the OpenDataPlane (ODP) API automake autoconf + autoconf-archive libtool On Debian/Ubuntu systems: - $ sudo apt-get install automake autoconf libtool + $ sudo apt-get install automake autoconf autoconf-archive libtool On CentOS/RedHat/Fedora systems: - $ sudo yum install automake autoconf libtool + $ sudo yum install automake autoconf autoconf-archive libtool 3. Required libraries diff --git a/configure.ac b/configure.ac index 5c7ddd04..08cc375d 100644 --- a/configure.ac +++ b/configure.ac @@ -224,6 +224,19 @@ ODP_CFLAGS="$ODP_CFLAGS -Wmissing-declarations -Wold-style-definition -Wpointer- 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" + +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]) + # Extra flags for example to suppress certain warning types ODP_CFLAGS="$ODP_CFLAGS $ODP_CFLAGS_EXTRA" diff --git a/platform/linux-generic/m4/configure.m4 b/platform/linux-generic/m4/configure.m4 index 1b1b883d..98885f5f 100644 --- a/platform/linux-generic/m4/configure.m4 +++ b/platform/linux-generic/m4/configure.m4 @@ -28,6 +28,50 @@ AC_LINK_IFELSE( echo "Use newer version. For gcc > 4.7.0" exit -1) +dnl Check whether -latomic is needed +use_libatomic=no + +AC_MSG_CHECKING(whether -latomic is needed for 64-bit atomic built-ins) +AC_LINK_IFELSE( + [AC_LANG_SOURCE([[ + static int loc; + int main(void) + { + int prev = __atomic_exchange_n(&loc, 7, __ATOMIC_RELAXED); + return 0; + } + ]])], + [AC_MSG_RESULT(no)], + [AC_MSG_RESULT(yes) + AC_CHECK_LIB( + [atomic], [__atomic_exchange_8], + [use_libatomic=yes], + [AC_MSG_FAILURE([__atomic_exchange_8 is not available])]) + ]) + +AC_MSG_CHECKING(whether -latomic is needed for 128-bit atomic built-ins) +AC_LINK_IFELSE( + [AC_LANG_SOURCE([[ + static __int128 loc; + int main(void) + { + __int128 prev; + prev = __atomic_exchange_n(&loc, 7, __ATOMIC_RELAXED); + return 0; + } + ]])], + [AC_MSG_RESULT(no)], + [AC_MSG_RESULT(yes) + AC_CHECK_LIB( + [atomic], [__atomic_exchange_16], + [use_libatomic=yes], + [AC_MSG_FAILURE([cannot detect support for 128-bit atomics])]) + ]) + +if test "x$use_libatomic" = "xyes"; then + AM_LDFLAGS="$AM_LDFLAGS -latomic" +fi + m4_include([platform/linux-generic/m4/odp_pthread.m4]) m4_include([platform/linux-generic/m4/odp_openssl.m4]) m4_include([platform/linux-generic/m4/odp_pcap.m4]) commit 461780c9df581b952d837ca72717f516d99da963 Author: Bill Fischofer <bill.fischofer(a)linaro.org> Date: Tue Jul 11 16:48:33 2017 -0500 bug: linux-generic: add syntax to allow newer clang to compile odp Resolve Bug https://bugs.linaro.org/show_bug.cgi?id=2942 by adding casts needed to avoid compilation failures when using clang 4.0.0 included in Ubuntu 17.04, which is stricter than clang 3.8.1 which is in Ubuntu 16.10. Signed-off-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/helper/chksum.c b/helper/chksum.c index 8f188814..772abcd2 100644 --- a/helper/chksum.c +++ b/helper/chksum.c @@ -122,7 +122,7 @@ static inline int odph_process_l4_hdr(odp_packet_t odp_pkt, * should come from the udp header, unlike for TCP where is * derived. */ l4_len = odp_be_to_cpu_16(udp_hdr_ptr->length); - pkt_chksum_ptr = &udp_hdr_ptr->chksum; + pkt_chksum_ptr = (uint16_t *)(void *)&udp_hdr_ptr->chksum; pkt_chksum_offset = l4_offset + offsetof(odph_udphdr_t, chksum); } else if (odp_packet_has_tcp(odp_pkt)) { tcp_hdr_ptr = (odph_tcphdr_t *)l4_ptr; @@ -133,7 +133,7 @@ static inline int odph_process_l4_hdr(odp_packet_t odp_pkt, tcp_hdr_ptr = &tcp_hdr; } - pkt_chksum_ptr = &tcp_hdr_ptr->cksm; + pkt_chksum_ptr = (uint16_t *)(void *)&tcp_hdr_ptr->cksm; pkt_chksum_offset = l4_offset + offsetof(odph_tcphdr_t, cksm); is_tcp = true; } else { @@ -197,7 +197,7 @@ static inline int odph_process_l3_hdr(odp_packet_t odp_pkt, ipv4_hdr_ptr = &ipv4_hdr; } - addrs_ptr = (uint16_t *)&ipv4_hdr_ptr->src_addr; + addrs_ptr = (uint16_t *)(void *)&ipv4_hdr_ptr->src_addr; addrs_len = 2 * ODPH_IPV4ADDR_LEN; protocol = ipv4_hdr_ptr->proto; l3_len = odp_be_to_cpu_16(ipv4_hdr_ptr->tot_len); diff --git a/platform/linux-generic/odp_packet_flags.c b/platform/linux-generic/odp_packet_flags.c index b88324c1..fc0bc1d2 100644 --- a/platform/linux-generic/odp_packet_flags.c +++ b/platform/linux-generic/odp_packet_flags.c @@ -18,7 +18,7 @@ odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt); \ if (packet_parse_not_complete(pkt_hdr)) \ packet_parse_full(pkt_hdr); \ - pkt_hdr->p.x = v & 1; \ + pkt_hdr->p.x = (v) & 1; \ } while (0) int odp_packet_has_error(odp_packet_t pkt) ----------------------------------------------------------------------- Summary of changes: .gitignore | 1 - .scmversion | 1 + .travis.yml | 226 +++++++++++++++++++++++ Makefile.am | 5 +- configure.ac | 34 +++- helper/chksum.c | 6 +- include/odp/api/spec/.gitignore | 1 + include/odp/api/spec/{version.h => version.h.in} | 6 +- m4/ax_check_compile_flag.m4 | 72 ++++++++ platform/Makefile.inc | 3 +- platform/linux-generic/m4/configure.m4 | 45 +++++ platform/linux-generic/odp_packet_flags.c | 2 +- scripts/Makefile.am | 1 - scripts/ci-checkpatches.sh | 17 ++ scripts/get_impl_str.sh | 11 -- test/performance/odp_pktio_perf.c | 16 +- test/validation/pktio/pktio.c | 4 +- 17 files changed, 418 insertions(+), 33 deletions(-) create mode 100644 .scmversion create mode 100644 .travis.yml create mode 100644 include/odp/api/spec/.gitignore rename include/odp/api/spec/{version.h => version.h.in} (93%) create mode 100644 m4/ax_check_compile_flag.m4 delete mode 100644 scripts/Makefile.am create mode 100755 scripts/ci-checkpatches.sh delete mode 100755 scripts/get_impl_str.sh hooks/post-receive --

7 years, 7 months

[COMMIT] branch api-next updated. v1.15.0.0-435-gdb7cc41a

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 db7cc41aeb559dd296f3a6d8570aa10326a31d5e (commit) from ae42f98c1a1c309c0718a3b5fc8589660de0f867 (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 db7cc41aeb559dd296f3a6d8570aa10326a31d5e Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Fri Jul 14 15:43:57 2017 +0300 api: ipsec: add warning status event Add status ID for warning messages. Outbound inline soft lifetime expiration is currently the only source of these events. API spec keeps simple when the same warning structure is shared with IPSEC packet and status events. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Reviewed-by: Nikhil Agarwal <nikhil.agarwal(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/include/odp/api/spec/ipsec.h b/include/odp/api/spec/ipsec.h index de126c37..7085bc0d 100644 --- a/include/odp/api/spec/ipsec.h +++ b/include/odp/api/spec/ipsec.h @@ -1123,8 +1123,26 @@ typedef struct odp_ipsec_packet_result_t { * IPSEC status ID */ typedef enum odp_ipsec_status_id_t { - /** Response to SA disable command */ - ODP_IPSEC_STATUS_SA_DISABLE = 0 + /** Response to SA disable command + * + * Following status event (odp_ipsec_status_t) fields have valid + * content, other fields must be ignored: + * - sa: The SA that was requested to be disabled + * - result: Operation result + */ + ODP_IPSEC_STATUS_SA_DISABLE = 0, + + /** Warning from inline IPSEC processing + * + * Following status event (odp_ipsec_status_t) fields have valid + * content, other fields must be ignored: + * - sa: The SA that caused the warning + * - warn: The warning(s) reported by this event + * + * This status event is generated only for outbound SAs in + * ODP_IPSEC_OP_MODE_INLINE mode. + */ + ODP_IPSEC_STATUS_WARN } odp_ipsec_status_id_t; @@ -1135,15 +1153,18 @@ typedef struct odp_ipsec_status_t { /** IPSEC status ID */ odp_ipsec_status_id_t id; - /** Return value from the operation + /** IPSEC SA that was target of the operation */ + odp_ipsec_sa_t sa; + + /** Result of the operation * * 0: Success * <0: Failure */ - int ret; + int result; - /** IPSEC SA that was target of the operation */ - odp_ipsec_sa_t sa; + /** Warnings of an ODP_IPSEC_STATUS_WARN status event */ + odp_ipsec_warn_t warn; } odp_ipsec_status_t; ----------------------------------------------------------------------- Summary of changes: include/odp/api/spec/ipsec.h | 33 +++++++++++++++++++++++++++------ 1 file changed, 27 insertions(+), 6 deletions(-) hooks/post-receive --

7 years, 7 months

[COMMIT] branch master updated. v1.15.0.0-68-g95ba4b39

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 95ba4b394009d92c29c2e22f0776e90bb4c6edec (commit) from 9bb623dfe97590991dfe3ab04e1dcfb9ff745169 (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 95ba4b394009d92c29c2e22f0776e90bb4c6edec Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Fri Jul 14 18:05:28 2017 +0300 test: ipc pktio: bind tasks and keep packet order Tasks which use odp time api have to be bind to cores. pktio_ipc1 and pktio_ipc2 apps expect counters inside packets incrementing in order - cache request in buffers to process such packet can not be allocated immediately. Single reorder of MAX_PKT_BURST+2 is ok for current example code to find initial counters value. https://bugs.linaro.org/show_bug.cgi?id=3126 Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> diff --git a/platform/linux-generic/include/odp_packet_io_internal.h b/platform/linux-generic/include/odp_packet_io_internal.h index 93040681..20a86557 100644 --- a/platform/linux-generic/include/odp_packet_io_internal.h +++ b/platform/linux-generic/include/odp_packet_io_internal.h @@ -85,9 +85,10 @@ typedef struct { _ring_t *recv; /**< ODP ring for IPC msg packets indexes received from shared memory (from remote process) */ - _ring_t *free; /**< ODP ring for IPC msg packets + _ring_t *free; /**< odp ring for ipc msg packets indexes already processed by current process */ + _ring_t *cache; /**< local cache to keep packet order right */ } rx; /* slave */ void *pool_base; /**< Remote pool base addr */ void *pool_mdata_base; /**< Remote pool mdata base addr */ diff --git a/platform/linux-generic/pktio/ipc.c b/platform/linux-generic/pktio/ipc.c index acdfc4ff..bc7d7564 100644 --- a/platform/linux-generic/pktio/ipc.c +++ b/platform/linux-generic/pktio/ipc.c @@ -341,6 +341,10 @@ static int ipc_pktio_open(odp_pktio_t id ODP_UNUSED, odp_atomic_init_u32(&pktio_entry->s.ipc.ready, 0); + pktio_entry->s.ipc.rx.cache = _ring_create("ipc_rx_cache", + PKTIO_IPC_ENTRIES, + _RING_NO_LIST); + /* Shared info about remote pktio */ if (sscanf(dev, "ipc:%d:%s", &pid, tail) == 2) { pktio_entry->s.ipc.type = PKTIO_TYPE_IPC_SLAVE; @@ -437,14 +441,19 @@ static int ipc_pktio_recv_lockless(pktio_entry_t *pktio_entry, _ipc_free_ring_packets(pktio_entry, pktio_entry->s.ipc.tx.free); - r = pktio_entry->s.ipc.rx.recv; + /* rx from cache */ + r = pktio_entry->s.ipc.rx.cache; pkts = _ring_mc_dequeue_burst(r, ipcbufs_p, len); if (odp_unlikely(pkts < 0)) ODP_ABORT("internal error dequeue\n"); - for (i = 0; i < pkts; i++) { - IPC_ODP_DBG("%d/%d recv packet offset %x\n", - i, pkts, offsets[i]); + /* rx from other app */ + if (pkts == 0) { + ipcbufs_p = (void *)&offsets[0]; + r = pktio_entry->s.ipc.rx.recv; + pkts = _ring_mc_dequeue_burst(r, ipcbufs_p, len); + if (odp_unlikely(pkts < 0)) + ODP_ABORT("internal error dequeue\n"); } /* fast path */ @@ -473,10 +482,12 @@ static int ipc_pktio_recv_lockless(pktio_entry_t *pktio_entry, /* Original pool might be smaller then * PKTIO_IPC_ENTRIES. If packet can not be * allocated from pool at this time, - * simple get in on next recv() call. + * simple get in on next recv() call. To keep + * packet ordering store such packets in local + * cache. */ - if (i == 0) - return 0; + IPC_ODP_DBG("unable to allocate packet %d/%d\n", + i, pkts); break; } @@ -507,11 +518,16 @@ static int ipc_pktio_recv_lockless(pktio_entry_t *pktio_entry, /* put back to rx ring dequed but not processed packets*/ if (pkts != i) { - r_p = pktio_entry->s.ipc.rx.recv; ipcbufs_p = (void *)&offsets[i]; + r_p = pktio_entry->s.ipc.rx.cache; pkts_ring = _ring_mp_enqueue_burst(r_p, ipcbufs_p, pkts - i); + if (pkts_ring != (pkts - i)) - ODP_ERR("bug to enqueue packets\n"); + ODP_ABORT("bug to enqueue packets\n"); + + if (i == 0) + return 0; + } /*num of actually received packets*/ @@ -740,6 +756,7 @@ static int ipc_close(pktio_entry_t *pktio_entry) _ring_destroy(ipc_shm_name); snprintf(ipc_shm_name, sizeof(ipc_shm_name), "%s_m_prod", name); _ring_destroy(ipc_shm_name); + _ring_destroy("ipc_rx_cache"); return 0; } diff --git a/test/linux-generic/pktio_ipc/ipc_common.h b/test/linux-generic/pktio_ipc/ipc_common.h index 62455776..ca78b684 100644 --- a/test/linux-generic/pktio_ipc/ipc_common.h +++ b/test/linux-generic/pktio_ipc/ipc_common.h @@ -5,6 +5,10 @@ */ #define _POSIX_C_SOURCE 200809L + +#define _GNU_SOURCE +#include <sched.h> + #include <stdlib.h> #include <inttypes.h> #include <string.h> diff --git a/test/linux-generic/pktio_ipc/pktio_ipc1.c b/test/linux-generic/pktio_ipc/pktio_ipc1.c index 705c205d..5d8434bf 100644 --- a/test/linux-generic/pktio_ipc/pktio_ipc1.c +++ b/test/linux-generic/pktio_ipc/pktio_ipc1.c @@ -42,6 +42,7 @@ static int pktio_run_loop(odp_pool_t pool) int ret; odp_pktin_queue_t pktin; char name[30]; + int sync_cnt = 0; if (master_pid) sprintf(name, TEST_IPC_PKTIO_PID_NAME, master_pid); @@ -178,7 +179,7 @@ static int pktio_run_loop(odp_pool_t pool) cnt_recv++; - if (head.seq != cnt_recv) { + if (head.seq != cnt_recv && sync_cnt) { stat_errors++; odp_packet_free(pkt); EXAMPLE_DBG("head.seq %d - " @@ -187,7 +188,6 @@ static int pktio_run_loop(odp_pool_t pool) head.seq, cnt_recv, head.seq - cnt_recv); cnt_recv = head.seq; - stat_errors++; stat_free++; continue; } @@ -213,13 +213,6 @@ static int pktio_run_loop(odp_pool_t pool) pkt_tbl[i] = pkt; } - /* exit if no packets allocated */ - if (i == 0) { - EXAMPLE_DBG("unable to alloc packet pkts %d/%d\n", - i, pkts); - break; - } - pkts = i; /* 4. Copy counter and magic numbers to that packets */ @@ -262,6 +255,10 @@ static int pktio_run_loop(odp_pool_t pool) if (odp_time_cmp(odp_time_local_from_ns(ODP_TIME_SEC_IN_NS), diff) < 0) { current_cycle = cycle; + if (!sync_cnt && stat_errors == (MAX_PKT_BURST + 2)) { + stat_errors = 0; + sync_cnt = 1; + } printf("\rpkts: %" PRIu64 ", alloc %" PRIu64 "," " errors %" PRIu64 ", pps %" PRIu64 "," " free %" PRIu64 ".", @@ -287,7 +284,7 @@ exit: return -1; } - return (stat_errors > 10 || stat_pkts < 1000) ? -1 : 0; + return (stat_errors || stat_pkts < 1000) ? -1 : 0; } /** @@ -299,6 +296,10 @@ int main(int argc, char *argv[]) odp_pool_param_t params; odp_instance_t instance; int ret; + cpu_set_t cpu_set; + odp_cpumask_t mask; + int cpu; + pid_t pid; /* Parse and store the application arguments */ parse_args(argc, argv); @@ -309,8 +310,23 @@ int main(int argc, char *argv[]) exit(EXIT_FAILURE); } + odp_cpumask_default_worker(&mask, 0); + cpu = odp_cpumask_first(&mask); + + CPU_ZERO(&cpu_set); + CPU_SET(cpu, &cpu_set); + + pid = getpid(); + + if (sched_setaffinity(pid, sizeof(cpu_set_t), &cpu_set)) { + printf("Set CPU affinity failed.\n"); + return -1; + } + + printf("ipc_pktio1 %d run on cpu %d\n", pid, cpu); + /* Init this thread */ - if (odp_init_local(instance, ODP_THREAD_CONTROL)) { + if (odp_init_local(instance, ODP_THREAD_WORKER)) { EXAMPLE_ERR("Error: ODP local init failed.\n"); exit(EXIT_FAILURE); } diff --git a/test/linux-generic/pktio_ipc/pktio_ipc2.c b/test/linux-generic/pktio_ipc/pktio_ipc2.c index daf38413..95d69e80 100644 --- a/test/linux-generic/pktio_ipc/pktio_ipc2.c +++ b/test/linux-generic/pktio_ipc/pktio_ipc2.c @@ -208,6 +208,10 @@ int main(int argc, char *argv[]) { odp_instance_t instance; int ret; + cpu_set_t cpu_set; + odp_cpumask_t mask; + int cpu; + pid_t pid; /* Parse and store the application arguments */ parse_args(argc, argv); @@ -217,8 +221,26 @@ int main(int argc, char *argv[]) exit(EXIT_FAILURE); } + odp_cpumask_default_worker(&mask, 0); + cpu = odp_cpumask_first(&mask); + ret = odp_cpumask_next(&mask, cpu); + if (ret != -1) + cpu = ret; + + CPU_ZERO(&cpu_set); + CPU_SET(cpu, &cpu_set); + + pid = getpid(); + + if (sched_setaffinity(pid, sizeof(cpu_set_t), &cpu_set)) { + printf("Set CPU affinity failed to cpu %d.\n", cpu); + return -1; + } + + printf("ipc_pktio2 %d run on cpu %d\n", pid, cpu); + /* Init this thread */ - if (odp_init_local(instance, ODP_THREAD_CONTROL)) { + if (odp_init_local(instance, ODP_THREAD_WORKER)) { EXAMPLE_ERR("Error: ODP local init failed.\n"); exit(EXIT_FAILURE); } ----------------------------------------------------------------------- Summary of changes: .../linux-generic/include/odp_packet_io_internal.h | 3 +- platform/linux-generic/pktio/ipc.c | 35 +++++++++++++++----- test/linux-generic/pktio_ipc/ipc_common.h | 4 +++ test/linux-generic/pktio_ipc/pktio_ipc1.c | 38 +++++++++++++++------- test/linux-generic/pktio_ipc/pktio_ipc2.c | 24 +++++++++++++- 5 files changed, 82 insertions(+), 22 deletions(-) hooks/post-receive --

7 years, 7 months

[COMMIT] branch master updated. v1.15.0.0-67-g9bb623df

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 9bb623dfe97590991dfe3ab04e1dcfb9ff745169 (commit) via 8b1dd78079de09d5f51c61b5b2ede2766ac74685 (commit) via 920857807c4d7831ada68ebed4ffa542564ee3a5 (commit) via 43bfbbf66db3d8fd6a22762d7ac346461857f653 (commit) via a959a61e3d00965af8b93536e3fbc3bc09cad1e9 (commit) via 9e4826c45af05eb339d129140ac88bc9d4e5a2fd (commit) via fc539b10fff8b92c234f422905eec2266ec13b26 (commit) via 04e5b3dd319d1affb61e0f6860e255082a6c15df (commit) via c65cfd73c6103d02f33a62099391a98cf60d098f (commit) from 490f4bf22129638899ce71c99a8847e8ba849692 (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 9bb623dfe97590991dfe3ab04e1dcfb9ff745169 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Fri Jul 14 03:17:05 2017 +0300 example: ipsec: fix build with OpenSSL located in non-standard path IPsec example uses OpenSSL directly to generate packages stream. Thus use $(OPENSSL_CPPFLAGS) and $(OPENSSL_LIBS) to let compiler find OpenSSL if it is present in non-standard location. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/example/ipsec/Makefile.am b/example/ipsec/Makefile.am index 01ccd426..fd9b3c72 100644 --- a/example/ipsec/Makefile.am +++ b/example/ipsec/Makefile.am @@ -1,5 +1,7 @@ include $(top_srcdir)/example/Makefile.inc +AM_CPPFLAGS = $(OPENSSL_CPPFLAGS) + bin_PROGRAMS = odp_ipsec$(EXEEXT) odp_ipsec_LDFLAGS = $(AM_LDFLAGS) -static odp_ipsec_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/example commit 8b1dd78079de09d5f51c61b5b2ede2766ac74685 Author: Matias Elo <matias.elo(a)nokia.com> Date: Mon Jul 10 16:32:05 2017 +0300 travis: add zero-copy dpdk pktio to CI Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/.travis.yml b/.travis.yml index 665d70f8..a1306206 100644 --- a/.travis.yml +++ b/.travis.yml @@ -64,6 +64,7 @@ env: - CONF="--disable-abi-compat" - CONF="--enable-schedule-sp" - CONF="--enable-schedule-iquery" + - CONF="--enable-dpdk-zero-copy" before_install: # Install cunit for the validation tests because distro version is too old and fails C99 compile commit 920857807c4d7831ada68ebed4ffa542564ee3a5 Author: Matias Elo <matias.elo(a)nokia.com> Date: Mon Jun 26 16:31:41 2017 +0300 linux-gen: dpdk: enable zero-copy operation Implements experimental zero-copy mode for DPDK pktio. This can be enabled with additional '--enable-dpdk-zero-copy' configure flag. This feature has been put behind an extra configure flag as it doesn't entirely adhere to the DPDK API and may behave unexpectedly with untested DPDK NIC drivers. Zero-copy operation has been tested with pcap, ixgbe, and i40e drivers. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/include/odp_buffer_internal.h b/platform/linux-generic/include/odp_buffer_internal.h index 1e8a6486..20127004 100644 --- a/platform/linux-generic/include/odp_buffer_internal.h +++ b/platform/linux-generic/include/odp_buffer_internal.h @@ -100,7 +100,7 @@ struct odp_buffer_hdr_t { /* Data or next header */ uint8_t data[0]; -}; +} ODP_ALIGNED_CACHE; ODP_STATIC_ASSERT(CONFIG_PACKET_MAX_SEGS < 256, "CONFIG_PACKET_MAX_SEGS_TOO_LARGE"); diff --git a/platform/linux-generic/include/odp_packet_dpdk.h b/platform/linux-generic/include/odp_packet_dpdk.h index 4d7e0fc4..5d80d84a 100644 --- a/platform/linux-generic/include/odp_packet_dpdk.h +++ b/platform/linux-generic/include/odp_packet_dpdk.h @@ -52,8 +52,6 @@ typedef struct { odp_pktio_capability_t capa; /**< interface capabilities */ uint32_t data_room; /**< maximum packet length */ uint16_t mtu; /**< maximum transmission unit */ - /** DPDK packet pool name (pktpool_<ifname>) */ - char pool_name[IF_NAMESIZE + 8]; /** Use system call to get/set vdev promisc mode */ odp_bool_t vdev_sysc_promisc; uint8_t port_id; /**< DPDK port identifier */ diff --git a/platform/linux-generic/include/odp_packet_internal.h b/platform/linux-generic/include/odp_packet_internal.h index b4bec35b..f77987c8 100644 --- a/platform/linux-generic/include/odp_packet_internal.h +++ b/platform/linux-generic/include/odp_packet_internal.h @@ -93,6 +93,12 @@ typedef struct { uint32_t l4_offset; /**< offset to L4 hdr (TCP, UDP, SCTP, also ICMP) */ } packet_parser_t; +/* Packet extra data length */ +#define PKT_EXTRA_LEN 128 + +/* Packet extra data types */ +#define PKT_EXTRA_TYPE_DPDK 1 + /** * Internal Packet header * @@ -132,6 +138,13 @@ typedef struct { /* Result for crypto */ odp_crypto_generic_op_result_t op_result; +#ifdef ODP_PKTIO_DPDK + /* Type of extra data */ + uint8_t extra_type; + /* Extra space for packet descriptors. E.g. DPDK mbuf */ + uint8_t extra[PKT_EXTRA_LEN] ODP_ALIGNED_CACHE; +#endif + /* Packet data storage */ uint8_t data[0]; } odp_packet_hdr_t; diff --git a/platform/linux-generic/include/odp_pool_internal.h b/platform/linux-generic/include/odp_pool_internal.h index a4c0e532..f2d2e2ca 100644 --- a/platform/linux-generic/include/odp_pool_internal.h +++ b/platform/linux-generic/include/odp_pool_internal.h @@ -42,6 +42,9 @@ typedef struct { } pool_ring_t ODP_ALIGNED_CACHE; +/* Callback function for pool destroy */ +typedef void (*pool_destroy_cb_fn)(void *pool); + typedef struct pool_t { odp_ticketlock_t lock ODP_ALIGNED_CACHE; @@ -67,6 +70,10 @@ typedef struct pool_t { uint8_t *base_addr; uint8_t *uarea_base_addr; + /* Used by DPDK zero-copy pktio */ + pool_destroy_cb_fn ext_destroy; + void *ext_desc; + pool_cache_t local_cache[ODP_THREAD_COUNT_MAX]; odp_shm_t ring_shm; diff --git a/platform/linux-generic/m4/odp_dpdk.m4 b/platform/linux-generic/m4/odp_dpdk.m4 index 1995e0fe..cebf1028 100644 --- a/platform/linux-generic/m4/odp_dpdk.m4 +++ b/platform/linux-generic/m4/odp_dpdk.m4 @@ -9,6 +9,16 @@ AC_HELP_STRING([--with-dpdk-path=DIR path to dpdk build directory]), pktio_dpdk_support=yes],[]) ########################################################################## +# Enable zero-copy DPDK pktio +########################################################################## +zero_copy=0 +AC_ARG_ENABLE([dpdk-zero-copy], + [ --enable-dpdk-zero-copy enable experimental zero-copy DPDK pktio mode], + [if test x$enableval = xyes; then + zero_copy=1 + fi]) + +########################################################################## # Save and set temporary compilation flags ########################################################################## OLD_CPPFLAGS="$CPPFLAGS" @@ -37,8 +47,8 @@ then done AS_VAR_APPEND([DPDK_PMDS], [--no-whole-archive]) - ODP_CFLAGS="$ODP_CFLAGS -DODP_PKTIO_DPDK" - DPDK_LIBS="-L$DPDK_PATH/lib -ldpdk -lpthread -ldl -lpcap" + ODP_CFLAGS="$ODP_CFLAGS -DODP_PKTIO_DPDK -DODP_DPDK_ZERO_COPY=$zero_copy" + DPDK_LIBS="-L$DPDK_PATH/lib -ldpdk -lpthread -ldl -lpcap -lm" AC_SUBST([DPDK_CPPFLAGS]) AC_SUBST([DPDK_LIBS]) AC_SUBST([DPDK_PMDS]) diff --git a/platform/linux-generic/odp_pool.c b/platform/linux-generic/odp_pool.c index bbd56b06..f2410b6e 100644 --- a/platform/linux-generic/odp_pool.c +++ b/platform/linux-generic/odp_pool.c @@ -393,6 +393,8 @@ static odp_pool_t pool_create(const char *name, odp_pool_param_t *params, pool->uarea_size = uarea_size; pool->shm_size = num * block_size; pool->uarea_shm_size = num * uarea_size; + pool->ext_desc = NULL; + pool->ext_destroy = NULL; shm = odp_shm_reserve(pool->name, pool->shm_size, ODP_PAGE_SIZE, shmflags); @@ -537,6 +539,13 @@ int odp_pool_destroy(odp_pool_t pool_hdl) return -1; } + /* Destroy external DPDK mempool */ + if (pool->ext_destroy) { + pool->ext_destroy(pool->ext_desc); + pool->ext_destroy = NULL; + pool->ext_desc = NULL; + } + /* Make sure local caches are empty */ for (i = 0; i < ODP_THREAD_COUNT_MAX; i++) flush_cache(&pool->local_cache[i], pool); diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c index c52cd09d..9e3e583d 100644 --- a/platform/linux-generic/pktio/dpdk.c +++ b/platform/linux-generic/pktio/dpdk.c @@ -11,6 +11,7 @@ #include <sched.h> #include <ctype.h> #include <unistd.h> +#include <math.h> #include <odp/api/cpumask.h> @@ -25,10 +26,19 @@ #include <protocols/eth.h> #include <rte_config.h> +#include <rte_malloc.h> #include <rte_mbuf.h> +#include <rte_mempool.h> #include <rte_ethdev.h> #include <rte_string_fns.h> +#if ODP_DPDK_ZERO_COPY +ODP_STATIC_ASSERT(CONFIG_PACKET_HEADROOM == RTE_PKTMBUF_HEADROOM, + "ODP and DPDK headroom sizes not matching!"); +ODP_STATIC_ASSERT(PKT_EXTRA_LEN >= sizeof(struct rte_mbuf), + "DPDK rte_mbuf won't fit in odp_packet_hdr_t.extra!"); +#endif + static int disable_pktio; /** !0 this pktio disabled, 0 enabled */ /* Has dpdk_pktio_init() been called */ @@ -58,6 +68,464 @@ void refer_constructors(void) mp_hdlr_init_ops_stack(); } +/** + * Calculate valid cache size for DPDK packet pool + */ +static unsigned cache_size(uint32_t num) +{ + unsigned size = 0; + unsigned i; + + if (!RTE_MEMPOOL_CACHE_MAX_SIZE) + return 0; + + i = ceil((double)num / RTE_MEMPOOL_CACHE_MAX_SIZE); + i = RTE_MAX(i, 2UL); + for (; i <= (num / 2); ++i) + if ((num % i) == 0) { + size = num / i; + break; + } + if (odp_unlikely(size > RTE_MEMPOOL_CACHE_MAX_SIZE || + (uint32_t)size * 1.5 > num)) { + ODP_ERR("Cache size calc failure: %d\n", size); + size = 0; + } + + return size; +} + +static inline uint16_t mbuf_data_off(struct rte_mbuf *mbuf, + odp_packet_hdr_t *pkt_hdr) +{ + return (uint64_t)pkt_hdr->buf_hdr.seg[0].data - + (uint64_t)mbuf->buf_addr; +} + +/** + * Update mbuf + * + * Called always before rte_mbuf is passed to DPDK. + */ +static inline void mbuf_update(struct rte_mbuf *mbuf, odp_packet_hdr_t *pkt_hdr, + uint16_t pkt_len) +{ + mbuf->data_len = pkt_len; + mbuf->pkt_len = pkt_len; + mbuf->refcnt = 1; + + if (odp_unlikely(pkt_hdr->buf_hdr.base_data != + pkt_hdr->buf_hdr.seg[0].data)) + mbuf->data_off = mbuf_data_off(mbuf, pkt_hdr); +} + +/** + * Initialize mbuf + * + * Called once per ODP packet. + */ +static void mbuf_init(struct rte_mempool *mp, struct rte_mbuf *mbuf, + odp_packet_hdr_t *pkt_hdr) +{ + void *buf_addr = pkt_hdr->buf_hdr.base_data - RTE_PKTMBUF_HEADROOM; + + rte_mem_lock_page(buf_addr); + + memset(mbuf, 0, sizeof(struct rte_mbuf)); + + mbuf->priv_size = 0; + mbuf->buf_addr = buf_addr; + mbuf->buf_physaddr = rte_mem_virt2phy(buf_addr); + if (odp_unlikely(mbuf->buf_physaddr == RTE_BAD_PHYS_ADDR)) + ODP_ABORT("Failed to map virt addr to phy"); + + mbuf->buf_len = (uint16_t)rte_pktmbuf_data_room_size(mp); + mbuf->data_off = RTE_PKTMBUF_HEADROOM; + mbuf->pool = mp; + mbuf->refcnt = 1; + mbuf->nb_segs = 1; + mbuf->port = 0xff; + + /* Store ODP packet handle inside rte_mbuf */ + mbuf->userdata = packet_handle(pkt_hdr); + pkt_hdr->extra_type = PKT_EXTRA_TYPE_DPDK; +} + +/** + * Create custom DPDK packet pool + */ +static struct rte_mempool *mbuf_pool_create(const char *name, + pool_t *pool_entry) +{ + struct rte_mempool *mp; + struct rte_pktmbuf_pool_private mbp_priv; + unsigned elt_size; + unsigned num; + uint16_t data_room_size; + + num = pool_entry->num; + data_room_size = pool_entry->max_seg_len + CONFIG_PACKET_HEADROOM; + elt_size = sizeof(struct rte_mbuf) + (unsigned)data_room_size; + mbp_priv.mbuf_data_room_size = data_room_size; + mbp_priv.mbuf_priv_size = 0; + + mp = rte_mempool_create_empty(name, num, elt_size, cache_size(num), + sizeof(struct rte_pktmbuf_pool_private), + rte_socket_id(), 0); + if (mp == NULL) { + ODP_ERR("Failed to create empty DPDK packet pool\n"); + return NULL; + } + + if (rte_mempool_set_ops_byname(mp, "odp_pool", pool_entry)) { + ODP_ERR("Failed setting mempool operations\n"); + return NULL; + } + + rte_pktmbuf_pool_init(mp, &mbp_priv); + + if (rte_mempool_ops_alloc(mp)) { + ODP_ERR("Failed allocating mempool\n"); + return NULL; + } + + return mp; +} + +/* DPDK external memory pool operations */ + +static int pool_enqueue(struct rte_mempool *mp ODP_UNUSED, + void * const *obj_table, unsigned num) +{ + odp_packet_t pkt_tbl[num]; + unsigned i; + + if (odp_unlikely(num == 0)) + return 0; + + for (i = 0; i < num; i++) + pkt_tbl[i] = (odp_packet_t)((struct rte_mbuf *) + obj_table[i])->userdata; + + odp_packet_free_multi(pkt_tbl, num); + + return 0; +} + +static int pool_dequeue_bulk(struct rte_mempool *mp, void **obj_table, + unsigned num) +{ + odp_pool_t pool = (odp_pool_t)mp->pool_data; + pool_t *pool_entry = (pool_t *)mp->pool_config; + odp_packet_t packet_tbl[num]; + int pkts; + int i; + + pkts = packet_alloc_multi(pool, pool_entry->max_seg_len, packet_tbl, + num); + + if (odp_unlikely(pkts != (int)num)) { + if (pkts > 0) + odp_packet_free_multi(packet_tbl, pkts); + return -ENOENT; + } + + for (i = 0; i < pkts; i++) { + odp_packet_t pkt = packet_tbl[i]; + odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt); + struct rte_mbuf *mbuf = (struct rte_mbuf *) + (uintptr_t)pkt_hdr->extra; + if (pkt_hdr->extra_type != PKT_EXTRA_TYPE_DPDK) + mbuf_init(mp, mbuf, pkt_hdr); + obj_table[i] = mbuf; + } + + return 0; +} + +static int pool_alloc(struct rte_mempool *mp) +{ + pool_t *pool_entry = (pool_t *)mp->pool_config; + + mp->pool_data = pool_entry->pool_hdl; + mp->flags |= MEMPOOL_F_POOL_CREATED; + + return 0; +} + +static unsigned pool_get_count(const struct rte_mempool *mp) +{ + odp_pool_t pool = (odp_pool_t)mp->pool_data; + odp_pool_info_t info; + + if (odp_pool_info(pool, &info)) { + ODP_ERR("Failed to read pool info\n"); + return 0; + } + return info.params.pkt.num; +} + +static void pool_free(struct rte_mempool *mp) +{ + unsigned lcore_id; + + RTE_LCORE_FOREACH(lcore_id) { + struct rte_mempool_cache *cache; + + cache = rte_mempool_default_cache(mp, lcore_id); + if (cache != NULL) + rte_mempool_cache_flush(cache, mp); + } +} + +static void pool_destroy(void *pool) +{ + struct rte_mempool *mp = (struct rte_mempool *)pool; + + if (mp != NULL) + rte_mempool_free(mp); +} + +static struct rte_mempool_ops ops_stack = { + .name = "odp_pool", + .alloc = pool_alloc, + .free = pool_free, + .enqueue = pool_enqueue, + .dequeue = pool_dequeue_bulk, + .get_count = pool_get_count +}; + +MEMPOOL_REGISTER_OPS(ops_stack); + +static inline int mbuf_to_pkt(pktio_entry_t *pktio_entry, + odp_packet_t pkt_table[], + struct rte_mbuf *mbuf_table[], + uint16_t mbuf_num, odp_time_t *ts) +{ + odp_packet_t pkt; + odp_packet_hdr_t *pkt_hdr; + uint16_t pkt_len; + struct rte_mbuf *mbuf; + void *data; + int i, j; + int nb_pkts = 0; + int alloc_len, num; + odp_pool_t pool = pktio_entry->s.pkt_dpdk.pool; + + /* Allocate maximum sized packets */ + alloc_len = pktio_entry->s.pkt_dpdk.data_room; + + num = packet_alloc_multi(pool, alloc_len, pkt_table, mbuf_num); + if (num != mbuf_num) { + ODP_DBG("packet_alloc_multi() unable to allocate all packets: " + "%d/%" PRIu16 " allocated\n", num, mbuf_num); + for (i = num; i < mbuf_num; i++) + rte_pktmbuf_free(mbuf_table[i]); + } + + for (i = 0; i < num; i++) { + odp_packet_hdr_t parsed_hdr; + + mbuf = mbuf_table[i]; + if (odp_unlikely(mbuf->nb_segs != 1)) { + ODP_ERR("Segmented buffers not supported\n"); + goto fail; + } + + data = rte_pktmbuf_mtod(mbuf, char *); + odp_prefetch(data); + + pkt_len = rte_pktmbuf_pkt_len(mbuf); + + if (pktio_cls_enabled(pktio_entry)) { + if (cls_classify_packet(pktio_entry, + (const uint8_t *)data, + pkt_len, pkt_len, &pool, + &parsed_hdr)) + goto fail; + } + + pkt = pkt_table[i]; + pkt_hdr = odp_packet_hdr(pkt); + pull_tail(pkt_hdr, alloc_len - pkt_len); + + if (odp_packet_copy_from_mem(pkt, 0, pkt_len, data) != 0) + goto fail; + + pkt_hdr->input = pktio_entry->s.handle; + + if (pktio_cls_enabled(pktio_entry)) + copy_packet_cls_metadata(&parsed_hdr, pkt_hdr); + else + packet_parse_layer(pkt_hdr, + pktio_entry->s.config.parser.layer); + + if (mbuf->ol_flags & PKT_RX_RSS_HASH) + odp_packet_flow_hash_set(pkt, mbuf->hash.rss); + + packet_set_ts(pkt_hdr, ts); + + pkt_table[nb_pkts++] = pkt; + + rte_pktmbuf_free(mbuf); + } + + return nb_pkts; + +fail: + odp_packet_free_multi(&pkt_table[i], num - i); + + for (j = i; j < num; j++) + rte_pktmbuf_free(mbuf_table[j]); + + return (i > 0 ? i : -1); +} + +static inline int pkt_to_mbuf(pktio_entry_t *pktio_entry, + struct rte_mbuf *mbuf_table[], + const odp_packet_t pkt_table[], uint16_t num) +{ + pkt_dpdk_t *pkt_dpdk = &pktio_entry->s.pkt_dpdk; + int i, j; + char *data; + uint16_t pkt_len; + + if (odp_unlikely((rte_pktmbuf_alloc_bulk(pkt_dpdk->pkt_pool, + mbuf_table, num)))) { + ODP_ERR("Failed to alloc mbuf\n"); + return 0; + } + for (i = 0; i < num; i++) { + pkt_len = _odp_packet_len(pkt_table[i]); + + if (pkt_len > pkt_dpdk->mtu) { + if (i == 0) + __odp_errno = EMSGSIZE; + goto fail; + } + + /* Packet always fits in mbuf */ + data = rte_pktmbuf_append(mbuf_table[i], pkt_len); + + odp_packet_copy_to_mem(pkt_table[i], 0, pkt_len, data); + } + return i; + +fail: + for (j = i; j < num; j++) + rte_pktmbuf_free(mbuf_table[j]); + + return i; +} + +static inline int mbuf_to_pkt_zero(pktio_entry_t *pktio_entry, + odp_packet_t pkt_table[], + struct rte_mbuf *mbuf_table[], + uint16_t mbuf_num, odp_time_t *ts) +{ + odp_packet_t pkt; + odp_packet_hdr_t *pkt_hdr; + uint16_t pkt_len; + struct rte_mbuf *mbuf; + void *data; + int i; + int nb_pkts = 0; + odp_pool_t pool = pktio_entry->s.pkt_dpdk.pool; + + for (i = 0; i < mbuf_num; i++) { + odp_packet_hdr_t parsed_hdr; + + mbuf = mbuf_table[i]; + if (odp_unlikely(mbuf->nb_segs != 1)) { + ODP_ERR("Segmented buffers not supported\n"); + rte_pktmbuf_free(mbuf); + continue; + } + + data = rte_pktmbuf_mtod(mbuf, char *); + pkt_len = rte_pktmbuf_pkt_len(mbuf); + + pkt = (odp_packet_t)mbuf->userdata; + pkt_hdr = odp_packet_hdr(pkt); + + if (pktio_cls_enabled(pktio_entry)) { + if (cls_classify_packet(pktio_entry, + (const uint8_t *)data, + pkt_len, pkt_len, &pool, + &parsed_hdr)) + ODP_ERR("Unable to classify packet\n"); + rte_pktmbuf_free(mbuf); + continue; + } + + /* Init buffer segments. Currently, only single segment packets + * are supported. */ + pkt_hdr->buf_hdr.seg[0].data = data; + + packet_init(pkt_hdr, pkt_len); + pkt_hdr->input = pktio_entry->s.handle; + + if (pktio_cls_enabled(pktio_entry)) + copy_packet_cls_metadata(&parsed_hdr, pkt_hdr); + else + packet_parse_layer(pkt_hdr, + pktio_entry->s.config.parser.layer); + + if (mbuf->ol_flags & PKT_RX_RSS_HASH) + odp_packet_flow_hash_set(pkt, mbuf->hash.rss); + + packet_set_ts(pkt_hdr, ts); + + pkt_table[nb_pkts++] = pkt; + } + + return nb_pkts; +} + +static inline int pkt_to_mbuf_zero(pktio_entry_t *pktio_entry, + struct rte_mbuf *mbuf_table[], + const odp_packet_t pkt_table[], uint16_t num, + uint16_t *seg_count) +{ + pkt_dpdk_t *pkt_dpdk = &pktio_entry->s.pkt_dpdk; + int i; + + *seg_count = 0; + + for (i = 0; i < num; i++) { + odp_packet_t pkt = pkt_table[i]; + odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt); + struct rte_mbuf *mbuf = (struct rte_mbuf *) + (uintptr_t)pkt_hdr->extra; + uint16_t pkt_len = odp_packet_len(pkt); + + if (odp_unlikely(pkt_len > pkt_dpdk->mtu)) + goto fail; + + if (odp_likely(pkt_hdr->buf_hdr.segcount == 1)) { + if (odp_unlikely(pkt_hdr->extra_type != + PKT_EXTRA_TYPE_DPDK)) + mbuf_init(pkt_dpdk->pkt_pool, mbuf, pkt_hdr); + + mbuf_update(mbuf, pkt_hdr, pkt_len); + } else { + /* Fall back to packet copy */ + if (odp_unlikely(pkt_to_mbuf(pktio_entry, &mbuf, + &pkt, 1) != 1)) + goto fail; + (*seg_count)++; + } + + mbuf_table[i] = mbuf; + } + return i; + +fail: + if (i == 0) + __odp_errno = EMSGSIZE; + return i; +} + /* Test if s has only digits or not. Dpdk pktio uses only digits.*/ static int dpdk_netdev_is_valid(const char *s) { @@ -95,7 +563,7 @@ static uint32_t dpdk_vdev_mtu_get(uint8_t port_id) static uint32_t dpdk_mtu_get(pktio_entry_t *pktio_entry) { pkt_dpdk_t *pkt_dpdk = &pktio_entry->s.pkt_dpdk; - uint32_t mtu; + uint32_t mtu = 0; if (rte_eth_dev_get_mtu(pkt_dpdk->port_id, (uint16_t *)&mtu)) return 0; @@ -201,13 +669,12 @@ static int dpdk_setup_port(pktio_entry_t *pktio_entry) struct rte_eth_conf port_conf = { .rxmode = { .mq_mode = ETH_MQ_RX_RSS, - .max_rx_pkt_len = pkt_dpdk->data_room, .split_hdr_size = 0, .header_split = 0, .hw_ip_checksum = 0, .hw_vlan_filter = 0, - .jumbo_frame = 1, .hw_strip_crc = 0, + .enable_scatter = 0, }, .rx_adv_conf = { .rss_conf = rss_conf, @@ -245,7 +712,8 @@ static int dpdk_close(pktio_entry_t *pktio_entry) if (pktio_entry->s.state != PKTIO_STATE_OPENED) rte_eth_dev_close(pkt_dpdk->port_id); - rte_mempool_free(pkt_dpdk->pkt_pool); + if (!ODP_DPDK_ZERO_COPY) + rte_mempool_free(pkt_dpdk->pkt_pool); return 0; } @@ -444,16 +912,18 @@ static int dpdk_open(odp_pktio_t id ODP_UNUSED, pkt_dpdk_t *pkt_dpdk = &pktio_entry->s.pkt_dpdk; struct rte_eth_dev_info dev_info; struct rte_mempool *pkt_pool; - odp_pool_info_t pool_info; + char pool_name[RTE_MEMPOOL_NAMESIZE]; uint16_t data_room; uint32_t mtu; int i; + pool_t *pool_entry; if (disable_pktio) return -1; if (pool == ODP_POOL_INVALID) return -1; + pool_entry = pool_entry_from_hdl(pool); if (!dpdk_netdev_is_valid(netdev)) { ODP_ERR("Invalid dpdk netdev: %s\n", netdev); @@ -473,19 +943,11 @@ static int dpdk_open(odp_pktio_t id ODP_UNUSED, pkt_dpdk->pool = pool; pkt_dpdk->port_id = atoi(netdev); - snprintf(pkt_dpdk->pool_name, sizeof(pkt_dpdk->pool_name), "pktpool_%s", - netdev); - if (rte_eth_dev_count() == 0) { ODP_ERR("No DPDK ports found\n"); return -1; } - if (odp_pool_info(pool, &pool_info) < 0) { - ODP_ERR("Failed to read pool info\n"); - return -1; - } - dpdk_init_capability(pktio_entry, &dev_info); mtu = dpdk_mtu_get(pktio_entry); @@ -506,19 +968,35 @@ static int dpdk_open(odp_pktio_t id ODP_UNUSED, pkt_dpdk->min_rx_burst = DPDK_IXGBE_MIN_RX_BURST; else pkt_dpdk->min_rx_burst = 0; - - pkt_pool = rte_pktmbuf_pool_create(pkt_dpdk->pool_name, DPDK_NB_MBUF, - DPDK_MEMPOOL_CACHE_SIZE, 0, - DPDK_MBUF_BUF_SIZE, rte_socket_id()); + if (ODP_DPDK_ZERO_COPY) { + if (pool_entry->ext_desc != NULL) { + pkt_pool = (struct rte_mempool *)pool_entry->ext_desc; + } else { + snprintf(pool_name, sizeof(pool_name), + "pktpool_%" PRIu32 "", pool_entry->pool_idx); + pkt_pool = mbuf_pool_create(pool_name, + pool_entry); + pool_entry->ext_destroy = pool_destroy; + pool_entry->ext_desc = pkt_pool; + } + } else { + snprintf(pool_name, sizeof(pool_name), "pktpool_%s", netdev); + pkt_pool = rte_pktmbuf_pool_create(pool_name, + DPDK_NB_MBUF, + DPDK_MEMPOOL_CACHE_SIZE, 0, + DPDK_MBUF_BUF_SIZE, + rte_socket_id()); + } if (pkt_pool == NULL) { ODP_ERR("Cannot init mbuf packet pool\n"); return -1; } + pkt_dpdk->pkt_pool = pkt_pool; data_room = rte_pktmbuf_data_room_size(pkt_dpdk->pkt_pool) - RTE_PKTMBUF_HEADROOM; - pkt_dpdk->data_room = RTE_MIN(pool_info.params.pkt.len, data_room); + pkt_dpdk->data_room = RTE_MIN(pool_entry->max_seg_len, data_room); /* Mbuf chaining not yet supported */ pkt_dpdk->mtu = RTE_MIN(pkt_dpdk->mtu, pkt_dpdk->data_room); @@ -591,129 +1069,6 @@ static int dpdk_stop(pktio_entry_t *pktio_entry) return 0; } -static inline int mbuf_to_pkt(pktio_entry_t *pktio_entry, - odp_packet_t pkt_table[], - struct rte_mbuf *mbuf_table[], - uint16_t mbuf_num, odp_time_t *ts) -{ - odp_packet_t pkt; - odp_packet_hdr_t *pkt_hdr; - uint16_t pkt_len; - struct rte_mbuf *mbuf; - void *buf; - int i, j; - int nb_pkts = 0; - int alloc_len, num; - odp_pool_t pool = pktio_entry->s.pkt_dpdk.pool; - - /* Allocate maximum sized packets */ - alloc_len = pktio_entry->s.pkt_dpdk.data_room; - - num = packet_alloc_multi(pool, alloc_len, pkt_table, mbuf_num); - if (num != mbuf_num) { - ODP_DBG("packet_alloc_multi() unable to allocate all packets: " - "%d/%" PRIu16 " allocated\n", num, mbuf_num); - for (i = num; i < mbuf_num; i++) - rte_pktmbuf_free(mbuf_table[i]); - } - - for (i = 0; i < num; i++) { - odp_packet_hdr_t parsed_hdr; - - mbuf = mbuf_table[i]; - if (odp_unlikely(mbuf->nb_segs != 1)) { - ODP_ERR("Segmented buffers not supported\n"); - goto fail; - } - - buf = rte_pktmbuf_mtod(mbuf, char *); - odp_prefetch(buf); - - pkt_len = rte_pktmbuf_pkt_len(mbuf); - - if (pktio_cls_enabled(pktio_entry)) { - if (cls_classify_packet(pktio_entry, - (const uint8_t *)buf, - pkt_len, pkt_len, &pool, - &parsed_hdr)) - goto fail; - } - - pkt = pkt_table[i]; - pkt_hdr = odp_packet_hdr(pkt); - pull_tail(pkt_hdr, alloc_len - pkt_len); - - /* For now copy the data in the mbuf, - worry about zero-copy later */ - if (odp_packet_copy_from_mem(pkt, 0, pkt_len, buf) != 0) - goto fail; - - pkt_hdr->input = pktio_entry->s.handle; - - if (pktio_cls_enabled(pktio_entry)) - copy_packet_cls_metadata(&parsed_hdr, pkt_hdr); - else - packet_parse_layer(pkt_hdr, - pktio_entry->s.config.parser.layer); - - if (mbuf->ol_flags & PKT_RX_RSS_HASH) - odp_packet_flow_hash_set(pkt, mbuf->hash.rss); - - packet_set_ts(pkt_hdr, ts); - - pkt_table[nb_pkts++] = pkt; - - rte_pktmbuf_free(mbuf); - } - - return nb_pkts; - -fail: - odp_packet_free_multi(&pkt_table[i], num - i); - - for (j = i; j < num; j++) - rte_pktmbuf_free(mbuf_table[j]); - - return (i > 0 ? i : -1); -} - -static inline int pkt_to_mbuf(pktio_entry_t *pktio_entry, - struct rte_mbuf *mbuf_table[], - const odp_packet_t pkt_table[], uint16_t num) -{ - pkt_dpdk_t *pkt_dpdk = &pktio_entry->s.pkt_dpdk; - int i, j; - char *data; - uint16_t pkt_len; - - if (odp_unlikely((rte_pktmbuf_alloc_bulk(pkt_dpdk->pkt_pool, - mbuf_table, num)))) { - ODP_ERR("Failed to alloc mbuf\n"); - return 0; - } - for (i = 0; i < num; i++) { - pkt_len = _odp_packet_len(pkt_table[i]); - - if (pkt_len > pkt_dpdk->mtu) { - if (i == 0) - __odp_errno = EMSGSIZE; - goto fail; - } - - /* Packet always fits in mbuf */ - data = rte_pktmbuf_append(mbuf_table[i], pkt_len); - - odp_packet_copy_to_mem(pkt_table[i], 0, pkt_len, data); - } - return i; - -fail: - for (j = i; j < num; j++) - rte_pktmbuf_free(mbuf_table[j]); - - return i; -} - static int dpdk_recv(pktio_entry_t *pktio_entry, int index, odp_packet_t pkt_table[], int num) { @@ -777,8 +1132,12 @@ static int dpdk_recv(pktio_entry_t *pktio_entry, int index, ts_val = odp_time_global(); ts = &ts_val; } - nb_rx = mbuf_to_pkt(pktio_entry, pkt_table, rx_mbufs, nb_rx, - ts); + if (ODP_DPDK_ZERO_COPY) + nb_rx = mbuf_to_pkt_zero(pktio_entry, pkt_table, + rx_mbufs, nb_rx, ts); + else + nb_rx = mbuf_to_pkt(pktio_entry, pkt_table, rx_mbufs, + nb_rx, ts); } return nb_rx; @@ -789,6 +1148,7 @@ static int dpdk_send(pktio_entry_t *pktio_entry, int index, { struct rte_mbuf *tx_mbufs[num]; pkt_dpdk_t *pkt_dpdk = &pktio_entry->s.pkt_dpdk; + uint16_t seg_count = 0; int tx_pkts; int i; int mbufs; @@ -796,7 +1156,11 @@ static int dpdk_send(pktio_entry_t *pktio_entry, int index, if (odp_unlikely(pktio_entry->s.state != PKTIO_STATE_STARTED)) return 0; - mbufs = pkt_to_mbuf(pktio_entry, tx_mbufs, pkt_table, num); + if (ODP_DPDK_ZERO_COPY) + mbufs = pkt_to_mbuf_zero(pktio_entry, tx_mbufs, pkt_table, num, + &seg_count); + else + mbufs = pkt_to_mbuf(pktio_entry, tx_mbufs, pkt_table, num); if (!pkt_dpdk->lockless_tx) odp_ticketlock_lock(&pkt_dpdk->tx_lock[index]); @@ -807,16 +1171,38 @@ static int dpdk_send(pktio_entry_t *pktio_entry, int index, if (!pkt_dpdk->lockless_tx) odp_ticketlock_unlock(&pkt_dpdk->tx_lock[index]); - if (odp_unlikely(tx_pkts < num)) { - for (i = tx_pkts; i < mbufs; i++) - rte_pktmbuf_free(tx_mbufs[i]); - } - - if (odp_unlikely(tx_pkts == 0)) { - if (__odp_errno != 0) - return -1; + if (ODP_DPDK_ZERO_COPY) { + /* Free copied segmented packets */ + if (odp_unlikely(seg_count)) { + uint16_t freed = 0; + + for (i = 0; i < mbufs && freed != seg_count; i++) { + odp_packet_t pkt = pkt_table[i]; + odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt); + + if (pkt_hdr->buf_hdr.segcount > 1) { + if (odp_likely(i < tx_pkts)) + odp_packet_free(pkt); + else + rte_pktmbuf_free(tx_mbufs[i]); + freed++; + } + } + } + if (odp_unlikely(tx_pkts == 0 && __odp_errno != 0)) + return -1; } else { - odp_packet_free_multi(pkt_table, tx_pkts); + if (odp_unlikely(tx_pkts < mbufs)) { + for (i = tx_pkts; i < mbufs; i++) + rte_pktmbuf_free(tx_mbufs[i]); + } + + if (odp_unlikely(tx_pkts == 0)) { + if (__odp_errno != 0) + return -1; + } else { + odp_packet_free_multi(pkt_table, tx_pkts); + } } return tx_pkts; commit 43bfbbf66db3d8fd6a22762d7ac346461857f653 Author: Matias Elo <matias.elo(a)nokia.com> Date: Mon Jul 3 12:27:34 2017 +0300 linux-gen: packet: increase default headroom The packet default headroom is modified to be the same as in DPDK to enable interoperability between ODP and DPDK packets. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/include/odp_config_internal.h b/platform/linux-generic/include/odp_config_internal.h index 292be356..a798851f 100644 --- a/platform/linux-generic/include/odp_config_internal.h +++ b/platform/linux-generic/include/odp_config_internal.h @@ -56,10 +56,10 @@ extern "C" { * size e.g. due to HW or a protocol specific alignment requirement. * * @internal In odp-linux implementation: - * The default value (66) allows a 1500-byte packet to be received into a single - * segment with Ethernet offset alignment and room for some header expansion. + * The default value (128) allows a 1500-byte packet to be received into a + * single segment with room for some header expansion. */ -#define CONFIG_PACKET_HEADROOM 66 +#define CONFIG_PACKET_HEADROOM 128 /* * Default packet tailroom commit a959a61e3d00965af8b93536e3fbc3bc09cad1e9 Author: Matias Elo <matias.elo(a)nokia.com> Date: Thu Jun 29 15:06:59 2017 +0300 linux-gen: pool: fix segfault condition in buffer_free_to_pool() One can remove max 'cache_num' objects from the local cache. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/odp_pool.c b/platform/linux-generic/odp_pool.c index e08c8985..bbd56b06 100644 --- a/platform/linux-generic/odp_pool.c +++ b/platform/linux-generic/odp_pool.c @@ -703,6 +703,8 @@ static inline void buffer_free_to_pool(pool_t *pool, if (odp_unlikely(num > CACHE_BURST)) burst = num; + if (odp_unlikely((uint32_t)num > cache_num)) + burst = cache_num; { /* Temporary copy needed since odp_buffer_t is commit 9e4826c45af05eb339d129140ac88bc9d4e5a2fd Author: Matias Elo <matias.elo(a)nokia.com> Date: Tue Jun 27 10:53:35 2017 +0300 linux-gen: pktio: add missing global locks to odp_pktio_close() Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c index 6a181f53..64c6e452 100644 --- a/platform/linux-generic/odp_packet_io.c +++ b/platform/linux-generic/odp_packet_io.c @@ -376,7 +376,9 @@ int odp_pktio_close(odp_pktio_t hdl) entry->s.num_in_queue = 0; entry->s.num_out_queue = 0; + odp_spinlock_lock(&pktio_tbl->lock); res = _pktio_close(entry); + odp_spinlock_unlock(&pktio_tbl->lock); if (res) ODP_ABORT("unable to close pktio\n"); commit fc539b10fff8b92c234f422905eec2266ec13b26 Author: Matias Elo <matias.elo(a)nokia.com> Date: Mon Jun 26 16:03:58 2017 +0300 linux-gen: packet: move packet_init() function to header file Move packet_init() inline function to odp_packet_internal.h. This way e.g. pktio devices can use it directly. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/include/odp_packet_internal.h b/platform/linux-generic/include/odp_packet_internal.h index d38f831f..b4bec35b 100644 --- a/platform/linux-generic/include/odp_packet_internal.h +++ b/platform/linux-generic/include/odp_packet_internal.h @@ -159,6 +159,45 @@ static inline odp_packet_t packet_from_buf_hdr(odp_buffer_hdr_t *buf_hdr) return (odp_packet_t)(odp_packet_hdr_t *)buf_hdr; } +/** + * Initialize packet + */ +static inline void packet_init(odp_packet_hdr_t *pkt_hdr, uint32_t len) +{ + uint32_t seg_len; + int num = pkt_hdr->buf_hdr.segcount; + + if (odp_likely(CONFIG_PACKET_MAX_SEGS == 1 || num == 1)) { + seg_len = len; + pkt_hdr->buf_hdr.seg[0].len = len; + } else { + seg_len = len - ((num - 1) * CONFIG_PACKET_MAX_SEG_LEN); + + /* Last segment data length */ + pkt_hdr->buf_hdr.seg[num - 1].len = seg_len; + } + + pkt_hdr->p.input_flags.all = 0; + pkt_hdr->p.output_flags.all = 0; + pkt_hdr->p.error_flags.all = 0; + + pkt_hdr->p.l2_offset = 0; + pkt_hdr->p.l3_offset = ODP_PACKET_OFFSET_INVALID; + pkt_hdr->p.l4_offset = ODP_PACKET_OFFSET_INVALID; + + /* + * Packet headroom is set from the pool's headroom + * Packet tailroom is rounded up to fill the last + * segment occupied by the allocated length. + */ + pkt_hdr->frame_len = len; + pkt_hdr->headroom = CONFIG_PACKET_HEADROOM; + pkt_hdr->tailroom = CONFIG_PACKET_MAX_SEG_LEN - seg_len + + CONFIG_PACKET_TAILROOM; + + pkt_hdr->input = ODP_PKTIO_INVALID; +} + static inline void copy_packet_parser_metadata(odp_packet_hdr_t *src_hdr, odp_packet_hdr_t *dst_hdr) { diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index ab325692..dbde7280 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -241,45 +241,6 @@ void packet_parse_reset(odp_packet_hdr_t *pkt_hdr) pkt_hdr->p.l4_offset = ODP_PACKET_OFFSET_INVALID; } -/** - * Initialize packet - */ -static inline void packet_init(odp_packet_hdr_t *pkt_hdr, uint32_t len) -{ - uint32_t seg_len; - int num = pkt_hdr->buf_hdr.segcount; - - if (odp_likely(CONFIG_PACKET_MAX_SEGS == 1 || num == 1)) { - seg_len = len; - pkt_hdr->buf_hdr.seg[0].len = len; - } else { - seg_len = len - ((num - 1) * CONFIG_PACKET_MAX_SEG_LEN); - - /* Last segment data length */ - pkt_hdr->buf_hdr.seg[num - 1].len = seg_len; - } - - pkt_hdr->p.input_flags.all = 0; - pkt_hdr->p.output_flags.all = 0; - pkt_hdr->p.error_flags.all = 0; - - pkt_hdr->p.l2_offset = 0; - pkt_hdr->p.l3_offset = ODP_PACKET_OFFSET_INVALID; - pkt_hdr->p.l4_offset = ODP_PACKET_OFFSET_INVALID; - - /* - * Packet headroom is set from the pool's headroom - * Packet tailroom is rounded up to fill the last - * segment occupied by the allocated length. - */ - pkt_hdr->frame_len = len; - pkt_hdr->headroom = CONFIG_PACKET_HEADROOM; - pkt_hdr->tailroom = CONFIG_PACKET_MAX_SEG_LEN - seg_len + - CONFIG_PACKET_TAILROOM; - - pkt_hdr->input = ODP_PKTIO_INVALID; -} - static inline void init_segments(odp_packet_hdr_t *pkt_hdr[], int num) { odp_packet_hdr_t *hdr; commit 04e5b3dd319d1affb61e0f6860e255082a6c15df Author: Matias Elo <matias.elo(a)nokia.com> Date: Thu Jun 22 16:32:36 2017 +0300 linux-gen: socket: fix ring frame size Frame size should include also packet headroom and tailroom. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/pktio/socket_mmap.c b/platform/linux-generic/pktio/socket_mmap.c index 2dba7b08..6fc4b4cc 100644 --- a/platform/linux-generic/pktio/socket_mmap.c +++ b/platform/linux-generic/pktio/socket_mmap.c @@ -355,9 +355,9 @@ static void mmap_fill_ring(struct ring *ring, odp_pool_t pool_hdl, int fanout) pool = pool_entry_from_hdl(pool_hdl); /* Frame has to capture full packet which can fit to the pool block.*/ - ring->req.tp_frame_size = (pool->data_size + - TPACKET_HDRLEN + TPACKET_ALIGNMENT + - + (pz - 1)) & (-pz); + ring->req.tp_frame_size = (pool->headroom + pool->data_size + + pool->tailroom + TPACKET_HDRLEN + + TPACKET_ALIGNMENT + + (pz - 1)) & (-pz); /* Calculate how many pages do we need to hold all pool packets * and align size to page boundary. commit c65cfd73c6103d02f33a62099391a98cf60d098f Author: Matias Elo <matias.elo(a)nokia.com> Date: Thu Jun 22 14:52:27 2017 +0300 linux-gen: packet: fix odp_packet_reset() implementation Follow the API definition and use total buffer length instead of single segment length when checking 'len' argument validity. Reset also packet segment data pointers and lengths. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index 3cde2086..ab325692 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -308,6 +308,20 @@ static inline void init_segments(odp_packet_hdr_t *pkt_hdr[], int num) } } +static inline void reset_seg(odp_packet_hdr_t *pkt_hdr, int first, int num) +{ + odp_buffer_hdr_t *hdr; + void *base; + int i; + + for (i = first; i < first + num; i++) { + hdr = pkt_hdr->buf_hdr.seg[i].hdr; + base = hdr->base_data; + pkt_hdr->buf_hdr.seg[i].len = BASE_LEN; + pkt_hdr->buf_hdr.seg[i].data = base; + } +} + /* Calculate the number of segments */ static inline int num_segments(uint32_t len) { @@ -627,10 +641,13 @@ int odp_packet_reset(odp_packet_t pkt, uint32_t len) { odp_packet_hdr_t *const pkt_hdr = packet_hdr(pkt); pool_t *pool = pkt_hdr->buf_hdr.pool_ptr; + int num = pkt_hdr->buf_hdr.segcount; - if (len > pool->headroom + pool->data_size + pool->tailroom) + if (odp_unlikely(len > (pool->max_seg_len * num))) return -1; + reset_seg(pkt_hdr, 0, num); + packet_init(pkt_hdr, len); return 0; @@ -844,20 +861,6 @@ static inline int move_data_to_tail(odp_packet_hdr_t *pkt_hdr, int segs) return dst_seg; } -static inline void reset_seg(odp_packet_hdr_t *pkt_hdr, int first, int num) -{ - odp_buffer_hdr_t *hdr; - void *base; - int i; - - for (i = first; i < first + num; i++) { - hdr = pkt_hdr->buf_hdr.seg[i].hdr; - base = hdr->base_data; - pkt_hdr->buf_hdr.seg[i].len = BASE_LEN; - pkt_hdr->buf_hdr.seg[i].data = base; - } -} - int odp_packet_extend_head(odp_packet_t *pkt, uint32_t len, void **data_ptr, uint32_t *seg_len) { ----------------------------------------------------------------------- Summary of changes: .travis.yml | 1 + example/ipsec/Makefile.am | 2 + .../linux-generic/include/odp_buffer_internal.h | 2 +- .../linux-generic/include/odp_config_internal.h | 6 +- platform/linux-generic/include/odp_packet_dpdk.h | 2 - .../linux-generic/include/odp_packet_internal.h | 52 ++ platform/linux-generic/include/odp_pool_internal.h | 7 + platform/linux-generic/m4/odp_dpdk.m4 | 14 +- platform/linux-generic/odp_packet.c | 72 +-- platform/linux-generic/odp_packet_io.c | 2 + platform/linux-generic/odp_pool.c | 11 + platform/linux-generic/pktio/dpdk.c | 692 ++++++++++++++++----- platform/linux-generic/pktio/socket_mmap.c | 6 +- 13 files changed, 651 insertions(+), 218 deletions(-) hooks/post-receive --

7 years, 7 months

[COMMIT] branch api-next updated. v1.15.0.0-434-gae42f98c

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 ae42f98c1a1c309c0718a3b5fc8589660de0f867 (commit) via 7e71ca2883bbdeb4765e476fcfe3334e4fbfbd88 (commit) via 333c585111723d2cb7dae0cf1517cc1f3453df4d (commit) via bc36acc21368ff3f27d5b3836e8524747e0ab4c9 (commit) from f49ce736d461c3e8c2534ed216e8a70e8bee954e (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 ae42f98c1a1c309c0718a3b5fc8589660de0f867 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Wed Jul 12 16:44:20 2017 +0300 api: crypto: revert deprecation of crypto completion API It was decided that it would be benefitable to live with both API types at this point, as odp_crypto_compl_t was available for some time. So undeprecate odp_crypto_compl_t and related functionality. Validation tests also provide necessary tests for pref_mode and for completion event. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/include/odp/api/spec/crypto.h b/include/odp/api/spec/crypto.h index 1cd09afd..6d4807c4 100644 --- a/include/odp/api/spec/crypto.h +++ b/include/odp/api/spec/crypto.h @@ -271,11 +271,8 @@ typedef struct odp_crypto_session_param_t { */ odp_bool_t auth_cipher_text; - /** Preferred sync vs. async - * - * @deprecated no-op now, odp_crypto_operation() will always process - * data in non-posted mode */ - odp_crypto_op_mode_t ODP_DEPRECATE(pref_mode); + /** Preferred sync vs. async for odp_crypto_operation() */ + odp_crypto_op_mode_t pref_mode; /** Operation mode when using packet interface: sync or async */ odp_crypto_op_mode_t op_mode; @@ -340,11 +337,8 @@ typedef struct odp_crypto_op_param_t { /** Session handle from creation */ odp_crypto_session_t session; - /** User context - * - * @deprecated No need to pass context around sync calls - * */ - void *ODP_DEPRECATE(ctx); + /** User context */ + void *ctx; /** Input packet * @@ -504,11 +498,8 @@ typedef struct odp_crypto_op_result { /** Request completed successfully */ odp_bool_t ok; - /** User context from request - * - * @deprecated No need to pass context around sync calls - * */ - void *ODP_DEPRECATE(ctx); + /** User context from request */ + void *ctx; /** Output packet */ odp_packet_t pkt; @@ -692,8 +683,7 @@ int odp_crypto_session_destroy(odp_crypto_session_t session); * * @return crypto completion handle */ -ODP_DEPRECATE(odp_crypto_compl_t) ODP_DEPRECATE(odp_crypto_compl_from_event)( - odp_event_t ev); +odp_crypto_compl_t odp_crypto_compl_from_event(odp_event_t ev); /** * Convert crypto completion handle to event handle @@ -702,16 +692,14 @@ ODP_DEPRECATE(odp_crypto_compl_t) ODP_DEPRECATE(odp_crypto_compl_from_event)( * * @return Event handle */ -odp_event_t ODP_DEPRECATE(odp_crypto_compl_to_event)( - ODP_DEPRECATE(odp_crypto_compl_t) completion_event); +odp_event_t odp_crypto_compl_to_event(odp_crypto_compl_t completion_event); /** * Release crypto completion event * * @param completion_event Completion event we are done accessing */ -void ODP_DEPRECATE(odp_crypto_compl_free)( - ODP_DEPRECATE(odp_crypto_compl_t) completion_event); +void odp_crypto_compl_free(odp_crypto_compl_t completion_event); /** * Crypto per packet operation @@ -739,9 +727,8 @@ int odp_crypto_operation(odp_crypto_op_param_t *param, * @param completion_event Event containing operation results * @param result Pointer to result structure */ -void ODP_DEPRECATE(odp_crypto_compl_result)( - ODP_DEPRECATE(odp_crypto_compl_t) completion_event, - odp_crypto_op_result_t *result); +void odp_crypto_compl_result(odp_crypto_compl_t completion_event, + odp_crypto_op_result_t *result); /** * Get printable value for an odp_crypto_session_t @@ -767,8 +754,7 @@ uint64_t odp_crypto_session_to_u64(odp_crypto_session_t hdl); * to enable applications to generate a printable value that represents * an odp_crypto_compl_t handle. */ -uint64_t ODP_DEPRECATE(odp_crypto_compl_to_u64)( - ODP_DEPRECATE(odp_crypto_compl_t) hdl); +uint64_t odp_crypto_compl_to_u64(odp_crypto_compl_t hdl); /** * Initialize crypto session parameters diff --git a/include/odp/arch/default/api/abi/crypto.h b/include/odp/arch/default/api/abi/crypto.h index 2d02eee6..f0793a19 100644 --- a/include/odp/arch/default/api/abi/crypto.h +++ b/include/odp/arch/default/api/abi/crypto.h @@ -11,8 +11,6 @@ extern "C" { #endif -#include <odp/api/deprecated.h> - #include <stdint.h> /** @internal Dummy type for strong typing */ @@ -25,7 +23,7 @@ typedef struct { char dummy; /**< @internal Dummy */ } _odp_abi_crypto_compl_t; #define ODP_CRYPTO_SESSION_INVALID (0xffffffffffffffffULL) typedef uint64_t odp_crypto_session_t; -typedef _odp_abi_crypto_compl_t *ODP_DEPRECATE(odp_crypto_compl_t); +typedef _odp_abi_crypto_compl_t *odp_crypto_compl_t; /** * @} diff --git a/include/odp/arch/default/api/abi/event.h b/include/odp/arch/default/api/abi/event.h index 871d2cf9..f86d8e27 100644 --- a/include/odp/arch/default/api/abi/event.h +++ b/include/odp/arch/default/api/abi/event.h @@ -11,8 +11,6 @@ extern "C" { #endif -#include <odp/api/deprecated.h> - #include <stdint.h> /** @internal Dummy type for strong typing */ @@ -30,7 +28,7 @@ typedef enum odp_event_type_t { ODP_EVENT_BUFFER = 1, ODP_EVENT_PACKET = 2, ODP_EVENT_TIMEOUT = 3, - ODP_DEPRECATE(ODP_EVENT_CRYPTO_COMPL) = 4, + ODP_EVENT_CRYPTO_COMPL = 4, ODP_EVENT_IPSEC_STATUS = 5 } odp_event_type_t; diff --git a/platform/linux-generic/include/odp/api/plat/crypto_types.h b/platform/linux-generic/include/odp/api/plat/crypto_types.h index 23e1cc42..2cc747eb 100644 --- a/platform/linux-generic/include/odp/api/plat/crypto_types.h +++ b/platform/linux-generic/include/odp/api/plat/crypto_types.h @@ -22,7 +22,6 @@ extern "C" { #if ODP_ABI_COMPAT == 1 #include <odp/api/abi/crypto.h> #else -#include <odp/api/deprecated.h> /** @ingroup odp_crypto * @{ @@ -31,7 +30,7 @@ extern "C" { #define ODP_CRYPTO_SESSION_INVALID (0xffffffffffffffffULL) typedef uint64_t odp_crypto_session_t; -typedef ODP_HANDLE_T(ODP_DEPRECATE(odp_crypto_compl_t)); +typedef ODP_HANDLE_T(odp_crypto_compl_t); /** * @} diff --git a/platform/linux-generic/include/odp/api/plat/event_types.h b/platform/linux-generic/include/odp/api/plat/event_types.h index 58ce0a8b..4d0efff1 100644 --- a/platform/linux-generic/include/odp/api/plat/event_types.h +++ b/platform/linux-generic/include/odp/api/plat/event_types.h @@ -23,7 +23,6 @@ extern "C" { #include <odp/api/abi/event.h> #else -#include <odp/api/deprecated.h> #include <odp/api/std_types.h> #include <odp/api/plat/strong_types.h> @@ -39,7 +38,7 @@ typedef enum odp_event_type_t { ODP_EVENT_BUFFER = 1, ODP_EVENT_PACKET = 2, ODP_EVENT_TIMEOUT = 3, - ODP_DEPRECATE(ODP_EVENT_CRYPTO_COMPL) = 4, + ODP_EVENT_CRYPTO_COMPL = 4, ODP_EVENT_IPSEC_STATUS = 5 } odp_event_type_t; diff --git a/platform/linux-generic/odp_crypto.c b/platform/linux-generic/odp_crypto.c index 80ff6f59..ca51bdf0 100644 --- a/platform/linux-generic/odp_crypto.c +++ b/platform/linux-generic/odp_crypto.c @@ -881,9 +881,7 @@ odp_crypto_operation(odp_crypto_op_param_t *param, ODP_EVENT_PACKET_BASIC); /* Fill in result */ -#if ODP_DEPRECATED_API local_result.ctx = param->ctx; -#endif local_result.pkt = out_pkt; local_result.cipher_status = packet_result.cipher_status; local_result.auth_status = packet_result.auth_status; @@ -1030,7 +1028,6 @@ int32_t odp_random_test_data(uint8_t *buf, uint32_t len, uint64_t *seed) return len; } -#if ODP_DEPRECATED_API odp_crypto_compl_t odp_crypto_compl_from_event(odp_event_t ev) { /* This check not mandated by the API specification */ @@ -1067,7 +1064,6 @@ uint64_t odp_crypto_compl_to_u64(odp_crypto_compl_t hdl) { return _odp_pri(hdl); } -#endif void odp_crypto_session_param_init(odp_crypto_session_param_t *param) { diff --git a/platform/linux-generic/odp_event.c b/platform/linux-generic/odp_event.c index 56cc90b0..23b410d8 100644 --- a/platform/linux-generic/odp_event.c +++ b/platform/linux-generic/odp_event.c @@ -46,11 +46,9 @@ void odp_event_free(odp_event_t event) case ODP_EVENT_TIMEOUT: odp_timeout_free(odp_timeout_from_event(event)); break; -#if ODP_DEPRECATED_API case ODP_EVENT_CRYPTO_COMPL: odp_crypto_compl_free(odp_crypto_compl_from_event(event)); break; -#endif default: ODP_ABORT("Invalid event type: %d\n", odp_event_type(event)); } diff --git a/test/common_plat/performance/odp_crypto.c b/test/common_plat/performance/odp_crypto.c index 27d4fd30..7a25ffdc 100644 --- a/test/common_plat/performance/odp_crypto.c +++ b/test/common_plat/performance/odp_crypto.c @@ -427,6 +427,7 @@ create_session_from_config(odp_crypto_session_t *session, odp_crypto_session_param_init(&params); memcpy(&params, &config->session, sizeof(odp_crypto_session_param_t)); params.op = ODP_CRYPTO_OP_ENCODE; + params.pref_mode = ODP_CRYPTO_SYNC; /* Lookup the packet pool */ pkt_pool = odp_pool_lookup("packet_pool"); diff --git a/test/common_plat/validation/api/crypto/crypto.c b/test/common_plat/validation/api/crypto/crypto.c index 8a6c20ec..04ca527d 100644 --- a/test/common_plat/validation/api/crypto/crypto.c +++ b/test/common_plat/validation/api/crypto/crypto.c @@ -15,6 +15,8 @@ odp_suiteinfo_t crypto_suites[] = { {ODP_CRYPTO_SYNC_INP, crypto_suite_sync_init, crypto_suite_term, crypto_suite}, + {ODP_CRYPTO_ASYNC_INP, crypto_suite_async_init, + crypto_suite_term, crypto_suite}, {ODP_CRYPTO_PACKET_SYNC_INP, crypto_suite_packet_sync_init, crypto_suite_term, crypto_suite}, {ODP_CRYPTO_PACKET_ASYNC_INP, crypto_suite_packet_async_init, 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 ac59744f..df4ac0c4 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 @@ -16,6 +16,7 @@ struct suite_context_s { odp_bool_t packet; odp_crypto_op_mode_t op_mode; + odp_crypto_op_mode_t pref_mode; odp_pool_t pool; odp_queue_t queue; }; @@ -81,6 +82,7 @@ static int alg_op(odp_packet_t pkt, op_params.session = session; op_params.pkt = pkt; op_params.out_pkt = pkt; + op_params.ctx = (void *)0xdeadbeef; if (cipher_range) { op_params.cipher_range = *cipher_range; @@ -109,8 +111,31 @@ static int alg_op(odp_packet_t pkt, return rc; } - CU_ASSERT(posted == 0); + if (posted) { + odp_event_t event; + odp_crypto_compl_t compl_event; + + /* Poll completion queue for results */ + do { + event = odp_queue_deq(suite_context.queue); + } while (event == ODP_EVENT_INVALID); + + CU_ASSERT(ODP_EVENT_CRYPTO_COMPL == odp_event_type(event)); + CU_ASSERT(ODP_EVENT_NO_SUBTYPE == odp_event_subtype(event)); + CU_ASSERT(ODP_EVENT_CRYPTO_COMPL == + odp_event_types(event, &subtype)); + CU_ASSERT(ODP_EVENT_NO_SUBTYPE == subtype); + + compl_event = odp_crypto_compl_from_event(event); + CU_ASSERT(odp_crypto_compl_to_u64(compl_event) == + odp_crypto_compl_to_u64( + odp_crypto_compl_from_event(event))); + odp_crypto_compl_result(compl_event, &result); + odp_crypto_compl_free(compl_event); + } + CU_ASSERT(result.pkt == pkt); + CU_ASSERT(result.ctx == (void *)0xdeadbeef); CU_ASSERT(ODP_EVENT_PACKET == odp_event_type(odp_packet_to_event(result.pkt))); CU_ASSERT(ODP_EVENT_PACKET_BASIC == @@ -403,6 +428,7 @@ static void alg_test(odp_crypto_op_t op, ses_params.op = op; ses_params.auth_cipher_text = false; ses_params.op_mode = suite_context.op_mode; + ses_params.pref_mode = suite_context.pref_mode; ses_params.cipher_alg = cipher_alg; ses_params.auth_alg = auth_alg; ses_params.compl_queue = suite_context.queue; @@ -1678,6 +1704,20 @@ int crypto_suite_sync_init(void) return -1; suite_context.queue = ODP_QUEUE_INVALID; + suite_context.pref_mode = ODP_CRYPTO_SYNC; + return 0; +} + +int crypto_suite_async_init(void) +{ + suite_context.pool = odp_pool_lookup("packet_pool"); + if (suite_context.pool == ODP_POOL_INVALID) + return -1; + suite_context.queue = odp_queue_lookup("crypto-out"); + if (suite_context.queue == ODP_QUEUE_INVALID) + return -1; + + suite_context.pref_mode = ODP_CRYPTO_ASYNC; return 0; } diff --git a/test/common_plat/validation/api/crypto/odp_crypto_test_inp.h b/test/common_plat/validation/api/crypto/odp_crypto_test_inp.h index 2bc77a94..c50b8493 100644 --- a/test/common_plat/validation/api/crypto/odp_crypto_test_inp.h +++ b/test/common_plat/validation/api/crypto/odp_crypto_test_inp.h @@ -10,6 +10,7 @@ /* Suite names */ #define ODP_CRYPTO_SYNC_INP "odp_crypto_sync_inp" +#define ODP_CRYPTO_ASYNC_INP "odp_crypto_async_inp" #define ODP_CRYPTO_PACKET_SYNC_INP "odp_crypto_packet_sync_inp" #define ODP_CRYPTO_PACKET_ASYNC_INP "odp_crypto_packet_async_inp" @@ -17,6 +18,7 @@ extern odp_testinfo_t crypto_suite[]; int crypto_suite_sync_init(void); +int crypto_suite_async_init(void); int crypto_suite_packet_sync_init(void); int crypto_suite_packet_async_init(void); int crypto_suite_term(void); commit 7e71ca2883bbdeb4765e476fcfe3334e4fbfbd88 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Wed Jul 12 14:49:40 2017 +0300 api: crypto: replace redundant packet_ prefixes from definitions Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/example/ipsec/odp_ipsec.c b/example/ipsec/odp_ipsec.c index 5df8f154..52a5fdcd 100644 --- a/example/ipsec/odp_ipsec.c +++ b/example/ipsec/odp_ipsec.c @@ -698,12 +698,12 @@ pkt_disposition_e do_ipsec_in_classify(odp_packet_t *pkt, *skip = FALSE; ctx->state = PKT_STATE_IPSEC_IN_FINISH; if (entry->async) { - if (odp_crypto_packet_op_enq(pkt, &out_pkt, &params, 1)) + if (odp_crypto_op_enq(pkt, &out_pkt, &params, 1)) abort(); return PKT_POSTED; } - if (odp_crypto_packet_op(pkt, &out_pkt, &params, 1)) + if (odp_crypto_op(pkt, &out_pkt, &params, 1)) abort(); *pkt = out_pkt; @@ -727,7 +727,7 @@ pkt_disposition_e do_ipsec_in_finish(odp_packet_t pkt, int hdr_len = ctx->ipsec.hdr_len; int trl_len = 0; - odp_crypto_packet_result(&result, pkt); + odp_crypto_result(&result, pkt); /* Check crypto result */ if (!result.ok) { @@ -1001,14 +1001,14 @@ pkt_disposition_e do_ipsec_out_seq(odp_packet_t *pkt, /* Issue crypto request */ if (entry->async) { - if (odp_crypto_packet_op_enq(pkt, &out_pkt, - &ctx->ipsec.params, 1)) + if (odp_crypto_op_enq(pkt, &out_pkt, + &ctx->ipsec.params, 1)) abort(); return PKT_POSTED; } - if (odp_crypto_packet_op(pkt, &out_pkt, - &ctx->ipsec.params, 1)) + if (odp_crypto_op(pkt, &out_pkt, + &ctx->ipsec.params, 1)) abort(); *pkt = out_pkt; @@ -1030,7 +1030,7 @@ pkt_disposition_e do_ipsec_out_finish(odp_packet_t pkt, odph_ipv4hdr_t *ip; odp_crypto_packet_result_t result; - odp_crypto_packet_result(&result, pkt); + odp_crypto_result(&result, pkt); /* Check crypto result */ if (!result.ok) { diff --git a/example/ipsec/odp_ipsec_cache.c b/example/ipsec/odp_ipsec_cache.c index 18a98a29..2a1416b0 100644 --- a/example/ipsec/odp_ipsec_cache.c +++ b/example/ipsec/odp_ipsec_cache.c @@ -66,12 +66,12 @@ int create_ipsec_cache_entry(sa_db_entry_t *cipher_sa, params.op = (in) ? ODP_CRYPTO_OP_DECODE : ODP_CRYPTO_OP_ENCODE; params.auth_cipher_text = TRUE; if (CRYPTO_API_SYNC == api_mode) { - params.packet_op_mode = ODP_CRYPTO_SYNC; + params.op_mode = ODP_CRYPTO_SYNC; params.compl_queue = ODP_QUEUE_INVALID; params.output_pool = ODP_POOL_INVALID; entry->async = FALSE; } else { - params.packet_op_mode = ODP_CRYPTO_ASYNC; + params.op_mode = ODP_CRYPTO_ASYNC; params.compl_queue = completionq; params.output_pool = out_pool; entry->async = TRUE; diff --git a/include/odp/api/spec/crypto.h b/include/odp/api/spec/crypto.h index 013507f9..1cd09afd 100644 --- a/include/odp/api/spec/crypto.h +++ b/include/odp/api/spec/crypto.h @@ -278,7 +278,7 @@ typedef struct odp_crypto_session_param_t { odp_crypto_op_mode_t ODP_DEPRECATE(pref_mode); /** Operation mode when using packet interface: sync or async */ - odp_crypto_op_mode_t packet_op_mode; + odp_crypto_op_mode_t op_mode; /** Cipher algorithm * @@ -315,7 +315,7 @@ typedef struct odp_crypto_session_param_t { /** Async mode completion event queue * - * The completion queue is used to return odp_crypto_packet_op_enq() + * The completion queue is used to return odp_crypto_op_enq() * results to the application. */ odp_queue_t compl_queue; @@ -544,10 +544,10 @@ typedef struct odp_crypto_capability_t { uint32_t max_sessions; /** Supported packet operation in SYNC mode */ - odp_support_t packet_sync_mode; + odp_support_t sync_mode; /** Supported packet operation in ASYNC mode */ - odp_support_t packet_async_mode; + odp_support_t async_mode; /** Supported cipher algorithms */ odp_crypto_cipher_algos_t ciphers; @@ -785,7 +785,7 @@ void odp_crypto_session_param_init(odp_crypto_session_param_t *param); * * Get packet handle to an crypto processed packet event. Event subtype must be * ODP_EVENT_PACKET_CRYPTO. Crypto operation results can be examined with - * odp_crypto_packet_result(). + * odp_crypto_result(). * * Note: any invalid parameters will cause undefined behavior and may cause * the application to abort or crash. @@ -822,8 +822,8 @@ odp_event_t odp_crypto_packet_to_event(odp_packet_t pkt); * @retval 0 On success * @retval <0 On failure */ -int odp_crypto_packet_result(odp_crypto_packet_result_t *result, - odp_packet_t packet); +int odp_crypto_result(odp_crypto_packet_result_t *result, + odp_packet_t packet); /** * Crypto packet operation @@ -841,10 +841,10 @@ int odp_crypto_packet_result(odp_crypto_packet_result_t *result, * @return Number of input packets consumed (0 ... num_pkt) * @retval <0 on failure */ -int odp_crypto_packet_op(const odp_packet_t pkt_in[], - odp_packet_t pkt_out[], - const odp_crypto_packet_op_param_t param[], - int num_pkt); +int odp_crypto_op(const odp_packet_t pkt_in[], + odp_packet_t pkt_out[], + const odp_crypto_packet_op_param_t param[], + int num_pkt); /** * Crypto packet operation @@ -863,10 +863,10 @@ int odp_crypto_packet_op(const odp_packet_t pkt_in[], * @return Number of input packets consumed (0 ... num_pkt) * @retval <0 on failure */ -int odp_crypto_packet_op_enq(const odp_packet_t pkt_in[], - const odp_packet_t pkt_out[], - const odp_crypto_packet_op_param_t param[], - int num_pkt); +int odp_crypto_op_enq(const odp_packet_t pkt_in[], + const odp_packet_t pkt_out[], + const odp_crypto_packet_op_param_t param[], + int num_pkt); /** * @} diff --git a/platform/linux-generic/odp_crypto.c b/platform/linux-generic/odp_crypto.c index 792c2eca..80ff6f59 100644 --- a/platform/linux-generic/odp_crypto.c +++ b/platform/linux-generic/odp_crypto.c @@ -866,11 +866,11 @@ odp_crypto_operation(odp_crypto_op_param_t *param, packet_param.cipher_range = param->cipher_range; packet_param.auth_range = param->auth_range; - rc = odp_crypto_packet_op(&param->pkt, &out_pkt, &packet_param, 1); + rc = odp_crypto_op(&param->pkt, &out_pkt, &packet_param, 1); if (rc < 0) return rc; - rc = odp_crypto_packet_result(&packet_result, out_pkt); + rc = odp_crypto_result(&packet_result, out_pkt); if (rc < 0) return rc; @@ -1101,8 +1101,8 @@ odp_crypto_packet_result_t *get_op_result_from_packet(odp_packet_t pkt) return &hdr->crypto_op_result; } -int odp_crypto_packet_result(odp_crypto_packet_result_t *result, - odp_packet_t packet) +int odp_crypto_result(odp_crypto_packet_result_t *result, + odp_packet_t packet) { odp_crypto_packet_result_t *op_result; @@ -1117,9 +1117,9 @@ int odp_crypto_packet_result(odp_crypto_packet_result_t *result, } static -int odp_crypto_op(odp_packet_t pkt_in, - odp_packet_t *pkt_out, - const odp_crypto_packet_op_param_t *param) +int odp_crypto_int(odp_packet_t pkt_in, + odp_packet_t *pkt_out, + const odp_crypto_packet_op_param_t *param) { odp_crypto_alg_err_t rc_cipher = ODP_CRYPTO_ALG_ERR_NONE; odp_crypto_alg_err_t rc_auth = ODP_CRYPTO_ALG_ERR_NONE; @@ -1197,19 +1197,19 @@ err: return -1; } -int odp_crypto_packet_op(const odp_packet_t pkt_in[], - odp_packet_t pkt_out[], - const odp_crypto_packet_op_param_t param[], - int num_pkt) +int odp_crypto_op(const odp_packet_t pkt_in[], + odp_packet_t pkt_out[], + const odp_crypto_packet_op_param_t param[], + int num_pkt) { int i, rc; odp_crypto_generic_session_t *session; session = (odp_crypto_generic_session_t *)(intptr_t)param->session; - ODP_ASSERT(ODP_CRYPTO_SYNC == session->p.packet_op_mode); + ODP_ASSERT(ODP_CRYPTO_SYNC == session->p.op_mode); for (i = 0; i < num_pkt; i++) { - rc = odp_crypto_op(pkt_in[i], &pkt_out[i], &param[i]); + rc = odp_crypto_int(pkt_in[i], &pkt_out[i], &param[i]); if (rc < 0) break; } @@ -1217,10 +1217,10 @@ int odp_crypto_packet_op(const odp_packet_t pkt_in[], return i; } -int odp_crypto_packet_op_enq(const odp_packet_t pkt_in[], - const odp_packet_t pkt_out[], - const odp_crypto_packet_op_param_t param[], - int num_pkt) +int odp_crypto_op_enq(const odp_packet_t pkt_in[], + const odp_packet_t pkt_out[], + const odp_crypto_packet_op_param_t param[], + int num_pkt) { odp_packet_t pkt; odp_event_t event; @@ -1228,12 +1228,12 @@ int odp_crypto_packet_op_enq(const odp_packet_t pkt_in[], int i, rc; session = (odp_crypto_generic_session_t *)(intptr_t)param->session; - ODP_ASSERT(ODP_CRYPTO_ASYNC == session->p.packet_op_mode); + ODP_ASSERT(ODP_CRYPTO_ASYNC == session->p.op_mode); ODP_ASSERT(ODP_QUEUE_INVALID != session->p.compl_queue); for (i = 0; i < num_pkt; i++) { pkt = pkt_out[i]; - rc = odp_crypto_op(pkt_in[i], &pkt, &param[i]); + rc = odp_crypto_int(pkt_in[i], &pkt, &param[i]); if (rc < 0) break; diff --git a/test/common_plat/performance/odp_crypto.c b/test/common_plat/performance/odp_crypto.c index a129ec98..27d4fd30 100644 --- a/test/common_plat/performance/odp_crypto.c +++ b/test/common_plat/performance/odp_crypto.c @@ -443,10 +443,10 @@ create_session_from_config(odp_crypto_session_t *session, return -1; } params.compl_queue = out_queue; - params.packet_op_mode = ODP_CRYPTO_ASYNC; + params.op_mode = ODP_CRYPTO_ASYNC; } else { params.compl_queue = ODP_QUEUE_INVALID; - params.packet_op_mode = ODP_CRYPTO_SYNC; + params.op_mode = ODP_CRYPTO_SYNC; } if (odp_crypto_session_create(&params, session, &ses_create_rc)) { @@ -554,8 +554,8 @@ run_measure_one(crypto_args_t *cargs, } if (cargs->schedule || cargs->poll) { - rc = odp_crypto_packet_op_enq(&pkt, &out_pkt, - &params, 1); + rc = odp_crypto_op_enq(&pkt, &out_pkt, + &params, 1); if (rc <= 0) { app_err("failed odp_crypto_packet_op_enq: rc = %d\n", rc); @@ -563,8 +563,8 @@ run_measure_one(crypto_args_t *cargs, } packets_sent += rc; } else { - rc = odp_crypto_packet_op(&pkt, &out_pkt, - &params, 1); + rc = odp_crypto_op(&pkt, &out_pkt, + &params, 1); if (rc <= 0) { app_err("failed odp_crypto_packet_op: rc = %d\n", rc); @@ -603,7 +603,7 @@ run_measure_one(crypto_args_t *cargs, while (ev != ODP_EVENT_INVALID) { out_pkt = odp_crypto_packet_from_event(ev); - odp_crypto_packet_result(&result, out_pkt); + odp_crypto_result(&result, out_pkt); if (cargs->debug_packets) { mem = odp_packet_data(out_pkt); 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 716bd952..ac59744f 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 @@ -15,7 +15,7 @@ struct suite_context_s { odp_bool_t packet; - odp_crypto_op_mode_t packet_op_mode; + odp_crypto_op_mode_t op_mode; odp_pool_t pool; odp_queue_t queue; }; @@ -165,7 +165,7 @@ static int alg_packet_op(odp_packet_t pkt, op_params.hash_result_offset = plaintext_len; - rc = odp_crypto_packet_op(&pkt, &out_pkt, &op_params, 1); + rc = odp_crypto_op(&pkt, &out_pkt, &op_params, 1); if (rc < 0) { CU_FAIL("Failed odp_crypto_packet_op()"); return rc; @@ -180,7 +180,7 @@ static int alg_packet_op(odp_packet_t pkt, odp_event_types(odp_packet_to_event(pkt), &subtype)); CU_ASSERT(ODP_EVENT_PACKET_CRYPTO == subtype); - rc = odp_crypto_packet_result(&result, pkt); + rc = odp_crypto_result(&result, pkt); if (rc < 0) { CU_FAIL("Failed odp_crypto_packet_result()"); return rc; @@ -233,7 +233,7 @@ static int alg_packet_op_enq(odp_packet_t pkt, op_params.hash_result_offset = plaintext_len; - rc = odp_crypto_packet_op_enq(&pkt, &pkt, &op_params, 1); + rc = odp_crypto_op_enq(&pkt, &pkt, &op_params, 1); if (rc < 0) { CU_FAIL("Failed odp_crypto_op_enq()"); return rc; @@ -260,7 +260,7 @@ static int alg_packet_op_enq(odp_packet_t pkt, odp_event_types(odp_packet_to_event(pkt), &subtype)); CU_ASSERT(ODP_EVENT_PACKET_CRYPTO == subtype); - rc = odp_crypto_packet_result(&result, pkt); + rc = odp_crypto_result(&result, pkt); if (rc < 0) { CU_FAIL("Failed odp_crypto_packet_result()"); return rc; @@ -402,7 +402,7 @@ static void alg_test(odp_crypto_op_t op, odp_crypto_session_param_init(&ses_params); ses_params.op = op; ses_params.auth_cipher_text = false; - ses_params.packet_op_mode = suite_context.packet_op_mode; + ses_params.op_mode = suite_context.op_mode; ses_params.cipher_alg = cipher_alg; ses_params.auth_alg = auth_alg; ses_params.compl_queue = suite_context.queue; @@ -433,7 +433,7 @@ static void alg_test(odp_crypto_op_t op, rc = alg_op(pkt, &ok, session, op_iv_ptr, cipher_range, auth_range, aad, aad_len, plaintext_len); - else if (ODP_CRYPTO_ASYNC == suite_context.packet_op_mode) + else if (ODP_CRYPTO_ASYNC == suite_context.op_mode) rc = alg_packet_op_enq(pkt, &ok, session, op_iv_ptr, cipher_range, auth_range, aad, aad_len, plaintext_len); @@ -1684,7 +1684,7 @@ int crypto_suite_sync_init(void) int crypto_suite_packet_sync_init(void) { suite_context.packet = true; - suite_context.packet_op_mode = ODP_CRYPTO_SYNC; + suite_context.op_mode = ODP_CRYPTO_SYNC; suite_context.pool = odp_pool_lookup("packet_pool"); if (suite_context.pool == ODP_POOL_INVALID) @@ -1697,7 +1697,7 @@ int crypto_suite_packet_sync_init(void) int crypto_suite_packet_async_init(void) { suite_context.packet = true; - suite_context.packet_op_mode = ODP_CRYPTO_ASYNC; + suite_context.op_mode = ODP_CRYPTO_ASYNC; suite_context.pool = odp_pool_lookup("packet_pool"); if (suite_context.pool == ODP_POOL_INVALID) commit 333c585111723d2cb7dae0cf1517cc1f3453df4d Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Wed Jul 12 14:42:06 2017 +0300 doc: move PREDEFINED to common place It is easy to update PREDEFINED definitions in one Doxyfile, while forgetting about the others, as happened e.g. with ODP_DEPRECATE(x) definition. Move PREDEFINED definitions into Doxyfile_common, so that it is included by the rest of Doxyfiles. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/doc/Doxyfile_common b/doc/Doxyfile_common index 59558535..0471dcf3 100644 --- a/doc/Doxyfile_common +++ b/doc/Doxyfile_common @@ -30,3 +30,15 @@ MACRO_EXPANSION = YES EXPAND_ONLY_PREDEF = YES INTERNAL_DOCS = YES DOT_IMAGE_FORMAT = svg +PREDEFINED = __GNUC__ \ + __attribute__(x)= \ + ODP_ALIGNED(x)= \ + ODPDRV_ALIGNED(x)= \ + __BIG_ENDIAN_BITFIELD \ + __LITTLE_ENDIAN_BITFIELD \ + __x86_64__ \ + ODP_PACKED \ + ODPDRV_PACKED \ + ODP_DEPRECATE(x)=x \ + "ODP_HANDLE_T(type)=odp_handle_t type" \ + "ODPDRV_HANDLE_T(type)=odpdrv_handle_t type" diff --git a/doc/application-api-guide/Doxyfile b/doc/application-api-guide/Doxyfile index 9cb183c1..2709f6fd 100644 --- a/doc/application-api-guide/Doxyfile +++ b/doc/application-api-guide/Doxyfile @@ -7,6 +7,4 @@ INPUT = $(SRCDIR)/doc/application-api-guide \ $(SRCDIR)/include EXCLUDE_PATTERNS = drv* odp_drv.h EXAMPLE_PATH = $(SRCDIR)/example $(SRCDIR) -PREDEFINED = __GNUC__ \ - "ODP_HANDLE_T(type)=odp_handle_t type" WARNINGS = NO diff --git a/doc/driver-api-guide/Doxyfile b/doc/driver-api-guide/Doxyfile index b5f7260e..28794ef0 100644 --- a/doc/driver-api-guide/Doxyfile +++ b/doc/driver-api-guide/Doxyfile @@ -7,11 +7,3 @@ INPUT = $(SRCDIR)/doc/driver-api-guide \ $(SRCDIR)/include/odp/drv \ $(SRCDIR)/platform/$(WITH_PLATFORM)/include/odp/drv \ $(SRCDIR)/include/odp_drv.h -PREDEFINED = __GNUC__ \ - __attribute__(x)= \ - ODPDRV_ALIGNED(x)= \ - __BIG_ENDIAN_BITFIELD \ - __LITTLE_ENDIAN_BITFIELD \ - __x86_64__ \ - ODPDRV_PACKED \ - "ODPDRV_HANDLE_T(type)=odpdrv_handle_t type" diff --git a/doc/helper-guide/Doxyfile b/doc/helper-guide/Doxyfile index bcc24539..bb9bd8e6 100644 --- a/doc/helper-guide/Doxyfile +++ b/doc/helper-guide/Doxyfile @@ -33,13 +33,5 @@ LAYOUT_FILE = $(SRCDIR)/doc/doxygenlayout.xml ENABLE_PREPROCESSING = YES MACRO_EXPANSION = YES EXPAND_ONLY_PREDEF = YES -PREDEFINED = __GNUC__ \ - __attribute__(x)= \ - ODP_ALIGNED(x)= \ - __BIG_ENDIAN_BITFIELD \ - __LITTLE_ENDIAN_BITFIELD \ - __x86_64__ \ - ODP_PACKED \ - "ODP_HANDLE_T(type)=odp_handle_t type" INTERNAL_DOCS = YES DOT_IMAGE_FORMAT = svg diff --git a/doc/platform-api-guide/Doxyfile b/doc/platform-api-guide/Doxyfile index 1f2d49a4..d716b4a3 100644 --- a/doc/platform-api-guide/Doxyfile +++ b/doc/platform-api-guide/Doxyfile @@ -10,12 +10,3 @@ INPUT = $(SRCDIR)/doc/application-api-guide \ $(SRCDIR)/platform/$(WITH_PLATFORM)/include/odp/api \ $(SRCDIR)/platform/$(WITH_PLATFORM)/arch/$(WITH_ARCH) EXAMPLE_PATH = $(SRCDIR)/example $(SRCDIR)/platform $(SRCDIR) -PREDEFINED = __GNUC__ \ - __attribute__(x)= \ - ODP_ALIGNED(x)= \ - __BIG_ENDIAN_BITFIELD \ - __LITTLE_ENDIAN_BITFIELD \ - __x86_64__ \ - ODP_PACKED \ - ODP_DEPRECATE(x)=x \ - "ODP_HANDLE_T(type)=odp_handle_t type" commit bc36acc21368ff3f27d5b3836e8524747e0ab4c9 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Wed Jul 12 14:38:04 2017 +0300 validation: crypto: fix unitialized variable error Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c b/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c index d5549493..716bd952 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 @@ -303,7 +303,7 @@ static void alg_test(odp_crypto_op_t op, odp_crypto_capability_t capa; int rc; odp_crypto_ses_create_err_t status; - odp_bool_t ok; + odp_bool_t ok = false; odp_crypto_session_param_t ses_params; uint8_t *data_addr; odp_crypto_cipher_capability_t cipher_capa[MAX_ALG_CAPA]; ----------------------------------------------------------------------- Summary of changes: doc/Doxyfile_common | 12 ++++ doc/application-api-guide/Doxyfile | 2 - doc/driver-api-guide/Doxyfile | 8 --- doc/helper-guide/Doxyfile | 8 --- doc/platform-api-guide/Doxyfile | 9 --- example/ipsec/odp_ipsec.c | 16 ++--- example/ipsec/odp_ipsec_cache.c | 4 +- include/odp/api/spec/crypto.h | 68 +++++++++------------- include/odp/arch/default/api/abi/crypto.h | 4 +- include/odp/arch/default/api/abi/event.h | 4 +- .../include/odp/api/plat/crypto_types.h | 3 +- .../include/odp/api/plat/event_types.h | 3 +- platform/linux-generic/odp_crypto.c | 42 ++++++------- platform/linux-generic/odp_event.c | 2 - test/common_plat/performance/odp_crypto.c | 15 ++--- test/common_plat/validation/api/crypto/crypto.c | 2 + .../validation/api/crypto/odp_crypto_test_inp.c | 62 ++++++++++++++++---- .../validation/api/crypto/odp_crypto_test_inp.h | 2 + 18 files changed, 135 insertions(+), 131 deletions(-) hooks/post-receive --

7 years, 7 months

[COMMIT] branch api-next updated. v1.15.0.0-430-gf49ce736

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 f49ce736d461c3e8c2534ed216e8a70e8bee954e (commit) via d4b85d07214fb1f566b8ac346375cfe097c0bb51 (commit) via 127c73198b07dfe413e8ce401bb26f3e5ff71e91 (commit) via 2cd78610004d755dbe7a8e9c29086791793aea19 (commit) via e58e1fc97f392f63a267c2252656367b12417152 (commit) via a3ff4f6726582e41dd1398a6939a1877b9f25edc (commit) via 4e3598f34f16aa9e50ac1aaae2b4074cd806e419 (commit) via 697c4a58d57c286e679dd570722d8875ccf05a27 (commit) via 6879ecd2d136508e59cf8d9b8f15c6475ba74c99 (commit) from 698d82ce41a3f6ca08c6f218784d3eea6ac81e42 (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 f49ce736d461c3e8c2534ed216e8a70e8bee954e Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Wed Jul 12 16:54:38 2017 +0300 api: ipsec: remove initial sequence number parameter Application should not need to control initial sequence number value as implementation is able to manage that internally. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/include/odp/api/spec/ipsec.h b/include/odp/api/spec/ipsec.h index a156b54f..de126c37 100644 --- a/include/odp/api/spec/ipsec.h +++ b/include/odp/api/spec/ipsec.h @@ -623,9 +623,6 @@ typedef struct odp_ipsec_sa_param_t { /** SA lifetime parameters */ odp_ipsec_lifetime_t lifetime; - /** Initial sequence number */ - uint64_t seq; - /** SPI value */ uint32_t spi; commit d4b85d07214fb1f566b8ac346375cfe097c0bb51 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Wed Jul 12 16:54:37 2017 +0300 api: ipsec: outer header pointer as const Outer headers are read-only data for an implementation. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/include/odp/api/spec/ipsec.h b/include/odp/api/spec/ipsec.h index 00f3fd05..a156b54f 100644 --- a/include/odp/api/spec/ipsec.h +++ b/include/odp/api/spec/ipsec.h @@ -1073,7 +1073,7 @@ typedef struct odp_ipsec_out_inline_param_t { /** Points to first byte of outer headers to be copied in * front of the outgoing IPSEC packet. Implementation copies * the headers during odp_ipsec_out_inline() call. */ - uint8_t *ptr; + const uint8_t *ptr; /** Outer header length in bytes */ uint32_t len; commit 127c73198b07dfe413e8ce401bb26f3e5ff71e91 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Wed Jul 12 16:54:36 2017 +0300 api: ipsec: flexible soft lifetime reporting Allow implementation to decide how many times a soft lifetime expiration is reported. Application does not require strict synchronization of soft lifetimes. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/include/odp/api/spec/ipsec.h b/include/odp/api/spec/ipsec.h index e6124464..00f3fd05 100644 --- a/include/odp/api/spec/ipsec.h +++ b/include/odp/api/spec/ipsec.h @@ -504,7 +504,9 @@ typedef struct odp_ipsec_sa_opt_t { * * These limits are used for setting up SA lifetime. IPSEC operations check * against the limits and output a status code (e.g. soft_exp_bytes) when - * a limit is crossed. Any number of limits may be used simultaneously. + * a limit is crossed. It's implementation defined how many times soft + * lifetime expiration is reported: only once, first N or all packets following + * the limit crossing. Any number of limits may be used simultaneously. * Use zero when there is no limit. */ typedef struct odp_ipsec_lifetime_t { commit 2cd78610004d755dbe7a8e9c29086791793aea19 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Wed Jul 12 16:54:35 2017 +0300 api: ipsec: split operation result status bits Split error bits into error and warning bits. Move flags into separate type and field. This way, all exceptions (rare but important events) can be checked and maintained separately from operation flags, which may be set for almost every packet. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/include/odp/api/spec/ipsec.h b/include/odp/api/spec/ipsec.h index 331971db..e6124464 100644 --- a/include/odp/api/spec/ipsec.h +++ b/include/odp/api/spec/ipsec.h @@ -555,8 +555,8 @@ typedef enum odp_ipsec_frag_mode_t { * Lookup mode controls how an SA participates in SA lookup offload. * Inbound operations perform SA lookup if application does not provide a SA as * a parameter. In inline mode, a lookup miss directs the packet back to normal - * packet input interface processing. SA lookup failure status (error.sa_lookup) - * is reported through odp_ipsec_packet_result_t. + * packet input interface processing. SA lookup failure status + * (status.error.sa_lookup) is reported through odp_ipsec_packet_result_t. */ typedef enum odp_ipsec_lookup_mode_t { /** Inbound SA lookup is disabled for the SA. */ @@ -875,11 +875,11 @@ uint64_t odp_ipsec_sa_to_u64(odp_ipsec_sa_t sa); /** IPSEC operation status has no errors */ #define ODP_IPSEC_OK 0 -/** IPSEC operation status */ -typedef struct odp_ipsec_op_status_t { - /** Variant mappings for op status */ +/** IPSEC errors */ +typedef struct odp_ipsec_error_t { + /** IPSEC errors */ union { - /** Error flags */ + /** Error bits */ struct { /** Protocol error. Not a valid ESP or AH packet, * packet data length error, etc. */ @@ -900,44 +900,81 @@ typedef struct odp_ipsec_op_status_t { /** Packet does not fit into the given MTU size */ uint32_t mtu : 1; - /** Soft lifetime expired: bytes */ - uint32_t soft_exp_bytes : 1; - - /** Soft lifetime expired: packets */ - uint32_t soft_exp_packets : 1; - /** Hard lifetime expired: bytes */ uint32_t hard_exp_bytes : 1; /** Hard lifetime expired: packets */ uint32_t hard_exp_packets : 1; - - } error; + }; /** All error bits * - * This field can be used to set, clear or compare multiple - * flags. For example, 'status.all_error != ODP_IPSEC_OK' - * checks if there are - * any errors. + * This field can be used to set, clear or compare + * multiple bits. For example, 'status.error.all != 0' + * checks if there are any errors. */ - uint32_t all_error; + uint32_t all; }; - /** Variant mappings for status flags */ +} odp_ipsec_error_t; + +/** IPSEC warnings */ +typedef struct odp_ipsec_warn_t { + /** IPSEC warnings */ union { - /** Status flags */ + /** Warning bits */ + struct { + /** Soft lifetime expired: bytes */ + uint32_t soft_exp_bytes : 1; + + /** Soft lifetime expired: packets */ + uint32_t soft_exp_packets : 1; + }; + + /** All warnings bits */ + uint32_t all; + }; + +} odp_ipsec_warn_t; + +/** IPSEC operation status */ +typedef struct odp_ipsec_op_status_t { + /** IPSEC status bits */ + union { + /** IPSEC errors and warnings */ + struct { + /** IPSEC errors */ + odp_ipsec_error_t error; + + /** IPSEC warnings */ + odp_ipsec_warn_t warn; + }; + + /** All status bits. Combines all error and warning bits. + * For example, 'status.all != ODP_IPSEC_OK' checks if there + * are any errors or warnings. */ + uint64_t all; + + }; + +} odp_ipsec_op_status_t; + +/** IPSEC operation flags */ +typedef struct odp_ipsec_op_flag_t { + /** IPSEC operations flags */ + union { + /** Operation flags */ struct { /** Packet was processed in inline mode */ uint32_t inline_mode : 1; - } flag; + }; /** All flag bits */ - uint32_t all_flag; + uint32_t all; }; -} odp_ipsec_op_status_t; +} odp_ipsec_op_flag_t; /** * IPSEC outbound operation options @@ -1046,9 +1083,14 @@ typedef struct odp_ipsec_out_inline_param_t { * IPSEC operation result for a packet */ typedef struct odp_ipsec_packet_result_t { - /** IPSEC operation status */ + /** IPSEC operation status. Use this to check if IPSEC operation + * reported any errors or warnings (e.g. status.all != ODP_IPSEC_OK). + */ odp_ipsec_op_status_t status; + /** IPSEC operation flags */ + odp_ipsec_op_flag_t flag; + /** IPSEC SA that was used to create the packet * * Operation updates this SA handle value, when SA look up is performed @@ -1060,7 +1102,7 @@ typedef struct odp_ipsec_packet_result_t { /** Packet outer header status before inbound inline processing. * This is valid only when outer headers are retained - * (see odp_ipsec_inbound_config_t) and status.flag.inline_mode is set. + * (see odp_ipsec_inbound_config_t) and flag.inline_mode is set. */ struct { /** Points to the first byte of retained outer headers. These commit e58e1fc97f392f63a267c2252656367b12417152 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Wed Jul 12 16:54:34 2017 +0300 api: ipsec: ignore aad capability AAD lengths are needed in crypto API but not in IPSEC API. So, application should ignore AAD capability values in IPSEC API. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/include/odp/api/spec/ipsec.h b/include/odp/api/spec/ipsec.h index 2d0aea45..331971db 100644 --- a/include/odp/api/spec/ipsec.h +++ b/include/odp/api/spec/ipsec.h @@ -758,7 +758,9 @@ int odp_ipsec_cipher_capability(odp_cipher_alg_t cipher, * Outputs all supported configuration options for the algorithm. Output is * sorted (from the smallest to the largest) first by digest length, then by key * length. Use this information to select key lengths, etc authentication - * algorithm options for SA creation (odp_ipsec_crypto_param_t). + * algorithm options for SA creation (odp_ipsec_crypto_param_t). Application + * must ignore values for AAD length capabilities as those are not relevant for + * IPSEC API (fixed in IPSEC RFCs). * * @param auth Authentication algorithm * @param[out] capa Array of capability structures for output commit a3ff4f6726582e41dd1398a6939a1877b9f25edc Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Wed Jul 12 16:54:33 2017 +0300 api: ipsec: remove time based SA lifetime Application may track time based SA lifetime expiration efficiently and in many ways: e.g. ODP timers may be used, wall clock time may be polled, control plane may send notifications, etc. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/include/odp/api/spec/ipsec.h b/include/odp/api/spec/ipsec.h index 31fcd750..2d0aea45 100644 --- a/include/odp/api/spec/ipsec.h +++ b/include/odp/api/spec/ipsec.h @@ -278,20 +278,6 @@ typedef struct odp_ipsec_capability_t { * be used for many SAs. */ uint32_t max_queues; - /** Soft expiry limit in seconds support - * - * 0: Limit is not supported - * 1: Limit is supported - */ - uint8_t soft_limit_sec; - - /** Hard expiry limit in seconds support - * - * 0: Limit is not supported - * 1: Limit is supported - */ - uint8_t hard_limit_sec; - /** Supported cipher algorithms */ odp_crypto_cipher_algos_t ciphers; @@ -524,9 +510,6 @@ typedef struct odp_ipsec_sa_opt_t { typedef struct odp_ipsec_lifetime_t { /** Soft expiry limits for the session */ struct { - /** Limit in seconds from the SA creation */ - uint64_t sec; - /** Limit in bytes */ uint64_t bytes; @@ -536,9 +519,6 @@ typedef struct odp_ipsec_lifetime_t { /** Hard expiry limits for the session */ struct { - /** Limit in seconds from the SA creation */ - uint64_t sec; - /** Limit in bytes */ uint64_t bytes; @@ -918,18 +898,12 @@ typedef struct odp_ipsec_op_status_t { /** Packet does not fit into the given MTU size */ uint32_t mtu : 1; - /** Soft lifetime expired: seconds */ - uint32_t soft_exp_sec : 1; - /** Soft lifetime expired: bytes */ uint32_t soft_exp_bytes : 1; /** Soft lifetime expired: packets */ uint32_t soft_exp_packets : 1; - /** Hard lifetime expired: seconds */ - uint32_t hard_exp_sec : 1; - /** Hard lifetime expired: bytes */ uint32_t hard_exp_bytes : 1; commit 4e3598f34f16aa9e50ac1aaae2b4074cd806e419 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Wed Jul 12 16:54:32 2017 +0300 api: ipsec: direction specific SA params Move direction (inboud/outbound) specific SA parameters into separate structures. Specification is more clear between common and direction specific SA parameters. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Bogdan Pricope <bogdan.pricope(a)linaro.org> Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/include/odp/api/spec/ipsec.h b/include/odp/api/spec/ipsec.h index 7f4a2c4c..31fcd750 100644 --- a/include/odp/api/spec/ipsec.h +++ b/include/odp/api/spec/ipsec.h @@ -635,51 +635,18 @@ typedef struct odp_ipsec_sa_param_t { /** Parameters for crypto and authentication algorithms */ odp_ipsec_crypto_param_t crypto; - /** Parameters for tunnel mode */ - odp_ipsec_tunnel_param_t tunnel; - - /** Fragmentation mode */ - odp_ipsec_frag_mode_t frag_mode; - /** Various SA option flags */ odp_ipsec_sa_opt_t opt; /** SA lifetime parameters */ odp_ipsec_lifetime_t lifetime; - /** SA lookup mode */ - odp_ipsec_lookup_mode_t lookup_mode; - - /** Minimum anti-replay window size. Use 0 to disable anti-replay - * service. */ - uint32_t antireplay_ws; - /** Initial sequence number */ uint64_t seq; /** SPI value */ uint32_t spi; - /** Additional inbound SA lookup parameters. Values are considered - * only in ODP_IPSEC_LOOKUP_DSTADDR_SPI lookup mode. */ - struct { - /** Select IP version - */ - odp_ipsec_ip_version_t ip_version; - - /** IP destination address (NETWORK ENDIAN) */ - void *dst_addr; - - } lookup_param; - - /** MTU for outbound IP fragmentation offload - * - * This is the maximum length of IP packets that outbound IPSEC - * operations may produce. The value may be updated later with - * odp_ipsec_mtu_update(). - */ - uint32_t mtu; - /** Select pipelined destination for resulting events * * Asynchronous and inline modes generate events. Select where @@ -696,17 +663,6 @@ typedef struct odp_ipsec_sa_param_t { */ odp_queue_t dest_queue; - /** Classifier destination CoS for resulting packets - * - * Successfully decapsulated packets are sent to classification - * through this CoS. Other resulting events are sent to 'dest_queue'. - * This field is considered only when 'pipeline' is - * ODP_IPSEC_PIPELINE_CLS. The CoS must not be shared between any pktio - * interface default CoS. The maximum number of different CoS supported - * is defined by IPSEC capability max_cls_cos. - */ - odp_cos_t dest_cos; - /** User defined SA context pointer * * User defined context pointer associated with the SA. @@ -723,6 +679,65 @@ typedef struct odp_ipsec_sa_param_t { */ uint32_t context_len; + /** IPSEC SA direction dependent parameters */ + union { + /** Inbound specific parameters */ + struct { + /** SA lookup mode */ + odp_ipsec_lookup_mode_t lookup_mode; + + /** Additional SA lookup parameters. Values are + * considered only in ODP_IPSEC_LOOKUP_DSTADDR_SPI + * lookup mode. */ + struct { + /** Select IP version */ + odp_ipsec_ip_version_t ip_version; + + /** IP destination address (NETWORK ENDIAN) to + * be matched in addition to SPI value. */ + void *dst_addr; + + } lookup_param; + + /** Minimum anti-replay window size. Use 0 to disable + * anti-replay service. + */ + uint32_t antireplay_ws; + + /** Classifier destination CoS for resulting packets + * + * Successfully decapsulated packets are sent to + * classification through this CoS. Other resulting + * events are sent to 'dest_queue'. This field is + * considered only when 'pipeline' is + * ODP_IPSEC_PIPELINE_CLS. The CoS must not be shared + * between any pktio interface default CoS. The maximum + * number of different CoS supported is defined by + * IPSEC capability max_cls_cos. + */ + odp_cos_t dest_cos; + + } inbound; + + /** Outbound specific parameters */ + struct { + /** Parameters for tunnel mode */ + odp_ipsec_tunnel_param_t tunnel; + + /** Fragmentation mode */ + odp_ipsec_frag_mode_t frag_mode; + + /** MTU for outbound IP fragmentation offload + * + * This is the maximum length of IP packets that + * outbound IPSEC operations may produce. The value may + * be updated later with odp_ipsec_mtu_update(). + */ + uint32_t mtu; + + } outbound; + }; + } odp_ipsec_sa_param_t; /** commit 697c4a58d57c286e679dd570722d8875ccf05a27 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Wed Jul 12 16:54:31 2017 +0300 api: ipsec: add max queues capability Added capability to specify maximum number of different queues that can be used with IPsec. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/include/odp/api/spec/ipsec.h b/include/odp/api/spec/ipsec.h index 7fa4e178..7f4a2c4c 100644 --- a/include/odp/api/spec/ipsec.h +++ b/include/odp/api/spec/ipsec.h @@ -274,6 +274,10 @@ typedef struct odp_ipsec_capability_t { */ uint32_t max_cls_cos; + /** Maximum number of different destination queues. The same queue may + * be used for many SAs. */ + uint32_t max_queues; + /** Soft expiry limit in seconds support * * 0: Limit is not supported commit 6879ecd2d136508e59cf8d9b8f15c6475ba74c99 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Wed Jul 12 16:54:30 2017 +0300 api: ipsec: add salt parameter Added a parameter for passing salt/nonce for algorithms that need it. Currently, only AES GCM needs it with 4 bytes of salt. Later on, other cipher (or auth) algorithms may need also salt/nonce data. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/include/odp/api/spec/ipsec.h b/include/odp/api/spec/ipsec.h index 54491b12..7fa4e178 100644 --- a/include/odp/api/spec/ipsec.h +++ b/include/odp/api/spec/ipsec.h @@ -384,6 +384,15 @@ typedef struct odp_ipsec_crypto_param_t { /** Cipher key */ odp_crypto_key_t cipher_key; + /** Extra keying material for cipher key + * + * Additional data used as salt or nonce if the algorithm requires it, + * other algorithms ignore this field. These algorithms require this + * field set: + * - AES_GCM: 4 bytes of salt + **/ + odp_crypto_key_t cipher_key_extra; + /** Authentication algorithm */ odp_auth_alg_t auth_alg; ----------------------------------------------------------------------- Summary of changes: include/odp/api/spec/ipsec.h | 243 +++++++++++++++++++++++++------------------ 1 file changed, 144 insertions(+), 99 deletions(-) hooks/post-receive --

7 years, 7 months

[COMMIT] branch api-next updated. v1.15.0.0-421-g698d82ce

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 698d82ce41a3f6ca08c6f218784d3eea6ac81e42 (commit) from cd097450cbf9d7bb6cd24654f8d43ceade5b114a (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 698d82ce41a3f6ca08c6f218784d3eea6ac81e42 Author: Nikhil Agarwal <nikhil.agarwal(a)linaro.org> Date: Thu Jul 13 12:00:06 2017 +0300 api: ipsec: add retain header capability Signed-off-by: Nikhil Agarwal <nikhil.agarwal(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/include/odp/api/spec/ipsec.h b/include/odp/api/spec/ipsec.h index e602e4b8..54491b12 100644 --- a/include/odp/api/spec/ipsec.h +++ b/include/odp/api/spec/ipsec.h @@ -262,6 +262,12 @@ typedef struct odp_ipsec_capability_t { */ odp_support_t pipeline_cls; + /** + * Support of retaining outer headers (retain_outer) in inbound inline + * processed packets + */ + odp_support_t retain_header; + /** Maximum number of different destination CoSes in classification * pipelining. The same CoS may be used for many SAs. This is equal or * less than 'max_cos' capability in classifier API. ----------------------------------------------------------------------- Summary of changes: include/odp/api/spec/ipsec.h | 6 ++++++ 1 file changed, 6 insertions(+) hooks/post-receive --

7 years, 7 months

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

git-lng-odp July 2017