git-lng-odp

git-lng-odp@lists.linaro.org

1 participants
1239 discussions

Start a nNew thread

[COMMIT] branch master updated. v1.15.0.0-305-g29c7a054

by git＠git-us.linaro.org

8 years, 10 months

[COMMIT] branch next updated. v1.15.0.0-323-gb61de566

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, next has been updated via b61de566190e19cc79531fdca737787cc359584b (commit) via ae393d6677e242464773aa81a5c18fdfe1ce2c85 (commit) via 9f02c58d41ec59f443e880766855265885f3a13d (commit) via 4954fd9289befbdd06d52b4d9b7ed7a83f268b10 (commit) via fb667f44a397a34bc1c4af41c49a766156740ff3 (commit) from f318c88f26b15140dda243e6a1d27e3c8f9d275b (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 b61de566190e19cc79531fdca737787cc359584b Author: Bill Fischofer <bill.fischofer(a)linaro.org> Date: Wed Nov 1 13:51:05 2017 -0500 changelog: updates for odp v1.16.0.0 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 866e51e9..ec0f777c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,210 @@ +== OpenDataPlane (1.16.0.0) +=== New Features +ODP v1.16.0.0 is the final preview release before the official release of +Tiger Moth. It introduces new APIs and extensions, as well as bug fixes and +functional improvements. + +==== APIs +The following new and changed APIs are included in this release: + +===== Initialization Changes +The new `odp_feature_t` type is introduced that defines various feature bits +for ODP components. This is used in an expanded `odp_init_t` argument to +`odp_init_global()` to specify which ODP features are unused by the +application. For example, if the application knows it will not be making use +of crypto features or the classifier, this may permit the ODP implementation +to configure itself more efficiently. Results are undefined if an application +asserts that it will not be using a feature and it attempts to do so +afterwards. + +Associated with this new support the `odp_init_param_init()` API is added +to initialize the `odp_init_t` struct to default values. + +===== Packet API Changes + +* The `odp_packet_unshared_len()` API is removed. Testing showed that this +API was non-essential and conflicted with the goal of implementation +efficiency. +* The `odp_print_packet_data()` API is added. This permits packet data to +be logged along with platform-defined metadata for debugging or diagnostic +purposes. + +===== PktIO API Changes + +* The `loop_supported` attribute of the `odp_pktio_capability_t` struct is +deprecated since this is redundant. The `enable_loop` field of the +`odp_pktio_config_t` struct (which is returned as part of the +`odp_packet_capability_t` struct) is the proper way to determine whether a +PktIO supports loopback mode. + +===== System Info API Changes + +* The documentation for the `odp_sys_huge_page_size()` API is updated to +clarify that a 0 return code indicates that huge pages are not supported by +this platform. +* The `odp_sys_huge_page_size_all()` API is added to return all +huge page sizes supported by this platform. + +===== Timer API Changes + +* The documentation for the various parameters contained in the +`odp_timer_pool_param_t` struct are expanded and clarified. + +=== Miscellaneous Fixes and Improvements + +==== Default Packet Headroom +The default packet headroom in `odp-linux` has been increased from 66 to +128 bytes for better compatibility with `odp-dpdk`. + +==== Zero-copy Packet References +The `odp-linux` reference implementation now fully supports zero-copy +packet references. Previously these APIs were implemented via packet copies, +which while functionally correct, were not how these APIs are intended to +operate. + +==== DPDK Zero-copy I/O support +The `--enable-dpdk-zero-copy` `configure` option is added to allow DPDK PktIO +devices to avoid data copies, leading to improved performance. + +==== DPDK Checksum offload support +DPDK PktIO now makes use of RX and TX IP/UDP/TCP checksum offload. + +==== Shared memory stored in /dev/shm +In the `odp-linux` reference implementation, shared memory is now backed to +`/dev/shm` rather than `/tmp` for better reliability and robustness. This may +be overridden as part of ODP build-time customization if desired. + +==== IPC Improvements +PktIO IPC support has received improvements in both performance and +reliability and is now suitable for development use. + +=== Dependency Changes + +==== Dependency on autoconf-archive removed +Since some build environments do not supply autoconf-archive, this dependency +is removed. + +==== DPDK support upgraded to 17.08 release +The ODP DPDK Packet I/O support has been upgraded to work with the DPDK 17.08 +release. + +==== Added support for OpenSSL 1.1.x releases +ODP use of OpenSSL for crypto processing has been upgraded to allow use of +OpenSSL 1.1.x. + +=== Build System Restructure +The ODP build system has been overhauled to support more comprehensive and +efficient automated testing under Travis CI. Greater use of Autoconf is now +made to control ODP configuration and build options, permitting greater +environmental flexibility. This includes an expanded range of test coverage, +including cross-compilation support for ARMv8, MIPS,and Power architectures, +as well as testing under the latest levels of GCC and clang. + +=== Arm Architecture Support Improvements + +* ARMv8 generic timer support is now included +* Improved time efficiency and accuracy by using native ARMv8 time/clock +instructions. + +==== Test Improvements +The `test` directory has been reorganized and streamlined. Platform-specific +tests are moved from `test/linux-generic` to +`platform/linux-generic/test/`. As a result, the `test/common_plat` +directory is deleted so that `test/validation`, `test/performance`, etc. are +now used for all platform-independent tests. + +==== Examples Improvements + +===== IPv4 Fragmentation Reassembly Example +The `ipfragreass` example program has been added to demonstrate IPv4 fragment +reassembly. + +===== ODP Generator Improvements +The `odp_generator` example program now uses packet references for improved +performance in UDP and ICMP traffic. The program also now makes use of HW +checksum offload support, when available. + +=== Documentation Improvements + +* The ODP Users Guide has clarified usage information about the ODP time +APIs for better portability. +* A section has been added to the ODP Users Guide on API specification +principles. This clarifies expected behavior of ODP applications and +implementations and makes explicit what the specification means by "undefined +behavior". +* All Doxygen used in ODP is upgraded to conform to the stricter documentation +requirements introduced by Doxygen 1.8.13. + +=== Bug Fixes + +==== https://bugs.linaro.org/show_bug.cgi?id=2254[Bug 2254] +check-odp: valgrind generates "No rule to make target" + +==== https://bugs.linaro.org/show_bug.cgi?id=2812[Bug 2812] +Helper/test/process fails on a single core system + +==== https://bugs.linaro.org/show_bug.cgi?id=2861[Bug 2861] +Remove redundant loop_support parameter in pktio capability + +==== https://bugs.linaro.org/show_bug.cgi?id=2938[Bug 2938] +Make file deps failure + +==== https://bugs.linaro.org/show_bug.cgi?id=2976[Bug 2976] +IP headers checksum functions are incorrect + +==== https://bugs.linaro.org/show_bug.cgi?id=3024[Bug 3024] +odp_traffic_mngr example is broken + +==== https://bugs.linaro.org/show_bug.cgi?id=3026[Bug 3026] +pktio_ipc_run test can fail due to segfault + +==== https://bugs.linaro.org/show_bug.cgi?id=3043[Bug 3043] +User guide error (packet diagram fix) + +==== https://bugs.linaro.org/show_bug.cgi?id=3052[Bug 3052] +api-next out of tree build broken + +==== https://bugs.linaro.org/show_bug.cgi?id=3066[Bug 3066] +Cross compile broken for ARMv8 + +==== https://bugs.linaro.org/show_bug.cgi?id=3126[Bug 3126] +IPC pktio test fails with taskset -c 1-2 + +==== https://bugs.linaro.org/show_bug.cgi?id=3177[Bug 3177] +Test case for classification enable + +==== https://bugs.linaro.org/show_bug.cgi?id=3182[Bug 3182] +Memory allocation checks (in traffic manager) + +==== https://bugs.linaro.org/show_bug.cgi?id=3216[Bug 3216] +Adding --enable-helper-linux configure flag breaks build + +==== https://bugs.linaro.org/show_bug.cgi?id=3238[Bug 3238] +Doxygen warnings on helper header files + +==== https://bugs.linaro.org/show_bug.cgi?id=3241[Bug 3241] +codecov: _odp_packet_cmp_data is not covered + +==== https://bugs.linaro.org/show_bug.cgi?id=3242[Bug 3242] +setup_pktio_entry missing unlock + +==== https://bugs.linaro.org/show_bug.cgi?id=3249[Bug 3249] +odp_cpu_hz() does not work on all Linux distros + +==== https://bugs.linaro.org/show_bug.cgi?id=3262[Bug 3262] +Missing doxygen detected by Travis + +==== https://bugs.linaro.org/show_bug.cgi?id=3289[Bug 3289] +'num_queues' isn't ignored when "classifier_enable" is enabled + +==== https://bugs.linaro.org/show_bug.cgi?id=3300[Bug 3300] +Validation tests cannot be disabled after commit b4d17b1 + +=== Known Issues + +==== https://bugs.linaro.org/show_bug.cgi?id=3245[Bug 3245] +Cannot run l2fwd application on Cavium ThunderX platform + == OpenDataPlane (1.15.0.0) === New Features ODP v1.15.0.0 continues the preview of Tiger Moth, introducing new APIs and commit ae393d6677e242464773aa81a5c18fdfe1ce2c85 Author: Bill Fischofer <bill.fischofer(a)linaro.org> Date: Tue Jun 13 07:55:14 2017 -0500 validation: init: use odp_init_param_init() in init tests Provide test coverage for odp_init_param_init() API. Signed-off-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/init/init.c b/test/validation/api/init/init.c index d44ff234..3dc40ea5 100644 --- a/test/validation/api/init/init.c +++ b/test/validation/api/init/init.c @@ -26,10 +26,10 @@ static int odp_init_log(odp_log_level_t level, const char *fmt, ...); void init_test_odp_init_global_replace_abort(void) { int status; - struct odp_init_t init_data; + odp_init_t init_data; odp_instance_t instance; - memset(&init_data, 0, sizeof(init_data)); + odp_init_param_init(&init_data); init_data.abort_fn = &odp_init_abort; status = odp_init_global(&instance, &init_data, NULL); @@ -79,10 +79,10 @@ int init_main_abort(int argc, char *argv[]) void init_test_odp_init_global_replace_log(void) { int status; - struct odp_init_t init_data; + odp_init_t init_data; odp_instance_t instance; - memset(&init_data, 0, sizeof(init_data)); + odp_init_param_init(&init_data); init_data.log_fn = &odp_init_log; replacement_logging_used = 0; commit 9f02c58d41ec59f443e880766855265885f3a13d Author: Bill Fischofer <bill.fischofer(a)linaro.org> Date: Tue Jun 13 07:55:13 2017 -0500 linux-generic: init: implement odp_init_param_init() Signed-off-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/odp_init.c b/platform/linux-generic/odp_init.c index 92a58370..fe03709b 100644 --- a/platform/linux-generic/odp_init.c +++ b/platform/linux-generic/odp_init.c @@ -25,6 +25,11 @@ struct odp_global_data_s odp_global_data; +void odp_init_param_init(odp_init_t *param) +{ + memset(param, 0, sizeof(odp_init_t)); +} + int odp_init_global(odp_instance_t *instance, const odp_init_t *params, const odp_platform_init_t *platform_params ODP_UNUSED) commit 4954fd9289befbdd06d52b4d9b7ed7a83f268b10 Author: Bill Fischofer <bill.fischofer(a)linaro.org> Date: Tue Jun 13 07:55:12 2017 -0500 api: init: add support for unused features Add the not_used field to odp_init_t to permit applications to specify that they will not use various ODP features. This may allow implementations to provide optimized behavior. Also add the odp_init_param_init() API to initialize odp_init_t to default values. Signed-off-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/include/odp/api/spec/init.h b/include/odp/api/spec/init.h index 154cdf8f..e8ec4113 100644 --- a/include/odp/api/spec/init.h +++ b/include/odp/api/spec/init.h @@ -29,6 +29,7 @@ extern "C" { #include <odp/api/std_types.h> #include <odp/api/hints.h> +#include <odp/api/feature.h> #include <odp/api/thread.h> #include <odp/api/cpumask.h> @@ -153,8 +154,22 @@ typedef struct odp_init_t { odp_log_func_t log_fn; /** Replacement for the default abort fn */ odp_abort_func_t abort_fn; + /** Unused features. These are hints to the ODP implementation that + * the application will not use any APIs associated with these + * features. Implementations may use this information to provide + * optimized behavior. Results are undefined if applications assert + * that a feature will not be used and it is used anyway. + */ + odp_feature_t not_used; } odp_init_t; +/** + * Initialize the odp_init_t to default values for all fields + * + * @param[out] param Address of the odp_init_t to be initialized + */ +void odp_init_param_init(odp_init_t *param); + /** * @typedef odp_platform_init_t * ODP platform initialization data commit fb667f44a397a34bc1c4af41c49a766156740ff3 Author: Bill Fischofer <bill.fischofer(a)linaro.org> Date: Tue Jun 13 07:55:11 2017 -0500 api: feature: add odp feature bits Add new odp_feature_t bits that permit other APIs/components to refer to various ODP features. Signed-off-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/include/Makefile.am b/include/Makefile.am index a3a7e165..746b5975 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -17,6 +17,7 @@ odpapispecinclude_HEADERS = \ odp/api/spec/debug.h \ odp/api/spec/errno.h \ odp/api/spec/event.h \ + odp/api/spec/feature.h \ odp/api/spec/hash.h \ odp/api/spec/hints.h \ odp/api/spec/init.h \ diff --git a/include/odp/api/spec/feature.h b/include/odp/api/spec/feature.h new file mode 100644 index 00000000..0cfc141d --- /dev/null +++ b/include/odp/api/spec/feature.h @@ -0,0 +1,69 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +/** + * @file + * + * ODP features. + * Define various ODP feature sets that can be referenced by other + * components. + */ + +#ifndef ODP_API_FEATURE_H_ +#define ODP_API_FEATURE_H_ +#include <odp/visibility_begin.h> + +#ifdef __cplusplus +extern "C" { +#endif + +#include <odp/api/std_types.h> + +/** @defgroup odp_features ODP_FEATURE + * ODP feature definitions + * @{ + */ + +/** Definition of ODP features */ +typedef union odp_feature_t { + /** All features */ + uint32_t all_feat; + + /** Individual feature bits */ + struct { + /** Classifier APIs, e.g., odp_cls_xxx(), odp_cos_xxx() */ + uint32_t cls:1; + + /** Crypto APIs, e.g., odp_crypto_xxx() */ + uint32_t crypto:1; + + /** IPsec APIs, e.g., odp_ipsec_xxx() */ + uint32_t ipsec:1; + + /** Scheduler APIs, e.g., odp_schedule_xxx() */ + uint32_t schedule:1; + + /** Time APIs are, e.g., odp_time_xxx() */ + uint32_t time:1; + + /** Timer APIs, e.g., odp_timer_xxx(), odp_timeout_xxx() */ + uint32_t timer:1; + + /** Traffic Manager APIs, e.g., odp_tm_xxx() */ + uint32_t tm:1; + } feat; +} odp_feature_t; + +/** + * @} + */ + +#ifdef __cplusplus +} +#endif + +#include <odp/visibility_end.h> +#endif diff --git a/include/odp_api.h b/include/odp_api.h index 060ec888..3a03a05b 100644 --- a/include/odp_api.h +++ b/include/odp_api.h @@ -32,6 +32,7 @@ extern "C" { #include <odp/api/barrier.h> #include <odp/api/spinlock.h> #include <odp/api/atomic.h> +#include <odp/api/feature.h> #include <odp/api/init.h> #include <odp/api/system_info.h> #include <odp/api/thread.h> diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 0b29e613..356f229b 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -35,6 +35,7 @@ odpapiinclude_HEADERS = \ include/odp/api/deprecated.h \ include/odp/api/errno.h \ include/odp/api/event.h \ + include/odp/api/feature.h \ include/odp/api/hash.h \ include/odp/api/hints.h \ include/odp/api/init.h \ diff --git a/platform/linux-generic/include/odp/api/feature.h b/platform/linux-generic/include/odp/api/feature.h new file mode 100644 index 00000000..55a86a83 --- /dev/null +++ b/platform/linux-generic/include/odp/api/feature.h @@ -0,0 +1,34 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +/** + * @file + * + * ODP features. + */ + +#ifndef ODP_PLAT_FEATURE_H_ +#define ODP_PLAT_FEATURE_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +/** @ingroup odp_feature + * @{ + */ + +/** + * @} + */ + +#include <odp/api/spec/feature.h> + +#ifdef __cplusplus +} +#endif + +#endif ----------------------------------------------------------------------- Summary of changes: CHANGELOG | 207 +++++++++++++++++++++ include/Makefile.am | 1 + include/odp/api/spec/feature.h | 69 +++++++ include/odp/api/spec/init.h | 15 ++ include/odp_api.h | 1 + platform/linux-generic/Makefile.am | 1 + .../{odp_errno_define.h => odp/api/feature.h} | 16 +- platform/linux-generic/odp_init.c | 5 + test/validation/api/init/init.c | 8 +- 9 files changed, 315 insertions(+), 8 deletions(-) create mode 100644 include/odp/api/spec/feature.h copy platform/linux-generic/include/{odp_errno_define.h => odp/api/feature.h} (57%) hooks/post-receive --

8 years, 10 months

[COMMIT] branch 2.0-native-drivers created. v1.15.0.0-822-gc0f99c44

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, 2.0-native-drivers has been created at c0f99c441feadd1566b7e92789b11c30c6ee3f64 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- hooks/post-receive --

8 years, 10 months

[COMMIT] branch master updated. v1.15.0.0-304-g2dd964e1

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 2dd964e170d71078cfe03d4c9e00c6f592b4326b (commit) via 449c693b2678bc29577b64fb76003bb10b86db6e (commit) via b13eba4e9b9cb814f115627addf763322fe22a76 (commit) via ea9f2aa440a653a77cbcadc2862c5af298205272 (commit) from 5e840b83992bba2f64750bb3a4599478d6ea9260 (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 2dd964e170d71078cfe03d4c9e00c6f592b4326b Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Thu Nov 2 16:49:34 2017 +0300 build: run doxygen-doc during make distcheck Check that distribution has all files necessary to build doxygen documentation. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/Makefile.am b/Makefile.am index e6edb7e1..dab8ca8c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,3 +21,9 @@ SUBDIRS = \ @DX_RULES@ EXTRA_DIST = bootstrap CHANGELOG config/README + +distcheck-hook: + if test -n "$(DX_CLEANFILES)" ; \ + then \ + $(MAKE) doxygen-doc ; \ + fi commit 449c693b2678bc29577b64fb76003bb10b86db6e Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Thu Nov 2 21:36:18 2017 +0300 travis: move Doxygen compilation to before_install Move Doxygen compilation to before_install to make it available to make distcheck. 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 7632ae3f..6bd03a0c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -138,6 +138,19 @@ before_install: - export PKG_CONFIG_PATH="$HOME/cunit-install/$CROSS_ARCH/lib/pkgconfig:${PKG_CONFIG_PATH}" - find $HOME/cunit-install + # Updated Doxygen + - | + if [ ! -f "$HOME/doxygen-install/bin/doxygen" ]; then + wget https://github.com/doxygen/doxygen/archive/Release_1_8_13.tar.gz + tar xpvf Release_1_8_13.tar.gz + pushd doxygen-Release_1_8_13 + cmake -DCMAKE_INSTALL_PREFIX=$HOME/doxygen-install . + make install + popd + fi + - export PATH=$HOME/doxygen-install/bin:$PATH + + install: - echo 1000 | sudo tee /proc/sys/vm/nr_hugepages - sudo mkdir -p /mnt/huge @@ -249,17 +262,6 @@ jobs: install: - true script: - - | - if [ ! -f "$HOME/doxygen-install/bin/doxygen" ]; then - wget https://github.com/doxygen/doxygen/archive/Release_1_8_13.tar.gz - tar xpvf Release_1_8_13.tar.gz - pushd doxygen-Release_1_8_13 - cmake -DCMAKE_INSTALL_PREFIX=$HOME/doxygen-install . - make install - popd - fi - - - export PATH=$HOME/doxygen-install/bin:$PATH - ./bootstrap - ./configure # doxygen does not trap on warnings, check for them here. commit b13eba4e9b9cb814f115627addf763322fe22a76 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Thu Nov 2 16:36:37 2017 +0300 doc: include Doxyfile into EXTRA_DIST As it is done with the rest of Doxygen docs, include Doxyfile into EXTRA_DIST of corresponding doc directory. Drop $(DX_CONFIG) from top-level Makefile.am, as it becomes unused now. 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 c28b0229..e6edb7e1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,4 +20,4 @@ SUBDIRS = \ @DX_RULES@ -EXTRA_DIST = bootstrap $(DX_CONFIG) CHANGELOG config/README +EXTRA_DIST = bootstrap CHANGELOG config/README diff --git a/doc/application-api-guide/Makefile.am b/doc/application-api-guide/Makefile.am index 6109e825..7d900397 100644 --- a/doc/application-api-guide/Makefile.am +++ b/doc/application-api-guide/Makefile.am @@ -1,4 +1,5 @@ EXTRA_DIST = \ + Doxyfile \ api_guide_lines.dox \ examples.dox \ odp.dox \ commit ea9f2aa440a653a77cbcadc2862c5af298205272 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Thu Nov 2 16:48:50 2017 +0300 configure: don't try building driver api guide driver api guide was removed from master branch. Drop it from configure.ac. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/configure.ac b/configure.ac index 4bce0534..069fdb4c 100644 --- a/configure.ac +++ b/configure.ac @@ -219,9 +219,7 @@ DX_INIT_DOXYGEN($PACKAGE_NAME, ${srcdir}/doc/helper-guide/Doxyfile, ${builddir}/doc/helper-guide/output, ${srcdir}/doc/platform-api-guide/Doxyfile, - ${builddir}/doc/platform-api-guide/output, - ${srcdir}/doc/driver-api-guide/Doxyfile, - ${builddir}/doc/driver-api-guide/output) + ${builddir}/doc/platform-api-guide/output) ########################################################################## # Enable/disable ODP_DEBUG ----------------------------------------------------------------------- Summary of changes: .travis.yml | 24 +++++++++++++----------- Makefile.am | 8 +++++++- configure.ac | 4 +--- doc/application-api-guide/Makefile.am | 1 + 4 files changed, 22 insertions(+), 15 deletions(-) hooks/post-receive --

8 years, 10 months

[COMMIT] branch 2.0 updated. v1.15.0.0-822-gc0f99c44

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, 2.0 has been updated via c0f99c441feadd1566b7e92789b11c30c6ee3f64 (commit) via 3fc5b2aa0d85c5fb6800f06fcbf836ea1ac43337 (commit) via d8b56f1fa9ad273cb251675a46e92635b38adc92 (commit) via e971a0f4b8135812d268415d279ef3f618f4ee41 (commit) from ca1be967bd4f6aec7dc99b72de643718cb8a32b8 (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 c0f99c441feadd1566b7e92789b11c30c6ee3f64 Author: Bogdan Pricope <bogdan.pricope(a)linaro.org> Date: Tue Oct 31 11:30:45 2017 +0200 linux-gen: pktio: remove duplicate odp_packet_io_internal.h Enable utilization of linux-generic version of odp_packet_io_internal.h for linux-dpdk platform. Subsequently, linux-dpdk version of odp_packet_io_internal.h is removed. This is part of an attempt to reduce the delta between linux-dpdk and linux-generic platforms to permit integration of linux-dpdk pktios in linux-generic. Signed-off-by: Bogdan Pricope <bogdan.pricope(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Honnappa Nagarahalli <honnappa.Nagarahalli(a)arm.com> Reviewed-by: Krishna Garapati <balakrishna.garapati(a)linaro.org> Signed-off-by: Yi He <yi.he(a)linaro.org> diff --git a/platform/linux-dpdk/Makefile.am b/platform/linux-dpdk/Makefile.am index e2a0249d..596c7b78 100644 --- a/platform/linux-dpdk/Makefile.am +++ b/platform/linux-dpdk/Makefile.am @@ -199,7 +199,7 @@ noinst_HEADERS = \ ${top_srcdir}/platform/linux-generic/include/odp_pktio_ops_socket.h \ ${top_srcdir}/platform/linux-generic/include/odp_pktio_ops_loopback.h \ ${top_srcdir}/platform/linux-generic/include/odp_name_table_internal.h \ - ${srcdir}/include/odp_packet_io_internal.h \ + ${top_srcdir}/platform/linux-generic/include/odp_packet_io_internal.h \ ${srcdir}/include/odp_errno_define.h \ ${top_srcdir}/platform/linux-generic/include/odp_packet_io_ring_internal.h \ ${top_srcdir}/platform/linux-generic/include/odp_pkt_queue_internal.h \ diff --git a/platform/linux-dpdk/include/odp_packet_io_internal.h b/platform/linux-dpdk/include/odp_packet_io_internal.h deleted file mode 100644 index 089ad38c..00000000 --- a/platform/linux-dpdk/include/odp_packet_io_internal.h +++ /dev/null @@ -1,157 +0,0 @@ -/* Copyright (c) 2013, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -/** - * @file - * - * ODP packet IO - implementation internal - */ - -#ifndef ODP_PACKET_IO_INTERNAL_H_ -#define ODP_PACKET_IO_INTERNAL_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -#include <odp/api/spinlock.h> -#include <odp/api/ticketlock.h> -#include <odp_classification_datamodel.h> -#include <odp_align_internal.h> -#include <odp_debug_internal.h> -#include <odp_queue_if.h> - -#include <odp_config_internal.h> -#include <odp/api/hints.h> - -#define PKTIO_MAX_QUEUES 64 -#include <linux/if_ether.h> - -/* Forward declaration */ -typedef union pktio_entry_u pktio_entry_t; -#include <odp_pktio_ops_subsystem.h> - -#define PKTIO_NAME_LEN 256 - -#define PKTIN_INVALID ((odp_pktin_queue_t) {ODP_PKTIO_INVALID, 0}) -#define PKTOUT_INVALID ((odp_pktout_queue_t) {ODP_PKTIO_INVALID, 0}) - -struct pktio_entry { - const pktio_ops_module_t *ops; /**< Implementation specific methods */ - uint8_t ops_data[ODP_PKTIO_ODPS_DATA_MAX_SIZE]; /**< IO operation - specific data */ - /* These two locks together lock the whole pktio device */ - odp_ticketlock_t rxl; /**< RX ticketlock */ - odp_ticketlock_t txl; /**< TX ticketlock */ - int cls_enabled; /**< is classifier enabled */ - odp_pktio_t handle; /**< pktio handle */ - enum { - /* Not allocated */ - PKTIO_STATE_FREE = 0, - /* Close pending on scheduler response. Next state after this - * is PKTIO_STATE_FREE. */ - PKTIO_STATE_CLOSE_PENDING, - /* Open in progress. - Marker for all active states following under. */ - PKTIO_STATE_ACTIVE, - /* Open completed */ - PKTIO_STATE_OPENED, - /* Start completed */ - PKTIO_STATE_STARTED, - /* Stop pending on scheduler response */ - PKTIO_STATE_STOP_PENDING, - /* Stop completed */ - PKTIO_STATE_STOPPED - } state; - odp_pktio_config_t config; /**< Device configuration */ - classifier_t cls; /**< classifier linked with this pktio*/ - odp_pktio_stats_t stats; /**< statistic counters for pktio */ - char name[PKTIO_NAME_LEN]; /**< name of pktio provided to - pktio_open() */ - odp_pool_t pool; - odp_pktio_param_t param; - - /* Storage for queue handles - * Multi-queue support is pktio driver specific */ - unsigned num_in_queue; - unsigned num_out_queue; - - struct { - odp_queue_t queue; - queue_t queue_int; - odp_pktin_queue_t pktin; - } in_queue[PKTIO_MAX_QUEUES]; - - struct { - odp_queue_t queue; - odp_pktout_queue_t pktout; - } out_queue[PKTIO_MAX_QUEUES]; -}; - -union pktio_entry_u { - struct pktio_entry s; - uint8_t pad[ROUNDUP_CACHE_LINE(sizeof(struct pktio_entry))]; -}; - -typedef struct { - odp_spinlock_t lock; - pktio_entry_t entries[ODP_CONFIG_PKTIO_ENTRIES]; -} pktio_table_t; - -extern void *pktio_entry_ptr[]; - -static inline int pktio_to_id(odp_pktio_t pktio) -{ - return _odp_typeval(pktio) - 1; -} - -static inline pktio_entry_t *get_pktio_entry(odp_pktio_t pktio) -{ - if (odp_unlikely(pktio == ODP_PKTIO_INVALID)) - return NULL; - - if (odp_unlikely(_odp_typeval(pktio) > ODP_CONFIG_PKTIO_ENTRIES)) { - ODP_DBG("pktio limit %d/%d exceed\n", - _odp_typeval(pktio), ODP_CONFIG_PKTIO_ENTRIES); - return NULL; - } - - return pktio_entry_ptr[pktio_to_id(pktio)]; -} - -static inline int pktio_cls_enabled(pktio_entry_t *entry) -{ - return entry->s.cls_enabled; -} - -static inline void pktio_cls_enabled_set(pktio_entry_t *entry, int ena) -{ - entry->s.cls_enabled = ena; -} - -/* - * Dummy single queue implementations of multi-queue API - */ -int single_input_queues_config(pktio_entry_t *entry, - const odp_pktin_queue_param_t *param); -int single_output_queues_config(pktio_entry_t *entry, - const odp_pktout_queue_param_t *param); -int single_recv_queue(pktio_entry_t *entry, int index, odp_packet_t packets[], - int num); -int single_send_queue(pktio_entry_t *entry, int index, - const odp_packet_t packets[], int num); - -int pktin_poll_one(int pktio_index, - int rx_queue, - odp_event_t evt_tbl[]); -int pktin_poll(int pktio_index, int num_queue, int index[]); -void pktio_stop_finalize(int pktio_index); - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/platform/linux-generic/include/odp_packet_io_internal.h b/platform/linux-generic/include/odp_packet_io_internal.h index a2e1fdd9..7df11618 100644 --- a/platform/linux-generic/include/odp_packet_io_internal.h +++ b/platform/linux-generic/include/odp_packet_io_internal.h @@ -25,7 +25,6 @@ extern "C" { #include <odp_classification_datamodel.h> #include <odp_align_internal.h> #include <odp_debug_internal.h> -#include <odp_packet_io_ring_internal.h> #include <odp_queue_if.h> #include <odp_config_internal.h> diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c index beeb9c6b..d5f8d5de 100644 --- a/platform/linux-generic/odp_packet_io.c +++ b/platform/linux-generic/odp_packet_io.c @@ -186,6 +186,7 @@ static odp_pktio_t setup_pktio_entry(const char *name, odp_pool_t pool, pktio_entry->s.pool = pool; memcpy(&pktio_entry->s.param, param, sizeof(odp_pktio_param_t)); pktio_entry->s.handle = hdl; + pktio_entry->s.stats_type = STATS_UNSUPPORTED; odp_pktio_config_init(&pktio_entry->s.config); commit 3fc5b2aa0d85c5fb6800f06fcbf836ea1ac43337 Author: Bogdan Pricope <bogdan.pricope(a)linaro.org> Date: Mon Oct 30 15:59:34 2017 +0200 linux-gen: pktio: move SOCK_ERR_REPORT macro from odp_packet_io_internal.h Move SOCK_ERR_REPORT macro from linux-generic version of odp_packet_io_internal.h to a common header file. This is part of an attempt to cleanup linux-generic version of odp_packet_io_internal.h from macros used only in linux-generic platform before enabling it for linux-dpdk platform as well. Signed-off-by: Bogdan Pricope <bogdan.pricope(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Honnappa Nagarahalli <honnappa.Nagarahalli(a)arm.com> Reviewed-by: Krishna Garapati <balakrishna.garapati(a)linaro.org> Signed-off-by: Yi He <yi.he(a)linaro.org> diff --git a/platform/linux-generic/include/odp_packet_io_internal.h b/platform/linux-generic/include/odp_packet_io_internal.h index 1302a59b..a2e1fdd9 100644 --- a/platform/linux-generic/include/odp_packet_io_internal.h +++ b/platform/linux-generic/include/odp_packet_io_internal.h @@ -42,12 +42,6 @@ typedef union pktio_entry_u pktio_entry_t; #define PKTIN_INVALID ((odp_pktin_queue_t) {ODP_PKTIO_INVALID, 0}) #define PKTOUT_INVALID ((odp_pktout_queue_t) {ODP_PKTIO_INVALID, 0}) -/** Determine if a socket read/write error should be reported. Transient errors - * that simply require the caller to retry are ignored, the _send/_recv APIs - * are non-blocking and it is the caller's responsibility to retry if the - * requested number of packets were not handled. */ -#define SOCK_ERR_REPORT(e) (e != EAGAIN && e != EWOULDBLOCK && e != EINTR) - struct pktio_entry { const pktio_ops_module_t *ops; /**< Implementation specific methods */ uint8_t ops_data[ODP_PKTIO_ODPS_DATA_MAX_SIZE]; /**< IO operation diff --git a/platform/linux-generic/pktio/common.h b/platform/linux-generic/pktio/common.h index 025e1893..2ea68f64 100644 --- a/platform/linux-generic/pktio/common.h +++ b/platform/linux-generic/pktio/common.h @@ -7,6 +7,14 @@ #ifndef ODP_PKTIO_COMMON_H_ #define ODP_PKTIO_COMMON_H_ +#include <errno.h> + +/** Determine if a socket read/write error should be reported. Transient errors + * that simply require the caller to retry are ignored, the _send/_recv APIs + * are non-blocking and it is the caller's responsibility to retry if the + * requested number of packets were not handled. */ +#define SOCK_ERR_REPORT(e) (e != EAGAIN && e != EWOULDBLOCK && e != EINTR) + /** * Read the MTU from a packet socket */ commit d8b56f1fa9ad273cb251675a46e92635b38adc92 Author: Bogdan Pricope <bogdan.pricope(a)linaro.org> Date: Mon Oct 30 15:31:14 2017 +0200 linux-gen: pktio: move sysfs stats function prototype Move sysfs stats function prototype from linux-generic version of odp_packet_io_internal.h to a new header file. This is part of an attempt to remove from linux-generic version of odp_packet_io_internal.h all the references to symbols implemented only in linux-generic platform before enabling it for linux-dpdk platform as well. Signed-off-by: Bogdan Pricope <bogdan.pricope(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Honnappa Nagarahalli <honnappa.Nagarahalli(a)arm.com> Reviewed-by: Krishna Garapati <balakrishna.garapati(a)linaro.org> Signed-off-by: Yi He <yi.he(a)linaro.org> diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 27741814..db466dd2 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -177,6 +177,7 @@ noinst_HEADERS = \ ${srcdir}/include/odp_packet_io_ring_internal.h \ ${srcdir}/pktio/ethtool.h \ ${srcdir}/pktio/common.h \ + ${srcdir}/pktio/sysfs.h \ ${srcdir}/pktio/dpdk.h \ ${srcdir}/include/odp_pktio_ops_ipc.h \ ${srcdir}/include/odp_pktio_ops_loopback.h \ diff --git a/platform/linux-generic/include/odp_packet_io_internal.h b/platform/linux-generic/include/odp_packet_io_internal.h index e078cc82..1302a59b 100644 --- a/platform/linux-generic/include/odp_packet_io_internal.h +++ b/platform/linux-generic/include/odp_packet_io_internal.h @@ -147,9 +147,6 @@ static inline void pktio_cls_enabled_set(pktio_entry_t *entry, int ena) entry->s.cls_enabled = ena; } -int sysfs_stats(pktio_entry_t *pktio_entry, - odp_pktio_stats_t *stats); - int pktin_poll_one(int pktio_index, int rx_queue, odp_event_t evt_tbl[]); diff --git a/platform/linux-generic/pktio/common.c b/platform/linux-generic/pktio/common.c index 050d2d95..900dcbba 100644 --- a/platform/linux-generic/pktio/common.c +++ b/platform/linux-generic/pktio/common.c @@ -11,6 +11,7 @@ #include <odp_classification_internal.h> #include <pktio/ethtool.h> #include <pktio/common.h> +#include <pktio/sysfs.h> #include <errno.h> #include <sys/ioctl.h> #include <sys/types.h> diff --git a/platform/linux-generic/pktio/socket.c b/platform/linux-generic/pktio/socket.c index 7481f4f7..d9f85b29 100644 --- a/platform/linux-generic/pktio/socket.c +++ b/platform/linux-generic/pktio/socket.c @@ -47,6 +47,7 @@ #include <odp/api/hints.h> #include <odp_pktio_ops_socket.h> #include <pktio/common.h> +#include <pktio/sysfs.h> #include <pktio/ethtool.h> #include <protocols/eth.h> diff --git a/platform/linux-generic/pktio/socket_mmap.c b/platform/linux-generic/pktio/socket_mmap.c index 67d2b920..9b35d89f 100644 --- a/platform/linux-generic/pktio/socket_mmap.c +++ b/platform/linux-generic/pktio/socket_mmap.c @@ -36,6 +36,7 @@ #include <odp/api/hints.h> #include <odp_pktio_ops_socket.h> #include <pktio/common.h> +#include <pktio/sysfs.h> #include <pktio/ethtool.h> #include <protocols/eth.h> diff --git a/platform/linux-generic/pktio/sysfs.c b/platform/linux-generic/pktio/sysfs.c index c3d4faea..f674ac42 100644 --- a/platform/linux-generic/pktio/sysfs.c +++ b/platform/linux-generic/pktio/sysfs.c @@ -8,6 +8,7 @@ #include <odp_api.h> #include <odp_packet_io_internal.h> +#include <pktio/sysfs.h> #include <errno.h> #include <string.h> #include <inttypes.h> diff --git a/platform/linux-generic/pktio/sysfs.h b/platform/linux-generic/pktio/sysfs.h new file mode 100644 index 00000000..f8fe3072 --- /dev/null +++ b/platform/linux-generic/pktio/sysfs.h @@ -0,0 +1,23 @@ +/* Copyright (c) 2016, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#ifndef ODP_PKTIO_SYSFS_H_ +#define ODP_PKTIO_SYSFS_H_ + +/** + * Get statistics for a pktio entry + * + * @param pktio_entry Packet IO entry + * @param stats[out] Output buffer for counters + * + * @retval 0 on success + * @retval != 0 on failure + */ + +int sysfs_stats(pktio_entry_t *pktio_entry, + odp_pktio_stats_t *stats); + +#endif /* ODP_PKTIO_SYSFS_H_ */ commit e971a0f4b8135812d268415d279ef3f618f4ee41 Author: Bogdan Pricope <bogdan.pricope(a)linaro.org> Date: Mon Oct 30 14:39:46 2017 +0200 linux-gen: pktio: move socket stats function prototypes Move socket stats function prototypes from linux-generic version of odp_packet_io_internal.h. This is part of an attempt to remove from this header file all the references to symbols implemented only in linux-generic platform before enabling it for linux-dpdk platform as well. Signed-off-by: Bogdan Pricope <bogdan.pricope(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Honnappa Nagarahalli <honnappa.Nagarahalli(a)arm.com> Reviewed-by: Krishna Garapati <balakrishna.garapati(a)linaro.org> Signed-off-by: Yi He <yi.he(a)linaro.org> diff --git a/platform/linux-generic/include/odp_packet_io_internal.h b/platform/linux-generic/include/odp_packet_io_internal.h index b26a35d2..e078cc82 100644 --- a/platform/linux-generic/include/odp_packet_io_internal.h +++ b/platform/linux-generic/include/odp_packet_io_internal.h @@ -149,10 +149,6 @@ static inline void pktio_cls_enabled_set(pktio_entry_t *entry, int ena) int sysfs_stats(pktio_entry_t *pktio_entry, odp_pktio_stats_t *stats); -int sock_stats_fd(pktio_entry_t *pktio_entry, - odp_pktio_stats_t *stats, - int fd); -int sock_stats_reset_fd(pktio_entry_t *pktio_entry, int fd); int pktin_poll_one(int pktio_index, int rx_queue, diff --git a/platform/linux-generic/pktio/common.c b/platform/linux-generic/pktio/common.c index 4c952e46..050d2d95 100644 --- a/platform/linux-generic/pktio/common.c +++ b/platform/linux-generic/pktio/common.c @@ -21,6 +21,11 @@ #include <linux/if_packet.h> #include <linux/if_ether.h> +/* + * ODP_PACKET_SOCKET_MMSG: + * ODP_PACKET_SOCKET_MMAP: + * ODP_PACKET_NETMAP: + */ int sock_stats_reset_fd(pktio_entry_t *pktio_entry, int fd) { int err = 0; @@ -51,6 +56,11 @@ int sock_stats_reset_fd(pktio_entry_t *pktio_entry, int fd) return err; } +/* + * ODP_PACKET_SOCKET_MMSG: + * ODP_PACKET_SOCKET_MMAP: + * ODP_PACKET_NETMAP: + */ int sock_stats_fd(pktio_entry_t *pktio_entry, odp_pktio_stats_t *stats, int fd) diff --git a/platform/linux-generic/pktio/common.h b/platform/linux-generic/pktio/common.h index 2940af14..025e1893 100644 --- a/platform/linux-generic/pktio/common.h +++ b/platform/linux-generic/pktio/common.h @@ -78,4 +78,29 @@ int rss_conf_set_fd(int fd, const char *name, */ void rss_conf_print(const odp_pktin_hash_proto_t *hash_proto); +/** + * Get statistics for pktio entry + * + * @param pktio_entry Packet IO entry + * @param stats[out] Output buffer for counters + * @param fd Socket file descriptor + * + * @retval 0 on success + * @retval != 0 on failure + */ +int sock_stats_fd(pktio_entry_t *pktio_entry, + odp_pktio_stats_t *stats, + int fd); + +/** + * Reset statistics for pktio entry + * + * @param pktio_entry Packet IO entry + * @param fd Socket file descriptor + * + * @retval 0 on success + * @retval != 0 on failure + */ +int sock_stats_reset_fd(pktio_entry_t *pktio_entry, int fd); + #endif /*ODP_PKTIO_COMMON_H_*/ ----------------------------------------------------------------------- Summary of changes: platform/linux-dpdk/Makefile.am | 2 +- .../linux-dpdk/include/odp_packet_io_internal.h | 157 --------------------- platform/linux-generic/Makefile.am | 1 + .../linux-generic/include/odp_packet_io_internal.h | 14 -- platform/linux-generic/odp_packet_io.c | 1 + platform/linux-generic/pktio/common.c | 11 ++ platform/linux-generic/pktio/common.h | 33 +++++ platform/linux-generic/pktio/socket.c | 1 + platform/linux-generic/pktio/socket_mmap.c | 1 + platform/linux-generic/pktio/sysfs.c | 1 + platform/linux-generic/pktio/sysfs.h | 23 +++ 11 files changed, 73 insertions(+), 172 deletions(-) delete mode 100644 platform/linux-dpdk/include/odp_packet_io_internal.h create mode 100644 platform/linux-generic/pktio/sysfs.h hooks/post-receive --

8 years, 10 months

[COMMIT] branch master updated. v1.15.0.0-300-g5e840b83

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 5e840b83992bba2f64750bb3a4599478d6ea9260 (commit) from 387b402c4f2fc0694b6e0fe68ee4be8a2bd42442 (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 5e840b83992bba2f64750bb3a4599478d6ea9260 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Wed Nov 1 17:50:17 2017 +0300 drv: doc, linux-gen, include: drop incomplete drv interface Driver interface at master branch is incomplete. Drop it for now. API-next will receive update DDF framework separately. 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/doc/Makefile.am b/doc/Makefile.am index c6124f46..708a294e 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,8 +1,7 @@ SUBDIRS = \ application-api-guide \ helper-guide \ - platform-api-guide \ - driver-api-guide + platform-api-guide if user_guide SUBDIRS += implementers-guide users-guide process-guide diff --git a/doc/application-api-guide/Doxyfile b/doc/application-api-guide/Doxyfile index 9cb183c1..a2168a92 100644 --- a/doc/application-api-guide/Doxyfile +++ b/doc/application-api-guide/Doxyfile @@ -5,7 +5,6 @@ PROJECT_NUMBER = $(VERSION) PROJECT_LOGO = $(SRCDIR)/doc/images/ODP-Logo-HQ.svg INPUT = $(SRCDIR)/doc/application-api-guide \ $(SRCDIR)/include -EXCLUDE_PATTERNS = drv* odp_drv.h EXAMPLE_PATH = $(SRCDIR)/example $(SRCDIR) PREDEFINED = __GNUC__ \ "ODP_HANDLE_T(type)=odp_handle_t type" diff --git a/doc/driver-api-guide/.gitignore b/doc/driver-api-guide/.gitignore deleted file mode 100644 index 53752db2..00000000 --- a/doc/driver-api-guide/.gitignore +++ /dev/null @@ -1 +0,0 @@ -output diff --git a/doc/driver-api-guide/Doxyfile b/doc/driver-api-guide/Doxyfile deleted file mode 100644 index 680d1d42..00000000 --- a/doc/driver-api-guide/Doxyfile +++ /dev/null @@ -1,14 +0,0 @@ -@INCLUDE = $(SRCDIR)/doc/Doxyfile_common - -PROJECT_NAME = "Driver Interface (drv) Reference Manual" -PROJECT_NUMBER = $(VERSION) -PROJECT_LOGO = $(SRCDIR)/doc/images/ODP-Logo-HQ.svg -INPUT = $(SRCDIR)/doc/driver-api-guide \ - $(SRCDIR)/include/odp/drv \ - $(SRCDIR)/include/odp_drv.h -EXCLUDE_PATTERNS = drv* odp_drv.h -EXAMPLE_PATH = $(SRCDIR)/example $(SRCDIR) -PREDEFINED = __GNUC__ \ - "ODP_HANDLE_T(type)=odp_handle_t type" \ - odpdrv_bool_t=int -WARNINGS = NO diff --git a/doc/driver-api-guide/Makefile.am b/doc/driver-api-guide/Makefile.am deleted file mode 100644 index 4fc4755d..00000000 --- a/doc/driver-api-guide/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -EXTRA_DIST = \ - odp.dox - -clean-local: - rm -rf output diff --git a/doc/driver-api-guide/odp.dox b/doc/driver-api-guide/odp.dox deleted file mode 100644 index 687a79e0..00000000 --- a/doc/driver-api-guide/odp.dox +++ /dev/null @@ -1,20 +0,0 @@ -/* Copyright (c) 2016, Linaro Limited - * All rights reserved - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -/** - * @mainpage - * - * @section sec_1 Introduction - * - * OpenDataPlane (ODP) provides a driver interface - - * - * @section contact Contact Details - * - The main web site is http://www.opendataplane.org/ - * - The git repo is https://git.linaro.org/lng/odp.git - * - Bug tracking is https://bugs.linaro.org/buglist.cgi?product=OpenDataPlane - * - */ diff --git a/doc/implementers-guide/implementers-guide.adoc b/doc/implementers-guide/implementers-guide.adoc index 0e2edc0c..794beb00 100644 --- a/doc/implementers-guide/implementers-guide.adoc +++ b/doc/implementers-guide/implementers-guide.adoc @@ -75,57 +75,35 @@ with discussion of how these are done in *odp-linux*. [[include_structure]] == The Include Structure -The implementers view of the include source tree allows the common interface +The implementers view of the include source tree allows the common API definitions and documentation to be reused by all the platforms defined in the tree, but leave the actual definitions to be defined by the specific platform. -The different ODP interfaces (api and drv) are defined and implemented using -similar structures: .Implementers include structure (in repository) ---- ./ ├── include/ │ ├── odp/ -│ │ ├── api/ -│ │ │ └── spec/ -│ │ │ └── The Public API specification and its documentation. <1> -│ │ │ -│ │ └── drv/ +│ │ └── api/ │ │ └── spec/ -│ │ └── The Public Nic driver interface and its documentation. <5> -│ │ +│ │ └── The Public API specification and its documentation. <1> │ │ │ ├── odp_api.h This file should be the only file included by the any ODP │ │ application. <4> │ │ -│ └── odp_drv.h This file should be the only file included by the any ODP -│ nic driver. <8> -│ └── platform/ └── <implementation name>/ └── include/ ├── Internal header files seen only by the implementation. └── odp/ - ├── api/ <2> - │ ├── In-line function definitions of the public API for this - │ │ platform seen by the application. - │ │ - │ └── plat/ <3> - │ └── Platform specific types, enums etc as seen by the - │ application but require overriding by the - │ implementation. - │ - ├── drv/ <6> - │ ├── In-line function definitions of the nic driver interface - │ │ for this platform seen by the application. - │ │ - │ └── plat/ <7> - │ └── Platform specific types, enums etc as seen by the - │ nic driver but require overriding by the - │ implementation. - │ - └── com/ - └── Things common to both interfaces are placed here. + └── api/ <2> + ├── In-line function definitions of the public API for this + │ platform seen by the application. + │ + └── plat/ <3> + └── Platform specific types, enums etc as seen by the + application but require overriding by the + implementation. ---- <1> The specification, defining the ODP application programming interface (API) @@ -140,20 +118,6 @@ to allow the platform to provide definitions that match the underlying hardware. <4> Applications in turn include the include/odp_api.h file which includes the 'platform/<implementation name>/include/odp/api' files to provide a complete definition of the API. -<5> The specification, defining the driver programming interface (drv) -is held in 'include/odp/drv/spec/'. The interface is defined by a set of '.h' -files including doxygen documentation. -<6> Each public specification file is included by a counterpart in -'platform/<implementation name>/include/odp/drv'. -The include of the specification is AFTER the platform specific definitions -to allow the platform to provide definitions that match the underlying hardware. -<7> The implementation code may include files from -'platform/<implementation name>/include/odp/drv/plat' -<8> Nic drivers in turn include the include/odp_drv.h file which includes the -'platform/<implementation name>/include/odp/drv' files to provide a complete -definition of the ODP driver interface. - - After ODP installation (make install), the structure becomes as follows: @@ -162,16 +126,10 @@ After ODP installation (make install), the structure becomes as follows: ./ └── include/ ├── odp/ - │ ├── api/ API In-line for this platform. - │ │ ├── plat/ API Platform specific types. - │ │ └── spec/ The public API specification. - │ │ - │ └── drv/ Driver interface In-line for this platform. - │ ├── plat/ Driver interface Platform specific types. - │ └── spec/ The public Driver interface specification. - │ - ├── odp_api.h - └── odp_drv.h + │ └── api/ API In-line for this platform. + │ ├── plat/ API Platform specific types. + │ └── spec/ The public API specification. + └── odp_api.h ---- == ODP library naming recommendations diff --git a/doc/m4/configure.m4 b/doc/m4/configure.m4 index 6e02f761..ed9451df 100644 --- a/doc/m4/configure.m4 +++ b/doc/m4/configure.m4 @@ -42,5 +42,4 @@ AC_CONFIG_FILES([doc/application-api-guide/Makefile doc/Makefile doc/platform-api-guide/Makefile doc/process-guide/Makefile - doc/users-guide/Makefile - doc/driver-api-guide/Makefile]) + doc/users-guide/Makefile]) diff --git a/include/odp/drv/spec/README b/include/odp/drv/spec/README deleted file mode 100644 index cd017bf9..00000000 --- a/include/odp/drv/spec/README +++ /dev/null @@ -1,4 +0,0 @@ -This directory should contain files (including doxygen documentation) defining -the ODP Nic driver interface. -The NIC driver interface is the south interface of ODP, which is used by -PCI nic drivers. diff --git a/include/odp/drv/spec/compiler.h b/include/odp/drv/spec/compiler.h deleted file mode 100644 index 3198d21e..00000000 --- a/include/odp/drv/spec/compiler.h +++ /dev/null @@ -1,51 +0,0 @@ -/* Copyright (c) 2016, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -/** - * @file - * - * Compiler related for ODP driver interface - */ - -#ifndef ODPDRV_COMPILER_H_ -#define ODPDRV_COMPILER_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -/** @addtogroup odpdrv_compiler_optim ODPDRV COMPILER / OPTIMIZATION - * Macro for old compilers - * @{ - */ - -/** @internal GNU compiler version */ -#define GCC_VERSION (__GNUC__ * 10000 \ - + __GNUC_MINOR__ * 100 \ - + __GNUC_PATCHLEVEL__) - -/** - * @internal - * Compiler __builtin_bswap16() is not available on all platforms - * until GCC 4.8.0 - work around this by offering __odpdrv_builtin_bswap16() - * Don't use this function directly, instead see odpdrv byteorder.h - */ -#if GCC_VERSION < 40800 -#define __odpdrv_builtin_bswap16(u16) \ - ((((u16)&0x00ff) << 8) | (((u16)&0xff00) >> 8)) -#else -#define __odpdrv_builtin_bswap16(u16) __builtin_bswap16(u16) -#endif - -/** - * @} - */ - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/include/odp/drv/spec/std_types.h b/include/odp/drv/spec/std_types.h deleted file mode 100644 index 904a385b..00000000 --- a/include/odp/drv/spec/std_types.h +++ /dev/null @@ -1,40 +0,0 @@ -/* Copyright (c) 2016, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -/** - * @file - * - * Standard C language types and definitions for ODP driver interface. - * - */ - -#ifndef ODPDRV_STD_TYPES_H_ -#define ODPDRV_STD_TYPES_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -/** @addtogroup odpdrv_system ODPDRV SYSTEM - * @{ - */ - -/** - * @typedef odpdrv_bool_t - * Use odpdrv boolean type to have it well-defined and known size, - * regardless which compiler is used as this facilities interoperability - * between e.g. different compilers. - */ - -/** - * @} - */ - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/include/odp_drv.h b/include/odp_drv.h deleted file mode 100644 index a6d3a443..00000000 --- a/include/odp_drv.h +++ /dev/null @@ -1,27 +0,0 @@ -/* Copyright (c) 2016, Linaro Limited - * All rights reserved - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -/** - * @file - * - * The OpenDataPlane nic driver programming interface - * - */ - -#ifndef ODP_DRV_H_ -#define ODP_DRV_H_ - -#ifdef __cplusplus -extern C { -#endif - -#include <odp/drv/compiler.h> -#include <odp/drv/std_types.h> - -#ifdef __cplusplus -} -#endif -#endif diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 0b29e613..cb13126e 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -107,10 +107,6 @@ odpapiplatinclude_HEADERS = \ nodist_odpapiplatinclude_HEADERS = \ include/odp/api/plat/static_inline.h -odpdrvincludedir = $(includedir)/odp/drv -odpdrvinclude_HEADERS = \ - include/odp/drv/compiler.h - noinst_HEADERS = \ include/_fdserver_internal.h \ include/_ishm_internal.h \ diff --git a/platform/linux-generic/include/odp/drv/README b/platform/linux-generic/include/odp/drv/README deleted file mode 100644 index fd38e8e5..00000000 --- a/platform/linux-generic/include/odp/drv/README +++ /dev/null @@ -1,2 +0,0 @@ -This directory contains the files defining the ODP driver interface, -for linux-generic. diff --git a/platform/linux-generic/include/odp/drv/compiler.h b/platform/linux-generic/include/odp/drv/compiler.h deleted file mode 100644 index 24e84c55..00000000 --- a/platform/linux-generic/include/odp/drv/compiler.h +++ /dev/null @@ -1,34 +0,0 @@ -/* Copyright (c) 2016, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -/** - * @file - * - * Compiler related - */ - -#ifndef ODPDRV_PLAT_COMPILER_H_ -#define ODPDRV_PLAT_COMPILER_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -/** @addtogroup odpdrv_compiler_optim ODPDRV COMPILER / OPTIMIZATION - * @{ - */ - -/** - * @} - */ - -#include <odp/drv/spec/compiler.h> - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/platform/linux-generic/include/odp/drv/std_types.h b/platform/linux-generic/include/odp/drv/std_types.h deleted file mode 100644 index 4fe4affd..00000000 --- a/platform/linux-generic/include/odp/drv/std_types.h +++ /dev/null @@ -1,42 +0,0 @@ -/* Copyright (c) 2016, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -/** - * @file - * - * Standard C language types and definitions for ODP driver interface. - */ - -#ifndef ODPDRV_PLAT_STD_TYPES_H_ -#define ODPDRV_PLAT_STD_TYPES_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -#include <stddef.h> -#include <stdbool.h> -#include <stdint.h> -#include <inttypes.h> -#include <limits.h> - -/** @addtogroup odpdrv_system ODPDRV SYSTEM - * @{ - */ - -typedef int odpdrv_bool_t; - -/** - * @} - */ - -#include <odp/drv/spec/std_types.h> - -#ifdef __cplusplus -} -#endif - -#endif ----------------------------------------------------------------------- Summary of changes: doc/Makefile.am | 3 +- doc/application-api-guide/Doxyfile | 1 - doc/driver-api-guide/.gitignore | 1 - doc/driver-api-guide/Doxyfile | 14 ----- doc/driver-api-guide/Makefile.am | 5 -- doc/driver-api-guide/odp.dox | 20 ------ doc/implementers-guide/implementers-guide.adoc | 72 +++++----------------- doc/m4/configure.m4 | 3 +- include/odp/drv/spec/README | 4 -- include/odp/drv/spec/compiler.h | 51 --------------- include/odp/drv/spec/std_types.h | 40 ------------ include/odp_drv.h | 27 -------- platform/linux-generic/Makefile.am | 4 -- platform/linux-generic/include/odp/drv/README | 2 - platform/linux-generic/include/odp/drv/compiler.h | 34 ---------- platform/linux-generic/include/odp/drv/std_types.h | 42 ------------- 16 files changed, 17 insertions(+), 306 deletions(-) delete mode 100644 doc/driver-api-guide/.gitignore delete mode 100644 doc/driver-api-guide/Doxyfile delete mode 100644 doc/driver-api-guide/Makefile.am delete mode 100644 doc/driver-api-guide/odp.dox delete mode 100644 include/odp/drv/spec/README delete mode 100644 include/odp/drv/spec/compiler.h delete mode 100644 include/odp/drv/spec/std_types.h delete mode 100644 include/odp_drv.h delete mode 100644 platform/linux-generic/include/odp/drv/README delete mode 100644 platform/linux-generic/include/odp/drv/compiler.h delete mode 100644 platform/linux-generic/include/odp/drv/std_types.h hooks/post-receive --

8 years, 10 months

[COMMIT] branch 2.0 updated. v1.15.0.0-818-gca1be967

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, 2.0 has been updated via ca1be967bd4f6aec7dc99b72de643718cb8a32b8 (commit) from 1236f1ad2bba56b5e49ff62df247e52143b48985 (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 ca1be967bd4f6aec7dc99b72de643718cb8a32b8 Author: Joyce Kong <joyce.kong(a)arm.com> Date: Wed Oct 18 17:45:27 2017 +0800 remove uarea_size from packet meta data Signed-off-by: Joyce Kong <joyce.kong(a)arm.com> Reviewed-by: Honnappa Nagarahalli <honnappa.Nagarahalli(a)arm.com> Reviewed-by: Ola Liljedahl <ola.Liljedahl(a)arm.com> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Yi He <yi.he(a)linaro.org> diff --git a/platform/linux-dpdk/include/odp/api/plat/packet_inlines.h b/platform/linux-dpdk/include/odp/api/plat/packet_inlines.h index 93102974..a8d8b1d5 100644 --- a/platform/linux-dpdk/include/odp/api/plat/packet_inlines.h +++ b/platform/linux-dpdk/include/odp/api/plat/packet_inlines.h @@ -102,13 +102,6 @@ static inline void *_odp_packet_user_area(odp_packet_t pkt) return (void *)((char *)pkt + _odp_packet_inline.udata); } -/** @internal Inline function @param pkt @return */ -static inline uint32_t _odp_packet_user_area_size(odp_packet_t pkt) -{ - return *(uint32_t *)(void *)((char *)pkt + - _odp_packet_inline.udata_len); -} - /** @internal Inline function @param pkt @return */ static inline uint32_t _odp_packet_flow_hash(odp_packet_t pkt) { diff --git a/platform/linux-dpdk/include/odp/api/plat/packet_inlines_api.h b/platform/linux-dpdk/include/odp/api/plat/packet_inlines_api.h index 16a445a1..c964ce6d 100644 --- a/platform/linux-dpdk/include/odp/api/plat/packet_inlines_api.h +++ b/platform/linux-dpdk/include/odp/api/plat/packet_inlines_api.h @@ -63,11 +63,6 @@ _ODP_INLINE void *odp_packet_user_area(odp_packet_t pkt) return _odp_packet_user_area(pkt); } -_ODP_INLINE uint32_t odp_packet_user_area_size(odp_packet_t pkt) -{ - return _odp_packet_user_area_size(pkt); -} - _ODP_INLINE uint32_t odp_packet_flow_hash(odp_packet_t pkt) { return _odp_packet_flow_hash(pkt); diff --git a/platform/linux-dpdk/include/odp_packet_internal.h b/platform/linux-dpdk/include/odp_packet_internal.h index fc1f9e5f..66159cae 100644 --- a/platform/linux-dpdk/include/odp_packet_internal.h +++ b/platform/linux-dpdk/include/odp_packet_internal.h @@ -119,9 +119,6 @@ typedef struct { * Members below are not initialized by packet_init() */ - /* User metadata size, it's right after odp_packet_hdr_t */ - uint32_t uarea_size; - /* Timestamp value */ odp_time_t timestamp; diff --git a/platform/linux-dpdk/odp_packet.c b/platform/linux-dpdk/odp_packet.c index 523c2229..103f6f7a 100644 --- a/platform/linux-dpdk/odp_packet.c +++ b/platform/linux-dpdk/odp_packet.c @@ -44,7 +44,6 @@ const _odp_packet_inline_offset_t _odp_packet_inline ODP_ALIGNED_CACHE = { (size_t)&rte_pktmbuf_data_len((struct rte_mbuf *)0), .nb_segs = offsetof(odp_packet_hdr_t, buf_hdr.mb) + offsetof(struct rte_mbuf, nb_segs), - .udata_len = offsetof(odp_packet_hdr_t, uarea_size), .udata = sizeof(odp_packet_hdr_t), .rss = offsetof(odp_packet_hdr_t, buf_hdr.mb) + offsetof(struct rte_mbuf, hash.rss), @@ -540,6 +539,12 @@ void *odp_packet_offset(odp_packet_t pkt, uint32_t offset, uint32_t *len, * ******************************************************** * */ +uint32_t odp_packet_user_area_size(odp_packet_t pkt) +{ + pool_entry_cp_t *pool_cp = odp_pool_to_entry_cp(odp_packet_pool(pkt)); + + return pool_cp->params.pkt.uarea_size; +} int odp_packet_input_index(odp_packet_t pkt) { diff --git a/platform/linux-dpdk/pool/dpdk.c b/platform/linux-dpdk/pool/dpdk.c index 3f085620..90d2d7c6 100644 --- a/platform/linux-dpdk/pool/dpdk.c +++ b/platform/linux-dpdk/pool/dpdk.c @@ -219,14 +219,10 @@ odp_dpdk_mbuf_ctor(struct rte_mempool *mp, /* keep some headroom between start of buffer and data */ if (mb_ctor_arg->type == ODP_POOL_PACKET) { - odp_packet_hdr_t *pkt_hdr; - mb->data_off = RTE_PKTMBUF_HEADROOM; mb->nb_segs = 1; mb->port = 0xff; mb->vlan_tci = 0; - pkt_hdr = (odp_packet_hdr_t *)raw_mbuf; - pkt_hdr->uarea_size = mb_ctor_arg->pkt_uarea_size; } else { mb->data_off = 0; } diff --git a/platform/linux-generic/include/odp/api/plat/packet_inlines.h b/platform/linux-generic/include/odp/api/plat/packet_inlines.h index 1804fa6f..06bcf855 100644 --- a/platform/linux-generic/include/odp/api/plat/packet_inlines.h +++ b/platform/linux-generic/include/odp/api/plat/packet_inlines.h @@ -95,12 +95,6 @@ static inline void *_odp_packet_user_area(odp_packet_t pkt) return _odp_pkt_get(pkt, void *, user_area); } -/** @internal Inline function @param pkt @return */ -static inline uint32_t _odp_packet_user_area_size(odp_packet_t pkt) -{ - return _odp_pkt_get(pkt, uint32_t, user_area_size); -} - /** @internal Inline function @param pkt @return */ static inline uint32_t _odp_packet_flow_hash(odp_packet_t pkt) { diff --git a/platform/linux-generic/include/odp/api/plat/packet_inlines_api.h b/platform/linux-generic/include/odp/api/plat/packet_inlines_api.h index 233bc876..7eaaa85e 100644 --- a/platform/linux-generic/include/odp/api/plat/packet_inlines_api.h +++ b/platform/linux-generic/include/odp/api/plat/packet_inlines_api.h @@ -63,11 +63,6 @@ _ODP_INLINE void *odp_packet_user_area(odp_packet_t pkt) return _odp_packet_user_area(pkt); } -_ODP_INLINE uint32_t odp_packet_user_area_size(odp_packet_t pkt) -{ - return _odp_packet_user_area_size(pkt); -} - _ODP_INLINE uint32_t odp_packet_flow_hash(odp_packet_t pkt) { return _odp_packet_flow_hash(pkt); diff --git a/platform/linux-generic/include/odp/api/plat/packet_types.h b/platform/linux-generic/include/odp/api/plat/packet_types.h index 68c66312..009a3aa7 100644 --- a/platform/linux-generic/include/odp/api/plat/packet_types.h +++ b/platform/linux-generic/include/odp/api/plat/packet_types.h @@ -94,8 +94,6 @@ typedef struct _odp_packet_inline_offset_t { /** @internal field offset */ uint16_t user_area; /** @internal field offset */ - uint16_t user_area_size; - /** @internal field offset */ uint16_t flow_hash; /** @internal field offset */ uint16_t timestamp; diff --git a/platform/linux-generic/include/odp_buffer_internal.h b/platform/linux-generic/include/odp_buffer_internal.h index 358c0e44..e9b3e886 100644 --- a/platform/linux-generic/include/odp_buffer_internal.h +++ b/platform/linux-generic/include/odp_buffer_internal.h @@ -104,9 +104,6 @@ struct odp_buffer_hdr_t { /* User area pointer */ void *uarea_addr; - /* User area size */ - uint32_t uarea_size; - /* Max data size */ uint32_t size; diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index 68a834a1..3011183d 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -40,7 +40,6 @@ const _odp_packet_inline_offset_t _odp_packet_inline ODP_ALIGNED_CACHE = { .segcount = offsetof(odp_packet_hdr_t, buf_hdr.segcount), .user_ptr = offsetof(odp_packet_hdr_t, buf_hdr.buf_ctx), .user_area = offsetof(odp_packet_hdr_t, buf_hdr.uarea_addr), - .user_area_size = offsetof(odp_packet_hdr_t, buf_hdr.uarea_size), .flow_hash = offsetof(odp_packet_hdr_t, flow_hash), .timestamp = offsetof(odp_packet_hdr_t, timestamp), .input_flags = offsetof(odp_packet_hdr_t, p.input_flags) @@ -268,7 +267,6 @@ static inline void packet_seg_copy_md(odp_packet_hdr_t *dst, /* buffer header side packet metadata */ dst->buf_hdr.buf_u64 = src->buf_hdr.buf_u64; dst->buf_hdr.uarea_addr = src->buf_hdr.uarea_addr; - dst->buf_hdr.uarea_size = src->buf_hdr.uarea_size; /* segmentation data is not copied: * buf_hdr.seg[] @@ -1168,6 +1166,12 @@ void *odp_packet_offset(odp_packet_t pkt, uint32_t offset, uint32_t *len, * ******************************************************** * */ +uint32_t odp_packet_user_area_size(odp_packet_t pkt) +{ + pool_t *pool = pool_entry_from_hdl(odp_packet_pool(pkt)); + + return pool->params.pkt.uarea_size; +} int odp_packet_input_index(odp_packet_t pkt) { @@ -1744,6 +1748,8 @@ int _odp_packet_copy_md_to_packet(odp_packet_t srcpkt, odp_packet_t dstpkt) { odp_packet_hdr_t *srchdr = packet_hdr(srcpkt); odp_packet_hdr_t *dsthdr = packet_hdr(dstpkt); + uint32_t src_size = odp_packet_user_area_size(srcpkt); + uint32_t dst_size = odp_packet_user_area_size(dstpkt); dsthdr->input = srchdr->input; dsthdr->dst_queue = srchdr->dst_queue; @@ -1752,10 +1758,7 @@ int _odp_packet_copy_md_to_packet(odp_packet_t srcpkt, odp_packet_t dstpkt) srchdr->buf_hdr.uarea_addr != NULL) memcpy(dsthdr->buf_hdr.uarea_addr, srchdr->buf_hdr.uarea_addr, - dsthdr->buf_hdr.uarea_size <= - srchdr->buf_hdr.uarea_size ? - dsthdr->buf_hdr.uarea_size : - srchdr->buf_hdr.uarea_size); + dst_size <= src_size ? dst_size : src_size); copy_packet_parser_metadata(srchdr, dsthdr); @@ -1763,7 +1766,7 @@ int _odp_packet_copy_md_to_packet(odp_packet_t srcpkt, odp_packet_t dstpkt) * user area was truncated in the process. Note this can only * happen when copying between different pools. */ - return dsthdr->buf_hdr.uarea_size < srchdr->buf_hdr.uarea_size; + return dst_size < src_size; } /** diff --git a/platform/linux-generic/pool/generic.c b/platform/linux-generic/pool/generic.c index 520d8a6f..37628b13 100644 --- a/platform/linux-generic/pool/generic.c +++ b/platform/linux-generic/pool/generic.c @@ -237,7 +237,6 @@ static void init_buffers(pool_t *pool) buf_hdr->pool_ptr = pool; buf_hdr->uarea_addr = uarea; /* Show user requested size through API */ - buf_hdr->uarea_size = pool->params.pkt.uarea_size; buf_hdr->segcount = 1; buf_hdr->num_seg = 1; buf_hdr->next_seg = NULL; ----------------------------------------------------------------------- Summary of changes: .../linux-dpdk/include/odp/api/plat/packet_inlines.h | 7 ------- .../include/odp/api/plat/packet_inlines_api.h | 5 ----- platform/linux-dpdk/include/odp_packet_internal.h | 3 --- platform/linux-dpdk/odp_packet.c | 7 ++++++- platform/linux-dpdk/pool/dpdk.c | 4 ---- .../linux-generic/include/odp/api/plat/packet_inlines.h | 6 ------ .../include/odp/api/plat/packet_inlines_api.h | 5 ----- .../linux-generic/include/odp/api/plat/packet_types.h | 2 -- platform/linux-generic/include/odp_buffer_internal.h | 3 --- platform/linux-generic/odp_packet.c | 17 ++++++++++------- platform/linux-generic/pool/generic.c | 1 - 11 files changed, 16 insertions(+), 44 deletions(-) hooks/post-receive --

8 years, 10 months

[COMMIT] branch api-next updated. v1.15.0.0-845-gd22c949c

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 d22c949cc466bf28de559855a1cb525740578137 (commit) from 637353bbd96770741cbb58711c78c9dc01e4ea34 (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 d22c949cc466bf28de559855a1cb525740578137 Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Fri Oct 27 15:56:32 2017 +0300 api: packet: change argument to insert for l3 and l4 chsums function name already has l3 and l4 layer, argument insert is more clean here. Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> diff --git a/include/odp/api/spec/packet.h b/include/odp/api/spec/packet.h index 3fc46064..fac7790b 100644 --- a/include/odp/api/spec/packet.h +++ b/include/odp/api/spec/packet.h @@ -1414,10 +1414,10 @@ odp_packet_chksum_status_t odp_packet_l4_chksum_status(odp_packet_t pkt); * the relevant pktout chksum bit set in the pktio capability. * * @param pkt Packet handle - * @param l3 0: do not insert L3 checksum + * @param insert 0: do not insert L3 checksum * 1: insert L3 checksum */ -void odp_packet_l3_chksum_insert(odp_packet_t pkt, int l3); +void odp_packet_l3_chksum_insert(odp_packet_t pkt, int insert); /** * Layer 4 checksum insertion override @@ -1431,10 +1431,10 @@ void odp_packet_l3_chksum_insert(odp_packet_t pkt, int l3); * the relevant pktout chksum bit set in the pktio capability. * * @param pkt Packet handle - * @param l4 0: do not insert L4 checksum + * @param insert 0: do not insert L4 checksum * 1: insert L4 checksum */ -void odp_packet_l4_chksum_insert(odp_packet_t pkt, int l4); +void odp_packet_l4_chksum_insert(odp_packet_t pkt, int insert); /** * Packet flow hash value ----------------------------------------------------------------------- Summary of changes: include/odp/api/spec/packet.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) hooks/post-receive --

8 years, 10 months

[COMMIT] branch master updated. v1.15.0.0-299-g387b402c

by git＠git-us.linaro.org

8 years, 10 months

[COMMIT] branch api-next updated. v1.15.0.0-844-g637353bb

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 637353bbd96770741cbb58711c78c9dc01e4ea34 (commit) via 387b402c4f2fc0694b6e0fe68ee4be8a2bd42442 (commit) via ebdf6e27af66a58fff6a17a1c6c2cd6ae85909f1 (commit) via 3edee38da55876e36f654a5d1a4b87c2ea5b8bfe (commit) via 8d22e0e2013596403ae6a35457cdf30b0a0c559b (commit) from cc97d3ae6d6d4c07ec77e7b33e2529154fb0ed24 (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 637353bbd96770741cbb58711c78c9dc01e4ea34 Merge: ebdf6e27 387b402c Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Mon Oct 30 22:27:20 2017 +0300 Merge branch 'master' into api-next commit ebdf6e27af66a58fff6a17a1c6c2cd6ae85909f1 Author: Matias Elo <matias.elo(a)nokia.com> Date: Wed Oct 25 14:59:00 2017 +0300 validation: shmem: compare info page size to all supported huge page sizes Compare odp_shm_info_t.page_size to all supported page sizes on the system. This enables passing the test when shmem is not allocated using the system's default huge page size. 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/test/validation/api/shmem/shmem.c b/test/validation/api/shmem/shmem.c index d5335afa..d1abc62b 100644 --- a/test/validation/api/shmem/shmem.c +++ b/test/validation/api/shmem/shmem.c @@ -80,6 +80,7 @@ static int run_test_basic_thread(void *arg ODP_UNUSED) odp_shm_t shm; shared_test_data_t *shared_test_data; int thr; + int pagesz_match = 0; thr = odp_thread_id(); printf("Thread %i starts\n", thr); @@ -98,8 +99,27 @@ static int run_test_basic_thread(void *arg ODP_UNUSED) CU_ASSERT(0 == info.flags); CU_ASSERT(shared_test_data == info.addr); CU_ASSERT(sizeof(shared_test_data_t) <= info.size); - CU_ASSERT((info.page_size == odp_sys_huge_page_size()) || - (info.page_size == odp_sys_page_size())) + + if (info.page_size == odp_sys_page_size()) { + pagesz_match = 1; + } else { + int num = odp_sys_huge_page_size_all(NULL, 0); + + if (num > 0) { + uint64_t pagesz_tbs[num]; + int i; + + num = odp_sys_huge_page_size_all(pagesz_tbs, num); + for (i = 0; i < num; i++) { + if (info.page_size == pagesz_tbs[i]) { + pagesz_match = 1; + break; + } + } + } + } + CU_ASSERT(pagesz_match == 1); + odp_shm_print_all(); fflush(stdout); ----------------------------------------------------------------------- Summary of changes: .travis.yml | 1 - doc/users-guide/users-guide.adoc | 18 ++++++++++++++++++ platform/linux-generic/odp_packet.c | 35 +++++++++++++++++++++++++++++++++++ scripts/ci-checkpatches.sh | 22 ++++++++++++++-------- test/validation/api/shmem/shmem.c | 24 ++++++++++++++++++++++-- 5 files changed, 89 insertions(+), 11 deletions(-) hooks/post-receive --

8 years, 10 months

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

git-lng-odp