git-lng-odp

git-lng-odp@lists.linaro.org

1203 discussions

[COMMIT] annotated tag v1.18.0.1 created. v1.18.0.0_tigermoth_rc3

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 annotated tag, v1.18.0.1 has been created at fe1ca0d1cb8e9a44be6d5ba2908268c7dcc6b7bd (tag) tagging 3c5cc8070d3bc8b7429f0410de6ef3009ff6a28f (commit) replaces v1.18.0.0_tigermoth_rc2 tagged by Maxim Uvarov on Fri Mar 16 16:39:50 2018 +0300 - Log ----------------------------------------------------------------- == OpenDataPlane (1.18.0.1) === Summary of Changes ODP v1.18.0.1 is a fix level for Tiger Moth Release Candidate 2 (RC 2). It incorporates fixes and performance / serviceability enhancements but no API changes. ==== APIs No changes for this release. ==== Corrected Crypto Functionality This release corrects a merge issue with crypto functionality that resulted in incorrect crypto operation for certain cipher suites. ==== Runtime Configuration Introduces a runtime configuration file that can be used by applications to set selected ODP configuration parameters dynamically at runtime rather than at `configure` time. At present this is used to configure parameters needed by DPDK PMDs when using PktIO interfaces in the DPDK class. The intention is to expand the use of this file over time to allow more dynamic control of other aspect of ODP runtime configuration. For the ODP Reference Implementation, a template configuration file is provided in `config/odp-linux.conf`. Introduction of this support generates an additional dependency on the `libconfig` package, which must be present to build ODP. ==== IPsec Traffic Flow Confidentiality (TFC) Corrections A few missing implementation features associated with TFC packet generation have been added in this fix level. This support is now functionally complete in the ODP Reference Implementation. ==== Debug Print Improvements The information provided in debug builds of the Reference Implementation is improved to print the interface name on open, start, stop, and close calls. The driver name and number of queues are also printed to ease verification of correct configuration. ==== Default Scheduler Performance Improvements The performance of the default scheduler in the Reference Implementation is significantly improved in providing scheduled access to PktIO queues. Scheduled I/O now operates within 10% of the performance achievable using Direct I/O, while providing incomparably better scalability in multicore environments. ==== `.so` Numbering Changes In preparation for the Tiger Moth official release, ODP has adopted a simplified `.so` naming scheme, which is introduced here. ODP `.so` numbers are now tied to the ODP release number since ODP does not promise backward compatibility across release boundaries. Balasubramanian Manoharan (1): validation: cls: add cls capability check Bill Fischofer (1): changelog: updates for odp v1.18.0.1 Dmitry Eremin-Solenikov (6): linux-gen: ipsec: support tfc_pad_len IPsec option linux-gen: ipsec: support TFC dummy packet generation validation: ipsec: verify TFC dummy packet generation build: make so numbering to be tied to ODP versions test: l2fwd: enforce dependency between l2fwd test and generator build: change order of subdirectories Josep Puigdemont (2): odp_dpdk.m4: check for DPDK static libraries odp_dpdk.m4: use correct installation directory Matias Elo (5): linux-gen: add runtime configuration file validation: pktio: remove pktio_test_send_failure test checkpatch: update to the latest version configure: add check for 'xxd' tool test: mmap_vlan_ins: wait before removing test interfaces Maxim Uvarov (7): linux-gen: fix crypto merge aes_gmac_gen_init/aes_gmac_check_init linux-gen: check crypto pool allocation linux-gen: crypto: remove odp prefix from internal crypto_int linux-gen: crypto: set pkt_out to INVALID on error shippable: do not use huge pages shippable: disable abi compat mode tests on aarch64 configure.ac: update version to v1.18.0.1 Petri Savolainen (10): linux-gen: version: implementation name content linux-gen: sysinfo: add content to info string print linux-gen: pktio: add debug prints linux-gen: queue: improve debug print linux-gen: sched: optimize packet input polling linux-gen: sched: optimize atomic packet input queue throughput linux-gen: queue: enqueue may fail linux-gen: sched: optimize parallel packet input queue throughput linux-gen: sched: use stash prefix linux-gen: sched: optimize local variable layout Yi He (1): validation: scheduler: fix test_wait_time failure ----------------------------------------------------------------------- hooks/post-receive --

7 years, 3 months

[COMMIT] annotated tag v1.18.0.0_tigermoth_rc3 created. v1.18.0.0_tigermoth_rc3

by git＠git-us.linaro.org

7 years, 3 months

[COMMIT] branch master updated. v1.18.0.0_tigermoth_rc2-33-g3c5cc807

by git＠git-us.linaro.org

7 years, 3 months

[COMMIT] branch master updated. v1.18.0.0_tigermoth_rc2-32-g4665f6d2

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 4665f6d2987fb26ad006cb56b02b3ef4c170f371 (commit) via d3690d4115441dc69d9571cb5261dd005a112d39 (commit) from 364887331875180c498abb8b7681a228ca21181e (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 4665f6d2987fb26ad006cb56b02b3ef4c170f371 Author: Bill Fischofer <bill.fischofer(a)linaro.org> Date: Wed Mar 7 11:02:06 2018 -0600 changelog: updates for odp v1.18.0.1 Add updates for V1.18.0.1 (Tiger Moth RC2 fix level) 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 cfebbbdc..1dfdd0e7 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,52 @@ +== OpenDataPlane (1.18.0.1) +=== Summary of Changes +ODP v1.18.0.1 is a fix level for Tiger Moth Release Candidate 2 (RC 2). +It incorporates fixes and performance / serviceability enhancements but no +API changes. + +==== APIs +No changes for this release. + +==== Corrected Crypto Functionality +This release corrects a merge issue with crypto functionality that resulted in +incorrect crypto operation for certain cipher suites. + +==== Runtime Configuration +Introduces a runtime configuration file that can be used by applications to +set selected ODP configuration parameters dynamically at runtime rather than +at `configure` time. At present this is used to configure parameters needed +by DPDK PMDs when using PktIO interfaces in the DPDK class. The intention is +to expand the use of this file over time to allow more dynamic control +of other aspect of ODP runtime configuration. + +For the ODP Reference Implementation, a template configuration file is +provided in `config/odp-linux.conf`. Introduction of this support generates +an additional dependency on the `libconfig` package, which must be present to +build ODP. + +==== IPsec Traffic Flow Confidentiality (TFC) Corrections +A few missing implementation features associated with TFC packet generation +have been added in this fix level. This support is now functionally complete in +the ODP Reference Implementation. + +==== Debug Print Improvements +The information provided in debug builds of the Reference Implementation is +improved to print the interface name on open, start, stop, and close calls. +The driver name and number of queues are also printed to ease verification of +correct configuration. + +==== Default Scheduler Performance Improvements +The performance of the default scheduler in the Reference Implementation is +significantly improved in providing scheduled access to PktIO queues. Scheduled +I/O now operates within 10% of the performance achievable using Direct I/O, +while providing incomparably better scalability in multicore environments. + +==== `.so` Numbering Changes +In preparation for the Tiger Moth official release, ODP has adopted a +simplified `.so` naming scheme, which is introduced here. ODP `.so` numbers +are now tied to the ODP release number since ODP does not promise backward +compatibility across release boundaries. + == OpenDataPlane (1.18.0.0) === New Features ODP v1.18.0.0 is Tiger Moth Release Candidate 2 (RC 2). It completes the new commit d3690d4115441dc69d9571cb5261dd005a112d39 Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Thu Mar 15 16:51:45 2018 +0300 shippable: disable abi compat mode tests on aarch64 disable tests which fails under our docker runs with native clang 4.0 Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/.shippable.yml b/.shippable.yml index 6a6a5974..82960a39 100644 --- a/.shippable.yml +++ b/.shippable.yml @@ -6,7 +6,7 @@ compiler: env: - CONF="--disable-test-perf --disable-test-perf-proc" - - CONF="--disable-abi-compat --disable-test-perf --disable-test-perf-proc" + # - CONF="--disable-abi-compat --disable-test-perf --disable-test-perf-proc" # - CONF="--enable-schedule-sp" # - CONF="--enable-schedule-iquery" # - CONF="--enable-dpdk-zero-copy" ----------------------------------------------------------------------- Summary of changes: .shippable.yml | 2 +- CHANGELOG | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 1 deletion(-) hooks/post-receive --

7 years, 3 months

[COMMIT] branch master updated. v1.18.0.0_tigermoth_rc2-30-g36488733

by git＠git-us.linaro.org

7 years, 3 months

[COMMIT] branch master updated. v1.18.0.0_tigermoth_rc2-29-geca5df13

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 eca5df13cf7987d6e3cd3cc930851671b071e4b3 (commit) from c8dc27d1fb5c890143338439f1cdbe3b2719174c (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 eca5df13cf7987d6e3cd3cc930851671b071e4b3 Author: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Date: Mon Mar 12 18:41:50 2018 +0530 validation: cls: add cls capability check check for max_cos supported in odp_cls_capability_t before creating odp_cos_t Signed-off-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/classification/odp_classification_tests.c b/test/validation/api/classification/odp_classification_tests.c index 7e157970..42d0c412 100644 --- a/test/validation/api/classification/odp_classification_tests.c +++ b/test/validation/api/classification/odp_classification_tests.c @@ -17,7 +17,14 @@ static odp_pool_t pool_list[CLS_ENTRIES]; static odp_pool_t pool_default; static odp_pktio_t pktio_loop; - +static odp_cls_testcase_u tc; + +#define NUM_COS_PMR_CHAIN 2 +#define NUM_COS_DEFAULT 1 +#define NUM_COS_ERROR 1 +#define NUM_COS_L2_PRIO CLS_L2_QOS_MAX +#define NUM_COS_PMR 1 +#define NUM_COS_COMPOSITE 1 /** sequence number of IP packets */ odp_atomic_u32_t seq; @@ -30,6 +37,7 @@ int classification_suite_init(void) int ret; odp_pktio_param_t pktio_param; odp_pktin_queue_param_t pktin_param; + tc.all_bits = 0; pool_default = pool_create("classification_pool"); if (ODP_POOL_INVALID == pool_default) { @@ -683,35 +691,60 @@ void test_pktio_pmr_composite_cos(void) static void classification_test_pktio_configure(void) { + odp_cls_capability_t capa; + int num_cos; + + odp_cls_capability(&capa); + num_cos = capa.max_cos; + /* Configure the Different CoS for the pktio interface */ - if (TEST_DEFAULT) + if (num_cos >= NUM_COS_DEFAULT && TEST_DEFAULT) { configure_pktio_default_cos(); - if (TEST_ERROR) + tc.default_cos = 1; + num_cos -= NUM_COS_DEFAULT; + } + if (num_cos >= NUM_COS_ERROR && TEST_ERROR) { configure_pktio_error_cos(); - if (TEST_PMR_CHAIN) + tc.error_cos = 1; + num_cos -= NUM_COS_ERROR; + } + if (num_cos >= NUM_COS_PMR_CHAIN && TEST_PMR_CHAIN) { configure_cls_pmr_chain(); - if (TEST_L2_QOS) + tc.pmr_chain = 1; + num_cos -= NUM_COS_PMR_CHAIN; + } + if (num_cos >= NUM_COS_L2_PRIO && TEST_L2_QOS) { configure_cos_with_l2_priority(); - if (TEST_PMR) + tc.l2_priority = 1; + num_cos -= NUM_COS_L2_PRIO; + } + if (num_cos >= NUM_COS_PMR && TEST_PMR) { configure_pmr_cos(); - if (TEST_PMR_SET) + tc.pmr_cos = 1; + num_cos -= NUM_COS_PMR; + } + if (num_cos >= NUM_COS_COMPOSITE && TEST_PMR_SET) { configure_pktio_pmr_composite(); + tc.pmr_composite_cos = 1; + num_cos -= NUM_COS_COMPOSITE; + } + } static void classification_test_pktio_test(void) { /* Test Different CoS on the pktio interface */ - if (TEST_DEFAULT) + if (tc.default_cos && TEST_DEFAULT) test_pktio_default_cos(); - if (TEST_ERROR) + if (tc.error_cos && TEST_ERROR) test_pktio_error_cos(); - if (TEST_PMR_CHAIN) + if (tc.pmr_chain && TEST_PMR_CHAIN) test_cls_pmr_chain(); - if (TEST_L2_QOS) + if (tc.l2_priority && TEST_L2_QOS) test_cos_with_l2_priority(); - if (TEST_PMR) + if (tc.pmr_cos && TEST_PMR) test_pmr_cos(); - if (TEST_PMR_SET) + if (tc.pmr_composite_cos && TEST_PMR_SET) test_pktio_pmr_composite_cos(); } diff --git a/test/validation/api/classification/odp_classification_testsuites.h b/test/validation/api/classification/odp_classification_testsuites.h index 20f6b82d..2c615367 100644 --- a/test/validation/api/classification/odp_classification_testsuites.h +++ b/test/validation/api/classification/odp_classification_testsuites.h @@ -22,6 +22,18 @@ typedef struct cls_packet_info { uint32_t len; } cls_packet_info_t; +typedef union odp_cls_testcase { + struct { + uint32_t default_cos:1; + uint32_t error_cos:1; + uint32_t pmr_chain:1; + uint32_t l2_priority:1; + uint32_t pmr_cos:1; + uint32_t pmr_composite_cos:1; + }; + uint32_t all_bits; +} odp_cls_testcase_u; + extern odp_testinfo_t classification_suite[]; extern odp_testinfo_t classification_suite_basic[]; extern odp_testinfo_t classification_suite_pmr[]; ----------------------------------------------------------------------- Summary of changes: .../api/classification/odp_classification_tests.c | 59 +++++++++++++++++----- .../classification/odp_classification_testsuites.h | 12 +++++ 2 files changed, 58 insertions(+), 13 deletions(-) hooks/post-receive --

7 years, 3 months

[COMMIT] branch master updated. v1.18.0.0_tigermoth_rc2-28-gc8dc27d1

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 c8dc27d1fb5c890143338439f1cdbe3b2719174c (commit) via 62ef9d5c92e0f56f45767f4c73df214d4393e158 (commit) from 41fd242a0685e79cb6f1b1e1826e6734bea2f359 (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 c8dc27d1fb5c890143338439f1cdbe3b2719174c Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Wed Feb 21 20:19:32 2018 +0300 build: change order of subdirectories Descend into examples after building/running tests. It is quite logical that first we build validation & performance tests, then we build platform tests, helper tests and only after that descend into examples. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/Makefile.am b/Makefile.am index 89388a19..4f3e0020 100644 --- a/Makefile.am +++ b/Makefile.am @@ -12,11 +12,11 @@ SUBDIRS = \ include \ $(PLATFORM_DIR) \ helper \ + test \ + $(PLATFORM_TEST_DIR) \ helper/test \ doc \ - example . \ - test \ - $(PLATFORM_TEST_DIR) + example @DX_RULES@ commit 62ef9d5c92e0f56f45767f4c73df214d4393e158 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Fri Mar 9 13:47:25 2018 +0300 test: l2fwd: enforce dependency between l2fwd test and generator Test l2fwd depends on the generator example. Enforce build order. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/performance/Makefile.am b/test/performance/Makefile.am index 9c709e79..e50c840b 100644 --- a/test/performance/Makefile.am +++ b/test/performance/Makefile.am @@ -34,6 +34,12 @@ odp_sched_latency_SOURCES = odp_sched_latency.c odp_scheduling_SOURCES = odp_scheduling.c odp_pktio_perf_SOURCES = odp_pktio_perf.c +# l2fwd test depends on generator example +EXTRA_odp_l2fwd_DEPENDENCIES = example-generator +.PHONY: $(EXTRA_odp_l2fwd_DEPENDENCIES) +example-generator: + $(MAKE) -C $(top_builddir)/example/generator odp_generator$(EXEEXT) + dist_check_SCRIPTS = $(TESTSCRIPTS) dist_check_DATA = udp64.pcap ----------------------------------------------------------------------- Summary of changes: Makefile.am | 6 +++--- test/performance/Makefile.am | 6 ++++++ 2 files changed, 9 insertions(+), 3 deletions(-) hooks/post-receive --

7 years, 3 months

[COMMIT] branch master updated. v1.18.0.0_tigermoth_rc2-26-g41fd242a

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 41fd242a0685e79cb6f1b1e1826e6734bea2f359 (commit) via 35a90a547466db90c00d6375d8d9a3573e84e99b (commit) from 9a1d48b1262d88e55922c4e1ed9f91ed2e3376d7 (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 41fd242a0685e79cb6f1b1e1826e6734bea2f359 Author: Yi He <yi.he(a)linaro.org> Date: Mon Mar 12 16:38:37 2018 +0800 validation: scheduler: fix test_wait_time failure Resolve Bug https://bugs.linaro.org/show_bug.cgi?id=3675, the elapsed time measurement could be enlarged unpredictably by inner printf calls and exceed the upper limit of tolerance. Signed-off-by: Yi He <yi.he(a)linaro.org> Reviewed-by: Ola Liljedahl <ola.liljedahl(a)arm.com> Reviewed-by: Brian Brooks <brian.brooks(a)arm.com> Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/scheduler/scheduler.c b/test/validation/api/scheduler/scheduler.c index d5783b4d..f1b61dfd 100644 --- a/test/validation/api/scheduler/scheduler.c +++ b/test/validation/api/scheduler/scheduler.c @@ -175,10 +175,8 @@ static void scheduler_test_wait_time(void) /* check time correctness */ start_time = odp_time_local(); - for (i = 1; i < 6; i++) { + for (i = 1; i < 6; i++) odp_schedule(&queue, wait_time); - printf("%d..", i); - } end_time = odp_time_local(); diff = odp_time_diff(end_time, start_time); commit 35a90a547466db90c00d6375d8d9a3573e84e99b Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Wed Mar 14 00:58:58 2018 +0300 shippable: do not use huge pages huge pages under docker are trickly also /dev/shm/ is limited to 64Mb. Use different folder for shared memory files. Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> diff --git a/.shippable.yml b/.shippable.yml index 9828ed52..6a6a5974 100644 --- a/.shippable.yml +++ b/.shippable.yml @@ -33,22 +33,20 @@ build: options: ci: - - echo 1000 | sudo tee /proc/sys/vm/nr_hugepages - - sudo mkdir -p /mnt/huge - - sudo mount -t hugetlbfs nodev /mnt/huge - - mkdir -p /dev/shm/odp + - mkdir -p $HOME/odp-shmdir - ./bootstrap - if [ "${CC#clang}" != "${CC}" ] ; then export CXX="${CC/clang/clang++}"; fi - ./configure $CONF - make -j $(nproc) - - sudo env CI=true ODP_SHM_DIR=/dev/shm/odp ODP_TEST_OUT_XML=yes ODP_SCHEDULER=basic make check + - sudo env CI=true ODP_SHM_DIR=$HOME/odp-shmdir ODP_TEST_OUT_XML=yes ODP_SCHEDULER=basic make check - ./scripts/shippable-post.sh basic - - sudo env CI=true ODP_SHM_DIR=/dev/shm/odp ODP_TEST_OUT_XML=yes ODP_SCHEDULER=sp make check + - sudo env CI=true ODP_SHM_DIR=$HOME/odp-shmdir ODP_TEST_OUT_XML=yes ODP_SCHEDULER=sp make check - ./scripts/shippable-post.sh sp - - sudo env CI=true ODP_SHM_DIR=/dev/shm/odp ODP_TEST_OUT_XML=yes ODP_SCHEDULER=iquery make check + - sudo env CI=true ODP_SHM_DIR=$HOME/odp-shmdir ODP_TEST_OUT_XML=yes ODP_SCHEDULER=iquery make check - ./scripts/shippable-post.sh iquery - - sudo env CI=true ODP_SHM_DIR=/dev/shm/odp ODP_TEST_OUT_XML=yes ODP_SCHEDULER=scalable make check + - sudo env CI=true ODP_SHM_DIR=$HOME/odp-shmdir ODP_TEST_OUT_XML=yes ODP_SCHEDULER=scalable make check - ./scripts/shippable-post.sh scalable + - rm -rf $HOME/odp-shmdir on_failure: - ./scripts/shippable-post.sh ----------------------------------------------------------------------- Summary of changes: .shippable.yml | 14 ++++++-------- test/validation/api/scheduler/scheduler.c | 4 +--- 2 files changed, 7 insertions(+), 11 deletions(-) hooks/post-receive --

7 years, 3 months

[COMMIT] branch master updated. v1.18.0.0_tigermoth_rc2-24-g9a1d48b1

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 9a1d48b1262d88e55922c4e1ed9f91ed2e3376d7 (commit) via 1e70adc3ae54b0c4518bdb51d94301f1dafe4ebf (commit) from 91282a4c578716f157aa8a5e0a9bf9bd25b19a17 (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 9a1d48b1262d88e55922c4e1ed9f91ed2e3376d7 Author: Josep Puigdemont <josep.puigdemont(a)linaro.org> Date: Fri Mar 9 16:58:15 2018 +0100 odp_dpdk.m4: use correct installation directory We are currently using the include path used when building DPDK, however when installing DPDK, the headers are put in ${prefix}/include/dpdk. We should use the latter in our include path. Signed-off-by: Josep Puigdemont <josep.puigdemont(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/.travis.yml b/.travis.yml index a03b2904..1f5ef42e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -195,7 +195,7 @@ install: LIBDPDKEXT=a fi DPDK_TARGET="${DPDK_TARGET}gcc" - if [ ! -f "dpdk/${TARGET}/lib/libdpdk.$LIBDPDKEXT" ]; then + if [ ! -f "dpdk/${TARGET}/usr/local/lib/libdpdk.$LIBDPDKEXT" ]; then git -c advice.detachedHead=false clone -q --depth=1 --single-branch --branch=v${DPDK_VERS} http://dpdk.org/git/dpdk dpdk pushd dpdk git log --oneline --decorate @@ -222,10 +222,11 @@ install: echo CONFIG_RTE_TOOLCHAIN_${DPDKCC^^}=y >> .config popd make build O=${TARGET} EXTRA_CFLAGS="-fPIC $DPDK_CFLAGS" CROSS="$DPDK_CROSS" CC="$CC" HOSTCC=gcc -j $(nproc) + make install O=${TARGET} DESTDIR=${TARGET} rm -r ./doc ./${TARGET}/app ./${TARGET}/build popd fi - EXTRA_CONF="$EXTRA_CONF --with-dpdk-path=`pwd`/dpdk/${TARGET}" + EXTRA_CONF="$EXTRA_CONF --with-dpdk-path=`pwd`/dpdk/${TARGET}/usr/local" fi # Netmap pktio @@ -293,7 +294,7 @@ jobs: - ./bootstrap - ./configure --prefix=$HOME/odp-install --enable-user-guides - --with-dpdk-path=`pwd`/dpdk/${TARGET} + --with-dpdk-path=`pwd`/dpdk/${TARGET}/usr/local --with-netmap-path=`pwd`/netmap CFLAGS="-O0 -coverage" CXXFLAGS="-O0 -coverage" LDFLAGS="--coverage" --enable-debug=full diff --git a/m4/odp_dpdk.m4 b/m4/odp_dpdk.m4 index 6e2a914b..b94c9b55 100644 --- a/m4/odp_dpdk.m4 +++ b/m4/odp_dpdk.m4 @@ -120,7 +120,7 @@ AS_IF([test "x$1" = "xsystem"], [dnl fi DPDK_LIB_PATH=`AS_DIRNAME(["$DPDK_LIB_PATH"])` ], [dnl - DPDK_CPPFLAGS="-isystem $1/include" + DPDK_CPPFLAGS="-isystem $1/include/dpdk" DPDK_LIB_PATH="$1/lib" DPDK_LDFLAGS="-L$DPDK_LIB_PATH" if test -r "$DPDK_LIB_PATH"/libdpdk.so ; then diff --git a/scripts/build-pktio-dpdk b/scripts/build-pktio-dpdk index 97916c1e..26afd97c 100755 --- a/scripts/build-pktio-dpdk +++ b/scripts/build-pktio-dpdk @@ -28,12 +28,13 @@ sed -ri 's,(CONFIG_RTE_LIBRTE_PMD_PCAP=).*,\1y,' .config popd #Build DPDK -make install T=${TARGET} EXTRA_CFLAGS="-fPIC" +make build O=${TARGET} EXTRA_CFLAGS="-fPIC" +make install O=${TARGET} DESTDIR=${TARGET} popd #Build ODP ./bootstrap; ./configure --enable-test-vald --enable-test-perf --enable-test-cpp \ --enable-debug --enable-debug-print \ - --with-dpdk-path=`pwd`/dpdk/${TARGET} + --with-dpdk-path=`pwd`/dpdk/${TARGET}/usr/local make commit 1e70adc3ae54b0c4518bdb51d94301f1dafe4ebf Author: Josep Puigdemont <josep.puigdemont(a)linaro.org> Date: Fri Mar 9 15:59:52 2018 +0100 odp_dpdk.m4: check for DPDK static libraries Signed-off-by: Josep Puigdemont <josep.puigdemont(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/m4/odp_dpdk.m4 b/m4/odp_dpdk.m4 index 0050fc4b..6e2a914b 100644 --- a/m4/odp_dpdk.m4 +++ b/m4/odp_dpdk.m4 @@ -127,6 +127,8 @@ AS_IF([test "x$1" = "xsystem"], [dnl DPDK_RPATH="-Wl,-rpath,$DPDK_LIB_PATH" DPDK_RPATH_LT="-R$DPDK_LIB_PATH" DPDK_SHARED=yes + elif test ! -r "$DPDK_LIB_PATH"/libdpdk.a ; then + AC_MSG_FAILURE([Could not find DPDK]) fi ]) DPDK_PMD_PATH="$DPDK_LIB_PATH" ----------------------------------------------------------------------- Summary of changes: .travis.yml | 7 ++++--- m4/odp_dpdk.m4 | 4 +++- scripts/build-pktio-dpdk | 5 +++-- 3 files changed, 10 insertions(+), 6 deletions(-) hooks/post-receive --

7 years, 3 months

[COMMIT] branch master updated. v1.18.0.0_tigermoth_rc2-22-g91282a4c

by git＠git-us.linaro.org

7 years, 3 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

git-lng-odp