git-lng-odp

git-lng-odp@lists.linaro.org

1203 discussions

[COMMIT] branch api-next updated. v1.16.0.0-754-gbea7fcae

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 bea7fcae31d525e7f1e991f301c807cf86095aef (commit) via 7a88e1e111d09b5b4bcdc211cbc4ab7f9c94ccfe (commit) via dcdd06fbaffce7be63fc5f43bbe7792e3e1234fb (commit) from a5f07dbf95f982b7c5898434e56164ff976c0a0f (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 bea7fcae31d525e7f1e991f301c807cf86095aef Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Wed Dec 27 13:45:18 2017 +0300 linux-gen: crypto: fix fallthrough error GCC-7 will output "may fall through" error if fallthrough comment is present, but before preprocessor directive. Move these comments after endif directives. 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/platform/linux-generic/odp_crypto.c b/platform/linux-generic/odp_crypto.c index 69e6d0da..2038aa46 100644 --- a/platform/linux-generic/odp_crypto.c +++ b/platform/linux-generic/odp_crypto.c @@ -962,8 +962,8 @@ odp_crypto_session_create(odp_crypto_session_param_t *param, case ODP_AUTH_ALG_MD5_96: /* Fixed digest tag length with deprecated algo */ session->p.auth_digest_len = 96 / 8; - /* Fallthrough */ #endif + /* Fallthrough */ case ODP_AUTH_ALG_MD5_HMAC: rc = process_auth_param(session, 16, EVP_md5()); break; @@ -974,8 +974,8 @@ odp_crypto_session_create(odp_crypto_session_param_t *param, case ODP_AUTH_ALG_SHA256_128: /* Fixed digest tag length with deprecated algo */ session->p.auth_digest_len = 128 / 8; - /* Fallthrough */ #endif + /* Fallthrough */ case ODP_AUTH_ALG_SHA256_HMAC: rc = process_auth_param(session, 32, EVP_sha256()); break; @@ -988,8 +988,8 @@ odp_crypto_session_create(odp_crypto_session_param_t *param, aes_gcm = 1; /* Fixed digest tag length with deprecated algo */ session->p.auth_digest_len = 16; - /* Fallthrough */ #endif + /* Fallthrough */ case ODP_AUTH_ALG_AES_GCM: /* AES-GCM requires to do both auth and * cipher at the same time */ commit 7a88e1e111d09b5b4bcdc211cbc4ab7f9c94ccfe Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Wed Dec 27 13:45:11 2017 +0300 validation: drop obsolete Makefile.inc This make include file was removed long ago but got resurrected in one of merges with master branch. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/Makefile.inc b/test/validation/Makefile.inc deleted file mode 100644 index 4f946b8a..00000000 --- a/test/validation/Makefile.inc +++ /dev/null @@ -1,10 +0,0 @@ -include $(top_srcdir)/test/Makefile.inc - -COMMON_DIR = $(top_builddir)/test/common - -AM_CFLAGS += -I$(top_srcdir)/test/common - -LIBCUNIT_COMMON = $(COMMON_DIR)/libcunit_common.la -LIBCPUMASK_COMMON = $(COMMON_DIR)/libcpumask_common.la -LIBTHRMASK_COMMON = $(COMMON_DIR)/libthrmask_common.la -LIBODP = $(LIB)/libodphelper.la $(LIB)/libodp-linux.la diff --git a/test/validation/api/Makefile.inc b/test/validation/api/Makefile.inc index 2a9ec255..4af01000 100644 --- a/test/validation/api/Makefile.inc +++ b/test/validation/api/Makefile.inc @@ -1,6 +1,13 @@ -include $(top_srcdir)/test/validation/Makefile.inc +include $(top_srcdir)/test/Makefile.inc +COMMON_DIR = $(top_builddir)/test/common + +AM_CFLAGS += -I$(top_srcdir)/test/common AM_LDFLAGS += $(DPDK_PMDS) AM_CFLAGS += $(CUNIT_CFLAGS) +LIBCUNIT_COMMON = $(COMMON_DIR)/libcunit_common.la +LIBCPUMASK_COMMON = $(COMMON_DIR)/libcpumask_common.la +LIBTHRMASK_COMMON = $(COMMON_DIR)/libthrmask_common.la +LIBODP = $(LIB)/libodphelper.la $(LIB)/libodp-linux.la commit dcdd06fbaffce7be63fc5f43bbe7792e3e1234fb Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Wed Dec 27 13:45:02 2017 +0300 doc: drop driver-api-guide remnants 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/driver-api-guide/Doxyfile b/doc/driver-api-guide/Doxyfile deleted file mode 100644 index 28794ef0..00000000 --- a/doc/driver-api-guide/Doxyfile +++ /dev/null @@ -1,9 +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)/platform/$(WITH_PLATFORM)/include/odp/drv \ - $(SRCDIR)/include/odp_drv.h ----------------------------------------------------------------------- Summary of changes: doc/driver-api-guide/Doxyfile | 9 --------- platform/linux-generic/odp_crypto.c | 6 +++--- test/validation/Makefile.inc | 10 ---------- test/validation/api/Makefile.inc | 9 ++++++++- 4 files changed, 11 insertions(+), 23 deletions(-) delete mode 100644 doc/driver-api-guide/Doxyfile delete mode 100644 test/validation/Makefile.inc hooks/post-receive --

7 years, 6 months

[COMMIT] branch master updated. v1.16.0.0-44-gdccf4d8f

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 dccf4d8fcba4f912d4844b6d4a30f045b1e12651 (commit) from cd289985b5247fe9f1d1f58753717bd5659bd7d0 (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 dccf4d8fcba4f912d4844b6d4a30f045b1e12651 Author: Ilias Apalodimas <ilias.apalodimas(a)linaro.org> Date: Sat Dec 23 13:49:01 2017 +0200 linux-gen: _ishm: proper alignment for current page size On systems compiled without hugetlb odp_init_global() failed. On systems with hugetlb alignment was superfluous. Fixes https://bugs.linaro.org/show_bug.cgi?id=3478 Signed-off-by: Ilias Apalodimas <ilias.apalodimas(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/platform/linux-generic/_ishm.c b/platform/linux-generic/_ishm.c index 82465bc5..bce4e402 100644 --- a/platform/linux-generic/_ishm.c +++ b/platform/linux-generic/_ishm.c @@ -864,8 +864,8 @@ int _odp_ishm_reserve(const char *name, uint64_t size, int fd, * the same address every where, otherwise alignment may be * be wrong for some process */ hp_align = align; - if (hp_align <= odp_sys_huge_page_size()) - hp_align = odp_sys_huge_page_size(); + if (hp_align <= page_hp_size) + hp_align = page_hp_size; else flags |= _ODP_ISHM_SINGLE_VA; @@ -1441,6 +1441,8 @@ int _odp_ishm_init_global(void) void *spce_addr; int i; uid_t uid; + char *hp_dir = odp_global_data.hugepage_info.default_huge_page_dir; + uint64_t align; odp_global_data.main_pid = getpid(); odp_global_data.shm_dir = getenv("ODP_SHM_DIR"); @@ -1466,13 +1468,13 @@ int _odp_ishm_init_global(void) return -1; } - if (!odp_global_data.hugepage_info.default_huge_page_dir) + if (!hp_dir) { ODP_DBG("NOTE: No support for huge pages\n"); - else { - ODP_DBG("Huge pages mount point is: %s\n", - odp_global_data.hugepage_info.default_huge_page_dir); - _odp_ishm_cleanup_files( - odp_global_data.hugepage_info.default_huge_page_dir); + align = odp_sys_page_size(); + } else { + ODP_DBG("Huge pages mount point is: %s\n", hp_dir); + _odp_ishm_cleanup_files(hp_dir); + align = odp_sys_huge_page_size(); } _odp_ishm_cleanup_files(odp_global_data.shm_dir); @@ -1504,8 +1506,7 @@ int _odp_ishm_init_global(void) *reserve the address space for _ODP_ISHM_SINGLE_VA reserved blocks, * only address space! */ - spce_addr = _odp_ishmphy_book_va(ODP_CONFIG_ISHM_VA_PREALLOC_SZ, - odp_sys_huge_page_size()); + spce_addr = _odp_ishmphy_book_va(ODP_CONFIG_ISHM_VA_PREALLOC_SZ, align); if (!spce_addr) { ODP_ERR("unable to reserve virtual space\n."); goto init_glob_err3; ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/_ishm.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) hooks/post-receive --

7 years, 6 months

[COMMIT] branch caterpillar updated. v1.15.0.0-949-gbbbe6c0e

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, caterpillar has been updated via bbbe6c0ef65c16f6d7d327712f177fbf6740e96f (commit) from 63fd88635cc10caaa02fdccd3f52c9494487bdd2 (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: platform/linux-dpdk/Makefile.am | 4 ++-- platform/linux-dpdk/buffer/dpdk.c | 1 - platform/linux-dpdk/include/odp_buffer_internal.h | 8 +++++--- platform/linux-dpdk/odp_packet.c | 2 -- 4 files changed, 7 insertions(+), 8 deletions(-) hooks/post-receive --

7 years, 6 months

[COMMIT] branch api-next updated. v1.16.0.0-751-ga5f07dbf

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 a5f07dbf95f982b7c5898434e56164ff976c0a0f (commit) via cd289985b5247fe9f1d1f58753717bd5659bd7d0 (commit) via 38fb73d6ed79d649fdec726ca4bacc93747daa9b (commit) via 5b915893c793ffb3d49152d480d084dba32a5a74 (commit) from 578ecf796dc0bf7bb230b3488d263dd455ed0a18 (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: .../include/odp/api/plat/packet_inlines.h | 80 ++++++++++++++++++++++ .../include/odp/api/plat/packet_inlines_api.h | 30 ++++++++ .../include/odp/api/plat/packet_types.h | 6 ++ platform/linux-generic/odp_packet.c | 66 +++++------------- platform/linux-generic/odp_traffic_mngr.c | 11 +-- test/Makefile.am | 2 +- 6 files changed, 141 insertions(+), 54 deletions(-) hooks/post-receive --

7 years, 6 months

[COMMIT] branch next updated. v1.16.0.0-751-ga5f07dbf

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 a5f07dbf95f982b7c5898434e56164ff976c0a0f (commit) via cd289985b5247fe9f1d1f58753717bd5659bd7d0 (commit) via 38fb73d6ed79d649fdec726ca4bacc93747daa9b (commit) via 5b915893c793ffb3d49152d480d084dba32a5a74 (commit) via 578ecf796dc0bf7bb230b3488d263dd455ed0a18 (commit) via f1449d2555fbfa3d72aeb79d3ad6d2f199e83731 (commit) via 5d6aea3f7186a4533ffb7a2bc4858a1d339ebbb4 (commit) via 260ca880b76151b66919cf0f3c149c2ba9ede24e (commit) from 6ca5f5cb57de9f71ace37118a9b0788b2abf529e (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: .travis.yml | 2 - .../include/odp/api/plat/packet_inlines.h | 80 ++++++++++++++++++++++ .../include/odp/api/plat/packet_inlines_api.h | 30 ++++++++ .../include/odp/api/plat/packet_types.h | 6 ++ platform/linux-generic/odp_packet.c | 66 +++++------------- platform/linux-generic/odp_traffic_mngr.c | 11 +-- test/Makefile.am | 2 +- test/common/odp_cunit_common.c | 14 ++++ test/common/odp_cunit_common.h | 2 - test/validation/api/packet/packet.c | 2 +- 10 files changed, 156 insertions(+), 59 deletions(-) hooks/post-receive --

7 years, 6 months

[COMMIT] branch master updated. v1.16.0.0-43-gcd289985

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 cd289985b5247fe9f1d1f58753717bd5659bd7d0 (commit) via 38fb73d6ed79d649fdec726ca4bacc93747daa9b (commit) from 5b915893c793ffb3d49152d480d084dba32a5a74 (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 cd289985b5247fe9f1d1f58753717bd5659bd7d0 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Thu Dec 21 17:13:12 2017 +0200 linux-gen: packet: inline layer pointers Inline L2/L3/L4 pointer functions. Packet map function is exported to backup the unlikely case when offset is not within the first segment. Always use the inlined version within the implementation itself. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> 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 aa9ba812..4314619a 100644 --- a/platform/linux-generic/include/odp/api/plat/packet_inlines.h +++ b/platform/linux-generic/include/odp/api/plat/packet_inlines.h @@ -18,6 +18,11 @@ #include <odp/api/packet_io.h> #include <odp/api/hints.h> +/** @internal Inline function @param pkt_ptr @param offset @param seg_len + * @param seg_idx @return */ +void *_odp_packet_map(void *pkt_ptr, uint32_t offset, uint32_t *seg_len, + int *seg_idx); + /** @internal Inline function offsets */ extern const _odp_packet_inline_offset_t _odp_packet_inline; @@ -126,6 +131,63 @@ static inline uint32_t _odp_packet_l4_offset(odp_packet_t pkt) return _odp_pkt_get(pkt, uint16_t, l4_offset); } +/** @internal Inline function @param pkt @param len @return */ +static inline void *_odp_packet_l2_ptr(odp_packet_t pkt, uint32_t *len) +{ + uint32_t offset = _odp_packet_l2_offset(pkt); + uint32_t seg_len = _odp_packet_seg_len(pkt); + uint8_t *data = (uint8_t *)_odp_packet_data(pkt); + + if (odp_unlikely(offset >= seg_len)) { + void *pkt_hdr = (void *)pkt; + + return _odp_packet_map(pkt_hdr, offset, len, NULL); + } + + if (len) + *len = seg_len - offset; + + return data + offset; +} + +/** @internal Inline function @param pkt @param len @return */ +static inline void *_odp_packet_l3_ptr(odp_packet_t pkt, uint32_t *len) +{ + uint32_t offset = _odp_packet_l3_offset(pkt); + uint32_t seg_len = _odp_packet_seg_len(pkt); + uint8_t *data = (uint8_t *)_odp_packet_data(pkt); + + if (odp_unlikely(offset >= seg_len)) { + void *pkt_hdr = (void *)pkt; + + return _odp_packet_map(pkt_hdr, offset, len, NULL); + } + + if (len) + *len = seg_len - offset; + + return data + offset; +} + +/** @internal Inline function @param pkt @param len @return */ +static inline void *_odp_packet_l4_ptr(odp_packet_t pkt, uint32_t *len) +{ + uint32_t offset = _odp_packet_l4_offset(pkt); + uint32_t seg_len = _odp_packet_seg_len(pkt); + uint8_t *data = (uint8_t *)_odp_packet_data(pkt); + + if (odp_unlikely(offset >= seg_len)) { + void *pkt_hdr = (void *)pkt; + + return _odp_packet_map(pkt_hdr, offset, len, NULL); + } + + if (len) + *len = seg_len - offset; + + return data + offset; +} + /** @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 84b4f08a..c90a69c5 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 @@ -83,6 +83,21 @@ _ODP_INLINE uint32_t odp_packet_l4_offset(odp_packet_t pkt) return _odp_packet_l4_offset(pkt); } +_ODP_INLINE void *odp_packet_l2_ptr(odp_packet_t pkt, uint32_t *len) +{ + return _odp_packet_l2_ptr(pkt, len); +} + +_ODP_INLINE void *odp_packet_l3_ptr(odp_packet_t pkt, uint32_t *len) +{ + return _odp_packet_l3_ptr(pkt, len); +} + +_ODP_INLINE void *odp_packet_l4_ptr(odp_packet_t pkt, uint32_t *len) +{ + return _odp_packet_l4_ptr(pkt, len); +} + _ODP_INLINE uint32_t odp_packet_flow_hash(odp_packet_t pkt) { return _odp_packet_flow_hash(pkt); diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index 3f0d764f..446d8efa 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -278,11 +278,12 @@ static inline void packet_seg_copy_md(odp_packet_hdr_t *dst, */ } -static inline void *packet_map(odp_packet_hdr_t *pkt_hdr, - uint32_t offset, uint32_t *seg_len, int *seg_idx) +static inline void *packet_map(void *pkt_ptr, uint32_t offset, + uint32_t *seg_len, int *seg_idx) { void *addr; uint32_t len; + odp_packet_hdr_t *pkt_hdr = pkt_ptr; int seg_id = 0; int seg_count = pkt_hdr->buf_hdr.segcount; @@ -323,6 +324,18 @@ static inline void *packet_map(odp_packet_hdr_t *pkt_hdr, return addr; } +#include <odp/visibility_begin.h> + +/* This file uses the inlined version directly. Inlined API calls use this when + * offset does not point to the first segment. */ +void *_odp_packet_map(void *pkt_ptr, uint32_t offset, uint32_t *seg_len, + int *seg_idx) +{ + return packet_map(pkt_ptr, offset, seg_len, seg_idx); +} + +#include <odp/visibility_end.h> + void packet_parse_reset(odp_packet_hdr_t *pkt_hdr) { /* Reset parser metadata before new parse */ @@ -1207,15 +1220,6 @@ void odp_packet_user_ptr_set(odp_packet_t pkt, const void *ctx) packet_hdr(pkt)->buf_hdr.buf_cctx = ctx; } -void *odp_packet_l2_ptr(odp_packet_t pkt, uint32_t *len) -{ - odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); - - if (!packet_hdr_has_l2(pkt_hdr)) - return NULL; - return packet_map(pkt_hdr, pkt_hdr->p.l2_offset, len, NULL); -} - int odp_packet_l2_offset_set(odp_packet_t pkt, uint32_t offset) { odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); @@ -1228,13 +1232,6 @@ int odp_packet_l2_offset_set(odp_packet_t pkt, uint32_t offset) return 0; } -void *odp_packet_l3_ptr(odp_packet_t pkt, uint32_t *len) -{ - odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); - - return packet_map(pkt_hdr, pkt_hdr->p.l3_offset, len, NULL); -} - int odp_packet_l3_offset_set(odp_packet_t pkt, uint32_t offset) { odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); @@ -1246,13 +1243,6 @@ int odp_packet_l3_offset_set(odp_packet_t pkt, uint32_t offset) return 0; } -void *odp_packet_l4_ptr(odp_packet_t pkt, uint32_t *len) -{ - odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); - - return packet_map(pkt_hdr, pkt_hdr->p.l4_offset, len, NULL); -} - int odp_packet_l4_offset_set(odp_packet_t pkt, uint32_t offset) { odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); diff --git a/platform/linux-generic/odp_traffic_mngr.c b/platform/linux-generic/odp_traffic_mngr.c index e22a33f2..556b2a1f 100644 --- a/platform/linux-generic/odp_traffic_mngr.c +++ b/platform/linux-generic/odp_traffic_mngr.c @@ -1928,7 +1928,7 @@ static void egress_vlan_marking(tm_vlan_marking_t *vlan_marking, uint32_t hdr_len; uint16_t old_tci, new_tci; - ether_hdr_ptr = odp_packet_l2_ptr(odp_pkt, &hdr_len); + ether_hdr_ptr = _odp_packet_l2_ptr(odp_pkt, &hdr_len); vlan_hdr_ptr = (_odp_vlanhdr_t *)(ether_hdr_ptr + 1); /* If the split_hdr variable below is TRUE, then this indicates that @@ -1968,7 +1968,7 @@ static void egress_ipv4_tos_marking(tm_tos_marking_t *tos_marking, uint8_t old_tos, new_tos, ecn; l3_offset = _odp_packet_l3_offset(odp_pkt); - ipv4_hdr_ptr = odp_packet_l3_ptr(odp_pkt, &hdr_len); + ipv4_hdr_ptr = _odp_packet_l3_ptr(odp_pkt, &hdr_len); /* If the split_hdr variable below is TRUE, then this indicates that * for this odp (output) packet the IPv4 header is not all in the same @@ -2034,7 +2034,7 @@ static void egress_ipv6_tc_marking(tm_tos_marking_t *tos_marking, uint8_t old_tc, new_tc, ecn; l3_offset = _odp_packet_l3_offset(odp_pkt); - ipv6_hdr_ptr = odp_packet_l3_ptr(odp_pkt, &hdr_len); + ipv6_hdr_ptr = _odp_packet_l3_ptr(odp_pkt, &hdr_len); /* If the split_hdr variable below is TRUE, then this indicates that * for this odp (output) packet the IPv6 header is not all in the same commit 38fb73d6ed79d649fdec726ca4bacc93747daa9b Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Thu Dec 21 16:09:07 2017 +0200 linux-gen: packet: inline layer offsets Inline L2/L3/L4 offset read functions. Always use the inlined version within the implementation itself. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> 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 c808f2d6..aa9ba812 100644 --- a/platform/linux-generic/include/odp/api/plat/packet_inlines.h +++ b/platform/linux-generic/include/odp/api/plat/packet_inlines.h @@ -108,6 +108,24 @@ static inline uint32_t _odp_packet_user_area_size(odp_packet_t pkt) return _odp_pool_get(pool, uint32_t, uarea_size); } +/** @internal Inline function @param pkt @return */ +static inline uint32_t _odp_packet_l2_offset(odp_packet_t pkt) +{ + return _odp_pkt_get(pkt, uint16_t, l2_offset); +} + +/** @internal Inline function @param pkt @return */ +static inline uint32_t _odp_packet_l3_offset(odp_packet_t pkt) +{ + return _odp_pkt_get(pkt, uint16_t, l3_offset); +} + +/** @internal Inline function @param pkt @return */ +static inline uint32_t _odp_packet_l4_offset(odp_packet_t pkt) +{ + return _odp_pkt_get(pkt, uint16_t, l4_offset); +} + /** @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..84b4f08a 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 @@ -68,6 +68,21 @@ _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_l2_offset(odp_packet_t pkt) +{ + return _odp_packet_l2_offset(pkt); +} + +_ODP_INLINE uint32_t odp_packet_l3_offset(odp_packet_t pkt) +{ + return _odp_packet_l3_offset(pkt); +} + +_ODP_INLINE uint32_t odp_packet_l4_offset(odp_packet_t pkt) +{ + return _odp_packet_l4_offset(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 009a3aa7..5b44c09c 100644 --- a/platform/linux-generic/include/odp/api/plat/packet_types.h +++ b/platform/linux-generic/include/odp/api/plat/packet_types.h @@ -94,6 +94,12 @@ typedef struct _odp_packet_inline_offset_t { /** @internal field offset */ uint16_t user_area; /** @internal field offset */ + uint16_t l2_offset; + /** @internal field offset */ + uint16_t l3_offset; + /** @internal field offset */ + uint16_t l4_offset; + /** @internal field offset */ uint16_t flow_hash; /** @internal field offset */ uint16_t timestamp; diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index 04f1f33b..3f0d764f 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -37,6 +37,9 @@ 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), + .l2_offset = offsetof(odp_packet_hdr_t, p.l2_offset), + .l3_offset = offsetof(odp_packet_hdr_t, p.l3_offset), + .l4_offset = offsetof(odp_packet_hdr_t, p.l4_offset), .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) @@ -1213,15 +1216,6 @@ void *odp_packet_l2_ptr(odp_packet_t pkt, uint32_t *len) return packet_map(pkt_hdr, pkt_hdr->p.l2_offset, len, NULL); } -uint32_t odp_packet_l2_offset(odp_packet_t pkt) -{ - odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); - - if (!packet_hdr_has_l2(pkt_hdr)) - return ODP_PACKET_OFFSET_INVALID; - return pkt_hdr->p.l2_offset; -} - int odp_packet_l2_offset_set(odp_packet_t pkt, uint32_t offset) { odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); @@ -1241,13 +1235,6 @@ void *odp_packet_l3_ptr(odp_packet_t pkt, uint32_t *len) return packet_map(pkt_hdr, pkt_hdr->p.l3_offset, len, NULL); } -uint32_t odp_packet_l3_offset(odp_packet_t pkt) -{ - odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); - - return pkt_hdr->p.l3_offset; -} - int odp_packet_l3_offset_set(odp_packet_t pkt, uint32_t offset) { odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); @@ -1266,13 +1253,6 @@ void *odp_packet_l4_ptr(odp_packet_t pkt, uint32_t *len) return packet_map(pkt_hdr, pkt_hdr->p.l4_offset, len, NULL); } -uint32_t odp_packet_l4_offset(odp_packet_t pkt) -{ - odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); - - return pkt_hdr->p.l4_offset; -} - int odp_packet_l4_offset_set(odp_packet_t pkt, uint32_t offset) { odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); diff --git a/platform/linux-generic/odp_traffic_mngr.c b/platform/linux-generic/odp_traffic_mngr.c index ab06b3c0..e22a33f2 100644 --- a/platform/linux-generic/odp_traffic_mngr.c +++ b/platform/linux-generic/odp_traffic_mngr.c @@ -26,6 +26,7 @@ #include <protocols/eth.h> #include <protocols/ip.h> #include <odp_traffic_mngr_internal.h> +#include <odp/api/plat/packet_inlines.h> /* Local vars */ static const @@ -1966,7 +1967,7 @@ static void egress_ipv4_tos_marking(tm_tos_marking_t *tos_marking, uint32_t hdr_len, l3_offset, old_chksum, ones_compl_sum, tos_diff; uint8_t old_tos, new_tos, ecn; - l3_offset = odp_packet_l3_offset(odp_pkt); + l3_offset = _odp_packet_l3_offset(odp_pkt); ipv4_hdr_ptr = odp_packet_l3_ptr(odp_pkt, &hdr_len); /* If the split_hdr variable below is TRUE, then this indicates that @@ -2032,7 +2033,7 @@ static void egress_ipv6_tc_marking(tm_tos_marking_t *tos_marking, uint32_t hdr_len, old_ver_tc_flow, new_ver_tc_flow, l3_offset; uint8_t old_tc, new_tc, ecn; - l3_offset = odp_packet_l3_offset(odp_pkt); + l3_offset = _odp_packet_l3_offset(odp_pkt); ipv6_hdr_ptr = odp_packet_l3_ptr(odp_pkt, &hdr_len); /* If the split_hdr variable below is TRUE, then this indicates that ----------------------------------------------------------------------- Summary of changes: .../include/odp/api/plat/packet_inlines.h | 80 ++++++++++++++++++++++ .../include/odp/api/plat/packet_inlines_api.h | 30 ++++++++ .../include/odp/api/plat/packet_types.h | 6 ++ platform/linux-generic/odp_packet.c | 66 +++++------------- platform/linux-generic/odp_traffic_mngr.c | 11 +-- 5 files changed, 140 insertions(+), 53 deletions(-) hooks/post-receive --

7 years, 6 months

[COMMIT] branch master updated. v1.16.0.0-41-g5b915893

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 5b915893c793ffb3d49152d480d084dba32a5a74 (commit) from f1449d2555fbfa3d72aeb79d3ad6d2f199e83731 (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 5b915893c793ffb3d49152d480d084dba32a5a74 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Wed Dec 13 01:15:40 2017 +0300 tests: compile and execute validation tests before the rest of tests Validation tests examine API thoroughly. Compile and execute them before performance and misc tests. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Signed-off-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/Makefile.am b/test/Makefile.am index 8fbd9190..ba13eae8 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1 +1 @@ -SUBDIRS = common performance miscellaneous validation +SUBDIRS = common validation performance miscellaneous ----------------------------------------------------------------------- Summary of changes: test/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive --

7 years, 6 months

[COMMIT] branch master updated. v1.16.0.0-40-gf1449d25

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 f1449d2555fbfa3d72aeb79d3ad6d2f199e83731 (commit) via 5d6aea3f7186a4533ffb7a2bc4858a1d339ebbb4 (commit) from 260ca880b76151b66919cf0f3c149c2ba9ede24e (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: .travis.yml | 2 -- test/common/odp_cunit_common.c | 14 ++++++++++++++ test/common/odp_cunit_common.h | 2 -- 3 files changed, 14 insertions(+), 4 deletions(-) hooks/post-receive --

7 years, 6 months

[COMMIT] branch api-next updated. v1.16.0.0-747-g578ecf79

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 578ecf796dc0bf7bb230b3488d263dd455ed0a18 (commit) via f1449d2555fbfa3d72aeb79d3ad6d2f199e83731 (commit) via 5d6aea3f7186a4533ffb7a2bc4858a1d339ebbb4 (commit) via 260ca880b76151b66919cf0f3c149c2ba9ede24e (commit) from 6ca5f5cb57de9f71ace37118a9b0788b2abf529e (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 578ecf796dc0bf7bb230b3488d263dd455ed0a18 Merge: 6ca5f5cb f1449d25 Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Sat Dec 23 23:24:44 2017 +0300 Merge branch 'master' into api-next Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> ----------------------------------------------------------------------- Summary of changes: .travis.yml | 2 -- test/common/odp_cunit_common.c | 14 ++++++++++++++ test/common/odp_cunit_common.h | 2 -- test/validation/api/packet/packet.c | 2 +- 4 files changed, 15 insertions(+), 5 deletions(-) hooks/post-receive --

7 years, 6 months

[COMMIT] branch next updated. v1.16.0.0-743-g6ca5f5cb

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 6ca5f5cb57de9f71ace37118a9b0788b2abf529e (commit) via fa4e7f2672f5854e35544b10ce17c8d13f96fd71 (commit) via 18b4ac5ead1d428ebea0f8f9590951159f138b4c (commit) via 8f528c3624b449e9b93604e293bee029b077b521 (commit) via eb8be4f5a77b45fe279c1412231c5bc7de32a166 (commit) via b15b01036bd985d6218f9f756d108712c8d84fed (commit) via 85b2f8e1f52929dec7f5d8933c8cb4b9373b6754 (commit) via ba4559f569397e401ea41e67661d9fd0052b33ba (commit) via d3d70123198484f659f1aebc6e34a4da89e10b29 (commit) via 1adc8ef5dbcfde127c1b52df84152c187519b27e (commit) from 177eeff39e19289e771119cfdffc515cb16f9db5 (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/Makefile.am | 2 + example/ipsec/Makefile.am | 2 - example/ipsec/README | 3 +- example/ipsec/odp_ipsec.c | 89 +-- example/ipsec/odp_ipsec_cache.c | 4 + example/ipsec/odp_ipsec_fwd_db.c | 4 +- example/ipsec/odp_ipsec_fwd_db.h | 5 +- example/ipsec/odp_ipsec_loop_db.c | 56 -- example/ipsec/odp_ipsec_loop_db.h | 128 --- example/ipsec/odp_ipsec_stream.c | 46 +- example/ipsec/odp_ipsec_stream.h | 6 +- example/{ipsec => ipsec_api}/.gitignore | 0 example/ipsec_api/Makefile.am | 29 + example/{ipsec => ipsec_api}/odp_ipsec.c | 791 +++++-------------- example/{ipsec => ipsec_api}/odp_ipsec_cache.c | 109 +-- example/{ipsec => ipsec_api}/odp_ipsec_cache.h | 26 +- example/ipsec_api/odp_ipsec_fwd_db.c | 1 + example/ipsec_api/odp_ipsec_fwd_db.h | 1 + example/ipsec_api/odp_ipsec_misc.h | 1 + .../odp_ipsec_run_ah_in.sh} | 2 +- .../odp_ipsec_run_ah_out.sh} | 2 +- .../odp_ipsec_run_ah_tun_in.sh} | 3 +- .../odp_ipsec_run_ah_tun_out.sh} | 3 +- .../odp_ipsec_run_esp_in.sh} | 2 +- .../odp_ipsec_run_esp_out.sh} | 2 +- .../odp_ipsec_run_esp_tun_in.sh} | 3 +- .../odp_ipsec_run_esp_tun_out.sh} | 2 +- .../odp_ipsec_run_live.sh} | 2 +- .../odp_ipsec_run_router.sh} | 2 +- .../odp_ipsec_run_simple.sh} | 2 +- example/ipsec_api/odp_ipsec_sa_db.c | 1 + example/ipsec_api/odp_ipsec_sa_db.h | 1 + example/ipsec_api/odp_ipsec_sp_db.c | 1 + example/ipsec_api/odp_ipsec_sp_db.h | 1 + example/ipsec_api/odp_ipsec_stream.c | 1 + example/ipsec_api/odp_ipsec_stream.h | 1 + example/ipsec_offload/.gitignore | 1 + example/ipsec_offload/Makefile.am | 18 + example/ipsec_offload/odp_ipsec_offload.c | 854 +++++++++++++++++++++ example/ipsec_offload/odp_ipsec_offload_cache.c | 146 ++++ example/ipsec_offload/odp_ipsec_offload_cache.h | 78 ++ .../odp_ipsec_offload_fwd_db.c} | 80 +- example/ipsec_offload/odp_ipsec_offload_fwd_db.h | 197 +++++ .../odp_ipsec_offload_misc.h} | 93 ++- .../odp_ipsec_offload_sa_db.c} | 109 ++- .../odp_ipsec_offload_sa_db.h} | 19 +- .../odp_ipsec_offload_sp_db.c} | 41 +- .../odp_ipsec_offload_sp_db.h} | 8 +- example/ipsec_offload/run_left.sh | 14 + example/ipsec_offload/run_right.sh | 14 + example/m4/configure.m4 | 2 + .../linux-generic/include/odp_packet_io_internal.h | 1 + platform/linux-generic/odp_crypto.c | 3 + platform/linux-generic/pktio/loop.c | 37 +- test/validation/api/crypto/odp_crypto_test_inp.c | 125 +-- test/validation/api/ipsec/ipsec.c | 4 +- 56 files changed, 2031 insertions(+), 1147 deletions(-) delete mode 100644 example/ipsec/odp_ipsec_loop_db.c delete mode 100644 example/ipsec/odp_ipsec_loop_db.h copy example/{ipsec => ipsec_api}/.gitignore (100%) create mode 100644 example/ipsec_api/Makefile.am copy example/{ipsec => ipsec_api}/odp_ipsec.c (59%) copy example/{ipsec => ipsec_api}/odp_ipsec_cache.c (58%) copy example/{ipsec => ipsec_api}/odp_ipsec_cache.h (77%) create mode 120000 example/ipsec_api/odp_ipsec_fwd_db.c create mode 120000 example/ipsec_api/odp_ipsec_fwd_db.h create mode 120000 example/ipsec_api/odp_ipsec_misc.h copy example/{ipsec/odp_ipsec_run_ah_in => ipsec_api/odp_ipsec_run_ah_in.sh} (96%) copy example/{ipsec/odp_ipsec_run_ah_out => ipsec_api/odp_ipsec_run_ah_out.sh} (96%) copy example/{ipsec/odp_ipsec_run_ah_in => ipsec_api/odp_ipsec_run_ah_tun_in.sh} (84%) copy example/{ipsec/odp_ipsec_run_ah_out => ipsec_api/odp_ipsec_run_ah_tun_out.sh} (84%) copy example/{ipsec/odp_ipsec_run_esp_in => ipsec_api/odp_ipsec_run_esp_in.sh} (97%) copy example/{ipsec/odp_ipsec_run_esp_out => ipsec_api/odp_ipsec_run_esp_out.sh} (97%) copy example/{ipsec/odp_ipsec_run_esp_in => ipsec_api/odp_ipsec_run_esp_tun_in.sh} (85%) copy example/{ipsec/odp_ipsec_run_esp_out => ipsec_api/odp_ipsec_run_esp_tun_out.sh} (97%) copy example/{ipsec/odp_ipsec_run_live => ipsec_api/odp_ipsec_run_live.sh} (98%) copy example/{ipsec/odp_ipsec_run_router => ipsec_api/odp_ipsec_run_router.sh} (95%) copy example/{ipsec/odp_ipsec_run_simple => ipsec_api/odp_ipsec_run_simple.sh} (95%) create mode 120000 example/ipsec_api/odp_ipsec_sa_db.c create mode 120000 example/ipsec_api/odp_ipsec_sa_db.h create mode 120000 example/ipsec_api/odp_ipsec_sp_db.c create mode 120000 example/ipsec_api/odp_ipsec_sp_db.h create mode 120000 example/ipsec_api/odp_ipsec_stream.c create mode 120000 example/ipsec_api/odp_ipsec_stream.h create mode 100644 example/ipsec_offload/.gitignore create mode 100644 example/ipsec_offload/Makefile.am create mode 100644 example/ipsec_offload/odp_ipsec_offload.c create mode 100644 example/ipsec_offload/odp_ipsec_offload_cache.c create mode 100644 example/ipsec_offload/odp_ipsec_offload_cache.h copy example/{ipsec/odp_ipsec_fwd_db.c => ipsec_offload/odp_ipsec_offload_fwd_db.c} (62%) create mode 100644 example/ipsec_offload/odp_ipsec_offload_fwd_db.h copy example/{ipsec/odp_ipsec_misc.h => ipsec_offload/odp_ipsec_offload_misc.h} (78%) copy example/{ipsec/odp_ipsec_sa_db.c => ipsec_offload/odp_ipsec_offload_sa_db.c} (72%) copy example/{ipsec/odp_ipsec_sa_db.h => ipsec_offload/odp_ipsec_offload_sa_db.h} (84%) copy example/{ipsec/odp_ipsec_sp_db.c => ipsec_offload/odp_ipsec_offload_sp_db.c} (74%) copy example/{ipsec/odp_ipsec_sp_db.h => ipsec_offload/odp_ipsec_offload_sp_db.h} (90%) create mode 100755 example/ipsec_offload/run_left.sh create mode 100755 example/ipsec_offload/run_right.sh hooks/post-receive --

7 years, 6 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

git-lng-odp