git-lng-odp August 2016

git-lng-odp@lists.linaro.org

1 participants
36 discussions

[COMMIT] branch api-next updated. v1.10.1.0-129-gb999565

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 b9995659aabf9a20cae2ae6905b84c94b733636c (commit) via ca927a72b1f9ea2a583e8a628790d62eb93d430f (commit) via c70e9679f2827bcf9fe520ce2d1d39ca25d42c73 (commit) via abb1be33068b60290a252ce10a494338e80848e3 (commit) via b007f9d72b085005ba7b19355885c7f0096899e2 (commit) via b6a5e7039cc23e4547b11b78a12ba7f9efe6ae93 (commit) via 4c759ad5c0a4d1ece38b5cd93c24faddee9d5292 (commit) via 014a7fab6a34aacb061e53cc0b14d12aa119b03a (commit) via 48272fd98f3882a708a7302cd4e28308d59f96e9 (commit) via e63a6cc10819fccbc55ec55d4585e0619463320b (commit) from 65ea1213c75e323c4ff8ee2de48ce6dd84b1f7f2 (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 b9995659aabf9a20cae2ae6905b84c94b733636c Merge: 65ea121 ca927a7 Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Wed Aug 3 18:11:56 2016 +0300 Merge branch 'master' into api-next ----------------------------------------------------------------------- Summary of changes: example/ipsec/odp_ipsec_stream.h | 4 --- example/traffic_mgmt/odp_traffic_mgmt.c | 4 --- helper/chksum.c | 51 +++++++++++++++------------ include/odp/api/spec/crypto.h | 12 ++++--- platform/linux-generic/pktio/ipc.c | 37 +++++++++---------- test/linux-generic/pktio_ipc/ipc_common.c | 15 +++++--- test/linux-generic/pktio_ipc/ipc_common.h | 5 +-- test/linux-generic/pktio_ipc/pktio_ipc1.c | 45 ++++++++++++++--------- test/linux-generic/pktio_ipc/pktio_ipc2.c | 33 ++++++++++++----- test/linux-generic/pktio_ipc/pktio_ipc_run.sh | 1 + 10 files changed, 124 insertions(+), 83 deletions(-) hooks/post-receive --

7 years, 9 months

[COMMIT] branch next updated. v1.10.1.0-77-gca927a7

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 ca927a72b1f9ea2a583e8a628790d62eb93d430f (commit) via c70e9679f2827bcf9fe520ce2d1d39ca25d42c73 (commit) via abb1be33068b60290a252ce10a494338e80848e3 (commit) via b007f9d72b085005ba7b19355885c7f0096899e2 (commit) via b6a5e7039cc23e4547b11b78a12ba7f9efe6ae93 (commit) via 4c759ad5c0a4d1ece38b5cd93c24faddee9d5292 (commit) from 014a7fab6a34aacb061e53cc0b14d12aa119b03a (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: example/ipsec/odp_ipsec_stream.h | 4 --- example/traffic_mgmt/odp_traffic_mgmt.c | 4 --- helper/chksum.c | 51 +++++++++++++++------------ include/odp/api/spec/crypto.h | 12 ++++--- platform/linux-generic/pktio/ipc.c | 37 +++++++++---------- test/linux-generic/pktio_ipc/ipc_common.c | 15 +++++--- test/linux-generic/pktio_ipc/ipc_common.h | 5 +-- test/linux-generic/pktio_ipc/pktio_ipc1.c | 45 ++++++++++++++--------- test/linux-generic/pktio_ipc/pktio_ipc2.c | 33 ++++++++++++----- test/linux-generic/pktio_ipc/pktio_ipc_run.sh | 1 + 10 files changed, 124 insertions(+), 83 deletions(-) hooks/post-receive --

7 years, 9 months

[COMMIT] branch monarch_lts updated. v1.10.1.0-63-g9c8ab91

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, monarch_lts has been updated via 9c8ab9126181e5457f5711075b97ca9ec9a20fc8 (commit) from 9ad380fa0a113b90e26518b7d659213f05264841 (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 9c8ab9126181e5457f5711075b97ca9ec9a20fc8 Author: Bill Fischofer <bill.fischofer(a)linaro.org> Date: Tue Aug 2 14:19:54 2016 -0500 changelog: update for v1.11.0.0-monarch_lts Signed-off-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Mike Holmes <mike.holmes(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/CHANGELOG b/CHANGELOG index d8230cd..1d652a8 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,125 @@ +== OpenDataPlane (1.11.0.0) +ODP v1.11.0 is the base tag and branch for the Monarch LTS (Long Term Support) +release of ODP. + +=== New Features +==== APIs +As part of the final Monarch LTS API set, a minor change to the +`odp_tm_egress_t` struct was made to better reflect the capabilities of +SoC platforms targeting Monarch support. This change adds the boolean +`egress_fcn_supported` that indicates whether TM systems support an egress +function. In addition, each TM system is now associated with a PktIO rather +than a PktOUT queue. This struct is input to the `odp_tm_create()` API and +output from the `odp_tm_find()` API. + +==== Strict Priority (SP) Scheduler +Building on the modular scheduler framework introduced in v1.10.1.0, An +alternate Strict Priority (SP) scheduler is now available. The SP scheduler +is selected when ODP is configured with the `--enable_schedule_sp` option. + +The SP scheduler is designed to favor low-latency processing of high priority +work at the expense of throughput. This is considered experimental code at +this point and should be treated as such by those wishing to use it. + +=== Bug Fixes +==== Scheduler PktIO Cleanup +The scheduler now properly cleans up PktIOs operating in SCHEDULE mode following +`odp_pktio_close()` calls. This resolves +https://bugs.linaro.org/show_bug.cgi?id=2301[Bug 2301]. + +==== Chksum Routine C++ conformance +The odph_chksum() helper routine is now C++ conformant. This resolves +https://bugs.linaro.org/show_bug.cgi?id=2302[Bug 2302]. + +==== User Area Copying +The `odp_packet_copy()` API now copies the packet user area as part of its +processing and the packet validation test has been enhanced to verify that this +is done properly. This resolves +https://bugs.linaro.org/show_bug.cgi?id=2310[Bug 2310]. + +==== Use of Pool 0 as a Timeout Pool +The internal definition of `ODP_TIMEOUT_INVALID` was changed in `odp-linux` to +enable the use of Pool 0 as a timeout pool. This resolves +https://bugs.linaro.org/show_bug.cgi?id=2316[Bug 2316]. + +=== Packaging +==== libodphelper +To facilitate API tracking, `libodphelper.so` has been split out from +`libodp.so`. + +==== Helper dependencies +To avoid circular dependencies that cause issues when packaging ODP as a +shared library, the `odp-linux` implementation no longer makes and use of +the ODP helper library. + +=== Performance +Performance enhancements in the `odp-linux` reference implementation have been +made in PktIO routines and the packet classifier. + +=== General Cleanup +General cleanup throughout has resulted in adding proper termination calls to +ODP examples as well as miscellaneous Doxygen corrections. Additionally, the +`odp-linux` code base has been cleaned up by removing "To Dos" as well as +extraneous `#includes` for extra C headers and dependencies on linux headers +for improved portability. + +=== Validation +==== Queue Capability Test +The Queue validation test now properly exercises the `odp_queue_capability()` +API and attempts to create the maximum reported number of supported queues. + +==== Platform Tests +The platform-specific tests have been moved from `platform/linux-generic/test` +to `test/platform/linux-generc` so that all tests are now found under a +single `test` directory. + +=== Examples +The ODP `examples` directory has been cleaned up and numerous corrections to +existing examples have been made to add proper termination paths, etc. In +addition, a new "hello world" example (`odp_hello.c`) has been added that +illustrates the basic startup and shutdown steps needed for all ODP +applications. As a simple stand-alone application is is also a good initial +build tests for new ODP implementations. + +=== Documentation +==== Pure API Guide +The Doxygen API guide has been split so that both a "pure" version that is +platform-independent and retains unresolved ODP abstract types as well as +an implementation-specific version (for `odp-linux`) that shows +platform-specific `typedef` and `enum` values. + +==== Implementation Guide Improvements +The _ODP Implementer's Guide_ has been enhanced with a section on +implementation considerations, including issues surrounding the definition of +Application Binary Interfaces (ABIs). + +=== Known Issues +==== https://bugs.linaro.org/show_bug.cgi?id=2309[Bug 2309] +The timer validation tests have seen occasional failures when run on systems +containing a larger number of CPUs (typically 24 or more). + +==== https://bugs.linaro.org/show_bug.cgi?id=2386[Bug 2386] +ODP cannot be compiled using the -m32 option to generate 32-bit code on a +64-bit platform when using GCC 4.9 (the default GCC found in Ubuntu 15.04). +This is due to a known bug in GCC 4.9 and is closed as a permanent restriction. + +==== https://bugs.linaro.org/show_bug.cgi?id=2402[Bug 2402] +Doxygen generates a warning for `ODP_BIG_ENDIAN_BITFIELD` when compiling on +little endian systems. A similar warning for `ODP_LITTLE_ENDIAN_BITFIELD` is +issued when compiling on big endian systems. + +==== https://bugs.linaro.org/show_bug.cgi?id=2444[Bug 2444] +The traffic manager cannot be used with two PktIOs simultaneously. That is, +`odp-linux` does not properly support applications that create more than one +TM system. This is a bug in the `odp-linux` implementation that will be +corrected. It is not a limit of the architecture or other ODP implementations. + +==== https://bugs.linaro.org/show_bug.cgi?id=2449[Bug 2449] +Packet queue pool causes out-of-bounds accesses. This is closely related +to https://bugs.linaro.org/show_bug.cgi?id=2444[Bug 2444] and reflects that +`odp-linux` does not properly support multiple TM systems. This is scheduled +for correction in the first maintenance update for this ODP implementation. + == OpenDataPlane (1.10.1.0) === New Features ----------------------------------------------------------------------- Summary of changes: CHANGELOG | 122 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 122 insertions(+) hooks/post-receive --

7 years, 9 months

[COMMIT] branch master updated. v1.10.1.0-77-gca927a7

by git＠git-us.linaro.org

7 years, 9 months

[COMMIT] branch master updated. v1.10.1.0-76-gc70e967

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 c70e9679f2827bcf9fe520ce2d1d39ca25d42c73 (commit) from abb1be33068b60290a252ce10a494338e80848e3 (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 c70e9679f2827bcf9fe520ce2d1d39ca25d42c73 Author: Khalil Blaiech <kblaiech(a)mellanox.com> Date: Thu Jul 14 18:01:46 2016 -0400 helper: fixing helper prefix in chksum.c Add odph_ prefix to udp_or_tcp_hdr_t and rename structure odph_l4_hdr_t. Signed-off-by: Khalil Blaiech <kblaiech(a)mellanox.com> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/helper/chksum.c b/helper/chksum.c index 8f18881..b7eef67 100644 --- a/helper/chksum.c +++ b/helper/chksum.c @@ -19,6 +19,11 @@ typedef union { uint8_t bytes[4]; } swap_buf_t; +typedef union { + odph_udphdr_t udp_hdr; + odph_tcphdr_t tcp_hdr; +} odph_l4_hdr_t; + static uint8_t ZEROS[2] = { 0, 0 }; /* Note that for data_seg_sum byte_len MUST be >= 1. This function Returns the @@ -85,17 +90,18 @@ static uint32_t data_seg_sum(uint8_t *data8_ptr, return sum; } -static inline int odph_process_l4_hdr(odp_packet_t odp_pkt, - odph_chksum_op_t op, - uint16_t *chksum_ptr, - uint32_t *l4_len_ptr, - odp_bool_t *split_l4_hdr_ptr, - odp_bool_t *is_tcp_ptr, - uint32_t *pkt_chksum_offset_ptr, - uint16_t **pkt_chksum_ptr_ptr) +static inline int odph_process_l4_hdr(odp_packet_t odp_pkt, + odph_chksum_op_t op, + odph_l4_hdr_t *udp_tcp_hdr, + uint16_t *chksum_ptr, + uint32_t *l4_len_ptr, + odp_bool_t *split_l4_hdr_ptr, + odp_bool_t *is_tcp_ptr, + uint32_t *pkt_chksum_offset_ptr, + uint16_t **pkt_chksum_ptr_ptr) { - odph_udphdr_t *udp_hdr_ptr, udp_hdr; - odph_tcphdr_t *tcp_hdr_ptr, tcp_hdr; + odph_udphdr_t *udp_hdr_ptr; + odph_tcphdr_t *tcp_hdr_ptr; odp_bool_t split_l4_hdr, is_tcp; uint32_t l4_offset, l4_len, hdr_len, pkt_chksum_offset; uint16_t *pkt_chksum_ptr; @@ -113,9 +119,9 @@ static inline int odph_process_l4_hdr(odp_packet_t odp_pkt, udp_hdr_ptr = (odph_udphdr_t *)l4_ptr; split_l4_hdr = hdr_len < ODPH_UDPHDR_LEN; if (split_l4_hdr) { + udp_hdr_ptr = &udp_tcp_hdr->udp_hdr; odp_packet_copy_to_mem(odp_pkt, l4_offset, - ODPH_UDPHDR_LEN, &udp_hdr); - udp_hdr_ptr = &udp_hdr; + ODPH_UDPHDR_LEN, udp_hdr_ptr); } /* According to the spec's the l4_len to be used for UDP pkts @@ -128,9 +134,9 @@ static inline int odph_process_l4_hdr(odp_packet_t odp_pkt, tcp_hdr_ptr = (odph_tcphdr_t *)l4_ptr; split_l4_hdr = hdr_len < ODPH_TCPHDR_LEN; if (split_l4_hdr) { + tcp_hdr_ptr = &udp_tcp_hdr->tcp_hdr; odp_packet_copy_to_mem(odp_pkt, l4_offset, - ODPH_TCPHDR_LEN, &tcp_hdr); - tcp_hdr_ptr = &tcp_hdr; + ODPH_TCPHDR_LEN, tcp_hdr_ptr); } pkt_chksum_ptr = &tcp_hdr_ptr->cksm; @@ -259,16 +265,17 @@ int odph_udp_tcp_chksum(odp_packet_t odp_pkt, odph_chksum_op_t op, uint16_t *chksum_ptr) { - odp_bool_t split_l4_hdr, is_tcp, is_last; - odp_bool_t has_odd_byte_in; - uint32_t l4_len, sum, ones_compl_sum, remaining_seg_len, data_len; - uint32_t pkt_chksum_offset, offset; - uint16_t *pkt_chksum_ptr, chksum; - uint8_t *data_ptr, odd_byte_in_out; - int rc, ret_code; + odph_l4_hdr_t udp_tcp_hdr; + odp_bool_t split_l4_hdr, is_tcp, is_last; + odp_bool_t has_odd_byte_in; + uint32_t l4_len, sum, ones_compl_sum, remaining_seg_len; + uint32_t data_len, pkt_chksum_offset, offset; + uint16_t *pkt_chksum_ptr, chksum; + uint8_t *data_ptr, odd_byte_in_out; + int rc, ret_code; /* First parse and process the l4 header */ - rc = odph_process_l4_hdr(odp_pkt, op, chksum_ptr, &l4_len, + rc = odph_process_l4_hdr(odp_pkt, op, &udp_tcp_hdr, chksum_ptr, &l4_len, &split_l4_hdr, &is_tcp, &pkt_chksum_offset, &pkt_chksum_ptr); if (rc != 0) ----------------------------------------------------------------------- Summary of changes: helper/chksum.c | 51 +++++++++++++++++++++++++++++---------------------- 1 file changed, 29 insertions(+), 22 deletions(-) hooks/post-receive --

7 years, 9 months

[COMMIT] branch monarch_lts updated. v1.10.1.0-62-g9ad380f

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, monarch_lts has been updated via 9ad380fa0a113b90e26518b7d659213f05264841 (commit) via b3b97530679ed0fe6f975986270a3fa7d4c59a72 (commit) via 99117760f8bed0d8351c35a2c037e288d5a9280a (commit) via a560c609e78716421e782aa388805937d177ef0e (commit) via 524987a32f9873e59ce265ffba6e831e756a2441 (commit) via ab966018496e7ebb0d1532d6c5c119b9db7d56fa (commit) from 197710ffc229f3db775a97c27e09c2dc063497c4 (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 9ad380fa0a113b90e26518b7d659213f05264841 Author: Nikhil Agarwal <nikhil.agarwal(a)linaro.org> Date: Fri Jul 29 20:08:58 2016 +0530 api:crypto: resolve todo items odp_session_proc_info_t is no longer required. Clarified hash_result_offset and its relation with ICV value. Signed-off-by: Nikhil Agarwal <nikhil.agarwal(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/include/odp/api/spec/crypto.h b/include/odp/api/spec/crypto.h index d8123e9..dea1fe9 100644 --- a/include/odp/api/spec/crypto.h +++ b/include/odp/api/spec/crypto.h @@ -170,8 +170,6 @@ typedef struct odp_crypto_data_range { /** * Crypto API session creation parameters - * - * @todo Add "odp_session_proc_info_t" */ typedef struct odp_crypto_session_params { odp_crypto_op_t op; /**< Encode versus decode */ @@ -210,8 +208,6 @@ typedef struct odp_crypto_session_params { /** * Crypto API per packet operation parameters - * - * @todo Clarify who zero's ICV and how this relates to "hash_result_offset" */ typedef struct odp_crypto_op_params { odp_crypto_session_t session; /**< Session handle from creation */ @@ -245,6 +241,14 @@ typedef struct odp_crypto_op_params { * indicates the caller wishes the destination packet buffer be allocated * from the output pool specified during session creation. * + * @var odp_crypto_op_params_t::hash_result_offset + * + * Specifies the offset where the hash result is to be stored. In case of + * decode sessions, input hash values will be read from this offset, and + * overwritten with hash results. If this offset lies within specified + * auth_range, implementation will mute this field before calculating the hash + * result. + * * @sa odp_crypto_session_params_t::output_pool. */ commit b3b97530679ed0fe6f975986270a3fa7d4c59a72 Author: Nikhil Agarwal <nikhil.agarwal(a)linaro.org> Date: Fri Jul 29 20:08:57 2016 +0530 example:ipsec: removed invalid todos. This todo item is no longer valid. Fixed as a part of following work card. https://cards.linaro.org/browse/LNG-857 Signed-off-by: Nikhil Agarwal <nikhil.agarwal(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/example/ipsec/odp_ipsec_stream.h b/example/ipsec/odp_ipsec_stream.h index ea480c3..6f6f7df 100644 --- a/example/ipsec/odp_ipsec_stream.h +++ b/example/ipsec/odp_ipsec_stream.h @@ -93,10 +93,6 @@ odp_packet_t create_ipv4_packet(stream_db_entry_t *stream, /** * Verify an IPv4 packet received on a loop output queue * - * @todo Better error checking, add counters, add tracing, - * remove magic numbers, add order verification - * (see https://bugs.linaro.org/show_bug.cgi?id=620) - * * @param stream Stream to verify the packet against * @param pkt Packet to verify * commit 99117760f8bed0d8351c35a2c037e288d5a9280a Author: Barry Spinney <spinney(a)mellanox.com> Date: Wed Jul 13 11:59:40 2016 -0500 api: tm: resolve todo This todo just asks a question which is no longer important. Signed-off-by: Barry Spinney <spinney(a)mellanox.com> Signed-off-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/include/odp/api/spec/traffic_mngr.h b/include/odp/api/spec/traffic_mngr.h index c9e6f8f..3473648 100644 --- a/include/odp/api/spec/traffic_mngr.h +++ b/include/odp/api/spec/traffic_mngr.h @@ -93,7 +93,6 @@ extern "C" { * @def ODP_TM_MAX_TM_NODE_FANIN * The largest number of fan-in "inputs" that can be simultaneously connected * to a single tm_node. - * @todo Does this need to be as large as ODP_TM_MAX_TM_QUEUES? */ /** @@ -886,7 +885,7 @@ typedef struct { /** In the case that sched_modes for a given strict priority level * indicates the use of weighted scheduling, this field supplies the * weighting factors. The weights - when defined - are used such that - * the (adjusted) frame lengths are divided by these 8-bit weights + * the (adjusted) frame lengths are divided by these 8-bit weights * (i.e. they are divisors and not multipliers). Consequently a * weight of 0 (when sched_mode is ODP_TM_BYTE_BASED_WEIGHTS) is * illegal. */ commit a560c609e78716421e782aa388805937d177ef0e Author: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Date: Tue Jun 28 17:35:54 2016 +0530 api: traffic_mngr: Add pktio interface to odp_tm_egress_t struct Replaces pktio interface as input to TM system instead of odp_pktout_queue_t.This creates an 1 to 1 mapping between a TM system and pktio interface. Signed-off-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/include/odp/api/spec/traffic_mngr.h b/include/odp/api/spec/traffic_mngr.h index 83b89e7..c9e6f8f 100644 --- a/include/odp/api/spec/traffic_mngr.h +++ b/include/odp/api/spec/traffic_mngr.h @@ -270,6 +270,12 @@ typedef struct { * have their fan_in only from tm_queues. */ uint8_t max_levels; + /** egress_fcn_supported indicates whether the tm system supports + * egress function. It is an optional feature used to receive the + * packet from the tm system and its performance might be limited. + */ + odp_bool_t egress_fcn_supported; + /** tm_queue_shaper_supported indicates that the tm_queues support * proper TM shaping. Note that TM Shaping is NOT the same thing as * Ingress Metering/Policing as specified by RFC 2697 (A Single Rate @@ -467,7 +473,7 @@ typedef struct { odp_tm_egress_kind_t egress_kind; /**< Union discriminator */ union { - odp_pktout_queue_t pktout; + odp_pktio_t pktio; odp_tm_egress_fcn_t egress_fcn; }; } odp_tm_egress_t; diff --git a/platform/linux-generic/include/odp_traffic_mngr_internal.h b/platform/linux-generic/include/odp_traffic_mngr_internal.h index 15451ac..e4bc5ce 100644 --- a/platform/linux-generic/include/odp_traffic_mngr_internal.h +++ b/platform/linux-generic/include/odp_traffic_mngr_internal.h @@ -380,7 +380,7 @@ typedef struct { tm_queue_info_t priority_info[ODP_TM_MAX_PRIORITIES]; tm_random_data_t tm_random_data; - + odp_pktout_queue_t pktout; uint64_t current_time; uint8_t tm_idx; uint8_t first_enq; diff --git a/platform/linux-generic/odp_traffic_mngr.c b/platform/linux-generic/odp_traffic_mngr.c index 7a8b647..e668bf9 100644 --- a/platform/linux-generic/odp_traffic_mngr.c +++ b/platform/linux-generic/odp_traffic_mngr.c @@ -2108,7 +2108,7 @@ static void tm_send_pkt(tm_system_t *tm_system, uint32_t max_sends) tm_system->egress_pkt_desc = EMPTY_PKT_DESC; if (tm_system->egress.egress_kind == ODP_TM_EGRESS_PKT_IO) - odp_pktout_send(tm_system->egress.pktout, &odp_pkt, 1); + odp_pktout_send(tm_system->pktout, &odp_pkt, 1); else if (tm_system->egress.egress_kind == ODP_TM_EGRESS_FN) tm_system->egress.egress_fcn(odp_pkt); else @@ -2426,6 +2426,7 @@ int odp_tm_capabilities(odp_tm_capabilities_t capabilities[] ODP_UNUSED, cap_ptr->max_tm_queues = ODP_TM_MAX_TM_QUEUES; cap_ptr->max_levels = ODP_TM_MAX_LEVELS; cap_ptr->tm_queue_shaper_supported = true; + cap_ptr->egress_fcn_supported = true; cap_ptr->tm_queue_wred_supported = true; cap_ptr->tm_queue_dual_slope_supported = true; cap_ptr->vlan_marking_supported = true; @@ -2607,6 +2608,7 @@ odp_tm_t odp_tm_create(const char *name, tm_system_t *tm_system; odp_bool_t create_fail; odp_tm_t odp_tm; + odp_pktout_queue_t pktout; uint32_t malloc_len, max_num_queues, max_queued_pkts, max_timers; uint32_t max_tm_queues, max_sorted_lists; int rc; @@ -2627,6 +2629,10 @@ odp_tm_t odp_tm_create(const char *name, return ODP_TM_INVALID; } + if (odp_pktout_queue(egress->pktio, &pktout, 1) != 1) + return ODP_TM_INVALID; + + tm_system->pktout = pktout; tm_system->name_tbl_id = name_tbl_id; max_tm_queues = requirements->max_tm_queues; memcpy(&tm_system->egress, egress, sizeof(odp_tm_egress_t)); diff --git a/test/validation/traffic_mngr/traffic_mngr.c b/test/validation/traffic_mngr/traffic_mngr.c index 1c4e90b..b857800 100644 --- a/test/validation/traffic_mngr/traffic_mngr.c +++ b/test/validation/traffic_mngr/traffic_mngr.c @@ -323,7 +323,7 @@ static odp_pktio_t pktios[MAX_NUM_IFACES]; static odp_pktin_queue_t pktins[MAX_NUM_IFACES]; static odp_pktout_queue_t pktouts[MAX_NUM_IFACES]; static odp_pktin_queue_t rcv_pktin; -static odp_pktout_queue_t xmt_pktout; +static odp_pktio_t xmt_pktio; static odph_ethaddr_t src_mac; static odph_ethaddr_t dst_mac; @@ -543,7 +543,7 @@ static int open_pktios(void) } if (2 <= num_ifaces) { - xmt_pktout = pktouts[0]; + xmt_pktio = pktios[0]; rcv_pktin = pktins[1]; ret = odp_pktio_start(pktios[1]); if (ret != 0) { @@ -551,7 +551,7 @@ static int open_pktios(void) return -1; } } else { - xmt_pktout = pktouts[0]; + xmt_pktio = pktios[0]; rcv_pktin = pktins[0]; } @@ -1627,7 +1627,7 @@ static int create_tm_system(void) } egress.egress_kind = ODP_TM_EGRESS_PKT_IO; - egress.pktout = xmt_pktout; + egress.pktio = xmt_pktio; snprintf(tm_name, sizeof(tm_name), "TM_system_%u", num_odp_tm_systems); odp_tm = odp_tm_create(tm_name, &requirements, &egress); commit 524987a32f9873e59ce265ffba6e831e756a2441 Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Tue May 10 18:34:37 2016 +0300 api: system: specify default huge page size System can have different sizes for huge pages. Clarify that this api returns default system huge page size, which is usually 2Mb on x86 reachable with: grep Hugepagesize: /proc/meminfo Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/include/odp/api/spec/system_info.h b/include/odp/api/spec/system_info.h index 6957731..c5a5fd0 100644 --- a/include/odp/api/spec/system_info.h +++ b/include/odp/api/spec/system_info.h @@ -24,9 +24,9 @@ extern "C" { */ /** - * Huge page size in bytes + * Default system huge page size in bytes * - * @return Huge page size in bytes + * @return Default huge page size in bytes */ uint64_t odp_sys_huge_page_size(void); commit ab966018496e7ebb0d1532d6c5c119b9db7d56fa Author: Brian Brooks <brian.brooks(a)linaro.org> Date: Tue Jul 26 11:38:27 2016 -0500 linux-generic: internal cache line size Define the ODP API for cache line size to the cache line size defined in the internal architecture directories. Prefix internal cache line size identifier with '_odp'. Signed-off-by: Brian Brooks <brian.brooks(a)linaro.org> Reviewed-by: Christophe Milard <christophe.milard(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/arch/default/odp/api/cpu_arch.h b/platform/linux-generic/arch/default/odp/api/cpu_arch.h index 29f8889..22b1da2 100644 --- a/platform/linux-generic/arch/default/odp/api/cpu_arch.h +++ b/platform/linux-generic/arch/default/odp/api/cpu_arch.h @@ -11,15 +11,7 @@ extern "C" { #endif -/** @ingroup odp_compiler_optim - * @{ - */ - -#define ODP_CACHE_LINE_SIZE 64 - -/** - * @} - */ +#define _ODP_CACHE_LINE_SIZE 64 static inline void odp_cpu_pause(void) { diff --git a/platform/linux-generic/arch/mips64/odp/api/cpu_arch.h b/platform/linux-generic/arch/mips64/odp/api/cpu_arch.h index 7b5bfd2..3582b12 100644 --- a/platform/linux-generic/arch/mips64/odp/api/cpu_arch.h +++ b/platform/linux-generic/arch/mips64/odp/api/cpu_arch.h @@ -11,18 +11,12 @@ extern "C" { #endif -/** @ingroup odp_compiler_optim - * @{ - */ - #if defined __OCTEON__ -#define ODP_CACHE_LINE_SIZE 128 +#define _ODP_CACHE_LINE_SIZE 128 +#else +#error Please add support for your arch in cpu_arch.h #endif -/** - * @} - */ - static inline void odp_cpu_pause(void) { __asm__ __volatile__ ("nop"); diff --git a/platform/linux-generic/arch/powerpc/odp/api/cpu_arch.h b/platform/linux-generic/arch/powerpc/odp/api/cpu_arch.h index 29f8889..22b1da2 100644 --- a/platform/linux-generic/arch/powerpc/odp/api/cpu_arch.h +++ b/platform/linux-generic/arch/powerpc/odp/api/cpu_arch.h @@ -11,15 +11,7 @@ extern "C" { #endif -/** @ingroup odp_compiler_optim - * @{ - */ - -#define ODP_CACHE_LINE_SIZE 64 - -/** - * @} - */ +#define _ODP_CACHE_LINE_SIZE 64 static inline void odp_cpu_pause(void) { diff --git a/platform/linux-generic/arch/x86/odp/api/cpu_arch.h b/platform/linux-generic/arch/x86/odp/api/cpu_arch.h index 3a16fa6..44e6b30 100644 --- a/platform/linux-generic/arch/x86/odp/api/cpu_arch.h +++ b/platform/linux-generic/arch/x86/odp/api/cpu_arch.h @@ -11,15 +11,7 @@ extern "C" { #endif -/** @ingroup odp_compiler_optim - * @{ - */ - -#define ODP_CACHE_LINE_SIZE 64 - -/** - * @} - */ +#define _ODP_CACHE_LINE_SIZE 64 static inline void odp_cpu_pause(void) { diff --git a/platform/linux-generic/include/odp/api/align.h b/platform/linux-generic/include/odp/api/align.h index d8bc653..c238b80 100644 --- a/platform/linux-generic/include/odp/api/align.h +++ b/platform/linux-generic/include/odp/api/align.h @@ -17,6 +17,8 @@ extern "C" { #endif +#include <odp/api/cpu_arch.h> + /** @ingroup odp_compiler_optim * @{ */ @@ -31,16 +33,12 @@ extern "C" { #define ODP_FIELD_SIZEOF(type, member) sizeof(((type *)0)->member) -#if defined __arm__ || defined __aarch64__ - -#define ODP_CACHE_LINE_SIZE 64 - -#endif - #else #error Non-gcc compatible compiler #endif +#define ODP_CACHE_LINE_SIZE _ODP_CACHE_LINE_SIZE + #define ODP_PAGE_SIZE 4096 #define ODP_ALIGNED_CACHE ODP_ALIGNED(ODP_CACHE_LINE_SIZE) @@ -52,7 +50,6 @@ extern "C" { */ #include <odp/api/spec/align.h> -#include <odp/api/cpu_arch.h> #ifdef __cplusplus } ----------------------------------------------------------------------- Summary of changes: example/ipsec/odp_ipsec_stream.h | 4 ---- include/odp/api/spec/crypto.h | 12 ++++++++---- include/odp/api/spec/system_info.h | 4 ++-- include/odp/api/spec/traffic_mngr.h | 11 ++++++++--- platform/linux-generic/arch/default/odp/api/cpu_arch.h | 10 +--------- platform/linux-generic/arch/mips64/odp/api/cpu_arch.h | 12 +++--------- platform/linux-generic/arch/powerpc/odp/api/cpu_arch.h | 10 +--------- platform/linux-generic/arch/x86/odp/api/cpu_arch.h | 10 +--------- platform/linux-generic/include/odp/api/align.h | 11 ++++------- platform/linux-generic/include/odp_traffic_mngr_internal.h | 2 +- platform/linux-generic/odp_traffic_mngr.c | 8 +++++++- test/validation/traffic_mngr/traffic_mngr.c | 8 ++++---- 12 files changed, 40 insertions(+), 62 deletions(-) hooks/post-receive --

7 years, 9 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

git-lng-odp August 2016