git-lng-odp

git-lng-odp@lists.linaro.org

2 participants
1206 discussions

[COMMIT] branch master updated. v1.17.0.0_tigermoth_rc1-211-g94665734

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 94665734b42bb11f98bf18205c4df7ad13c6f2a4 (commit) via c3af3011406a0b5a67c8dbf95b53ef94775d3014 (commit) via c1a00bb2a20b166a329dbd1158400fb27081c66c (commit) via 34dcdce23b1851f910aef53c4f17f3491f95183c (commit) via 7b98d4d5018461db83c3feef696b4470674844de (commit) via ff6fdd70a2b07bee11b708f5fd13350c5740de0e (commit) via b6ac02a13723c372501d21c56c9d73f506cafc3b (commit) from 40e4bafd9122e9531b0b6480b14f3d73d1d14e58 (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 94665734b42bb11f98bf18205c4df7ad13c6f2a4 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Fri Feb 9 17:12:22 2018 +0300 configure: fix enabling -mcx16 flag for i?86 platforms Use correct pattern in case-host construction. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/configure.ac b/configure.ac index 24a78823..21718f07 100644 --- a/configure.ac +++ b/configure.ac @@ -124,7 +124,7 @@ ODP_CFLAGS="$ODP_CFLAGS $ODP_CFLAGS_EXTRA" # Check if compiler supports cmpxchng16 on x86-based architectures ########################################################################## case "${host}" in - i?86? | x86*) + i?86* | x86*) if test "${CC}" != "gcc" -o ${CC_VERSION_MAJOR} -ge 5; then ODP_CHECK_CFLAG([-mcx16]) fi commit c3af3011406a0b5a67c8dbf95b53ef94775d3014 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Fri Feb 9 03:02:46 2018 +0300 configure: use AS_HELP_STRING for abi-compat option Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/configure.ac b/configure.ac index 799d0b7b..24a78823 100644 --- a/configure.ac +++ b/configure.ac @@ -211,7 +211,8 @@ AC_SUBST(PKGCONFIG_VERSION) ODP_ABI_COMPAT=1 abi_compat=yes AC_ARG_ENABLE([abi-compat], - [ --disable-abi-compat disables ABI compatible mode, enables inline code in header files], + [AS_HELP_STRING([--disable-abi-compat], + [disables ABI compatible mode, enables inline code in header files])], [if test "x$enableval" = "xno"; then ODP_ABI_COMPAT=0 abi_compat=no commit c1a00bb2a20b166a329dbd1158400fb27081c66c Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Fri Feb 9 03:01:55 2018 +0300 travis: enable tests for default host configuration Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/.travis.yml b/.travis.yml index 5fbb42c4..d9423adc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -58,6 +58,8 @@ env: - CONF="--enable-schedule-scalable" - CONF="--enable-dpdk-zero-copy" - CONF="--disable-static-applications" + - CONF="--disable-host-optimization" + - CONF="--disable-host-optimization --disable-abi-compat" - DPDK_SHARED="y" CONF="--disable-static-applications" - DPDK_VERS="17.11" CONF="" - DPDK_VERS="17.11" DPDK_SHARED="y" CONF="--disable-static-applications" commit 34dcdce23b1851f910aef53c4f17f3491f95183c Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Fri Feb 9 03:01:05 2018 +0300 configure: add flag to build for host=default Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/configure.ac b/configure.ac index dd82b66e..799d0b7b 100644 --- a/configure.ac +++ b/configure.ac @@ -163,14 +163,6 @@ AS_CASE([$host], ) AC_SUBST([ARCH_DIR]) -########################################################################## -# Warn on the defaults if arch is undefined -########################################################################## -if test "${ARCH_DIR}" = "default"; -then - AC_MSG_WARN([ARCH_DIR is undefined, please add your ARCH_DIR based on host=${host}]) -fi - ########################################################################## # Architecture for ABI support ########################################################################## @@ -185,6 +177,23 @@ AS_CASE([$host], ) AC_SUBST([ARCH_ABI]) +AC_ARG_ENABLE([host-optimization], + [AS_HELP_STRING([--disable-host-optimization], + [disables using host-specific ARCH and ABI files])], + [], [enable_host_optimization=yes]) +if test "x$enable_host_optimization" = "xno" ; then + ARCH_DIR=default + ARCH_ABI=default-linux +fi + +########################################################################## +# Warn on the defaults if arch is undefined +########################################################################## +if test "${ARCH_DIR}" = "default"; +then + AC_MSG_WARN([ARCH_DIR is undefined, please add your ARCH_DIR based on host=${host}]) +fi + if test "${ARCH_ABI}" = "default-linux"; then AC_MSG_WARN([ARCH_ABI is undefined, please add your ARCH_ABI based on host=${host}]) commit 7b98d4d5018461db83c3feef696b4470674844de Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Fri Feb 9 02:55:49 2018 +0300 linux-gen: set DPDK's -msse4.2 flag during configure Use ${host} during configure time to detect if we should enable -msse4.2 flag when building with DPDK. 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/Makefile.am b/platform/linux-generic/Makefile.am index bb5bc813..7f212fe5 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -13,12 +13,6 @@ AM_CPPFLAGS += $(OPENSSL_CPPFLAGS) AM_CPPFLAGS += $(DPDK_CPPFLAGS) AM_CPPFLAGS += $(NETMAP_CPPFLAGS) -if PKTIO_DPDK -if ARCH_IS_X86 -AM_CFLAGS += -msse4.2 -endif -endif - if !ODP_ABI_COMPAT odpapiplatincludedir= $(includedir)/odp/api/plat odpapiplatinclude_HEADERS = \ diff --git a/platform/linux-generic/m4/odp_dpdk.m4 b/platform/linux-generic/m4/odp_dpdk.m4 index b2193a16..cb2ed60d 100644 --- a/platform/linux-generic/m4/odp_dpdk.m4 +++ b/platform/linux-generic/m4/odp_dpdk.m4 @@ -34,6 +34,12 @@ then ODP_DPDK([$DPDK_PATH], [], [AC_MSG_FAILURE([can't find DPDK])]) + case "${host}" in + i?86* | x86*) + DPDK_CPPFLAGS="${DPDK_CPPFLAGS} -msse4.2" + ;; + esac + AC_DEFINE([ODP_PKTIO_DPDK], [1], [Define to 1 to enable DPDK packet I/O support]) AC_DEFINE_UNQUOTED([ODP_DPDK_ZERO_COPY], [$zero_copy], commit ff6fdd70a2b07bee11b708f5fd13350c5740de0e Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Fri Feb 9 02:55:09 2018 +0300 build: add default-linux ABI dir, supporting generic arch Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/configure.ac b/configure.ac index 97f0af40..dd82b66e 100644 --- a/configure.ac +++ b/configure.ac @@ -181,14 +181,13 @@ AS_CASE([$host], [powerpc*], [ARCH_ABI=power64-linux], [aarch64*], [ARCH_ABI=arm64-linux], [arm*], [ARCH_ABI=arm32-linux], - [ARCH_ABI=undefined] + [ARCH_ABI=default-linux] ) AC_SUBST([ARCH_ABI]) -if test "${ARCH_ABI}" = "undefined"; +if test "${ARCH_ABI}" = "default-linux"; then - echo "ARCH_ABI is undefined, please add your ARCH_ABI based on host=${host}" - exit 1 + AC_MSG_WARN([ARCH_ABI is undefined, please add your ARCH_ABI based on host=${host}]) fi ########################################################################## diff --git a/include/Makefile.am b/include/Makefile.am index aa330b8d..512002f8 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -226,6 +226,44 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/arm64-linux/odp/api/abi/traffic_mngr.h \ odp/arch/arm64-linux/odp/api/abi/version.h endif +if ARCH_IS_DEFAULT +odpapiabiarchinclude_HEADERS = \ + odp/arch/default-linux/odp/api/abi/align.h \ + odp/arch/default-linux/odp/api/abi/atomic.h \ + odp/arch/default-linux/odp/api/abi/barrier.h \ + odp/arch/default-linux/odp/api/abi/buffer.h \ + odp/arch/default-linux/odp/api/abi/byteorder.h \ + odp/arch/default-linux/odp/api/abi/classification.h \ + odp/arch/default-linux/odp/api/abi/cpu.h \ + odp/arch/default-linux/odp/api/abi/cpumask.h \ + odp/arch/default-linux/odp/api/abi/crypto.h \ + odp/arch/default-linux/odp/api/abi/debug.h \ + odp/arch/default-linux/odp/api/abi/event.h \ + odp/arch/default-linux/odp/api/abi/init.h \ + odp/arch/default-linux/odp/api/abi/ipsec.h \ + odp/arch/default-linux/odp/api/abi/packet.h \ + odp/arch/default-linux/odp/api/abi/packet_flags.h \ + odp/arch/default-linux/odp/api/abi/packet_io.h \ + odp/arch/default-linux/odp/api/abi/pool.h \ + odp/arch/default-linux/odp/api/abi/queue.h \ + odp/arch/default-linux/odp/api/abi/rwlock.h \ + odp/arch/default-linux/odp/api/abi/rwlock_recursive.h \ + odp/arch/default-linux/odp/api/abi/schedule.h \ + odp/arch/default-linux/odp/api/abi/schedule_types.h \ + odp/arch/default-linux/odp/api/abi/shared_memory.h \ + odp/arch/default-linux/odp/api/abi/spinlock.h \ + odp/arch/default-linux/odp/api/abi/spinlock_recursive.h \ + odp/arch/default-linux/odp/api/abi/std_clib.h \ + odp/arch/default-linux/odp/api/abi/std_types.h \ + odp/arch/default-linux/odp/api/abi/sync.h \ + odp/arch/default-linux/odp/api/abi/thread.h \ + odp/arch/default-linux/odp/api/abi/thrmask.h \ + odp/arch/default-linux/odp/api/abi/ticketlock.h \ + odp/arch/default-linux/odp/api/abi/time.h \ + odp/arch/default-linux/odp/api/abi/timer.h \ + odp/arch/default-linux/odp/api/abi/traffic_mngr.h \ + odp/arch/default-linux/odp/api/abi/version.h +endif if ARCH_IS_MIPS64 odpapiabiarchinclude_HEADERS = \ odp/arch/mips64-linux/odp/api/abi/align.h \ diff --git a/include/odp/arch/default-linux/odp/api/abi/align.h b/include/odp/arch/default-linux/odp/api/abi/align.h new file mode 100644 index 00000000..a4692f5d --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/align.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/align.h> diff --git a/include/odp/arch/default-linux/odp/api/abi/atomic.h b/include/odp/arch/default-linux/odp/api/abi/atomic.h new file mode 100644 index 00000000..df1c2cd9 --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/atomic.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/atomic.h> diff --git a/include/odp/arch/default-linux/odp/api/abi/barrier.h b/include/odp/arch/default-linux/odp/api/abi/barrier.h new file mode 100644 index 00000000..5ccdf017 --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/barrier.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/barrier.h> diff --git a/include/odp/arch/default-linux/odp/api/abi/buffer.h b/include/odp/arch/default-linux/odp/api/abi/buffer.h new file mode 100644 index 00000000..e030559a --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/buffer.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/buffer.h> diff --git a/include/odp/arch/default-linux/odp/api/abi/byteorder.h b/include/odp/arch/default-linux/odp/api/abi/byteorder.h new file mode 100644 index 00000000..27219f94 --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/byteorder.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/byteorder.h> diff --git a/include/odp/arch/default-linux/odp/api/abi/classification.h b/include/odp/arch/default-linux/odp/api/abi/classification.h new file mode 100644 index 00000000..4c3ba327 --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/classification.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/classification.h> diff --git a/include/odp/arch/default-linux/odp/api/abi/cpu.h b/include/odp/arch/default-linux/odp/api/abi/cpu.h new file mode 100644 index 00000000..0765339b --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/cpu.h @@ -0,0 +1,24 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#ifndef ODP_API_ABI_CPU_H_ +#define ODP_API_ABI_CPU_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#define ODP_CACHE_LINE_SIZE 64 + +static inline void odp_cpu_pause(void) +{ +} + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/include/odp/arch/default-linux/odp/api/abi/cpumask.h b/include/odp/arch/default-linux/odp/api/abi/cpumask.h new file mode 100644 index 00000000..b4e7a5df --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/cpumask.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/cpumask.h> diff --git a/include/odp/arch/default-linux/odp/api/abi/crypto.h b/include/odp/arch/default-linux/odp/api/abi/crypto.h new file mode 100644 index 00000000..4f4b4368 --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/crypto.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/crypto.h> diff --git a/include/odp/arch/default-linux/odp/api/abi/debug.h b/include/odp/arch/default-linux/odp/api/abi/debug.h new file mode 100644 index 00000000..1bc03109 --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/debug.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/debug.h> diff --git a/include/odp/arch/default-linux/odp/api/abi/event.h b/include/odp/arch/default-linux/odp/api/abi/event.h new file mode 100644 index 00000000..f87d6195 --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/event.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/event.h> diff --git a/include/odp/arch/default-linux/odp/api/abi/init.h b/include/odp/arch/default-linux/odp/api/abi/init.h new file mode 100644 index 00000000..bd64cf14 --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/init.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/init.h> diff --git a/include/odp/arch/default-linux/odp/api/abi/ipsec.h b/include/odp/arch/default-linux/odp/api/abi/ipsec.h new file mode 100644 index 00000000..5073680b --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/ipsec.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/ipsec.h> diff --git a/include/odp/arch/default-linux/odp/api/abi/packet.h b/include/odp/arch/default-linux/odp/api/abi/packet.h new file mode 100644 index 00000000..a1e9b1a8 --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/packet.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/packet.h> diff --git a/include/odp/arch/default-linux/odp/api/abi/packet_flags.h b/include/odp/arch/default-linux/odp/api/abi/packet_flags.h new file mode 100644 index 00000000..fd3e10d0 --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/packet_flags.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/packet_flags.h> diff --git a/include/odp/arch/default-linux/odp/api/abi/packet_io.h b/include/odp/arch/default-linux/odp/api/abi/packet_io.h new file mode 100644 index 00000000..e4220c63 --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/packet_io.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/packet_io.h> diff --git a/include/odp/arch/default-linux/odp/api/abi/pool.h b/include/odp/arch/default-linux/odp/api/abi/pool.h new file mode 100644 index 00000000..72055635 --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/pool.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/pool.h> diff --git a/include/odp/arch/default-linux/odp/api/abi/queue.h b/include/odp/arch/default-linux/odp/api/abi/queue.h new file mode 100644 index 00000000..04f0c6eb --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/queue.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/queue.h> diff --git a/include/odp/arch/default-linux/odp/api/abi/rwlock.h b/include/odp/arch/default-linux/odp/api/abi/rwlock.h new file mode 100644 index 00000000..a6aa377d --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/rwlock.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/rwlock.h> diff --git a/include/odp/arch/default-linux/odp/api/abi/rwlock_recursive.h b/include/odp/arch/default-linux/odp/api/abi/rwlock_recursive.h new file mode 100644 index 00000000..a78a2181 --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/rwlock_recursive.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/rwlock_recursive.h> diff --git a/include/odp/arch/default-linux/odp/api/abi/schedule.h b/include/odp/arch/default-linux/odp/api/abi/schedule.h new file mode 100644 index 00000000..027265c1 --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/schedule.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/schedule.h> diff --git a/include/odp/arch/default-linux/odp/api/abi/schedule_types.h b/include/odp/arch/default-linux/odp/api/abi/schedule_types.h new file mode 100644 index 00000000..f9aa2005 --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/schedule_types.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/schedule_types.h> diff --git a/include/odp/arch/default-linux/odp/api/abi/shared_memory.h b/include/odp/arch/default-linux/odp/api/abi/shared_memory.h new file mode 100644 index 00000000..51e35e90 --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/shared_memory.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/shared_memory.h> diff --git a/include/odp/arch/default-linux/odp/api/abi/spinlock.h b/include/odp/arch/default-linux/odp/api/abi/spinlock.h new file mode 100644 index 00000000..46da3024 --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/spinlock.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/spinlock.h> diff --git a/include/odp/arch/default-linux/odp/api/abi/spinlock_recursive.h b/include/odp/arch/default-linux/odp/api/abi/spinlock_recursive.h new file mode 100644 index 00000000..e75e753e --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/spinlock_recursive.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/spinlock_recursive.h> diff --git a/include/odp/arch/default-linux/odp/api/abi/std_clib.h b/include/odp/arch/default-linux/odp/api/abi/std_clib.h new file mode 100644 index 00000000..048c9fc2 --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/std_clib.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/std_clib.h> diff --git a/include/odp/arch/default-linux/odp/api/abi/std_types.h b/include/odp/arch/default-linux/odp/api/abi/std_types.h new file mode 100644 index 00000000..fa360e01 --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/std_types.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/std_types.h> diff --git a/include/odp/arch/default-linux/odp/api/abi/sync.h b/include/odp/arch/default-linux/odp/api/abi/sync.h new file mode 100644 index 00000000..cdab3a94 --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/sync.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/sync.h> diff --git a/include/odp/arch/default-linux/odp/api/abi/thread.h b/include/odp/arch/default-linux/odp/api/abi/thread.h new file mode 100644 index 00000000..e34b7c7b --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/thread.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/thread.h> diff --git a/include/odp/arch/default-linux/odp/api/abi/thrmask.h b/include/odp/arch/default-linux/odp/api/abi/thrmask.h new file mode 100644 index 00000000..14ff7770 --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/thrmask.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/thrmask.h> diff --git a/include/odp/arch/default-linux/odp/api/abi/ticketlock.h b/include/odp/arch/default-linux/odp/api/abi/ticketlock.h new file mode 100644 index 00000000..268b8094 --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/ticketlock.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/ticketlock.h> diff --git a/include/odp/arch/default-linux/odp/api/abi/time.h b/include/odp/arch/default-linux/odp/api/abi/time.h new file mode 100644 index 00000000..85c7dd03 --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/time.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/time.h> diff --git a/include/odp/arch/default-linux/odp/api/abi/timer.h b/include/odp/arch/default-linux/odp/api/abi/timer.h new file mode 100644 index 00000000..b1664959 --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/timer.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/timer.h> diff --git a/include/odp/arch/default-linux/odp/api/abi/traffic_mngr.h b/include/odp/arch/default-linux/odp/api/abi/traffic_mngr.h new file mode 100644 index 00000000..fcd83801 --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/traffic_mngr.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/traffic_mngr.h> diff --git a/include/odp/arch/default-linux/odp/api/abi/version.h b/include/odp/arch/default-linux/odp/api/abi/version.h new file mode 100644 index 00000000..36559ec8 --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/version.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/version.h> commit b6ac02a13723c372501d21c56c9d73f506cafc3b Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Fri Feb 9 02:52:49 2018 +0300 build: support building for generic arch Support building ODP for generic architecture, using default ARCH code. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/configure.ac b/configure.ac index a44a2ec6..97f0af40 100644 --- a/configure.ac +++ b/configure.ac @@ -159,17 +159,16 @@ AS_CASE([$host], [powerpc*], [ARCH_DIR=powerpc], [aarch64*], [ARCH_DIR=aarch64], [arm*], [ARCH_DIR=arm], - [ARCH_DIR=undefined] + [ARCH_DIR=default] ) AC_SUBST([ARCH_DIR]) ########################################################################## # Warn on the defaults if arch is undefined ########################################################################## -if test "${ARCH_DIR}" = "undefined"; +if test "${ARCH_DIR}" = "default"; then - echo "ARCH_DIR is undefined, please add your ARCH_DIR based on host=${host}" - exit 1 + AC_MSG_WARN([ARCH_DIR is undefined, please add your ARCH_DIR based on host=${host}]) fi ########################################################################## @@ -280,6 +279,7 @@ AM_CONDITIONAL([HAVE_MSCGEN], [test "x${MSCGEN}" = "xmscgen"]) AM_CONDITIONAL([helper_linux], [test x$helper_linux = xyes ]) AM_CONDITIONAL([ARCH_IS_ARM], [test "x${ARCH_DIR}" = "xarm"]) AM_CONDITIONAL([ARCH_IS_AARCH64], [test "x${ARCH_DIR}" = "xaarch64"]) +AM_CONDITIONAL([ARCH_IS_DEFAULT], [test "x${ARCH_DIR}" = "xdefault"]) AM_CONDITIONAL([ARCH_IS_MIPS64], [test "x${ARCH_DIR}" = "xmips64"]) AM_CONDITIONAL([ARCH_IS_POWERPC], [test "x${ARCH_DIR}" = "xpowerpc"]) AM_CONDITIONAL([ARCH_IS_X86], [test "x${ARCH_DIR}" = "xx86"]) diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 9e82f262..bb5bc813 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -241,6 +241,16 @@ noinst_HEADERS += arch/aarch64/odp_atomic.h \ arch/default/odp_cpu_idling.h \ arch/aarch64/odp_llsc.h endif +if ARCH_IS_DEFAULT +__LIB__libodp_linux_la_SOURCES += arch/default/odp_cpu_cycles.c \ + arch/default/odp_global_time.c \ + arch/default/odp_sysinfo_parse.c +if !ODP_ABI_COMPAT +odpapiabiarchinclude_HEADERS += arch/default/odp/api/abi/cpu.h +endif +noinst_HEADERS += arch/default/odp_cpu.h \ + arch/default/odp_cpu_idling.h +endif if ARCH_IS_MIPS64 __LIB__libodp_linux_la_SOURCES += arch/mips64/odp_cpu_cycles.c \ arch/default/odp_global_time.c \ diff --git a/platform/linux-generic/arch/default/odp/api/abi/cpu.h b/platform/linux-generic/arch/default/odp/api/abi/cpu.h new file mode 100644 index 00000000..0765339b --- /dev/null +++ b/platform/linux-generic/arch/default/odp/api/abi/cpu.h @@ -0,0 +1,24 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#ifndef ODP_API_ABI_CPU_H_ +#define ODP_API_ABI_CPU_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#define ODP_CACHE_LINE_SIZE 64 + +static inline void odp_cpu_pause(void) +{ +} + +#ifdef __cplusplus +} +#endif + +#endif ----------------------------------------------------------------------- Summary of changes: .travis.yml | 2 ++ configure.ac | 41 +++++++++++++--------- include/Makefile.am | 38 ++++++++++++++++++++ .../odp/api/abi/align.h | 2 +- .../odp/api/abi/atomic.h | 2 +- .../odp/api/abi/barrier.h | 2 +- .../odp/api/abi/buffer.h | 2 +- .../odp/api/abi/byteorder.h | 2 +- .../odp/api/abi/classification.h | 2 +- .../odp/arch/default-linux}/odp/api/abi/cpu.h | 7 +--- .../odp/api/abi/cpumask.h | 2 +- .../odp/api/abi/crypto.h | 2 +- .../odp/api/abi/debug.h | 2 +- .../odp/api/abi/event.h | 2 +- .../odp/api/abi/init.h | 2 +- .../odp/api/abi/ipsec.h | 2 +- .../odp/api/abi/packet.h | 2 +- .../odp/api/abi/packet_flags.h | 2 +- .../odp/api/abi/packet_io.h | 2 +- .../odp/api/abi/pool.h | 2 +- .../odp/api/abi/queue.h | 2 +- .../odp/api/abi/rwlock.h | 2 +- .../odp/api/abi/rwlock_recursive.h | 2 +- .../odp/api/abi/schedule.h | 2 +- .../odp/api/abi/schedule_types.h | 2 +- .../odp/api/abi/shared_memory.h | 2 +- .../odp/api/abi/spinlock.h | 2 +- .../odp/api/abi/spinlock_recursive.h | 2 +- .../odp/api/abi/std_clib.h | 2 +- .../odp/api/abi/std_types.h | 2 +- .../odp/api/abi/sync.h | 2 +- .../odp/api/abi/thread.h | 2 +- .../odp/api/abi/thrmask.h | 2 +- .../odp/api/abi/ticketlock.h | 2 +- .../odp/api/abi/time.h | 2 +- .../odp/api/abi/timer.h | 2 +- .../odp/api/abi/traffic_mngr.h | 2 +- .../odp/api/abi/version.h | 2 +- platform/linux-generic/Makefile.am | 16 +++++---- .../arch/{x86 => default}/odp/api/abi/cpu.h | 7 +--- platform/linux-generic/m4/odp_dpdk.m4 | 6 ++++ 41 files changed, 117 insertions(+), 68 deletions(-) copy include/odp/arch/{arm64-linux => default-linux}/odp/api/abi/align.h (75%) copy include/odp/arch/{arm32-linux => default-linux}/odp/api/abi/atomic.h (75%) copy include/odp/arch/{arm64-linux => default-linux}/odp/api/abi/barrier.h (75%) copy include/odp/arch/{arm64-linux => default-linux}/odp/api/abi/buffer.h (75%) copy include/odp/arch/{arm32-linux => default-linux}/odp/api/abi/byteorder.h (75%) copy include/odp/arch/{arm32-linux => default-linux}/odp/api/abi/classification.h (76%) copy {platform/linux-generic/arch/x86 => include/odp/arch/default-linux}/odp/api/abi/cpu.h (67%) copy include/odp/arch/{arm32-linux => default-linux}/odp/api/abi/cpumask.h (75%) copy include/odp/arch/{arm64-linux => default-linux}/odp/api/abi/crypto.h (75%) copy include/odp/arch/{arm32-linux => default-linux}/odp/api/abi/debug.h (75%) copy include/odp/arch/{arm64-linux => default-linux}/odp/api/abi/event.h (75%) copy include/odp/arch/{arm64-linux => default-linux}/odp/api/abi/init.h (75%) copy include/odp/arch/{arm32-linux => default-linux}/odp/api/abi/ipsec.h (75%) copy include/odp/arch/{arm32-linux => default-linux}/odp/api/abi/packet.h (75%) copy include/odp/arch/{arm32-linux => default-linux}/odp/api/abi/packet_flags.h (76%) copy include/odp/arch/{arm32-linux => default-linux}/odp/api/abi/packet_io.h (75%) copy include/odp/arch/{arm32-linux => default-linux}/odp/api/abi/pool.h (75%) copy include/odp/arch/{arm32-linux => default-linux}/odp/api/abi/queue.h (75%) copy include/odp/arch/{arm32-linux => default-linux}/odp/api/abi/rwlock.h (75%) copy include/odp/arch/{arm32-linux => default-linux}/odp/api/abi/rwlock_recursive.h (76%) copy include/odp/arch/{arm32-linux => default-linux}/odp/api/abi/schedule.h (75%) copy include/odp/arch/{arm32-linux => default-linux}/odp/api/abi/schedule_types.h (76%) copy include/odp/arch/{arm32-linux => default-linux}/odp/api/abi/shared_memory.h (76%) copy include/odp/arch/{arm32-linux => default-linux}/odp/api/abi/spinlock.h (75%) copy include/odp/arch/{arm32-linux => default-linux}/odp/api/abi/spinlock_recursive.h (77%) copy include/odp/arch/{arm32-linux => default-linux}/odp/api/abi/std_clib.h (75%) copy include/odp/arch/{arm32-linux => default-linux}/odp/api/abi/std_types.h (75%) copy include/odp/arch/{arm64-linux => default-linux}/odp/api/abi/sync.h (75%) copy include/odp/arch/{arm32-linux => default-linux}/odp/api/abi/thread.h (75%) copy include/odp/arch/{arm32-linux => default-linux}/odp/api/abi/thrmask.h (75%) copy include/odp/arch/{arm32-linux => default-linux}/odp/api/abi/ticketlock.h (76%) copy include/odp/arch/{arm64-linux => default-linux}/odp/api/abi/time.h (75%) copy include/odp/arch/{arm32-linux => default-linux}/odp/api/abi/timer.h (75%) copy include/odp/arch/{arm32-linux => default-linux}/odp/api/abi/traffic_mngr.h (76%) copy include/odp/arch/{arm32-linux => default-linux}/odp/api/abi/version.h (75%) copy platform/linux-generic/arch/{x86 => default}/odp/api/abi/cpu.h (67%) hooks/post-receive --

7 years, 11 months

[COMMIT] branch master updated. v1.17.0.0_tigermoth_rc1-204-g40e4bafd

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 40e4bafd9122e9531b0b6480b14f3d73d1d14e58 (commit) via ca9bf637fdadca1208fce921e836a58b40237c7b (commit) from e7823af35b340fed70ed5f423f7d04c7d5c62b38 (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 40e4bafd9122e9531b0b6480b14f3d73d1d14e58 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Wed Feb 14 17:04:39 2018 +0200 validation: packet: add IPv4 options Added test case for IPv4 options. Signed-off-by: Petri Savolainen <petri.savolainen(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/common/test_packet_parser.h b/test/common/test_packet_parser.h index fd1b40ab..09c998c9 100644 --- a/test/common/test_packet_parser.h +++ b/test/common/test_packet_parser.h @@ -424,6 +424,18 @@ static const uint8_t test_packet_ipv4_udp_last_frag[] = { 0x2E }; +/* IPv4 / Record Route + NOP options / ICMP */ +static const uint8_t test_packet_ipv4_rr_nop_icmp[] = { + 0x02, 0x00, 0x00, 0x04, 0x05, 0x06, 0x02, 0x00, + 0x00, 0x01, 0x02, 0x03, 0x08, 0x00, 0x49, 0x00, + 0x00, 0x2C, 0x00, 0x01, 0x00, 0x00, 0x40, 0x01, + 0x8E, 0xE2, 0xC0, 0xA8, 0x00, 0x01, 0xC0, 0xA8, + 0x00, 0x02, 0x07, 0x0F, 0x0C, 0xC0, 0xA8, 0x04, + 0x01, 0xC0, 0xA8, 0x05, 0x01, 0x00, 0x00, 0x00, + 0x00, 0x01, 0x08, 0x00, 0xF7, 0xFF, 0x00, 0x00, + 0x00, 0x00 +}; + #ifdef __cplusplus } #endif diff --git a/test/validation/api/packet/packet.c b/test/validation/api/packet/packet.c index 71bf1d86..054a0d4e 100644 --- a/test/validation/api/packet/packet.c +++ b/test/validation/api/packet/packet.c @@ -70,7 +70,8 @@ static uint32_t parse_test_pkt_len[] = { sizeof(test_packet_bcast_eth_ipv4_udp), sizeof(test_packet_mcast_eth_ipv6_udp), sizeof(test_packet_ipv4_udp_first_frag), - sizeof(test_packet_ipv4_udp_last_frag) + sizeof(test_packet_ipv4_udp_last_frag), + sizeof(test_packet_ipv4_rr_nop_icmp) }; #define packet_compare_offset(pkt1, off1, pkt2, off2, len) \ @@ -3223,6 +3224,39 @@ static void parse_eth_ipv4_udp_last_frag(void) odp_packet_free_multi(pkt, num_pkt); } +/* Ethernet/IPv4 + options (Record route, NOP)/ICMP */ +static void parse_eth_ipv4_rr_nop_icmp(void) +{ + odp_packet_parse_param_t parse; + int i; + int num_pkt = PARSE_TEST_NUM_PKT; + odp_packet_t pkt[num_pkt]; + + parse_test_alloc(pkt, test_packet_ipv4_rr_nop_icmp, + sizeof(test_packet_ipv4_rr_nop_icmp)); + + parse.proto = ODP_PROTO_ETH; + parse.last_layer = ODP_PROTO_LAYER_L4; + parse.chksums.all_chksum = 0; + + CU_ASSERT(odp_packet_parse(pkt[0], 0, &parse) == 0); + CU_ASSERT(odp_packet_parse_multi(&pkt[1], parse_test.offset_zero, + num_pkt - 1, &parse) == (num_pkt - 1)); + + for (i = 0; i < num_pkt; i++) { + CU_ASSERT(odp_packet_has_eth(pkt[i])); + CU_ASSERT(odp_packet_has_ipv4(pkt[i])); + CU_ASSERT(odp_packet_has_ipopt(pkt[i])); + CU_ASSERT(odp_packet_has_icmp(pkt[i])); + CU_ASSERT(!odp_packet_has_ipfrag(pkt[i])); + CU_ASSERT(!odp_packet_has_ipv6(pkt[i])); + CU_ASSERT(!odp_packet_has_udp(pkt[i])); + CU_ASSERT(!odp_packet_has_tcp(pkt[i])); + } + + odp_packet_free_multi(pkt, num_pkt); +} + odp_testinfo_t packet_suite[] = { ODP_TEST_INFO(packet_test_alloc_free), ODP_TEST_INFO(packet_test_alloc_free_multi), @@ -3279,6 +3313,7 @@ odp_testinfo_t packet_parse_suite[] = { ODP_TEST_INFO(parse_mcast_eth_ipv6_udp), ODP_TEST_INFO(parse_eth_ipv4_udp_first_frag), ODP_TEST_INFO(parse_eth_ipv4_udp_last_frag), + ODP_TEST_INFO(parse_eth_ipv4_rr_nop_icmp), ODP_TEST_INFO_NULL, }; commit ca9bf637fdadca1208fce921e836a58b40237c7b Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Tue Feb 13 16:10:40 2018 +0200 validation: packet: add IPv4 fragments Added test cases for IPv4/UDP fragments. Signed-off-by: Petri Savolainen <petri.savolainen(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/common/test_packet_parser.h b/test/common/test_packet_parser.h index d0a0582a..fd1b40ab 100644 --- a/test/common/test_packet_parser.h +++ b/test/common/test_packet_parser.h @@ -389,6 +389,41 @@ static const uint8_t test_packet_mcast_eth_ipv6_udp[] = { 0x79, 0x74, 0x65, 0x73, 0x2E }; +static const uint8_t test_packet_ipv4_udp_first_frag[] = { + 0x02, 0x00, 0x00, 0x04, 0x05, 0x06, 0x02, 0x00, + 0x00, 0x01, 0x02, 0x03, 0x08, 0x00, 0x45, 0x00, + 0x00, 0x63, 0x00, 0x01, 0x20, 0x00, 0x40, 0x11, + 0xD9, 0x35, 0xC0, 0xA8, 0x00, 0x01, 0xC0, 0xA8, + 0x00, 0x02, 0x04, 0xD2, 0x16, 0x2E, 0x01, 0x17, + 0x54, 0xF3, 0x54, 0x68, 0x69, 0x73, 0x20, 0x69, + 0x73, 0x20, 0x6D, 0x79, 0x20, 0x64, 0x75, 0x6D, + 0x6D, 0x79, 0x20, 0x70, 0x61, 0x79, 0x6C, 0x6F, + 0x61, 0x64, 0x20, 0x73, 0x74, 0x72, 0x69, 0x6E, + 0x67, 0x2E, 0x20, 0x54, 0x68, 0x65, 0x20, 0x6C, + 0x65, 0x6E, 0x67, 0x74, 0x68, 0x20, 0x6F, 0x66, + 0x20, 0x74, 0x68, 0x69, 0x73, 0x20, 0x73, 0x74, + 0x72, 0x69, 0x6E, 0x67, 0x20, 0x69, 0x73, 0x20, + 0x37, 0x31, 0x20, 0x62, 0x79, 0x74, 0x65, 0x73, + 0x2E +}; + +static const uint8_t test_packet_ipv4_udp_last_frag[] = { + 0x02, 0x00, 0x00, 0x04, 0x05, 0x06, 0x02, 0x00, + 0x00, 0x01, 0x02, 0x03, 0x08, 0x00, 0x45, 0x00, + 0x00, 0x5B, 0x00, 0x01, 0x00, 0x0A, 0x40, 0x11, + 0xF9, 0x33, 0xC0, 0xA8, 0x00, 0x01, 0xC0, 0xA8, + 0x00, 0x02, 0x54, 0x68, 0x69, 0x73, 0x20, 0x69, + 0x73, 0x20, 0x6D, 0x79, 0x20, 0x64, 0x75, 0x6D, + 0x6D, 0x79, 0x20, 0x70, 0x61, 0x79, 0x6C, 0x6F, + 0x61, 0x64, 0x20, 0x73, 0x74, 0x72, 0x69, 0x6E, + 0x67, 0x2E, 0x20, 0x54, 0x68, 0x65, 0x20, 0x6C, + 0x65, 0x6E, 0x67, 0x74, 0x68, 0x20, 0x6F, 0x66, + 0x20, 0x74, 0x68, 0x69, 0x73, 0x20, 0x73, 0x74, + 0x72, 0x69, 0x6E, 0x67, 0x20, 0x69, 0x73, 0x20, + 0x37, 0x31, 0x20, 0x62, 0x79, 0x74, 0x65, 0x73, + 0x2E +}; + #ifdef __cplusplus } #endif diff --git a/test/validation/api/packet/packet.c b/test/validation/api/packet/packet.c index db3a47cf..71bf1d86 100644 --- a/test/validation/api/packet/packet.c +++ b/test/validation/api/packet/packet.c @@ -68,7 +68,9 @@ static uint32_t parse_test_pkt_len[] = { sizeof(test_packet_ipv6_ipsec_esp), sizeof(test_packet_mcast_eth_ipv4_udp), sizeof(test_packet_bcast_eth_ipv4_udp), - sizeof(test_packet_mcast_eth_ipv6_udp) + sizeof(test_packet_mcast_eth_ipv6_udp), + sizeof(test_packet_ipv4_udp_first_frag), + sizeof(test_packet_ipv4_udp_last_frag) }; #define packet_compare_offset(pkt1, off1, pkt2, off2, len) \ @@ -3157,6 +3159,70 @@ static void parse_mcast_eth_ipv6_udp(void) odp_packet_free_multi(pkt, num_pkt); } +/* Ethernet/IPv4/UDP first fragment */ +static void parse_eth_ipv4_udp_first_frag(void) +{ + odp_packet_parse_param_t parse; + int i; + int num_pkt = PARSE_TEST_NUM_PKT; + odp_packet_t pkt[num_pkt]; + + parse_test_alloc(pkt, test_packet_ipv4_udp_first_frag, + sizeof(test_packet_ipv4_udp_first_frag)); + + parse.proto = ODP_PROTO_ETH; + parse.last_layer = ODP_PROTO_LAYER_L4; + parse.chksums.all_chksum = 0; + + CU_ASSERT(odp_packet_parse(pkt[0], 0, &parse) == 0); + CU_ASSERT(odp_packet_parse_multi(&pkt[1], parse_test.offset_zero, + num_pkt - 1, &parse) == (num_pkt - 1)); + + for (i = 0; i < num_pkt; i++) { + CU_ASSERT(odp_packet_has_eth(pkt[i])); + CU_ASSERT(odp_packet_has_ipv4(pkt[i])); + CU_ASSERT(odp_packet_has_ipfrag(pkt[i])); + CU_ASSERT(odp_packet_has_udp(pkt[i])); + CU_ASSERT(!odp_packet_has_ipv6(pkt[i])); + CU_ASSERT(!odp_packet_has_tcp(pkt[i])); + CU_ASSERT(!odp_packet_has_ipopt(pkt[i])); + } + + odp_packet_free_multi(pkt, num_pkt); +} + +/* Ethernet/IPv4/UDP last fragment */ +static void parse_eth_ipv4_udp_last_frag(void) +{ + odp_packet_parse_param_t parse; + int i; + int num_pkt = PARSE_TEST_NUM_PKT; + odp_packet_t pkt[num_pkt]; + + parse_test_alloc(pkt, test_packet_ipv4_udp_last_frag, + sizeof(test_packet_ipv4_udp_last_frag)); + + parse.proto = ODP_PROTO_ETH; + parse.last_layer = ODP_PROTO_LAYER_L4; + parse.chksums.all_chksum = 0; + + CU_ASSERT(odp_packet_parse(pkt[0], 0, &parse) == 0); + CU_ASSERT(odp_packet_parse_multi(&pkt[1], parse_test.offset_zero, + num_pkt - 1, &parse) == (num_pkt - 1)); + + for (i = 0; i < num_pkt; i++) { + CU_ASSERT(odp_packet_has_eth(pkt[i])); + CU_ASSERT(odp_packet_has_ipv4(pkt[i])); + CU_ASSERT(odp_packet_has_ipfrag(pkt[i])); + CU_ASSERT(odp_packet_has_udp(pkt[i])); + CU_ASSERT(!odp_packet_has_ipv6(pkt[i])); + CU_ASSERT(!odp_packet_has_tcp(pkt[i])); + CU_ASSERT(!odp_packet_has_ipopt(pkt[i])); + } + + odp_packet_free_multi(pkt, num_pkt); +} + odp_testinfo_t packet_suite[] = { ODP_TEST_INFO(packet_test_alloc_free), ODP_TEST_INFO(packet_test_alloc_free_multi), @@ -3211,6 +3277,8 @@ odp_testinfo_t packet_parse_suite[] = { ODP_TEST_INFO(parse_mcast_eth_ipv4_udp), ODP_TEST_INFO(parse_bcast_eth_ipv4_udp), ODP_TEST_INFO(parse_mcast_eth_ipv6_udp), + ODP_TEST_INFO(parse_eth_ipv4_udp_first_frag), + ODP_TEST_INFO(parse_eth_ipv4_udp_last_frag), ODP_TEST_INFO_NULL, }; ----------------------------------------------------------------------- Summary of changes: test/common/test_packet_parser.h | 47 ++++++++++++++++ test/validation/api/packet/packet.c | 105 +++++++++++++++++++++++++++++++++++- 2 files changed, 151 insertions(+), 1 deletion(-) hooks/post-receive --

7 years, 11 months

[COMMIT] branch master updated. v1.17.0.0_tigermoth_rc1-202-ge7823af3

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 e7823af35b340fed70ed5f423f7d04c7d5c62b38 (commit) via 9ee8609b86639606217d2f78c52f28e3fe08c782 (commit) via 569810c52a72c83aced5c5b8adf3eec40f371d90 (commit) from 6e213fbae7f16558e572da39704927f107c01f80 (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 e7823af35b340fed70ed5f423f7d04c7d5c62b38 Author: Bogdan Pricope <bogdan.pricope(a)linaro.org> Date: Tue Jan 16 17:07:54 2018 +0200 example: generator: remove useless csum checks Remove useless csum checks: packets are dropped at platform level if have csum errors. Signed-off-by: Bogdan Pricope <bogdan.pricope(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/example/generator/odp_generator.c b/example/generator/odp_generator.c index 440b6b28..d31b6851 100644 --- a/example/generator/odp_generator.c +++ b/example/generator/odp_generator.c @@ -824,21 +824,12 @@ static void process_pkts(int thr, thread_args_t *thr_args, odp_packet_t pkt_tbl[], unsigned len) { odp_packet_t pkt; - odp_packet_chksum_status_t csum_status; uint32_t left, offset, i; odph_ipv4hdr_t *ip; for (i = 0; i < len; ++i) { pkt = pkt_tbl[i]; - csum_status = odp_packet_l3_chksum_status(pkt); - if (csum_status == ODP_PACKET_CHKSUM_BAD) - printf("L3 checksum error detected.\n"); - - csum_status = odp_packet_l4_chksum_status(pkt); - if (csum_status == ODP_PACKET_CHKSUM_BAD) - printf("L4 checksum error detected.\n"); - /* Drop packets with errors */ if (odp_unlikely(odp_packet_has_error(pkt))) continue; commit 9ee8609b86639606217d2f78c52f28e3fe08c782 Author: Bogdan Pricope <bogdan.pricope(a)linaro.org> Date: Tue Jan 16 16:13:11 2018 +0200 example: generator: remove busy wait for direct mode receive Add timeout to avoid unnecessary loops on low traffic. Signed-off-by: Bogdan Pricope <bogdan.pricope(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/example/generator/odp_generator.c b/example/generator/odp_generator.c index f8c787e4..440b6b28 100644 --- a/example/generator/odp_generator.c +++ b/example/generator/odp_generator.c @@ -939,6 +939,7 @@ static int gen_recv_direct_thread(void *arg) odp_packet_t pkts[MAX_RX_BURST]; int pkt_cnt, burst_size; odp_pktin_queue_t pktin; + uint64_t wait = odp_pktin_wait_time(ODP_TIME_SEC_IN_NS); thr = odp_thread_id(); thr_args = (thread_args_t *)arg; @@ -952,8 +953,7 @@ static int gen_recv_direct_thread(void *arg) if (thr_args->stop) break; - pkt_cnt = odp_pktin_recv_tmo(pktin, pkts, burst_size, - ODP_PKTIN_NO_WAIT); + pkt_cnt = odp_pktin_recv_tmo(pktin, pkts, burst_size, wait); if (pkt_cnt > 0) { process_pkts(thr, thr_args, pkts, pkt_cnt); commit 569810c52a72c83aced5c5b8adf3eec40f371d90 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Wed Feb 14 20:26:00 2018 +0300 validation: tm: auto skip test on Shippable in addition to Travis Apply the same workaround as we have on Travis: retun 77 to mark the test as skipped if we detect failure while running on top of CI. 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/api/traffic_mngr/traffic_mngr.sh b/test/validation/api/traffic_mngr/traffic_mngr.sh index c4e2d297..c88aa805 100755 --- a/test/validation/api/traffic_mngr/traffic_mngr.sh +++ b/test/validation/api/traffic_mngr/traffic_mngr.sh @@ -31,9 +31,7 @@ TEST_SKIPPED=77 traffic_mngr_main${EXEEXT} ret=$? -SIGSEGV=139 - -if [ "${TRAVIS}" = "true" ] && [ $ret -ne 0 ] && [ $ret -ne ${SIGSEGV} ]; then +if [ "${CI}" = "true" ] && [ $ret -eq 255 ]; then echo "SKIP: skip due to not isolated environment" exit ${TEST_SKIPPED} fi ----------------------------------------------------------------------- Summary of changes: example/generator/odp_generator.c | 13 ++----------- test/validation/api/traffic_mngr/traffic_mngr.sh | 4 +--- 2 files changed, 3 insertions(+), 14 deletions(-) hooks/post-receive --

7 years, 11 months

[COMMIT] branch master updated. v1.17.0.0_tigermoth_rc1-199-g6e213fba

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 6e213fbae7f16558e572da39704927f107c01f80 (commit) via cc453ca9fc04f370c3af28d4366c49d5f07bec32 (commit) via 448629199c4b50d5dd22be946b8c0d963479a3f3 (commit) from 1e47fa70c2eeb3d2f3805af28a00476c7284ef24 (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 6e213fbae7f16558e572da39704927f107c01f80 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Thu Feb 15 14:54:35 2018 +0200 validation: cls: test cos_num_queue and cos_queues Added single queue tests for cos_num_queue and cos_queues. This way functions are called at least once from validation test suite. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/classification/odp_classification_basic.c b/test/validation/api/classification/odp_classification_basic.c index c31a7530..20f07374 100644 --- a/test/validation/api/classification/odp_classification_basic.c +++ b/test/validation/api/classification/odp_classification_basic.c @@ -149,6 +149,7 @@ void classification_test_cos_set_queue(void) odp_queue_t queue_cos; odp_cos_t cos_queue; odp_queue_t recvqueue; + odp_queue_t queue_out = ODP_QUEUE_INVALID; pool = pool_create("cls_basic_pool"); CU_ASSERT_FATAL(pool != ODP_POOL_INVALID); @@ -171,6 +172,9 @@ void classification_test_cos_set_queue(void) CU_ASSERT(retval == 0); recvqueue = odp_cos_queue(cos_queue); CU_ASSERT(recvqueue == queue_cos); + CU_ASSERT(odp_cls_cos_num_queue(cos_queue) == 1); + CU_ASSERT(odp_cls_cos_queues(cos_queue, &queue_out, 1) == 1); + CU_ASSERT(queue_out == queue_cos); odp_cos_destroy(cos_queue); odp_queue_destroy(queue_cos); commit cc453ca9fc04f370c3af28d4366c49d5f07bec32 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Thu Feb 15 14:41:27 2018 +0200 linux-gen: cls: fix single queue bugs odp_cls_cos_num_queue() and odp_cls_cos_queues() returned 0 for single queue CoS. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/odp_classification.c b/platform/linux-generic/odp_classification.c index f22dd091..ceef1fc1 100644 --- a/platform/linux-generic/odp_classification.c +++ b/platform/linux-generic/odp_classification.c @@ -250,11 +250,12 @@ odp_cos_t odp_cls_cos_create(const char *name, odp_cls_cos_param_t *param) cos->s.linked_cos[j] = NULL; } + cos->s.num_queue = param->num_queue; + if (param->num_queue > 1) { odp_queue_param_init(&cos->s.queue_param); cos->s.queue_group = true; cos->s.queue = ODP_QUEUE_INVALID; - cos->s.num_queue = param->num_queue; _odp_cls_update_hash_proto(cos, param->hash_proto); tbl_index = i * CLS_COS_QUEUE_MAX; @@ -358,6 +359,12 @@ int odp_cos_queue_set(odp_cos_t cos_id, odp_queue_t queue_id) ODP_ERR("Invalid odp_cos_t handle"); return -1; } + + if (cos->s.num_queue != 1) { + ODP_ERR("Hashing enabled, cannot set queue"); + return -1; + } + /* Locking is not required as intermittent stale data during CoS modification is acceptable*/ cos->s.queue = queue_id; @@ -402,6 +409,14 @@ uint32_t odp_cls_cos_queues(odp_cos_t cos_id, odp_queue_t queue[], return 0; } + if (cos->s.num_queue == 1) { + if (num == 0) + return 1; + + queue[0] = cos->s.queue; + return 1; + } + if (num < cos->s.num_queue) num_queues = num; else commit 448629199c4b50d5dd22be946b8c0d963479a3f3 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Thu Feb 15 13:40:46 2018 +0200 validation: sched: add order_unlock_lock test Added simple ordered lock test, so that new ordered_unlock_lock function is tested at least on single thread. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/scheduler/scheduler.c b/test/validation/api/scheduler/scheduler.c index 2c0d4410..0be6ce3f 100644 --- a/test/validation/api/scheduler/scheduler.c +++ b/test/validation/api/scheduler/scheduler.c @@ -1336,6 +1336,76 @@ void scheduler_test_pause_resume(void) CU_ASSERT(ret == 0); } +/* Basic, single threaded ordered lock API testing */ +static void scheduler_test_ordered_lock(void) +{ + odp_queue_t queue; + odp_buffer_t buf; + odp_event_t ev; + odp_queue_t from; + int i; + int ret; + uint32_t lock_count; + + queue = odp_queue_lookup("sched_0_0_o"); + CU_ASSERT_FATAL(queue != ODP_QUEUE_INVALID); + CU_ASSERT_FATAL(odp_queue_type(queue) == ODP_QUEUE_TYPE_SCHED); + CU_ASSERT_FATAL(odp_queue_sched_type(queue) == ODP_SCHED_SYNC_ORDERED); + + lock_count = odp_queue_lock_count(queue); + + if (lock_count == 0) { + printf(" NO ORDERED LOCKS. Ordered locks not tested.\n"); + return; + } + + pool = odp_pool_lookup(MSG_POOL_NAME); + CU_ASSERT_FATAL(pool != ODP_POOL_INVALID); + + for (i = 0; i < BUFS_PER_QUEUE; i++) { + buf = odp_buffer_alloc(pool); + CU_ASSERT_FATAL(buf != ODP_BUFFER_INVALID); + ev = odp_buffer_to_event(buf); + ret = odp_queue_enq(queue, ev); + CU_ASSERT(ret == 0); + + if (ret) + odp_buffer_free(buf); + } + + for (i = 0; i < BUFS_PER_QUEUE / 2; i++) { + from = ODP_QUEUE_INVALID; + ev = odp_schedule(&from, ODP_SCHED_WAIT); + CU_ASSERT_FATAL(ev != ODP_EVENT_INVALID); + CU_ASSERT(from == queue); + buf = odp_buffer_from_event(ev); + odp_schedule_order_lock(0); + odp_schedule_order_unlock(0); + odp_buffer_free(buf); + } + + if (lock_count < 2) { + printf(" ONLY ONE ORDERED LOCK. Unlock_lock not tested.\n"); + return; + } + + for (i = 0; i < BUFS_PER_QUEUE / 2; i++) { + from = ODP_QUEUE_INVALID; + ev = odp_schedule(&from, ODP_SCHED_WAIT); + CU_ASSERT_FATAL(ev != ODP_EVENT_INVALID); + CU_ASSERT(from == queue); + buf = odp_buffer_from_event(ev); + odp_schedule_order_lock(0); + odp_schedule_order_unlock_lock(0, 1); + odp_schedule_order_unlock(1); + odp_buffer_free(buf); + } + + ret = exit_schedule_loop(); + + CU_ASSERT(ret == 0); +} + static int create_queues(void) { int i, j, prios, rc; @@ -1618,6 +1688,7 @@ odp_testinfo_t scheduler_suite[] = { ODP_TEST_INFO(scheduler_test_queue_destroy), ODP_TEST_INFO(scheduler_test_groups), ODP_TEST_INFO(scheduler_test_pause_resume), + ODP_TEST_INFO(scheduler_test_ordered_lock), ODP_TEST_INFO(scheduler_test_parallel), ODP_TEST_INFO(scheduler_test_atomic), ODP_TEST_INFO(scheduler_test_ordered), ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/odp_classification.c | 17 +++++- .../api/classification/odp_classification_basic.c | 4 ++ test/validation/api/scheduler/scheduler.c | 71 ++++++++++++++++++++++ 3 files changed, 91 insertions(+), 1 deletion(-) hooks/post-receive --

7 years, 11 months

[COMMIT] branch master updated. v1.17.0.0_tigermoth_rc1-196-g1e47fa70

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 1e47fa70c2eeb3d2f3805af28a00476c7284ef24 (commit) from 7599dfb05bf942eaad227462f1a58a78aac9e67d (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 1e47fa70c2eeb3d2f3805af28a00476c7284ef24 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Thu Feb 15 14:39:11 2018 +0300 shippable: disable perf-proc tests These tests have tendency of hanging up Shippable occasionally. 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/.shippable.yml b/.shippable.yml index 72d17bda..6b2a73c3 100644 --- a/.shippable.yml +++ b/.shippable.yml @@ -5,8 +5,8 @@ compiler: - clang env: - - CONF="--disable-test-perf" - - CONF="--disable-abi-compat --disable-test-perf" + - CONF="--disable-test-perf --disable-test-perf-proc" + - CONF="--disable-abi-compat --disable-test-perf --disable-test-perf-proc" # - CONF="--enable-schedule-sp" # - CONF="--enable-schedule-iquery" # - CONF="--enable-dpdk-zero-copy" @@ -18,7 +18,7 @@ env: matrix: allow_failures: - compiler: clang - env: CONF="--disable-abi-compat --disable-test-perf" + env: CONF="--disable-abi-compat --disable-test-perf --disable-test-perf-proc" build: pre_ci: ----------------------------------------------------------------------- Summary of changes: .shippable.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) hooks/post-receive --

7 years, 11 months

[COMMIT] branch master updated. v1.17.0.0_tigermoth_rc1-195-g7599dfb0

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 7599dfb05bf942eaad227462f1a58a78aac9e67d (commit) from c175ae14ed7122dce26e89a4fc464eba7208bb22 (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 7599dfb05bf942eaad227462f1a58a78aac9e67d Author: Matias Elo <matias.elo(a)nokia.com> Date: Wed Feb 14 11:03:49 2018 +0200 linux-gen: dpdk: port ID is two bytes long Starting from DPDK v17.05 port ID is 2 bytes long. 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/platform/linux-generic/include/odp_packet_dpdk.h b/platform/linux-generic/include/odp_packet_dpdk.h index 24292655..ec60b872 100644 --- a/platform/linux-generic/include/odp_packet_dpdk.h +++ b/platform/linux-generic/include/odp_packet_dpdk.h @@ -54,13 +54,13 @@ typedef struct ODP_ALIGNED_CACHE { unsigned min_rx_burst; /**< minimum RX burst size */ odp_pktin_hash_proto_t hash; /**< Packet input hash protocol */ uint16_t mtu; /**< maximum transmission unit */ + uint16_t port_id; /**< DPDK port identifier */ /** Use system call to get/set vdev promisc mode */ uint8_t vdev_sysc_promisc; uint8_t lockless_rx; /**< no locking for rx */ uint8_t lockless_tx; /**< no locking for tx */ - uint8_t port_id; /**< DPDK port identifier */ - /* --- 34 bytes --- */ - odp_ticketlock_t rx_lock[PKTIO_MAX_QUEUES]; /**< RX queue locks */ + /** RX queue locks */ + odp_ticketlock_t ODP_ALIGNED_CACHE rx_lock[PKTIO_MAX_QUEUES]; odp_ticketlock_t tx_lock[PKTIO_MAX_QUEUES]; /**< TX queue locks */ /** cache for storing extra RX packets */ pkt_cache_t rx_cache[PKTIO_MAX_QUEUES]; diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c index dd9da264..6dc60238 100644 --- a/platform/linux-generic/pktio/dpdk.c +++ b/platform/linux-generic/pktio/dpdk.c @@ -820,7 +820,7 @@ static int dpdk_netdev_is_valid(const char *s) return 1; } -static uint32_t dpdk_vdev_mtu_get(uint8_t port_id) +static uint32_t dpdk_vdev_mtu_get(uint16_t port_id) { struct rte_eth_dev_info dev_info; struct ifreq ifr; @@ -871,7 +871,7 @@ static uint32_t dpdk_frame_maxlen(pktio_entry_t *pktio_entry) return pkt_dpdk->mtu; } -static int dpdk_vdev_promisc_mode_get(uint8_t port_id) +static int dpdk_vdev_promisc_mode_get(uint16_t port_id) { struct rte_eth_dev_info dev_info; struct ifreq ifr; @@ -894,7 +894,7 @@ static int dpdk_vdev_promisc_mode_get(uint8_t port_id) return mode; } -static int dpdk_vdev_promisc_mode_set(uint8_t port_id, int enable) +static int dpdk_vdev_promisc_mode_set(uint16_t port_id, int enable) { struct rte_eth_dev_info dev_info; struct ifreq ifr; @@ -1150,7 +1150,7 @@ static int dpdk_pktio_term(void) return 0; #if RTE_VERSION >= RTE_VERSION_NUM(17, 8, 0, 0) - uint8_t port_id; + uint16_t port_id; RTE_ETH_FOREACH_DEV(port_id) { rte_eth_dev_close(port_id); @@ -1409,7 +1409,7 @@ static int dpdk_start(pktio_entry_t *pktio_entry) struct rte_eth_dev_info dev_info; struct rte_eth_rxconf *rxconf; pkt_dpdk_t *pkt_dpdk = &pktio_entry->s.pkt_dpdk; - uint8_t port_id = pkt_dpdk->port_id; + uint16_t port_id = pkt_dpdk->port_id; int ret; unsigned i; @@ -1653,7 +1653,7 @@ static int dpdk_mac_addr_get(pktio_entry_t *pktio_entry, void *mac_addr) static int dpdk_promisc_mode_set(pktio_entry_t *pktio_entry, odp_bool_t enable) { - uint8_t port_id = pktio_entry->s.pkt_dpdk.port_id; + uint16_t port_id = pktio_entry->s.pkt_dpdk.port_id; if (pktio_entry->s.pkt_dpdk.vdev_sysc_promisc) return dpdk_vdev_promisc_mode_set(port_id, enable); @@ -1668,7 +1668,7 @@ static int dpdk_promisc_mode_set(pktio_entry_t *pktio_entry, odp_bool_t enable) static int dpdk_promisc_mode_get(pktio_entry_t *pktio_entry) { - uint8_t port_id = pktio_entry->s.pkt_dpdk.port_id; + uint16_t port_id = pktio_entry->s.pkt_dpdk.port_id; if (pktio_entry->s.pkt_dpdk.vdev_sysc_promisc) return dpdk_vdev_promisc_mode_get(port_id); ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/include/odp_packet_dpdk.h | 6 +++--- platform/linux-generic/pktio/dpdk.c | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) hooks/post-receive --

7 years, 11 months

[COMMIT] branch master updated. v1.17.0.0_tigermoth_rc1-194-gc175ae14

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 c175ae14ed7122dce26e89a4fc464eba7208bb22 (commit) from ea529e1c3312459b6722c8a175d7f03ad0251a0a (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 c175ae14ed7122dce26e89a4fc464eba7208bb22 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Mon Feb 12 18:45:22 2018 +0300 travis: add two tests using DPDK version 17.11 Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/.travis.yml b/.travis.yml index e36c7bcb..5fbb42c4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -59,6 +59,8 @@ env: - CONF="--enable-dpdk-zero-copy" - CONF="--disable-static-applications" - DPDK_SHARED="y" CONF="--disable-static-applications" + - DPDK_VERS="17.11" CONF="" + - DPDK_VERS="17.11" DPDK_SHARED="y" CONF="--disable-static-applications" compiler: - gcc ----------------------------------------------------------------------- Summary of changes: .travis.yml | 2 ++ 1 file changed, 2 insertions(+) hooks/post-receive --

7 years, 11 months

[COMMIT] branch master updated. v1.17.0.0_tigermoth_rc1-193-gea529e1c

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 ea529e1c3312459b6722c8a175d7f03ad0251a0a (commit) via 2f8d049cc5a33933165fdec19c1a8480cd71e984 (commit) from 6ea9400bfcc7497ea8f9d2fd8cc3b77936c71d0b (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 ea529e1c3312459b6722c8a175d7f03ad0251a0a Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Thu Feb 15 12:28:06 2018 +0200 linux-gen: packet: remove duplicate conversion Remove _odp_packet_from_buf_hdr() as it is a duplicate of packet_from_buf_hdr(). Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-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/include/odp_packet_internal.h b/platform/linux-generic/include/odp_packet_internal.h index e6b65bab..5058c02d 100644 --- a/platform/linux-generic/include/odp_packet_internal.h +++ b/platform/linux-generic/include/odp_packet_internal.h @@ -302,9 +302,6 @@ int packet_parse_layer(odp_packet_hdr_t *pkt_hdr, /* Reset parser metadata for a new parse */ void packet_parse_reset(odp_packet_hdr_t *pkt_hdr); -/* Convert a buffer handle to a packet handle */ -odp_packet_t _odp_packet_from_buf_hdr(odp_buffer_hdr_t *buf_hdr); - static inline int packet_hdr_has_l2(odp_packet_hdr_t *pkt_hdr) { return pkt_hdr->p.input_flags.l2; diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index 89f85d15..1c1b45ff 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -60,11 +60,6 @@ ODP_STATIC_ASSERT(ODP_BUFFER_INVALID == 0, "Buffer invalid not 0"); ODP_STATIC_ASSERT(ODP_EVENT_INVALID == 0, "Event invalid not 0"); #endif -odp_packet_t _odp_packet_from_buf_hdr(odp_buffer_hdr_t *buf_hdr) -{ - return (odp_packet_t)buf_hdr; -} - static inline odp_buffer_t packet_to_buffer(odp_packet_t pkt) { return (odp_buffer_t)pkt; diff --git a/platform/linux-generic/odp_traffic_mngr.c b/platform/linux-generic/odp_traffic_mngr.c index 5c19b7c1..a6f066c2 100644 --- a/platform/linux-generic/odp_traffic_mngr.c +++ b/platform/linux-generic/odp_traffic_mngr.c @@ -111,7 +111,7 @@ static int queue_tm_reenq(queue_t queue, odp_buffer_hdr_t *buf_hdr) odp_tm_queue_t tm_queue = MAKE_ODP_TM_QUEUE((uint8_t *)queue - offsetof(tm_queue_obj_t, tm_qentry)); - odp_packet_t pkt = _odp_packet_from_buf_hdr(buf_hdr); + odp_packet_t pkt = packet_from_buf_hdr(buf_hdr); return odp_tm_enq(tm_queue, pkt); } commit 2f8d049cc5a33933165fdec19c1a8480cd71e984 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Thu Feb 15 12:08:31 2018 +0200 linux-gen: packet: remove unused function Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-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/include/odp_packet_internal.h b/platform/linux-generic/include/odp_packet_internal.h index 89009a02..e6b65bab 100644 --- a/platform/linux-generic/include/odp_packet_internal.h +++ b/platform/linux-generic/include/odp_packet_internal.h @@ -299,12 +299,6 @@ int packet_alloc_multi(odp_pool_t pool_hdl, uint32_t len, int packet_parse_layer(odp_packet_hdr_t *pkt_hdr, odp_proto_layer_t layer); -/* Perform L3 and L4 parsing up to a given protocol layer */ -int packet_parse_l3_l4(odp_packet_hdr_t *pkt_hdr, - odp_proto_layer_t layer, - uint32_t l3_offset, - uint16_t ethtype); - /* Reset parser metadata for a new parse */ void packet_parse_reset(odp_packet_hdr_t *pkt_hdr); diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index 05b8c485..89f85d15 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -2274,22 +2274,6 @@ int packet_parse_layer(odp_packet_hdr_t *pkt_hdr, seg_len, layer); } -int packet_parse_l3_l4(odp_packet_hdr_t *pkt_hdr, - odp_proto_layer_t layer, - uint32_t l3_offset, - uint16_t ethtype) -{ - uint32_t seg_len = 0; - void *base = packet_map(pkt_hdr, l3_offset, &seg_len, NULL); - - if (seg_len == 0) - return -1; - - return packet_parse_common_l3_l4(&pkt_hdr->p, base, l3_offset, - pkt_hdr->frame_len, seg_len, - layer, ethtype); -} - int odp_packet_parse(odp_packet_t pkt, uint32_t offset, const odp_packet_parse_param_t *param) { ----------------------------------------------------------------------- Summary of changes: .../linux-generic/include/odp_packet_internal.h | 9 --------- platform/linux-generic/odp_packet.c | 21 --------------------- platform/linux-generic/odp_traffic_mngr.c | 2 +- 3 files changed, 1 insertion(+), 31 deletions(-) hooks/post-receive --

7 years, 11 months

[COMMIT] branch master updated. v1.17.0.0_tigermoth_rc1-191-g6ea9400b

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 6ea9400bfcc7497ea8f9d2fd8cc3b77936c71d0b (commit) via 18462171eb83f9b6f867812629f7e89998bc6e1a (commit) via c976a3146724bd0d09bcad2bd83810c300bf8ad5 (commit) via 9805209384a5f40210b5f57c1f7a67e83f07fb99 (commit) via 67b1d6ed0e5a318f6913f96f9d427df5799317e9 (commit) via 22866cc9df76230750b8ce5504d948ed78a727a2 (commit) via ab78f2924a353d4e0e45deea73201e6da10a7664 (commit) from 41b3fa2cd994a7ef68290a07dcde5564e4640847 (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 6ea9400bfcc7497ea8f9d2fd8cc3b77936c71d0b Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Tue Feb 13 14:00:54 2018 +0200 validation: packet: add IP multicast tests Added test cases for Ethernet/IP multi- and broadcasts. Signed-off-by: Petri Savolainen <petri.savolainen(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/test/common/test_packet_parser.h b/test/common/test_packet_parser.h index b7d02113..d0a0582a 100644 --- a/test/common/test_packet_parser.h +++ b/test/common/test_packet_parser.h @@ -333,6 +333,62 @@ static const uint8_t test_packet_ipv6_ipsec_esp[] = { 0x88, 0x37, 0x65, 0xab, 0x0d, 0xe9, 0x95, 0x3b }; +static const uint8_t test_packet_mcast_eth_ipv4_udp[] = { + 0x03, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x02, 0x00, + 0x00, 0x03, 0x04, 0x05, 0x08, 0x00, 0x45, 0x00, + 0x00, 0x63, 0x00, 0x01, 0x00, 0x00, 0x40, 0x11, + 0xC8, 0xDB, 0xC0, 0xA8, 0x00, 0x01, 0xEF, 0x01, + 0x02, 0x03, 0x04, 0xD2, 0x16, 0x2E, 0x00, 0x4F, + 0x25, 0x61, 0x54, 0x68, 0x69, 0x73, 0x20, 0x69, + 0x73, 0x20, 0x6D, 0x79, 0x20, 0x64, 0x75, 0x6D, + 0x6D, 0x79, 0x20, 0x70, 0x61, 0x79, 0x6C, 0x6F, + 0x61, 0x64, 0x20, 0x73, 0x74, 0x72, 0x69, 0x6E, + 0x67, 0x2E, 0x20, 0x54, 0x68, 0x65, 0x20, 0x6C, + 0x65, 0x6E, 0x67, 0x74, 0x68, 0x20, 0x6F, 0x66, + 0x20, 0x74, 0x68, 0x69, 0x73, 0x20, 0x73, 0x74, + 0x72, 0x69, 0x6E, 0x67, 0x20, 0x69, 0x73, 0x20, + 0x37, 0x31, 0x20, 0x62, 0x79, 0x74, 0x65, 0x73, + 0x2E +}; + +static const uint8_t test_packet_bcast_eth_ipv4_udp[] = { + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x02, 0x00, + 0x00, 0x03, 0x04, 0x05, 0x08, 0x00, 0x45, 0x00, + 0x00, 0x63, 0x00, 0x01, 0x00, 0x00, 0x40, 0x11, + 0xB9, 0xE0, 0xC0, 0xA8, 0x00, 0x01, 0xFF, 0xFF, + 0xFF, 0xFF, 0x04, 0xD2, 0x16, 0x2E, 0x00, 0x4F, + 0x16, 0x66, 0x54, 0x68, 0x69, 0x73, 0x20, 0x69, + 0x73, 0x20, 0x6D, 0x79, 0x20, 0x64, 0x75, 0x6D, + 0x6D, 0x79, 0x20, 0x70, 0x61, 0x79, 0x6C, 0x6F, + 0x61, 0x64, 0x20, 0x73, 0x74, 0x72, 0x69, 0x6E, + 0x67, 0x2E, 0x20, 0x54, 0x68, 0x65, 0x20, 0x6C, + 0x65, 0x6E, 0x67, 0x74, 0x68, 0x20, 0x6F, 0x66, + 0x20, 0x74, 0x68, 0x69, 0x73, 0x20, 0x73, 0x74, + 0x72, 0x69, 0x6E, 0x67, 0x20, 0x69, 0x73, 0x20, + 0x37, 0x31, 0x20, 0x62, 0x79, 0x74, 0x65, 0x73, + 0x2E +}; + +static const uint8_t test_packet_mcast_eth_ipv6_udp[] = { + 0x33, 0x33, 0x01, 0x02, 0x03, 0x04, 0x02, 0x00, + 0x00, 0x03, 0x04, 0x05, 0x86, 0xDD, 0x60, 0x00, + 0x00, 0x00, 0x00, 0x4F, 0x11, 0x40, 0xFE, 0x80, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0xFF, 0xFE, 0x03, 0x04, 0x05, 0xFF, 0x02, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, + 0x00, 0x02, 0x00, 0x03, 0x00, 0x04, 0x04, 0xD2, + 0x16, 0x2E, 0x00, 0x4F, 0xD6, 0x79, 0x54, 0x68, + 0x69, 0x73, 0x20, 0x69, 0x73, 0x20, 0x6D, 0x79, + 0x20, 0x64, 0x75, 0x6D, 0x6D, 0x79, 0x20, 0x70, + 0x61, 0x79, 0x6C, 0x6F, 0x61, 0x64, 0x20, 0x73, + 0x74, 0x72, 0x69, 0x6E, 0x67, 0x2E, 0x20, 0x54, + 0x68, 0x65, 0x20, 0x6C, 0x65, 0x6E, 0x67, 0x74, + 0x68, 0x20, 0x6F, 0x66, 0x20, 0x74, 0x68, 0x69, + 0x73, 0x20, 0x73, 0x74, 0x72, 0x69, 0x6E, 0x67, + 0x20, 0x69, 0x73, 0x20, 0x37, 0x31, 0x20, 0x62, + 0x79, 0x74, 0x65, 0x73, 0x2E +}; + #ifdef __cplusplus } #endif diff --git a/test/validation/api/packet/packet.c b/test/validation/api/packet/packet.c index ccfe6e51..db3a47cf 100644 --- a/test/validation/api/packet/packet.c +++ b/test/validation/api/packet/packet.c @@ -65,7 +65,10 @@ static uint32_t parse_test_pkt_len[] = { sizeof(test_packet_ipv4_ipsec_ah), sizeof(test_packet_ipv4_ipsec_esp), sizeof(test_packet_ipv6_ipsec_ah), - sizeof(test_packet_ipv6_ipsec_esp) + sizeof(test_packet_ipv6_ipsec_esp), + sizeof(test_packet_mcast_eth_ipv4_udp), + sizeof(test_packet_bcast_eth_ipv4_udp), + sizeof(test_packet_mcast_eth_ipv6_udp) }; #define packet_compare_offset(pkt1, off1, pkt2, off2, len) \ @@ -3051,6 +3054,109 @@ static void parse_eth_ipv6_ipsec_esp(void) odp_packet_free_multi(pkt, num_pkt); } +/* Ethernet mcast/IPv4 mcast/UDP */ +static void parse_mcast_eth_ipv4_udp(void) +{ + odp_packet_parse_param_t parse; + int i; + int num_pkt = PARSE_TEST_NUM_PKT; + odp_packet_t pkt[num_pkt]; + + parse_test_alloc(pkt, test_packet_mcast_eth_ipv4_udp, + sizeof(test_packet_mcast_eth_ipv4_udp)); + + parse.proto = ODP_PROTO_ETH; + parse.last_layer = ODP_PROTO_LAYER_L4; + parse.chksums.all_chksum = 0; + + CU_ASSERT(odp_packet_parse(pkt[0], 0, &parse) == 0); + CU_ASSERT(odp_packet_parse_multi(&pkt[1], parse_test.offset_zero, + num_pkt - 1, &parse) == (num_pkt - 1)); + + for (i = 0; i < num_pkt; i++) { + CU_ASSERT(odp_packet_has_eth(pkt[i])); + CU_ASSERT(odp_packet_has_eth_mcast(pkt[i])); + CU_ASSERT(odp_packet_has_ipv4(pkt[i])); + CU_ASSERT(odp_packet_has_ip_mcast(pkt[i])); + CU_ASSERT(odp_packet_has_udp(pkt[i])); + CU_ASSERT(!odp_packet_has_ipv6(pkt[i])); + CU_ASSERT(!odp_packet_has_tcp(pkt[i])); + CU_ASSERT(!odp_packet_has_eth_bcast(pkt[i])); + CU_ASSERT(!odp_packet_has_ip_bcast(pkt[i])); + } + + odp_packet_free_multi(pkt, num_pkt); +} + +/* Ethernet bcast/IPv4 bcast/UDP */ +static void parse_bcast_eth_ipv4_udp(void) +{ + odp_packet_parse_param_t parse; + int i; + int num_pkt = PARSE_TEST_NUM_PKT; + odp_packet_t pkt[num_pkt]; + + parse_test_alloc(pkt, test_packet_bcast_eth_ipv4_udp, + sizeof(test_packet_bcast_eth_ipv4_udp)); + + parse.proto = ODP_PROTO_ETH; + parse.last_layer = ODP_PROTO_LAYER_L4; + parse.chksums.all_chksum = 0; + + CU_ASSERT(odp_packet_parse(pkt[0], 0, &parse) == 0); + CU_ASSERT(odp_packet_parse_multi(&pkt[1], parse_test.offset_zero, + num_pkt - 1, &parse) == (num_pkt - 1)); + + for (i = 0; i < num_pkt; i++) { + CU_ASSERT(odp_packet_has_eth(pkt[i])); + CU_ASSERT(odp_packet_has_eth_bcast(pkt[i])); + /* API specifies that Ethernet broadcast is also multicast */ + CU_ASSERT(odp_packet_has_eth_mcast(pkt[i])); + CU_ASSERT(odp_packet_has_ipv4(pkt[i])); + CU_ASSERT(odp_packet_has_ip_bcast(pkt[i])); + CU_ASSERT(odp_packet_has_udp(pkt[i])); + CU_ASSERT(!odp_packet_has_ipv6(pkt[i])); + CU_ASSERT(!odp_packet_has_tcp(pkt[i])); + CU_ASSERT(!odp_packet_has_ip_mcast(pkt[i])); + } + + odp_packet_free_multi(pkt, num_pkt); +} + +/* Ethernet mcast/IPv6 mcast/UDP */ +static void parse_mcast_eth_ipv6_udp(void) +{ + odp_packet_parse_param_t parse; + int i; + int num_pkt = PARSE_TEST_NUM_PKT; + odp_packet_t pkt[num_pkt]; + + parse_test_alloc(pkt, test_packet_mcast_eth_ipv6_udp, + sizeof(test_packet_mcast_eth_ipv6_udp)); + + parse.proto = ODP_PROTO_ETH; + parse.last_layer = ODP_PROTO_LAYER_L4; + parse.chksums.all_chksum = 0; + + CU_ASSERT(odp_packet_parse(pkt[0], 0, &parse) == 0); + CU_ASSERT(odp_packet_parse_multi(&pkt[1], parse_test.offset_zero, + num_pkt - 1, &parse) == (num_pkt - 1)); + + for (i = 0; i < num_pkt; i++) { + CU_ASSERT(odp_packet_has_eth(pkt[i])); + CU_ASSERT(odp_packet_has_eth_mcast(pkt[i])); + CU_ASSERT(odp_packet_has_ipv6(pkt[i])); + CU_ASSERT(odp_packet_has_ip_mcast(pkt[i])); + CU_ASSERT(odp_packet_has_udp(pkt[i])); + CU_ASSERT(!odp_packet_has_ipv4(pkt[i])); + CU_ASSERT(!odp_packet_has_tcp(pkt[i])); + CU_ASSERT(!odp_packet_has_eth_bcast(pkt[i])); + CU_ASSERT(!odp_packet_has_ip_bcast(pkt[i])); + } + + odp_packet_free_multi(pkt, num_pkt); +} + odp_testinfo_t packet_suite[] = { ODP_TEST_INFO(packet_test_alloc_free), ODP_TEST_INFO(packet_test_alloc_free_multi), @@ -3102,6 +3208,9 @@ odp_testinfo_t packet_parse_suite[] = { ODP_TEST_INFO(parse_eth_ipv4_ipsec_esp), ODP_TEST_INFO(parse_eth_ipv6_ipsec_ah), ODP_TEST_INFO(parse_eth_ipv6_ipsec_esp), + ODP_TEST_INFO(parse_mcast_eth_ipv4_udp), + ODP_TEST_INFO(parse_bcast_eth_ipv4_udp), + ODP_TEST_INFO(parse_mcast_eth_ipv6_udp), ODP_TEST_INFO_NULL, }; commit 18462171eb83f9b6f867812629f7e89998bc6e1a Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Tue Feb 13 14:02:14 2018 +0200 linux-gen: packet: fix IP multicast parse IPv4 multicast address range is between 224.0.0.0 and 239.255.255.255. So, first four bits are always 0xe (1110). Signed-off-by: Petri Savolainen <petri.savolainen(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/odp_packet.c b/platform/linux-generic/odp_packet.c index b2a22903..05b8c485 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -2028,7 +2028,7 @@ static inline uint8_t parse_ipv4(packet_parser_t *prs, const uint8_t **parseptr, if (odp_unlikely(dstaddr == 0xffffffff)) prs->input_flags.ip_bcast = 1; - if (odp_unlikely((dstaddr >> 28) == 0xd)) + if (odp_unlikely((dstaddr >> 28) == 0xe)) prs->input_flags.ip_mcast = 1; return ipv4->proto; commit c976a3146724bd0d09bcad2bd83810c300bf8ad5 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Tue Feb 13 11:03:27 2018 +0200 validation: packet: add IPSEC parse test Added test cases for IPSEC. AH and ESP headers with both IP versions. Signed-off-by: Petri Savolainen <petri.savolainen(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/test/common/test_packet_parser.h b/test/common/test_packet_parser.h index 22c7e6c5..b7d02113 100644 --- a/test/common/test_packet_parser.h +++ b/test/common/test_packet_parser.h @@ -168,6 +168,171 @@ static const uint8_t test_packet_ipv4_sctp[] = { 0x79, 0x74, 0x65, 0x73, 0x2E }; +static const uint8_t test_packet_ipv4_ipsec_ah[] = { + /* ETH */ + 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, + 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0x08, 0x00, + + /* IPv4 */ + 0x45, 0x00, 0x00, 0x9c, 0x00, 0x00, 0x00, 0x00, + 0x40, 0x33, 0xab, 0xd9, 0xc0, 0xa8, 0x6f, 0x02, + 0xc0, 0xa8, 0xde, 0x02, + + /* AH */ + 0x01, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7b, + 0x00, 0x00, 0x00, 0x01, + 0x6c, 0x2e, 0xf7, 0x1f, 0x7c, 0x70, 0x39, 0xa3, + 0x4a, 0x77, 0x01, 0x47, 0x9e, 0x45, 0x73, 0x51, + + /* ICMP */ + 0x08, 0x00, 0xfb, 0x37, 0x12, 0x34, 0x00, 0x00, + 0xba, 0xbe, 0x01, 0x23, 0x45, 0x67, 0xca, 0xfe, + 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, + 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, + 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, + 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, + 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, + 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f, + 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, + 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, + 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, + 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f, + 0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, + 0x58, 0x59, 0x5a, 0x5b +}; + +static const uint8_t test_packet_ipv4_ipsec_esp[] = { + /* ETH */ + 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, + 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0x08, 0x00, + + /* IPv4 */ + 0x45, 0x00, 0x00, 0xb0, 0x00, 0x00, 0x00, 0x00, + 0x40, 0x32, 0x19, 0x18, 0x0a, 0x00, 0x6f, 0x02, + 0x0a, 0x00, 0xde, 0x02, + + /* ESP */ + 0x00, 0x00, 0x00, 0x7b, 0x00, 0x00, 0x00, 0x01, + + /* IPv4 */ + 0x45, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, + 0x40, 0x01, 0xac, 0x27, 0xc0, 0xa8, 0x6f, 0x02, + 0xc0, 0xa8, 0xde, 0x02, + + /* ICMP */ + 0x08, 0x00, 0xfb, 0x37, 0x12, 0x34, 0x00, 0x00, + 0xba, 0xbe, 0x01, 0x23, 0x45, 0x67, 0xca, 0xfe, + 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, + 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, + 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, + 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, + 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, + 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f, + 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, + 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, + 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, + 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f, + 0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, + 0x58, 0x59, 0x5a, 0x5b, + + /* ESP TRL */ + 0x01, 0x02, 0x02, 0x04, + + /* ICV */ + 0x73, 0x8d, 0xf6, 0x9a, 0x26, 0x06, 0x4d, 0xa1, + 0x88, 0x37, 0x65, 0xab, 0x0d, 0xe9, 0x95, 0x3b +}; + +static const uint8_t test_packet_ipv6_ipsec_ah[] = { + /* ETH */ + 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, + 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0x86, 0xdd, + + /* IPv6 */ + 0x60, 0x00, 0x00, 0x00, 0x00, 0xbc, 0x33, 0x40, + 0x20, 0x01, 0x0d, 0xb8, 0x00, 0x00, 0x00, 0x00, + 0x02, 0x11, 0x43, 0xff, 0xfe, 0x4a, 0xd7, 0x0a, + 0x20, 0x01, 0x0d, 0xb8, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16, + + /* AH */ + 0x29, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7b, + 0x00, 0x00, 0x00, 0x01, + 0x62, 0x96, 0x2b, 0x40, 0x3e, 0x53, 0x76, 0x4a, + 0x4d, 0x7f, 0xf6, 0x22, 0x35, 0x3c, 0x74, 0xe2, + 0x00, 0x00, 0x00, 0x00, + + /* IPv6 */ + 0x60, 0x00, 0x00, 0x00, 0x00, 0x74, 0x00, 0x40, + 0x20, 0x01, 0x0d, 0xb8, 0x00, 0x00, 0x00, 0x00, + 0x02, 0x11, 0x43, 0xff, 0xfe, 0x4a, 0xd7, 0x0a, + 0x20, 0x01, 0x0d, 0xb8, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16, + + /* Hop-by-Hop */ + 0x3a, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, + + /* ICMP */ + 0x08, 0x00, 0xfb, 0x37, 0x12, 0x34, 0x00, 0x00, + 0xba, 0xbe, 0x01, 0x23, 0x45, 0x67, 0xca, 0xfe, + 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, + 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, + 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, + 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, + 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, + 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f, + 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, + 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, + 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, + 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f, + 0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, + 0x58, 0x59, 0x5a, 0x5b +}; + +static const uint8_t test_packet_ipv6_ipsec_esp[] = { + /* ETH */ + 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, + 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0x86, 0xdd, + + /* IPv6 */ + 0x60, 0x00, 0x00, 0x00, 0x00, 0x9c, 0x32, 0x40, + 0x20, 0x01, 0x0d, 0xb8, 0x00, 0x00, 0x00, 0x00, + 0x02, 0x11, 0x43, 0xff, 0xfe, 0x4a, 0xd7, 0x0a, + 0x20, 0x01, 0x0d, 0xb8, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16, + + /* ESP */ + 0x00, 0x00, 0x00, 0x7b, 0x00, 0x00, 0x00, 0x01, + + /* IPv4 */ + 0x45, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, + 0x40, 0x01, 0xac, 0x27, 0xc0, 0xa8, 0x6f, 0x02, + 0xc0, 0xa8, 0xde, 0x02, + + /* ICMP */ + 0x08, 0x00, 0xfb, 0x37, 0x12, 0x34, 0x00, 0x00, + 0xba, 0xbe, 0x01, 0x23, 0x45, 0x67, 0xca, 0xfe, + 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, + 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, + 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, + 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, + 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, + 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f, + 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, + 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, + 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, + 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f, + 0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, + 0x58, 0x59, 0x5a, 0x5b, + + /* ESP TRL */ + 0x01, 0x02, 0x02, 0x04, + + /* ICV */ + 0x73, 0x8d, 0xf6, 0x9a, 0x26, 0x06, 0x4d, 0xa1, + 0x88, 0x37, 0x65, 0xab, 0x0d, 0xe9, 0x95, 0x3b +}; + #ifdef __cplusplus } #endif diff --git a/test/validation/api/packet/packet.c b/test/validation/api/packet/packet.c index ad552040..ccfe6e51 100644 --- a/test/validation/api/packet/packet.c +++ b/test/validation/api/packet/packet.c @@ -61,7 +61,11 @@ static uint32_t parse_test_pkt_len[] = { sizeof(test_packet_ipv6_tcp), sizeof(test_packet_ipv6_udp), sizeof(test_packet_vlan_ipv6_udp), - sizeof(test_packet_ipv4_sctp) + sizeof(test_packet_ipv4_sctp), + sizeof(test_packet_ipv4_ipsec_ah), + sizeof(test_packet_ipv4_ipsec_esp), + sizeof(test_packet_ipv6_ipsec_ah), + sizeof(test_packet_ipv6_ipsec_esp) }; #define packet_compare_offset(pkt1, off1, pkt2, off2, len) \ @@ -2923,6 +2927,130 @@ static void parse_eth_ipv4_sctp(void) odp_packet_free_multi(pkt, num_pkt); } +/* Ethernet/IPv4/IPSEC AH*/ +static void parse_eth_ipv4_ipsec_ah(void) +{ + odp_packet_parse_param_t parse; + int i; + int num_pkt = PARSE_TEST_NUM_PKT; + odp_packet_t pkt[num_pkt]; + + parse_test_alloc(pkt, test_packet_ipv4_ipsec_ah, + sizeof(test_packet_ipv4_ipsec_ah)); + + parse.proto = ODP_PROTO_ETH; + parse.last_layer = ODP_PROTO_LAYER_L4; + parse.chksums.all_chksum = 0; + + CU_ASSERT(odp_packet_parse(pkt[0], 0, &parse) == 0); + CU_ASSERT(odp_packet_parse_multi(&pkt[1], parse_test.offset_zero, + num_pkt - 1, &parse) == (num_pkt - 1)); + + for (i = 0; i < num_pkt; i++) { + CU_ASSERT(odp_packet_has_eth(pkt[i])); + CU_ASSERT(odp_packet_has_ipv4(pkt[i])); + CU_ASSERT(odp_packet_has_ipsec(pkt[i])); + CU_ASSERT(!odp_packet_has_ipv6(pkt[i])); + CU_ASSERT(!odp_packet_has_tcp(pkt[i])); + CU_ASSERT(!odp_packet_has_udp(pkt[i])); + } + + odp_packet_free_multi(pkt, num_pkt); +} + +/* Ethernet/IPv4/IPSEC ESP*/ +static void parse_eth_ipv4_ipsec_esp(void) +{ + odp_packet_parse_param_t parse; + int i; + int num_pkt = PARSE_TEST_NUM_PKT; + odp_packet_t pkt[num_pkt]; + + parse_test_alloc(pkt, test_packet_ipv4_ipsec_esp, + sizeof(test_packet_ipv4_ipsec_esp)); + + parse.proto = ODP_PROTO_ETH; + parse.last_layer = ODP_PROTO_LAYER_L4; + parse.chksums.all_chksum = 0; + + CU_ASSERT(odp_packet_parse(pkt[0], 0, &parse) == 0); + CU_ASSERT(odp_packet_parse_multi(&pkt[1], parse_test.offset_zero, + num_pkt - 1, &parse) == (num_pkt - 1)); + + for (i = 0; i < num_pkt; i++) { + CU_ASSERT(odp_packet_has_eth(pkt[i])); + CU_ASSERT(odp_packet_has_ipv4(pkt[i])); + CU_ASSERT(odp_packet_has_ipsec(pkt[i])); + CU_ASSERT(!odp_packet_has_ipv6(pkt[i])); + CU_ASSERT(!odp_packet_has_tcp(pkt[i])); + CU_ASSERT(!odp_packet_has_udp(pkt[i])); + } + + odp_packet_free_multi(pkt, num_pkt); +} + +/* Ethernet/IPv6/IPSEC AH*/ +static void parse_eth_ipv6_ipsec_ah(void) +{ + odp_packet_parse_param_t parse; + int i; + int num_pkt = PARSE_TEST_NUM_PKT; + odp_packet_t pkt[num_pkt]; + + parse_test_alloc(pkt, test_packet_ipv6_ipsec_ah, + sizeof(test_packet_ipv6_ipsec_ah)); + + parse.proto = ODP_PROTO_ETH; + parse.last_layer = ODP_PROTO_LAYER_L4; + parse.chksums.all_chksum = 0; + + CU_ASSERT(odp_packet_parse(pkt[0], 0, &parse) == 0); + CU_ASSERT(odp_packet_parse_multi(&pkt[1], parse_test.offset_zero, + num_pkt - 1, &parse) == (num_pkt - 1)); + + for (i = 0; i < num_pkt; i++) { + CU_ASSERT(odp_packet_has_eth(pkt[i])); + CU_ASSERT(odp_packet_has_ipv6(pkt[i])); + CU_ASSERT(odp_packet_has_ipsec(pkt[i])); + CU_ASSERT(!odp_packet_has_ipv4(pkt[i])); + CU_ASSERT(!odp_packet_has_tcp(pkt[i])); + CU_ASSERT(!odp_packet_has_udp(pkt[i])); + } + + odp_packet_free_multi(pkt, num_pkt); +} + +/* Ethernet/IPv6/IPSEC ESP*/ +static void parse_eth_ipv6_ipsec_esp(void) +{ + odp_packet_parse_param_t parse; + int i; + int num_pkt = PARSE_TEST_NUM_PKT; + odp_packet_t pkt[num_pkt]; + + parse_test_alloc(pkt, test_packet_ipv6_ipsec_esp, + sizeof(test_packet_ipv6_ipsec_esp)); + + parse.proto = ODP_PROTO_ETH; + parse.last_layer = ODP_PROTO_LAYER_L4; + parse.chksums.all_chksum = 0; + + CU_ASSERT(odp_packet_parse(pkt[0], 0, &parse) == 0); + CU_ASSERT(odp_packet_parse_multi(&pkt[1], parse_test.offset_zero, + num_pkt - 1, &parse) == (num_pkt - 1)); + + for (i = 0; i < num_pkt; i++) { + CU_ASSERT(odp_packet_has_eth(pkt[i])); + CU_ASSERT(odp_packet_has_ipv6(pkt[i])); + CU_ASSERT(odp_packet_has_ipsec(pkt[i])); + CU_ASSERT(!odp_packet_has_ipv4(pkt[i])); + CU_ASSERT(!odp_packet_has_tcp(pkt[i])); + CU_ASSERT(!odp_packet_has_udp(pkt[i])); + } + + odp_packet_free_multi(pkt, num_pkt); +} + odp_testinfo_t packet_suite[] = { ODP_TEST_INFO(packet_test_alloc_free), ODP_TEST_INFO(packet_test_alloc_free_multi), @@ -2970,6 +3098,10 @@ odp_testinfo_t packet_parse_suite[] = { ODP_TEST_INFO(parse_eth_ipv4_icmp), ODP_TEST_INFO(parse_eth_ipv6_icmp), ODP_TEST_INFO(parse_eth_ipv4_sctp), + ODP_TEST_INFO(parse_eth_ipv4_ipsec_ah), + ODP_TEST_INFO(parse_eth_ipv4_ipsec_esp), + ODP_TEST_INFO(parse_eth_ipv6_ipsec_ah), + ODP_TEST_INFO(parse_eth_ipv6_ipsec_esp), ODP_TEST_INFO_NULL, }; commit 9805209384a5f40210b5f57c1f7a67e83f07fb99 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Mon Feb 12 15:32:16 2018 +0200 validation: packet: add IPv4 SCTP parse test Added test for IPv4 / SCTP packet with payload data chunk type. Signed-off-by: Petri Savolainen <petri.savolainen(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/test/common/test_packet_parser.h b/test/common/test_packet_parser.h index 918e0ad6..22c7e6c5 100644 --- a/test/common/test_packet_parser.h +++ b/test/common/test_packet_parser.h @@ -4,12 +4,6 @@ * SPDX-License-Identifier: BSD-3-Clause */ -/** - * @file - * - * Test packets for parser tests - */ - #ifndef TEST_PACKET_PARSER_H_ #define TEST_PACKET_PARSER_H_ @@ -21,9 +15,7 @@ extern "C" { /* Test packets without CRC */ -/** - * ARP request - */ +/* ARP request */ static const uint8_t test_packet_arp[] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x09, 0x00, 0x04, 0x00, 0x08, 0x06, 0x00, 0x01, @@ -35,9 +27,7 @@ static const uint8_t test_packet_arp[] = { 0x0E, 0x0F, 0x10, 0x11 }; -/** - * ICMPv4 echo reply - */ +/* ICMPv4 echo reply */ static const uint8_t test_packet_ipv4_icmp[] = { 0x00, 0x00, 0x09, 0x00, 0x05, 0x00, 0x00, 0x00, 0x09, 0x00, 0x04, 0x00, 0x08, 0x00, 0x45, 0x00, @@ -49,9 +39,7 @@ static const uint8_t test_packet_ipv4_icmp[] = { 0x0E, 0x0F, 0x10, 0x11 }; -/** - * IPv4 TCP - */ +/* IPv4 TCP */ static const uint8_t test_packet_ipv4_tcp[] = { 0x00, 0x00, 0x09, 0x00, 0x05, 0x00, 0x00, 0x00, 0x09, 0x00, 0x04, 0x00, 0x08, 0x00, 0x45, 0x00, @@ -63,9 +51,7 @@ static const uint8_t test_packet_ipv4_tcp[] = { 0x02, 0x03, 0x04, 0x05 }; -/** - * IPv4 UDP - */ +/* IPv4 UDP */ static const uint8_t test_packet_ipv4_udp[] = { 0x00, 0x00, 0x09, 0x00, 0x05, 0x00, 0x00, 0x00, 0x09, 0x00, 0x04, 0x00, 0x08, 0x00, 0x45, 0x00, @@ -77,9 +63,8 @@ static const uint8_t test_packet_ipv4_udp[] = { 0x0E, 0x0F, 0x10, 0x11 }; -/** - * VLAN IPv4 UDP - * - ID: 23 +/* VLAN IPv4 UDP + * - type 0x8100, tag 23 */ static const uint8_t test_packet_vlan_ipv4_udp[] = { 0x00, 0x00, 0x09, 0x00, 0x05, 0x00, 0x00, 0x00, @@ -92,10 +77,9 @@ static const uint8_t test_packet_vlan_ipv4_udp[] = { 0x0A, 0x0B, 0x0C, 0x0D }; -/** - * VLAN Q-in-Q IPv4 UDP - * - Outer: Tag Protocol ID 0x88a8, VLAN ID 1 - * - Inner: Tag Protocol ID 0x8100, VLAN ID 2 +/* VLAN Q-in-Q IPv4 UDP + * - Outer: type 0x88a8, tag 1 + * - Inner: type 0x8100, tag 2 */ static const uint8_t test_packet_vlan_qinq_ipv4_udp[] = { 0x00, 0x00, 0x09, 0x00, 0x05, 0x00, 0x00, 0x00, @@ -108,9 +92,7 @@ static const uint8_t test_packet_vlan_qinq_ipv4_udp[] = { 0x06, 0x07, 0x08, 0x09 }; -/** - * ICMPv6 echo request - */ +/* ICMPv6 echo request */ static const uint8_t test_packet_ipv6_icmp[] = { 0x00, 0x00, 0x09, 0x00, 0x05, 0x00, 0x00, 0x00, 0x09, 0x00, 0x04, 0x00, 0x86, 0xDD, 0x60, 0x30, @@ -122,9 +104,7 @@ static const uint8_t test_packet_ipv6_icmp[] = { 0x1B, 0xC2, 0x00, 0x01, 0x00, 0x02 }; -/** - * IPv6 TCP - */ +/* IPv6 TCP */ static const uint8_t test_packet_ipv6_tcp[] = { 0x00, 0x00, 0x09, 0x00, 0x05, 0x00, 0x00, 0x00, 0x09, 0x00, 0x04, 0x00, 0x86, 0xDD, 0x60, 0x30, @@ -138,9 +118,7 @@ static const uint8_t test_packet_ipv6_tcp[] = { 0x00, 0x00 }; -/** - * IPv6 UDP - */ +/* IPv6 UDP */ static const uint8_t test_packet_ipv6_udp[] = { 0x00, 0x00, 0x09, 0x00, 0x05, 0x00, 0x00, 0x00, 0x09, 0x00, 0x04, 0x00, 0x86, 0xDD, 0x60, 0x30, @@ -152,9 +130,8 @@ static const uint8_t test_packet_ipv6_udp[] = { 0x00, 0x3F, 0x00, 0x08, 0x9B, 0x68 }; -/** - * VLAN IPv6 - * - ID: 23 +/* VLAN IPv6 + * - type 0x8100, tag 23 */ static const uint8_t test_packet_vlan_ipv6_udp[] = { 0x00, 0x00, 0x09, 0x00, 0x05, 0x00, 0x00, 0x00, @@ -168,6 +145,29 @@ static const uint8_t test_packet_vlan_ipv6_udp[] = { 0x9B, 0x68 }; +/* IPv4 SCTP + * - chunk type: payload data + */ +static const uint8_t test_packet_ipv4_sctp[] = { + 0x00, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x00, 0x01, + 0x02, 0x03, 0x04, 0x05, 0x08, 0x00, 0x45, 0x00, + 0x00, 0x77, 0x00, 0x01, 0x00, 0x00, 0x40, 0x84, + 0xF8, 0xAE, 0xC0, 0xA8, 0x00, 0x01, 0xC0, 0xA8, + 0x00, 0x02, 0x04, 0xD2, 0x16, 0x2E, 0xDE, 0xAD, + 0xBE, 0xEF, 0x31, 0x44, 0xE3, 0xFE, 0x00, 0x00, + 0x00, 0x57, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x54, 0x68, + 0x69, 0x73, 0x20, 0x69, 0x73, 0x20, 0x6D, 0x79, + 0x20, 0x64, 0x75, 0x6D, 0x6D, 0x79, 0x20, 0x70, + 0x61, 0x79, 0x6C, 0x6F, 0x61, 0x64, 0x20, 0x73, + 0x74, 0x72, 0x69, 0x6E, 0x67, 0x2E, 0x20, 0x54, + 0x68, 0x65, 0x20, 0x6C, 0x65, 0x6E, 0x67, 0x74, + 0x68, 0x20, 0x6F, 0x66, 0x20, 0x74, 0x68, 0x69, + 0x73, 0x20, 0x73, 0x74, 0x72, 0x69, 0x6E, 0x67, + 0x20, 0x69, 0x73, 0x20, 0x37, 0x31, 0x20, 0x62, + 0x79, 0x74, 0x65, 0x73, 0x2E +}; + #ifdef __cplusplus } #endif diff --git a/test/validation/api/packet/packet.c b/test/validation/api/packet/packet.c index ea7e89b2..ad552040 100644 --- a/test/validation/api/packet/packet.c +++ b/test/validation/api/packet/packet.c @@ -60,7 +60,8 @@ static uint32_t parse_test_pkt_len[] = { sizeof(test_packet_ipv6_icmp), sizeof(test_packet_ipv6_tcp), sizeof(test_packet_ipv6_udp), - sizeof(test_packet_vlan_ipv6_udp) + sizeof(test_packet_vlan_ipv6_udp), + sizeof(test_packet_ipv4_sctp) }; #define packet_compare_offset(pkt1, off1, pkt2, off2, len) \ @@ -2891,6 +2892,37 @@ static void parse_eth_ipv6_icmp(void) odp_packet_free_multi(pkt, num_pkt); } +/* Ethernet/IPv4/SCTP */ +static void parse_eth_ipv4_sctp(void) +{ + odp_packet_parse_param_t parse; + int i; + int num_pkt = PARSE_TEST_NUM_PKT; + odp_packet_t pkt[num_pkt]; + + parse_test_alloc(pkt, test_packet_ipv4_sctp, + sizeof(test_packet_ipv4_sctp)); + + parse.proto = ODP_PROTO_ETH; + parse.last_layer = ODP_PROTO_LAYER_L4; + parse.chksums.all_chksum = 0; + + CU_ASSERT(odp_packet_parse(pkt[0], 0, &parse) == 0); + CU_ASSERT(odp_packet_parse_multi(&pkt[1], parse_test.offset_zero, + num_pkt - 1, &parse) == (num_pkt - 1)); + + for (i = 0; i < num_pkt; i++) { + CU_ASSERT(odp_packet_has_eth(pkt[i])); + CU_ASSERT(odp_packet_has_ipv4(pkt[i])); + CU_ASSERT(odp_packet_has_sctp(pkt[i])); + CU_ASSERT(!odp_packet_has_ipv6(pkt[i])); + CU_ASSERT(!odp_packet_has_tcp(pkt[i])); + CU_ASSERT(!odp_packet_has_udp(pkt[i])); + } + + odp_packet_free_multi(pkt, num_pkt); +} + odp_testinfo_t packet_suite[] = { ODP_TEST_INFO(packet_test_alloc_free), ODP_TEST_INFO(packet_test_alloc_free_multi), @@ -2937,6 +2969,7 @@ odp_testinfo_t packet_parse_suite[] = { ODP_TEST_INFO(parse_eth_arp), ODP_TEST_INFO(parse_eth_ipv4_icmp), ODP_TEST_INFO(parse_eth_ipv6_icmp), + ODP_TEST_INFO(parse_eth_ipv4_sctp), ODP_TEST_INFO_NULL, }; commit 67b1d6ed0e5a318f6913f96f9d427df5799317e9 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Mon Feb 12 14:52:37 2018 +0200 validation: packet: add parser test cases Add remaining test cases for packet formats already defined in test_packet_parser.h file. Signed-off-by: Petri Savolainen <petri.savolainen(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/test/validation/api/packet/packet.c b/test/validation/api/packet/packet.c index 05ec2b55..ea7e89b2 100644 --- a/test/validation/api/packet/packet.c +++ b/test/validation/api/packet/packet.c @@ -2633,6 +2633,7 @@ static void parse_eth_ipv4_tcp(void) num_pkt - 1, &parse) == (num_pkt - 1)); for (i = 0; i < num_pkt; i++) { + CU_ASSERT(odp_packet_has_eth(pkt[i])); CU_ASSERT(odp_packet_has_ipv4(pkt[i])); CU_ASSERT(odp_packet_has_tcp(pkt[i])); CU_ASSERT(!odp_packet_has_ipv6(pkt[i])); @@ -2702,6 +2703,194 @@ static void parse_eth_ipv6_tcp(void) odp_packet_free_multi(pkt, num_pkt); } +/* Ethernet/VLAN/IPv4/UDP */ +static void parse_eth_vlan_ipv4_udp(void) +{ + odp_packet_parse_param_t parse; + int i; + int num_pkt = PARSE_TEST_NUM_PKT; + odp_packet_t pkt[num_pkt]; + + parse_test_alloc(pkt, test_packet_vlan_ipv4_udp, + sizeof(test_packet_vlan_ipv4_udp)); + + parse.proto = ODP_PROTO_ETH; + parse.last_layer = ODP_PROTO_LAYER_L4; + parse.chksums.all_chksum = 0; + + CU_ASSERT(odp_packet_parse(pkt[0], 0, &parse) == 0); + CU_ASSERT(odp_packet_parse_multi(&pkt[1], parse_test.offset_zero, + num_pkt - 1, &parse) == (num_pkt - 1)); + + for (i = 0; i < num_pkt; i++) { + CU_ASSERT(odp_packet_has_eth(pkt[i])); + CU_ASSERT(odp_packet_has_vlan(pkt[i])); + CU_ASSERT(odp_packet_has_ipv4(pkt[i])); + CU_ASSERT(odp_packet_has_udp(pkt[i])); + CU_ASSERT(!odp_packet_has_ipv6(pkt[i])); + CU_ASSERT(!odp_packet_has_tcp(pkt[i])); + } + + odp_packet_free_multi(pkt, num_pkt); +} + +/* Ethernet/VLAN/IPv6/UDP */ +static void parse_eth_vlan_ipv6_udp(void) +{ + odp_packet_parse_param_t parse; + int i; + int num_pkt = PARSE_TEST_NUM_PKT; + odp_packet_t pkt[num_pkt]; + + parse_test_alloc(pkt, test_packet_vlan_ipv6_udp, + sizeof(test_packet_vlan_ipv6_udp)); + + parse.proto = ODP_PROTO_ETH; + parse.last_layer = ODP_PROTO_LAYER_L4; + parse.chksums.all_chksum = 0; + + CU_ASSERT(odp_packet_parse(pkt[0], 0, &parse) == 0); + CU_ASSERT(odp_packet_parse_multi(&pkt[1], parse_test.offset_zero, + num_pkt - 1, &parse) == (num_pkt - 1)); + + for (i = 0; i < num_pkt; i++) { + CU_ASSERT(odp_packet_has_eth(pkt[i])); + CU_ASSERT(odp_packet_has_vlan(pkt[i])); + CU_ASSERT(odp_packet_has_ipv6(pkt[i])); + CU_ASSERT(odp_packet_has_udp(pkt[i])); + CU_ASSERT(!odp_packet_has_ipv4(pkt[i])); + CU_ASSERT(!odp_packet_has_tcp(pkt[i])); + } + + odp_packet_free_multi(pkt, num_pkt); +} + +/* Ethernet/VLAN/VLAN/IPv4/UDP */ +static void parse_eth_vlan_qinq_ipv4_udp(void) +{ + odp_packet_parse_param_t parse; + int i; + int num_pkt = PARSE_TEST_NUM_PKT; + odp_packet_t pkt[num_pkt]; + + parse_test_alloc(pkt, test_packet_vlan_qinq_ipv4_udp, + sizeof(test_packet_vlan_qinq_ipv4_udp)); + + parse.proto = ODP_PROTO_ETH; + parse.last_layer = ODP_PROTO_LAYER_L4; + parse.chksums.all_chksum = 0; + + CU_ASSERT(odp_packet_parse(pkt[0], 0, &parse) == 0); + CU_ASSERT(odp_packet_parse_multi(&pkt[1], parse_test.offset_zero, + num_pkt - 1, &parse) == (num_pkt - 1)); + + for (i = 0; i < num_pkt; i++) { + CU_ASSERT(odp_packet_has_eth(pkt[i])); + CU_ASSERT(odp_packet_has_vlan(pkt[i])); + CU_ASSERT(odp_packet_has_vlan_qinq(pkt[i])); + CU_ASSERT(odp_packet_has_ipv4(pkt[i])); + CU_ASSERT(odp_packet_has_udp(pkt[i])); + CU_ASSERT(!odp_packet_has_ipv6(pkt[i])); + CU_ASSERT(!odp_packet_has_tcp(pkt[i])); + } + + odp_packet_free_multi(pkt, num_pkt); +} + +/* Ethernet/ARP */ +static void parse_eth_arp(void) +{ + odp_packet_parse_param_t parse; + int i; + int num_pkt = PARSE_TEST_NUM_PKT; + odp_packet_t pkt[num_pkt]; + + parse_test_alloc(pkt, test_packet_arp, + sizeof(test_packet_arp)); + + parse.proto = ODP_PROTO_ETH; + parse.last_layer = ODP_PROTO_LAYER_L4; + parse.chksums.all_chksum = 0; + + CU_ASSERT(odp_packet_parse(pkt[0], 0, &parse) == 0); + CU_ASSERT(odp_packet_parse_multi(&pkt[1], parse_test.offset_zero, + num_pkt - 1, &parse) == (num_pkt - 1)); + + for (i = 0; i < num_pkt; i++) { + CU_ASSERT(odp_packet_has_eth(pkt[i])); + CU_ASSERT(odp_packet_has_eth_bcast(pkt[i])); + CU_ASSERT(odp_packet_has_arp(pkt[i])); + CU_ASSERT(!odp_packet_has_vlan(pkt[i])); + CU_ASSERT(!odp_packet_has_ipv4(pkt[i])); + CU_ASSERT(!odp_packet_has_ipv6(pkt[i])); + CU_ASSERT(!odp_packet_has_udp(pkt[i])); + } + + odp_packet_free_multi(pkt, num_pkt); +} + +/* Ethernet/IPv4/ICMP */ +static void parse_eth_ipv4_icmp(void) +{ + odp_packet_parse_param_t parse; + int i; + int num_pkt = PARSE_TEST_NUM_PKT; + odp_packet_t pkt[num_pkt]; + + parse_test_alloc(pkt, test_packet_ipv4_icmp, + sizeof(test_packet_ipv4_icmp)); + + parse.proto = ODP_PROTO_ETH; + parse.last_layer = ODP_PROTO_LAYER_L4; + parse.chksums.all_chksum = 0; + + CU_ASSERT(odp_packet_parse(pkt[0], 0, &parse) == 0); + CU_ASSERT(odp_packet_parse_multi(&pkt[1], parse_test.offset_zero, + num_pkt - 1, &parse) == (num_pkt - 1)); + + for (i = 0; i < num_pkt; i++) { + CU_ASSERT(odp_packet_has_eth(pkt[i])); + CU_ASSERT(odp_packet_has_ipv4(pkt[i])); + CU_ASSERT(odp_packet_has_icmp(pkt[i])); + CU_ASSERT(!odp_packet_has_eth_bcast(pkt[i])); + CU_ASSERT(!odp_packet_has_ipv6(pkt[i])); + CU_ASSERT(!odp_packet_has_tcp(pkt[i])); + } + + odp_packet_free_multi(pkt, num_pkt); +} + +/* Ethernet/IPv6/ICMP */ +static void parse_eth_ipv6_icmp(void) +{ + odp_packet_parse_param_t parse; + int i; + int num_pkt = PARSE_TEST_NUM_PKT; + odp_packet_t pkt[num_pkt]; + + parse_test_alloc(pkt, test_packet_ipv6_icmp, + sizeof(test_packet_ipv6_icmp)); + + parse.proto = ODP_PROTO_ETH; + parse.last_layer = ODP_PROTO_LAYER_L4; + parse.chksums.all_chksum = 0; + + CU_ASSERT(odp_packet_parse(pkt[0], 0, &parse) == 0); + CU_ASSERT(odp_packet_parse_multi(&pkt[1], parse_test.offset_zero, + num_pkt - 1, &parse) == (num_pkt - 1)); + + for (i = 0; i < num_pkt; i++) { + CU_ASSERT(odp_packet_has_eth(pkt[i])); + CU_ASSERT(odp_packet_has_ipv6(pkt[i])); + CU_ASSERT(odp_packet_has_icmp(pkt[i])); + CU_ASSERT(!odp_packet_has_eth_bcast(pkt[i])); + CU_ASSERT(!odp_packet_has_ipv4(pkt[i])); + CU_ASSERT(!odp_packet_has_tcp(pkt[i])); + } + + odp_packet_free_multi(pkt, num_pkt); +} + odp_testinfo_t packet_suite[] = { ODP_TEST_INFO(packet_test_alloc_free), ODP_TEST_INFO(packet_test_alloc_free_multi), @@ -2742,6 +2931,12 @@ odp_testinfo_t packet_parse_suite[] = { ODP_TEST_INFO(parse_eth_ipv4_tcp), ODP_TEST_INFO(parse_eth_ipv6_udp), ODP_TEST_INFO(parse_eth_ipv6_tcp), + ODP_TEST_INFO(parse_eth_vlan_ipv4_udp), + ODP_TEST_INFO(parse_eth_vlan_ipv6_udp), + ODP_TEST_INFO(parse_eth_vlan_qinq_ipv4_udp), + ODP_TEST_INFO(parse_eth_arp), + ODP_TEST_INFO(parse_eth_ipv4_icmp), + ODP_TEST_INFO(parse_eth_ipv6_icmp), ODP_TEST_INFO_NULL, }; commit 22866cc9df76230750b8ce5504d948ed78a727a2 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Mon Feb 12 14:19:55 2018 +0200 validation: packet: create parse test suite Move parse tests into own suite before adding new test cases. There will be many parse test cases as there are many combinations of good and bad packet formats. Signed-off-by: Petri Savolainen <petri.savolainen(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/test/validation/api/packet/packet.c b/test/validation/api/packet/packet.c index 1188c683..05ec2b55 100644 --- a/test/validation/api/packet/packet.c +++ b/test/validation/api/packet/packet.c @@ -23,6 +23,9 @@ ODP_STATIC_ASSERT(PACKET_POOL_NUM_SEG > 1 && PACKET_POOL_NUM_SEG < PACKET_POOL_NUM, "Invalid PACKET_POOL_NUM_SEG value"); +/* Number of packets in parse test */ +#define PARSE_TEST_NUM_PKT 10 + static odp_pool_t packet_pool, packet_pool_no_uarea, packet_pool_double_uarea; static uint32_t packet_len; @@ -41,6 +44,25 @@ static struct udata_struct { "abcdefg", }; +static struct { + odp_pool_t pool; + odp_proto_chksums_t all_chksums; + uint32_t offset_zero[PARSE_TEST_NUM_PKT]; +} parse_test; + +static uint32_t parse_test_pkt_len[] = { + sizeof(test_packet_arp), + sizeof(test_packet_ipv4_icmp), + sizeof(test_packet_ipv4_tcp), + sizeof(test_packet_ipv4_udp), + sizeof(test_packet_vlan_ipv4_udp), + sizeof(test_packet_vlan_qinq_ipv4_udp), + sizeof(test_packet_ipv6_icmp), + sizeof(test_packet_ipv6_tcp), + sizeof(test_packet_ipv6_udp), + sizeof(test_packet_vlan_ipv6_udp) +}; + #define packet_compare_offset(pkt1, off1, pkt2, off2, len) \ _packet_compare_offset((pkt1), (off1), (pkt2), (off2), (len), __LINE__) @@ -2459,41 +2481,18 @@ void packet_test_ref(void) odp_packet_free(ref_pkt[1]); } -void packet_test_parse(void) +static int packet_parse_suite_init(void) { - odp_pool_t pool; + int num_test_pkt, i; + uint32_t max_len; odp_pool_param_t param; - odp_packet_parse_param_t parse; - int ret, num_test_pkt, i; - uint32_t len, max_len; - odp_packet_chksum_status_t chksum_status; - odp_proto_chksums_t all_chksums; - int num_pkt = 10; - odp_packet_t pkt[num_pkt]; - uint32_t offset[num_pkt]; - uint32_t test_pkt_len[] = {sizeof(test_packet_arp), - sizeof(test_packet_ipv4_icmp), - sizeof(test_packet_ipv4_tcp), - sizeof(test_packet_ipv4_udp), - sizeof(test_packet_vlan_ipv4_udp), - sizeof(test_packet_vlan_qinq_ipv4_udp), - sizeof(test_packet_ipv6_icmp), - sizeof(test_packet_ipv6_tcp), - sizeof(test_packet_ipv6_udp), - sizeof(test_packet_vlan_ipv6_udp) }; - - all_chksums.all_chksum = 0; - all_chksums.chksum.ipv4 = 1; - all_chksums.chksum.udp = 1; - all_chksums.chksum.tcp = 1; - all_chksums.chksum.sctp = 1; - - num_test_pkt = sizeof(test_pkt_len) / sizeof(uint32_t); + + num_test_pkt = sizeof(parse_test_pkt_len) / sizeof(uint32_t); max_len = 0; for (i = 0; i < num_test_pkt; i++) { - if (max_len < test_pkt_len[i]) - max_len = test_pkt_len[i]; + if (max_len < parse_test_pkt_len[i]) + max_len = parse_test_pkt_len[i]; } odp_pool_param_init(&param); @@ -2503,21 +2502,59 @@ void packet_test_parse(void) param.pkt.len = max_len; param.pkt.num = 100; - pool = odp_pool_create("test_parse_pool", &param); - CU_ASSERT_FATAL(pool != ODP_POOL_INVALID); + parse_test.pool = odp_pool_create("parse_test_pool", &param); + + if (parse_test.pool == ODP_POOL_INVALID) + return -1; + + parse_test.all_chksums.all_chksum = 0; + parse_test.all_chksums.chksum.ipv4 = 1; + parse_test.all_chksums.chksum.udp = 1; + parse_test.all_chksums.chksum.tcp = 1; + parse_test.all_chksums.chksum.sctp = 1; + + for (i = 0; i < PARSE_TEST_NUM_PKT; i++) + parse_test.offset_zero[i] = 0; + + return 0; +} + +static int packet_parse_suite_term(void) +{ + if (odp_pool_destroy(parse_test.pool)) + return -1; - /* Ethernet/IPv4/UDP */ - len = sizeof(test_packet_ipv4_udp); - ret = odp_packet_alloc_multi(pool, len, pkt, num_pkt); + return 0; +} + +static void parse_test_alloc(odp_packet_t pkt[], const uint8_t test_packet[], + uint32_t len) +{ + int ret, i; + int num_pkt = PARSE_TEST_NUM_PKT; + + ret = odp_packet_alloc_multi(parse_test.pool, len, pkt, num_pkt); CU_ASSERT_FATAL(ret == num_pkt); for (i = 0; i < num_pkt; i++) { - ret = odp_packet_copy_from_mem(pkt[i], 0, len, - test_packet_ipv4_udp); - CU_ASSERT(ret == 0); + ret = odp_packet_copy_from_mem(pkt[i], 0, len, test_packet); + CU_ASSERT_FATAL(ret == 0); + } +} - offset[i] = 0; +/* Ethernet/IPv4/UDP */ +static void parse_eth_ipv4_udp(void) +{ + odp_packet_parse_param_t parse; + int i; + odp_packet_chksum_status_t chksum_status; + int num_pkt = PARSE_TEST_NUM_PKT; + odp_packet_t pkt[num_pkt]; + + parse_test_alloc(pkt, test_packet_ipv4_udp, + sizeof(test_packet_ipv4_udp)); + for (i = 0; i < num_pkt; i++) { chksum_status = odp_packet_l3_chksum_status(pkt[i]); CU_ASSERT(chksum_status == ODP_PACKET_CHKSUM_UNKNOWN); chksum_status = odp_packet_l4_chksum_status(pkt[i]); @@ -2526,10 +2563,10 @@ void packet_test_parse(void) parse.proto = ODP_PROTO_ETH; parse.last_layer = ODP_PROTO_LAYER_ALL; - parse.chksums = all_chksums; + parse.chksums = parse_test.all_chksums; - CU_ASSERT(odp_packet_parse(pkt[0], offset[0], &parse) == 0); - CU_ASSERT(odp_packet_parse_multi(&pkt[1], &offset[1], + CU_ASSERT(odp_packet_parse(pkt[0], 0, &parse) == 0); + CU_ASSERT(odp_packet_parse_multi(&pkt[1], parse_test.offset_zero, num_pkt - 1, &parse) == (num_pkt - 1)); for (i = 0; i < num_pkt; i++) { @@ -2541,19 +2578,22 @@ void packet_test_parse(void) } odp_packet_free_multi(pkt, num_pkt); +} - /* IPv4/UDP */ - len = sizeof(test_packet_ipv4_udp); - ret = odp_packet_alloc_multi(pool, len, pkt, num_pkt); - CU_ASSERT_FATAL(ret == num_pkt); +/* IPv4/UDP */ +static void parse_ipv4_udp(void) +{ + odp_packet_parse_param_t parse; + int i; + int num_pkt = PARSE_TEST_NUM_PKT; + odp_packet_t pkt[num_pkt]; + uint32_t offset[num_pkt]; - for (i = 0; i < num_pkt; i++) { - ret = odp_packet_copy_from_mem(pkt[i], 0, len, - test_packet_ipv4_udp); - CU_ASSERT(ret == 0); + parse_test_alloc(pkt, test_packet_ipv4_udp, + sizeof(test_packet_ipv4_udp)); + for (i = 0; i < num_pkt; i++) offset[i] = 14; - } parse.proto = ODP_PROTO_IPV4; parse.last_layer = ODP_PROTO_LAYER_L4; @@ -2571,26 +2611,25 @@ void packet_test_parse(void) } odp_packet_free_multi(pkt, num_pkt); +} - /* Ethernet/IPv4/TCP */ - len = sizeof(test_packet_ipv4_tcp); - ret = odp_packet_alloc_multi(pool, len, pkt, num_pkt); - CU_ASSERT_FATAL(ret == num_pkt); - - for (i = 0; i < num_pkt; i++) { - ret = odp_packet_copy_from_mem(pkt[i], 0, len, - test_packet_ipv4_tcp); - CU_ASSERT(ret == 0); +/* Ethernet/IPv4/TCP */ +static void parse_eth_ipv4_tcp(void) +{ + odp_packet_parse_param_t parse; + int i; + int num_pkt = PARSE_TEST_NUM_PKT; + odp_packet_t pkt[num_pkt]; - offset[i] = 0; - } + parse_test_alloc(pkt, test_packet_ipv4_tcp, + sizeof(test_packet_ipv4_tcp)); parse.proto = ODP_PROTO_ETH; parse.last_layer = ODP_PROTO_LAYER_L4; parse.chksums.all_chksum = 0; - CU_ASSERT(odp_packet_parse(pkt[0], offset[0], &parse) == 0); - CU_ASSERT(odp_packet_parse_multi(&pkt[1], &offset[1], + CU_ASSERT(odp_packet_parse(pkt[0], 0, &parse) == 0); + CU_ASSERT(odp_packet_parse_multi(&pkt[1], parse_test.offset_zero, num_pkt - 1, &parse) == (num_pkt - 1)); for (i = 0; i < num_pkt; i++) { @@ -2601,26 +2640,25 @@ void packet_test_parse(void) } odp_packet_free_multi(pkt, num_pkt); +} - /* Ethernet/IPv6/UDP */ - len = sizeof(test_packet_ipv6_udp); - ret = odp_packet_alloc_multi(pool, len, pkt, num_pkt); - CU_ASSERT_FATAL(ret == num_pkt); - - for (i = 0; i < num_pkt; i++) { - ret = odp_packet_copy_from_mem(pkt[i], 0, len, - test_packet_ipv6_udp); - CU_ASSERT(ret == 0); +/* Ethernet/IPv6/UDP */ +static void parse_eth_ipv6_udp(void) +{ + odp_packet_parse_param_t parse; + int i; + int num_pkt = PARSE_TEST_NUM_PKT; + odp_packet_t pkt[num_pkt]; - offset[i] = 0; - } + parse_test_alloc(pkt, test_packet_ipv6_udp, + sizeof(test_packet_ipv6_udp)); parse.proto = ODP_PROTO_ETH; parse.last_layer = ODP_PROTO_LAYER_L4; parse.chksums.all_chksum = 0; - CU_ASSERT(odp_packet_parse(pkt[0], offset[0], &parse) == 0); - CU_ASSERT(odp_packet_parse_multi(&pkt[1], &offset[1], + CU_ASSERT(odp_packet_parse(pkt[0], 0, &parse) == 0); + CU_ASSERT(odp_packet_parse_multi(&pkt[1], parse_test.offset_zero, num_pkt - 1, &parse) == (num_pkt - 1)); for (i = 0; i < num_pkt; i++) { @@ -2632,26 +2670,25 @@ void packet_test_parse(void) } odp_packet_free_multi(pkt, num_pkt); +} - /* Ethernet/IPv6/TCP */ - len = sizeof(test_packet_ipv6_tcp); - ret = odp_packet_alloc_multi(pool, len, pkt, num_pkt); - CU_ASSERT_FATAL(ret == num_pkt); - - for (i = 0; i < num_pkt; i++) { - ret = odp_packet_copy_from_mem(pkt[i], 0, len, - test_packet_ipv6_tcp); - CU_ASSERT(ret == 0); +/* Ethernet/IPv6/TCP */ +static void parse_eth_ipv6_tcp(void) +{ + odp_packet_parse_param_t parse; + int i; + int num_pkt = PARSE_TEST_NUM_PKT; + odp_packet_t pkt[num_pkt]; - offset[i] = 0; - } + parse_test_alloc(pkt, test_packet_ipv6_tcp, + sizeof(test_packet_ipv6_tcp)); parse.proto = ODP_PROTO_ETH; parse.last_layer = ODP_PROTO_LAYER_ALL; parse.chksums.all_chksum = 0; - CU_ASSERT(odp_packet_parse(pkt[0], offset[0], &parse) == 0); - CU_ASSERT(odp_packet_parse_multi(&pkt[1], &offset[1], + CU_ASSERT(odp_packet_parse(pkt[0], 0, &parse) == 0); + CU_ASSERT(odp_packet_parse_multi(&pkt[1], parse_test.offset_zero, num_pkt - 1, &parse) == (num_pkt - 1)); for (i = 0; i < num_pkt; i++) { @@ -2663,8 +2700,6 @@ void packet_test_parse(void) } odp_packet_free_multi(pkt, num_pkt); - - odp_pool_destroy(pool); } odp_testinfo_t packet_suite[] = { @@ -2698,7 +2733,15 @@ odp_testinfo_t packet_suite[] = { ODP_TEST_INFO(packet_test_align), ODP_TEST_INFO(packet_test_offset), ODP_TEST_INFO(packet_test_ref), - ODP_TEST_INFO(packet_test_parse), + ODP_TEST_INFO_NULL, +}; + +odp_testinfo_t packet_parse_suite[] = { + ODP_TEST_INFO(parse_eth_ipv4_udp), + ODP_TEST_INFO(parse_ipv4_udp), + ODP_TEST_INFO(parse_eth_ipv4_tcp), + ODP_TEST_INFO(parse_eth_ipv6_udp), + ODP_TEST_INFO(parse_eth_ipv6_tcp), ODP_TEST_INFO_NULL, }; @@ -2708,6 +2751,11 @@ odp_suiteinfo_t packet_suites[] = { .init_func = packet_suite_init, .term_func = packet_suite_term, }, + { .name = "packet parse tests", + .testinfo_tbl = packet_parse_suite, + .init_func = packet_parse_suite_init, + .term_func = packet_parse_suite_term, + }, ODP_SUITE_INFO_NULL, }; diff --git a/test/validation/api/packet/packet.h b/test/validation/api/packet/packet.h index 1d9947af..798b272b 100644 --- a/test/validation/api/packet/packet.h +++ b/test/validation/api/packet/packet.h @@ -40,7 +40,6 @@ void packet_test_extend_ref(void); void packet_test_align(void); void packet_test_offset(void); void packet_test_ref(void); -void packet_test_parse(void); /* test arrays: */ extern odp_testinfo_t packet_suite[]; commit ab78f2924a353d4e0e45deea73201e6da10a7664 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Mon Feb 12 13:12:31 2018 +0200 validation: common: remove camel case names Rename struct fields to not use camel case names. Signed-off-by: Petri Savolainen <petri.savolainen(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/test/common/odp_cunit_common.c b/test/common/odp_cunit_common.c index 6e51388f..d8a17a75 100644 --- a/test/common/odp_cunit_common.c +++ b/test/common/odp_cunit_common.c @@ -126,8 +126,8 @@ static odp_suiteinfo_t *cunit_get_suite_info(const char *suite_name) { odp_suiteinfo_t *sinfo; - for (sinfo = global_testsuites; sinfo->pName; sinfo++) - if (strcmp(sinfo->pName, suite_name) == 0) + for (sinfo = global_testsuites; sinfo->name; sinfo++) + if (strcmp(sinfo->name, suite_name) == 0) return sinfo; return NULL; @@ -138,8 +138,8 @@ static odp_testinfo_t *cunit_get_test_info(odp_suiteinfo_t *sinfo, { odp_testinfo_t *tinfo; - for (tinfo = sinfo->pTests; tinfo->pName; tinfo++) - if (strcmp(tinfo->pName, test_name) == 0) + for (tinfo = sinfo->testinfo_tbl; tinfo->name; tinfo++) + if (strcmp(tinfo->name, test_name) == 0) return tinfo; return NULL; @@ -167,14 +167,14 @@ static int _cunit_suite_init(void) return -1; /* execute its init function */ - if (sinfo->pInitFunc) { - ret = sinfo->pInitFunc(); + if (sinfo->init_func) { + ret = sinfo->init_func(); if (ret) return ret; } /* run any configured conditional checks and mark inactive tests */ - for (tinfo = sinfo->pTests; tinfo->pName; tinfo++) { + for (tinfo = sinfo->testinfo_tbl; tinfo->name; tinfo++) { CU_pTest ptest; CU_ErrorCode err; @@ -182,7 +182,7 @@ static int _cunit_suite_init(void) continue; /* test is inactive, mark it as such */ - ptest = CU_get_test_by_name(tinfo->pName, cur_suite); + ptest = CU_get_test_by_name(tinfo->name, cur_suite); if (ptest) err = CU_set_test_active(ptest, CU_FALSE); else @@ -190,7 +190,7 @@ static int _cunit_suite_init(void) if (err != CUE_SUCCESS) { fprintf(stderr, "%s: failed to set test %s inactive\n", - __func__, tinfo->pName); + __func__, tinfo->name); return -1; } } @@ -211,15 +211,15 @@ static int cunit_register_suites(odp_suiteinfo_t testsuites[]) CU_pSuite suite; CU_pTest test; - for (sinfo = testsuites; sinfo->pName; sinfo++) { - suite = CU_add_suite(sinfo->pName, - _cunit_suite_init, sinfo->pCleanupFunc); + for (sinfo = testsuites; sinfo->name; sinfo++) { + suite = CU_add_suite(sinfo->name, + _cunit_suite_init, sinfo->term_func); if (!suite) return CU_get_error(); - for (tinfo = sinfo->pTests; tinfo->pName; tinfo++) { - test = CU_add_test(suite, tinfo->pName, - tinfo->pTestFunc); + for (tinfo = sinfo->testinfo_tbl; tinfo->name; tinfo++) { + test = CU_add_test(suite, tinfo->name, + tinfo->test_func); if (!test) return CU_get_error(); } @@ -235,7 +235,7 @@ static int cunit_update_test(CU_pSuite suite, CU_pTest test = NULL; CU_ErrorCode err; odp_testinfo_t *tinfo; - const char *test_name = updated_tinfo->pName; + const char *test_name = updated_tinfo->name; tinfo = cunit_get_test_info(sinfo, test_name); if (tinfo) @@ -247,7 +247,7 @@ static int cunit_update_test(CU_pSuite suite, return -1; } - err = CU_set_test_func(test, updated_tinfo->pTestFunc); + err = CU_set_test_func(test, updated_tinfo->test_func); if (err != CUE_SUCCESS) { fprintf(stderr, "%s: failed to update test func for %s\n", __func__, test_name); @@ -267,31 +267,31 @@ static int cunit_update_suite(odp_suiteinfo_t *updated_sinfo) odp_testinfo_t *tinfo; /* find previously registered suite with matching name */ - sinfo = cunit_get_suite_info(updated_sinfo->pName); + sinfo = cunit_get_suite_info(updated_sinfo->name); if (sinfo) { /* lookup the associated CUnit suite */ - suite = CU_get_suite_by_name(updated_sinfo->pName, + suite = CU_get_suite_by_name(updated_sinfo->name, CU_get_registry()); } if (!sinfo || !suite) { fprintf(stderr, "%s: unable to find existing suite named %s\n", - __func__, updated_sinfo->pName); + __func__, updated_sinfo->name); return -1; } - sinfo->pInitFunc = updated_sinfo->pInitFunc; - sinfo->pCleanupFunc = updated_sinfo->pCleanupFunc; + sinfo->init_func = updated_sinfo->init_func; + sinfo->term_func = updated_sinfo->term_func; - err = CU_set_suite_cleanupfunc(suite, updated_sinfo->pCleanupFunc); + err = CU_set_suite_cleanupfunc(suite, updated_sinfo->term_func); if (err != CUE_SUCCESS) { fprintf(stderr, "%s: failed to update cleanup func for %s\n", - __func__, updated_sinfo->pName); + __func__, updated_sinfo->name); return -1; } - for (tinfo = updated_sinfo->pTests; tinfo->pName; tinfo++) { + for (tinfo = updated_sinfo->testinfo_tbl; tinfo->name; tinfo++) { int ret; ret = cunit_update_test(suite, sinfo, tinfo); @@ -345,7 +345,7 @@ int odp_cunit_update(odp_suiteinfo_t testsuites[]) int ret = 0; odp_suiteinfo_t *sinfo; - for (sinfo = testsuites; sinfo->pName && ret == 0; sinfo++) + for (sinfo = testsuites; sinfo->name && ret == 0; sinfo++) ret = cunit_update_suite(sinfo); return ret; diff --git a/test/common/odp_cunit_common.h b/test/common/odp_cunit_common.h index 390e8f57..f6d38432 100644 --- a/test/common/odp_cunit_common.h +++ b/test/common/odp_cunit_common.h @@ -23,16 +23,16 @@ typedef int (*cunit_test_check_active)(void); typedef struct { - const char *pName; - CU_TestFunc pTestFunc; + const char *name; + CU_TestFunc test_func; cunit_test_check_active check_active; } odp_testinfo_t; typedef struct { - const char *pName; - CU_InitializeFunc pInitFunc; - CU_CleanupFunc pCleanupFunc; - odp_testinfo_t *pTests; + const char *name; + CU_InitializeFunc init_func; + CU_CleanupFunc term_func; + odp_testinfo_t *testinfo_tbl; } odp_suiteinfo_t; static inline int odp_cunit_test_inactive(void) { return 0; } diff --git a/test/validation/api/classification/classification.c b/test/validation/api/classification/classification.c index a0d290ec..ef621f72 100644 --- a/test/validation/api/classification/classification.c +++ b/test/validation/api/classification/classification.c @@ -12,18 +12,18 @@ #include "classification.h" odp_suiteinfo_t classification_suites[] = { - { .pName = "classification basic", - .pTests = classification_suite_basic, + { .name = "classification basic", + .testinfo_tbl = classification_suite_basic, }, - { .pName = "classification pmr tests", - .pTests = classification_suite_pmr, - .pInitFunc = classification_suite_pmr_init, - .pCleanupFunc = classification_suite_pmr_term, + { .name = "classification pmr tests", + .testinfo_tbl = classification_suite_pmr, + .init_func = classification_suite_pmr_init, + .term_func = classification_suite_pmr_term, }, - { .pName = "classification tests", - .pTests = classification_suite, - .pInitFunc = classification_suite_init, - .pCleanupFunc = classification_suite_term, + { .name = "classification tests", + .testinfo_tbl = classification_suite, + .init_func = classification_suite_init, + .term_func = classification_suite_term, }, ODP_SUITE_INFO_NULL, }; diff --git a/test/validation/api/crypto/odp_crypto_test_inp.c b/test/validation/api/crypto/odp_crypto_test_inp.c index ad9784a6..df1c7b6f 100644 --- a/test/validation/api/crypto/odp_crypto_test_inp.c +++ b/test/validation/api/crypto/odp_crypto_test_inp.c @@ -1230,14 +1230,14 @@ int crypto_suite_term(void) int i; int first = 1; - for (i = 0; crypto_suite[i].pName; i++) { + for (i = 0; crypto_suite[i].name; i++) { if (crypto_suite[i].check_active && crypto_suite[i].check_active() == ODP_TEST_INACTIVE) { if (first) { first = 0; printf("\n\n Inactive tests:\n"); } - printf(" %s\n", crypto_suite[i].pName); + printf(" %s\n", crypto_suite[i].name); } } return 0; diff --git a/test/validation/api/ipsec/ipsec.c b/test/validation/api/ipsec/ipsec.c index ea3cff05..b16f84ac 100644 --- a/test/validation/api/ipsec/ipsec.c +++ b/test/validation/api/ipsec/ipsec.c @@ -789,14 +789,14 @@ static int ipsec_suite_term(odp_testinfo_t *suite) if (suite_context.pktio != ODP_PKTIO_INVALID) pktio_stop(suite_context.pktio); - for (i = 0; suite[i].pName; i++) { + for (i = 0; suite[i].name; i++) { if (suite[i].check_active && suite[i].check_active() == ODP_TEST_INACTIVE) { if (first) { first = 0; printf("\n\n Inactive tests:\n"); } - printf(" %s\n", suite[i].pName); + printf(" %s\n", suite[i].name); } } diff --git a/test/validation/api/packet/packet.c b/test/validation/api/packet/packet.c index 78ccbeae..1188c683 100644 --- a/test/validation/api/packet/packet.c +++ b/test/validation/api/packet/packet.c @@ -2703,10 +2703,10 @@ odp_testinfo_t packet_suite[] = { }; odp_suiteinfo_t packet_suites[] = { - { .pName = "packet tests", - .pTests = packet_suite, - .pInitFunc = packet_suite_init, - .pCleanupFunc = packet_suite_term, + { .name = "packet tests", + .testinfo_tbl = packet_suite, + .init_func = packet_suite_init, + .term_func = packet_suite_term, }, ODP_SUITE_INFO_NULL, }; diff --git a/test/validation/api/pool/pool.c b/test/validation/api/pool/pool.c index 84c17720..3a2c7412 100644 --- a/test/validation/api/pool/pool.c +++ b/test/validation/api/pool/pool.c @@ -230,8 +230,8 @@ odp_testinfo_t pool_suite[] = { }; odp_suiteinfo_t pool_suites[] = { - { .pName = "Pool tests", - .pTests = pool_suite, + { .name = "Pool tests", + .testinfo_tbl = pool_suite, }, ODP_SUITE_INFO_NULL, }; ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/odp_packet.c | 2 +- test/common/odp_cunit_common.c | 52 +- test/common/odp_cunit_common.h | 12 +- test/common/test_packet_parser.h | 295 +++++++-- .../validation/api/classification/classification.c | 20 +- test/validation/api/crypto/odp_crypto_test_inp.c | 4 +- test/validation/api/ipsec/ipsec.c | 4 +- test/validation/api/packet/packet.c | 701 ++++++++++++++++++--- test/validation/api/packet/packet.h | 1 - test/validation/api/pool/pool.c | 4 +- 10 files changed, 916 insertions(+), 179 deletions(-) hooks/post-receive --

7 years, 11 months

[COMMIT] branch api-next updated. v1.17.0.0_tigermoth_rc1-250-g27328232

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 27328232ed2f01dd70aa431f5fa19bd058014305 (commit) via 50189d89de86f4989b2688dbeea8774d39b2cbf0 (commit) from 4b1101adedf0941f6db34047cc06fde11fb06a34 (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 27328232ed2f01dd70aa431f5fa19bd058014305 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Wed Feb 14 10:20:10 2018 +0300 linux-gen: add L2 type support for non-ABI-compat mode Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/include-abi/odp/api/abi/packet.h b/platform/linux-generic/include-abi/odp/api/abi/packet.h index 137cd3ec..92fe21a8 100644 --- a/platform/linux-generic/include-abi/odp/api/abi/packet.h +++ b/platform/linux-generic/include-abi/odp/api/abi/packet.h @@ -47,6 +47,11 @@ static inline odp_packet_seg_t _odp_packet_seg_from_ndx(uint8_t ndx) #define ODP_PACKET_SEG_INVALID ((odp_packet_seg_t)-1) +typedef uint8_t odp_proto_l2_type_t; + +#define ODP_PROTO_L2_TYPE_NONE 0 +#define ODP_PROTO_L2_TYPE_ETH 1 + typedef uint8_t odp_proto_l3_type_t; #define ODP_PROTO_L3_TYPE_NONE 0 commit 50189d89de86f4989b2688dbeea8774d39b2cbf0 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Wed Feb 14 10:06:58 2018 +0300 api: packet add L2 packet type to complement L3 and L4 types Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/include/odp/api/abi-default/packet.h b/include/odp/api/abi-default/packet.h index d3a1753f..97c0d088 100644 --- a/include/odp/api/abi-default/packet.h +++ b/include/odp/api/abi-default/packet.h @@ -30,6 +30,11 @@ typedef _odp_abi_packet_seg_t *odp_packet_seg_t; #define ODP_PACKET_SEG_INVALID ((odp_packet_seg_t)0xffffffff) #define ODP_PACKET_OFFSET_INVALID 0xffff +typedef uint8_t odp_proto_l2_type_t; + +#define ODP_PROTO_L2_TYPE_NONE 0 +#define ODP_PROTO_L2_TYPE_ETH 1 + typedef uint8_t odp_proto_l3_type_t; #define ODP_PROTO_L3_TYPE_NONE 0 diff --git a/include/odp/api/spec/packet.h b/include/odp/api/spec/packet.h index 4be515c7..079a1ae1 100644 --- a/include/odp/api/spec/packet.h +++ b/include/odp/api/spec/packet.h @@ -71,6 +71,19 @@ extern "C" { * Packet is red */ +/** + * @typedef odp_proto_l2_type_t + * Layer 2 protocol type + */ + +/** + * @def ODP_PROTO_L2_TYPE_NONE + * Layer 2 protocol type not defined + * + * @def ODP_PROTO_L2_TYPE_ETH + * Layer 2 protocol is Ethernet + */ + /** * @typedef odp_proto_l3_type_t * Layer 3 protocol type @@ -1615,6 +1628,17 @@ uint32_t odp_packet_l4_offset(odp_packet_t pkt); */ int odp_packet_l4_offset_set(odp_packet_t pkt, uint32_t offset); +/** + * Layer 2 protocol type + * + * Returns layer 2 protocol type. Initial type value is ODP_PROTO_L2_TYPE_NONE. + * + * @param pkt Packet handle + * + * @return Layer 2 protocol type + */ +odp_proto_l2_type_t odp_packet_l2_type(odp_packet_t pkt); + /** * Layer 3 protocol type * ----------------------------------------------------------------------- Summary of changes: include/odp/api/abi-default/packet.h | 5 +++++ include/odp/api/spec/packet.h | 24 ++++++++++++++++++++++ .../linux-generic/include-abi/odp/api/abi/packet.h | 5 +++++ 3 files changed, 34 insertions(+) hooks/post-receive --

7 years, 11 months

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

git-lng-odp