October 2016 - git-lng-odp - lists.linaro.org

[COMMIT] branch master updated. v1.10.1.0-149-gcd47265

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 cd472652f51881008020a5a56b1ffc774f813ac3 (commit) from e72f5324c7bd559373b2827f9f8f225beee992fb (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 cd472652f51881008020a5a56b1ffc774f813ac3 Author: Matias Elo <matias.elo(a)nokia.com> Date: Thu Oct 27 16:42:08 2016 +0300 example: l3fwd: prevent possible use of uninitialised variables Fixes bug https://bugs.linaro.org/show_bug.cgi?id=2564 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/example/l3fwd/odp_l3fwd.c b/example/l3fwd/odp_l3fwd.c index fa1b299..8919bd3 100644 --- a/example/l3fwd/odp_l3fwd.c +++ b/example/l3fwd/odp_l3fwd.c @@ -309,7 +309,9 @@ static int run_worker(void *arg) } } - num_pktio = thr_arg->nb_pktio; + if (num_pktio == 0) + LOG_ABORT("No pktio devices found\n"); + if_idx = input_ifs[pktio]; inq = input_queues[pktio]; ----------------------------------------------------------------------- Summary of changes: example/l3fwd/odp_l3fwd.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) hooks/post-receive --

7 years, 5 months

1
0
0 0

[COMMIT] branch master updated. v1.10.1.0-148-ge72f532

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 e72f5324c7bd559373b2827f9f8f225beee992fb (commit) from c710eb38a88d20f4adc2ee377a0fa170fbca1aca (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 e72f5324c7bd559373b2827f9f8f225beee992fb Author: Bill Fischofer <bill.fischofer(a)linaro.org> Date: Thu Oct 27 11:44:39 2016 -0500 linux-generic: packet: add fall through comments to parser Address bug https://bugs.linaro.org/show_bug.cgi?id=2565 by adding comments to the parser's switch statement to document the fact that fall through is intentional. Signed-off-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index 714794a..c2b26fd 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -1182,6 +1182,8 @@ int packet_parse_common(packet_parser_t *prs, const uint8_t *ptr, switch (prs->parsed_layers) { case LAYER_NONE: + /* Fall through */ + case LAYER_L2: { const _odp_ethhdr_t *eth; @@ -1254,6 +1256,8 @@ int packet_parse_common(packet_parser_t *prs, const uint8_t *ptr, if (layer == LAYER_L2) return prs->error_flags.all != 0; } + /* Fall through */ + case LAYER_L3: { offset = prs->l3_offset; @@ -1292,6 +1296,8 @@ int packet_parse_common(packet_parser_t *prs, const uint8_t *ptr, if (layer == LAYER_L3) return prs->error_flags.all != 0; } + /* Fall through */ + case LAYER_L4: { offset = prs->l4_offset; @@ -1341,6 +1347,7 @@ int packet_parse_common(packet_parser_t *prs, const uint8_t *ptr, prs->parsed_layers = LAYER_L4; break; } + case LAYER_ALL: break; ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/odp_packet.c | 7 +++++++ 1 file changed, 7 insertions(+) hooks/post-receive --

7 years, 5 months

1
0
0 0

[COMMIT] branch api-next updated. v1.10.1.0-230-g192cbb2

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 192cbb2e987211e0706c315ef2349ddc5b263d3f (commit) via c710eb38a88d20f4adc2ee377a0fa170fbca1aca (commit) via e01d879bd344f89d25568d93531d457e87e80f6f (commit) via b35abec0dbb6fbbe747e1c66223d92fc921279bb (commit) via 0cc926cea639f5a4538ec8f1f25437f995484e3b (commit) via eebd6b0bb6cc1f724d8f78c1c419031004adc3e4 (commit) via 44df10d424bcd3c74b1d662b40e74b8fdbd031a4 (commit) via 3c78ee3f2c9274ebfd6b51e1ec203218b792fc9b (commit) via a45b9dad99ea5e50cdafada1bfbb2bef68467263 (commit) via 91df9eab8dd6ed2aeaf367575c42fe0979435431 (commit) via 018c59b52d91dc0ef4ded90d4a76a8b053d078b6 (commit) via 5fff93ce094807c460ab7a1bf9b7af429143a19d (commit) via f73efb129c474301d6f70d727452c0c69ce0e309 (commit) via 144a1d8c4d0265ff3ff6ae740b4e99045645e59d (commit) via e89d5d15852b9a64e3aaf115b59c87d07092717d (commit) via aaca222d10a3829e4c982a1b4842b0be11860b7d (commit) via 25f82fc54a78100098eae5b22719571b6991c955 (commit) from 28d95ca27265aeaf95f06bcc7b937263f96fd826 (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 192cbb2e987211e0706c315ef2349ddc5b263d3f Merge: 0cc926c c710eb3 Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Thu Oct 27 16:04:04 2016 +0300 Merge branch 'master' into api-next diff --cc platform/Makefile.inc index 113f9c5,2722946..b31b95b --- a/platform/Makefile.inc +++ b/platform/Makefile.inc @@@ -57,21 -57,9 +57,21 @@@ odpapispecinclude_HEADERS = $(top_srcdir)/include/odp/api/spec/ticketlock.h \ $(top_srcdir)/include/odp/api/spec/time.h \ $(top_srcdir)/include/odp/api/spec/timer.h \ - $(top_srcdir)/include/odp/api/spec/traffic_mngr.h \ - $(top_srcdir)/include/odp/api/spec/version.h + $(top_builddir)/include/odp/api/spec/version.h \ + $(top_srcdir)/include/odp/api/spec/traffic_mngr.h +odpdrvspecincludedir= $(includedir)/odp/drv/spec +odpdrvspecinclude_HEADERS = \ + $(top_srcdir)/include/odp/drv/spec/align.h \ + $(top_srcdir)/include/odp/drv/spec/atomic.h \ + $(top_srcdir)/include/odp/drv/spec/barrier.h \ + $(top_srcdir)/include/odp/drv/spec/byteorder.h \ + $(top_srcdir)/include/odp/drv/spec/compiler.h \ + $(top_srcdir)/include/odp/drv/spec/shm.h \ + $(top_srcdir)/include/odp/drv/spec/spinlock.h \ + $(top_srcdir)/include/odp/drv/spec/std_types.h \ + $(top_srcdir)/include/odp/drv/spec/sync.h + EXTRA_DIST = \ arch/arm/odp/api/cpu_arch.h \ arch/arm/odp_cpu_arch.c \ commit 0cc926cea639f5a4538ec8f1f25437f995484e3b Merge: 28d95ca eebd6b0 Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Mon Oct 24 23:51:57 2016 +0300 Merge branch 'master' into api-next Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> ----------------------------------------------------------------------- Summary of changes: .gitignore | 1 - Makefile.am | 5 +- configure.ac | 21 +- example/Makefile.inc | 3 +- example/l3fwd/.gitignore | 2 + example/l3fwd/odp_l3fwd.c | 220 +++++++++------ example/timer/odp_timer_simple.c | 4 +- helper/Makefile.am | 1 + include/odp/api/spec/.gitignore | 1 + include/odp/api/spec/{version.h => version.h.in} | 6 +- platform/Makefile.inc | 7 +- platform/linux-generic/Makefile.am | 1 + .../include/odp/api/plat/atomic_types.h | 4 +- .../include/odp/api/plat/static_inline.h.in | 11 + .../linux-generic/include/odp_packet_internal.h | 25 +- platform/linux-generic/include/protocols/ip.h | 2 + platform/linux-generic/odp_classification.c | 4 +- platform/linux-generic/odp_packet.c | 311 ++++++++++++--------- platform/linux-generic/odp_packet_flags.c | 112 ++++---- platform/linux-generic/odp_timer.c | 2 + scripts/Makefile.am | 1 - scripts/get_impl_str.sh | 11 - scripts/git_hash.sh | 29 -- test/Makefile.inc | 3 +- test/common_plat/performance/odp_pktio_perf.c | 16 +- test/linux-generic/Makefile.inc | 1 + 26 files changed, 456 insertions(+), 348 deletions(-) create mode 100644 include/odp/api/spec/.gitignore rename include/odp/api/spec/{version.h => version.h.in} (93%) delete mode 100644 scripts/Makefile.am delete mode 100755 scripts/get_impl_str.sh delete mode 100755 scripts/git_hash.sh hooks/post-receive --

7 years, 5 months

1
0
0 0

[COMMIT] branch master updated. v1.10.1.0-147-gc710eb3

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 c710eb38a88d20f4adc2ee377a0fa170fbca1aca (commit) from e01d879bd344f89d25568d93531d457e87e80f6f (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 c710eb38a88d20f4adc2ee377a0fa170fbca1aca Author: Bill Fischofer <bill.fischofer(a)linaro.org> Date: Wed Oct 19 07:09:31 2016 -0500 linux-generic: config: add missing doxygen documentation for abi macros Fix Bug https://bugs.linaro.org/show_bug.cgi?id=2553 by adding missing doxygen documentation for the internal macros ODP_ABI_COMPAT and _STATIC. 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/platform/linux-generic/include/odp/api/plat/static_inline.h.in b/platform/linux-generic/include/odp/api/plat/static_inline.h.in index acee5f3..4562a22 100644 --- a/platform/linux-generic/include/odp/api/plat/static_inline.h.in +++ b/platform/linux-generic/include/odp/api/plat/static_inline.h.in @@ -17,6 +17,17 @@ extern "C" { #endif +/** + * @internal + * @def ODP_ABI_COMPAT + * Control ABI compatibility + */ + +/** + * @internal + * @def _STATIC + * Control conditional static inline expansions for ABI compatibility + */ #if @ODP_ABI_COMPAT@ #define ODP_ABI_COMPAT 1 #define _STATIC ----------------------------------------------------------------------- Summary of changes: .../linux-generic/include/odp/api/plat/static_inline.h.in | 11 +++++++++++ 1 file changed, 11 insertions(+) hooks/post-receive --

7 years, 5 months

1
0
0 0

[COMMIT] branch master updated. v1.10.1.0-146-ge01d879

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 e01d879bd344f89d25568d93531d457e87e80f6f (commit) from b35abec0dbb6fbbe747e1c66223d92fc921279bb (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 e01d879bd344f89d25568d93531d457e87e80f6f Author: Xuelin Shi <forrest.shi(a)linaro.org> Date: Mon Oct 24 15:02:19 2016 +0800 linux-generic: fix ISO C compiling issue with -Werror=pedantic ISO C does not allow extra ‘;’ outside of a function. Signed-off-by: Xuelin Shi <forrest.shi(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/include/odp/api/plat/atomic_types.h b/platform/linux-generic/include/odp/api/plat/atomic_types.h index 3bb2bbd..33a0565 100644 --- a/platform/linux-generic/include/odp/api/plat/atomic_types.h +++ b/platform/linux-generic/include/odp/api/plat/atomic_types.h @@ -32,7 +32,7 @@ struct odp_atomic_u64_s { * data types. We use a spin lock to ensure atomicity. */ char lock; /**< Spin lock (if needed) used to ensure atomic access */ #endif -} ODP_ALIGNED(sizeof(uint64_t)); /* Enforce alignement! */; +} ODP_ALIGNED(sizeof(uint64_t)); /* Enforce alignement! */ /** * @internal @@ -40,7 +40,7 @@ struct odp_atomic_u64_s { */ struct odp_atomic_u32_s { uint32_t v; /**< Actual storage for the atomic variable */ -} ODP_ALIGNED(sizeof(uint32_t)); /* Enforce alignement! */; +} ODP_ALIGNED(sizeof(uint32_t)); /* Enforce alignement! */ #if __GCC_ATOMIC_LLONG_LOCK_FREE < 2 ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/include/odp/api/plat/atomic_types.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) hooks/post-receive --

7 years, 5 months

1
0
0 0

[COMMIT] branch master updated. v1.10.1.0-145-gb35abec

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 b35abec0dbb6fbbe747e1c66223d92fc921279bb (commit) from eebd6b0bb6cc1f724d8f78c1c419031004adc3e4 (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 b35abec0dbb6fbbe747e1c66223d92fc921279bb Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Tue Oct 25 15:43:27 2016 +0300 fix out of tree build Commit: eebd6b0 configure: the version cannot use a script Did generation of version.h which is done in $dest_dir. Includes paths have to be corrected accordingly. Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> Reviewed-and tested-by: Mike Holmes <mike.holmes(a)linaro.org> diff --git a/example/Makefile.inc b/example/Makefile.inc index 9fb2f29..19d3994 100644 --- a/example/Makefile.inc +++ b/example/Makefile.inc @@ -7,6 +7,7 @@ AM_CFLAGS += \ -I$(top_srcdir)/platform/@with_platform@/include \ -I$(top_srcdir)/include/ \ -I$(top_srcdir)/helper/include \ - -I$(top_builddir)/platform/@with_platform@/include + -I$(top_builddir)/platform/@with_platform@/include \ + -I$(top_builddir)/include AM_LDFLAGS += -L$(LIB) diff --git a/helper/Makefile.am b/helper/Makefile.am index b6e6a1d..d09d900 100644 --- a/helper/Makefile.am +++ b/helper/Makefile.am @@ -8,6 +8,7 @@ AM_CFLAGS = -I$(srcdir)/include AM_CFLAGS += -I$(top_srcdir)/platform/@with_platform@/include AM_CFLAGS += -I$(top_srcdir)/include AM_CFLAGS += -I$(top_builddir)/platform/@with_platform@/include +AM_CFLAGS += -I$(top_builddir)/include AM_LDFLAGS += -version-number '$(ODPHELPER_LIBSO_VERSION)' diff --git a/platform/Makefile.inc b/platform/Makefile.inc index 432d1fd..2722946 100644 --- a/platform/Makefile.inc +++ b/platform/Makefile.inc @@ -57,8 +57,8 @@ odpapispecinclude_HEADERS = \ $(top_srcdir)/include/odp/api/spec/ticketlock.h \ $(top_srcdir)/include/odp/api/spec/time.h \ $(top_srcdir)/include/odp/api/spec/timer.h \ - $(top_srcdir)/include/odp/api/spec/traffic_mngr.h \ - $(top_srcdir)/include/odp/api/spec/version.h + $(top_builddir)/include/odp/api/spec/version.h \ + $(top_srcdir)/include/odp/api/spec/traffic_mngr.h EXTRA_DIST = \ arch/arm/odp/api/cpu_arch.h \ diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 0ec13d4..22cf6f3 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -6,6 +6,7 @@ include $(top_srcdir)/platform/@with_platform@/Makefile.inc AM_CFLAGS += -I$(srcdir)/include AM_CFLAGS += -I$(top_srcdir)/include +AM_CFLAGS += -I$(top_builddir)/include AM_CFLAGS += -Iinclude include_HEADERS = \ diff --git a/test/Makefile.inc b/test/Makefile.inc index db5a2fa..1ebc047 100644 --- a/test/Makefile.inc +++ b/test/Makefile.inc @@ -11,7 +11,8 @@ INCFLAGS = \ -I$(top_srcdir)/helper/include \ -I$(top_srcdir)/include \ -I$(top_srcdir)/platform/@with_platform@/include \ - -I$(top_srcdir)/test + -I$(top_srcdir)/test \ + -I$(top_builddir)/include AM_CFLAGS += $(INCFLAGS) AM_CXXFLAGS = $(INCFLAGS) diff --git a/test/linux-generic/Makefile.inc b/test/linux-generic/Makefile.inc index eba1d2d..36745fe 100644 --- a/test/linux-generic/Makefile.inc +++ b/test/linux-generic/Makefile.inc @@ -10,6 +10,7 @@ LIBODP = $(LIB)/libodphelper-linux.la $(LIB)/libodp-linux.la INCCUNIT_COMMON = -I$(top_srcdir)/test/common_plat/common INCODP = \ + -I$(top_builddir)/include \ -I$(top_builddir)/platform/@with_platform@/include \ -I$(top_srcdir)/helper/include \ -I$(top_srcdir)/include \ ----------------------------------------------------------------------- Summary of changes: example/Makefile.inc | 3 ++- helper/Makefile.am | 1 + platform/Makefile.inc | 4 ++-- platform/linux-generic/Makefile.am | 1 + test/Makefile.inc | 3 ++- test/linux-generic/Makefile.inc | 1 + 6 files changed, 9 insertions(+), 4 deletions(-) hooks/post-receive --

7 years, 5 months

1
0
0 0

[COMMIT] branch master updated. v1.10.1.0-144-geebd6b0

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 eebd6b0bb6cc1f724d8f78c1c419031004adc3e4 (commit) from 44df10d424bcd3c74b1d662b40e74b8fdbd031a4 (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 eebd6b0bb6cc1f724d8f78c1c419031004adc3e4 Author: Mike Holmes <mike.holmes(a)linaro.org> Date: Fri Oct 21 14:40:17 2016 -0400 configure: the version cannot use a script Use of a script in the autotools breaks github CI Define the API version in configure and reuse it in the code Benefits: removes dependence on scripts to build removes scripts and the make file from odp/scripts removes generated .scmversion file places api versioning right next to lib versioning in the configure.ac allows github to auto build odp repos Signed-off-by: Mike Holmes <mike.holmes(a)linaro.org> Reviewed-by: Brian Brooks <brian.brooks(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/.gitignore b/.gitignore index d4e7d02..fbc0eab 100644 --- a/.gitignore +++ b/.gitignore @@ -12,7 +12,6 @@ .deps/ .dirstamp .libs/ -.scmversion CUnit-Memory-Dump.xml ID Makefile diff --git a/Makefile.am b/Makefile.am index 625748a..2a9a658 100644 --- a/Makefile.am +++ b/Makefile.am @@ -11,9 +11,8 @@ SUBDIRS = @platform_with_platform@ \ test \ helper/test \ doc \ - example \ - scripts + example @DX_RULES@ -EXTRA_DIST = bootstrap $(DX_CONFIG) CHANGELOG config/README .scmversion +EXTRA_DIST = bootstrap $(DX_CONFIG) CHANGELOG config/README diff --git a/configure.ac b/configure.ac index f081c51..ab19084 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,23 @@ AC_PREREQ([2.5]) -AC_INIT([OpenDataPlane], m4_esyscmd(./scripts/git_hash.sh .), [lng-odp(a)lists.linaro.org]) +########################################################################## +# Set correct API version +########################################################################## +m4_define([odpapi_generation_version], [1]) +m4_define([odpapi_major_version], [11]) +m4_define([odpapi_minor_version], [0]) +m4_define([odpapi_point_version], [0]) +m4_define([odpapi_version], + [odpapi_generation_version.odpapi_major_version.odpapi_minor_version.odpapi_point_version]) +AC_INIT([OpenDataPlane],[odpapi_version],[lng-odp(a)lists.linaro.org]) + +ODP_VERSION_API_GENERATION=odpapi_generation_version +AC_SUBST(ODP_VERSION_API_GENERATION) +ODP_VERSION_API_MAJOR=odpapi_major_version +AC_SUBST(ODP_VERSION_API_MAJOR) +ODP_VERSION_API_MINOR=odpapi_minor_version +AC_SUBST(ODP_VERSION_API_MINOR) +AC_CONFIG_FILES([include/odp/api/spec/version.h]) + AM_INIT_AUTOMAKE([1.9 tar-pax subdir-objects]) AC_CONFIG_SRCDIR([helper/config.h.in]) AM_CONFIG_HEADER([helper/config.h]) @@ -271,7 +289,6 @@ AC_CONFIG_FILES([Makefile helper/test/Makefile pkgconfig/libodp-linux.pc pkgconfig/libodphelper-linux.pc - scripts/Makefile ]) AC_SEARCH_LIBS([timer_create],[rt posix4]) diff --git a/include/odp/api/spec/.gitignore b/include/odp/api/spec/.gitignore new file mode 100644 index 0000000..6702033 --- /dev/null +++ b/include/odp/api/spec/.gitignore @@ -0,0 +1 @@ +version.h diff --git a/include/odp/api/spec/version.h b/include/odp/api/spec/version.h.in similarity index 93% rename from include/odp/api/spec/version.h rename to include/odp/api/spec/version.h.in index aa3f3ab..4b16dcc 100644 --- a/include/odp/api/spec/version.h +++ b/include/odp/api/spec/version.h.in @@ -37,7 +37,7 @@ extern "C" { * very significant changes to the API. APIs with different * versions are likely not backward compatible. */ -#define ODP_VERSION_API_GENERATION 1 +#define ODP_VERSION_API_GENERATION @ODP_VERSION_API_GENERATION@ /** * ODP API major version @@ -45,7 +45,7 @@ extern "C" { * Introduction of major new features or changes. APIs with different major * versions are likely not backward compatible. */ -#define ODP_VERSION_API_MAJOR 10 +#define ODP_VERSION_API_MAJOR @ODP_VERSION_API_MAJOR@ /** * ODP API minor version @@ -54,7 +54,7 @@ extern "C" { * to the API. For an API with common generation and major version, but with * different minor numbers the two versions are backward compatible. */ -#define ODP_VERSION_API_MINOR 1 +#define ODP_VERSION_API_MINOR @ODP_VERSION_API_MINOR@ /** * ODP API version string diff --git a/platform/Makefile.inc b/platform/Makefile.inc index a44f88f..432d1fd 100644 --- a/platform/Makefile.inc +++ b/platform/Makefile.inc @@ -10,8 +10,7 @@ lib_LTLIBRARIES = $(LIB)/libodp-linux.la AM_LDFLAGS += -version-number '$(ODP_LIBSO_VERSION)' -GIT_DESC = `$(top_srcdir)/scripts/get_impl_str.sh $(top_srcdir)` -AM_CFLAGS += "-DGIT_HASH=$(GIT_DESC)" +AM_CFLAGS += "-DGIT_HASH=$(VERSION)" AM_CFLAGS += $(VISIBILITY_CFLAGS) #The implementation will need to retain the deprecated implementation diff --git a/scripts/Makefile.am b/scripts/Makefile.am deleted file mode 100644 index 189b3ef..0000000 --- a/scripts/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -EXTRA_DIST = get_impl_str.sh git_hash.sh diff --git a/scripts/get_impl_str.sh b/scripts/get_impl_str.sh deleted file mode 100755 index d765a53..0000000 --- a/scripts/get_impl_str.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -if [ -z ${1} ]; then - echo "should be called with a path" - exit -fi -ROOTDIR=${1} - -CUSTOM_STR=${CUSTOM_STR:-https://git.linaro.org/lng/odp.git} - -echo -n "'${CUSTOM_STR}' ($(cat ${ROOTDIR}/.scmversion))" diff --git a/scripts/git_hash.sh b/scripts/git_hash.sh deleted file mode 100755 index 336eb01..0000000 --- a/scripts/git_hash.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash - -if [ -z ${1} ]; then - echo "should be called with a path" - exit -fi -ROOTDIR=${1} - -if [ -d ${ROOTDIR}/.git ]; then - hash=$(git --git-dir=${ROOTDIR}/.git describe --match 'v[0-9]*\.[0-9]*\.[0-9]*\.[0-9]*'\ - | tr -d "\n") - if [[ $(git --git-dir=${ROOTDIR}/.git diff --shortstat 2> /dev/null \ - | tail -n1) != "" ]]; then - dirty=.dirty - fi - - echo -n "${hash}${dirty}">${ROOTDIR}/.scmversion - - sed -i "s|-|.git|" ${ROOTDIR}/.scmversion - sed -i "s|-|.|g" ${ROOTDIR}/.scmversion - sed -i "s|^v||g" ${ROOTDIR}/.scmversion -elif [ ! -d ${ROOTDIR}/.git -a ! -f ${ROOTDIR}/.scmversion ]; then - echo -n "File ROOTDIR/.scmversion not found, " - echo "and not inside a git repository" - echo "Bailing out! Not recoverable!" - exit 1 -fi - -cat ${ROOTDIR}/.scmversion ----------------------------------------------------------------------- Summary of changes: .gitignore | 1 - Makefile.am | 5 ++-- configure.ac | 21 +++++++++++++++-- include/odp/api/spec/.gitignore | 1 + include/odp/api/spec/{version.h => version.h.in} | 6 ++--- platform/Makefile.inc | 3 +-- scripts/Makefile.am | 1 - scripts/get_impl_str.sh | 11 --------- scripts/git_hash.sh | 29 ------------------------ 9 files changed, 26 insertions(+), 52 deletions(-) create mode 100644 include/odp/api/spec/.gitignore rename include/odp/api/spec/{version.h => version.h.in} (93%) delete mode 100644 scripts/Makefile.am delete mode 100755 scripts/get_impl_str.sh delete mode 100755 scripts/git_hash.sh hooks/post-receive --

7 years, 5 months

1
0
0 0

[COMMIT] branch master updated. v1.10.1.0-143-g44df10d

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 44df10d424bcd3c74b1d662b40e74b8fdbd031a4 (commit) via 3c78ee3f2c9274ebfd6b51e1ec203218b792fc9b (commit) via a45b9dad99ea5e50cdafada1bfbb2bef68467263 (commit) via 91df9eab8dd6ed2aeaf367575c42fe0979435431 (commit) via 018c59b52d91dc0ef4ded90d4a76a8b053d078b6 (commit) from 5fff93ce094807c460ab7a1bf9b7af429143a19d (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 44df10d424bcd3c74b1d662b40e74b8fdbd031a4 Author: Matias Elo <matias.elo(a)nokia.com> Date: Mon Oct 3 14:49:16 2016 +0300 example: l3fwd: simplify worker main loop Reduce extra code in the fast path. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Mike Holmes <mike.holmes(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/example/l3fwd/odp_l3fwd.c b/example/l3fwd/odp_l3fwd.c index 0f8068f..fa1b299 100644 --- a/example/l3fwd/odp_l3fwd.c +++ b/example/l3fwd/odp_l3fwd.c @@ -62,6 +62,7 @@ struct thread_arg_s { uint64_t rx_drops; uint64_t tx_drops; struct { + int if_idx; /* interface index */ int nb_rxq; /* number of rxq this thread will access */ int rxq[MAX_NB_QUEUE]; /* rxq[i] is index in pktio.ifin[] */ int txq_idx; /* index in pktio.ifout[] */ @@ -175,7 +176,7 @@ static inline void ipv4_dec_ttl_csum_update(odph_ipv4hdr_t *ip) ip->chksum += odp_cpu_to_be_16(1 << 8); } -static int l3fwd_pkt_hash(odp_packet_t pkt, int sif) +static inline int l3fwd_pkt_hash(odp_packet_t pkt, int sif) { fwd_db_entry_t *entry; ipv4_tuple5_t key; @@ -217,7 +218,7 @@ static int l3fwd_pkt_hash(odp_packet_t pkt, int sif) return dif; } -static int l3fwd_pkt_lpm(odp_packet_t pkt, int sif) +static inline int l3fwd_pkt_lpm(odp_packet_t pkt, int sif) { odph_ipv4hdr_t *ip; odph_ethhdr_t *eth; @@ -275,75 +276,85 @@ static inline int drop_err_pkts(odp_packet_t pkt_tbl[], unsigned num) return dropped; } -static void l3fwd_one_queue(uint32_t sif, int rxq_idx, void *thr_arg) +static int run_worker(void *arg) { - odp_packet_t *tbl; - odp_pktout_queue_t outq; + int if_idx; + struct thread_arg_s *thr_arg = arg; odp_pktin_queue_t inq; + int input_ifs[thr_arg->nb_pktio]; + odp_pktin_queue_t input_queues[thr_arg->nb_pktio]; + odp_pktout_queue_t output_queues[global.cmd_args.if_count]; odp_packet_t pkt_tbl[MAX_PKT_BURST]; - struct thread_arg_s *arg; + odp_packet_t *tbl; int pkts, drop, sent; int dst_port, dif; - int i; + int i, j; + int pktio = 0; + int num_pktio = 0; - arg = thr_arg; - inq = global.l3fwd_pktios[sif].ifin[rxq_idx]; - pkts = odp_pktin_recv(inq, pkt_tbl, MAX_PKT_BURST); - if (pkts <= 0) - return; - - arg->packets += pkts; - drop = drop_err_pkts(pkt_tbl, pkts); - pkts -= drop; - arg->rx_drops += drop; - - dif = global.fwd_func(pkt_tbl[0], sif); - tbl = &pkt_tbl[0]; - while (pkts) { - int txq_idx; - - dst_port = dif; - for (i = 1; i < pkts; i++) { - dif = global.fwd_func(tbl[i], sif); - if (dif != dst_port) - break; - } + /* Copy all required handles to local memory */ + for (i = 0; i < global.cmd_args.if_count; i++) { + int txq_idx = thr_arg->pktio[i].txq_idx; - txq_idx = arg->pktio[dst_port].txq_idx; - outq = global.l3fwd_pktios[dst_port].ifout[txq_idx]; - sent = odp_pktout_send(outq, tbl, i); - if (odp_unlikely(sent < i)) { - sent = sent < 0 ? 0 : sent; - odp_packet_free_multi(&tbl[sent], i - sent); - arg->tx_drops += i - sent; - } + output_queues[i] = global.l3fwd_pktios[i].ifout[txq_idx]; - if (i < pkts) - tbl += i; + if_idx = thr_arg->pktio[i].if_idx; + for (j = 0; j < thr_arg->pktio[i].nb_rxq; j++) { + int rxq_idx = thr_arg->pktio[i].rxq[j]; - pkts -= i; + inq = global.l3fwd_pktios[if_idx].ifin[rxq_idx]; + input_ifs[num_pktio] = if_idx; + input_queues[num_pktio] = inq; + num_pktio++; + } } -} -static int run_worker(void *arg) -{ - int if_idx, rxq, nb_rxq; - struct thread_arg_s *thr_arg = arg; + num_pktio = thr_arg->nb_pktio; + if_idx = input_ifs[pktio]; + inq = input_queues[pktio]; odp_barrier_wait(&barrier); while (!exit_threads) { - for (if_idx = 0; if_idx < thr_arg->nb_pktio; if_idx++) { - nb_rxq = thr_arg->pktio[if_idx].nb_rxq; - if (!nb_rxq || thr_arg->thr_idx == INVALID_ID) - continue; - - for (rxq = 0; rxq < nb_rxq; rxq++) { - int rxq_idx; + if (num_pktio > 1) { + if_idx = input_ifs[pktio]; + inq = input_queues[pktio]; + pktio++; + if (pktio == num_pktio) + pktio = 0; + } - rxq_idx = thr_arg->pktio[if_idx].rxq[rxq]; - l3fwd_one_queue(if_idx, rxq_idx, arg); + pkts = odp_pktin_recv(inq, pkt_tbl, MAX_PKT_BURST); + if (pkts < 1) + continue; + + thr_arg->packets += pkts; + drop = drop_err_pkts(pkt_tbl, pkts); + pkts -= drop; + thr_arg->rx_drops += drop; + if (odp_unlikely(pkts < 1)) + continue; + + dif = global.fwd_func(pkt_tbl[0], if_idx); + tbl = &pkt_tbl[0]; + while (pkts) { + dst_port = dif; + for (i = 1; i < pkts; i++) { + dif = global.fwd_func(tbl[i], if_idx); + if (dif != dst_port) + break; } + sent = odp_pktout_send(output_queues[dst_port], tbl, i); + if (odp_unlikely(sent < i)) { + sent = sent < 0 ? 0 : sent; + odp_packet_free_multi(&tbl[sent], i - sent); + thr_arg->tx_drops += i - sent; + } + + if (i < pkts) + tbl += i; + + pkts -= i; } } @@ -675,7 +686,7 @@ static void print_info(char *progname, app_args_t *args) */ static void setup_worker_qconf(app_args_t *args) { - int nb_worker, if_count; + int nb_worker, if_count, pktio; int i, j, rxq_idx; struct thread_arg_s *arg; struct l3fwd_pktio_s *port; @@ -692,10 +703,11 @@ static void setup_worker_qconf(app_args_t *args) arg->thr_idx = i; j = i % if_count; port = &global.l3fwd_pktios[j]; - rxq_idx = arg->pktio[j].nb_rxq; - arg->pktio[j].rxq[rxq_idx] = + arg->pktio[0].rxq[0] = port->rxq_idx % port->nb_rxq; - arg->pktio[j].nb_rxq++; + arg->pktio[0].nb_rxq = 1; + arg->pktio[0].if_idx = j; + arg->nb_pktio = 1; port->rxq_idx++; } } else { @@ -705,9 +717,12 @@ static void setup_worker_qconf(app_args_t *args) arg->thr_idx = j; port = &global.l3fwd_pktios[i]; rxq_idx = arg->pktio[i].nb_rxq; - arg->pktio[i].rxq[rxq_idx] = + pktio = arg->nb_pktio; + arg->pktio[pktio].rxq[rxq_idx] = port->rxq_idx % port->nb_rxq; - arg->pktio[i].nb_rxq++; + arg->pktio[pktio].nb_rxq++; + arg->pktio[pktio].if_idx = i; + arg->nb_pktio++; port->rxq_idx++; } } @@ -747,12 +762,21 @@ static void setup_worker_qconf(app_args_t *args) /* put the queue into worker_args */ arg = &global.worker_args[q->core_idx]; - rxq_idx = arg->pktio[q->if_idx].nb_rxq; - arg->pktio[q->if_idx].rxq[rxq_idx] = q->rxq_idx; - arg->pktio[q->if_idx].nb_rxq++; + + /* Check if interface already has queues configured */ + for (j = 0; j < args->if_count; j++) { + if (arg->pktio[j].if_idx == q->if_idx) + break; + } + if (j == args->if_count) + j = arg->nb_pktio++; + + rxq_idx = arg->pktio[j].nb_rxq; + arg->pktio[j].rxq[rxq_idx] = q->rxq_idx; + arg->pktio[j].nb_rxq++; + arg->pktio[j].if_idx = q->if_idx; arg->thr_idx = q->core_idx; } - /* distribute tx queues among threads */ for (i = 0; i < args->worker_count; i++) { arg = &global.worker_args[i]; @@ -821,7 +845,7 @@ static void setup_worker_qconf(app_args_t *args) static void print_qconf_table(app_args_t *args) { - int i, j, k, qid; + int i, j, k, qid, if_idx; char buf[32]; struct thread_arg_s *thr_arg; @@ -836,7 +860,9 @@ static void print_qconf_table(app_args_t *args) if (!thr_arg->pktio[j].nb_rxq) continue; - snprintf(buf, 32, "%s/%d", args->if_names[j], j); + if_idx = thr_arg->pktio[j].if_idx; + snprintf(buf, 32, "%s/%d", args->if_names[if_idx], + if_idx); for (k = 0; k < MAX_NB_QUEUE; k++) { qid = thr_arg->pktio[j].rxq[k]; if (qid != INVALID_ID) @@ -948,6 +974,7 @@ int main(int argc, char **argv) for (j = 0; j < MAX_NB_PKTIO; j++) { thr_arg->thr_idx = INVALID_ID; thr_arg->pktio[j].txq_idx = INVALID_ID; + thr_arg->pktio[j].if_idx = INVALID_ID; memset(thr_arg->pktio[j].rxq, INVALID_ID, sizeof(thr_arg->pktio[j].rxq)); } @@ -1069,7 +1096,6 @@ int main(int argc, char **argv) odp_cpumask_t thr_mask; arg = &global.worker_args[i]; - arg->nb_pktio = args->if_count; odp_cpumask_zero(&thr_mask); odp_cpumask_set(&thr_mask, cpu); thr_params.arg = arg; commit 3c78ee3f2c9274ebfd6b51e1ec203218b792fc9b Author: Matias Elo <matias.elo(a)nokia.com> Date: Mon Oct 3 14:49:15 2016 +0300 example: l3fwd: remove unnecessary output arguments There is no need to save the number of data bytes remaining in the segment when calling odp_packet_l3_ptr(). Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Mike Holmes <mike.holmes(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/example/l3fwd/odp_l3fwd.c b/example/l3fwd/odp_l3fwd.c index df412af..0f8068f 100644 --- a/example/l3fwd/odp_l3fwd.c +++ b/example/l3fwd/odp_l3fwd.c @@ -182,10 +182,9 @@ static int l3fwd_pkt_hash(odp_packet_t pkt, int sif) odph_ethhdr_t *eth; odph_udphdr_t *udp; odph_ipv4hdr_t *ip; - uint32_t len; int dif; - ip = odp_packet_l3_ptr(pkt, &len); + ip = odp_packet_l3_ptr(pkt, NULL); key.dst_ip = odp_be_to_cpu_32(ip->dst_addr); key.src_ip = odp_be_to_cpu_32(ip->src_addr); key.proto = ip->proto; @@ -222,11 +221,10 @@ static int l3fwd_pkt_lpm(odp_packet_t pkt, int sif) { odph_ipv4hdr_t *ip; odph_ethhdr_t *eth; - uint32_t len; int dif; int ret; - ip = odp_packet_l3_ptr(pkt, &len); + ip = odp_packet_l3_ptr(pkt, NULL); ipv4_dec_ttl_csum_update(ip); eth = odp_packet_l2_ptr(pkt, NULL); commit a45b9dad99ea5e50cdafada1bfbb2bef68467263 Author: Matias Elo <matias.elo(a)nokia.com> Date: Mon Oct 3 14:49:14 2016 +0300 example: l3fwd: make packet error check optional Make packet error check optional as it forces full packet parse. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Mike Holmes <mike.holmes(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/example/l3fwd/odp_l3fwd.c b/example/l3fwd/odp_l3fwd.c index 95c3d85..df412af 100644 --- a/example/l3fwd/odp_l3fwd.c +++ b/example/l3fwd/odp_l3fwd.c @@ -80,6 +80,7 @@ typedef struct { uint32_t duration; /* seconds to run */ uint8_t hash_mode; /* 1:hash, 0:lpm */ uint8_t dest_mac_changed[MAX_NB_PKTIO]; /* 1: dest mac from cmdline */ + int error_check; /* Check packets for errors */ } app_args_t; struct { @@ -241,10 +242,10 @@ static int l3fwd_pkt_lpm(odp_packet_t pkt, int sif) } /** - * Drop packets which input parsing marked as containing errors. + * Drop unsupported packets and packets containing errors. * - * Frees packets with error and modifies pkt_tbl[] to only contain packets with - * no detected errors. + * Frees packets with errors or unsupported protocol and modifies pkt_tbl[] to + * only contain valid packets. * * @param pkt_tbl Array of packets * @param num Number of packets in pkt_tbl[] @@ -256,12 +257,16 @@ static inline int drop_err_pkts(odp_packet_t pkt_tbl[], unsigned num) odp_packet_t pkt; unsigned dropped = 0; unsigned i, j; + int err; for (i = 0, j = 0; i < num; ++i) { pkt = pkt_tbl[i]; + err = 0; - if (odp_unlikely(odp_packet_has_error(pkt) || - !odp_packet_has_ipv4(pkt))) { + if (global.cmd_args.error_check) + err = odp_packet_has_error(pkt); + + if (odp_unlikely(err || !odp_packet_has_ipv4(pkt))) { odp_packet_free(pkt); dropped++; } else if (odp_unlikely(i != j++)) { @@ -475,6 +480,8 @@ static void print_usage(char *progname) " -q, --queue Configure rx queue(s) for port\n" " optional, format: [(port, queue, thread),...]\n" " for example: -q '(0, 0, 1),(1,0,2)'\n" + " -e, --error_check 0: Don't check packet errors (default)\n" + " 1: Check packet errors\n" " -h, --help Display help and exit.\n\n" "\n", NO_PATH(progname), NO_PATH(progname) ); @@ -491,16 +498,17 @@ static void parse_cmdline_args(int argc, char *argv[], app_args_t *args) static struct option longopts[] = { {"interface", required_argument, NULL, 'i'}, /* return 'i' */ {"route", required_argument, NULL, 'r'}, /* return 'r' */ - {"style", optional_argument, NULL, 's'}, /* return 's' */ - {"duration", optional_argument, NULL, 'd'}, /* return 'd' */ - {"thread", optional_argument, NULL, 't'}, /* return 't' */ - {"queue", optional_argument, NULL, 'q'}, /* return 'q' */ + {"style", required_argument, NULL, 's'}, /* return 's' */ + {"duration", required_argument, NULL, 'd'}, /* return 'd' */ + {"thread", required_argument, NULL, 't'}, /* return 't' */ + {"queue", required_argument, NULL, 'q'}, /* return 'q' */ + {"error_check", required_argument, NULL, 'e'}, {"help", no_argument, NULL, 'h'}, /* return 'h' */ {NULL, 0, NULL, 0} }; while (1) { - opt = getopt_long(argc, argv, "+s:t:d:i:r:q:h", + opt = getopt_long(argc, argv, "+s:t:d:i:r:q:e:h", longopts, &long_index); if (opt == -1) @@ -585,6 +593,10 @@ static void parse_cmdline_args(int argc, char *argv[], app_args_t *args) args->route_str[route_index++] = local; break; + case 'e': + args->error_check = atoi(optarg); + break; + case 'h': print_usage(argv[0]); exit(EXIT_SUCCESS); commit 91df9eab8dd6ed2aeaf367575c42fe0979435431 Author: Matias Elo <matias.elo(a)nokia.com> Date: Mon Oct 3 14:49:13 2016 +0300 example: l3fwd: optimize ip checksum update When decrementing TTL the IPv4 checksum can be incrementally updated. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Mike Holmes <mike.holmes(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/example/l3fwd/odp_l3fwd.c b/example/l3fwd/odp_l3fwd.c index 44778b0..95c3d85 100644 --- a/example/l3fwd/odp_l3fwd.c +++ b/example/l3fwd/odp_l3fwd.c @@ -158,6 +158,22 @@ static void setup_fwd_db(void) } } +/** + * Decrement TTL and incrementally update checksum + * + * @param ip IPv4 header + */ +static inline void ipv4_dec_ttl_csum_update(odph_ipv4hdr_t *ip) +{ + uint16_t a = ~odp_cpu_to_be_16(1 << 8); + + ip->ttl--; + if (ip->chksum >= a) + ip->chksum -= a; + else + ip->chksum += odp_cpu_to_be_16(1 << 8); +} + static int l3fwd_pkt_hash(odp_packet_t pkt, int sif) { fwd_db_entry_t *entry; @@ -186,8 +202,7 @@ static int l3fwd_pkt_hash(odp_packet_t pkt, int sif) key.dst_port = 0; } entry = find_fwd_db_entry(&key); - ip->ttl--; - ip->chksum = odph_ipv4_csum_update(pkt); + ipv4_dec_ttl_csum_update(ip); eth = odp_packet_l2_ptr(pkt, NULL); if (entry) { eth->src = entry->src_mac; @@ -211,8 +226,7 @@ static int l3fwd_pkt_lpm(odp_packet_t pkt, int sif) int ret; ip = odp_packet_l3_ptr(pkt, &len); - ip->ttl--; - ip->chksum = odph_ipv4_csum_update(pkt); + ipv4_dec_ttl_csum_update(ip); eth = odp_packet_l2_ptr(pkt, NULL); /* network byte order maybe different from host */ commit 018c59b52d91dc0ef4ded90d4a76a8b053d078b6 Author: Matias Elo <matias.elo(a)nokia.com> Date: Mon Oct 3 14:49:12 2016 +0300 example: l3fwd: add missing gitignores Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Mike Holmes <mike.holmes(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/example/l3fwd/.gitignore b/example/l3fwd/.gitignore index 74e501f..3411830 100644 --- a/example/l3fwd/.gitignore +++ b/example/l3fwd/.gitignore @@ -1 +1,3 @@ odp_l3fwd +*.log +*.trs ----------------------------------------------------------------------- Summary of changes: example/l3fwd/.gitignore | 2 + example/l3fwd/odp_l3fwd.c | 220 ++++++++++++++++++++++++++++------------------ 2 files changed, 137 insertions(+), 85 deletions(-) hooks/post-receive --

7 years, 5 months

1
0
0 0

[COMMIT] branch master updated. v1.10.1.0-138-g5fff93c

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 5fff93ce094807c460ab7a1bf9b7af429143a19d (commit) via f73efb129c474301d6f70d727452c0c69ce0e309 (commit) via 144a1d8c4d0265ff3ff6ae740b4e99045645e59d (commit) from e89d5d15852b9a64e3aaf115b59c87d07092717d (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 5fff93ce094807c460ab7a1bf9b7af429143a19d Author: Matias Elo <matias.elo(a)nokia.com> Date: Tue Sep 13 17:30:12 2016 +0300 linux-gen: packet: identify sctp packets Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-and-tested-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/include/protocols/ip.h b/platform/linux-generic/include/protocols/ip.h index d5277fb..6c089e3 100644 --- a/platform/linux-generic/include/protocols/ip.h +++ b/platform/linux-generic/include/protocols/ip.h @@ -154,6 +154,8 @@ typedef struct ODP_PACKED { #define _ODP_IPPROTO_FRAG 0x2C /**< IPv6 Fragment (44) */ #define _ODP_IPPROTO_AH 0x33 /**< Authentication Header (51) */ #define _ODP_IPPROTO_ESP 0x32 /**< Encapsulating Security Payload (50) */ +#define _ODP_IPPROTO_SCTP 0x84 /**< Stream Control Transmission protocol + (132) */ #define _ODP_IPPROTO_INVALID 0xFF /**< Reserved invalid by IANA */ /**@}*/ diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index df6fd1e..714794a 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -1328,6 +1328,10 @@ int packet_parse_common(packet_parser_t *prs, const uint8_t *ptr, prs->input_flags.ipsec_esp = 1; break; + case _ODP_IPPROTO_SCTP: + prs->input_flags.sctp = 1; + break; + default: prs->input_flags.l4 = 0; prs->l4_offset = ODP_PACKET_OFFSET_INVALID; commit f73efb129c474301d6f70d727452c0c69ce0e309 Author: Matias Elo <matias.elo(a)nokia.com> Date: Tue Sep 13 17:30:11 2016 +0300 linux-gen: packet: parse only required packet header layers Improve performance by parsing only the required protocol layers. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-and-tested-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/include/odp_packet_internal.h b/platform/linux-generic/include/odp_packet_internal.h index 9b4f59e..b23ad9c 100644 --- a/platform/linux-generic/include/odp_packet_internal.h +++ b/platform/linux-generic/include/odp_packet_internal.h @@ -328,9 +328,6 @@ int packet_alloc_multi(odp_pool_t pool_hdl, uint32_t len, /* Fill in parser metadata for L2 */ void packet_parse_l2(packet_parser_t *prs, uint32_t frame_len); -/* Perform full packet parse */ -int packet_parse_full(odp_packet_hdr_t *pkt_hdr); - /* Perform packet parse up to a given protocol layer */ int packet_parse_layer(odp_packet_hdr_t *pkt_hdr, layer_t layer); diff --git a/platform/linux-generic/odp_classification.c b/platform/linux-generic/odp_classification.c index 868058d..82760e8 100644 --- a/platform/linux-generic/odp_classification.c +++ b/platform/linux-generic/odp_classification.c @@ -775,7 +775,7 @@ static inline cos_t *cls_select_cos(pktio_entry_t *entry, /* Check for lazy parse needed */ if (packet_parse_not_complete(pkt_hdr)) - packet_parse_full(pkt_hdr); + packet_parse_layer(pkt_hdr, LAYER_ALL); /* Return error cos for error packet */ if (pkt_hdr->p.error_flags.all) diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index 5f84869..df6fd1e 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -476,8 +476,8 @@ void *odp_packet_l3_ptr(odp_packet_t pkt, uint32_t *len) { odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt); - if (packet_parse_not_complete(pkt_hdr)) - packet_parse_full(pkt_hdr); + if (pkt_hdr->p.parsed_layers < LAYER_L3) + packet_parse_layer(pkt_hdr, LAYER_L3); return packet_map(pkt_hdr, pkt_hdr->p.l3_offset, len); } @@ -485,8 +485,8 @@ uint32_t odp_packet_l3_offset(odp_packet_t pkt) { odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt); - if (packet_parse_not_complete(pkt_hdr)) - packet_parse_full(pkt_hdr); + if (pkt_hdr->p.parsed_layers < LAYER_L3) + packet_parse_layer(pkt_hdr, LAYER_L3); return pkt_hdr->p.l3_offset; } @@ -497,8 +497,8 @@ int odp_packet_l3_offset_set(odp_packet_t pkt, uint32_t offset) if (offset >= pkt_hdr->frame_len) return -1; - if (packet_parse_not_complete(pkt_hdr)) - packet_parse_full(pkt_hdr); + if (pkt_hdr->p.parsed_layers < LAYER_L3) + packet_parse_layer(pkt_hdr, LAYER_L3); pkt_hdr->p.l3_offset = offset; return 0; } @@ -507,8 +507,8 @@ void *odp_packet_l4_ptr(odp_packet_t pkt, uint32_t *len) { odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt); - if (packet_parse_not_complete(pkt_hdr)) - packet_parse_full(pkt_hdr); + if (pkt_hdr->p.parsed_layers < LAYER_L4) + packet_parse_layer(pkt_hdr, LAYER_L4); return packet_map(pkt_hdr, pkt_hdr->p.l4_offset, len); } @@ -516,8 +516,8 @@ uint32_t odp_packet_l4_offset(odp_packet_t pkt) { odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt); - if (packet_parse_not_complete(pkt_hdr)) - packet_parse_full(pkt_hdr); + if (pkt_hdr->p.parsed_layers < LAYER_L4) + packet_parse_layer(pkt_hdr, LAYER_L4); return pkt_hdr->p.l4_offset; } @@ -528,8 +528,8 @@ int odp_packet_l4_offset_set(odp_packet_t pkt, uint32_t offset) if (offset >= pkt_hdr->frame_len) return -1; - if (packet_parse_not_complete(pkt_hdr)) - packet_parse_full(pkt_hdr); + if (pkt_hdr->p.parsed_layers < LAYER_L4) + packet_parse_layer(pkt_hdr, LAYER_L4); pkt_hdr->p.l4_offset = offset; return 0; } @@ -1354,18 +1354,6 @@ parse_exit: /** * Simple packet parser */ -int packet_parse_full(odp_packet_hdr_t *pkt_hdr) -{ - uint32_t seg_len; - void *base = packet_map(pkt_hdr, 0, &seg_len); - - return packet_parse_common(&pkt_hdr->p, base, pkt_hdr->frame_len, - seg_len, LAYER_ALL); -} - -/** - * Simple packet parser - */ int packet_parse_layer(odp_packet_hdr_t *pkt_hdr, layer_t layer) { uint32_t seg_len; diff --git a/platform/linux-generic/odp_packet_flags.c b/platform/linux-generic/odp_packet_flags.c index b88324c..798fa11 100644 --- a/platform/linux-generic/odp_packet_flags.c +++ b/platform/linux-generic/odp_packet_flags.c @@ -7,17 +7,17 @@ #include <odp/api/packet_flags.h> #include <odp_packet_internal.h> -#define retflag(pkt, x) do { \ +#define retflag(pkt, x, layer) do { \ odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt); \ - if (packet_parse_not_complete(pkt_hdr)) \ - packet_parse_full(pkt_hdr); \ + if (pkt_hdr->p.parsed_layers < layer) \ + packet_parse_layer(pkt_hdr, layer); \ return pkt_hdr->p.x; \ } while (0) -#define setflag(pkt, x, v) do { \ +#define setflag(pkt, x, v, layer) do { \ odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt); \ - if (packet_parse_not_complete(pkt_hdr)) \ - packet_parse_full(pkt_hdr); \ + if (pkt_hdr->p.parsed_layers < layer) \ + packet_parse_layer(pkt_hdr, layer); \ pkt_hdr->p.x = v & 1; \ } while (0) @@ -26,7 +26,7 @@ int odp_packet_has_error(odp_packet_t pkt) odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt); if (packet_parse_not_complete(pkt_hdr)) - packet_parse_full(pkt_hdr); + packet_parse_layer(pkt_hdr, LAYER_ALL); return odp_packet_hdr(pkt)->p.error_flags.all != 0; } @@ -51,30 +51,30 @@ int odp_packet_has_l2_error(odp_packet_t pkt) int odp_packet_has_l3(odp_packet_t pkt) { - retflag(pkt, input_flags.l3); + retflag(pkt, input_flags.l3, LAYER_L3); } int odp_packet_has_l3_error(odp_packet_t pkt) { odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt); - if (packet_parse_not_complete(pkt_hdr)) - packet_parse_full(pkt_hdr); + if (pkt_hdr->p.parsed_layers < LAYER_L3) + packet_parse_layer(pkt_hdr, LAYER_L3); return pkt_hdr->p.error_flags.ip_err; } int odp_packet_has_l4(odp_packet_t pkt) { - retflag(pkt, input_flags.l4); + retflag(pkt, input_flags.l4, LAYER_L4); } int odp_packet_has_l4_error(odp_packet_t pkt) { odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt); - if (packet_parse_not_complete(pkt_hdr)) - packet_parse_full(pkt_hdr); + if (pkt_hdr->p.parsed_layers < LAYER_L4) + packet_parse_layer(pkt_hdr, LAYER_L4); return pkt_hdr->p.error_flags.tcp_err | pkt_hdr->p.error_flags.udp_err; } @@ -88,12 +88,12 @@ int odp_packet_has_eth(odp_packet_t pkt) int odp_packet_has_eth_bcast(odp_packet_t pkt) { - retflag(pkt, input_flags.eth_bcast); + retflag(pkt, input_flags.eth_bcast, LAYER_L2); } int odp_packet_has_eth_mcast(odp_packet_t pkt) { - retflag(pkt, input_flags.eth_mcast); + retflag(pkt, input_flags.eth_mcast, LAYER_L2); } int odp_packet_has_jumbo(odp_packet_t pkt) @@ -105,72 +105,72 @@ int odp_packet_has_jumbo(odp_packet_t pkt) int odp_packet_has_vlan(odp_packet_t pkt) { - retflag(pkt, input_flags.vlan); + retflag(pkt, input_flags.vlan, LAYER_L2); } int odp_packet_has_vlan_qinq(odp_packet_t pkt) { - retflag(pkt, input_flags.vlan_qinq); + retflag(pkt, input_flags.vlan_qinq, LAYER_L2); } int odp_packet_has_arp(odp_packet_t pkt) { - retflag(pkt, input_flags.arp); + retflag(pkt, input_flags.arp, LAYER_L3); } int odp_packet_has_ipv4(odp_packet_t pkt) { - retflag(pkt, input_flags.ipv4); + retflag(pkt, input_flags.ipv4, LAYER_L3); } int odp_packet_has_ipv6(odp_packet_t pkt) { - retflag(pkt, input_flags.ipv6); + retflag(pkt, input_flags.ipv6, LAYER_L3); } int odp_packet_has_ip_bcast(odp_packet_t pkt) { - retflag(pkt, input_flags.ip_bcast); + retflag(pkt, input_flags.ip_bcast, LAYER_L3); } int odp_packet_has_ip_mcast(odp_packet_t pkt) { - retflag(pkt, input_flags.ip_mcast); + retflag(pkt, input_flags.ip_mcast, LAYER_L3); } int odp_packet_has_ipfrag(odp_packet_t pkt) { - retflag(pkt, input_flags.ipfrag); + retflag(pkt, input_flags.ipfrag, LAYER_L3); } int odp_packet_has_ipopt(odp_packet_t pkt) { - retflag(pkt, input_flags.ipopt); + retflag(pkt, input_flags.ipopt, LAYER_L3); } int odp_packet_has_ipsec(odp_packet_t pkt) { - retflag(pkt, input_flags.ipsec); + retflag(pkt, input_flags.ipsec, LAYER_L4); } int odp_packet_has_udp(odp_packet_t pkt) { - retflag(pkt, input_flags.udp); + retflag(pkt, input_flags.udp, LAYER_L4); } int odp_packet_has_tcp(odp_packet_t pkt) { - retflag(pkt, input_flags.tcp); + retflag(pkt, input_flags.tcp, LAYER_L4); } int odp_packet_has_sctp(odp_packet_t pkt) { - retflag(pkt, input_flags.sctp); + retflag(pkt, input_flags.sctp, LAYER_L4); } int odp_packet_has_icmp(odp_packet_t pkt) { - retflag(pkt, input_flags.icmp); + retflag(pkt, input_flags.icmp, LAYER_L4); } int odp_packet_has_flow_hash(odp_packet_t pkt) @@ -189,7 +189,7 @@ int odp_packet_has_ts(odp_packet_t pkt) odp_packet_color_t odp_packet_color(odp_packet_t pkt) { - retflag(pkt, input_flags.color); + retflag(pkt, input_flags.color, LAYER_ALL); } void odp_packet_color_set(odp_packet_t pkt, odp_packet_color_t color) @@ -197,7 +197,7 @@ void odp_packet_color_set(odp_packet_t pkt, odp_packet_color_t color) odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt); if (packet_parse_not_complete(pkt_hdr)) - packet_parse_full(pkt_hdr); + packet_parse_layer(pkt_hdr, LAYER_ALL); pkt_hdr->p.input_flags.color = color; } @@ -207,19 +207,19 @@ odp_bool_t odp_packet_drop_eligible(odp_packet_t pkt) odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt); if (packet_parse_not_complete(pkt_hdr)) - packet_parse_full(pkt_hdr); + packet_parse_layer(pkt_hdr, LAYER_ALL); return !pkt_hdr->p.input_flags.nodrop; } void odp_packet_drop_eligible_set(odp_packet_t pkt, odp_bool_t drop) { - setflag(pkt, input_flags.nodrop, !drop); + setflag(pkt, input_flags.nodrop, !drop, LAYER_ALL); } int8_t odp_packet_shaper_len_adjust(odp_packet_t pkt) { - retflag(pkt, output_flags.shaper_len_adj); + retflag(pkt, output_flags.shaper_len_adj, LAYER_ALL); } void odp_packet_shaper_len_adjust_set(odp_packet_t pkt, int8_t adj) @@ -227,7 +227,7 @@ void odp_packet_shaper_len_adjust_set(odp_packet_t pkt, int8_t adj) odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt); if (packet_parse_not_complete(pkt_hdr)) - packet_parse_full(pkt_hdr); + packet_parse_layer(pkt_hdr, LAYER_ALL); pkt_hdr->p.output_flags.shaper_len_adj = adj; } @@ -236,107 +236,107 @@ void odp_packet_shaper_len_adjust_set(odp_packet_t pkt, int8_t adj) void odp_packet_has_l2_set(odp_packet_t pkt, int val) { - setflag(pkt, input_flags.l2, val); + setflag(pkt, input_flags.l2, val, LAYER_L2); } void odp_packet_has_l3_set(odp_packet_t pkt, int val) { - setflag(pkt, input_flags.l3, val); + setflag(pkt, input_flags.l3, val, LAYER_L3); } void odp_packet_has_l4_set(odp_packet_t pkt, int val) { - setflag(pkt, input_flags.l4, val); + setflag(pkt, input_flags.l4, val, LAYER_L4); } void odp_packet_has_eth_set(odp_packet_t pkt, int val) { - setflag(pkt, input_flags.eth, val); + setflag(pkt, input_flags.eth, val, LAYER_L2); } void odp_packet_has_eth_bcast_set(odp_packet_t pkt, int val) { - setflag(pkt, input_flags.eth_bcast, val); + setflag(pkt, input_flags.eth_bcast, val, LAYER_L2); } void odp_packet_has_eth_mcast_set(odp_packet_t pkt, int val) { - setflag(pkt, input_flags.eth_mcast, val); + setflag(pkt, input_flags.eth_mcast, val, LAYER_L2); } void odp_packet_has_jumbo_set(odp_packet_t pkt, int val) { - setflag(pkt, input_flags.jumbo, val); + setflag(pkt, input_flags.jumbo, val, LAYER_L2); } void odp_packet_has_vlan_set(odp_packet_t pkt, int val) { - setflag(pkt, input_flags.vlan, val); + setflag(pkt, input_flags.vlan, val, LAYER_L2); } void odp_packet_has_vlan_qinq_set(odp_packet_t pkt, int val) { - setflag(pkt, input_flags.vlan_qinq, val); + setflag(pkt, input_flags.vlan_qinq, val, LAYER_L2); } void odp_packet_has_arp_set(odp_packet_t pkt, int val) { - setflag(pkt, input_flags.arp, val); + setflag(pkt, input_flags.arp, val, LAYER_L3); } void odp_packet_has_ipv4_set(odp_packet_t pkt, int val) { - setflag(pkt, input_flags.ipv4, val); + setflag(pkt, input_flags.ipv4, val, LAYER_L3); } void odp_packet_has_ipv6_set(odp_packet_t pkt, int val) { - setflag(pkt, input_flags.ipv6, val); + setflag(pkt, input_flags.ipv6, val, LAYER_L3); } void odp_packet_has_ip_bcast_set(odp_packet_t pkt, int val) { - setflag(pkt, input_flags.ip_bcast, val); + setflag(pkt, input_flags.ip_bcast, val, LAYER_L3); } void odp_packet_has_ip_mcast_set(odp_packet_t pkt, int val) { - setflag(pkt, input_flags.ip_mcast, val); + setflag(pkt, input_flags.ip_mcast, val, LAYER_L3); } void odp_packet_has_ipfrag_set(odp_packet_t pkt, int val) { - setflag(pkt, input_flags.ipfrag, val); + setflag(pkt, input_flags.ipfrag, val, LAYER_L3); } void odp_packet_has_ipopt_set(odp_packet_t pkt, int val) { - setflag(pkt, input_flags.ipopt, val); + setflag(pkt, input_flags.ipopt, val, LAYER_L3); } void odp_packet_has_ipsec_set(odp_packet_t pkt, int val) { - setflag(pkt, input_flags.ipsec, val); + setflag(pkt, input_flags.ipsec, val, LAYER_L4); } void odp_packet_has_udp_set(odp_packet_t pkt, int val) { - setflag(pkt, input_flags.udp, val); + setflag(pkt, input_flags.udp, val, LAYER_L4); } void odp_packet_has_tcp_set(odp_packet_t pkt, int val) { - setflag(pkt, input_flags.tcp, val); + setflag(pkt, input_flags.tcp, val, LAYER_L4); } void odp_packet_has_sctp_set(odp_packet_t pkt, int val) { - setflag(pkt, input_flags.sctp, val); + setflag(pkt, input_flags.sctp, val, LAYER_L4); } void odp_packet_has_icmp_set(odp_packet_t pkt, int val) { - setflag(pkt, input_flags.icmp, val); + setflag(pkt, input_flags.icmp, val, LAYER_L4); } void odp_packet_has_flow_hash_clr(odp_packet_t pkt) commit 144a1d8c4d0265ff3ff6ae740b4e99045645e59d Author: Matias Elo <matias.elo(a)nokia.com> Date: Tue Sep 13 17:30:10 2016 +0300 linux-gen: packet: enable parsing only selected packet header layers Enable parsing packet headers up to a given protocol layer. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-and-tested-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/include/odp_packet_internal.h b/platform/linux-generic/include/odp_packet_internal.h index 392d670..9b4f59e 100644 --- a/platform/linux-generic/include/odp_packet_internal.h +++ b/platform/linux-generic/include/odp_packet_internal.h @@ -41,7 +41,6 @@ typedef union { struct { uint64_t parsed_l2:1; /**< L2 parsed */ - uint64_t parsed_all:1;/**< Parsing complete */ uint64_t dst_queue:1; /**< Dst queue present */ uint64_t flow_hash:1; /**< Flow hash present */ @@ -131,6 +130,18 @@ ODP_STATIC_ASSERT(sizeof(output_flags_t) == sizeof(uint32_t), "OUTPUT_FLAGS_SIZE_ERROR"); /** + * Protocol stack layers + */ +typedef enum { + LAYER_NONE = 0, + LAYER_L1, + LAYER_L2, + LAYER_L3, + LAYER_L4, + LAYER_ALL +} layer_t; + +/** * Packet parser metadata */ typedef struct { @@ -145,6 +156,10 @@ typedef struct { uint32_t l3_len; /**< Layer 3 length */ uint32_t l4_len; /**< Layer 4 length */ + layer_t parsed_layers; /**< Highest parsed protocol stack layer */ + uint16_t ethtype; /**< EtherType */ + uint8_t ip_proto; /**< IP protocol */ + } packet_parser_t; /** @@ -300,7 +315,7 @@ static inline int packet_parse_l2_not_done(packet_parser_t *prs) static inline int packet_parse_not_complete(odp_packet_hdr_t *pkt_hdr) { - return !pkt_hdr->p.input_flags.parsed_all; + return pkt_hdr->p.parsed_layers != LAYER_ALL; } /* Forward declarations */ @@ -316,6 +331,9 @@ void packet_parse_l2(packet_parser_t *prs, uint32_t frame_len); /* Perform full packet parse */ int packet_parse_full(odp_packet_hdr_t *pkt_hdr); +/* Perform packet parse up to a given protocol layer */ +int packet_parse_layer(odp_packet_hdr_t *pkt_hdr, layer_t layer); + /* Reset parser metadata for a new parse */ void packet_parse_reset(odp_packet_hdr_t *pkt_hdr); @@ -349,7 +367,7 @@ static inline void packet_set_ts(odp_packet_hdr_t *pkt_hdr, odp_time_t *ts) } int packet_parse_common(packet_parser_t *pkt_hdr, const uint8_t *ptr, - uint32_t pkt_len, uint32_t seg_len); + uint32_t pkt_len, uint32_t seg_len, layer_t layer); int _odp_cls_parse(odp_packet_hdr_t *pkt_hdr, const uint8_t *parseptr); diff --git a/platform/linux-generic/odp_classification.c b/platform/linux-generic/odp_classification.c index ea223bf..868058d 100644 --- a/platform/linux-generic/odp_classification.c +++ b/platform/linux-generic/odp_classification.c @@ -821,7 +821,7 @@ int cls_classify_packet(pktio_entry_t *entry, const uint8_t *base, packet_parse_reset(pkt_hdr); packet_set_len(pkt_hdr, pkt_len); - packet_parse_common(&pkt_hdr->p, base, pkt_len, seg_len); + packet_parse_common(&pkt_hdr->p, base, pkt_len, seg_len, LAYER_ALL); cos = cls_select_cos(entry, base, pkt_hdr); if (cos == NULL) diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index c4cf324..5f84869 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -30,12 +30,13 @@ static inline void packet_parse_disable(odp_packet_hdr_t *pkt_hdr) { pkt_hdr->p.input_flags.parsed_l2 = 1; - pkt_hdr->p.input_flags.parsed_all = 1; + pkt_hdr->p.parsed_layers = LAYER_ALL; } void packet_parse_reset(odp_packet_hdr_t *pkt_hdr) { /* Reset parser metadata before new parse */ + pkt_hdr->p.parsed_layers = LAYER_NONE; pkt_hdr->p.error_flags.all = 0; pkt_hdr->p.input_flags.all = 0; pkt_hdr->p.output_flags.all = 0; @@ -50,6 +51,8 @@ void packet_parse_reset(odp_packet_hdr_t *pkt_hdr) static void packet_init(pool_entry_t *pool, odp_packet_hdr_t *pkt_hdr, size_t size, int parse) { + pkt_hdr->p.parsed_layers = LAYER_NONE; + pkt_hdr->p.input_flags.all = 0; pkt_hdr->p.output_flags.all = 0; pkt_hdr->p.error_flags.all = 0; @@ -1166,151 +1169,185 @@ void packet_parse_l2(packet_parser_t *prs, uint32_t frame_len) } /** - * Parse common packet headers + * Parse common packet headers up to given layer * * The function expects at least PACKET_PARSE_SEG_LEN bytes of data to be * available from the ptr. */ int packet_parse_common(packet_parser_t *prs, const uint8_t *ptr, - uint32_t frame_len, uint32_t seg_len) + uint32_t frame_len, uint32_t seg_len, layer_t layer) { - const _odp_ethhdr_t *eth; - const _odp_vlanhdr_t *vlan; - uint16_t ethtype; uint32_t offset; - uint8_t ip_proto = 0; const uint8_t *parseptr; - uint16_t macaddr0, macaddr2, macaddr4; - - offset = sizeof(_odp_ethhdr_t); - if (packet_parse_l2_not_done(prs)) - packet_parse_l2(prs, frame_len); - - eth = (const _odp_ethhdr_t *)ptr; - - /* Handle Ethernet broadcast/multicast addresses */ - macaddr0 = odp_be_to_cpu_16(*((const uint16_t *)(const void *)eth)); - prs->input_flags.eth_mcast = (macaddr0 & 0x0100) == 0x0100; - - if (macaddr0 == 0xffff) { - macaddr2 = - odp_be_to_cpu_16(*((const uint16_t *) - (const void *)eth + 1)); - macaddr4 = - odp_be_to_cpu_16(*((const uint16_t *) - (const void *)eth + 2)); - prs->input_flags.eth_bcast = - (macaddr2 == 0xffff) && (macaddr4 == 0xffff); - } else { - prs->input_flags.eth_bcast = 0; - } - /* Get Ethertype */ - ethtype = odp_be_to_cpu_16(eth->type); - parseptr = (const uint8_t *)(eth + 1); - - /* Check for SNAP vs. DIX */ - if (ethtype < _ODP_ETH_LEN_MAX) { - prs->input_flags.snap = 1; - if (ethtype > frame_len - offset) { - prs->error_flags.snap_len = 1; - goto parse_exit; + switch (prs->parsed_layers) { + case LAYER_NONE: + case LAYER_L2: + { + const _odp_ethhdr_t *eth; + uint16_t macaddr0, macaddr2, macaddr4; + const _odp_vlanhdr_t *vlan; + + offset = sizeof(_odp_ethhdr_t); + if (packet_parse_l2_not_done(prs)) + packet_parse_l2(prs, frame_len); + + eth = (const _odp_ethhdr_t *)ptr; + + /* Handle Ethernet broadcast/multicast addresses */ + macaddr0 = odp_be_to_cpu_16(*((const uint16_t *) + (const void *)eth)); + prs->input_flags.eth_mcast = (macaddr0 & 0x0100) == 0x0100; + + if (macaddr0 == 0xffff) { + macaddr2 = + odp_be_to_cpu_16(*((const uint16_t *) + (const void *)eth + 1)); + macaddr4 = + odp_be_to_cpu_16(*((const uint16_t *) + (const void *)eth + 2)); + prs->input_flags.eth_bcast = + (macaddr2 == 0xffff) && (macaddr4 == 0xffff); + } else { + prs->input_flags.eth_bcast = 0; } - ethtype = odp_be_to_cpu_16(*((const uint16_t *) - (uintptr_t)(parseptr + 6))); - offset += 8; - parseptr += 8; - } - - /* Parse the VLAN header(s), if present */ - if (ethtype == _ODP_ETHTYPE_VLAN_OUTER) { - prs->input_flags.vlan_qinq = 1; - prs->input_flags.vlan = 1; - vlan = (const _odp_vlanhdr_t *)parseptr; - ethtype = odp_be_to_cpu_16(vlan->type); - offset += sizeof(_odp_vlanhdr_t); - parseptr += sizeof(_odp_vlanhdr_t); - } - - if (ethtype == _ODP_ETHTYPE_VLAN) { - prs->input_flags.vlan = 1; - vlan = (const _odp_vlanhdr_t *)parseptr; - ethtype = odp_be_to_cpu_16(vlan->type); - offset += sizeof(_odp_vlanhdr_t); - parseptr += sizeof(_odp_vlanhdr_t); - } - - /* Set l3_offset+flag only for known ethtypes */ - prs->input_flags.l3 = 1; - prs->l3_offset = offset; + /* Get Ethertype */ + prs->ethtype = odp_be_to_cpu_16(eth->type); + parseptr = (const uint8_t *)(eth + 1); + + /* Check for SNAP vs. DIX */ + if (prs->ethtype < _ODP_ETH_LEN_MAX) { + prs->input_flags.snap = 1; + if (prs->ethtype > frame_len - offset) { + prs->error_flags.snap_len = 1; + goto parse_exit; + } + prs->ethtype = odp_be_to_cpu_16(*((const uint16_t *) + (uintptr_t) + (parseptr + 6))); + offset += 8; + parseptr += 8; + } - /* Parse Layer 3 headers */ - switch (ethtype) { - case _ODP_ETHTYPE_IPV4: - prs->input_flags.ipv4 = 1; - ip_proto = parse_ipv4(prs, &parseptr, &offset, frame_len); - break; + /* Parse the VLAN header(s), if present */ + if (prs->ethtype == _ODP_ETHTYPE_VLAN_OUTER) { + prs->input_flags.vlan_qinq = 1; + prs->input_flags.vlan = 1; - case _ODP_ETHTYPE_IPV6: - prs->input_flags.ipv6 = 1; - ip_proto = parse_ipv6(prs, &parseptr, &offset, frame_len, - seg_len); - break; + vlan = (const _odp_vlanhdr_t *)parseptr; + prs->ethtype = odp_be_to_cpu_16(vlan->type); + offset += sizeof(_odp_vlanhdr_t); + parseptr += sizeof(_odp_vlanhdr_t); + } - case _ODP_ETHTYPE_ARP: - prs->input_flags.arp = 1; - ip_proto = 255; /* Reserved invalid by IANA */ - break; + if (prs->ethtype == _ODP_ETHTYPE_VLAN) { + prs->input_flags.vlan = 1; + vlan = (const _odp_vlanhdr_t *)parseptr; + prs->ethtype = odp_be_to_cpu_16(vlan->type); + offset += sizeof(_odp_vlanhdr_t); + parseptr += sizeof(_odp_vlanhdr_t); + } - default: - prs->input_flags.l3 = 0; - prs->l3_offset = ODP_PACKET_OFFSET_INVALID; - ip_proto = 255; /* Reserved invalid by IANA */ + prs->l3_offset = offset; + prs->parsed_layers = LAYER_L2; + if (layer == LAYER_L2) + return prs->error_flags.all != 0; } + case LAYER_L3: + { + offset = prs->l3_offset; + parseptr = (const uint8_t *)(ptr + offset); + /* Set l3_offset+flag only for known ethtypes */ + prs->input_flags.l3 = 1; + + /* Parse Layer 3 headers */ + switch (prs->ethtype) { + case _ODP_ETHTYPE_IPV4: + prs->input_flags.ipv4 = 1; + prs->ip_proto = parse_ipv4(prs, &parseptr, &offset, + frame_len); + break; + + case _ODP_ETHTYPE_IPV6: + prs->input_flags.ipv6 = 1; + prs->ip_proto = parse_ipv6(prs, &parseptr, &offset, + frame_len, seg_len); + break; + + case _ODP_ETHTYPE_ARP: + prs->input_flags.arp = 1; + prs->ip_proto = 255; /* Reserved invalid by IANA */ + break; + + default: + prs->input_flags.l3 = 0; + prs->l3_offset = ODP_PACKET_OFFSET_INVALID; + prs->ip_proto = 255; /* Reserved invalid by IANA */ + } - /* Set l4_offset+flag only for known ip_proto */ - prs->input_flags.l4 = 1; - prs->l4_offset = offset; - - /* Parse Layer 4 headers */ - switch (ip_proto) { - case _ODP_IPPROTO_ICMP: - prs->input_flags.icmp = 1; - break; - - case _ODP_IPPROTO_TCP: - if (odp_unlikely(offset + _ODP_TCPHDR_LEN > seg_len)) - return -1; - prs->input_flags.tcp = 1; - parse_tcp(prs, &parseptr, NULL); - break; - - case _ODP_IPPROTO_UDP: - if (odp_unlikely(offset + _ODP_UDPHDR_LEN > seg_len)) - return -1; - prs->input_flags.udp = 1; - parse_udp(prs, &parseptr, NULL); - break; + /* Set l4_offset+flag only for known ip_proto */ + prs->l4_offset = offset; + prs->parsed_layers = LAYER_L3; + if (layer == LAYER_L3) + return prs->error_flags.all != 0; + } + case LAYER_L4: + { + offset = prs->l4_offset; + parseptr = (const uint8_t *)(ptr + offset); + prs->input_flags.l4 = 1; + + /* Parse Layer 4 headers */ + switch (prs->ip_proto) { + case _ODP_IPPROTO_ICMP: + prs->input_flags.icmp = 1; + break; + + case _ODP_IPPROTO_TCP: + if (odp_unlikely(offset + _ODP_TCPHDR_LEN > seg_len)) + return -1; + prs->input_flags.tcp = 1; + parse_tcp(prs, &parseptr, NULL); + break; + + case _ODP_IPPROTO_UDP: + if (odp_unlikely(offset + _ODP_UDPHDR_LEN > seg_len)) + return -1; + prs->input_flags.udp = 1; + parse_udp(prs, &parseptr, NULL); + break; + + case _ODP_IPPROTO_AH: + prs->input_flags.ipsec = 1; + prs->input_flags.ipsec_ah = 1; + break; + + case _ODP_IPPROTO_ESP: + prs->input_flags.ipsec = 1; + prs->input_flags.ipsec_esp = 1; + break; + + default: + prs->input_flags.l4 = 0; + prs->l4_offset = ODP_PACKET_OFFSET_INVALID; + break; + } - case _ODP_IPPROTO_AH: - prs->input_flags.ipsec = 1; - prs->input_flags.ipsec_ah = 1; + prs->parsed_layers = LAYER_L4; break; - - case _ODP_IPPROTO_ESP: - prs->input_flags.ipsec = 1; - prs->input_flags.ipsec_esp = 1; + } + case LAYER_ALL: break; default: - prs->input_flags.l4 = 0; - prs->l4_offset = ODP_PACKET_OFFSET_INVALID; - break; + ODP_ERR("Invalid parse layer: %d\n", (int)layer); + return -1; } + prs->parsed_layers = LAYER_ALL; + parse_exit: - prs->input_flags.parsed_all = 1; return prs->error_flags.all != 0; } @@ -1323,5 +1360,17 @@ int packet_parse_full(odp_packet_hdr_t *pkt_hdr) void *base = packet_map(pkt_hdr, 0, &seg_len); return packet_parse_common(&pkt_hdr->p, base, pkt_hdr->frame_len, - seg_len); + seg_len, LAYER_ALL); +} + +/** + * Simple packet parser + */ +int packet_parse_layer(odp_packet_hdr_t *pkt_hdr, layer_t layer) +{ + uint32_t seg_len; + void *base = packet_map(pkt_hdr, 0, &seg_len); + + return packet_parse_common(&pkt_hdr->p, base, pkt_hdr->frame_len, + seg_len, layer); } ----------------------------------------------------------------------- Summary of changes: .../linux-generic/include/odp_packet_internal.h | 25 +- platform/linux-generic/include/protocols/ip.h | 2 + platform/linux-generic/odp_classification.c | 4 +- platform/linux-generic/odp_packet.c | 311 ++++++++++++--------- platform/linux-generic/odp_packet_flags.c | 112 ++++---- 5 files changed, 256 insertions(+), 198 deletions(-) hooks/post-receive --

7 years, 5 months

1
0
0 0

[COMMIT] branch master updated. v1.10.1.0-135-ge89d5d1

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 e89d5d15852b9a64e3aaf115b59c87d07092717d (commit) from aaca222d10a3829e4c982a1b4842b0be11860b7d (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 e89d5d15852b9a64e3aaf115b59c87d07092717d Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Fri Oct 14 14:51:25 2016 +0300 test: skip pktio_perf tests on 1 and 2 cpus machines Make check should skip the test instead of failing it. Test splits RX and TX cores for packet processing. Core 0 bind to control thread. So running machine should have at least 2 worker threads which is not enough on 1 and 2 cpus machine. CUnit uses special value 77 to mark test as SKIPPED and not fail on it. Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> Reviewed-by: Mike Holmes <mike.holmes(a)linaro.org> diff --git a/test/common_plat/performance/odp_pktio_perf.c b/test/common_plat/performance/odp_pktio_perf.c index f041b13..483f067 100644 --- a/test/common_plat/performance/odp_pktio_perf.c +++ b/test/common_plat/performance/odp_pktio_perf.c @@ -34,6 +34,8 @@ #include <inttypes.h> #include <test_debug.h> +#define TEST_SKIP 77 + #define PKT_BUF_NUM 8192 #define MAX_NUM_IFACES 2 #define TEST_HDR_MAGIC 0x92749451 @@ -558,7 +560,7 @@ static int setup_txrx_masks(odp_cpumask_t *thd_mask_tx, gbl_args->args.cpu_count); if (num_workers < 2) { LOG_ERR("Need at least two cores\n"); - return -1; + return TEST_SKIP; } if (gbl_args->args.num_tx_workers) { @@ -659,7 +661,7 @@ static int run_test_single(odp_cpumask_t *thd_mask_tx, static int run_test(void) { - int ret = 1; + int ret; int i; odp_cpumask_t txmask, rxmask; test_status_t status = { @@ -669,8 +671,9 @@ static int run_test(void) .warmup = 1, }; - if (setup_txrx_masks(&txmask, &rxmask) != 0) - return -1; + ret = setup_txrx_masks(&txmask, &rxmask); + if (ret) + return ret; printf("Starting test with params:\n"); printf("\tTransmit workers: \t%d\n", odp_cpumask_count(&txmask)); @@ -691,8 +694,11 @@ static int run_test(void) run_test_single(&txmask, &rxmask, &status); status.warmup = 0; - while (ret > 0) + while (1) { ret = run_test_single(&txmask, &rxmask, &status); + if (ret <= 0) + break; + } return ret; } ----------------------------------------------------------------------- Summary of changes: test/common_plat/performance/odp_pktio_perf.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) hooks/post-receive --

7 years, 5 months

1
0
0 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

git-lng-odp October 2016