git-lng-odp

git-lng-odp@lists.linaro.org

1203 discussions

[COMMIT] branch master updated. v1.15.0.0-78-gb6308d6f

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 b6308d6f7cf7bf42b5ff6807ae659db83a66ce78 (commit) from 422ed4f2be27223b53c39a3d3f7b973781a6a420 (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 b6308d6f7cf7bf42b5ff6807ae659db83a66ce78 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Wed Jul 26 09:46:38 2017 +0300 travis: enable ccache and pip cache 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 b1f8e4ce..ed7eb2ba 100644 --- a/.travis.yml +++ b/.travis.yml @@ -58,6 +58,10 @@ compiler: - gcc - clang-3.8 +cache: + - ccache + - pip + env: - CONF="" - CONF="--disable-abi-compat" @@ -82,6 +86,8 @@ before_install: 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 + - if test ! -L /usr/lib/ccache/${CC%% *} ; then sudo ln -s -t /usr/lib/ccache/ `which ${CC%% *}` ; fi + - ccache -s # Install cunit for the validation tests because distro version is too old and fails C99 compile - sudo apt-get remove libcunit1-dev libcunit1 @@ -151,6 +157,7 @@ script: - echo "Static link.." - ${CC} ${OLDPWD}/example/hello/odp_hello.c -o odp_hello_inst `PKG_CONFIG_PATH=${HOME}/odp-install/lib/pkgconfig pkg-config --cflags --libs libodp-linux --static` -static - ./odp_hello_inst + - ccache -s jobs: include: ----------------------------------------------------------------------- Summary of changes: .travis.yml | 7 +++++++ 1 file changed, 7 insertions(+) hooks/post-receive --

7 years, 11 months

[COMMIT] branch master updated. v1.15.0.0-77-g422ed4f2

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 422ed4f2be27223b53c39a3d3f7b973781a6a420 (commit) from d3cae7aa012174bac6eecdca4ee3189c62400c48 (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 422ed4f2be27223b53c39a3d3f7b973781a6a420 Author: Matias Elo <matias.elo(a)nokia.com> Date: Wed Jul 19 16:38:19 2017 +0300 travis: cache dpdk directory Cache DPDK directory so each individual test doesn't have to download and build the code. Speeds up each tests which require dpdk by ~3 minutes. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> diff --git a/.travis.yml b/.travis.yml index 93567912..b1f8e4ce 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,9 @@ # See https://scan.coverity.com/travis_ci language: c +cache: + directories: + - dpdk sudo: required dist: trusty group: deprecated-2017Q2 @@ -108,17 +111,21 @@ install: - gem install asciidoctor - PATH=${PATH//:\.\/node_modules\/\.bin/} -# DPDK pktio +# DPDK pktio. Note that cache must be purged if dpdk version changes. - TARGET=${TARGET:-"x86_64-native-linuxapp-gcc"} - - git -c advice.detachedHead=false clone -q --depth=1 --single-branch --branch=v17.02 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 + - | + if [ ! -f "dpdk/${TARGET}/lib/libdpdk.a" ]; then + git -c advice.detachedHead=false clone -q --depth=1 --single-branch --branch=v17.02 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" + rm -r ./doc ./${TARGET}/app ./${TARGET}/build + popd + fi # Netmap pktio - git -c advice.detachedHead=false clone -q --depth=1 --single-branch --branch=v11.2 https://github.com/luigirizzo/netmap.git ----------------------------------------------------------------------- Summary of changes: .travis.yml | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) hooks/post-receive --

7 years, 11 months

[COMMIT] branch master updated. v1.15.0.0-76-gd3cae7aa

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 d3cae7aa012174bac6eecdca4ee3189c62400c48 (commit) via c444e19382a27c5d15e537f55c90a03963b86901 (commit) from f4f7679d16917d9a7c1b2220e351fd27733ee96b (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 d3cae7aa012174bac6eecdca4ee3189c62400c48 Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Thu Jul 27 13:53:50 2017 +0300 travis: add check for ODP_SHM_DIR Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> diff --git a/.travis.yml b/.travis.yml index 42c2c963..93567912 100644 --- a/.travis.yml +++ b/.travis.yml @@ -132,7 +132,8 @@ 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) - - sudo LD_LIBRARY_PATH="/usr/local/lib:$LD_LIBRARY_PATH" make check + - mkdir /dev/shm/odp + - sudo LD_LIBRARY_PATH="/usr/local/lib:$LD_LIBRARY_PATH" ODP_SHM_DIR=/dev/shm/odp make check - make install - echo "Checking linking and run from install..." commit c444e19382a27c5d15e537f55c90a03963b86901 Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Wed Jul 26 17:52:30 2017 +0300 linux-gen: fdserver: fix fdserver work if ODP_SHM_DIR is exported If ODP_SHM_DIR=/tmp is exported shmem test failed due to searching in wrong path. 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/_fdserver.c b/platform/linux-generic/_fdserver.c index 7ed5e7a6..4f74c614 100644 --- a/platform/linux-generic/_fdserver.c +++ b/platform/linux-generic/_fdserver.c @@ -59,8 +59,9 @@ #include <sys/wait.h> #define FDSERVER_SOCKPATH_MAXLEN 255 -#define FDSERVER_SOCK_FORMAT "/dev/shm/%s/odp-%d-fdserver" -#define FDSERVER_SOCKDIR_FORMAT "/dev/shm/%s" +#define FDSERVER_SOCK_FORMAT "%s/%s/odp-%d-fdserver" +#define FDSERVER_SOCKDIR_FORMAT "%s/%s" +#define FDSERVER_DEFAULT_DIR "/dev/shm" #define FDSERVER_BACKLOG 5 #ifndef MAP_ANONYMOUS @@ -241,6 +242,7 @@ static int get_socket(void) /* construct the named socket path: */ snprintf(sockpath, FDSERVER_SOCKPATH_MAXLEN, FDSERVER_SOCK_FORMAT, + odp_global_data.shm_dir, odp_global_data.uid, odp_global_data.main_pid); @@ -585,12 +587,14 @@ int _odp_fdserver_init_global(void) odp_spinlock_init(client_lock); snprintf(sockpath, FDSERVER_SOCKPATH_MAXLEN, FDSERVER_SOCKDIR_FORMAT, + odp_global_data.shm_dir, odp_global_data.uid); mkdir(sockpath, 0744); /* construct the server named socket path: */ snprintf(sockpath, FDSERVER_SOCKPATH_MAXLEN, FDSERVER_SOCK_FORMAT, + odp_global_data.shm_dir, odp_global_data.uid, odp_global_data.main_pid); @@ -673,6 +677,7 @@ int _odp_fdserver_term_global(void) /* construct the server named socket path: */ snprintf(sockpath, FDSERVER_SOCKPATH_MAXLEN, FDSERVER_SOCK_FORMAT, + odp_global_data.shm_dir, odp_global_data.uid, odp_global_data.main_pid); @@ -681,8 +686,9 @@ int _odp_fdserver_term_global(void) /* delete shm files directory */ snprintf(sockpath, FDSERVER_SOCKPATH_MAXLEN, FDSERVER_SOCKDIR_FORMAT, + odp_global_data.shm_dir, odp_global_data.uid); - unlink(sockpath); + rmdir(sockpath); return 0; } diff --git a/platform/linux-generic/include/odp_internal.h b/platform/linux-generic/include/odp_internal.h index ec17b199..355e25f7 100644 --- a/platform/linux-generic/include/odp_internal.h +++ b/platform/linux-generic/include/odp_internal.h @@ -60,8 +60,8 @@ enum init_stage { CPUMASK_INIT, TIME_INIT, SYSINFO_INIT, - FDSERVER_INIT, ISHM_INIT, + FDSERVER_INIT, THREAD_INIT, POOL_INIT, QUEUE_INIT, diff --git a/platform/linux-generic/odp_init.c b/platform/linux-generic/odp_init.c index 35a285ea..7d029950 100644 --- a/platform/linux-generic/odp_init.c +++ b/platform/linux-generic/odp_init.c @@ -70,7 +70,6 @@ int odp_init_global(odp_instance_t *instance, } stage = FDSERVER_INIT; - if (odp_thread_init_global()) { ODP_ERR("ODP thread init failed.\n"); goto init_failed; @@ -224,16 +223,16 @@ int _odp_term_global(enum init_stage stage) } /* Fall through */ - case ISHM_INIT: - if (_odp_ishm_term_global()) { - ODP_ERR("ODP ishm term failed.\n"); + case FDSERVER_INIT: + if (_odp_fdserver_term_global()) { + ODP_ERR("ODP fdserver term failed.\n"); rc = -1; } /* Fall through */ - case FDSERVER_INIT: - if (_odp_fdserver_term_global()) { - ODP_ERR("ODP fdserver term failed.\n"); + case ISHM_INIT: + if (_odp_ishm_term_global()) { + ODP_ERR("ODP ishm term failed.\n"); rc = -1; } /* Fall through */ diff --git a/test/linux-generic/validation/api/shmem/shmem_common.h b/test/linux-generic/validation/api/shmem/shmem_common.h index e6c04d81..0a90297f 100644 --- a/test/linux-generic/validation/api/shmem/shmem_common.h +++ b/test/linux-generic/validation/api/shmem/shmem_common.h @@ -9,7 +9,7 @@ #define SHM_NAME "odp_linux_shared_mem" #define DEFAULT_SHM_DIR "/dev/shm" -#define FIFO_NAME_FMT "/%s/%d/shmem_test_fifo-%d" +#define FIFO_NAME_FMT "%s/%d/shmem_test_fifo-%d" #define ALIGN_SIZE (128) #define TEST_SHARE_FOO (0xf0f0f0f0) #define TEST_SHARE_BAR (0xf0f0f0f) diff --git a/test/linux-generic/validation/api/shmem/shmem_linux.c b/test/linux-generic/validation/api/shmem/shmem_linux.c index e7e699e7..fe11a7db 100644 --- a/test/linux-generic/validation/api/shmem/shmem_linux.c +++ b/test/linux-generic/validation/api/shmem/shmem_linux.c @@ -86,7 +86,8 @@ #define ODP_APP1_NAME "shmem_odp1" /* name of the odp1 program, in this dir */ #define ODP_APP2_NAME "shmem_odp2" /* name of the odp2 program, in this dir */ /* odp-<pid>-shm-<name> */ -#define DEVNAME_FMT "/dev/shm/%d/odp-%" PRIu64 "-shm-%s" +#define DEVNAME_DEFAULT_DIR "/dev/shm" +#define DEVNAME_FMT "%s/%d/odp-%" PRIu64 "-shm-%s" #define MAX_FIFO_WAIT 30 /* Max time waiting for the fifo (sec) */ /* @@ -111,8 +112,11 @@ static int read_shmem_attribues(uint64_t ext_odp_pid, const char *blockname, { char shm_attr_filename[PATH_MAX]; FILE *export_file; + char *shm_dir = getenv("ODP_SHM_DIR"); - sprintf(shm_attr_filename, DEVNAME_FMT, getuid(), + sprintf(shm_attr_filename, DEVNAME_FMT, + shm_dir ? shm_dir : DEVNAME_DEFAULT_DIR, + getuid(), ext_odp_pid, blockname); /* O_CREAT flag not given => failure if shm_attr_filename does not @@ -250,16 +254,20 @@ int main(int argc __attribute__((unused)), char *argv[]) /* read the shared memory attributes (includes the shm filename): */ if (read_shmem_attribues(odp_app1, SHM_NAME, shm_filename, &len, &flags, - &user_len, &user_flags, &align) != 0) + &user_len, &user_flags, &align) != 0) { + printf("erorr read_shmem_attribues\n"); test_failure(fifo_name, fifo_fd, odp_app1); + } /* open the shm filename (which is either on /dev/shm/ or on hugetlbfs) * O_CREAT flag not given => failure if shm_devname does not already * exist */ shm_fd = open(shm_filename, O_RDONLY, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); - if (shm_fd == -1) + if (shm_fd == -1) { + fprintf(stderr, "unable to open %s\n", shm_filename); test_failure(fifo_name, fifo_fd, odp_app1); /* no return */ + } /* linux ODP guarantees page size alignement. Larger alignment may * fail as 2 different processes will have fully unrelated @@ -269,13 +277,16 @@ int main(int argc __attribute__((unused)), char *argv[]) addr = mmap(NULL, size, PROT_READ, MAP_SHARED, shm_fd, 0); if (addr == MAP_FAILED) { - printf("shmem_linux: map failed!\n"); + fprintf(stderr, "shmem_linux: map failed!\n"); test_failure(fifo_name, fifo_fd, odp_app1); } /* check that we see what the ODP application wrote in the memory */ - if ((addr->foo != TEST_SHARE_FOO) || (addr->bar != TEST_SHARE_BAR)) + if ((addr->foo != TEST_SHARE_FOO) || (addr->bar != TEST_SHARE_BAR)) { + fprintf(stderr, "ERROR: addr->foo %x addr->bar %x\n", + addr->foo, addr->bar); test_failure(fifo_name, fifo_fd, odp_app1); /* no return */ + } /* odp_app2 is in the same directory as this file: */ strncpy(prg_name, argv[0], PATH_MAX - 1); diff --git a/test/linux-generic/validation/api/shmem/shmem_odp1.c b/test/linux-generic/validation/api/shmem/shmem_odp1.c index 26abc94b..0ced4554 100644 --- a/test/linux-generic/validation/api/shmem/shmem_odp1.c +++ b/test/linux-generic/validation/api/shmem/shmem_odp1.c @@ -29,6 +29,7 @@ void shmem_test_odp_shm_proc(void) char test_result; char *shm_dir = getenv("ODP_SHM_DIR"); + printf("start with pid %d\n", getpid()); /* reminder: ODP_SHM_PROC => export to linux, ODP_SHM_EXPORT=>to odp */ shm = odp_shm_reserve(SHM_NAME, sizeof(test_shared_data_t), @@ -55,6 +56,7 @@ void shmem_test_odp_shm_proc(void) printf("shmem_odp1: reading fifo: %s\n", fifo_name); CU_ASSERT(read(fd, &test_result, sizeof(char)) == 1); + printf("shmem_odp1: read fifo: %d\n", test_result); printf("shmem_odp1: closing fifo: %s\n", fifo_name); close(fd); CU_ASSERT_FATAL(test_result == TEST_SUCCESS); diff --git a/test/linux-generic/validation/api/shmem/shmem_odp2.c b/test/linux-generic/validation/api/shmem/shmem_odp2.c index 2a4b67d7..0144407b 100644 --- a/test/linux-generic/validation/api/shmem/shmem_odp2.c +++ b/test/linux-generic/validation/api/shmem/shmem_odp2.c @@ -99,5 +99,6 @@ int main(int argc, char *argv[]) return 1; } + printf("%s SUCSESS\n", __FILE__); return 0; } ----------------------------------------------------------------------- Summary of changes: .travis.yml | 3 ++- platform/linux-generic/_fdserver.c | 12 ++++++++--- platform/linux-generic/include/odp_internal.h | 2 +- platform/linux-generic/odp_init.c | 13 ++++++------ .../validation/api/shmem/shmem_common.h | 2 +- .../validation/api/shmem/shmem_linux.c | 23 ++++++++++++++++------ .../validation/api/shmem/shmem_odp1.c | 2 ++ .../validation/api/shmem/shmem_odp2.c | 1 + 8 files changed, 39 insertions(+), 19 deletions(-) hooks/post-receive --

7 years, 11 months

[COMMIT] branch master updated. v1.15.0.0-74-gf4f7679d

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 f4f7679d16917d9a7c1b2220e351fd27733ee96b (commit) from fa9550ca8f4f0a77baf6d156b441fa2d703bbdf8 (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 f4f7679d16917d9a7c1b2220e351fd27733ee96b Author: Bill Fischofer <bill.fischofer(a)linaro.org> Date: Mon Feb 13 16:47:53 2017 -0600 doc: userguide: add portability and usage info for odp time apis Clarify and expand on portability and performance considerations regarding the use of the ODP time APIs in fulfillment of JIRA issue https://projects.linaro.org/browse/ODP-575 Signed-off-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/doc/users-guide/users-guide.adoc b/doc/users-guide/users-guide.adoc index ead8da5e..18d8cb8f 100644 --- a/doc/users-guide/users-guide.adoc +++ b/doc/users-guide/users-guide.adoc @@ -362,31 +362,41 @@ PktIOs are represented by handles of abstract type `odp_pktio_t`. === Time The time API is used to measure time intervals and track time flow of an -application and presents a convenient way to get access to a time source. -The time API consists of two main parts: local time API and global time API. +application and presents a convenient way to get access to an +implementation-defined time source. The time API consists of two main parts: +local time API and global time API. ==== Local time -The local time API is designed to be used within one thread and can be faster -than the global time API. The local time API cannot be used between threads as -time consistency is not guaranteed, and in some cases that's enough. -So, local time stamps are local to the calling thread and must not be shared -with other threads. Current local time can be read with `odp_time_local()`. +The local time API is designed to be used within one thread and obtaining +local time may be more efficient in some implementations than global +time. Local time stamps are local to the calling thread and should not be +shared with other threads, as local time is not guaranteed to be consistent +between threads. Current local time can be read with `odp_time_local()`. ==== Global time The global time API is designed to be used for tracking time between threads. -So, global time stamps can be shared between threads. Current global time can -be read with `odp_time_global()`. +So, global time stamps may safely be shared between threads. Current global +time can be read with `odp_time_global()`. -Both, local and global time is not wrapped during the application life cycle. +Both local and global time is not wrapped during the application life cycle. The time API includes functions to operate with time, such as `odp_time_diff()`, `odp_time_sum()`, `odp_time_cmp()`, conversion functions like `odp_time_to_ns()`, `odp_time_local_from_ns()`, `odp_time_global_from_ns()`. To get rate of time source `odp_time_local_res()`, `odp_time_global_res()` are used. To wait, `odp_time_wait_ns()` and `odp_time_wait_until()` are used, -during witch a thread potentially busy loop the entire wait time. +during which a thread potentially busy loops the entire wait time. The `odp_time_t` opaque type represents local or global timestamps. +==== Portability Considerations +The ODP Time APIs are designed to permit high-precision relative time +measurement within an ODP application. No attempt is made to correlate an +`odp_time_t` object with "wall time" or any other external time reference. +As defined by the ODP specification, `odp_time_t` values are required to +be unique over a span of at least 10 years. Most implementations will choose +to implement time values using 64-bit values, whose wrap times exceed 500 +years, making wrapping concerns not relevant to ODP applications. + === Timer Timers are how ODP applications measure and respond to the passage of time. Timers are drawn from specialized pools called timer pools that have their ----------------------------------------------------------------------- Summary of changes: doc/users-guide/users-guide.adoc | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) hooks/post-receive --

7 years, 11 months

[COMMIT] branch monarch_lts updated. v1.11.0.0_monarch-18-g759b6d5d

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 759b6d5da6617af244765983d0b8bfbb26f41890 (commit) from a28e0db6cdae7eb4f047cd79698ceadf96feff7f (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 759b6d5da6617af244765983d0b8bfbb26f41890 Author: Bill Fischofer <bill.fischofer(a)linaro.org> Date: Tue Jul 11 21:01:07 2017 -0500 changelog: document changes for v1.11.0.1 service release Signed-off-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/CHANGELOG b/CHANGELOG index 1d652a8d..e4178fcd 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,33 @@ +== OpenDataPlane (1.11.0.1) +v1.11.0.1 is a minor service release of the Monarch LTS (Long Term Support) +release of ODP. It incorporates several bug fixes and is otherwise unchanged +from the base Monarch LTS release + +=== Bug Fixes (With Numbers) +==== https://bugs.linaro.org/show_bug.cgi?id=2402[Bug 2402] +Doxygen warning for ODP_BIG_ENDIAN_BITFIELD + +==== https://bugs.linaro.org/show_bug.cgi?id=2704[Bug 2704] +Builds TAR have no .scmversion + +==== https://bugs.linaro.org/show_bug.cgi?id=2942[Bug 2942] +Compilation fails using clang 4.0.0 + +==== https://bugs.linaro.org/show_bug.cgi?id=2952[Bug 2952] +doxygen errors and travis does not catch them + +==== https://bugs.linaro.org/show_bug.cgi?id=3027[Bug 3027] +Compilation failures using GCC 7 series + +==== https://bugs.linaro.org/show_bug.cgi?id=3039[Bug 3039] +Socket pktio recv fails on large number of packet + +=== Bug Fixes (Unnumbered) +* git_hash: handle git worktree +* Use PRIu32 to print uint32_t values +* configure: remove dependency on autoconf-archive +* Fix compilation with OpenSSL 1.1.y + == OpenDataPlane (1.11.0.0) ODP v1.11.0 is the base tag and branch for the Monarch LTS (Long Term Support) release of ODP. ----------------------------------------------------------------------- Summary of changes: CHANGELOG | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) hooks/post-receive --

7 years, 11 months

[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, 11 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, 11 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, 11 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, 11 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, 11 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

git-lng-odp