git-lng-odp

git-lng-odp@lists.linaro.org

1 participants
1207 discussions

[COMMIT] branch master updated. v1.15.0.0-287-gf5120355

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 f5120355753ae3d69f81010cb9131abffdfb03fc (commit) from 54228421977f94d9da752290540c6ec4dc5306a0 (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 f5120355753ae3d69f81010cb9131abffdfb03fc Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Sat Oct 21 12:16:23 2017 +0300 .gitinore: ignore moved .pc files pkg-config files were moved, but I forgot to update .gitignore files. Update them now. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/.gitignore b/.gitignore index 3d4c58d6..b9c61424 100644 --- a/.gitignore +++ b/.gitignore @@ -44,6 +44,5 @@ m4/libtool.m4 m4/lt*.m4 missing perf.data* -pkgconfig/libodp*.pc tags test-driver diff --git a/helper/.gitignore b/helper/.gitignore new file mode 100644 index 00000000..edf7a0ba --- /dev/null +++ b/helper/.gitignore @@ -0,0 +1 @@ +libodphelper.pc diff --git a/platform/linux-generic/.gitignore b/platform/linux-generic/.gitignore index 909756a1..442e82a9 100644 --- a/platform/linux-generic/.gitignore +++ b/platform/linux-generic/.gitignore @@ -1 +1,2 @@ include/odp/api/plat/static_inline.h +libodp-linux.pc ----------------------------------------------------------------------- Summary of changes: .gitignore | 1 - helper/.gitignore | 1 + platform/linux-generic/.gitignore | 1 + 3 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 helper/.gitignore hooks/post-receive --

8 years, 4 months

[COMMIT] branch api-next updated. v1.15.0.0-816-gafa7e20a

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 afa7e20ab3b7a6e68a556f00b49aa19ea4a29be6 (commit) via 54228421977f94d9da752290540c6ec4dc5306a0 (commit) via 605e77187211dbb0716e4124f249c7f0f88567f7 (commit) via 940c54bbd1c0c16ea2b6a6f6737d151deeba1e43 (commit) via 91ceea49a975c6fcd61ab1c992a502350d673eeb (commit) via b46702e5ef368c9aaf9d6cea7d32b07adb881ce3 (commit) via 48dfcade1602e9cc9bb8cd3251037508aef146cd (commit) via 2aa9a05b11bdfac0c0126384d4677b3f9c561a78 (commit) via df978d9b4e766c8e1cb1a88a28d98318840fee22 (commit) via 482eeee380d40596131826c1103ed89247bd17e5 (commit) via 254190ffcdb51549ee23846f33fd45513656b78c (commit) via 52877c96e12bf62614df0482175384565a851083 (commit) via 133e7fc06147486fff5ab3393b1a791ab97d19d3 (commit) via 8c9ce8c63eed9d01fec54c09bd17040914abd623 (commit) via 2b57c7d7b96eef16c36b8b0020b3dd78acc82660 (commit) via cbced85824c4c03c0b35396d559ebfb187237569 (commit) via 1217fbaed0aee2ee395c131bb7fd2e201214ed31 (commit) via 927b57f21124f31e23fd7f72dddcc93a5248ed53 (commit) via 1bcf171f00973bcc21baadf9919a61cd6abdf713 (commit) via ec0c3145fcafa09ae3a79875e7e07dd4794583cc (commit) via aa64630294bed950641e99fa1c87725f521a0002 (commit) via 53b4c4aed8cc6e9caf379725e9ed1d2d36f04f10 (commit) via 77f9451a2acf4465e6a64f24b1dfdca56787f0ce (commit) via fce14d1496e7da19e2f0eb53339eea5a4204c03d (commit) via cc33578e327d5f6787711a71a60500c4be98bf63 (commit) via 4ab7a7b22b15011eb69c3e473278db13319aba52 (commit) via 53b735f14a9a1df23b054f15ce148e2fa36abe0f (commit) via 4df71d3f5450452a654bb7e94f8b3fed948ed31e (commit) via 326192cd87888abbea6c0dbdd3dc972db41f3325 (commit) via 55e6afa29bdc2ae314bada7ac5648049909e1775 (commit) via ff51f6363c9fad843f7872ad8048740d10368dd1 (commit) via 6a119c79b59de3c8ee9e51f3ceba9d26f24c3ce4 (commit) via 7d162deafa22535f8fab9ea39dcb4e3e0e7850b0 (commit) via adaa3b434086346402999d09c2223681aba4b1a4 (commit) via c657f3f3d9b2c5832b42a4344a526bf7d0c76a5d (commit) via e02f5545f97f90a75f2595bb1e9068f64bff133e (commit) via d0d0bd9787ee43db39ad4e7e9b224e70664d5663 (commit) via 7dc5f21c7ca88e6c19d34dc1933eddef190add7a (commit) via 209c3a2e255de7aa82c4f08f8abb41c04bb3d86d (commit) via ae4f1d82ed704992c1d8284c23795b9e076b33b9 (commit) via d2b3aa9a7ffc3028eedc7dbeb6257d7efd91bc05 (commit) via 66305f01a57741dc5eca061364e65a5f4da8584f (commit) from e3108af2f0b58c2ceca422b418439bba5de04b11 (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 afa7e20ab3b7a6e68a556f00b49aa19ea4a29be6 Merge: e3108af2 54228421 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Sat Oct 21 12:13:36 2017 +0300 Merge remote-tracking branch 'origin/master' into merge-master Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> diff --cc include/Makefile.am index 00000000,a3a7e165..d53181ce mode 000000,100644..100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@@ -1,0 -1,144 +1,162 @@@ + include_HEADERS = \ + odp.h \ - odp_api.h ++ odp_api.h \ ++ odp_drv.h + + odpapispecincludedir= $(includedir)/odp/api/spec + odpapispecinclude_HEADERS = \ + odp/api/spec/align.h \ + odp/api/spec/atomic.h \ + odp/api/spec/barrier.h \ + odp/api/spec/buffer.h \ + odp/api/spec/byteorder.h \ ++ odp/api/spec/chksum.h \ + odp/api/spec/classification.h \ + odp/api/spec/compiler.h \ + odp/api/spec/cpu.h \ + odp/api/spec/cpumask.h \ + odp/api/spec/crypto.h \ + odp/api/spec/debug.h \ + odp/api/spec/errno.h \ + odp/api/spec/event.h \ ++ odp/api/spec/feature.h \ + odp/api/spec/hash.h \ + odp/api/spec/hints.h \ + odp/api/spec/init.h \ ++ odp/api/spec/ipsec.h \ + odp/api/spec/packet.h \ + odp/api/spec/packet_flags.h \ + odp/api/spec/packet_io.h \ + odp/api/spec/packet_io_stats.h \ + odp/api/spec/pool.h \ + odp/api/spec/queue.h \ + odp/api/spec/random.h \ + odp/api/spec/rwlock.h \ + odp/api/spec/rwlock_recursive.h \ + odp/api/spec/schedule.h \ + odp/api/spec/schedule_types.h \ + odp/api/spec/shared_memory.h \ + odp/api/spec/spinlock.h \ + odp/api/spec/spinlock_recursive.h \ + odp/api/spec/std_clib.h \ + odp/api/spec/std_types.h \ ++ odp/api/spec/support.h \ + odp/api/spec/sync.h \ + odp/api/spec/system_info.h \ + odp/api/spec/thread.h \ + odp/api/spec/thrmask.h \ + odp/api/spec/ticketlock.h \ + odp/api/spec/time.h \ + odp/api/spec/timer.h \ + odp/api/spec/traffic_mngr.h + + nodist_odpapispecinclude_HEADERS = \ + odp/api/spec/deprecated.h \ + odp/api/spec/version.h + ++odpdrvspecincludedir= $(includedir)/odp/drv/spec ++odpdrvspecinclude_HEADERS = \ ++ odp/drv/spec/align.h \ ++ odp/drv/spec/atomic.h \ ++ odp/drv/spec/barrier.h \ ++ odp/drv/spec/byteorder.h \ ++ odp/drv/spec/compiler.h \ ++ odp/drv/spec/driver.h \ ++ odp/drv/spec/shm.h \ ++ odp/drv/spec/spinlock.h \ ++ odp/drv/spec/std_types.h \ ++ odp/drv/spec/sync.h ++ + odpapiabidefaultincludedir= $(includedir)/odp/arch/default/api/abi + odpapiabidefaultinclude_HEADERS = \ + odp/arch/default/api/abi/buffer.h \ + odp/arch/default/api/abi/classification.h \ + odp/arch/default/api/abi/crypto.h \ + odp/arch/default/api/abi/event.h \ + odp/arch/default/api/abi/packet.h \ + odp/arch/default/api/abi/pool.h \ + odp/arch/default/api/abi/queue.h \ + odp/arch/default/api/abi/shared_memory.h + + odpapiabiarchincludedir= $(includedir)/odp/arch/@ARCH_ABI@/odp/api/abi + if ARCH_IS_ARM + odpapiabiarchinclude_HEADERS = \ + odp/arch/arm32-linux/odp/api/abi/buffer.h \ + odp/arch/arm32-linux/odp/api/abi/classification.h \ + odp/arch/arm32-linux/odp/api/abi/crypto.h \ + odp/arch/arm32-linux/odp/api/abi/event.h \ + odp/arch/arm32-linux/odp/api/abi/packet.h \ + odp/arch/arm32-linux/odp/api/abi/pool.h \ + odp/arch/arm32-linux/odp/api/abi/queue.h \ + odp/arch/arm32-linux/odp/api/abi/shared_memory.h + endif + if ARCH_IS_AARCH64 + odpapiabiarchinclude_HEADERS = \ + odp/arch/arm64-linux/odp/api/abi/buffer.h \ + odp/arch/arm64-linux/odp/api/abi/classification.h \ + odp/arch/arm64-linux/odp/api/abi/crypto.h \ + odp/arch/arm64-linux/odp/api/abi/event.h \ + odp/arch/arm64-linux/odp/api/abi/packet.h \ + odp/arch/arm64-linux/odp/api/abi/pool.h \ + odp/arch/arm64-linux/odp/api/abi/queue.h \ + odp/arch/arm64-linux/odp/api/abi/shared_memory.h + endif + if ARCH_IS_MIPS64 + odpapiabiarchinclude_HEADERS = \ + odp/arch/mips64-linux/odp/api/abi/buffer.h \ + odp/arch/mips64-linux/odp/api/abi/classification.h \ + odp/arch/mips64-linux/odp/api/abi/crypto.h \ + odp/arch/mips64-linux/odp/api/abi/event.h \ + odp/arch/mips64-linux/odp/api/abi/packet.h \ + odp/arch/mips64-linux/odp/api/abi/pool.h \ + odp/arch/mips64-linux/odp/api/abi/queue.h \ + odp/arch/mips64-linux/odp/api/abi/shared_memory.h + endif + if ARCH_IS_POWERPC + odpapiabiarchinclude_HEADERS = \ + odp/arch/power64-linux/odp/api/abi/buffer.h \ + odp/arch/power64-linux/odp/api/abi/classification.h \ + odp/arch/power64-linux/odp/api/abi/crypto.h \ + odp/arch/power64-linux/odp/api/abi/event.h \ + odp/arch/power64-linux/odp/api/abi/packet.h \ + odp/arch/power64-linux/odp/api/abi/pool.h \ + odp/arch/power64-linux/odp/api/abi/queue.h \ + odp/arch/power64-linux/odp/api/abi/shared_memory.h + endif + if ARCH_IS_X86_32 + odpapiabiarchinclude_HEADERS = \ + odp/arch/x86_32-linux/odp/api/abi/buffer.h \ + odp/arch/x86_32-linux/odp/api/abi/classification.h \ + odp/arch/x86_32-linux/odp/api/abi/crypto.h \ + odp/arch/x86_32-linux/odp/api/abi/event.h \ + odp/arch/x86_32-linux/odp/api/abi/packet.h \ + odp/arch/x86_32-linux/odp/api/abi/pool.h \ + odp/arch/x86_32-linux/odp/api/abi/queue.h \ + odp/arch/x86_32-linux/odp/api/abi/shared_memory.h + endif + if ARCH_IS_X86_64 + odpapiabiarchinclude_HEADERS = \ + odp/arch/x86_64-linux/odp/api/abi/buffer.h \ + odp/arch/x86_64-linux/odp/api/abi/classification.h \ + odp/arch/x86_64-linux/odp/api/abi/crypto.h \ + odp/arch/x86_64-linux/odp/api/abi/event.h \ + odp/arch/x86_64-linux/odp/api/abi/packet.h \ + odp/arch/x86_64-linux/odp/api/abi/pool.h \ + odp/arch/x86_64-linux/odp/api/abi/queue.h \ + odp/arch/x86_64-linux/odp/api/abi/shared_memory.h + endif + + # Create symlink for ABI header files. Application does not need to use the arch + # specific include path for installed files. + install-data-hook: + if [ -h $(DESTDIR)$(prefix)/include/odp/api/abi ]; then \ + : ; \ + else \ + $(LN_S) -rf $(DESTDIR)$(prefix)/include/odp/arch/@ARCH_ABI@/odp/api/abi \ + $(DESTDIR)$(prefix)/include/odp/api/abi; \ + fi + + # Rerefence all nodist_*_HEADERS here + .PHONY: $(nodist_odpapispecinclude_HEADERS) + $(nodist_odpapispecinclude_HEADERS): + $(MAKE) -C $(top_builddir) $(subdir)/$@ diff --cc platform/linux-generic/Makefile.am index 1ac69753,0b29e613..c5406760 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@@ -16,187 -13,149 +16,184 @@@ AM_CPPFLAGS += -DSYSCONFDIR=\"@sysconf AM_CPPFLAGS += $(OPENSSL_CPPFLAGS) AM_CPPFLAGS += $(DPDK_CPPFLAGS) AM_CPPFLAGS += $(NETMAP_CPPFLAGS) +AM_CPPFLAGS += $(LIBCONFIG_CFLAGS) - include_HEADERS = \ - $(top_srcdir)/include/odp.h \ - $(top_srcdir)/include/odp_api.h \ - $(top_srcdir)/include/odp_drv.h - odpincludedir= $(includedir)/odp odpinclude_HEADERS = \ - $(srcdir)/include/odp/visibility_begin.h \ - $(srcdir)/include/odp/visibility_end.h + include/odp/visibility_begin.h \ + include/odp/visibility_end.h odpapiincludedir= $(includedir)/odp/api odpapiinclude_HEADERS = \ - $(srcdir)/include/odp/api/align.h \ - $(srcdir)/include/odp/api/atomic.h \ - $(srcdir)/include/odp/api/barrier.h \ - $(srcdir)/include/odp/api/buffer.h \ - $(srcdir)/include/odp/api/byteorder.h \ - $(srcdir)/include/odp/api/classification.h \ - $(srcdir)/include/odp/api/compiler.h \ - $(srcdir)/include/odp/api/chksum.h \ - $(srcdir)/include/odp/api/cpu.h \ - $(srcdir)/include/odp/api/cpumask.h \ - $(srcdir)/include/odp/api/crypto.h \ - $(srcdir)/include/odp/api/debug.h \ - $(srcdir)/include/odp/api/deprecated.h \ - $(srcdir)/include/odp/api/errno.h \ - $(srcdir)/include/odp/api/event.h \ - $(srcdir)/include/odp/api/feature.h \ - $(srcdir)/include/odp/api/hash.h \ - $(srcdir)/include/odp/api/hints.h \ - $(srcdir)/include/odp/api/init.h \ - $(srcdir)/include/odp/api/ipsec.h \ - $(srcdir)/include/odp/api/packet_flags.h \ - $(srcdir)/include/odp/api/packet.h \ - $(srcdir)/include/odp/api/packet_io.h \ - $(srcdir)/include/odp/api/packet_io_stats.h \ - $(srcdir)/include/odp/api/pool.h \ - $(srcdir)/include/odp/api/queue.h \ - $(srcdir)/include/odp/api/random.h \ - $(srcdir)/include/odp/api/rwlock.h \ - $(srcdir)/include/odp/api/rwlock_recursive.h \ - $(srcdir)/include/odp/api/schedule.h \ - $(srcdir)/include/odp/api/schedule_types.h \ - $(srcdir)/include/odp/api/shared_memory.h \ - $(srcdir)/include/odp/api/spinlock.h \ - $(srcdir)/include/odp/api/spinlock_recursive.h \ - $(srcdir)/include/odp/api/std_clib.h \ - $(srcdir)/include/odp/api/std_types.h \ - $(srcdir)/include/odp/api/support.h \ - $(srcdir)/include/odp/api/sync.h \ - $(srcdir)/include/odp/api/system_info.h \ - $(srcdir)/include/odp/api/thread.h \ - $(srcdir)/include/odp/api/thrmask.h \ - $(srcdir)/include/odp/api/ticketlock.h \ - $(srcdir)/include/odp/api/time.h \ - $(srcdir)/include/odp/api/timer.h \ - $(srcdir)/include/odp/api/traffic_mngr.h \ - $(srcdir)/include/odp/api/version.h + include/odp/api/align.h \ + include/odp/api/atomic.h \ + include/odp/api/barrier.h \ + include/odp/api/buffer.h \ + include/odp/api/byteorder.h \ + include/odp/api/classification.h \ + include/odp/api/compiler.h \ ++ include/odp/api/chksum.h \ + include/odp/api/cpu.h \ + include/odp/api/cpumask.h \ + include/odp/api/crypto.h \ + include/odp/api/debug.h \ + include/odp/api/deprecated.h \ + include/odp/api/errno.h \ + include/odp/api/event.h \ ++ include/odp/api/feature.h \ + include/odp/api/hash.h \ + include/odp/api/hints.h \ + include/odp/api/init.h \ ++ include/odp/api/ipsec.h \ + include/odp/api/packet_flags.h \ + include/odp/api/packet.h \ + include/odp/api/packet_io.h \ + include/odp/api/packet_io_stats.h \ + include/odp/api/pool.h \ + include/odp/api/queue.h \ + include/odp/api/random.h \ + include/odp/api/rwlock.h \ + include/odp/api/rwlock_recursive.h \ + include/odp/api/schedule.h \ + include/odp/api/schedule_types.h \ + include/odp/api/shared_memory.h \ + include/odp/api/spinlock.h \ + include/odp/api/spinlock_recursive.h \ + include/odp/api/std_clib.h \ + include/odp/api/std_types.h \ ++ include/odp/api/support.h \ + include/odp/api/sync.h \ + include/odp/api/system_info.h \ + include/odp/api/thread.h \ + include/odp/api/thrmask.h \ + include/odp/api/ticketlock.h \ + include/odp/api/time.h \ + include/odp/api/timer.h \ + include/odp/api/traffic_mngr.h \ + include/odp/api/version.h odpapiplatincludedir= $(includedir)/odp/api/plat odpapiplatinclude_HEADERS = \ - $(builddir)/include/odp/api/plat/static_inline.h \ - $(srcdir)/include/odp/api/plat/atomic_inlines.h \ - $(srcdir)/include/odp/api/plat/atomic_types.h \ - $(srcdir)/include/odp/api/plat/barrier_types.h \ - $(srcdir)/include/odp/api/plat/buffer_types.h \ - $(srcdir)/include/odp/api/plat/byteorder_inlines.h \ - $(srcdir)/include/odp/api/plat/byteorder_types.h \ - $(srcdir)/include/odp/api/plat/classification_types.h \ - $(srcdir)/include/odp/api/plat/cpumask_types.h \ - $(srcdir)/include/odp/api/plat/crypto_types.h \ - $(srcdir)/include/odp/api/plat/event_types.h \ - $(srcdir)/include/odp/api/plat/init_types.h \ - $(srcdir)/include/odp/api/plat/ipsec_types.h \ - $(srcdir)/include/odp/api/plat/packet_flag_inlines.h \ - $(srcdir)/include/odp/api/plat/packet_flag_inlines_api.h \ - $(srcdir)/include/odp/api/plat/packet_inlines.h \ - $(srcdir)/include/odp/api/plat/packet_inlines_api.h \ - $(srcdir)/include/odp/api/plat/packet_types.h \ - $(srcdir)/include/odp/api/plat/packet_io_types.h \ - $(srcdir)/include/odp/api/plat/pool_types.h \ - $(srcdir)/include/odp/api/plat/queue_types.h \ - $(srcdir)/include/odp/api/plat/rwlock_types.h \ - $(srcdir)/include/odp/api/plat/rwlock_recursive_types.h \ - $(srcdir)/include/odp/api/plat/schedule_types.h \ - $(srcdir)/include/odp/api/plat/shared_memory_types.h \ - $(srcdir)/include/odp/api/plat/spinlock_types.h \ - $(srcdir)/include/odp/api/plat/spinlock_recursive_types.h \ - $(srcdir)/include/odp/api/plat/std_clib_inlines.h \ - $(srcdir)/include/odp/api/plat/strong_types.h \ - $(srcdir)/include/odp/api/plat/sync_inlines.h \ - $(srcdir)/include/odp/api/plat/thread_types.h \ - $(srcdir)/include/odp/api/plat/thrmask_types.h \ - $(srcdir)/include/odp/api/plat/ticketlock_inlines.h \ - $(srcdir)/include/odp/api/plat/ticketlock_inlines_api.h \ - $(srcdir)/include/odp/api/plat/ticketlock_types.h \ - $(srcdir)/include/odp/api/plat/time_types.h \ - $(srcdir)/include/odp/api/plat/timer_types.h \ - $(srcdir)/include/odp/api/plat/traffic_mngr_types.h \ - $(srcdir)/include/odp/api/plat/version_types.h + include/odp/api/plat/atomic_inlines.h \ + include/odp/api/plat/atomic_types.h \ + include/odp/api/plat/barrier_types.h \ + include/odp/api/plat/buffer_types.h \ + include/odp/api/plat/byteorder_inlines.h \ + include/odp/api/plat/byteorder_types.h \ + include/odp/api/plat/classification_types.h \ + include/odp/api/plat/cpumask_types.h \ + include/odp/api/plat/crypto_types.h \ + include/odp/api/plat/event_types.h \ + include/odp/api/plat/init_types.h \ ++ include/odp/api/plat/ipsec_types.h \ + include/odp/api/plat/packet_flag_inlines.h \ + include/odp/api/plat/packet_flag_inlines_api.h \ + include/odp/api/plat/packet_inlines.h \ + include/odp/api/plat/packet_inlines_api.h \ + include/odp/api/plat/packet_types.h \ + include/odp/api/plat/packet_io_types.h \ + include/odp/api/plat/pool_types.h \ + include/odp/api/plat/queue_types.h \ + include/odp/api/plat/rwlock_types.h \ + include/odp/api/plat/rwlock_recursive_types.h \ + include/odp/api/plat/schedule_types.h \ + include/odp/api/plat/shared_memory_types.h \ + include/odp/api/plat/spinlock_types.h \ + include/odp/api/plat/spinlock_recursive_types.h \ + include/odp/api/plat/std_clib_inlines.h \ + include/odp/api/plat/strong_types.h \ + include/odp/api/plat/sync_inlines.h \ + include/odp/api/plat/thread_types.h \ + include/odp/api/plat/thrmask_types.h \ + include/odp/api/plat/ticketlock_inlines.h \ + include/odp/api/plat/ticketlock_inlines_api.h \ + include/odp/api/plat/ticketlock_types.h \ + include/odp/api/plat/time_types.h \ + include/odp/api/plat/timer_types.h \ + include/odp/api/plat/traffic_mngr_types.h \ + include/odp/api/plat/version_types.h + + nodist_odpapiplatinclude_HEADERS = \ + include/odp/api/plat/static_inline.h odpdrvincludedir = $(includedir)/odp/drv odpdrvinclude_HEADERS = \ - $(srcdir)/include/odp/drv/align.h \ - $(srcdir)/include/odp/drv/atomic.h \ - $(srcdir)/include/odp/drv/barrier.h \ - $(srcdir)/include/odp/drv/byteorder.h \ - $(srcdir)/include/odp/drv/compiler.h \ - $(srcdir)/include/odp/drv/driver.h \ - $(srcdir)/include/odp/drv/shm.h \ - $(srcdir)/include/odp/drv/spinlock.h \ - $(srcdir)/include/odp/drv/std_types.h \ - $(srcdir)/include/odp/drv/sync.h - include/odp/drv/compiler.h ++ include/odp/drv/align.h \ ++ include/odp/drv/atomic.h \ ++ include/odp/drv/barrier.h \ ++ include/odp/drv/byteorder.h \ ++ include/odp/drv/compiler.h \ ++ include/odp/drv/driver.h \ ++ include/odp/drv/shm.h \ ++ include/odp/drv/spinlock.h \ ++ include/odp/drv/std_types.h \ ++ include/odp/drv/sync.h + +odpdrvplatincludedir = $(includedir)/odp/drv/plat +odpdrvplatinclude_HEADERS = \ - $(srcdir)/include/odp/drv/plat/atomic_types.h \ - $(srcdir)/include/odp/drv/plat/barrier_types.h \ - $(srcdir)/include/odp/drv/plat/byteorder_types.h \ - $(srcdir)/include/odp/drv/compiler.h \ - $(srcdir)/include/odp/drv/plat/driver_types.h \ - $(srcdir)/include/odp/drv/plat/shm_types.h \ - $(srcdir)/include/odp/drv/plat/spinlock_types.h \ - $(srcdir)/include/odp/drv/plat/strong_types.h ++ include/odp/drv/plat/atomic_types.h \ ++ include/odp/drv/plat/barrier_types.h \ ++ include/odp/drv/plat/byteorder_types.h \ ++ include/odp/drv/compiler.h \ ++ include/odp/drv/plat/driver_types.h \ ++ include/odp/drv/plat/shm_types.h \ ++ include/odp/drv/plat/spinlock_types.h \ ++ include/odp/drv/plat/strong_types.h noinst_HEADERS = \ - ${srcdir}/include/_fdserver_internal.h \ - ${srcdir}/include/_ishm_internal.h \ - ${srcdir}/include/_ishmphy_internal.h \ - ${srcdir}/include/_ishmpool_internal.h \ - ${srcdir}/include/odp_align_internal.h \ - ${srcdir}/include/odp_atomic_internal.h \ - ${srcdir}/include/odp_buffer_inlines.h \ - ${srcdir}/include/odp_bitmap_internal.h \ - ${srcdir}/include/odp_bitset.h \ - ${srcdir}/include/odp_buffer_internal.h \ - ${srcdir}/include/odp_classification_datamodel.h \ - ${srcdir}/include/odp_classification_inlines.h \ - ${srcdir}/include/odp_classification_internal.h \ - ${srcdir}/include/odp_config_internal.h \ - ${srcdir}/include/odp_crypto_internal.h \ - ${srcdir}/include/odp_debug_internal.h \ - ${srcdir}/include/odp_errno_define.h \ - ${srcdir}/include/odp_forward_typedefs_internal.h \ - ${srcdir}/include/odp_internal.h \ - ${srcdir}/include/odp_ipsec_internal.h \ - ${srcdir}/include/odp_llqueue.h \ - ${srcdir}/include/odp_name_table_internal.h \ - ${srcdir}/include/odp_packet_internal.h \ - ${srcdir}/include/odp_packet_io_internal.h \ - ${srcdir}/include/odp_packet_io_ipc_internal.h \ - ${srcdir}/include/odp_packet_io_ring_internal.h \ - ${srcdir}/include/odp_packet_netmap.h \ - ${srcdir}/include/odp_packet_dpdk.h \ - ${srcdir}/include/odp_packet_socket.h \ - ${srcdir}/include/odp_packet_tap.h \ - ${srcdir}/include/odp_pkt_queue_internal.h \ - ${srcdir}/include/odp_pool_internal.h \ - ${srcdir}/include/odp_posix_extensions.h \ - ${srcdir}/include/odp_queue_internal.h \ - ${srcdir}/include/odp_queue_scalable_internal.h \ - ${srcdir}/include/odp_ring_internal.h \ - ${srcdir}/include/odp_queue_if.h \ - ${srcdir}/include/odp_schedule_if.h \ - ${srcdir}/include/odp_schedule_scalable.h \ - ${srcdir}/include/odp_schedule_scalable_config.h \ - ${srcdir}/include/odp_schedule_scalable_ordered.h \ - ${srcdir}/include/odp_sorted_list_internal.h \ - ${srcdir}/include/odp_shm_internal.h \ - ${srcdir}/include/odp_time_internal.h \ - ${srcdir}/include/odp_timer_internal.h \ - ${srcdir}/include/odp_timer_wheel_internal.h \ - ${srcdir}/include/odp_traffic_mngr_internal.h \ - ${srcdir}/include/protocols/eth.h \ - ${srcdir}/include/protocols/ip.h \ - ${srcdir}/include/protocols/ipsec.h \ - ${srcdir}/include/protocols/tcp.h \ - ${srcdir}/include/protocols/thash.h \ - ${srcdir}/include/protocols/udp.h + include/_fdserver_internal.h \ + include/_ishm_internal.h \ + include/_ishmphy_internal.h \ ++ include/_ishmpool_internal.h \ + include/odp_align_internal.h \ + include/odp_atomic_internal.h \ + include/odp_buffer_inlines.h \ + include/odp_bitmap_internal.h \ ++ include/odp_bitset.h \ + include/odp_buffer_internal.h \ + include/odp_classification_datamodel.h \ + include/odp_classification_inlines.h \ + include/odp_classification_internal.h \ + include/odp_config_internal.h \ + include/odp_crypto_internal.h \ + include/odp_debug_internal.h \ + include/odp_errno_define.h \ + include/odp_forward_typedefs_internal.h \ + include/odp_internal.h \ ++ include/odp_ipsec_internal.h \ ++ include/odp_llqueue.h \ + include/odp_name_table_internal.h \ + include/odp_packet_internal.h \ + include/odp_packet_io_internal.h \ + include/odp_packet_io_ipc_internal.h \ + include/odp_packet_io_ring_internal.h \ + include/odp_packet_netmap.h \ + include/odp_packet_dpdk.h \ + include/odp_packet_socket.h \ + include/odp_packet_tap.h \ + include/odp_pkt_queue_internal.h \ + include/odp_pool_internal.h \ + include/odp_posix_extensions.h \ + include/odp_queue_internal.h \ ++ include/odp_queue_scalable_internal.h \ + include/odp_ring_internal.h \ + include/odp_queue_if.h \ + include/odp_schedule_if.h \ ++ include/odp_schedule_scalable.h \ ++ include/odp_schedule_scalable_config.h \ ++ include/odp_schedule_scalable_ordered.h \ + include/odp_sorted_list_internal.h \ + include/odp_shm_internal.h \ + include/odp_time_internal.h \ + include/odp_timer_internal.h \ + include/odp_timer_wheel_internal.h \ + include/odp_traffic_mngr_internal.h \ + include/protocols/eth.h \ + include/protocols/ip.h \ + include/protocols/ipsec.h \ + include/protocols/tcp.h \ ++ include/protocols/thash.h \ + include/protocols/udp.h __LIB__libodp_linux_la_SOURCES = \ _fdserver.c \ @@@ -279,42 -224,28 +276,42 @@@ __LIB__libodp_linux_la_SOURCES += arch/ arch/default/odp_cpu_cycles.c \ arch/default/odp_global_time.c \ arch/default/odp_sysinfo_parse.c - arch_odp_headers = $(srcdir)/arch/arm/odp/api/cpu_arch.h - noinst_HEADERS += ${srcdir}/arch/arm/odp_atomic.h \ - ${srcdir}/arch/arm/odp_cpu.h \ - ${srcdir}/arch/arm/odp_cpu_idling.h \ - ${srcdir}/arch/default/odp_cpu_idling.h \ - ${srcdir}/arch/arm/odp_llsc.h + arch_odp_headers = arch/arm/odp/api/cpu_arch.h ++noinst_HEADERS += arch/arm/odp_atomic.h \ ++ arch/arm/odp_cpu.h \ ++ arch/arm/odp_cpu_idling.h \ ++ arch/default/odp_cpu_idling.h \ ++ arch/arm/odp_llsc.h endif if ARCH_IS_AARCH64 __LIB__libodp_linux_la_SOURCES += arch/default/odp_cpu_arch.c \ arch/default/odp_cpu_cycles.c \ arch/aarch64/odp_global_time.c \ arch/default/odp_sysinfo_parse.c - arch_odp_headers = $(srcdir)/arch/aarch64/odp/api/cpu_arch.h - noinst_HEADERS += ${srcdir}/arch/aarch64/odp_atomic.h \ - ${srcdir}/arch/aarch64/odp_cpu.h \ - ${srcdir}/arch/aarch64/odp_cpu_idling.h \ - ${srcdir}/arch/default/odp_cpu_idling.h \ - ${srcdir}/arch/aarch64/odp_llsc.h + arch_odp_headers = arch/aarch64/odp/api/cpu_arch.h ++noinst_HEADERS += arch/aarch64/odp_atomic.h \ ++ arch/aarch64/odp_cpu.h \ ++ arch/aarch64/odp_cpu_idling.h \ ++ arch/default/odp_cpu_idling.h \ ++ arch/aarch64/odp_llsc.h endif if ARCH_IS_MIPS64 __LIB__libodp_linux_la_SOURCES += arch/mips64/odp_cpu_arch.c \ arch/default/odp_cpu_cycles.c \ arch/default/odp_global_time.c \ arch/mips64/odp_sysinfo_parse.c - arch_odp_headers = $(srcdir)/arch/mips64/odp/api/cpu_arch.h - noinst_HEADERS += ${srcdir}/arch/default/odp_cpu.h \ - ${srcdir}/arch/default/odp_cpu_idling.h + arch_odp_headers = arch/mips64/odp/api/cpu_arch.h ++noinst_HEADERS += arch/default/odp_cpu.h \ ++ arch/default/odp_cpu_idling.h endif if ARCH_IS_POWERPC __LIB__libodp_linux_la_SOURCES += arch/default/odp_cpu_arch.c \ arch/default/odp_cpu_cycles.c \ arch/default/odp_global_time.c \ arch/powerpc/odp_sysinfo_parse.c - arch_odp_headers = $(srcdir)/arch/powerpc/odp/api/cpu_arch.h - noinst_HEADERS += ${srcdir}/arch/default/odp_cpu.h \ - ${srcdir}/arch/default/odp_cpu_idling.h + arch_odp_headers = arch/powerpc/odp/api/cpu_arch.h ++noinst_HEADERS += arch/default/odp_cpu.h \ ++ arch/default/odp_cpu_idling.h endif if ARCH_IS_X86 __LIB__libodp_linux_la_SOURCES += arch/x86/cpu_flags.c \ @@@ -322,13 -253,11 +319,13 @@@ arch/default/odp_cpu_cycles.c \ arch/x86/odp_global_time.c \ arch/x86/odp_sysinfo_parse.c - arch_odp_headers = $(srcdir)/arch/x86/odp/api/cpu_arch.h - noinst_HEADERS += $(srcdir)/arch/x86/cpu_flags.h - noinst_HEADERS += ${srcdir}/arch/default/odp_cpu.h \ - ${srcdir}/arch/default/odp_cpu_idling.h + arch_odp_headers = arch/x86/odp/api/cpu_arch.h + noinst_HEADERS += arch/x86/cpu_flags.h ++noinst_HEADERS += arch/default/odp_cpu.h \ ++ arch/default/odp_cpu_idling.h endif - noinst_HEADERS += $(srcdir)/arch/default/odp/api/cpu_arch.h + noinst_HEADERS += arch/default/odp/api/cpu_arch.h odpapiinclude_HEADERS += $(arch_odp_headers) diff --cc platform/linux-generic/include/odp_packet_internal.h index e2ef1363,3b3dec95..fed562aa --- a/platform/linux-generic/include/odp_packet_internal.h +++ b/platform/linux-generic/include/odp_packet_internal.h @@@ -227,13 -225,11 +228,12 @@@ static inline void packet_init(odp_pack * segment occupied by the allocated length. */ pkt_hdr->frame_len = len; - pkt_hdr->shared_len = 0; pkt_hdr->headroom = CONFIG_PACKET_HEADROOM; - pkt_hdr->tailroom = CONFIG_PACKET_MAX_SEG_LEN - seg_len + - CONFIG_PACKET_TAILROOM; + pkt_hdr->tailroom = pool->seg_len - seg_len + CONFIG_PACKET_TAILROOM; pkt_hdr->input = ODP_PKTIO_INVALID; + pkt_hdr->buf_hdr.event_subtype = ODP_EVENT_PACKET_BASIC; + } static inline void copy_packet_parser_metadata(odp_packet_hdr_t *src_hdr, diff --cc platform/linux-generic/m4/configure.m4 index 85d35f25,5d7ad35a..f4504bf9 --- a/platform/linux-generic/m4/configure.m4 +++ b/platform/linux-generic/m4/configure.m4 @@@ -1,87 -1,12 +1,16 @@@ - # Enable -fvisibility=hidden if using a gcc that supports it - OLD_CFLAGS="$CFLAGS" - AC_MSG_CHECKING([whether $CC supports -fvisibility=hidden]) - VISIBILITY_CFLAGS="-fvisibility=hidden" - CFLAGS="$CFLAGS $VISIBILITY_CFLAGS" - AC_LINK_IFELSE([AC_LANG_PROGRAM()], AC_MSG_RESULT([yes]), - [VISIBILITY_CFLAGS=""; AC_MSG_RESULT([no])]); - - AC_SUBST(VISIBILITY_CFLAGS) - # Restore CFLAGS; VISIBILITY_CFLAGS are added to it where needed. - CFLAGS=$OLD_CFLAGS - - AC_MSG_CHECKING(for GCC atomic builtins) - AC_LINK_IFELSE( - [AC_LANG_SOURCE( - [[int main() { - int v = 1; - __atomic_fetch_add(&v, 1, __ATOMIC_RELAXED); - __atomic_fetch_sub(&v, 1, __ATOMIC_RELAXED); - __atomic_store_n(&v, 1, __ATOMIC_RELAXED); - __atomic_load_n(&v, __ATOMIC_RELAXED); - return 0; - } - ]])], - AC_MSG_RESULT(yes), - AC_MSG_RESULT(no) - echo "GCC-style __atomic builtins not supported by the compiler." - echo "Use newer version. For gcc > 4.7.0" - exit -1) + IMPLEMENTATION_NAME="odp-linux" +dnl Check for libconfig (required) +PKG_CHECK_MODULES([LIBCONFIG], [libconfig >= 1.3.2]) + - dnl Check whether -latomic is needed - use_libatomic=no - - AC_MSG_CHECKING(whether -latomic is needed for 64-bit atomic built-ins) - AC_LINK_IFELSE( - [AC_LANG_SOURCE([[ - #include <stdint.h> - static uint64_t loc; - int main(void) - { - uint64_t prev = __atomic_exchange_n(&loc, 7, __ATOMIC_RELAXED); - return 0; - } - ]])], - [AC_MSG_RESULT(no)], - [AC_MSG_RESULT(yes) - AC_CHECK_LIB( - [atomic], [__atomic_exchange_8], - [use_libatomic=yes], - [AC_MSG_FAILURE([__atomic_exchange_8 is not available])]) - ]) - - AC_MSG_CHECKING(whether -latomic is needed for 128-bit atomic built-ins) - AC_LINK_IFELSE( - [AC_LANG_SOURCE([[ - static __int128 loc; - int main(void) - { - __int128 prev; - prev = __atomic_exchange_n(&loc, 7, __ATOMIC_RELAXED); - return 0; - } - ]])], - [AC_MSG_RESULT(no)], - [AC_MSG_RESULT(yes) - AC_CHECK_LIB( - [atomic], [__atomic_exchange_16], - [use_libatomic=yes], - [AC_MSG_CHECKING([cannot detect support for 128-bit atomics])]) - ]) - - if test "x$use_libatomic" = "xyes"; then - ATOMIC_LIBS="-latomic" - fi - AC_SUBST([ATOMIC_LIBS]) + ODP_VISIBILITY + ODP_ATOMIC m4_include([platform/linux-generic/m4/odp_pthread.m4]) - m4_include([platform/linux-generic/m4/odp_timer.m4]) - m4_include([platform/linux-generic/m4/odp_openssl.m4]) + ODP_TIMER + ODP_OPENSSL m4_include([platform/linux-generic/m4/odp_pcap.m4]) +m4_include([platform/linux-generic/m4/odp_modules.m4]) m4_include([platform/linux-generic/m4/odp_netmap.m4]) m4_include([platform/linux-generic/m4/odp_dpdk.m4]) m4_include([platform/linux-generic/m4/odp_schedule.m4]) diff --cc platform/linux-generic/odp_pool.c index b0b1adaf,3e47993c..40114093 --- a/platform/linux-generic/odp_pool.c +++ b/platform/linux-generic/odp_pool.c @@@ -384,10 -382,29 +383,34 @@@ static odp_pool_t pool_create(const cha break; case ODP_POOL_PACKET: + if (params->pkt.headroom > CONFIG_PACKET_HEADROOM) { + ODP_ERR("Packet headroom size not supported."); + return ODP_POOL_INVALID; + } ++ + seg_len = CONFIG_PACKET_MAX_SEG_LEN; + max_len = CONFIG_PACKET_MAX_LEN; + + if (params->pkt.len && + params->pkt.len < CONFIG_PACKET_MAX_SEG_LEN) + seg_len = params->pkt.len; + if (params->pkt.seg_len && params->pkt.seg_len > seg_len) + seg_len = params->pkt.seg_len; + if (seg_len < CONFIG_PACKET_SEG_LEN_MIN) + seg_len = CONFIG_PACKET_SEG_LEN_MIN; + + /* Make sure that at least one 'max_len' packet can fit in the + * pool. */ + if (params->pkt.max_len != 0) + max_len = params->pkt.max_len; + if ((max_len + seg_len - 1) / seg_len > CONFIG_PACKET_MAX_SEGS) + seg_len = (max_len + CONFIG_PACKET_MAX_SEGS - 1) / + CONFIG_PACKET_MAX_SEGS; + if (seg_len > CONFIG_PACKET_MAX_SEG_LEN) { + ODP_ERR("Pool unable to store 'max_len' packet"); + return ODP_POOL_INVALID; + } + headroom = CONFIG_PACKET_HEADROOM; tailroom = CONFIG_PACKET_TAILROOM; num = params->pkt.num; @@@ -900,13 -903,12 +919,13 @@@ int odp_pool_capability(odp_pool_capabi /* Packet pools */ capa->pkt.max_pools = ODP_CONFIG_POOLS; - capa->pkt.max_len = CONFIG_PACKET_MAX_SEGS * max_seg_len; + capa->pkt.max_len = CONFIG_PACKET_MAX_LEN; capa->pkt.max_num = CONFIG_POOL_MAX_NUM; capa->pkt.min_headroom = CONFIG_PACKET_HEADROOM; + capa->pkt.max_headroom = CONFIG_PACKET_HEADROOM; capa->pkt.min_tailroom = CONFIG_PACKET_TAILROOM; capa->pkt.max_segs_per_pkt = CONFIG_PACKET_MAX_SEGS; - capa->pkt.min_seg_len = max_seg_len; + capa->pkt.min_seg_len = CONFIG_PACKET_SEG_LEN_MIN; capa->pkt.max_seg_len = max_seg_len; capa->pkt.max_uarea_size = MAX_SIZE; diff --cc test/m4/configure.m4 index 460e8449,44c6bfe9..92bb53ad --- a/test/m4/configure.m4 +++ b/test/m4/configure.m4 @@@ -1,3 -1,33 +1,38 @@@ - m4_include([test/common_plat/m4/configure.m4]) + m4_include([test/m4/miscellaneous.m4]) + m4_include([test/m4/performance.m4]) + m4_include([test/m4/validation.m4]) - AC_CONFIG_FILES([test/Makefile]) + AC_CONFIG_FILES([test/Makefile + test/common/Makefile + test/miscellaneous/Makefile + test/performance/Makefile + test/validation/Makefile + test/validation/api/atomic/Makefile + test/validation/api/barrier/Makefile + test/validation/api/buffer/Makefile ++ test/validation/api/chksum/Makefile + test/validation/api/classification/Makefile + test/validation/api/cpumask/Makefile + test/validation/api/crypto/Makefile + test/validation/api/errno/Makefile + test/validation/api/hash/Makefile + test/validation/api/init/Makefile ++ test/validation/api/ipsec/Makefile + test/validation/api/lock/Makefile + test/validation/api/Makefile + test/validation/api/packet/Makefile + test/validation/api/pktio/Makefile + test/validation/api/pool/Makefile + test/validation/api/queue/Makefile + test/validation/api/random/Makefile + test/validation/api/scheduler/Makefile + test/validation/api/shmem/Makefile + test/validation/api/std_clib/Makefile + test/validation/api/system/Makefile + test/validation/api/thread/Makefile + test/validation/api/time/Makefile + test/validation/api/timer/Makefile - test/validation/api/traffic_mngr/Makefile]) ++ test/validation/api/traffic_mngr/Makefile ++ test/validation/drv/Makefile ++ test/validation/drv/drvatomic/Makefile ++ test/validation/drv/drvshmem/Makefile]) diff --cc test/validation/Makefile.inc index c4e80eb7,4af01000..4f946b8a --- a/test/validation/Makefile.inc +++ b/test/validation/Makefile.inc @@@ -1,11 -1,11 +1,8 @@@ include $(top_srcdir)/test/Makefile.inc - COMMON_DIR = $(top_builddir)/test/common_plat/common + COMMON_DIR = $(top_builddir)/test/common - AM_CFLAGS += -I$(top_srcdir)/test/common_plat/common - AM_LDFLAGS += $(DPDK_PMDS) - - AM_CFLAGS += $(CUNIT_CFLAGS) + AM_CFLAGS += -I$(top_srcdir)/test/common -AM_LDFLAGS += $(DPDK_PMDS) - -AM_CFLAGS += $(CUNIT_CFLAGS) LIBCUNIT_COMMON = $(COMMON_DIR)/libcunit_common.la LIBCPUMASK_COMMON = $(COMMON_DIR)/libcpumask_common.la diff --cc test/validation/api/Makefile.am index 00000000,730a336d..be3fb63e mode 000000,100644..100644 --- a/test/validation/api/Makefile.am +++ b/test/validation/api/Makefile.am @@@ -1,0 -1,72 +1,79 @@@ + ODP_MODULES = atomic \ + barrier \ + buffer \ ++ chksum \ + classification \ + cpumask \ + crypto \ + errno \ + hash \ + init \ ++ ipsec \ + lock \ + queue \ + packet \ + pktio \ + pool \ + random \ + scheduler \ + std_clib \ + thread \ + time \ + timer \ + traffic_mngr \ + shmem \ + system + + SUBDIRS = $(ODP_MODULES) + + include $(top_srcdir)/test/Makefile.inc + TESTS_ENVIRONMENT += TEST_DIR=${top_builddir}/test/validation + + TESTS = \ + atomic/atomic_main$(EXEEXT) \ + barrier/barrier_main$(EXEEXT) \ + buffer/buffer_main$(EXEEXT) \ ++ chksum/chksum_main$(EXEEXT) \ + classification/classification_main$(EXEEXT) \ + cpumask/cpumask_main$(EXEEXT) \ + crypto/crypto_main$(EXEEXT) \ + errno/errno_main$(EXEEXT) \ + hash/hash_main$(EXEEXT) \ + init/init_main_ok$(EXEEXT) \ + init/init_main_abort$(EXEEXT) \ + init/init_main_log$(EXEEXT) \ ++ ipsec/ipsec_sync$(EXEEXT) \ ++ ipsec/ipsec_async$(EXEEXT) \ ++ ipsec/ipsec_inline_in$(EXEEXT) \ ++ ipsec/ipsec_inline_out$(EXEEXT) \ + lock/lock_main$(EXEEXT) \ + packet/packet_main$(EXEEXT) \ + pool/pool_main$(EXEEXT) \ + queue/queue_main$(EXEEXT) \ + random/random_main$(EXEEXT) \ + scheduler/scheduler_main$(EXEEXT) \ + std_clib/std_clib_main$(EXEEXT) \ + thread/thread_main$(EXEEXT) \ + time/time.sh \ + timer/timer_main$(EXEEXT) \ + traffic_mngr/traffic_mngr.sh \ + shmem/shmem_main$(EXEEXT) \ + system/system_main$(EXEEXT) + + TESTNAME = validation + + TESTENV = tests-$(TESTNAME).env + + test_DATA = $(TESTENV) + + DISTCLEANFILES = $(TESTENV) + .PHONY: $(TESTENV) + $(TESTENV): + echo "TESTS=\"$(TESTS)\"" > $@ + echo "$(TESTS_ENVIRONMENT)" >> $@ + echo "$(LOG_COMPILER)" >> $@ + + if test_installdir + installcheck-local: + $(DESTDIR)/$(testdir)/run-test.sh $(TESTNAME) + endif diff --cc test/validation/api/Makefile.inc index 00000000,4af01000..2a9ec255 mode 000000,100644..100644 --- a/test/validation/api/Makefile.inc +++ b/test/validation/api/Makefile.inc @@@ -1,0 -1,13 +1,6 @@@ -include $(top_srcdir)/test/Makefile.inc ++include $(top_srcdir)/test/validation/Makefile.inc + -COMMON_DIR = $(top_builddir)/test/common - -AM_CFLAGS += -I$(top_srcdir)/test/common + AM_LDFLAGS += $(DPDK_PMDS) + + AM_CFLAGS += $(CUNIT_CFLAGS) + -LIBCUNIT_COMMON = $(COMMON_DIR)/libcunit_common.la -LIBCPUMASK_COMMON = $(COMMON_DIR)/libcpumask_common.la -LIBTHRMASK_COMMON = $(COMMON_DIR)/libthrmask_common.la -LIBODP = $(LIB)/libodphelper.la $(LIB)/libodp-linux.la diff --cc test/validation/api/chksum/.gitignore index c69e8c47,00000000..c69e8c47 mode 100644,000000..100644 --- a/test/validation/api/chksum/.gitignore +++ b/test/validation/api/chksum/.gitignore diff --cc test/validation/api/chksum/Makefile.am index 46f3643e,00000000..46f3643e mode 100644,000000..100644 --- a/test/validation/api/chksum/Makefile.am +++ b/test/validation/api/chksum/Makefile.am diff --cc test/validation/api/chksum/chksum.c index de98b74a,00000000..de98b74a mode 100644,000000..100644 --- a/test/validation/api/chksum/chksum.c +++ b/test/validation/api/chksum/chksum.c diff --cc test/validation/api/chksum/chksum.h index 50ed66ee,00000000..50ed66ee mode 100644,000000..100644 --- a/test/validation/api/chksum/chksum.h +++ b/test/validation/api/chksum/chksum.h diff --cc test/validation/api/chksum/chksum_main.c index bec10ddd,00000000..bec10ddd mode 100644,000000..100644 --- a/test/validation/api/chksum/chksum_main.c +++ b/test/validation/api/chksum/chksum_main.c diff --cc test/validation/api/ipsec/.gitignore index 2def047f,00000000..2def047f mode 100644,000000..100644 --- a/test/validation/api/ipsec/.gitignore +++ b/test/validation/api/ipsec/.gitignore diff --cc test/validation/api/ipsec/Makefile.am index 5a4652f5,00000000..5a4652f5 mode 100644,000000..100644 --- a/test/validation/api/ipsec/Makefile.am +++ b/test/validation/api/ipsec/Makefile.am diff --cc test/validation/api/ipsec/ipsec.c index a8fdf2b1,00000000..a8fdf2b1 mode 100644,000000..100644 --- a/test/validation/api/ipsec/ipsec.c +++ b/test/validation/api/ipsec/ipsec.c diff --cc test/validation/api/ipsec/ipsec.h index d1c6854b,00000000..d1c6854b mode 100644,000000..100644 --- a/test/validation/api/ipsec/ipsec.h +++ b/test/validation/api/ipsec/ipsec.h diff --cc test/validation/api/ipsec/ipsec_async.c index 79687923,00000000..79687923 mode 100644,000000..100644 --- a/test/validation/api/ipsec/ipsec_async.c +++ b/test/validation/api/ipsec/ipsec_async.c diff --cc test/validation/api/ipsec/ipsec_inline_in.c index 2a595353,00000000..2a595353 mode 100644,000000..100644 --- a/test/validation/api/ipsec/ipsec_inline_in.c +++ b/test/validation/api/ipsec/ipsec_inline_in.c diff --cc test/validation/api/ipsec/ipsec_inline_out.c index 0a34e03a,00000000..0a34e03a mode 100644,000000..100644 --- a/test/validation/api/ipsec/ipsec_inline_out.c +++ b/test/validation/api/ipsec/ipsec_inline_out.c diff --cc test/validation/api/ipsec/ipsec_sync.c index c22980a8,00000000..c22980a8 mode 100644,000000..100644 --- a/test/validation/api/ipsec/ipsec_sync.c +++ b/test/validation/api/ipsec/ipsec_sync.c diff --cc test/validation/api/ipsec/ipsec_sync_in.c index 8a7fc468,00000000..8a7fc468 mode 100644,000000..100644 --- a/test/validation/api/ipsec/ipsec_sync_in.c +++ b/test/validation/api/ipsec/ipsec_sync_in.c diff --cc test/validation/api/ipsec/ipsec_test_in.c index 25fc00e1,00000000..25fc00e1 mode 100644,000000..100644 --- a/test/validation/api/ipsec/ipsec_test_in.c +++ b/test/validation/api/ipsec/ipsec_test_in.c diff --cc test/validation/api/ipsec/ipsec_test_out.c index 39a3c30f,00000000..39a3c30f mode 100644,000000..100644 --- a/test/validation/api/ipsec/ipsec_test_out.c +++ b/test/validation/api/ipsec/ipsec_test_out.c diff --cc test/validation/api/ipsec/test_vectors.h index 2fb06b2b,00000000..2fb06b2b mode 100644,000000..100644 --- a/test/validation/api/ipsec/test_vectors.h +++ b/test/validation/api/ipsec/test_vectors.h diff --cc test/validation/drv/.gitignore index 7e563b8b,00000000..7e563b8b mode 100644,000000..100644 --- a/test/validation/drv/.gitignore +++ b/test/validation/drv/.gitignore diff --cc test/validation/drv/Makefile.am index e445adf5,00000000..e445adf5 mode 100644,000000..100644 --- a/test/validation/drv/Makefile.am +++ b/test/validation/drv/Makefile.am diff --cc test/validation/drv/Makefile.inc index 00000000,00000000..5f8fbbb6 new file mode 100644 --- /dev/null +++ b/test/validation/drv/Makefile.inc @@@ -1,0 -1,0 +1,1 @@@ ++include $(top_srcdir)/test/validation/Makefile.inc diff --cc test/validation/drv/README index d1a9e6f4,00000000..d1a9e6f4 mode 100644,000000..100644 --- a/test/validation/drv/README +++ b/test/validation/drv/README diff --cc test/validation/drv/drvatomic/.gitignore index 3b5e5102,00000000..3b5e5102 mode 100644,000000..100644 --- a/test/validation/drv/drvatomic/.gitignore +++ b/test/validation/drv/drvatomic/.gitignore diff --cc test/validation/drv/drvatomic/Makefile.am index 53e971c9,00000000..53e971c9 mode 100644,000000..100644 --- a/test/validation/drv/drvatomic/Makefile.am +++ b/test/validation/drv/drvatomic/Makefile.am diff --cc test/validation/drv/drvatomic/drvatomic.c index cc5e4415,00000000..cc5e4415 mode 100644,000000..100644 --- a/test/validation/drv/drvatomic/drvatomic.c +++ b/test/validation/drv/drvatomic/drvatomic.c diff --cc test/validation/drv/drvatomic/drvatomic.h index 62fb17d9,00000000..62fb17d9 mode 100644,000000..100644 --- a/test/validation/drv/drvatomic/drvatomic.h +++ b/test/validation/drv/drvatomic/drvatomic.h diff --cc test/validation/drv/drvatomic/drvatomic_main.c index 390a3e2e,00000000..390a3e2e mode 100644,000000..100644 --- a/test/validation/drv/drvatomic/drvatomic_main.c +++ b/test/validation/drv/drvatomic/drvatomic_main.c diff --cc test/validation/drv/drvshmem/.gitignore index 726dea34,00000000..726dea34 mode 100644,000000..100644 --- a/test/validation/drv/drvshmem/.gitignore +++ b/test/validation/drv/drvshmem/.gitignore diff --cc test/validation/drv/drvshmem/Makefile.am index 816a5e67,00000000..816a5e67 mode 100644,000000..100644 --- a/test/validation/drv/drvshmem/Makefile.am +++ b/test/validation/drv/drvshmem/Makefile.am diff --cc test/validation/drv/drvshmem/drvshmem.c index 0f882ae4,00000000..0f882ae4 mode 100644,000000..100644 --- a/test/validation/drv/drvshmem/drvshmem.c +++ b/test/validation/drv/drvshmem/drvshmem.c diff --cc test/validation/drv/drvshmem/drvshmem.h index 817b3d57,00000000..817b3d57 mode 100644,000000..100644 --- a/test/validation/drv/drvshmem/drvshmem.h +++ b/test/validation/drv/drvshmem/drvshmem.h diff --cc test/validation/drv/drvshmem/drvshmem_main.c index 566ccec6,00000000..566ccec6 mode 100644,000000..100644 --- a/test/validation/drv/drvshmem/drvshmem_main.c +++ b/test/validation/drv/drvshmem/drvshmem_main.c ----------------------------------------------------------------------- Summary of changes: .gitignore | 3 +- .travis.yml | 2 +- Makefile.am | 13 +- configure.ac | 41 +-- example/Makefile.am | 2 + example/Makefile.inc | 4 +- example/classifier/Makefile.am | 9 +- example/generator/Makefile.am | 9 +- example/hello/Makefile.am | 6 +- example/ipfragreass/Makefile.am | 27 +- example/ipsec/Makefile.am | 53 ++- example/l2fwd_simple/Makefile.am | 9 +- example/l2fwd_simple/l2fwd_simple_run.sh | 3 +- example/l3fwd/Makefile.am | 15 +- example/l3fwd/odp_l3fwd.c | 49 +-- example/l3fwd/odp_l3fwd_run.sh | 2 +- example/packet/Makefile.am | 9 +- example/packet/pktio_run.sh | 8 +- example/switch/Makefile.am | 9 +- example/switch/switch_run.sh | 2 +- example/time/Makefile.am | 9 +- example/timer/Makefile.am | 15 +- example/traffic_mgmt/Makefile.am | 10 +- example/traffic_mgmt/odp_traffic_mgmt.c | 30 +- helper/Makefile.am | 57 ++-- {pkgconfig => helper}/libodphelper.pc.in | 0 helper/m4/configure.m4 | 3 +- helper/test/Makefile.am | 18 +- helper/test/linux/Makefile.am | 5 - helper/test/odpthreads_as_processes | 2 +- helper/test/odpthreads_as_pthreads | 2 +- include/Makefile.am | 162 +++++++++ m4/odp_atomic.m4 | 95 ++++++ m4/odp_openssl.m4 | 60 ++++ {platform/linux-generic/m4 => m4}/odp_timer.m4 | 7 +- m4/odp_visibility.m4 | 21 ++ platform/Makefile.inc | 88 +---- platform/linux-generic/Makefile.am | 379 ++++++++++----------- .../linux-generic/include/odp_buffer_internal.h | 6 +- .../linux-generic/include/odp_config_internal.h | 17 +- .../linux-generic/include/odp_packet_internal.h | 8 +- platform/linux-generic/include/odp_pool_internal.h | 3 +- .../linux-generic}/libodp-linux.pc.in | 0 platform/linux-generic/m4/configure.m4 | 97 ++---- platform/linux-generic/m4/odp_dpdk.m4 | 2 +- platform/linux-generic/m4/odp_netmap.m4 | 4 +- platform/linux-generic/m4/odp_openssl.m4 | 37 -- platform/linux-generic/m4/odp_pcap.m4 | 4 +- {test => platform}/linux-generic/m4/performance.m4 | 2 + platform/linux-generic/odp_packet.c | 71 ++-- platform/linux-generic/odp_packet_io.c | 29 +- platform/linux-generic/odp_pkt_queue.c | 22 +- platform/linux-generic/odp_pool.c | 56 +-- platform/linux-generic/odp_sorted_list.c | 12 +- platform/linux-generic/odp_timer_wheel.c | 44 +-- platform/linux-generic/odp_traffic_mngr.c | 42 +-- platform/linux-generic/pktio/dpdk.c | 6 +- platform/linux-generic/pktio/netmap.c | 2 +- platform/linux-generic/pktio/socket_mmap.c | 2 +- .../linux-generic/test}/.gitignore | 0 platform/linux-generic/test/Makefile.am | 57 ++++ .../linux-generic/test}/Makefile.inc | 4 +- .../linux-generic/test}/mmap_vlan_ins/.gitignore | 0 .../linux-generic/test}/mmap_vlan_ins/Makefile.am | 2 +- .../test}/mmap_vlan_ins/mmap_vlan_ins.c | 0 .../test}/mmap_vlan_ins/mmap_vlan_ins.sh | 0 .../linux-generic/test}/mmap_vlan_ins/pktio_env | 0 .../linux-generic/test}/mmap_vlan_ins/vlan.pcap | Bin .../linux-generic/test/performance}/.gitignore | 0 .../linux-generic/test}/performance/Makefile.am | 0 .../test}/performance/odp_scheduling_run_proc.sh | 2 +- .../linux-generic/test}/pktio_ipc/.gitignore | 0 .../linux-generic/test}/pktio_ipc/Makefile.am | 0 .../linux-generic/test}/pktio_ipc/ipc_common.c | 0 .../linux-generic/test}/pktio_ipc/ipc_common.h | 0 .../linux-generic/test}/pktio_ipc/pktio_ipc1.c | 0 .../linux-generic/test}/pktio_ipc/pktio_ipc2.c | 0 .../linux-generic/test}/pktio_ipc/pktio_ipc_run.sh | 0 .../linux-generic/test}/ring/.gitignore | 0 .../linux-generic/test}/ring/Makefile.am | 2 +- .../linux-generic/test}/ring/ring_basic.c | 0 .../linux-generic/test}/ring/ring_main.c | 0 .../linux-generic/test}/ring/ring_stress.c | 0 .../linux-generic/test}/ring/ring_suites.c | 0 .../linux-generic/test}/ring/ring_suites.h | 0 .../linux-generic/test/validation/Makefile.inc | 1 + .../linux-generic/test/validation/api/Makefile.inc | 1 + .../test/validation/api/pktio}/.gitignore | 0 .../test}/validation/api/pktio/Makefile.am | 0 .../test}/validation/api/pktio/pktio_env | 0 .../test}/validation/api/pktio/pktio_run.sh | 2 +- .../test}/validation/api/pktio/pktio_run_dpdk.sh | 2 +- .../test}/validation/api/pktio/pktio_run_netmap.sh | 2 +- .../test}/validation/api/pktio/pktio_run_pcap.sh | 2 +- .../test}/validation/api/pktio/pktio_run_tap.sh | 2 +- .../test}/validation/api/shmem/.gitignore | 0 .../test}/validation/api/shmem/Makefile.am | 2 +- .../test}/validation/api/shmem/shmem_common.h | 0 .../test}/validation/api/shmem/shmem_linux.c | 8 +- .../test}/validation/api/shmem/shmem_linux.h | 0 .../test}/validation/api/shmem/shmem_odp1.c | 0 .../test}/validation/api/shmem/shmem_odp1.h | 0 .../test}/validation/api/shmem/shmem_odp2.c | 0 .../test}/validation/api/shmem/shmem_odp2.h | 0 test/Makefile.am | 2 +- test/Makefile.inc | 2 +- test/README | 2 +- test/{common_plat => }/common/Makefile.am | 7 + test/{common_plat => }/common/mask_common.c | 0 test/{common_plat => }/common/mask_common.h | 0 test/{common_plat => }/common/odp_cunit_common.c | 0 test/{common_plat => }/common/odp_cunit_common.h | 0 .../{linux-generic/run-test => common/run-test.sh} | 0 test/{ => common}/test_debug.h | 0 test/common_plat/Makefile.am | 7 - test/common_plat/m4/configure.m4 | 38 --- test/common_plat/validation/Makefile.inc | 16 - test/common_plat/validation/api/Makefile.am | 27 -- test/common_plat/validation/drv/Makefile.inc | 1 - test/linux-generic/Makefile.am | 88 ----- test/linux-generic/m4/configure.m4 | 9 - test/linux-generic/validation/Makefile.inc | 1 - test/linux-generic/validation/api/Makefile.inc | 1 - test/m4/configure.m4 | 39 ++- test/{common_plat => }/m4/miscellaneous.m4 | 0 test/{common_plat => }/m4/performance.m4 | 0 test/{common_plat => }/m4/validation.m4 | 0 test/{common_plat => }/miscellaneous/.gitignore | 0 test/{common_plat => }/miscellaneous/Makefile.am | 4 +- .../miscellaneous/odp_api_from_cpp.cpp | 0 test/{common_plat => }/performance/.gitignore | 0 test/{common_plat => }/performance/Makefile.am | 17 +- test/{common_plat => }/performance/dummy_crc.h | 0 .../performance/odp_bench_packet.c | 0 test/{common_plat => }/performance/odp_crypto.c | 0 test/{common_plat => }/performance/odp_l2fwd.c | 0 .../{common_plat => }/performance/odp_l2fwd_run.sh | 5 +- .../performance/odp_pktio_ordered.c | 0 .../performance/odp_pktio_ordered_run.sh | 0 .../{common_plat => }/performance/odp_pktio_perf.c | 0 .../performance/odp_sched_latency.c | 0 .../performance/odp_sched_latency_run.sh | 0 .../{common_plat => }/performance/odp_scheduling.c | 0 .../performance/odp_scheduling_run.sh | 0 test/{common_plat => }/performance/udp64.pcap | Bin test/{common_plat => }/validation/Makefile.am | 0 .../validation/api => validation}/Makefile.inc | 7 +- .../performance => validation/api}/.gitignore | 0 test/validation/api/Makefile.am | 79 +++++ test/validation/api/Makefile.inc | 6 + test/{common_plat => }/validation/api/README | 0 .../validation/api/atomic/.gitignore | 0 .../validation/api/atomic/Makefile.am | 2 +- .../validation/api/atomic/atomic.c | 0 .../validation/api/atomic/atomic.h | 0 .../validation/api/atomic/atomic_main.c | 0 .../validation/api/barrier/.gitignore | 0 .../validation/api/barrier/Makefile.am | 2 +- .../validation/api/barrier/barrier.c | 0 .../validation/api/barrier/barrier.h | 0 .../validation/api/barrier/barrier_main.c | 0 .../validation/api/buffer/.gitignore | 0 .../validation/api/buffer/Makefile.am | 2 +- .../validation/api/buffer/buffer.c | 0 .../validation/api/buffer/buffer.h | 0 .../validation/api/buffer/buffer_main.c | 0 .../validation/api/chksum/.gitignore | 0 .../validation/api/chksum/Makefile.am | 0 .../validation/api/chksum/chksum.c | 0 .../validation/api/chksum/chksum.h | 0 .../validation/api/chksum/chksum_main.c | 0 .../validation/api/classification/.gitignore | 0 .../validation/api/classification/Makefile.am | 2 +- .../validation/api/classification/classification.c | 0 .../validation/api/classification/classification.h | 0 .../api/classification/classification_main.c | 0 .../api/classification/odp_classification_basic.c | 0 .../api/classification/odp_classification_common.c | 0 .../classification/odp_classification_test_pmr.c | 0 .../api/classification/odp_classification_tests.c | 0 .../classification/odp_classification_testsuites.h | 0 .../validation/api/cpumask/.gitignore | 0 .../validation/api/cpumask/Makefile.am | 2 +- .../validation/api/cpumask/cpumask.c | 0 .../validation/api/cpumask/cpumask.h | 0 .../validation/api/cpumask/cpumask_main.c | 0 .../validation/api/crypto/.gitignore | 0 .../validation/api/crypto/Makefile.am | 2 +- .../validation/api/crypto/crypto.c | 0 .../validation/api/crypto/crypto.h | 0 .../validation/api/crypto/crypto_main.c | 0 .../validation/api/crypto/odp_crypto_test_inp.c | 0 .../validation/api/crypto/odp_crypto_test_inp.h | 0 .../validation/api/crypto/test_vectors.h | 0 .../validation/api/crypto/test_vectors_len.h | 0 .../validation/api/errno/.gitignore | 0 .../validation/api/errno/Makefile.am | 2 +- .../{common_plat => }/validation/api/errno/errno.c | 0 .../{common_plat => }/validation/api/errno/errno.h | 0 .../validation/api/errno/errno_main.c | 0 .../validation/api/hash/.gitignore | 0 .../validation/api/hash/Makefile.am | 2 +- test/{common_plat => }/validation/api/hash/hash.c | 0 test/{common_plat => }/validation/api/hash/hash.h | 0 .../validation/api/hash/hash_main.c | 0 .../validation/api/init/.gitignore | 0 .../validation/api/init/Makefile.am | 2 +- test/{common_plat => }/validation/api/init/init.c | 0 test/{common_plat => }/validation/api/init/init.h | 0 .../validation/api/init/init_main_abort.c | 0 .../validation/api/init/init_main_log.c | 0 .../validation/api/init/init_main_ok.c | 0 .../validation/api/ipsec/.gitignore | 0 .../validation/api/ipsec/Makefile.am | 0 .../{common_plat => }/validation/api/ipsec/ipsec.c | 0 .../{common_plat => }/validation/api/ipsec/ipsec.h | 0 .../validation/api/ipsec/ipsec_async.c | 0 .../validation/api/ipsec/ipsec_inline_in.c | 0 .../validation/api/ipsec/ipsec_inline_out.c | 0 .../validation/api/ipsec/ipsec_sync.c | 0 .../validation/api/ipsec/ipsec_sync_in.c | 0 .../validation/api/ipsec/ipsec_test_in.c | 0 .../validation/api/ipsec/ipsec_test_out.c | 0 .../validation/api/ipsec/test_vectors.h | 0 .../validation/api/lock/.gitignore | 0 .../validation/api/lock/Makefile.am | 2 +- test/{common_plat => }/validation/api/lock/lock.c | 0 test/{common_plat => }/validation/api/lock/lock.h | 0 .../validation/api/lock/lock_main.c | 0 .../validation/api/packet/.gitignore | 0 .../validation/api/packet/Makefile.am | 2 +- .../validation/api/packet/packet.c | 29 +- .../validation/api/packet/packet.h | 0 .../validation/api/packet/packet_main.c | 0 .../validation/api/pktio/.gitignore | 0 .../validation/api/pktio/Makefile.am | 2 +- .../validation/api/pktio/parser.c | 0 .../validation/api/pktio/parser.h | 0 .../{common_plat => }/validation/api/pktio/pktio.c | 0 .../{common_plat => }/validation/api/pktio/pktio.h | 0 .../validation/api/pktio/pktio_main.c | 0 .../validation/api/pool/.gitignore | 0 .../validation/api/pool/Makefile.am | 2 +- test/{common_plat => }/validation/api/pool/pool.c | 0 test/{common_plat => }/validation/api/pool/pool.h | 0 .../validation/api/pool/pool_main.c | 0 .../validation/api/queue/.gitignore | 0 .../validation/api/queue/Makefile.am | 2 +- .../{common_plat => }/validation/api/queue/queue.c | 0 .../{common_plat => }/validation/api/queue/queue.h | 0 .../validation/api/queue/queue_main.c | 0 .../validation/api/random/.gitignore | 0 .../validation/api/random/Makefile.am | 2 +- .../validation/api/random/random.c | 0 .../validation/api/random/random.h | 0 .../validation/api/random/random_main.c | 0 .../validation/api/scheduler/.gitignore | 0 .../validation/api/scheduler/Makefile.am | 2 +- .../validation/api/scheduler/scheduler.c | 0 .../validation/api/scheduler/scheduler.h | 0 .../validation/api/scheduler/scheduler_main.c | 0 .../validation/api/shmem/.gitignore | 0 .../validation/api/shmem/Makefile.am | 2 +- .../{common_plat => }/validation/api/shmem/shmem.c | 0 .../{common_plat => }/validation/api/shmem/shmem.h | 0 .../validation/api/shmem/shmem_main.c | 0 .../validation/api/std_clib/.gitignore | 0 .../validation/api/std_clib/Makefile.am | 2 +- .../validation/api/std_clib/std_clib.c | 0 .../validation/api/std_clib/std_clib.h | 0 .../validation/api/std_clib/std_clib_main.c | 0 .../validation/api/system/.gitignore | 0 .../validation/api/system/Makefile.am | 2 +- .../validation/api/system/system.c | 0 .../validation/api/system/system.h | 0 .../validation/api/system/system_main.c | 0 .../validation/api/thread/.gitignore | 0 .../validation/api/thread/Makefile.am | 2 +- .../validation/api/thread/thread.c | 0 .../validation/api/thread/thread.h | 0 .../validation/api/thread/thread_main.c | 0 .../validation/api/time/.gitignore | 0 .../validation/api/time/Makefile.am | 2 +- test/{common_plat => }/validation/api/time/time.c | 0 test/{common_plat => }/validation/api/time/time.sh | 2 +- .../validation/api/time/time_main.c | 0 .../validation/api/time/time_test.h | 0 .../validation/api/timer/.gitignore | 0 .../validation/api/timer/Makefile.am | 2 +- .../{common_plat => }/validation/api/timer/timer.c | 0 .../{common_plat => }/validation/api/timer/timer.h | 0 .../validation/api/timer/timer_main.c | 0 .../validation/api/traffic_mngr/.gitignore | 0 .../validation/api/traffic_mngr/Makefile.am | 2 +- .../validation/api/traffic_mngr/traffic_mngr.c | 0 .../validation/api/traffic_mngr/traffic_mngr.h | 0 .../validation/api/traffic_mngr/traffic_mngr.sh | 2 +- .../api/traffic_mngr/traffic_mngr_main.c | 0 .../api/pktio => validation/drv}/.gitignore | 0 test/{common_plat => }/validation/drv/Makefile.am | 0 test/validation/drv/Makefile.inc | 1 + test/{common_plat => }/validation/drv/README | 0 .../validation/drv/drvatomic/.gitignore | 0 .../validation/drv/drvatomic/Makefile.am | 0 .../validation/drv/drvatomic/drvatomic.c | 0 .../validation/drv/drvatomic/drvatomic.h | 0 .../validation/drv/drvatomic/drvatomic_main.c | 0 .../validation/drv/drvshmem/.gitignore | 0 .../validation/drv/drvshmem/Makefile.am | 0 .../validation/drv/drvshmem/drvshmem.c | 0 .../validation/drv/drvshmem/drvshmem.h | 0 .../validation/drv/drvshmem/drvshmem_main.c | 0 312 files changed, 1204 insertions(+), 1027 deletions(-) rename {pkgconfig => helper}/libodphelper.pc.in (100%) delete mode 100644 helper/test/linux/Makefile.am create mode 100644 include/Makefile.am create mode 100644 m4/odp_atomic.m4 create mode 100644 m4/odp_openssl.m4 rename {platform/linux-generic/m4 => m4}/odp_timer.m4 (63%) create mode 100644 m4/odp_visibility.m4 rename {pkgconfig => platform/linux-generic}/libodp-linux.pc.in (100%) delete mode 100644 platform/linux-generic/m4/odp_openssl.m4 rename {test => platform}/linux-generic/m4/performance.m4 (93%) rename {test/linux-generic => platform/linux-generic/test}/.gitignore (100%) create mode 100644 platform/linux-generic/test/Makefile.am rename {test/linux-generic => platform/linux-generic/test}/Makefile.inc (82%) rename {test/linux-generic => platform/linux-generic/test}/mmap_vlan_ins/.gitignore (100%) rename {test/linux-generic => platform/linux-generic/test}/mmap_vlan_ins/Makefile.am (88%) rename {test/linux-generic => platform/linux-generic/test}/mmap_vlan_ins/mmap_vlan_ins.c (100%) rename {test/linux-generic => platform/linux-generic/test}/mmap_vlan_ins/mmap_vlan_ins.sh (100%) rename {test/linux-generic => platform/linux-generic/test}/mmap_vlan_ins/pktio_env (100%) rename {test/linux-generic => platform/linux-generic/test}/mmap_vlan_ins/vlan.pcap (100%) rename {test/common_plat/validation/api => platform/linux-generic/test/performance}/.gitignore (100%) rename {test/linux-generic => platform/linux-generic/test}/performance/Makefile.am (100%) rename {test/linux-generic => platform/linux-generic/test}/performance/odp_scheduling_run_proc.sh (90%) rename {test/linux-generic => platform/linux-generic/test}/pktio_ipc/.gitignore (100%) rename {test/linux-generic => platform/linux-generic/test}/pktio_ipc/Makefile.am (100%) rename {test/linux-generic => platform/linux-generic/test}/pktio_ipc/ipc_common.c (100%) rename {test/linux-generic => platform/linux-generic/test}/pktio_ipc/ipc_common.h (100%) rename {test/linux-generic => platform/linux-generic/test}/pktio_ipc/pktio_ipc1.c (100%) rename {test/linux-generic => platform/linux-generic/test}/pktio_ipc/pktio_ipc2.c (100%) rename {test/linux-generic => platform/linux-generic/test}/pktio_ipc/pktio_ipc_run.sh (100%) rename {test/linux-generic => platform/linux-generic/test}/ring/.gitignore (100%) rename {test/linux-generic => platform/linux-generic/test}/ring/Makefile.am (89%) rename {test/linux-generic => platform/linux-generic/test}/ring/ring_basic.c (100%) rename {test/linux-generic => platform/linux-generic/test}/ring/ring_main.c (100%) rename {test/linux-generic => platform/linux-generic/test}/ring/ring_stress.c (100%) rename {test/linux-generic => platform/linux-generic/test}/ring/ring_suites.c (100%) rename {test/linux-generic => platform/linux-generic/test}/ring/ring_suites.h (100%) create mode 100644 platform/linux-generic/test/validation/Makefile.inc create mode 100644 platform/linux-generic/test/validation/api/Makefile.inc rename {test/common_plat/validation/drv => platform/linux-generic/test/validation/api/pktio}/.gitignore (100%) rename {test/linux-generic => platform/linux-generic/test}/validation/api/pktio/Makefile.am (100%) rename {test/linux-generic => platform/linux-generic/test}/validation/api/pktio/pktio_env (100%) rename {test/linux-generic => platform/linux-generic/test}/validation/api/pktio/pktio_run.sh (97%) rename {test/linux-generic => platform/linux-generic/test}/validation/api/pktio/pktio_run_dpdk.sh (97%) rename {test/linux-generic => platform/linux-generic/test}/validation/api/pktio/pktio_run_netmap.sh (97%) rename {test/linux-generic => platform/linux-generic/test}/validation/api/pktio/pktio_run_pcap.sh (93%) rename {test/linux-generic => platform/linux-generic/test}/validation/api/pktio/pktio_run_tap.sh (97%) rename {test/linux-generic => platform/linux-generic/test}/validation/api/shmem/.gitignore (100%) rename {test/linux-generic => platform/linux-generic/test}/validation/api/shmem/Makefile.am (90%) rename {test/linux-generic => platform/linux-generic/test}/validation/api/shmem/shmem_common.h (100%) rename {test/linux-generic => platform/linux-generic/test}/validation/api/shmem/shmem_linux.c (97%) rename {test/linux-generic => platform/linux-generic/test}/validation/api/shmem/shmem_linux.h (100%) rename {test/linux-generic => platform/linux-generic/test}/validation/api/shmem/shmem_odp1.c (100%) rename {test/linux-generic => platform/linux-generic/test}/validation/api/shmem/shmem_odp1.h (100%) rename {test/linux-generic => platform/linux-generic/test}/validation/api/shmem/shmem_odp2.c (100%) rename {test/linux-generic => platform/linux-generic/test}/validation/api/shmem/shmem_odp2.h (100%) rename test/{common_plat => }/common/Makefile.am (82%) rename test/{common_plat => }/common/mask_common.c (100%) rename test/{common_plat => }/common/mask_common.h (100%) rename test/{common_plat => }/common/odp_cunit_common.c (100%) rename test/{common_plat => }/common/odp_cunit_common.h (100%) rename test/{linux-generic/run-test => common/run-test.sh} (100%) rename test/{ => common}/test_debug.h (100%) delete mode 100644 test/common_plat/Makefile.am delete mode 100644 test/common_plat/m4/configure.m4 delete mode 100644 test/common_plat/validation/Makefile.inc delete mode 100644 test/common_plat/validation/api/Makefile.am delete mode 100644 test/common_plat/validation/drv/Makefile.inc delete mode 100644 test/linux-generic/Makefile.am delete mode 100644 test/linux-generic/m4/configure.m4 delete mode 100644 test/linux-generic/validation/Makefile.inc delete mode 100644 test/linux-generic/validation/api/Makefile.inc rename test/{common_plat => }/m4/miscellaneous.m4 (100%) rename test/{common_plat => }/m4/performance.m4 (100%) rename test/{common_plat => }/m4/validation.m4 (100%) rename test/{common_plat => }/miscellaneous/.gitignore (100%) rename test/{common_plat => }/miscellaneous/Makefile.am (58%) rename test/{common_plat => }/miscellaneous/odp_api_from_cpp.cpp (100%) rename test/{common_plat => }/performance/.gitignore (100%) rename test/{common_plat => }/performance/Makefile.am (69%) rename test/{common_plat => }/performance/dummy_crc.h (100%) rename test/{common_plat => }/performance/odp_bench_packet.c (100%) rename test/{common_plat => }/performance/odp_crypto.c (100%) rename test/{common_plat => }/performance/odp_l2fwd.c (100%) rename test/{common_plat => }/performance/odp_l2fwd_run.sh (94%) rename test/{common_plat => }/performance/odp_pktio_ordered.c (100%) rename test/{common_plat => }/performance/odp_pktio_ordered_run.sh (100%) rename test/{common_plat => }/performance/odp_pktio_perf.c (100%) rename test/{common_plat => }/performance/odp_sched_latency.c (100%) rename test/{common_plat => }/performance/odp_sched_latency_run.sh (100%) rename test/{common_plat => }/performance/odp_scheduling.c (100%) rename test/{common_plat => }/performance/odp_scheduling_run.sh (100%) rename test/{common_plat => }/performance/udp64.pcap (100%) rename test/{common_plat => }/validation/Makefile.am (100%) rename test/{common_plat/validation/api => validation}/Makefile.inc (61%) rename test/{linux-generic/performance => validation/api}/.gitignore (100%) create mode 100644 test/validation/api/Makefile.am create mode 100644 test/validation/api/Makefile.inc rename test/{common_plat => }/validation/api/README (100%) rename test/{common_plat => }/validation/api/atomic/.gitignore (100%) rename test/{common_plat => }/validation/api/atomic/Makefile.am (77%) rename test/{common_plat => }/validation/api/atomic/atomic.c (100%) rename test/{common_plat => }/validation/api/atomic/atomic.h (100%) rename test/{common_plat => }/validation/api/atomic/atomic_main.c (100%) rename test/{common_plat => }/validation/api/barrier/.gitignore (100%) rename test/{common_plat => }/validation/api/barrier/Makefile.am (77%) rename test/{common_plat => }/validation/api/barrier/barrier.c (100%) rename test/{common_plat => }/validation/api/barrier/barrier.h (100%) rename test/{common_plat => }/validation/api/barrier/barrier_main.c (100%) rename test/{common_plat => }/validation/api/buffer/.gitignore (100%) rename test/{common_plat => }/validation/api/buffer/Makefile.am (77%) rename test/{common_plat => }/validation/api/buffer/buffer.c (100%) rename test/{common_plat => }/validation/api/buffer/buffer.h (100%) rename test/{common_plat => }/validation/api/buffer/buffer_main.c (100%) rename test/{common_plat => }/validation/api/chksum/.gitignore (100%) rename test/{common_plat => }/validation/api/chksum/Makefile.am (100%) rename test/{common_plat => }/validation/api/chksum/chksum.c (100%) rename test/{common_plat => }/validation/api/chksum/chksum.h (100%) rename test/{common_plat => }/validation/api/chksum/chksum_main.c (100%) rename test/{common_plat => }/validation/api/classification/.gitignore (100%) rename test/{common_plat => }/validation/api/classification/Makefile.am (89%) rename test/{common_plat => }/validation/api/classification/classification.c (100%) rename test/{common_plat => }/validation/api/classification/classification.h (100%) rename test/{common_plat => }/validation/api/classification/classification_main.c (100%) rename test/{common_plat => }/validation/api/classification/odp_classification_basic.c (100%) rename test/{common_plat => }/validation/api/classification/odp_classification_common.c (100%) rename test/{common_plat => }/validation/api/classification/odp_classification_test_pmr.c (100%) rename test/{common_plat => }/validation/api/classification/odp_classification_tests.c (100%) rename test/{common_plat => }/validation/api/classification/odp_classification_testsuites.h (100%) rename test/{common_plat => }/validation/api/cpumask/.gitignore (100%) rename test/{common_plat => }/validation/api/cpumask/Makefile.am (80%) rename test/{common_plat => }/validation/api/cpumask/cpumask.c (100%) rename test/{common_plat => }/validation/api/cpumask/cpumask.h (100%) rename test/{common_plat => }/validation/api/cpumask/cpumask_main.c (100%) rename test/{common_plat => }/validation/api/crypto/.gitignore (100%) rename test/{common_plat => }/validation/api/crypto/Makefile.am (87%) rename test/{common_plat => }/validation/api/crypto/crypto.c (100%) rename test/{common_plat => }/validation/api/crypto/crypto.h (100%) rename test/{common_plat => }/validation/api/crypto/crypto_main.c (100%) rename test/{common_plat => }/validation/api/crypto/odp_crypto_test_inp.c (100%) rename test/{common_plat => }/validation/api/crypto/odp_crypto_test_inp.h (100%) rename test/{common_plat => }/validation/api/crypto/test_vectors.h (100%) rename test/{common_plat => }/validation/api/crypto/test_vectors_len.h (100%) rename test/{common_plat => }/validation/api/errno/.gitignore (100%) rename test/{common_plat => }/validation/api/errno/Makefile.am (77%) rename test/{common_plat => }/validation/api/errno/errno.c (100%) rename test/{common_plat => }/validation/api/errno/errno.h (100%) rename test/{common_plat => }/validation/api/errno/errno_main.c (100%) rename test/{common_plat => }/validation/api/hash/.gitignore (100%) rename test/{common_plat => }/validation/api/hash/Makefile.am (77%) rename test/{common_plat => }/validation/api/hash/hash.c (100%) rename test/{common_plat => }/validation/api/hash/hash.h (100%) rename test/{common_plat => }/validation/api/hash/hash_main.c (100%) rename test/{common_plat => }/validation/api/init/.gitignore (100%) rename test/{common_plat => }/validation/api/init/Makefile.am (85%) rename test/{common_plat => }/validation/api/init/init.c (100%) rename test/{common_plat => }/validation/api/init/init.h (100%) rename test/{common_plat => }/validation/api/init/init_main_abort.c (100%) rename test/{common_plat => }/validation/api/init/init_main_log.c (100%) rename test/{common_plat => }/validation/api/init/init_main_ok.c (100%) rename test/{common_plat => }/validation/api/ipsec/.gitignore (100%) rename test/{common_plat => }/validation/api/ipsec/Makefile.am (100%) rename test/{common_plat => }/validation/api/ipsec/ipsec.c (100%) rename test/{common_plat => }/validation/api/ipsec/ipsec.h (100%) rename test/{common_plat => }/validation/api/ipsec/ipsec_async.c (100%) rename test/{common_plat => }/validation/api/ipsec/ipsec_inline_in.c (100%) rename test/{common_plat => }/validation/api/ipsec/ipsec_inline_out.c (100%) rename test/{common_plat => }/validation/api/ipsec/ipsec_sync.c (100%) rename test/{common_plat => }/validation/api/ipsec/ipsec_sync_in.c (100%) rename test/{common_plat => }/validation/api/ipsec/ipsec_test_in.c (100%) rename test/{common_plat => }/validation/api/ipsec/ipsec_test_out.c (100%) rename test/{common_plat => }/validation/api/ipsec/test_vectors.h (100%) rename test/{common_plat => }/validation/api/lock/.gitignore (100%) rename test/{common_plat => }/validation/api/lock/Makefile.am (77%) rename test/{common_plat => }/validation/api/lock/lock.c (100%) rename test/{common_plat => }/validation/api/lock/lock.h (100%) rename test/{common_plat => }/validation/api/lock/lock_main.c (100%) rename test/{common_plat => }/validation/api/packet/.gitignore (100%) rename test/{common_plat => }/validation/api/packet/Makefile.am (77%) rename test/{common_plat => }/validation/api/packet/packet.c (98%) rename test/{common_plat => }/validation/api/packet/packet.h (100%) rename test/{common_plat => }/validation/api/packet/packet_main.c (100%) rename test/{common_plat => }/validation/api/pktio/.gitignore (100%) rename test/{common_plat => }/validation/api/pktio/Makefile.am (79%) rename test/{common_plat => }/validation/api/pktio/parser.c (100%) rename test/{common_plat => }/validation/api/pktio/parser.h (100%) rename test/{common_plat => }/validation/api/pktio/pktio.c (100%) rename test/{common_plat => }/validation/api/pktio/pktio.h (100%) rename test/{common_plat => }/validation/api/pktio/pktio_main.c (100%) rename test/{common_plat => }/validation/api/pool/.gitignore (100%) rename test/{common_plat => }/validation/api/pool/Makefile.am (77%) rename test/{common_plat => }/validation/api/pool/pool.c (100%) rename test/{common_plat => }/validation/api/pool/pool.h (100%) rename test/{common_plat => }/validation/api/pool/pool_main.c (100%) rename test/{common_plat => }/validation/api/queue/.gitignore (100%) rename test/{common_plat => }/validation/api/queue/Makefile.am (77%) rename test/{common_plat => }/validation/api/queue/queue.c (100%) rename test/{common_plat => }/validation/api/queue/queue.h (100%) rename test/{common_plat => }/validation/api/queue/queue_main.c (100%) rename test/{common_plat => }/validation/api/random/.gitignore (100%) rename test/{common_plat => }/validation/api/random/Makefile.am (77%) rename test/{common_plat => }/validation/api/random/random.c (100%) rename test/{common_plat => }/validation/api/random/random.h (100%) rename test/{common_plat => }/validation/api/random/random_main.c (100%) rename test/{common_plat => }/validation/api/scheduler/.gitignore (100%) rename test/{common_plat => }/validation/api/scheduler/Makefile.am (78%) rename test/{common_plat => }/validation/api/scheduler/scheduler.c (100%) rename test/{common_plat => }/validation/api/scheduler/scheduler.h (100%) rename test/{common_plat => }/validation/api/scheduler/scheduler_main.c (100%) rename test/{common_plat => }/validation/api/shmem/.gitignore (100%) rename test/{common_plat => }/validation/api/shmem/Makefile.am (77%) rename test/{common_plat => }/validation/api/shmem/shmem.c (100%) rename test/{common_plat => }/validation/api/shmem/shmem.h (100%) rename test/{common_plat => }/validation/api/shmem/shmem_main.c (100%) rename test/{common_plat => }/validation/api/std_clib/.gitignore (100%) rename test/{common_plat => }/validation/api/std_clib/Makefile.am (77%) rename test/{common_plat => }/validation/api/std_clib/std_clib.c (100%) rename test/{common_plat => }/validation/api/std_clib/std_clib.h (100%) rename test/{common_plat => }/validation/api/std_clib/std_clib_main.c (100%) rename test/{common_plat => }/validation/api/system/.gitignore (100%) rename test/{common_plat => }/validation/api/system/Makefile.am (77%) rename test/{common_plat => }/validation/api/system/system.c (100%) rename test/{common_plat => }/validation/api/system/system.h (100%) rename test/{common_plat => }/validation/api/system/system_main.c (100%) rename test/{common_plat => }/validation/api/thread/.gitignore (100%) rename test/{common_plat => }/validation/api/thread/Makefile.am (84%) rename test/{common_plat => }/validation/api/thread/thread.c (100%) rename test/{common_plat => }/validation/api/thread/thread.h (100%) rename test/{common_plat => }/validation/api/thread/thread_main.c (100%) rename test/{common_plat => }/validation/api/time/.gitignore (100%) rename test/{common_plat => }/validation/api/time/Makefile.am (89%) rename test/{common_plat => }/validation/api/time/time.c (100%) rename test/{common_plat => }/validation/api/time/time.sh (93%) rename test/{common_plat => }/validation/api/time/time_main.c (100%) rename test/{common_plat => }/validation/api/time/time_test.h (100%) rename test/{common_plat => }/validation/api/timer/.gitignore (100%) rename test/{common_plat => }/validation/api/timer/Makefile.am (77%) rename test/{common_plat => }/validation/api/timer/timer.c (100%) rename test/{common_plat => }/validation/api/timer/timer.h (100%) rename test/{common_plat => }/validation/api/timer/timer_main.c (100%) rename test/{common_plat => }/validation/api/traffic_mngr/.gitignore (100%) rename test/{common_plat => }/validation/api/traffic_mngr/Makefile.am (89%) rename test/{common_plat => }/validation/api/traffic_mngr/traffic_mngr.c (100%) rename test/{common_plat => }/validation/api/traffic_mngr/traffic_mngr.h (100%) rename test/{common_plat => }/validation/api/traffic_mngr/traffic_mngr.sh (93%) rename test/{common_plat => }/validation/api/traffic_mngr/traffic_mngr_main.c (100%) rename test/{linux-generic/validation/api/pktio => validation/drv}/.gitignore (100%) rename test/{common_plat => }/validation/drv/Makefile.am (100%) create mode 100644 test/validation/drv/Makefile.inc rename test/{common_plat => }/validation/drv/README (100%) rename test/{common_plat => }/validation/drv/drvatomic/.gitignore (100%) rename test/{common_plat => }/validation/drv/drvatomic/Makefile.am (100%) rename test/{common_plat => }/validation/drv/drvatomic/drvatomic.c (100%) rename test/{common_plat => }/validation/drv/drvatomic/drvatomic.h (100%) rename test/{common_plat => }/validation/drv/drvatomic/drvatomic_main.c (100%) rename test/{common_plat => }/validation/drv/drvshmem/.gitignore (100%) rename test/{common_plat => }/validation/drv/drvshmem/Makefile.am (100%) rename test/{common_plat => }/validation/drv/drvshmem/drvshmem.c (100%) rename test/{common_plat => }/validation/drv/drvshmem/drvshmem.h (100%) rename test/{common_plat => }/validation/drv/drvshmem/drvshmem_main.c (100%) hooks/post-receive --

8 years, 4 months

[COMMIT] branch master updated. v1.15.0.0-286-g54228421

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 54228421977f94d9da752290540c6ec4dc5306a0 (commit) via 605e77187211dbb0716e4124f249c7f0f88567f7 (commit) via 940c54bbd1c0c16ea2b6a6f6737d151deeba1e43 (commit) via 91ceea49a975c6fcd61ab1c992a502350d673eeb (commit) via b46702e5ef368c9aaf9d6cea7d32b07adb881ce3 (commit) via 48dfcade1602e9cc9bb8cd3251037508aef146cd (commit) via 2aa9a05b11bdfac0c0126384d4677b3f9c561a78 (commit) via df978d9b4e766c8e1cb1a88a28d98318840fee22 (commit) via 482eeee380d40596131826c1103ed89247bd17e5 (commit) via 254190ffcdb51549ee23846f33fd45513656b78c (commit) via 52877c96e12bf62614df0482175384565a851083 (commit) via 133e7fc06147486fff5ab3393b1a791ab97d19d3 (commit) via 8c9ce8c63eed9d01fec54c09bd17040914abd623 (commit) via 2b57c7d7b96eef16c36b8b0020b3dd78acc82660 (commit) via cbced85824c4c03c0b35396d559ebfb187237569 (commit) via 1217fbaed0aee2ee395c131bb7fd2e201214ed31 (commit) via 927b57f21124f31e23fd7f72dddcc93a5248ed53 (commit) via 1bcf171f00973bcc21baadf9919a61cd6abdf713 (commit) from ec0c3145fcafa09ae3a79875e7e07dd4794583cc (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 54228421977f94d9da752290540c6ec4dc5306a0 Author: Matias Elo <matias.elo(a)nokia.com> Date: Mon Oct 16 12:29:57 2017 +0300 validation: packet: adjust segmented test packet length Adjust 'segmented_packet_len' so that the test packet pool is able to allocate at least PACKET_POOL_NUM_SEG possibly segmented test packets. Several validation tests allocate new packets, so it is not enough to be able allocate a single segmented packet. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/packet/packet.c b/test/validation/api/packet/packet.c index 64165464..bf8f5f44 100644 --- a/test/validation/api/packet/packet.c +++ b/test/validation/api/packet/packet.c @@ -16,6 +16,11 @@ #define PACKET_TAILROOM_RESERVE 4 /* Number of packets in the test packet pool */ #define PACKET_POOL_NUM 300 +/* Number of large, possibly segmented, test packets */ +#define PACKET_POOL_NUM_SEG 4 +ODP_STATIC_ASSERT(PACKET_POOL_NUM_SEG > 1 && + PACKET_POOL_NUM_SEG < PACKET_POOL_NUM, + "Invalid PACKET_POOL_NUM_SEG value"); static odp_pool_t packet_pool, packet_pool_no_uarea, packet_pool_double_uarea; static uint32_t packet_len; @@ -108,11 +113,13 @@ int packet_suite_init(void) { odp_pool_param_t params; odp_pool_capability_t capa; + odp_packet_t pkt_tbl[PACKET_POOL_NUM_SEG]; struct udata_struct *udat; uint32_t udat_size; uint8_t data = 0; uint32_t i; uint32_t num = PACKET_POOL_NUM; + int ret; if (odp_pool_capability(&capa) < 0) { printf("pool_capability failed\n"); @@ -178,14 +185,26 @@ int packet_suite_init(void) data++; } - /* Try to allocate the largest possible packet to see + /* Try to allocate PACKET_POOL_NUM_SEG largest possible packets to see * if segmentation is supported */ do { - segmented_test_packet = odp_packet_alloc(packet_pool, - segmented_packet_len); - if (segmented_test_packet == ODP_PACKET_INVALID) + ret = odp_packet_alloc_multi(packet_pool, segmented_packet_len, + pkt_tbl, PACKET_POOL_NUM_SEG); + if (ret != PACKET_POOL_NUM_SEG) { + if (ret > 0) + odp_packet_free_multi(pkt_tbl, ret); segmented_packet_len -= capa.pkt.min_seg_len; - } while (segmented_test_packet == ODP_PACKET_INVALID); + continue; + } + } while (ret != PACKET_POOL_NUM_SEG && + segmented_packet_len > capa.pkt.min_seg_len); + + if (ret != PACKET_POOL_NUM_SEG) { + printf("packet alloc failed\n"); + return -1; + } + segmented_test_packet = pkt_tbl[0]; + odp_packet_free_multi(&pkt_tbl[1], PACKET_POOL_NUM_SEG - 1); if (odp_packet_is_valid(test_packet) == 0 || odp_packet_is_valid(segmented_test_packet) == 0) { commit 605e77187211dbb0716e4124f249c7f0f88567f7 Author: Matias Elo <matias.elo(a)nokia.com> Date: Tue Oct 10 09:08:51 2017 +0300 linux-gen: pool: select packet pool segment size at runtime Use stored packet pool segment length (pool_t.seg_len) instead of a define. This enables creating packet pools with different segment sizes. 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_internal.h b/platform/linux-generic/include/odp_packet_internal.h index 73a3e934..3b3dec95 100644 --- a/platform/linux-generic/include/odp_packet_internal.h +++ b/platform/linux-generic/include/odp_packet_internal.h @@ -194,6 +194,7 @@ static inline seg_entry_t *seg_entry_last(odp_packet_hdr_t *hdr) */ static inline void packet_init(odp_packet_hdr_t *pkt_hdr, uint32_t len) { + pool_t *pool = pool_entry_from_hdl(pkt_hdr->buf_hdr.pool_hdl); uint32_t seg_len; int num = pkt_hdr->buf_hdr.segcount; @@ -203,7 +204,7 @@ static inline void packet_init(odp_packet_hdr_t *pkt_hdr, uint32_t len) } else { seg_entry_t *last; - seg_len = len - ((num - 1) * CONFIG_PACKET_MAX_SEG_LEN); + seg_len = len - ((num - 1) * pool->seg_len); /* Last segment data length */ last = seg_entry_last(pkt_hdr); @@ -226,8 +227,7 @@ static inline void packet_init(odp_packet_hdr_t *pkt_hdr, uint32_t len) pkt_hdr->frame_len = len; pkt_hdr->shared_len = 0; pkt_hdr->headroom = CONFIG_PACKET_HEADROOM; - pkt_hdr->tailroom = CONFIG_PACKET_MAX_SEG_LEN - seg_len + - CONFIG_PACKET_TAILROOM; + pkt_hdr->tailroom = pool->seg_len - seg_len + CONFIG_PACKET_TAILROOM; pkt_hdr->input = ODP_PKTIO_INVALID; } diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index 54c98646..94aa01de 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -23,9 +23,6 @@ #include <stdio.h> #include <inttypes.h> -/* Initial packet segment data length */ -#define BASE_LEN CONFIG_PACKET_MAX_SEG_LEN - #include <odp/visibility_begin.h> /* Fill in packet header field offsets for inline functions */ @@ -341,6 +338,7 @@ static inline void link_segments(odp_packet_hdr_t *pkt_hdr[], int num) int cur, i; odp_packet_hdr_t *hdr; odp_packet_hdr_t *head = pkt_hdr[0]; + uint32_t seg_len = pool_entry_from_hdl(head->buf_hdr.pool_hdl)->seg_len; cur = 0; @@ -353,7 +351,7 @@ static inline void link_segments(odp_packet_hdr_t *pkt_hdr[], int num) buf_hdr = &pkt_hdr[cur]->buf_hdr; hdr->buf_hdr.seg[i].hdr = buf_hdr; hdr->buf_hdr.seg[i].data = buf_hdr->base_data; - hdr->buf_hdr.seg[i].len = BASE_LEN; + hdr->buf_hdr.seg[i].len = seg_len; cur++; if (cur == num) { @@ -373,13 +371,15 @@ static inline void link_segments(odp_packet_hdr_t *pkt_hdr[], int num) static inline void init_segments(odp_packet_hdr_t *pkt_hdr[], int num) { odp_packet_hdr_t *hdr; + uint32_t seg_len; /* First segment is the packet descriptor */ hdr = pkt_hdr[0]; + seg_len = pool_entry_from_hdl(hdr->buf_hdr.pool_hdl)->seg_len; /* Defaults for single segment packet */ hdr->buf_hdr.seg[0].data = hdr->buf_hdr.base_data; - hdr->buf_hdr.seg[0].len = BASE_LEN; + hdr->buf_hdr.seg[0].len = seg_len; if (!CONFIG_PACKET_SEG_DISABLED) { hdr->buf_hdr.segcount = num; @@ -399,6 +399,7 @@ static inline void reset_seg(odp_packet_hdr_t *pkt_hdr, int first, int num) void *base; int i; seg_entry_t *seg; + uint32_t seg_len = pool_entry_from_hdl(hdr->buf_hdr.pool_hdl)->seg_len; uint8_t idx; seg_entry_find_idx(&hdr, &idx, first); @@ -406,27 +407,25 @@ static inline void reset_seg(odp_packet_hdr_t *pkt_hdr, int first, int num) for (i = 0; i < num; i++) { base = hdr->buf_hdr.base_data; seg = seg_entry_next(&hdr, &idx); - seg->len = BASE_LEN; + seg->len = seg_len; seg->data = base; } } /* Calculate the number of segments */ -static inline int num_segments(uint32_t len) +static inline int num_segments(uint32_t len, uint32_t seg_len) { - uint32_t max_seg_len; int num; if (CONFIG_PACKET_SEG_DISABLED) return 1; num = 1; - max_seg_len = CONFIG_PACKET_MAX_SEG_LEN; - if (odp_unlikely(len > max_seg_len)) { - num = len / max_seg_len; + if (odp_unlikely(len > seg_len)) { + num = len / seg_len; - if (odp_likely((num * max_seg_len) != len)) + if (odp_likely((num * seg_len) != len)) num += 1; } @@ -793,7 +792,7 @@ int packet_alloc_multi(odp_pool_t pool_hdl, uint32_t len, pool_t *pool = pool_entry_from_hdl(pool_hdl); int num, num_seg; - num_seg = num_segments(len); + num_seg = num_segments(len, pool->seg_len); num = packet_alloc(pool, len, max_num, num_seg, pkt); return num; @@ -813,7 +812,7 @@ odp_packet_t odp_packet_alloc(odp_pool_t pool_hdl, uint32_t len) if (odp_unlikely(len > pool->max_len)) return ODP_PACKET_INVALID; - num_seg = num_segments(len); + num_seg = num_segments(len, pool->seg_len); num = packet_alloc(pool, len, 1, num_seg, &pkt); if (odp_unlikely(num == 0)) @@ -836,7 +835,7 @@ int odp_packet_alloc_multi(odp_pool_t pool_hdl, uint32_t len, if (odp_unlikely(len > pool->max_len)) return -1; - num_seg = num_segments(len); + num_seg = num_segments(len, pool->seg_len); num = packet_alloc(pool, len, max_num, num_seg, pkt); return num; @@ -977,7 +976,7 @@ int odp_packet_extend_head(odp_packet_t *pkt, uint32_t len, if (odp_unlikely((frame_len + len) > pool->max_len)) return -1; - num = num_segments(len - headroom); + num = num_segments(len - headroom, pool->seg_len); push_head(pkt_hdr, headroom); ptr = add_segments(pkt_hdr, pool, len - headroom, num, 1); @@ -1079,7 +1078,7 @@ int odp_packet_extend_tail(odp_packet_t *pkt, uint32_t len, if (odp_unlikely((frame_len + len) > pool->max_len)) return -1; - num = num_segments(len - tailroom); + num = num_segments(len - tailroom, pool->seg_len); push_tail(pkt_hdr, tailroom); ptr = add_segments(pkt_hdr, pool, len - tailroom, num, 0); diff --git a/platform/linux-generic/odp_pool.c b/platform/linux-generic/odp_pool.c index ab26bbf8..3e47993c 100644 --- a/platform/linux-generic/odp_pool.c +++ b/platform/linux-generic/odp_pool.c @@ -382,12 +382,33 @@ static odp_pool_t pool_create(const char *name, odp_pool_param_t *params, break; case ODP_POOL_PACKET: + seg_len = CONFIG_PACKET_MAX_SEG_LEN; + max_len = CONFIG_PACKET_MAX_LEN; + + if (params->pkt.len && + params->pkt.len < CONFIG_PACKET_MAX_SEG_LEN) + seg_len = params->pkt.len; + if (params->pkt.seg_len && params->pkt.seg_len > seg_len) + seg_len = params->pkt.seg_len; + if (seg_len < CONFIG_PACKET_SEG_LEN_MIN) + seg_len = CONFIG_PACKET_SEG_LEN_MIN; + + /* Make sure that at least one 'max_len' packet can fit in the + * pool. */ + if (params->pkt.max_len != 0) + max_len = params->pkt.max_len; + if ((max_len + seg_len - 1) / seg_len > CONFIG_PACKET_MAX_SEGS) + seg_len = (max_len + CONFIG_PACKET_MAX_SEGS - 1) / + CONFIG_PACKET_MAX_SEGS; + if (seg_len > CONFIG_PACKET_MAX_SEG_LEN) { + ODP_ERR("Pool unable to store 'max_len' packet"); + return ODP_POOL_INVALID; + } + headroom = CONFIG_PACKET_HEADROOM; tailroom = CONFIG_PACKET_TAILROOM; num = params->pkt.num; uarea_size = params->pkt.uarea_size; - seg_len = CONFIG_PACKET_MAX_SEG_LEN; - max_len = CONFIG_PACKET_MAX_LEN; break; case ODP_POOL_TIMEOUT: @@ -887,7 +908,7 @@ int odp_pool_capability(odp_pool_capability_t *capa) capa->pkt.min_headroom = CONFIG_PACKET_HEADROOM; capa->pkt.min_tailroom = CONFIG_PACKET_TAILROOM; capa->pkt.max_segs_per_pkt = CONFIG_PACKET_MAX_SEGS; - capa->pkt.min_seg_len = max_seg_len; + capa->pkt.min_seg_len = CONFIG_PACKET_SEG_LEN_MIN; capa->pkt.max_seg_len = max_seg_len; capa->pkt.max_uarea_size = MAX_SIZE; diff --git a/platform/linux-generic/pktio/netmap.c b/platform/linux-generic/pktio/netmap.c index 4d771fcb..4c72a658 100644 --- a/platform/linux-generic/pktio/netmap.c +++ b/platform/linux-generic/pktio/netmap.c @@ -350,7 +350,7 @@ static int netmap_open(odp_pktio_t id ODP_UNUSED, pktio_entry_t *pktio_entry, pkt_nm->pool = pool; /* max frame len taking into account the l2-offset */ - pkt_nm->max_frame_len = CONFIG_PACKET_MAX_SEG_LEN; + pkt_nm->max_frame_len = pool_entry_from_hdl(pool)->max_len; /* allow interface to be opened with or without the 'netmap:' prefix */ prefix = "netmap:"; commit 940c54bbd1c0c16ea2b6a6f6737d151deeba1e43 Author: Matias Elo <matias.elo(a)nokia.com> Date: Wed Oct 11 10:41:12 2017 +0300 linux-gen: packet: fix build error with single segment packet header Fix invalid gcc error ('array subscript is above array bounds') when CONFIG_PACKET_SEGS_PER_HDR is set to one. Tested with gcc 5.4.0. 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/odp_packet.c b/platform/linux-generic/odp_packet.c index abd06044..54c98646 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -2151,7 +2151,10 @@ odp_packet_t odp_packet_ref(odp_packet_t pkt, uint32_t offset) link_hdr->buf_hdr.seg[0].len = seg->len - seg_offset; buffer_ref_inc(seg->hdr); - for (i = 1; i < num_copy; i++) { + /* The 'CONFIG_PACKET_SEGS_PER_HDR > 1' condition is required to fix an + * invalid error ('array subscript is above array bounds') thrown by + * gcc (5.4.0). */ + for (i = 1; CONFIG_PACKET_SEGS_PER_HDR > 1 && i < num_copy; i++) { /* Update link header reference count */ if (idx == 0 && seg_is_link(hdr)) buffer_ref_inc((odp_buffer_hdr_t *)hdr); commit 91ceea49a975c6fcd61ab1c992a502350d673eeb Author: Matias Elo <matias.elo(a)nokia.com> Date: Thu Oct 12 16:28:04 2017 +0300 linux-gen: pool: modify packet pool config defines Use separate defines for the maximum number of segments per packet (CONFIG_PACKET_MAX_SEGS) and the number of segments stored in a packet header (CONFIG_PACKET_SEGS_PER_HDR). A separate define is also added for the maximum packet length. 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_buffer_internal.h b/platform/linux-generic/include/odp_buffer_internal.h index 5d40303b..aefb1352 100644 --- a/platform/linux-generic/include/odp_buffer_internal.h +++ b/platform/linux-generic/include/odp_buffer_internal.h @@ -71,7 +71,7 @@ struct odp_buffer_hdr_t { /* --- 40 bytes --- */ /* Segments */ - seg_entry_t seg[CONFIG_PACKET_MAX_SEGS]; + seg_entry_t seg[CONFIG_PACKET_SEGS_PER_HDR]; /* Burst counts */ uint8_t burst_num; @@ -122,8 +122,8 @@ struct odp_buffer_hdr_t { uint8_t data[0]; } ODP_ALIGNED_CACHE; -ODP_STATIC_ASSERT(CONFIG_PACKET_MAX_SEGS < 256, - "CONFIG_PACKET_MAX_SEGS_TOO_LARGE"); +ODP_STATIC_ASSERT(CONFIG_PACKET_SEGS_PER_HDR < 256, + "CONFIG_PACKET_SEGS_PER_HDR_TOO_LARGE"); ODP_STATIC_ASSERT(BUFFER_BURST_SIZE < 256, "BUFFER_BURST_SIZE_TOO_LARGE"); diff --git a/platform/linux-generic/include/odp_config_internal.h b/platform/linux-generic/include/odp_config_internal.h index a798851f..598f26e1 100644 --- a/platform/linux-generic/include/odp_config_internal.h +++ b/platform/linux-generic/include/odp_config_internal.h @@ -75,7 +75,22 @@ extern "C" { /* * Maximum number of segments per packet */ -#define CONFIG_PACKET_MAX_SEGS 6 +#define CONFIG_PACKET_MAX_SEGS 255 + +/* + * Packet segmentation disabled + */ +#define CONFIG_PACKET_SEG_DISABLED (CONFIG_PACKET_MAX_SEGS == 1) + +/* + * Number of segments stored in a packet header + */ +#define CONFIG_PACKET_SEGS_PER_HDR 6 + +/* + * Maximum packet data length in bytes + */ +#define CONFIG_PACKET_MAX_LEN (64 * 1024) /* * Maximum packet segment size including head- and tailrooms diff --git a/platform/linux-generic/include/odp_packet_internal.h b/platform/linux-generic/include/odp_packet_internal.h index 15cb53f4..73a3e934 100644 --- a/platform/linux-generic/include/odp_packet_internal.h +++ b/platform/linux-generic/include/odp_packet_internal.h @@ -197,7 +197,7 @@ static inline void packet_init(odp_packet_hdr_t *pkt_hdr, uint32_t len) uint32_t seg_len; int num = pkt_hdr->buf_hdr.segcount; - if (odp_likely(CONFIG_PACKET_MAX_SEGS == 1 || num == 1)) { + if (odp_likely(CONFIG_PACKET_SEG_DISABLED || num == 1)) { seg_len = len; pkt_hdr->buf_hdr.seg[0].len = len; } else { diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index c330c629..abd06044 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -179,7 +179,7 @@ static inline void *packet_seg_data(odp_packet_hdr_t *pkt_hdr, uint32_t seg_idx) static inline uint16_t packet_last_seg(odp_packet_hdr_t *pkt_hdr) { - if (CONFIG_PACKET_MAX_SEGS == 1) + if (CONFIG_PACKET_SEG_DISABLED) return 0; else return pkt_hdr->buf_hdr.segcount - 1; @@ -291,7 +291,7 @@ static inline void *packet_map(odp_packet_hdr_t *pkt_hdr, if (odp_unlikely(offset >= pkt_hdr->frame_len)) return NULL; - if (odp_likely(CONFIG_PACKET_MAX_SEGS == 1 || seg_count == 1)) { + if (odp_likely(CONFIG_PACKET_SEG_DISABLED || seg_count == 1)) { addr = pkt_hdr->buf_hdr.seg[0].data + offset; len = pkt_hdr->buf_hdr.seg[0].len - offset; } else { @@ -347,7 +347,7 @@ static inline void link_segments(odp_packet_hdr_t *pkt_hdr[], int num) while (1) { hdr = pkt_hdr[cur]; - for (i = 0; i < CONFIG_PACKET_MAX_SEGS; i++) { + for (i = 0; i < CONFIG_PACKET_SEGS_PER_HDR; i++) { odp_buffer_hdr_t *buf_hdr; buf_hdr = &pkt_hdr[cur]->buf_hdr; @@ -365,7 +365,7 @@ static inline void link_segments(odp_packet_hdr_t *pkt_hdr[], int num) } } - hdr->buf_hdr.num_seg = CONFIG_PACKET_MAX_SEGS; + hdr->buf_hdr.num_seg = CONFIG_PACKET_SEGS_PER_HDR; hdr->buf_hdr.next_seg = pkt_hdr[cur]; } } @@ -377,22 +377,19 @@ static inline void init_segments(odp_packet_hdr_t *pkt_hdr[], int num) /* First segment is the packet descriptor */ hdr = pkt_hdr[0]; + /* Defaults for single segment packet */ hdr->buf_hdr.seg[0].data = hdr->buf_hdr.base_data; hdr->buf_hdr.seg[0].len = BASE_LEN; - /* Link segments */ - if (CONFIG_PACKET_MAX_SEGS != 1) { + if (!CONFIG_PACKET_SEG_DISABLED) { hdr->buf_hdr.segcount = num; - - /* Defaults for single segment packet */ hdr->buf_hdr.num_seg = 1; hdr->buf_hdr.next_seg = NULL; hdr->buf_hdr.last_seg = &hdr->buf_hdr; - if (odp_unlikely(num > 1)) { + /* Link segments */ + if (odp_unlikely(num > 1)) link_segments(pkt_hdr, num); - - } } } @@ -420,7 +417,7 @@ static inline int num_segments(uint32_t len) uint32_t max_seg_len; int num; - if (CONFIG_PACKET_MAX_SEGS == 1) + if (CONFIG_PACKET_SEG_DISABLED) return 1; num = 1; @@ -850,7 +847,7 @@ void odp_packet_free(odp_packet_t pkt) odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); int num_seg = pkt_hdr->buf_hdr.segcount; - if (odp_likely(CONFIG_PACKET_MAX_SEGS == 1 || num_seg == 1)) { + if (odp_likely(CONFIG_PACKET_SEG_DISABLED || num_seg == 1)) { odp_buffer_hdr_t *buf_hdr[2]; int num = 1; @@ -1027,7 +1024,7 @@ int odp_packet_trunc_head(odp_packet_t *pkt, uint32_t len, if (len < seg_len) { pull_head(pkt_hdr, len); - } else if (CONFIG_PACKET_MAX_SEGS != 1) { + } else if (!CONFIG_PACKET_SEG_DISABLED) { int num = 0; uint32_t pull_len = 0; @@ -1131,7 +1128,7 @@ int odp_packet_trunc_tail(odp_packet_t *pkt, uint32_t len, if (len < seg_len) { pull_tail(pkt_hdr, len); - } else if (CONFIG_PACKET_MAX_SEGS != 1) { + } else if (!CONFIG_PACKET_SEG_DISABLED) { int num = 0; uint32_t pull_len = 0; diff --git a/platform/linux-generic/odp_pool.c b/platform/linux-generic/odp_pool.c index 44a40e83..ab26bbf8 100644 --- a/platform/linux-generic/odp_pool.c +++ b/platform/linux-generic/odp_pool.c @@ -386,8 +386,8 @@ static odp_pool_t pool_create(const char *name, odp_pool_param_t *params, tailroom = CONFIG_PACKET_TAILROOM; num = params->pkt.num; uarea_size = params->pkt.uarea_size; - seg_len = CONFIG_PACKET_MAX_SEG_LEN; - max_len = CONFIG_PACKET_MAX_SEGS * seg_len; + seg_len = CONFIG_PACKET_MAX_SEG_LEN; + max_len = CONFIG_PACKET_MAX_LEN; break; case ODP_POOL_TIMEOUT: @@ -882,7 +882,7 @@ int odp_pool_capability(odp_pool_capability_t *capa) /* Packet pools */ capa->pkt.max_pools = ODP_CONFIG_POOLS; - capa->pkt.max_len = CONFIG_PACKET_MAX_SEGS * max_seg_len; + capa->pkt.max_len = CONFIG_PACKET_MAX_LEN; capa->pkt.max_num = CONFIG_POOL_MAX_NUM; capa->pkt.min_headroom = CONFIG_PACKET_HEADROOM; capa->pkt.min_tailroom = CONFIG_PACKET_TAILROOM; commit b46702e5ef368c9aaf9d6cea7d32b07adb881ce3 Author: Matias Elo <matias.elo(a)nokia.com> Date: Mon Oct 9 15:48:23 2017 +0300 linux-gen: pool: combine overlapping struct pool_t members Struct pool_t members 'data_size' and 'max_seg_len' were both used to store the same value. Replace them with a single 'seg_len' member. 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_pool_internal.h b/platform/linux-generic/include/odp_pool_internal.h index edf75d6e..48945ee1 100644 --- a/platform/linux-generic/include/odp_pool_internal.h +++ b/platform/linux-generic/include/odp_pool_internal.h @@ -60,9 +60,8 @@ typedef struct pool_t { uint32_t align; uint32_t headroom; uint32_t tailroom; - uint32_t data_size; + uint32_t seg_len; uint32_t max_len; - uint32_t max_seg_len; uint32_t uarea_size; uint32_t block_size; uint32_t shm_size; diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index fff01ad9..c330c629 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -476,8 +476,8 @@ static inline odp_packet_hdr_t *add_segments(odp_packet_hdr_t *pkt_hdr, if (new_hdr == NULL) return NULL; - seg_len = len - ((num - 1) * pool->max_seg_len); - offset = pool->max_seg_len - seg_len; + seg_len = len - ((num - 1) * pool->seg_len); + offset = pool->seg_len - seg_len; if (head) { /* add into the head*/ @@ -906,7 +906,7 @@ int odp_packet_reset(odp_packet_t pkt, uint32_t len) pool_t *pool = pkt_hdr->buf_hdr.pool_ptr; int num = pkt_hdr->buf_hdr.segcount; - if (odp_unlikely(len > (pool->max_seg_len * num))) + if (odp_unlikely(len > (pool->seg_len * num))) return -1; reset_seg(pkt_hdr, 0, num); diff --git a/platform/linux-generic/odp_pool.c b/platform/linux-generic/odp_pool.c index 40cbb397..44a40e83 100644 --- a/platform/linux-generic/odp_pool.c +++ b/platform/linux-generic/odp_pool.c @@ -285,7 +285,7 @@ static void init_buffers(pool_t *pool) memset(buf_hdr, 0, (uintptr_t)data - (uintptr_t)buf_hdr); - seg_size = pool->headroom + pool->data_size + pool->tailroom; + seg_size = pool->headroom + pool->seg_len + pool->tailroom; /* Initialize buffer metadata */ buf_hdr->index = i; @@ -305,13 +305,13 @@ static void init_buffers(pool_t *pool) /* Pointer to data start (of the first segment) */ buf_hdr->seg[0].hdr = buf_hdr; buf_hdr->seg[0].data = &data[offset]; - buf_hdr->seg[0].len = pool->data_size; + buf_hdr->seg[0].len = pool->seg_len; odp_atomic_init_u32(&buf_hdr->ref_cnt, 0); /* Store base values for fast init */ buf_hdr->base_data = buf_hdr->seg[0].data; - buf_hdr->buf_end = &data[offset + pool->data_size + + buf_hdr->buf_end = &data[offset + pool->seg_len + pool->tailroom]; /* Store buffer index into the global pool */ @@ -341,8 +341,8 @@ static odp_pool_t pool_create(const char *name, odp_pool_param_t *params, pool_t *pool; uint32_t uarea_size, headroom, tailroom; odp_shm_t shm; - uint32_t data_size, align, num, hdr_size, block_size; - uint32_t max_len, max_seg_len; + uint32_t seg_len, align, num, hdr_size, block_size; + uint32_t max_len; uint32_t ring_size; uint32_t num_extra = 0; int name_len; @@ -371,15 +371,14 @@ static odp_pool_t pool_create(const char *name, odp_pool_param_t *params, headroom = 0; tailroom = 0; - data_size = 0; + seg_len = 0; max_len = 0; - max_seg_len = 0; uarea_size = 0; switch (params->type) { case ODP_POOL_BUFFER: num = params->buf.num; - data_size = params->buf.size; + seg_len = params->buf.size; break; case ODP_POOL_PACKET: @@ -387,9 +386,8 @@ static odp_pool_t pool_create(const char *name, odp_pool_param_t *params, tailroom = CONFIG_PACKET_TAILROOM; num = params->pkt.num; uarea_size = params->pkt.uarea_size; - data_size = CONFIG_PACKET_MAX_SEG_LEN; - max_seg_len = CONFIG_PACKET_MAX_SEG_LEN; - max_len = CONFIG_PACKET_MAX_SEGS * max_seg_len; + seg_len = CONFIG_PACKET_MAX_SEG_LEN; + max_len = CONFIG_PACKET_MAX_SEGS * seg_len; break; case ODP_POOL_TIMEOUT: @@ -428,8 +426,8 @@ static odp_pool_t pool_create(const char *name, odp_pool_param_t *params, hdr_size = sizeof(odp_packet_hdr_t); hdr_size = ROUNDUP_CACHE_LINE(hdr_size); - block_size = ROUNDUP_CACHE_LINE(hdr_size + align + headroom + - data_size + tailroom); + block_size = ROUNDUP_CACHE_LINE(hdr_size + align + headroom + seg_len + + tailroom); /* Allocate extra memory for skipping packet buffers which cross huge * page boundaries. */ @@ -449,9 +447,8 @@ static odp_pool_t pool_create(const char *name, odp_pool_param_t *params, pool->num = num; pool->align = align; pool->headroom = headroom; - pool->data_size = data_size; + pool->seg_len = seg_len; pool->max_len = max_len; - pool->max_seg_len = max_seg_len; pool->tailroom = tailroom; pool->block_size = block_size; pool->uarea_size = uarea_size; @@ -924,9 +921,8 @@ void odp_pool_print(odp_pool_t pool_hdl) printf(" num %u\n", pool->num); printf(" align %u\n", pool->align); printf(" headroom %u\n", pool->headroom); - printf(" data size %u\n", pool->data_size); + printf(" seg len %u\n", pool->seg_len); printf(" max data len %u\n", pool->max_len); - printf(" max seg len %u\n", pool->max_seg_len); printf(" tailroom %u\n", pool->tailroom); printf(" block size %u\n", pool->block_size); printf(" uarea size %u\n", pool->uarea_size); diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c index 26ca0d6b..2e50a55f 100644 --- a/platform/linux-generic/pktio/dpdk.c +++ b/platform/linux-generic/pktio/dpdk.c @@ -174,7 +174,7 @@ static struct rte_mempool *mbuf_pool_create(const char *name, } num = pool_entry->num; - data_room_size = pool_entry->max_seg_len + CONFIG_PACKET_HEADROOM; + data_room_size = pool_entry->seg_len + CONFIG_PACKET_HEADROOM; elt_size = sizeof(struct rte_mbuf) + (unsigned)data_room_size; mbp_priv.mbuf_data_room_size = data_room_size; mbp_priv.mbuf_priv_size = 0; @@ -231,7 +231,7 @@ static int pool_dequeue_bulk(struct rte_mempool *mp, void **obj_table, int pkts; int i; - pkts = packet_alloc_multi(pool, pool_entry->max_seg_len, packet_tbl, + pkts = packet_alloc_multi(pool, pool_entry->seg_len, packet_tbl, num); if (odp_unlikely(pkts != (int)num)) { @@ -1230,7 +1230,7 @@ static int dpdk_open(odp_pktio_t id ODP_UNUSED, data_room = rte_pktmbuf_data_room_size(pkt_dpdk->pkt_pool) - RTE_PKTMBUF_HEADROOM; - pkt_dpdk->data_room = RTE_MIN(pool_entry->max_seg_len, data_room); + pkt_dpdk->data_room = RTE_MIN(pool_entry->seg_len, data_room); /* Mbuf chaining not yet supported */ pkt_dpdk->mtu = RTE_MIN(pkt_dpdk->mtu, pkt_dpdk->data_room); diff --git a/platform/linux-generic/pktio/socket_mmap.c b/platform/linux-generic/pktio/socket_mmap.c index f7118023..42f4a262 100644 --- a/platform/linux-generic/pktio/socket_mmap.c +++ b/platform/linux-generic/pktio/socket_mmap.c @@ -357,7 +357,7 @@ static void mmap_fill_ring(struct ring *ring, odp_pool_t pool_hdl, int fanout) pool = pool_entry_from_hdl(pool_hdl); /* Frame has to capture full packet which can fit to the pool block.*/ - ring->req.tp_frame_size = (pool->headroom + pool->data_size + + ring->req.tp_frame_size = (pool->headroom + pool->seg_len + pool->tailroom + TPACKET_HDRLEN + TPACKET_ALIGNMENT + + (pz - 1)) & (-pz); commit 48dfcade1602e9cc9bb8cd3251037508aef146cd Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Wed Oct 18 16:08:11 2017 +0300 linux-gen: pktio: simplify ret code Simplify ret code. Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c index 4363711f..f972bb78 100644 --- a/platform/linux-generic/odp_packet_io.c +++ b/platform/linux-generic/odp_packet_io.c @@ -215,27 +215,25 @@ static odp_pktio_t setup_pktio_entry(const char *name, odp_pool_t pool, for (pktio_if = 0; pktio_if_ops[pktio_if]; ++pktio_if) { ret = pktio_if_ops[pktio_if]->open(hdl, pktio_entry, name, pool); - - if (!ret) { - pktio_entry->s.ops = pktio_if_ops[pktio_if]; - ODP_DBG("%s uses %s\n", - name, pktio_if_ops[pktio_if]->name); + if (!ret) break; - } } if (ret != 0) { pktio_entry->s.state = PKTIO_STATE_FREE; - hdl = ODP_PKTIO_INVALID; + unlock_entry(pktio_entry); ODP_ERR("Unable to init any I/O type.\n"); - } else { - snprintf(pktio_entry->s.name, - sizeof(pktio_entry->s.name), "%s", name); - pktio_entry->s.state = PKTIO_STATE_OPENED; + return ODP_PKTIO_INVALID; } + snprintf(pktio_entry->s.name, + sizeof(pktio_entry->s.name), "%s", name); + pktio_entry->s.state = PKTIO_STATE_OPENED; + pktio_entry->s.ops = pktio_if_ops[pktio_if]; unlock_entry(pktio_entry); + ODP_DBG("%s uses %s\n", name, pktio_if_ops[pktio_if]->name); + return hdl; } commit 2aa9a05b11bdfac0c0126384d4677b3f9c561a78 Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Wed Oct 18 15:58:24 2017 +0300 linux-gen: pktio test odp_shm_reserve return code Better to check odp_shm_reserve() code than address. Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c index c2e6742b..4363711f 100644 --- a/platform/linux-generic/odp_packet_io.c +++ b/platform/linux-generic/odp_packet_io.c @@ -59,11 +59,10 @@ int odp_pktio_init_global(void) shm = odp_shm_reserve("odp_pktio_entries", sizeof(pktio_table_t), sizeof(pktio_entry_t), 0); - pktio_tbl = odp_shm_addr(shm); - - if (pktio_tbl == NULL) + if (shm == ODP_SHM_INVALID) return -1; + pktio_tbl = odp_shm_addr(shm); memset(pktio_tbl, 0, sizeof(pktio_table_t)); odp_spinlock_init(&pktio_tbl->lock); commit df978d9b4e766c8e1cb1a88a28d98318840fee22 Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Wed Oct 18 15:50:02 2017 +0300 linux-gen: pktio: add missing unlock add missing unlock on return. https://bugs.linaro.org/show_bug.cgi?id=3242 Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c index 5cf94a14..c2e6742b 100644 --- a/platform/linux-generic/odp_packet_io.c +++ b/platform/linux-generic/odp_packet_io.c @@ -202,8 +202,10 @@ static odp_pktio_t setup_pktio_entry(const char *name, odp_pool_t pool, /* if successful, alloc_pktio_entry() returns with the entry locked */ pktio_entry = get_pktio_entry(hdl); - if (!pktio_entry) + if (!pktio_entry) { + unlock_entry(pktio_entry); return ODP_PKTIO_INVALID; + } pktio_entry->s.pool = pool; memcpy(&pktio_entry->s.param, param, sizeof(odp_pktio_param_t)); commit 482eeee380d40596131826c1103ed89247bd17e5 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue Oct 17 15:17:27 2017 +0300 linux-gen: use EXEEXT in shmem_linux test Use EXEEXT environment variable when calling test programs during shmem_linux test. 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/test/validation/api/shmem/shmem_linux.c b/platform/linux-generic/test/validation/api/shmem/shmem_linux.c index 10bbb6a4..7f0343cf 100644 --- a/platform/linux-generic/test/validation/api/shmem/shmem_linux.c +++ b/platform/linux-generic/test/validation/api/shmem/shmem_linux.c @@ -218,10 +218,14 @@ int main(int argc __attribute__((unused)), char *argv[]) int app2_status; uid_t uid = getuid(); char *shm_dir = getenv("ODP_SHM_DIR"); + const char *exeext = getenv("EXEEXT"); + + if (exeext == NULL) + exeext = ""; /* odp_app1 is in the same directory as this file: */ strncpy(prg_name, argv[0], PATH_MAX - 1); - sprintf(odp_name1, "%s/%s", dirname(prg_name), ODP_APP1_NAME); + sprintf(odp_name1, "%s/%s%s", dirname(prg_name), ODP_APP1_NAME, exeext); /* start the ODP application: */ odp_app1 = fork(); @@ -292,7 +296,7 @@ int main(int argc __attribute__((unused)), char *argv[]) /* odp_app2 is in the same directory as this file: */ strncpy(prg_name, argv[0], PATH_MAX - 1); - sprintf(odp_name2, "%s/%s", dirname(prg_name), ODP_APP2_NAME); + sprintf(odp_name2, "%s/%s%s", dirname(prg_name), ODP_APP2_NAME, exeext); /* start the second ODP application with pid of ODP_APP1 as parameter:*/ sprintf(pid1, "%d", odp_app1); commit 254190ffcdb51549ee23846f33fd45513656b78c Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue Oct 17 15:14:07 2017 +0300 linux-gen: use ${EXEEXT} when calling shmem_linux test 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/test/Makefile.am b/platform/linux-generic/test/Makefile.am index 1f4910ad..97784a02 100644 --- a/platform/linux-generic/test/Makefile.am +++ b/platform/linux-generic/test/Makefile.am @@ -6,7 +6,7 @@ SUBDIRS = performance if test_vald TESTS = validation/api/pktio/pktio_run.sh \ validation/api/pktio/pktio_run_tap.sh \ - validation/api/shmem/shmem_linux \ + validation/api/shmem/shmem_linux$(EXEEXT) \ ring/ring_main$(EXEEXT) SUBDIRS += validation/api/pktio\ commit 52877c96e12bf62614df0482175384565a851083 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue Oct 17 15:11:57 2017 +0300 helper: add ${EXEEXT} when calling compiled programs 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/helper/test/Makefile.am b/helper/test/Makefile.am index 620c1673..8eee643b 100644 --- a/helper/test/Makefile.am +++ b/helper/test/Makefile.am @@ -1,3 +1,5 @@ +TESTS_ENVIRONMENT = EXEEXT=${EXEEXT} + LIB = $(top_builddir)/lib #in the following line, the libs using the symbols should come before diff --git a/helper/test/odpthreads_as_processes b/helper/test/odpthreads_as_processes index 89405f36..01d65883 100755 --- a/helper/test/odpthreads_as_processes +++ b/helper/test/odpthreads_as_processes @@ -11,4 +11,4 @@ PATH=.:$PATH # The odpthreads test recognise the "--odph_proc" option to create # odp threads as linux processes: -odpthreads --odph_proc +odpthreads${EXEEXT} --odph_proc diff --git a/helper/test/odpthreads_as_pthreads b/helper/test/odpthreads_as_pthreads index ef569c3d..cd68a9e9 100755 --- a/helper/test/odpthreads_as_pthreads +++ b/helper/test/odpthreads_as_pthreads @@ -11,4 +11,4 @@ PATH=.:$PATH # The odpthreads test without the "--odph_proc" option defaults to create # odp threads as linux pthreads: -odpthreads +odpthreads${EXEEXT} commit 133e7fc06147486fff5ab3393b1a791ab97d19d3 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue Oct 17 15:11:57 2017 +0300 example: add ${EXEEXT} when calling compiled programs 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/example/Makefile.inc b/example/Makefile.inc index 12edc46c..1609066e 100644 --- a/example/Makefile.inc +++ b/example/Makefile.inc @@ -1,3 +1,5 @@ +TESTS_ENVIRONMENT = EXEEXT=${EXEEXT} + LIB = $(top_builddir)/lib LDADD = $(LIB)/libodp-linux.la $(LIB)/libodphelper.la $(DPDK_PMDS) AM_CFLAGS = \ diff --git a/example/l2fwd_simple/l2fwd_simple_run.sh b/example/l2fwd_simple/l2fwd_simple_run.sh index 130a3a84..089d9f97 100755 --- a/example/l2fwd_simple/l2fwd_simple_run.sh +++ b/example/l2fwd_simple/l2fwd_simple_run.sh @@ -9,7 +9,8 @@ PCAP_IN=`find . ${TEST_DIR} $(dirname $0) -name udp64.pcap -print -quit` echo "using PCAP_IN = ${PCAP_IN}" -./odp_l2fwd_simple pcap:in=${PCAP_IN} pcap:out=pcapout.pcap 02:00:00:00:00:01 02:00:00:00:00:02 & +./odp_l2fwd_simple${EXEEXT} pcap:in=${PCAP_IN} pcap:out=pcapout.pcap \ + 02:00:00:00:00:01 02:00:00:00:00:02 & sleep 1 kill -s SIGINT $! diff --git a/example/l3fwd/odp_l3fwd_run.sh b/example/l3fwd/odp_l3fwd_run.sh index 6f0b11a0..dff3afd7 100755 --- a/example/l3fwd/odp_l3fwd_run.sh +++ b/example/l3fwd/odp_l3fwd_run.sh @@ -11,7 +11,7 @@ PCAP_OUT="pcapout.pcap" PCAP_IN_SIZE=`stat -c %s ${PCAP_IN}` echo "using PCAP_IN = ${PCAP_IN}, PCAP_OUT = ${PCAP_OUT}" -./odp_l3fwd -i pcap:in=${PCAP_IN},pcap:out=${PCAP_OUT} \ +./odp_l3fwd${EXEEXT} -i pcap:in=${PCAP_IN},pcap:out=${PCAP_OUT} \ -r "10.0.0.0/24,pcap:out=${PCAP_OUT}" -d 30 STATUS=$? diff --git a/example/packet/pktio_run.sh b/example/packet/pktio_run.sh index 3adb2d62..122418b6 100755 --- a/example/packet/pktio_run.sh +++ b/example/packet/pktio_run.sh @@ -12,7 +12,7 @@ PCAP_IN_SIZE=`stat -c %s ${PCAP_IN}` echo "using PCAP in=${PCAP_IN}:out=${PCAP_OUT} size %${PCAP_IN_SIZE}" # burst mode -./odp_pktio -ipcap:in=${PCAP_IN}:out=${PCAP_OUT} -t 5 -m 0 +./odp_pktio${EXEEXT} -ipcap:in=${PCAP_IN}:out=${PCAP_OUT} -t 5 -m 0 STATUS=$? PCAP_OUT_SIZE=`stat -c %s ${PCAP_OUT}` rm -f ${PCAP_OUT} @@ -24,7 +24,7 @@ fi echo "Pass -m 0: status ${STATUS}, in:${PCAP_IN_SIZE} out:${PCAP_OUT_SIZE}" # queue mode -./odp_pktio -ipcap:in=${PCAP_IN}:out=${PCAP_OUT} -t 5 -m 1 +./odp_pktio${EXEEXT} -ipcap:in=${PCAP_IN}:out=${PCAP_OUT} -t 5 -m 1 STATUS=$? PCAP_OUT_SIZE=`stat -c %s ${PCAP_OUT}` rm -f ${PCAP_OUT} @@ -36,7 +36,7 @@ fi echo "Pass -m 1: status ${STATUS}, in:${PCAP_IN_SIZE} out:${PCAP_OUT_SIZE}" # sched/queue mode -./odp_pktio -ipcap:in=${PCAP_IN}:out=${PCAP_OUT} -t 5 -m 2 +./odp_pktio${EXEEXT} -ipcap:in=${PCAP_IN}:out=${PCAP_OUT} -t 5 -m 2 STATUS=$? PCAP_OUT_SIZE=`stat -c %s ${PCAP_OUT}` rm -f ${PCAP_OUT} @@ -48,7 +48,7 @@ fi echo "Pass -m 2: status ${STATUS}, in:${PCAP_IN_SIZE} out:${PCAP_OUT_SIZE}" # cpu number option test 1 -./odp_pktio -ipcap:in=${PCAP_IN}:out=${PCAP_OUT} -t 5 -m 0 -c 1 +./odp_pktio${EXEEXT} -ipcap:in=${PCAP_IN}:out=${PCAP_OUT} -t 5 -m 0 -c 1 STATUS=$? PCAP_OUT_SIZE=`stat -c %s ${PCAP_OUT}` rm -f ${PCAP_OUT} diff --git a/example/switch/switch_run.sh b/example/switch/switch_run.sh index d9aa8bd0..9a8e8480 100755 --- a/example/switch/switch_run.sh +++ b/example/switch/switch_run.sh @@ -19,7 +19,7 @@ do RX_PORTS="${RX_PORTS},pcap:out=pcapout${i}.pcap" done -./odp_switch -i pcap:in=${PCAP_IN}${RX_PORTS} -t 1 +./odp_switch${EXEEXT} -i pcap:in=${PCAP_IN}${RX_PORTS} -t 1 STATUS=$? if [ "$STATUS" -ne 0 ]; then echo "Error: status was: $STATUS, expected 0" commit 8c9ce8c63eed9d01fec54c09bd17040914abd623 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue Oct 17 15:11:57 2017 +0300 linux-gen: drop unused EXEEXT suffix 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/test/mmap_vlan_ins/Makefile.am b/platform/linux-generic/test/mmap_vlan_ins/Makefile.am index e42b5254..8559e55b 100644 --- a/platform/linux-generic/test/mmap_vlan_ins/Makefile.am +++ b/platform/linux-generic/test/mmap_vlan_ins/Makefile.am @@ -10,7 +10,7 @@ dist_check_DATA = vlan.pcap test_SCRIPTS = $(dist_check_SCRIPTS) test_DATA = $(dist_check_DATA) -test_PROGRAMS = plat_mmap_vlan_ins$(EXEEXT) +test_PROGRAMS = plat_mmap_vlan_ins # Clonned from example odp_l2fwd simple plat_mmap_vlan_ins_SOURCES = mmap_vlan_ins.c diff --git a/platform/linux-generic/test/ring/Makefile.am b/platform/linux-generic/test/ring/Makefile.am index 57ba82ae..37604755 100644 --- a/platform/linux-generic/test/ring/Makefile.am +++ b/platform/linux-generic/test/ring/Makefile.am @@ -1,6 +1,6 @@ include ../Makefile.inc -test_PROGRAMS = ring_main$(EXEEXT) +test_PROGRAMS = ring_main ring_main_SOURCES = \ ring_main.c \ ring_suites.c ring_suites.h \ diff --git a/platform/linux-generic/test/validation/api/shmem/Makefile.am b/platform/linux-generic/test/validation/api/shmem/Makefile.am index 962450e5..131a511b 100644 --- a/platform/linux-generic/test/validation/api/shmem/Makefile.am +++ b/platform/linux-generic/test/validation/api/shmem/Makefile.am @@ -1,7 +1,7 @@ include ../Makefile.inc #the main test program is shmem_linux, which, in turn, starts a shmem_odp: -test_PROGRAMS = shmem_linux$(EXEEXT) shmem_odp1$(EXEEXT) shmem_odp2$(EXEEXT) +test_PROGRAMS = shmem_linux shmem_odp1 shmem_odp2 #shmem_linux is stand alone, pure linux (no ODP): shmem_linux_SOURCES = shmem_linux.c shmem_linux.h shmem_common.h commit 2b57c7d7b96eef16c36b8b0020b3dd78acc82660 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue Oct 17 15:11:31 2017 +0300 test: drop unused EXEEXT suffix 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/miscellaneous/Makefile.am b/test/miscellaneous/Makefile.am index 7d42b07e..3ea5d5e8 100644 --- a/test/miscellaneous/Makefile.am +++ b/test/miscellaneous/Makefile.am @@ -1,8 +1,8 @@ include $(top_srcdir)/test/Makefile.inc if test_cpp -bin_PROGRAMS = odp_api_from_cpp$(EXEEXT) -TESTS = odp_api_from_cpp$(EXEEXT) +bin_PROGRAMS = odp_api_from_cpp +TESTS = odp_api_from_cpp endif odp_api_from_cpp_SOURCES = odp_api_from_cpp.cpp diff --git a/test/performance/Makefile.am b/test/performance/Makefile.am index 8d9fd359..1dccd82e 100644 --- a/test/performance/Makefile.am +++ b/test/performance/Makefile.am @@ -2,14 +2,14 @@ include $(top_srcdir)/test/Makefile.inc TESTS_ENVIRONMENT += TEST_DIR=${builddir} -EXECUTABLES = odp_bench_packet$(EXEEXT) \ - odp_crypto$(EXEEXT) \ - odp_pktio_perf$(EXEEXT) - -COMPILE_ONLY = odp_l2fwd$(EXEEXT) \ - odp_pktio_ordered$(EXEEXT) \ - odp_sched_latency$(EXEEXT) \ - odp_scheduling$(EXEEXT) +EXECUTABLES = odp_bench_packet \ + odp_crypto \ + odp_pktio_perf + +COMPILE_ONLY = odp_l2fwd \ + odp_pktio_ordered \ + odp_sched_latency \ + odp_scheduling TESTSCRIPTS = odp_l2fwd_run.sh \ odp_pktio_ordered_run.sh \ diff --git a/test/validation/api/atomic/Makefile.am b/test/validation/api/atomic/Makefile.am index b09d3b88..859e3c51 100644 --- a/test/validation/api/atomic/Makefile.am +++ b/test/validation/api/atomic/Makefile.am @@ -1,5 +1,5 @@ include ../Makefile.inc -test_PROGRAMS = atomic_main$(EXEEXT) +test_PROGRAMS = atomic_main atomic_main_SOURCES = atomic_main.c atomic.c atomic.h atomic_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/barrier/Makefile.am b/test/validation/api/barrier/Makefile.am index 4dfb1d1e..b0310e3a 100644 --- a/test/validation/api/barrier/Makefile.am +++ b/test/validation/api/barrier/Makefile.am @@ -1,5 +1,5 @@ include ../Makefile.inc -test_PROGRAMS = barrier_main$(EXEEXT) +test_PROGRAMS = barrier_main barrier_main_SOURCES = barrier_main.c barrier.c barrier.h barrier_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/buffer/Makefile.am b/test/validation/api/buffer/Makefile.am index ae6ce0a4..59639ff7 100644 --- a/test/validation/api/buffer/Makefile.am +++ b/test/validation/api/buffer/Makefile.am @@ -1,5 +1,5 @@ include ../Makefile.inc -test_PROGRAMS = buffer_main$(EXEEXT) +test_PROGRAMS = buffer_main buffer_main_SOURCES = buffer_main.c buffer.c buffer.h buffer_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/classification/Makefile.am b/test/validation/api/classification/Makefile.am index f177528e..b5870307 100644 --- a/test/validation/api/classification/Makefile.am +++ b/test/validation/api/classification/Makefile.am @@ -1,6 +1,6 @@ include ../Makefile.inc -test_PROGRAMS = classification_main$(EXEEXT) +test_PROGRAMS = classification_main classification_main_SOURCES = classification_main.c \ odp_classification_basic.c \ odp_classification_tests.c \ diff --git a/test/validation/api/cpumask/Makefile.am b/test/validation/api/cpumask/Makefile.am index ddafb9ab..ff12f56f 100644 --- a/test/validation/api/cpumask/Makefile.am +++ b/test/validation/api/cpumask/Makefile.am @@ -1,5 +1,5 @@ include ../Makefile.inc -test_PROGRAMS = cpumask_main$(EXEEXT) +test_PROGRAMS = cpumask_main cpumask_main_SOURCES = cpumask_main.c cpumask.c cpumask.h cpumask_main_LDADD = $(LIBCPUMASK_COMMON) $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/crypto/Makefile.am b/test/validation/api/crypto/Makefile.am index 6660e1b2..94f1c1ca 100644 --- a/test/validation/api/crypto/Makefile.am +++ b/test/validation/api/crypto/Makefile.am @@ -1,6 +1,6 @@ include ../Makefile.inc -test_PROGRAMS = crypto_main$(EXEEXT) +test_PROGRAMS = crypto_main crypto_main_SOURCES = crypto_main.c \ crypto.c \ crypto.h \ diff --git a/test/validation/api/errno/Makefile.am b/test/validation/api/errno/Makefile.am index 8f7b2e88..9eddfb48 100644 --- a/test/validation/api/errno/Makefile.am +++ b/test/validation/api/errno/Makefile.am @@ -1,5 +1,5 @@ include ../Makefile.inc -test_PROGRAMS = errno_main$(EXEEXT) +test_PROGRAMS = errno_main errno_main_SOURCES = errno_main.c errno.c errno.h errno_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/hash/Makefile.am b/test/validation/api/hash/Makefile.am index b37f2e00..bd098ffb 100644 --- a/test/validation/api/hash/Makefile.am +++ b/test/validation/api/hash/Makefile.am @@ -1,5 +1,5 @@ include ../Makefile.inc -test_PROGRAMS = hash_main$(EXEEXT) +test_PROGRAMS = hash_main hash_main_SOURCES = hash_main.c hash.c hash.h hash_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/init/Makefile.am b/test/validation/api/init/Makefile.am index ba25c61f..522c3a18 100644 --- a/test/validation/api/init/Makefile.am +++ b/test/validation/api/init/Makefile.am @@ -3,7 +3,7 @@ include ../Makefile.inc # most platforms are expected not to support multiple ODP inits # following each other: therefore 3 separate binaries are # created, each containing its ODP init test. -test_PROGRAMS = init_main_abort$(EXEEXT) init_main_log$(EXEEXT) init_main_ok$(EXEEXT) +test_PROGRAMS = init_main_abort init_main_log init_main_ok init_main_abort_SOURCES = init_main_abort.c init.c init.h init_main_log_SOURCES = init_main_log.c init.c init.h init_main_ok_SOURCES = init_main_ok.c init.c init.h diff --git a/test/validation/api/lock/Makefile.am b/test/validation/api/lock/Makefile.am index 80740282..b434fe77 100644 --- a/test/validation/api/lock/Makefile.am +++ b/test/validation/api/lock/Makefile.am @@ -1,5 +1,5 @@ include ../Makefile.inc -test_PROGRAMS = lock_main$(EXEEXT) +test_PROGRAMS = lock_main lock_main_SOURCES = lock_main.c lock.c lock.h lock_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/packet/Makefile.am b/test/validation/api/packet/Makefile.am index fb356997..43300ed0 100644 --- a/test/validation/api/packet/Makefile.am +++ b/test/validation/api/packet/Makefile.am @@ -1,5 +1,5 @@ include ../Makefile.inc -test_PROGRAMS = packet_main$(EXEEXT) +test_PROGRAMS = packet_main packet_main_SOURCES = packet_main.c packet.c packet.h packet_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/pktio/Makefile.am b/test/validation/api/pktio/Makefile.am index eb4b6038..a416fd1d 100644 --- a/test/validation/api/pktio/Makefile.am +++ b/test/validation/api/pktio/Makefile.am @@ -1,5 +1,5 @@ include ../Makefile.inc -test_PROGRAMS = pktio_main$(EXEEXT) +test_PROGRAMS = pktio_main pktio_main_SOURCES = pktio_main.c parser.c parser.h pktio.c pktio.h pktio_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/pool/Makefile.am b/test/validation/api/pool/Makefile.am index 85a37b05..9e7c42b5 100644 --- a/test/validation/api/pool/Makefile.am +++ b/test/validation/api/pool/Makefile.am @@ -1,5 +1,5 @@ include ../Makefile.inc -test_PROGRAMS = pool_main$(EXEEXT) +test_PROGRAMS = pool_main pool_main_SOURCES = pool_main.c pool.c pool.h pool_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/queue/Makefile.am b/test/validation/api/queue/Makefile.am index a5b6a9b1..9b1c6b77 100644 --- a/test/validation/api/queue/Makefile.am +++ b/test/validation/api/queue/Makefile.am @@ -1,5 +1,5 @@ include ../Makefile.inc -test_PROGRAMS = queue_main$(EXEEXT) +test_PROGRAMS = queue_main queue_main_SOURCES = queue_main.c queue.c queue.h queue_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/random/Makefile.am b/test/validation/api/random/Makefile.am index e026f045..e9e7ffc0 100644 --- a/test/validation/api/random/Makefile.am +++ b/test/validation/api/random/Makefile.am @@ -1,5 +1,5 @@ include ../Makefile.inc -test_PROGRAMS = random_main$(EXEEXT) +test_PROGRAMS = random_main random_main_SOURCES = random_main.c random.c random.h random_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/scheduler/Makefile.am b/test/validation/api/scheduler/Makefile.am index 6c71b010..34abf7d6 100644 --- a/test/validation/api/scheduler/Makefile.am +++ b/test/validation/api/scheduler/Makefile.am @@ -1,5 +1,5 @@ include ../Makefile.inc -test_PROGRAMS = scheduler_main$(EXEEXT) +test_PROGRAMS = scheduler_main scheduler_main_SOURCES = scheduler_main.c scheduler.c scheduler.h scheduler_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/shmem/Makefile.am b/test/validation/api/shmem/Makefile.am index d955cc22..8c5d7f70 100644 --- a/test/validation/api/shmem/Makefile.am +++ b/test/validation/api/shmem/Makefile.am @@ -1,5 +1,5 @@ include ../Makefile.inc -test_PROGRAMS = shmem_main$(EXEEXT) +test_PROGRAMS = shmem_main shmem_main_SOURCES = shmem_main.c shmem.c shmem.h shmem_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/std_clib/Makefile.am b/test/validation/api/std_clib/Makefile.am index 919c2556..dc75c95c 100644 --- a/test/validation/api/std_clib/Makefile.am +++ b/test/validation/api/std_clib/Makefile.am @@ -1,5 +1,5 @@ include ../Makefile.inc -test_PROGRAMS = std_clib_main$(EXEEXT) +test_PROGRAMS = std_clib_main std_clib_main_SOURCES = std_clib_main.c std_clib.c std_clib.h std_clib_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/system/Makefile.am b/test/validation/api/system/Makefile.am index 15e6d49a..123d3a69 100644 --- a/test/validation/api/system/Makefile.am +++ b/test/validation/api/system/Makefile.am @@ -1,5 +1,5 @@ include ../Makefile.inc -test_PROGRAMS = system_main$(EXEEXT) +test_PROGRAMS = system_main system_main_SOURCES = system_main.c system.c system.h system_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/thread/Makefile.am b/test/validation/api/thread/Makefile.am index 59e136b2..1c56574f 100644 --- a/test/validation/api/thread/Makefile.am +++ b/test/validation/api/thread/Makefile.am @@ -1,6 +1,6 @@ include ../Makefile.inc -test_PROGRAMS = thread_main$(EXEEXT) +test_PROGRAMS = thread_main thread_main_CPPFLAGS = $(AM_CPPFLAGS) -DTEST_THRMASK thread_main_SOURCES = thread_main.c thread.c thread.h thread_main_LDADD = $(LIBTHRMASK_COMMON) $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/time/Makefile.am b/test/validation/api/time/Makefile.am index faed577f..669d1226 100644 --- a/test/validation/api/time/Makefile.am +++ b/test/validation/api/time/Makefile.am @@ -7,7 +7,7 @@ TEST_EXTENSIONS = .sh TESTS = $(TESTSCRIPTS) -test_PROGRAMS = time_main$(EXEEXT) +test_PROGRAMS = time_main time_main_SOURCES = time_main.c time.c time_test.h time_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/timer/Makefile.am b/test/validation/api/timer/Makefile.am index 4f79020d..c953dcb3 100644 --- a/test/validation/api/timer/Makefile.am +++ b/test/validation/api/timer/Makefile.am @@ -1,5 +1,5 @@ include ../Makefile.inc -test_PROGRAMS = timer_main$(EXEEXT) +test_PROGRAMS = timer_main timer_main_SOURCES = timer_main.c timer.c timer.h timer_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/traffic_mngr/Makefile.am b/test/validation/api/traffic_mngr/Makefile.am index 3884a13c..dc4f8709 100644 --- a/test/validation/api/traffic_mngr/Makefile.am +++ b/test/validation/api/traffic_mngr/Makefile.am @@ -7,7 +7,7 @@ TEST_EXTENSIONS = .sh TESTS = $(TESTSCRIPTS) -test_PROGRAMS = traffic_mngr_main$(EXEEXT) +test_PROGRAMS = traffic_mngr_main traffic_mngr_main_SOURCES = traffic_mngr_main.c traffic_mngr.c traffic_mngr.h traffic_mngr_main_LDADD = -lm $(LIBCUNIT_COMMON) $(LIBODP) commit cbced85824c4c03c0b35396d559ebfb187237569 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue Oct 17 12:38:07 2017 +0300 configure: cleanup per-platform if Move setting IMPLEMENTATION_NAME to platform configure.m4. Use AS_IF instead of handcoded if. Use AC_MSG_ERROR instead of echo & exit. 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 89ff486f..4bce0534 100644 --- a/configure.ac +++ b/configure.ac @@ -165,15 +165,9 @@ AC_SUBST([with_platform]) ########################################################################## # Run platform specific checks and settings ########################################################################## -IMPLEMENTATION_NAME="" -if test "${with_platform}" = "linux-generic"; -then - m4_include([./platform/linux-generic/m4/configure.m4]) - IMPLEMENTATION_NAME="odp-linux" -else - echo "UNSUPPORTED PLATFORM: ${with_platform}" - exit 1 -fi +AS_IF([test "${with_platform}" = "linux-generic"], + [m4_include([./platform/linux-generic/m4/configure.m4])], + [AC_MSG_ERROR([UNSUPPORTED PLATFORM: ${with_platform}])]) AC_DEFINE_UNQUOTED([IMPLEMENTATION_NAME], ["$IMPLEMENTATION_NAME"], [Define to the name of the implementation]) diff --git a/platform/linux-generic/m4/configure.m4 b/platform/linux-generic/m4/configure.m4 index 68a270d8..5d7ad35a 100644 --- a/platform/linux-generic/m4/configure.m4 +++ b/platform/linux-generic/m4/configure.m4 @@ -1,3 +1,5 @@ +IMPLEMENTATION_NAME="odp-linux" + ODP_VISIBILITY ODP_ATOMIC commit 1217fbaed0aee2ee395c131bb7fd2e201214ed31 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue Oct 17 12:36:24 2017 +0300 configure: drop SDK_INSTALL_PATH variable 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 9144c418..89ff486f 100644 --- a/configure.ac +++ b/configure.ac @@ -186,16 +186,6 @@ m4_include([./example/m4/configure.m4]) m4_include([./helper/m4/configure.m4]) m4_include([./test/m4/configure.m4]) -########################################################################## -# Set SDK install path -########################################################################## -AC_ARG_WITH([sdk-install-path], -AS_HELP_STRING([--with-sdk-install-path=DIR path to external libs and headers], - [(or in the default path if not specified).]), -[SDK_INSTALL_PATH=$withval SDK_INSTALL_PATH_=1],[SDK_INSTALL_PATH_=]) - -AC_SUBST(SDK_INSTALL_PATH) - ########################################################################## # Set the install directory for test binaries/scripts ########################################################################## @@ -211,7 +201,6 @@ AM_CONDITIONAL([test_installdir], [test "x$testdir" != "xno"]) ########################################################################## # Set conditionals as computed within platform specific files ########################################################################## -AM_CONDITIONAL([SDK_INSTALL_PATH_], [test "x${SDK_INSTALL_PATH_}" = "x1"]) AM_CONDITIONAL([HAVE_DOXYGEN], [test "x${DOXYGEN}" = "xdoxygen"]) AM_CONDITIONAL([user_guide], [test "x${user_guides}" = "xyes" ]) AM_CONDITIONAL([HAVE_MSCGEN], [test "x${MSCGEN}" = "xmscgen"]) commit 927b57f21124f31e23fd7f72dddcc93a5248ed53 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue Oct 17 12:35:00 2017 +0300 configure: use AC_CONFIG_COMMANDS_PRE to set conditionals 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 dfea5d20..9144c418 100644 --- a/configure.ac +++ b/configure.ac @@ -162,9 +162,6 @@ AC_ARG_WITH([platform], AC_SUBST([with_platform]) -AM_CONDITIONAL([PLATFORM_IS_LINUX_GENERIC], - [test "x$with_platform" = "xlinux-generic"]) - ########################################################################## # Run platform specific checks and settings ########################################################################## diff --git a/platform/linux-generic/m4/configure.m4 b/platform/linux-generic/m4/configure.m4 index 7dc83bf8..68a270d8 100644 --- a/platform/linux-generic/m4/configure.m4 +++ b/platform/linux-generic/m4/configure.m4 @@ -11,6 +11,9 @@ m4_include([platform/linux-generic/m4/odp_schedule.m4]) m4_include([platform/linux-generic/m4/performance.m4]) +AC_CONFIG_COMMANDS_PRE([dnl +AM_CONDITIONAL([PLATFORM_IS_LINUX_GENERIC], + [test "${with_platform}" = "linux-generic"]) AC_CONFIG_FILES([platform/linux-generic/Makefile platform/linux-generic/libodp-linux.pc platform/linux-generic/include/odp/api/plat/static_inline.h @@ -21,3 +24,4 @@ AC_CONFIG_FILES([platform/linux-generic/Makefile platform/linux-generic/test/pktio_ipc/Makefile platform/linux-generic/test/ring/Makefile platform/linux-generic/test/performance/Makefile]) +]) diff --git a/platform/linux-generic/m4/odp_netmap.m4 b/platform/linux-generic/m4/odp_netmap.m4 index 24ed4bc1..85462c92 100644 --- a/platform/linux-generic/m4/odp_netmap.m4 +++ b/platform/linux-generic/m4/odp_netmap.m4 @@ -43,4 +43,6 @@ fi ########################################################################## CPPFLAGS=$OLD_CPPFLAGS +AC_CONFIG_COMMANDS_PRE([dnl AM_CONDITIONAL([netmap_support], [test x$netmap_support = xyes ]) +]) diff --git a/platform/linux-generic/m4/odp_pcap.m4 b/platform/linux-generic/m4/odp_pcap.m4 index 0b5b8a2e..0a8f3518 100644 --- a/platform/linux-generic/m4/odp_pcap.m4 +++ b/platform/linux-generic/m4/odp_pcap.m4 @@ -15,4 +15,6 @@ fi AC_SUBST([PCAP_LIBS]) -AM_CONDITIONAL([HAVE_PCAP], [test $have_pcap = yes]) +AC_CONFIG_COMMANDS_PRE([dnl +AM_CONDITIONAL([HAVE_PCAP], [test x$have_pcap = xyes]) +]) diff --git a/platform/linux-generic/m4/performance.m4 b/platform/linux-generic/m4/performance.m4 index 05b3a990..f2e7107c 100644 --- a/platform/linux-generic/m4/performance.m4 +++ b/platform/linux-generic/m4/performance.m4 @@ -5,4 +5,6 @@ AC_ARG_ENABLE([test-perf-proc], [AS_HELP_STRING([--enable-test-perf-proc], [run test in test/performance in process mode])], [test_perf_proc=$enableval], [test_perf_proc=yes]) +AC_CONFIG_COMMANDS_PRE([dnl AM_CONDITIONAL([test_perf_proc], [test x$test_perf_proc = xyes ]) +]) commit 1bcf171f00973bcc21baadf9919a61cd6abdf713 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue Oct 17 12:33:08 2017 +0300 configure: use AS_HELP_STRING instead of AC_HELP_STRING AC_HELP_STRING was replaced loong time ago by AS_HELP_STRING (it was before Autoconf 2.60). Let's use new macro instead of the obsolete one. 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 80bc3122..dfea5d20 100644 --- a/configure.ac +++ b/configure.ac @@ -193,7 +193,7 @@ m4_include([./test/m4/configure.m4]) # Set SDK install path ########################################################################## AC_ARG_WITH([sdk-install-path], -AC_HELP_STRING([--with-sdk-install-path=DIR path to external libs and headers], +AS_HELP_STRING([--with-sdk-install-path=DIR path to external libs and headers], [(or in the default path if not specified).]), [SDK_INSTALL_PATH=$withval SDK_INSTALL_PATH_=1],[SDK_INSTALL_PATH_=]) @@ -203,7 +203,7 @@ AC_SUBST(SDK_INSTALL_PATH) # Set the install directory for test binaries/scripts ########################################################################## AC_ARG_WITH([testdir], - [AC_HELP_STRING([--with-testdir=DIR], [installation directory for tests])], + [AS_HELP_STRING([--with-testdir=DIR], [installation directory for tests])], [testdir=$withval], [testdir=no]) AS_IF([test "x$testdir" = "xyes"], [testdir=$libdir/odp/tests], diff --git a/m4/odp_openssl.m4 b/m4/odp_openssl.m4 index 72568a8a..428470dc 100644 --- a/m4/odp_openssl.m4 +++ b/m4/odp_openssl.m4 @@ -10,7 +10,7 @@ AC_ARG_VAR([OPENSSL_STATIC_LIBS], [static linker flags for OpenSSL crypto librar # Set optional OpenSSL path ########################################################################## AC_ARG_WITH([openssl-path], -[AC_HELP_STRING([--with-openssl-path=DIR], +[AS_HELP_STRING([--with-openssl-path=DIR], [path to openssl libs and headers (use system path if not provided)])], [OPENSSL_CPPFLAGS="-I$withval/include" OPENSSL_LIBS="-L$withval/lib -lcrypto"], diff --git a/platform/linux-generic/m4/odp_dpdk.m4 b/platform/linux-generic/m4/odp_dpdk.m4 index b6554165..9d90bbab 100644 --- a/platform/linux-generic/m4/odp_dpdk.m4 +++ b/platform/linux-generic/m4/odp_dpdk.m4 @@ -3,7 +3,7 @@ ########################################################################## pktio_dpdk_support=no AC_ARG_WITH([dpdk-path], -AC_HELP_STRING([--with-dpdk-path=DIR path to dpdk build directory]), +AS_HELP_STRING([--with-dpdk-path=DIR path to dpdk build directory]), [DPDK_PATH="$withval" DPDK_CPPFLAGS="-msse4.2 -isystem $DPDK_PATH/include" pktio_dpdk_support=yes],[]) diff --git a/platform/linux-generic/m4/odp_netmap.m4 b/platform/linux-generic/m4/odp_netmap.m4 index bd04824b..24ed4bc1 100644 --- a/platform/linux-generic/m4/odp_netmap.m4 +++ b/platform/linux-generic/m4/odp_netmap.m4 @@ -12,7 +12,7 @@ AC_ARG_ENABLE([netmap_support], # Set optional netmap path ########################################################################## AC_ARG_WITH([netmap-path], -AC_HELP_STRING([--with-netmap-path=DIR path to netmap root directory], +AS_HELP_STRING([--with-netmap-path=DIR path to netmap root directory], [(or in the default path if not specified).]), [NETMAP_PATH=$withval NETMAP_CPPFLAGS="-isystem $NETMAP_PATH/sys" ----------------------------------------------------------------------- Summary of changes: configure.ac | 28 ++------- example/Makefile.inc | 2 + example/l2fwd_simple/l2fwd_simple_run.sh | 3 +- example/l3fwd/odp_l3fwd_run.sh | 2 +- example/packet/pktio_run.sh | 8 +-- example/switch/switch_run.sh | 2 +- helper/test/Makefile.am | 2 + helper/test/odpthreads_as_processes | 2 +- helper/test/odpthreads_as_pthreads | 2 +- m4/odp_openssl.m4 | 2 +- .../linux-generic/include/odp_buffer_internal.h | 6 +- .../linux-generic/include/odp_config_internal.h | 17 +++++- .../linux-generic/include/odp_packet_internal.h | 8 +-- platform/linux-generic/include/odp_pool_internal.h | 3 +- platform/linux-generic/m4/configure.m4 | 6 ++ platform/linux-generic/m4/odp_dpdk.m4 | 2 +- platform/linux-generic/m4/odp_netmap.m4 | 4 +- platform/linux-generic/m4/odp_pcap.m4 | 4 +- platform/linux-generic/m4/performance.m4 | 2 + platform/linux-generic/odp_packet.c | 71 +++++++++++----------- platform/linux-generic/odp_packet_io.c | 29 +++++---- platform/linux-generic/odp_pool.c | 55 +++++++++++------ platform/linux-generic/pktio/dpdk.c | 6 +- platform/linux-generic/pktio/netmap.c | 2 +- platform/linux-generic/pktio/socket_mmap.c | 2 +- platform/linux-generic/test/Makefile.am | 2 +- .../linux-generic/test/mmap_vlan_ins/Makefile.am | 2 +- platform/linux-generic/test/ring/Makefile.am | 2 +- .../test/validation/api/shmem/Makefile.am | 2 +- .../test/validation/api/shmem/shmem_linux.c | 8 ++- test/miscellaneous/Makefile.am | 4 +- test/performance/Makefile.am | 16 ++--- test/validation/api/atomic/Makefile.am | 2 +- test/validation/api/barrier/Makefile.am | 2 +- test/validation/api/buffer/Makefile.am | 2 +- test/validation/api/classification/Makefile.am | 2 +- test/validation/api/cpumask/Makefile.am | 2 +- test/validation/api/crypto/Makefile.am | 2 +- test/validation/api/errno/Makefile.am | 2 +- test/validation/api/hash/Makefile.am | 2 +- test/validation/api/init/Makefile.am | 2 +- test/validation/api/lock/Makefile.am | 2 +- test/validation/api/packet/Makefile.am | 2 +- test/validation/api/packet/packet.c | 29 +++++++-- test/validation/api/pktio/Makefile.am | 2 +- test/validation/api/pool/Makefile.am | 2 +- test/validation/api/queue/Makefile.am | 2 +- test/validation/api/random/Makefile.am | 2 +- test/validation/api/scheduler/Makefile.am | 2 +- test/validation/api/shmem/Makefile.am | 2 +- test/validation/api/std_clib/Makefile.am | 2 +- test/validation/api/system/Makefile.am | 2 +- test/validation/api/thread/Makefile.am | 2 +- test/validation/api/time/Makefile.am | 2 +- test/validation/api/timer/Makefile.am | 2 +- test/validation/api/traffic_mngr/Makefile.am | 2 +- 56 files changed, 215 insertions(+), 166 deletions(-) hooks/post-receive --

8 years, 4 months

[COMMIT] branch api-next updated. v1.15.0.0-774-ge3108af2

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 e3108af2f0b58c2ceca422b418439bba5de04b11 (commit) from cd196cf12f957456b24c844b2c38be5062130cf1 (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 e3108af2f0b58c2ceca422b418439bba5de04b11 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue Oct 17 21:19:57 2017 +0300 api: ipsec: move pipeline SA param to inbound substructrure SA param pipeline is related only to inbound configuration. If at some point it will be possible to configure destination for outbound operation, it will be done through a separate param. Move pipeline into inbound params substructure. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/include/odp/api/spec/ipsec.h b/include/odp/api/spec/ipsec.h index ddcdf75b..26e852fc 100644 --- a/include/odp/api/spec/ipsec.h +++ b/include/odp/api/spec/ipsec.h @@ -633,14 +633,6 @@ typedef struct odp_ipsec_sa_param_t { /** SPI value */ uint32_t spi; - /** Select pipelined destination for resulting events - * - * Asynchronous and inline modes generate events. Select where - * those events are sent. Inbound SAs may choose to use pipelined - * classification. The default value is ODP_IPSEC_PIPELINE_NONE. - */ - odp_ipsec_pipeline_t pipeline; - /** Destination queue for IPSEC events * * Operations in asynchronous or inline mode enqueue resulting events @@ -690,6 +682,15 @@ typedef struct odp_ipsec_sa_param_t { */ uint32_t antireplay_ws; + /** Select pipelined destination for resulting events + * + * Asynchronous and inline modes generate events. + * Select where those events are sent. Inbound SAs may + * choose to use pipelined classification. The default + * value is ODP_IPSEC_PIPELINE_NONE. + */ + odp_ipsec_pipeline_t pipeline; + /** Classifier destination CoS for resulting packets * * Successfully decapsulated packets are sent to ----------------------------------------------------------------------- Summary of changes: include/odp/api/spec/ipsec.h | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) hooks/post-receive --

8 years, 4 months

[COMMIT] branch api-next updated. v1.15.0.0-773-gcd196cf1

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 cd196cf12f957456b24c844b2c38be5062130cf1 (commit) via dee4a7512c21a8b7f15a4a05e6736de373df92f0 (commit) via f70ff3bc542961d52f9b0f867298014650c8e49e (commit) via 700c0ac917fedf532e9a7e21c42624faa4b09a5f (commit) via 20aba9a17664fb8d5261bece23a1c20f1a3465f7 (commit) via ce4bd52afcef245b069acfe8dc53bd62aec576fd (commit) via 01b5f7e0c0bcec5beb58c99573906b1a4ee8e5f0 (commit) via 5e8f87ae22ca0c3e6137f91f15c967aec958a67e (commit) via 9e10a562dfb67b7a37c67fecff3de00be798961a (commit) via 86d651b86c10dd77603354110644ad346dfb3e26 (commit) via bc3cad50ec6668064bae1af164875c93832caff8 (commit) via 9c747985d4c448ef737376c5c8180b78ae1e7378 (commit) via 698f370e71db55624e1bd78063569369f86db389 (commit) from edca8cd1e55898826f79383b689c2c4bd2c28b3a (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 cd196cf12f957456b24c844b2c38be5062130cf1 Author: Bogdan Pricope <bogdan.pricope(a)linaro.org> Date: Thu Oct 19 10:32:24 2017 +0300 linux-gen: pktio: tap: implement MAC address set operation Implement MAC address set function and set corresponding capability flag. Signed-off-by: Bogdan Pricope <bogdan.pricope(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/pktio/tap.c b/platform/linux-generic/pktio/tap.c index 2fda0b81..d8b78f3f 100644 --- a/platform/linux-generic/pktio/tap.c +++ b/platform/linux-generic/pktio/tap.c @@ -59,6 +59,29 @@ static int gen_random_mac(unsigned char *mac) return 0; } +static int mac_addr_set_fd(int fd, const char *name, + const unsigned char mac_dst[]) +{ + struct ifreq ethreq; + int ret; + + memset(&ethreq, 0, sizeof(ethreq)); + snprintf(ethreq.ifr_name, IF_NAMESIZE, "%s", name); + + ethreq.ifr_hwaddr.sa_family = AF_UNIX; + memcpy(ethreq.ifr_hwaddr.sa_data, mac_dst, ETH_ALEN); + + ret = ioctl(fd, SIOCSIFHWADDR, &ethreq); + if (ret != 0) { + __odp_errno = errno; + ODP_ERR("ioctl(SIOCSIFHWADDR): %s: \"%s\".\n", strerror(errno), + ethreq.ifr_name); + return -1; + } + + return 0; +} + static int tap_pktio_open(odp_pktio_t id ODP_UNUSED, pktio_entry_t *pktio_entry, const char *devname, odp_pool_t pool) @@ -406,6 +429,16 @@ static int tap_mac_addr_get(pktio_entry_t *pktio_entry, void *mac_addr) return ETH_ALEN; } +static int tap_mac_addr_set(pktio_entry_t *pktio_entry, const void *mac_addr) +{ + pkt_tap_t *tap = &pktio_entry->s.pkt_tap; + + memcpy(tap->if_mac, mac_addr, ETH_ALEN); + + return mac_addr_set_fd(tap->fd, (char *)pktio_entry->s.name + 4, + tap->if_mac); +} + static int tap_link_status(pktio_entry_t *pktio_entry) { return link_status_fd(pktio_entry->s.pkt_tap.skfd, @@ -420,6 +453,7 @@ static int tap_capability(pktio_entry_t *pktio_entry ODP_UNUSED, capa->max_input_queues = 1; capa->max_output_queues = 1; capa->set_op.op.promisc_mode = 1; + capa->set_op.op.mac_addr = 1; odp_pktio_config_init(&capa->config); capa->config.pktin.bit.ts_all = 1; @@ -443,7 +477,7 @@ const pktio_if_ops_t tap_pktio_ops = { .promisc_mode_set = tap_promisc_mode_set, .promisc_mode_get = tap_promisc_mode_get, .mac_get = tap_mac_addr_get, - .mac_set = NULL, + .mac_set = tap_mac_addr_set, .link_status = tap_link_status, .capability = tap_capability, .pktin_ts_res = NULL, commit dee4a7512c21a8b7f15a4a05e6736de373df92f0 Author: Bogdan Pricope <bogdan.pricope(a)linaro.org> Date: Mon Oct 16 08:53:59 2017 +0300 linux-gen: pktio: tap: implement link status operation Implement link status tap pktio operation. Signed-off-by: Bogdan Pricope <bogdan.pricope(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/pktio/tap.c b/platform/linux-generic/pktio/tap.c index 8ddd757d..2fda0b81 100644 --- a/platform/linux-generic/pktio/tap.c +++ b/platform/linux-generic/pktio/tap.c @@ -406,6 +406,12 @@ static int tap_mac_addr_get(pktio_entry_t *pktio_entry, void *mac_addr) return ETH_ALEN; } +static int tap_link_status(pktio_entry_t *pktio_entry) +{ + return link_status_fd(pktio_entry->s.pkt_tap.skfd, + pktio_entry->s.name + 4); +} + static int tap_capability(pktio_entry_t *pktio_entry ODP_UNUSED, odp_pktio_capability_t *capa) { @@ -438,6 +444,7 @@ const pktio_if_ops_t tap_pktio_ops = { .promisc_mode_get = tap_promisc_mode_get, .mac_get = tap_mac_addr_get, .mac_set = NULL, + .link_status = tap_link_status, .capability = tap_capability, .pktin_ts_res = NULL, .pktin_ts_from_ns = NULL, commit f70ff3bc542961d52f9b0f867298014650c8e49e Author: Bogdan Pricope <bogdan.pricope(a)linaro.org> Date: Thu Oct 12 15:56:26 2017 +0300 linux-gen: pktio: tap: implement start/stop operations Implement start/stop tap pktio operations. Signed-off-by: Bogdan Pricope <bogdan.pricope(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/pktio/tap.c b/platform/linux-generic/pktio/tap.c index ed447944..8ddd757d 100644 --- a/platform/linux-generic/pktio/tap.c +++ b/platform/linux-generic/pktio/tap.c @@ -134,8 +134,30 @@ static int tap_pktio_open(odp_pktio_t id ODP_UNUSED, goto sock_err; } - /* Up interface by default. */ - if (ioctl(skfd, SIOCGIFFLAGS, &ifr) < 0) { + tap->fd = fd; + tap->skfd = skfd; + tap->mtu = mtu; + tap->pool = pool; + return 0; +sock_err: + close(skfd); +tap_err: + close(fd); + ODP_ERR("Tap device alloc failed.\n"); + return -1; +} + +static int tap_pktio_start(pktio_entry_t *pktio_entry) +{ + struct ifreq ifr; + pkt_tap_t *tap = &pktio_entry->s.pkt_tap; + + odp_memset(&ifr, 0, sizeof(ifr)); + snprintf(ifr.ifr_name, IF_NAMESIZE, "%s", + (char *)pktio_entry->s.name + 4); + + /* Up interface by default. */ + if (ioctl(tap->skfd, SIOCGIFFLAGS, &ifr) < 0) { __odp_errno = errno; ODP_ERR("ioctl(SIOCGIFFLAGS) failed: %s\n", strerror(errno)); goto sock_err; @@ -144,22 +166,46 @@ static int tap_pktio_open(odp_pktio_t id ODP_UNUSED, ifr.ifr_flags |= IFF_UP; ifr.ifr_flags |= IFF_RUNNING; - if (ioctl(skfd, SIOCSIFFLAGS, &ifr) < 0) { + if (ioctl(tap->skfd, SIOCSIFFLAGS, &ifr) < 0) { __odp_errno = errno; ODP_ERR("failed to come up: %s\n", strerror(errno)); goto sock_err; } - tap->fd = fd; - tap->skfd = skfd; - tap->mtu = mtu; - tap->pool = pool; return 0; sock_err: - close(skfd); -tap_err: - close(fd); - ODP_ERR("Tap device alloc failed.\n"); + ODP_ERR("Tap device open failed.\n"); + return -1; +} + +static int tap_pktio_stop(pktio_entry_t *pktio_entry) +{ + struct ifreq ifr; + pkt_tap_t *tap = &pktio_entry->s.pkt_tap; + + odp_memset(&ifr, 0, sizeof(ifr)); + snprintf(ifr.ifr_name, IF_NAMESIZE, "%s", + (char *)pktio_entry->s.name + 4); + + /* Up interface by default. */ + if (ioctl(tap->skfd, SIOCGIFFLAGS, &ifr) < 0) { + __odp_errno = errno; + ODP_ERR("ioctl(SIOCGIFFLAGS) failed: %s\n", strerror(errno)); + goto sock_err; + } + + ifr.ifr_flags &= ~IFF_UP; + ifr.ifr_flags &= ~IFF_RUNNING; + + if (ioctl(tap->skfd, SIOCSIFFLAGS, &ifr) < 0) { + __odp_errno = errno; + ODP_ERR("failed to come up: %s\n", strerror(errno)); + goto sock_err; + } + + return 0; +sock_err: + ODP_ERR("Tap device open failed.\n"); return -1; } @@ -383,8 +429,8 @@ const pktio_if_ops_t tap_pktio_ops = { .term = NULL, .open = tap_pktio_open, .close = tap_pktio_close, - .start = NULL, - .stop = NULL, + .start = tap_pktio_start, + .stop = tap_pktio_stop, .recv = tap_pktio_recv, .send = tap_pktio_send, .mtu_get = tap_mtu_get, commit 700c0ac917fedf532e9a7e21c42624faa4b09a5f Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Thu Jul 6 13:39:22 2017 +0300 linux-gen: pktio: loop: support IPsec inbound inline Add support for inbound inline IPsec packet processing on loop interface. 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/pktio/loop.c b/platform/linux-generic/pktio/loop.c index f36dcee4..8bb4b4f1 100644 --- a/platform/linux-generic/pktio/loop.c +++ b/platform/linux-generic/pktio/loop.c @@ -135,6 +135,12 @@ static int loopback_recv(pktio_entry_t *pktio_entry, int index ODP_UNUSED, packet_set_ts(pkt_hdr, ts); pkt_hdr->input = pktio_entry->s.handle; + + /* Try IPsec inline processing */ + if (pktio_entry->s.config.inbound_ipsec && + odp_packet_has_ipsec(pkt)) + _odp_ipsec_try_inline(pkt); + pktio_entry->s.stats.in_octets += pkt_len; pkts[num_rx++] = pkt; } @@ -229,6 +235,7 @@ static int loopback_capability(pktio_entry_t *pktio_entry ODP_UNUSED, odp_pktio_config_init(&capa->config); capa->config.pktin.bit.ts_all = 1; capa->config.pktin.bit.ts_ptp = 1; + capa->config.inbound_ipsec = 1; capa->config.outbound_ipsec = 1; return 0; commit 20aba9a17664fb8d5261bece23a1c20f1a3465f7 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Thu Jul 6 13:39:22 2017 +0300 linux-gen: pktio: loop: support IPsec outbound inline Add support for outbound inline IPsec packet processing on loop interface. 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/pktio/loop.c b/platform/linux-generic/pktio/loop.c index eba6d3b0..f36dcee4 100644 --- a/platform/linux-generic/pktio/loop.c +++ b/platform/linux-generic/pktio/loop.c @@ -164,6 +164,22 @@ static int loopback_send(pktio_entry_t *pktio_entry, int index ODP_UNUSED, bytes += odp_packet_len(pkt_tbl[i]); } + if (pktio_entry->s.config.outbound_ipsec) + for (i = 0; i < len; ++i) { + odp_buffer_t buf = buf_from_buf_hdr(hdr_tbl[i]); + odp_ipsec_packet_result_t result; + + if (_odp_buffer_event_subtype(buf) != + ODP_EVENT_PACKET_IPSEC) + continue; + + /* Possibly postprocessing packet */ + odp_ipsec_result(&result, pkt_tbl[i]); + + _odp_buffer_event_subtype_set(buf, + ODP_EVENT_PACKET_BASIC); + } + odp_ticketlock_lock(&pktio_entry->s.txl); queue = queue_fn->from_ext(pktio_entry->s.pkt_loop.loopq); @@ -213,6 +229,8 @@ static int loopback_capability(pktio_entry_t *pktio_entry ODP_UNUSED, odp_pktio_config_init(&capa->config); capa->config.pktin.bit.ts_all = 1; capa->config.pktin.bit.ts_ptp = 1; + capa->config.outbound_ipsec = 1; + return 0; } commit ce4bd52afcef245b069acfe8dc53bd62aec576fd Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Thu Mar 9 14:57:14 2017 +0300 linux-generic: ipsec: draft IPsec implementation For now it's only a preview with the following limitation: - Only IPv4 support - No pipeline_cls and outer header retaining support - No zeroing of mutable IPv4 options for AH ICV calculation - No replay protection - No ESN support - No UDP encapsulation support 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/include/odp_ipsec_internal.h b/platform/linux-generic/include/odp_ipsec_internal.h index 64ef8ab7..1340ca7b 100644 --- a/platform/linux-generic/include/odp_ipsec_internal.h +++ b/platform/linux-generic/include/odp_ipsec_internal.h @@ -182,6 +182,14 @@ ipsec_sa_t *_odp_ipsec_sa_lookup(const ipsec_sa_lookup_t *lookup); int _odp_ipsec_sa_update_stats(ipsec_sa_t *ipsec_sa, uint32_t len, odp_ipsec_op_status_t *status); +/** + * Try inline IPsec processing of provided packet. + * + * @retval 0 if packet was processed and will be queue using IPsec inline + * processing + */ +int _odp_ipsec_try_inline(odp_packet_t pkt); + /** * @} */ diff --git a/platform/linux-generic/include/odp_packet_internal.h b/platform/linux-generic/include/odp_packet_internal.h index 051b2b20..e2ef1363 100644 --- a/platform/linux-generic/include/odp_packet_internal.h +++ b/platform/linux-generic/include/odp_packet_internal.h @@ -26,6 +26,7 @@ extern "C" { #include <odp/api/packet_io.h> #include <odp/api/crypto.h> #include <odp_crypto_internal.h> +#include <odp_ipsec_internal.h> #include <odp/api/plat/packet_types.h> #include <odp_queue_if.h> @@ -151,6 +152,9 @@ typedef struct { uint8_t extra[PKT_EXTRA_LEN] ODP_ALIGNED_CACHE; #endif + /* Context for IPsec */ + odp_ipsec_packet_result_t ipsec_ctx; + /* Packet data storage */ uint8_t data[0]; } odp_packet_hdr_t; diff --git a/platform/linux-generic/odp_ipsec.c b/platform/linux-generic/odp_ipsec.c index d0ca027c..e57736c2 100644 --- a/platform/linux-generic/odp_ipsec.c +++ b/platform/linux-generic/odp_ipsec.c @@ -4,127 +4,1264 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include <odp/api/ipsec.h> +#include <odp/api/plat/packet_inlines.h> + +#include <odp_debug_internal.h> +#include <odp_packet_internal.h> #include <odp_ipsec_internal.h> +#include <protocols/eth.h> +#include <protocols/ip.h> +#include <protocols/ipsec.h> + #include <string.h> +typedef struct ODP_PACKED { + odp_u32be_t spi; /**< Security Parameter Index */ + odp_u32be_t seq_no; /**< Sequence Number */ +} ipsec_aad_t; + int odp_ipsec_capability(odp_ipsec_capability_t *capa) { + int rc; + odp_crypto_capability_t crypto_capa; + odp_queue_capability_t queue_capa; + memset(capa, 0, sizeof(odp_ipsec_capability_t)); + capa->op_mode_sync = ODP_SUPPORT_PREFERRED; + capa->op_mode_async = ODP_SUPPORT_PREFERRED; + capa->op_mode_inline_in = ODP_SUPPORT_PREFERRED; + capa->op_mode_inline_out = ODP_SUPPORT_PREFERRED; + + capa->proto_ah = ODP_SUPPORT_YES; + + capa->max_num_sa = ODP_CONFIG_IPSEC_SAS; + + rc = odp_crypto_capability(&crypto_capa); + if (rc < 0) + return rc; + + capa->ciphers = crypto_capa.ciphers; + capa->auths = crypto_capa.auths; + + rc = odp_queue_capability(&queue_capa); + if (rc < 0) + return rc; + + capa->max_queues = queue_capa.max_queues; + return 0; } int odp_ipsec_cipher_capability(odp_cipher_alg_t cipher, odp_crypto_cipher_capability_t capa[], int num) { - (void)cipher; - (void)capa; - (void)num; - - return -1; + return odp_crypto_cipher_capability(cipher, capa, num); } int odp_ipsec_auth_capability(odp_auth_alg_t auth, odp_crypto_auth_capability_t capa[], int num) { - (void)auth; - (void)capa; - (void)num; - - return -1; + return odp_crypto_auth_capability(auth, capa, num); } void odp_ipsec_config_init(odp_ipsec_config_t *config) { memset(config, 0, sizeof(odp_ipsec_config_t)); + config->inbound_mode = ODP_IPSEC_OP_MODE_SYNC; + config->outbound_mode = ODP_IPSEC_OP_MODE_SYNC; + config->max_num_sa = ODP_CONFIG_IPSEC_SAS; + config->inbound.default_queue = ODP_QUEUE_INVALID; + config->inbound.lookup.min_spi = 0; + config->inbound.lookup.max_spi = UINT32_MAX; } +static odp_ipsec_config_t ipsec_config; + int odp_ipsec_config(const odp_ipsec_config_t *config) { - (void)config; + if (ODP_CONFIG_IPSEC_SAS > config->max_num_sa) + return -1; + + ipsec_config = *config; + + return 0; +} + +static odp_ipsec_packet_result_t *ipsec_pkt_result(odp_packet_t packet) +{ + ODP_ASSERT(ODP_EVENT_PACKET_IPSEC == + odp_event_subtype(odp_packet_to_event(packet))); + + return &odp_packet_hdr(packet)->ipsec_ctx; +} + +/** + * Checksum + * + * @param buffer calculate chksum for buffer + * @param len buffer length + * + * @return checksum value in network order + */ +static inline +odp_u16sum_t _odp_chksum(void *buffer, int len) +{ + uint16_t *buf = (uint16_t *)buffer; + uint32_t sum = 0; + uint16_t result; + + for (sum = 0; len > 1; len -= 2) + sum += *buf++; + + if (len == 1) + sum += *(unsigned char *)buf; + + sum = (sum >> 16) + (sum & 0xFFFF); + sum += (sum >> 16); + result = ~sum; + + return (__odp_force odp_u16sum_t) result; +} + +static inline int _odp_ipv4_csum(odp_packet_t pkt, + uint32_t offset, + _odp_ipv4hdr_t *ip, + odp_u16sum_t *chksum) +{ + unsigned nleft = _ODP_IPV4HDR_IHL(ip->ver_ihl) * 4; + uint16_t buf[nleft / 2]; + int res; + + if (odp_unlikely(nleft < sizeof(*ip))) + return -1; + ip->chksum = 0; + memcpy(buf, ip, sizeof(*ip)); + res = odp_packet_copy_to_mem(pkt, offset + sizeof(*ip), + nleft - sizeof(*ip), + buf + sizeof(*ip) / 2); + if (odp_unlikely(res < 0)) + return res; + + *chksum = _odp_chksum(buf, nleft); + + return 0; +} + +/** @internal Checksum offset in IPv4 header */ +#define _ODP_IPV4HDR_CSUM_OFFSET 10 + +/** + * Calculate and fill in IPv4 checksum + * + * @param pkt ODP packet + * + * @retval 0 on success + * @retval <0 on failure + */ +static inline int _odp_ipv4_csum_update(odp_packet_t pkt) +{ + uint32_t offset; + _odp_ipv4hdr_t ip; + odp_u16sum_t chksum; + int res; + + offset = odp_packet_l3_offset(pkt); + if (offset == ODP_PACKET_OFFSET_INVALID) + return -1; + + res = odp_packet_copy_to_mem(pkt, offset, sizeof(ip), &ip); + if (odp_unlikely(res < 0)) + return res; + + res = _odp_ipv4_csum(pkt, offset, &ip, &chksum); + if (odp_unlikely(res < 0)) + return res; + + return odp_packet_copy_from_mem(pkt, + offset + _ODP_IPV4HDR_CSUM_OFFSET, + 2, &chksum); +} + +#define ipv4_hdr_len(ip) (_ODP_IPV4HDR_IHL(ip->ver_ihl) * 4) +static inline +void ipv4_adjust_len(_odp_ipv4hdr_t *ip, int adj) +{ + ip->tot_len = odp_cpu_to_be_16(odp_be_to_cpu_16(ip->tot_len) + adj); +} + +static const uint8_t ipsec_padding[255] = { + 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, 0x5c, 0x5d, 0x5e, 0x5f, + 0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, + 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, + 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, + 0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f, + 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, + 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, + 0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, + 0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f, + 0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, + 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, + 0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7, + 0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf, + 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, + 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, + 0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, + 0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf, + 0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, + 0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef, + 0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, + 0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff, +}; + +static inline odp_pktio_parser_layer_t parse_layer(odp_ipsec_proto_layer_t l) +{ + switch (l) { + case ODP_IPSEC_LAYER_NONE: + return ODP_PKTIO_PARSER_LAYER_NONE; + case ODP_IPSEC_LAYER_L2: + return ODP_PKTIO_PARSER_LAYER_L2; + case ODP_IPSEC_LAYER_L3: + return ODP_PKTIO_PARSER_LAYER_L3; + case ODP_IPSEC_LAYER_L4: + return ODP_PKTIO_PARSER_LAYER_L4; + case ODP_IPSEC_LAYER_ALL: + return ODP_PKTIO_PARSER_LAYER_ALL; + } + + return ODP_PKTIO_PARSER_LAYER_NONE; +} + +static ipsec_sa_t *ipsec_in_single(odp_packet_t pkt, + odp_ipsec_sa_t sa, + odp_packet_t *pkt_out, + odp_ipsec_op_status_t *status) +{ + ipsec_sa_t *ipsec_sa = NULL; + uint32_t ip_offset = odp_packet_l3_offset(pkt); + _odp_ipv4hdr_t *ip = odp_packet_l3_ptr(pkt, NULL); + uint16_t ip_hdr_len = ipv4_hdr_len(ip); + odp_crypto_packet_op_param_t param; + int rc; + unsigned stats_length; + uint16_t ipsec_offset; /**< Offset of IPsec header from + buffer start */ + uint8_t iv[MAX_IV_LEN]; /**< ESP IV storage */ + ipsec_aad_t aad; /**< AAD, note ESN is not fully supported */ + unsigned hdr_len; /**< Length of IPsec headers */ + unsigned trl_len; /**< Length of IPsec trailers */ + uint8_t ip_tos; /**< Saved IP TOS value */ + uint8_t ip_ttl; /**< Saved IP TTL value */ + uint16_t ip_frag_offset; /**< Saved IP flags value */ + odp_crypto_packet_result_t crypto; /**< Crypto operation result */ + + ODP_ASSERT(ODP_PACKET_OFFSET_INVALID != ip_offset); + ODP_ASSERT(NULL != ip); - return -1; + ip_tos = 0; + ip_ttl = 0; + ip_frag_offset = 0; + + /* Initialize parameters block */ + memset(&param, 0, sizeof(param)); + + ipsec_offset = ip_offset + ip_hdr_len; + + if (_ODP_IPV4HDR_IS_FRAGMENT(odp_be_to_cpu_16(ip->frag_offset))) { + status->error.proto = 1; + goto out; + } + + /* Check IP header for IPSec protocols and look it up */ + if (_ODP_IPPROTO_ESP == ip->proto) { + _odp_esphdr_t esp; + + if (odp_packet_copy_to_mem(pkt, ipsec_offset, + sizeof(esp), &esp) < 0) { + status->error.alg = 1; + goto out; + } + + if (ODP_IPSEC_SA_INVALID == sa) { + ipsec_sa_lookup_t lookup; + + lookup.proto = ODP_IPSEC_ESP; + lookup.spi = odp_be_to_cpu_32(esp.spi); + lookup.dst_addr = &ip->dst_addr; + + ipsec_sa = _odp_ipsec_sa_lookup(&lookup); + if (NULL == ipsec_sa) { + status->error.sa_lookup = 1; + goto out; + } + } else { + ipsec_sa = _odp_ipsec_sa_use(sa); + ODP_ASSERT(NULL != ipsec_sa); + if (ipsec_sa->proto != ODP_IPSEC_ESP || + ipsec_sa->spi != odp_be_to_cpu_32(esp.spi)) { + status->error.proto = 1; + goto out; + } + } + + memcpy(iv, ipsec_sa->salt, ipsec_sa->salt_length); + if (odp_packet_copy_to_mem(pkt, + ipsec_offset + _ODP_ESPHDR_LEN, + ipsec_sa->esp_iv_len, + iv + ipsec_sa->salt_length) < 0) { + status->error.alg = 1; + goto out; + } + + hdr_len = _ODP_ESPHDR_LEN + ipsec_sa->esp_iv_len; + trl_len = _ODP_ESPTRL_LEN + ipsec_sa->icv_len; + + param.cipher_range.offset = ipsec_offset + hdr_len; + param.cipher_range.length = odp_be_to_cpu_16(ip->tot_len) - + ip_hdr_len - + hdr_len - + ipsec_sa->icv_len; + param.override_iv_ptr = iv; + + aad.spi = esp.spi; + aad.seq_no = esp.seq_no; + + param.aad.ptr = (uint8_t *)&aad; + param.aad.length = sizeof(aad); + + param.auth_range.offset = ipsec_offset; + param.auth_range.length = odp_be_to_cpu_16(ip->tot_len) - + ip_hdr_len - + ipsec_sa->icv_len; + param.hash_result_offset = ip_offset + + odp_be_to_cpu_16(ip->tot_len) - + ipsec_sa->icv_len; + + stats_length = param.cipher_range.length; + } else if (_ODP_IPPROTO_AH == ip->proto) { + _odp_ahhdr_t ah; + + if (odp_packet_copy_to_mem(pkt, ipsec_offset, + sizeof(ah), &ah) < 0) { + status->error.alg = 1; + goto out; + } + + if (ODP_IPSEC_SA_INVALID == sa) { + ipsec_sa_lookup_t lookup; + + lookup.proto = ODP_IPSEC_AH; + lookup.spi = odp_be_to_cpu_32(ah.spi); + lookup.dst_addr = &ip->dst_addr; + + ipsec_sa = _odp_ipsec_sa_lookup(&lookup); + if (NULL == ipsec_sa) { + status->error.sa_lookup = 1; + goto out; + } + } else { + ipsec_sa = _odp_ipsec_sa_use(sa); + ODP_ASSERT(NULL != ipsec_sa); + if (ipsec_sa->proto != ODP_IPSEC_AH || + ipsec_sa->spi != odp_be_to_cpu_32(ah.spi)) { + status->error.proto = 1; + goto out; + } + } + + hdr_len = (ah.ah_len + 2) * 4; + trl_len = 0; + + /* Save everything to context */ + ip_tos = ip->tos; + ip_frag_offset = odp_be_to_cpu_16(ip->frag_offset); + ip_ttl = ip->ttl; + + /* FIXME: zero copy of header, passing it to crypto! */ + /* + * If authenticating, zero the mutable fields build the request + */ + ip->chksum = 0; + ip->tos = 0; + ip->frag_offset = 0; + ip->ttl = 0; + + param.auth_range.offset = ip_offset; + param.auth_range.length = odp_be_to_cpu_16(ip->tot_len); + param.hash_result_offset = ipsec_offset + _ODP_AHHDR_LEN; + + stats_length = param.auth_range.length; + } else { + status->error.proto = 1; + goto out; + } + + if (_odp_ipsec_sa_update_stats(ipsec_sa, + stats_length, + status) < 0) + goto out; + + param.session = ipsec_sa->session; + + rc = odp_crypto_op(&pkt, &pkt, &param, 1); + if (rc < 0) { + ODP_DBG("Crypto failed\n"); + status->error.alg = 1; + goto out; + } + + rc = odp_crypto_result(&crypto, pkt); + if (rc < 0) { + ODP_DBG("Crypto failed\n"); + status->error.alg = 1; + goto out; + } + + if (!crypto.ok) { + if ((crypto.cipher_status.alg_err != + ODP_CRYPTO_ALG_ERR_NONE) || + (crypto.cipher_status.hw_err != + ODP_CRYPTO_HW_ERR_NONE)) + status->error.alg = 1; + + if ((crypto.auth_status.alg_err != + ODP_CRYPTO_ALG_ERR_NONE) || + (crypto.auth_status.hw_err != + ODP_CRYPTO_HW_ERR_NONE)) + status->error.auth = 1; + + goto out; + } + + ip_offset = odp_packet_l3_offset(pkt); + ip = odp_packet_l3_ptr(pkt, NULL); + ip_hdr_len = ipv4_hdr_len(ip); + + if (_ODP_IPPROTO_ESP == ip->proto) { + /* + * Finish cipher by finding ESP trailer and processing + */ + _odp_esptrl_t esptrl; + uint32_t esptrl_offset = ip_offset + + odp_be_to_cpu_16(ip->tot_len) - + trl_len; + + if (odp_packet_copy_to_mem(pkt, esptrl_offset, + sizeof(esptrl), &esptrl) < 0) { + status->error.proto = 1; + goto out; + } + + if (ip_offset + esptrl.pad_len > esptrl_offset) { + status->error.proto = 1; + goto out; + } + + if (_odp_packet_cmp_data(pkt, esptrl_offset - esptrl.pad_len, + ipsec_padding, esptrl.pad_len) != 0) { + status->error.proto = 1; + goto out; + } + + ip->proto = esptrl.next_header; + trl_len += esptrl.pad_len; + } else if (_ODP_IPPROTO_AH == ip->proto) { + /* + * Finish auth + */ + _odp_ahhdr_t ah; + + if (odp_packet_copy_to_mem(pkt, ipsec_offset, + sizeof(ah), &ah) < 0) { + status->error.alg = 1; + goto out; + } + + ip->proto = ah.next_header; + + /* Restore mutable fields */ + ip->ttl = ip_ttl; + ip->tos = ip_tos; + ip->frag_offset = odp_cpu_to_be_16(ip_frag_offset); + } else { + status->error.proto = 1; + goto out; + } + + if (odp_packet_trunc_tail(&pkt, trl_len, NULL, NULL) < 0) { + status->error.alg = 1; + goto out; + } + + if (ODP_IPSEC_MODE_TUNNEL == ipsec_sa->mode) { + /* We have a tunneled IPv4 packet, strip outer and IPsec + * headers */ + odp_packet_move_data(pkt, ip_hdr_len + hdr_len, 0, + ip_offset); + if (odp_packet_trunc_head(&pkt, ip_hdr_len + hdr_len, + NULL, NULL) < 0) { + status->error.alg = 1; + goto out; + } + } else { + odp_packet_move_data(pkt, hdr_len, 0, + ip_offset + ip_hdr_len); + if (odp_packet_trunc_head(&pkt, hdr_len, + NULL, NULL) < 0) { + status->error.alg = 1; + goto out; + } + } + + /* Finalize the IPv4 header */ + if (odp_packet_len(pkt) > sizeof(*ip)) { + ip = odp_packet_l3_ptr(pkt, NULL); + + if (ODP_IPSEC_MODE_TRANSPORT == ipsec_sa->mode) + ipv4_adjust_len(ip, -(hdr_len + trl_len)); + + ip->ttl -= ipsec_sa->dec_ttl; + _odp_ipv4_csum_update(pkt); + } + + if (!status->error.all) { + odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt); + + packet_parse_reset(pkt_hdr); + + packet_parse_l3_l4(pkt_hdr, parse_layer(ipsec_config.inbound.parse), + ip_offset, _ODP_ETHTYPE_IPV4); + } +out: + *pkt_out = pkt; + + return ipsec_sa; +} + +/* Generate sequence number */ +static inline +uint32_t ipsec_seq_no(ipsec_sa_t *ipsec_sa) +{ + return odp_atomic_fetch_add_u32(&ipsec_sa->out.seq, 1); +} + +/* Helper for calculating encode length using data length and block size */ +#define ESP_ENCODE_LEN(x, b) ((((x) + ((b) - 1)) / (b)) * (b)) + +static ipsec_sa_t *ipsec_out_single(odp_packet_t pkt, + odp_ipsec_sa_t sa, + odp_packet_t *pkt_out, + odp_ipsec_out_opt_t *opt ODP_UNUSED, + odp_ipsec_op_status_t *status) +{ + ipsec_sa_t *ipsec_sa = NULL; + uint32_t ip_offset = odp_packet_l3_offset(pkt); + _odp_ipv4hdr_t *ip = odp_packet_l3_ptr(pkt, NULL); + uint16_t ip_hdr_len = ipv4_hdr_len(ip); + odp_crypto_packet_op_param_t param; + unsigned stats_length; + int rc; + uint16_t ipsec_offset; /**< Offset of IPsec header from + buffer start */ + uint8_t iv[MAX_IV_LEN]; /**< ESP IV storage */ + ipsec_aad_t aad; /**< AAD, note ESN is not fully supported */ + unsigned hdr_len; /**< Length of IPsec headers */ + unsigned trl_len; /**< Length of IPsec trailers */ + uint8_t ip_tos; /**< Saved IP TOS value */ + uint8_t ip_ttl; /**< Saved IP TTL value */ + uint16_t ip_frag_offset; /**< Saved IP flags value */ + odp_crypto_packet_result_t crypto; /**< Crypto operation result */ + + ODP_ASSERT(ODP_PACKET_OFFSET_INVALID != ip_offset); + ODP_ASSERT(NULL != ip); + + ip_tos = 0; + ip_ttl = 0; + ip_frag_offset = 0; + + ipsec_sa = _odp_ipsec_sa_use(sa); + ODP_ASSERT(NULL != ipsec_sa); + + /* Initialize parameters block */ + memset(&param, 0, sizeof(param)); + + if (ODP_IPSEC_MODE_TRANSPORT == ipsec_sa->mode && + _ODP_IPV4HDR_IS_FRAGMENT(odp_be_to_cpu_16(ip->frag_offset))) { + status->error.alg = 1; + goto out; + } + + if (ODP_IPSEC_MODE_TUNNEL == ipsec_sa->mode) { + _odp_ipv4hdr_t out_ip; + uint16_t tot_len; + + ip->ttl -= ipsec_sa->dec_ttl; + + out_ip.ver_ihl = 0x45; + if (ipsec_sa->copy_dscp) + out_ip.tos = ip->tos; + else + out_ip.tos = (ip->tos & ~_ODP_IP_TOS_DSCP_MASK) | + (ipsec_sa->out.tun_dscp << + _ODP_IP_TOS_DSCP_SHIFT); + tot_len = odp_be_to_cpu_16(ip->tot_len) + _ODP_IPV4HDR_LEN; + out_ip.tot_len = odp_cpu_to_be_16(tot_len); + /* No need to convert to BE: ID just should not be duplicated */ + out_ip.id = odp_atomic_fetch_add_u32(&ipsec_sa->out.tun_hdr_id, + 1); + if (ipsec_sa->copy_df) + out_ip.frag_offset = ip->frag_offset; + else + out_ip.frag_offset = (ip->frag_offset & ~0x4000) | + (ipsec_sa->out.tun_df << 14); + out_ip.ttl = ipsec_sa->out.tun_ttl; + out_ip.proto = _ODP_IPV4; + /* Will be filled later by packet checksum update */ + out_ip.chksum = 0; + out_ip.src_addr = ipsec_sa->out.tun_src_ip; + out_ip.dst_addr = ipsec_sa->out.tun_dst_ip; + + if (odp_packet_extend_head(&pkt, _ODP_IPV4HDR_LEN, + NULL, NULL) < 0) { + status->error.alg = 1; + goto out; + } + + odp_packet_move_data(pkt, 0, _ODP_IPV4HDR_LEN, ip_offset); + + odp_packet_copy_from_mem(pkt, ip_offset, + _ODP_IPV4HDR_LEN, &out_ip); + + odp_packet_l4_offset_set(pkt, ip_offset + _ODP_IPV4HDR_LEN); + + ip = odp_packet_l3_ptr(pkt, NULL); + ip_hdr_len = _ODP_IPV4HDR_LEN; + } + + ipsec_offset = ip_offset + ip_hdr_len; + + if (ipsec_sa->proto == ODP_IPSEC_ESP) { + _odp_esphdr_t esp; + _odp_esptrl_t esptrl; + uint32_t encrypt_len; + uint16_t ip_data_len = odp_be_to_cpu_16(ip->tot_len) - + ip_hdr_len; + uint32_t pad_block = ipsec_sa->esp_block_len; + + /* ESP trailer should be 32-bit right aligned */ + if (pad_block < 4) + pad_block = 4; + + encrypt_len = ESP_ENCODE_LEN(ip_data_len + _ODP_ESPTRL_LEN, + pad_block); + + hdr_len = _ODP_ESPHDR_LEN + ipsec_sa->esp_iv_len; + trl_len = encrypt_len - + ip_data_len + + ipsec_sa->icv_len; + + if (ipsec_sa->esp_iv_len) { + uint32_t len; + + len = odp_random_data(iv + ipsec_sa->salt_length, + ipsec_sa->esp_iv_len, + ODP_RANDOM_CRYPTO); + + if (len != ipsec_sa->esp_iv_len) { + status->error.alg = 1; + goto out; + } + + memcpy(iv, ipsec_sa->salt, ipsec_sa->salt_length); + + param.override_iv_ptr = iv; + } + + if (odp_packet_extend_tail(&pkt, trl_len, NULL, NULL) < 0) { + status->error.alg = 1; + goto out; + } + + if (odp_packet_extend_head(&pkt, hdr_len, NULL, NULL) < 0) { + status->error.alg = 1; + goto out; + } + + odp_packet_move_data(pkt, 0, hdr_len, ipsec_offset); + + ip = odp_packet_l3_ptr(pkt, NULL); + + /* Set IPv4 length before authentication */ + ipv4_adjust_len(ip, hdr_len + trl_len); + + uint32_t esptrl_offset = ip_offset + + ip_hdr_len + + hdr_len + + encrypt_len - + _ODP_ESPTRL_LEN; + + memset(&esp, 0, sizeof(esp)); + esp.spi = odp_cpu_to_be_32(ipsec_sa->spi); + esp.seq_no = odp_cpu_to_be_32(ipsec_seq_no(ipsec_sa)); + + aad.spi = esp.spi; + aad.seq_no = esp.seq_no; + + param.aad.ptr = (uint8_t *)&aad; + param.aad.length = sizeof(aad); + + memset(&esptrl, 0, sizeof(esptrl)); + esptrl.pad_len = encrypt_len - ip_data_len - _ODP_ESPTRL_LEN; + esptrl.next_header = ip->proto; + ip->proto = _ODP_IPPROTO_ESP; + + odp_packet_copy_from_mem(pkt, + ipsec_offset, _ODP_ESPHDR_LEN, + &esp); + memcpy(iv, ipsec_sa->salt, ipsec_sa->salt_length); + odp_packet_copy_from_mem(pkt, + ipsec_offset + _ODP_ESPHDR_LEN, + ipsec_sa->esp_iv_len, + iv + ipsec_sa->salt_length); + odp_packet_copy_from_mem(pkt, + esptrl_offset - esptrl.pad_len, + esptrl.pad_len, ipsec_padding); + odp_packet_copy_from_mem(pkt, + esptrl_offset, _ODP_ESPTRL_LEN, + &esptrl); + + param.cipher_range.offset = ipsec_offset + hdr_len; + param.cipher_range.length = odp_be_to_cpu_16(ip->tot_len) - + ip_hdr_len - + hdr_len - + ipsec_sa->icv_len; + + param.auth_range.offset = ipsec_offset; + param.auth_range.length = odp_be_to_cpu_16(ip->tot_len) - + ip_hdr_len - + ipsec_sa->icv_len; + param.hash_result_offset = ip_offset + + odp_be_to_cpu_16(ip->tot_len) - + ipsec_sa->icv_len; + + stats_length = param.cipher_range.length; + } else if (ipsec_sa->proto == ODP_IPSEC_AH) { + _odp_ahhdr_t ah; + + hdr_len = _ODP_AHHDR_LEN + ipsec_sa->icv_len; + trl_len = 0; + + /* Save IPv4 stuff */ + ip_tos = ip->tos; + ip_frag_offset = odp_be_to_cpu_16(ip->frag_offset); + ip_ttl = ip->ttl; + + if (odp_packet_extend_tail(&pkt, trl_len, NULL, NULL) < 0) { + status->error.alg = 1; + goto out; + } + + if (odp_packet_extend_head(&pkt, hdr_len, NULL, NULL) < 0) { + status->error.alg = 1; + goto out; + } + + odp_packet_move_data(pkt, 0, hdr_len, ipsec_offset); + + ip = odp_packet_l3_ptr(pkt, NULL); + + /* Set IPv4 length before authentication */ + ipv4_adjust_len(ip, hdr_len + trl_len); + + memset(&ah, 0, sizeof(ah)); + ah.spi = odp_cpu_to_be_32(ipsec_sa->spi); + ah.ah_len = 1 + (ipsec_sa->icv_len / 4); + ah.seq_no = odp_cpu_to_be_32(ipsec_seq_no(ipsec_sa)); + ah.next_header = ip->proto; + ip->proto = _ODP_IPPROTO_AH; + + odp_packet_copy_from_mem(pkt, + ipsec_offset, _ODP_AHHDR_LEN, + &ah); + _odp_packet_set_data(pkt, + ipsec_offset + _ODP_AHHDR_LEN, + 0, ipsec_sa->icv_len); + + ip->chksum = 0; + ip->tos = 0; + ip->frag_offset = 0; + ip->ttl = 0; + + param.auth_range.offset = ip_offset; + param.auth_range.length = odp_be_to_cpu_16(ip->tot_len); + param.hash_result_offset = ipsec_offset + _ODP_AHHDR_LEN; + + stats_length = param.auth_range.length; + } else { + status->error.alg = 1; + goto out; + } + + if (_odp_ipsec_sa_update_stats(ipsec_sa, + stats_length, + status) < 0) + goto out; + + param.session = ipsec_sa->session; + + rc = odp_crypto_op(&pkt, &pkt, &param, 1); + if (rc < 0) { + ODP_DBG("Crypto failed\n"); + status->error.alg = 1; + goto out; + } + + rc = odp_crypto_result(&crypto, pkt); + if (rc < 0) { + ODP_DBG("Crypto failed\n"); + status->error.alg = 1; + goto out; + } + + if (!crypto.ok) { + if ((crypto.cipher_status.alg_err != + ODP_CRYPTO_ALG_ERR_NONE) || + (crypto.cipher_status.hw_err != + ODP_CRYPTO_HW_ERR_NONE)) + status->error.alg = 1; + + if ((crypto.auth_status.alg_err != + ODP_CRYPTO_ALG_ERR_NONE) || + (crypto.auth_status.hw_err != + ODP_CRYPTO_HW_ERR_NONE)) + status->error.auth = 1; + + goto out; + } + + ip = odp_packet_l3_ptr(pkt, NULL); + + /* Finalize the IPv4 header */ + if (ip->proto == _ODP_IPPROTO_AH) { + ip->ttl = ip_ttl; + ip->tos = ip_tos; + ip->frag_offset = odp_cpu_to_be_16(ip_frag_offset); + } + + _odp_ipv4_csum_update(pkt); + +out: + + *pkt_out = pkt; + return ipsec_sa; } int odp_ipsec_in(const odp_packet_t pkt_in[], int num_in, odp_packet_t pkt_out[], int *num_out, const odp_ipsec_in_param_t *param) { - (void)pkt_in; - (void)num_in; - (void)pkt_out; - (void)num_out; - (void)param; + int in_pkt = 0; + int out_pkt = 0; + int max_out = *num_out; + unsigned sa_idx = 0; + unsigned sa_inc = (param->num_sa > 1) ? 1 : 0; + + while (in_pkt < num_in && out_pkt < max_out) { + odp_packet_t pkt = pkt_in[in_pkt]; + odp_ipsec_op_status_t status; + odp_ipsec_sa_t sa; + ipsec_sa_t *ipsec_sa; + odp_ipsec_packet_result_t *result; + + memset(&status, 0, sizeof(status)); + + if (0 == param->num_sa) { + sa = ODP_IPSEC_SA_INVALID; + } else { + sa = param->sa[sa_idx++]; + ODP_ASSERT(ODP_IPSEC_SA_INVALID != sa); + } + + ipsec_sa = ipsec_in_single(pkt, sa, &pkt, &status); + + _odp_buffer_event_subtype_set(packet_to_buffer(pkt), + ODP_EVENT_PACKET_IPSEC); + result = ipsec_pkt_result(pkt); + memset(result, 0, sizeof(*result)); + result->status = status; + if (NULL != ipsec_sa) + result->sa = ipsec_sa->ipsec_sa_hdl; + else + result->sa = ODP_IPSEC_SA_INVALID; + + pkt_out[out_pkt] = pkt; + in_pkt++; + out_pkt++; + sa_idx += sa_inc; + + /* Last thing */ + if (NULL != ipsec_sa) + _odp_ipsec_sa_unuse(ipsec_sa); + } - return -1; + *num_out = out_pkt; + + return in_pkt; } +static odp_ipsec_out_opt_t default_opt = { + .mode = ODP_IPSEC_FRAG_DISABLED, +}; + int odp_ipsec_out(const odp_packet_t pkt_in[], int num_in, odp_packet_t pkt_out[], int *num_out, const odp_ipsec_out_param_t *param) { - (void)pkt_in; - (void)num_in; - (void)pkt_out; - (void)num_out; - (void)param; + int in_pkt = 0; + int out_pkt = 0; + int max_out = *num_out; + unsigned sa_idx = 0; + unsigned opt_idx = 0; + unsigned sa_inc = (param->num_sa > 1) ? 1 : 0; + unsigned opt_inc = (param->num_opt > 1) ? 1 : 0; + + ODP_ASSERT(param->num_sa != 0); + + while (in_pkt < num_in && out_pkt < max_out) { + odp_packet_t pkt = pkt_in[in_pkt]; + odp_ipsec_op_status_t status; + odp_ipsec_sa_t sa; + ipsec_sa_t *ipsec_sa; + odp_ipsec_packet_result_t *result; + odp_ipsec_out_opt_t *opt; + + memset(&status, 0, sizeof(status)); + + sa = param->sa[sa_idx++]; + ODP_ASSERT(ODP_IPSEC_SA_INVALID != sa); + + if (0 == param->num_opt) + opt = &default_opt; + else + opt = &param->opt[opt_idx]; + + ipsec_sa = ipsec_out_single(pkt, sa, &pkt, opt, &status); + ODP_ASSERT(NULL != ipsec_sa); - return -1; + _odp_buffer_event_subtype_set(packet_to_buffer(pkt), + ODP_EVENT_PACKET_IPSEC); + result = ipsec_pkt_result(pkt); + memset(result, 0, sizeof(*result)); + result->status = status; + result->sa = ipsec_sa->ipsec_sa_hdl; + + pkt_out[out_pkt] = pkt; + in_pkt++; + out_pkt++; + sa_idx += sa_inc; + opt_idx += opt_inc; + + /* Last thing */ + _odp_ipsec_sa_unuse(ipsec_sa); + } + + *num_out = out_pkt; + + return in_pkt; } -int odp_ipsec_in_enq(const odp_packet_t pkt[], int num, +int odp_ipsec_in_enq(const odp_packet_t pkt_in[], int num_in, const odp_ipsec_in_param_t *param) { - (void)pkt; - (void)num; - (void)param; + int in_pkt = 0; + unsigned sa_idx = 0; + unsigned sa_inc = (param->num_sa > 1) ? 1 : 0; + + while (in_pkt < num_in) { + odp_packet_t pkt = pkt_in[in_pkt]; + odp_ipsec_op_status_t status; + odp_ipsec_sa_t sa; + ipsec_sa_t *ipsec_sa; + odp_ipsec_packet_result_t *result; + odp_queue_t queue; + + memset(&status, 0, sizeof(status)); + + if (0 == param->num_sa) { + sa = ODP_IPSEC_SA_INVALID; + } else { + sa = param->sa[sa_idx++]; + ODP_ASSERT(ODP_IPSEC_SA_INVALID != sa); + } + + ipsec_sa = ipsec_in_single(pkt, sa, &pkt, &status); - return -1; + _odp_buffer_event_subtype_set(packet_to_buffer(pkt), + ODP_EVENT_PACKET_IPSEC); + result = ipsec_pkt_result(pkt); + memset(result, 0, sizeof(*result)); + result->status = status; + if (NULL != ipsec_sa) { + result->sa = ipsec_sa->ipsec_sa_hdl; + queue = ipsec_sa->queue; + } else { + result->sa = ODP_IPSEC_SA_INVALID; + queue = ipsec_config.inbound.default_queue; + } + + if (odp_queue_enq(queue, odp_ipsec_packet_to_event(pkt))) { + odp_packet_free(pkt); + break; + } + in_pkt++; + sa_idx += sa_inc; + + /* Last thing */ + if (NULL != ipsec_sa) + _odp_ipsec_sa_unuse(ipsec_sa); + } + + return in_pkt; } -int odp_ipsec_out_enq(const odp_packet_t pkt[], int num, +int odp_ipsec_out_enq(const odp_packet_t pkt_in[], int num_in, const odp_ipsec_out_param_t *param) { - (void)pkt; - (void)num; - (void)param; + int in_pkt = 0; + unsigned sa_idx = 0; + unsigned opt_idx = 0; + unsigned sa_inc = (param->num_sa > 1) ? 1 : 0; + unsigned opt_inc = (param->num_opt > 1) ? 1 : 0; + + ODP_ASSERT(param->num_sa != 0); + + while (in_pkt < num_in) { + odp_packet_t pkt = pkt_in[in_pkt]; + odp_ipsec_op_status_t status; + odp_ipsec_sa_t sa; + ipsec_sa_t *ipsec_sa; + odp_ipsec_packet_result_t *result; + odp_ipsec_out_opt_t *opt; + odp_queue_t queue; + + memset(&status, 0, sizeof(status)); + + sa = param->sa[sa_idx++]; + ODP_ASSERT(ODP_IPSEC_SA_INVALID != sa); + + if (0 == param->num_opt) + opt = &default_opt; + else + opt = &param->opt[opt_idx]; - return -1; + ipsec_sa = ipsec_out_single(pkt, sa, &pkt, opt, &status); + ODP_ASSERT(NULL != ipsec_sa); + + _odp_buffer_event_subtype_set(packet_to_buffer(pkt), + ODP_EVENT_PACKET_IPSEC); + result = ipsec_pkt_result(pkt); + memset(result, 0, sizeof(*result)); + result->status = status; + result->sa = ipsec_sa->ipsec_sa_hdl; + queue = ipsec_sa->queue; + + if (odp_queue_enq(queue, odp_ipsec_packet_to_event(pkt))) { + odp_packet_free(pkt); + break; + } + in_pkt++; + sa_idx += sa_inc; + opt_idx += opt_inc; + + /* Last thing */ + _odp_ipsec_sa_unuse(ipsec_sa); + } + + return in_pkt; } -int odp_ipsec_out_inline(const odp_packet_t pkt[], int num, +int _odp_ipsec_try_inline(odp_packet_t pkt) +{ + odp_ipsec_op_status_t status; + ipsec_sa_t *ipsec_sa; + odp_ipsec_packet_result_t *result; + odp_packet_hdr_t *pkt_hdr; + + memset(&status, 0, sizeof(status)); + + ipsec_sa = ipsec_in_single(pkt, ODP_IPSEC_SA_INVALID, &pkt, &status); + /* + * Route packet back in case of lookup failure or early error before + * lookup + */ + if (NULL == ipsec_sa) + return -1; + + _odp_buffer_event_subtype_set(packet_to_buffer(pkt), + ODP_EVENT_PACKET_IPSEC); + result = ipsec_pkt_result(pkt); + memset(result, 0, sizeof(*result)); + result->status = status; + result->sa = ipsec_sa->ipsec_sa_hdl; + + pkt_hdr = odp_packet_hdr(pkt); + pkt_hdr->p.input_flags.dst_queue = 1; + pkt_hdr->dst_queue = queue_fn->from_ext(ipsec_sa->queue); + + /* Last thing */ + _odp_ipsec_sa_unuse(ipsec_sa); + + return 0; +} + +int odp_ipsec_out_inline(const odp_packet_t pkt_in[], int num_in, const odp_ipsec_out_param_t *param, const odp_ipsec_out_inline_param_t *inline_param) { - (void)pkt; - (void)num; - (void)param; - (void)inline_param; + int in_pkt = 0; + unsigned sa_idx = 0; + unsigned opt_idx = 0; + unsigned sa_inc = (param->num_sa > 1) ? 1 : 0; + unsigned opt_inc = (param->num_opt > 1) ? 1 : 0; + + ODP_ASSERT(param->num_sa != 0); + + while (in_pkt < num_in) { + odp_packet_t pkt = pkt_in[in_pkt]; + odp_ipsec_op_status_t status; + odp_ipsec_sa_t sa; + ipsec_sa_t *ipsec_sa; + odp_ipsec_packet_result_t *result; + odp_ipsec_out_opt_t *opt; + uint32_t hdr_len, offset; + const void *ptr; + + memset(&status, 0, sizeof(status)); + + if (0 == param->num_sa) { + sa = ODP_IPSEC_SA_INVALID; + } else { + sa = param->sa[sa_idx++]; + ODP_ASSERT(ODP_IPSEC_SA_INVALID != sa); + } + + if (0 == param->num_opt) + opt = &default_opt; + else + opt = &param->opt[opt_idx]; + + hdr_len = inline_param[in_pkt].outer_hdr.len; + ptr = inline_param[in_pkt].outer_hdr.ptr; + offset = odp_packet_l3_offset(pkt); + if (offset >= hdr_len) { + if (odp_packet_trunc_head(&pkt, offset - hdr_len, + NULL, NULL) < 0) + status.error.alg = 1; + + } else { + if (odp_packet_extend_head(&pkt, hdr_len - offset, + NULL, NULL) < 0) + status.error.alg = 1; + } + + odp_packet_l3_offset_set(pkt, hdr_len); - return -1; + if (odp_packet_copy_from_mem(pkt, 0, + hdr_len, + ptr) < 0) + status.error.alg = 1; + + ipsec_sa = ipsec_out_single(pkt, sa, &pkt, opt, &status); + ODP_ASSERT(NULL != ipsec_sa); + + _odp_buffer_event_subtype_set(packet_to_buffer(pkt), + ODP_EVENT_PACKET_IPSEC); + result = ipsec_pkt_result(pkt); + memset(result, 0, sizeof(*result)); + result->sa = ipsec_sa->ipsec_sa_hdl; + result->status = status; + + if (!status.error.all) { + odp_pktout_queue_t pkqueue; + + if (odp_pktout_queue(inline_param[in_pkt].pktio, + &pkqueue, 1) < 0) { + status.error.alg = 1; + goto err; + } + + if (odp_pktout_send(pkqueue, &pkt, 1) < 0) { + status.error.alg = 1; + goto err; + } + } else { + odp_queue_t queue; + odp_buffer_t buf; +err: + buf = packet_to_buffer(pkt); + _odp_buffer_event_subtype_set(buf, + ODP_EVENT_PACKET_IPSEC); + result = ipsec_pkt_result(pkt); + memset(result, 0, sizeof(*result)); + result->sa = ipsec_sa->ipsec_sa_hdl; + result->status = status; + queue = ipsec_sa->queue; + + if (odp_queue_enq(queue, + odp_ipsec_packet_to_event(pkt))) { + odp_packet_free(pkt); + break; + } + } + in_pkt++; + sa_idx += sa_inc; + opt_idx += opt_inc; + + /* Last thing */ + _odp_ipsec_sa_unuse(ipsec_sa); + } + + return in_pkt; } int odp_ipsec_result(odp_ipsec_packet_result_t *result, odp_packet_t packet) { - (void)result; - (void)packet; + odp_ipsec_packet_result_t *res; - return -1; + ODP_ASSERT(result != NULL); + + res = ipsec_pkt_result(packet); + + /* FIXME: maybe postprocess here, setting alg error in case of crypto + * error instead of processing packet fully in ipsec_in/out_single */ + + *result = *res; + + return 0; } odp_packet_t odp_ipsec_packet_from_event(odp_event_t ev) { - (void)ev; - - return ODP_PACKET_INVALID; + return odp_packet_from_event(ev); } odp_event_t odp_ipsec_packet_to_event(odp_packet_t pkt) { - (void)pkt; - - return ODP_EVENT_INVALID; + return odp_packet_to_event(pkt); } commit 01b5f7e0c0bcec5beb58c99573906b1a4ee8e5f0 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Wed May 3 02:46:11 2017 +0300 linux-generic: ipsec: implement IPsec SAD Implement SA database and SA handling. - only IPv4 is supported for now Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 7c288791..1ac69753 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -222,6 +222,7 @@ __LIB__libodp_linux_la_SOURCES = \ odp_impl.c \ odp_ipsec.c \ odp_ipsec_events.c \ + odp_ipsec_sad.c \ odp_name_table.c \ odp_packet.c \ odp_packet_flags.c \ diff --git a/platform/linux-generic/include/odp_internal.h b/platform/linux-generic/include/odp_internal.h index a959e666..d01b4f15 100644 --- a/platform/linux-generic/include/odp_internal.h +++ b/platform/linux-generic/include/odp_internal.h @@ -75,6 +75,7 @@ enum init_stage { TRAFFIC_MNGR_INIT, NAME_TABLE_INIT, IPSEC_EVENTS_INIT, + IPSEC_SAD_INIT, MODULES_INIT, ALL_INIT /* All init stages completed */ }; @@ -134,6 +135,9 @@ int _odp_ishm_init_local(void); int _odp_ishm_term_global(void); int _odp_ishm_term_local(void); +int _odp_ipsec_sad_init_global(void); +int _odp_ipsec_sad_term_global(void); + int _odp_ipsec_events_init_global(void); int _odp_ipsec_events_term_global(void); diff --git a/platform/linux-generic/include/odp_ipsec_internal.h b/platform/linux-generic/include/odp_ipsec_internal.h index b31f048f..64ef8ab7 100644 --- a/platform/linux-generic/include/odp_ipsec_internal.h +++ b/platform/linux-generic/include/odp_ipsec_internal.h @@ -20,7 +20,9 @@ extern "C" { #include <odp/api/std_types.h> #include <odp/api/plat/strong_types.h> +#include <odp/api/byteorder.h> #include <odp/api/ipsec.h> +#include <odp/api/ticketlock.h> /** @ingroup odp_ipsec * @{ @@ -31,6 +33,8 @@ typedef ODP_HANDLE_T(ipsec_status_t); #define ODP_IPSEC_STATUS_INVALID \ _odp_cast_scalar(ipsec_status_t, 0xffffffff) +typedef struct ipsec_sa_s ipsec_sa_t; + /** * @internal Get ipsec_status handle from event * @@ -73,6 +77,111 @@ int _odp_ipsec_status_send(odp_queue_t queue, int result, odp_ipsec_warn_t warn); +#define IPSEC_MAX_IV_LEN 32 /**< Maximum IV length in bytes */ + +#define IPSEC_MAX_SALT_LEN 4 /**< Maximum salt length in bytes */ + +/** + * Maximum number of available SAs + */ +#define ODP_CONFIG_IPSEC_SAS 8 + +struct ipsec_sa_s { + odp_atomic_u32_t state ODP_ALIGNED_CACHE; + + uint32_t ipsec_sa_idx; + odp_ipsec_sa_t ipsec_sa_hdl; + + odp_ipsec_protocol_t proto; + uint32_t spi; + + odp_ipsec_mode_t mode; + + /* Limits */ + uint64_t soft_limit_bytes; + uint64_t soft_limit_packets; + uint64_t hard_limit_bytes; + uint64_t hard_limit_packets; + + /* Statistics for soft/hard expiration */ + odp_atomic_u64_t bytes; + odp_atomic_u64_t packets; + + odp_crypto_session_t session; + void *context; + odp_queue_t queue; + + uint32_t icv_len; + uint32_t esp_iv_len; + uint32_t esp_block_len; + + uint8_t salt[IPSEC_MAX_SALT_LEN]; + uint32_t salt_length; + + unsigned dec_ttl : 1; + unsigned copy_dscp : 1; + unsigned copy_df : 1; + + union { + struct { + odp_ipsec_lookup_mode_t lookup_mode; + odp_u32be_t lookup_dst_ip; + } in; + + struct { + odp_u32be_t tun_src_ip; + odp_u32be_t tun_dst_ip; + + /* 32-bit from which low 16 are used */ + odp_atomic_u32_t tun_hdr_id; + odp_atomic_u32_t seq; + + uint8_t tun_ttl; + uint8_t tun_dscp; + uint8_t tun_df; + } out; + }; +}; + +/** + * IPSEC Security Association (SA) lookup parameters + */ +typedef struct odp_ipsec_sa_lookup_s { + /** IPSEC protocol: ESP or AH */ + odp_ipsec_protocol_t proto; + + /** SPI value */ + uint32_t spi; + + /* FIXME: IPv4 vs IPv6 */ + + /** IP destination address (NETWORK ENDIAN) */ + void *dst_addr; +} ipsec_sa_lookup_t; + +/** + * Obtain SA reference + */ +ipsec_sa_t *_odp_ipsec_sa_use(odp_ipsec_sa_t sa); + +/** + * Release SA reference + */ +void _odp_ipsec_sa_unuse(ipsec_sa_t *ipsec_sa); + +/** + * Lookup SA corresponding to inbound packet pkt + */ +ipsec_sa_t *_odp_ipsec_sa_lookup(const ipsec_sa_lookup_t *lookup); + +/** + * Update SA usage statistics, filling respective status for the packet. + * + * @retval <0 if hard limits were breached + */ +int _odp_ipsec_sa_update_stats(ipsec_sa_t *ipsec_sa, uint32_t len, + odp_ipsec_op_status_t *status); + /** * @} */ diff --git a/platform/linux-generic/odp_init.c b/platform/linux-generic/odp_init.c index 8234df97..1412c03a 100644 --- a/platform/linux-generic/odp_init.c +++ b/platform/linux-generic/odp_init.c @@ -229,6 +229,12 @@ int odp_init_global(odp_instance_t *instance, } stage = IPSEC_EVENTS_INIT; + if (_odp_ipsec_sad_init_global()) { + ODP_ERR("ODP IPsec SAD init failed.\n"); + goto init_failed; + } + stage = IPSEC_SAD_INIT; + if (_odp_modules_init_global()) { ODP_ERR("ODP modules init failed\n"); goto init_failed; @@ -259,6 +265,13 @@ int _odp_term_global(enum init_stage stage) switch (stage) { case ALL_INIT: case MODULES_INIT: + case IPSEC_SAD_INIT: + if (_odp_ipsec_sad_term_global()) { + ODP_ERR("ODP IPsec SAD term failed.\n"); + rc = -1; + } + /* Fall through */ + case IPSEC_EVENTS_INIT: if (_odp_ipsec_events_term_global()) { ODP_ERR("ODP IPsec events term failed.\n"); diff --git a/platform/linux-generic/odp_ipsec.c b/platform/linux-generic/odp_ipsec.c index e42b488f..d0ca027c 100644 --- a/platform/linux-generic/odp_ipsec.c +++ b/platform/linux-generic/odp_ipsec.c @@ -49,32 +49,6 @@ int odp_ipsec_config(const odp_ipsec_config_t *config) return -1; } -void odp_ipsec_sa_param_init(odp_ipsec_sa_param_t *param) -{ - memset(param, 0, sizeof(odp_ipsec_sa_param_t)); -} - -odp_ipsec_sa_t odp_ipsec_sa_create(const odp_ipsec_sa_param_t *param) -{ - (void)param; - - return ODP_IPSEC_SA_INVALID; -} - -int odp_ipsec_sa_disable(odp_ipsec_sa_t sa) -{ - (void)sa; - - return -1; -} - -int odp_ipsec_sa_destroy(odp_ipsec_sa_t sa) -{ - (void)sa; - - return -1; -} - int odp_ipsec_in(const odp_packet_t pkt_in[], int num_in, odp_packet_t pkt_out[], int *num_out, const odp_ipsec_in_param_t *param) @@ -141,21 +115,6 @@ int odp_ipsec_result(odp_ipsec_packet_result_t *result, odp_packet_t packet) return -1; } -int odp_ipsec_sa_mtu_update(odp_ipsec_sa_t sa, uint32_t mtu) -{ - (void)sa; - (void)mtu; - - return -1; -} - -void *odp_ipsec_sa_context(odp_ipsec_sa_t sa) -{ - (void)sa; - - return NULL; -} - odp_packet_t odp_ipsec_packet_from_event(odp_event_t ev) { (void)ev; @@ -169,8 +128,3 @@ odp_event_t odp_ipsec_packet_to_event(odp_packet_t pkt) return ODP_EVENT_INVALID; } - -uint64_t odp_ipsec_sa_to_u64(odp_ipsec_sa_t sa) -{ - return _odp_pri(sa); -} diff --git a/platform/linux-generic/odp_ipsec_sad.c b/platform/linux-generic/odp_ipsec_sad.c new file mode 100644 index 00000000..f0b5b9e4 --- /dev/null +++ b/platform/linux-generic/odp_ipsec_sad.c @@ -0,0 +1,500 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include "config.h" + +#include <odp/api/atomic.h> +#include <odp/api/ipsec.h> +#include <odp/api/random.h> +#include <odp/api/shared_memory.h> + +#include <odp_debug_internal.h> +#include <odp_ipsec_internal.h> + +#include <string.h> + +#define IPSEC_SA_STATE_DISABLE 0x40000000 +#define IPSEC_SA_STATE_FREE 0xc0000000 /* This includes disable !!! */ + +typedef struct ipsec_sa_table_t { + ipsec_sa_t ipsec_sa[ODP_CONFIG_IPSEC_SAS]; + odp_shm_t shm; +} ipsec_sa_table_t; + +static ipsec_sa_table_t *ipsec_sa_tbl; + +static inline ipsec_sa_t *ipsec_sa_entry(uint32_t ipsec_sa_idx) +{ + return &ipsec_sa_tbl->ipsec_sa[ipsec_sa_idx]; +} + +static inline ipsec_sa_t *ipsec_sa_entry_from_hdl(odp_ipsec_sa_t ipsec_sa_hdl) +{ + return ipsec_sa_entry(_odp_typeval(ipsec_sa_hdl)); +} + +static inline odp_ipsec_sa_t ipsec_sa_index_to_handle(uint32_t ipsec_sa_idx) +{ + return _odp_cast_scalar(odp_ipsec_sa_t, ipsec_sa_idx); +} + +int _odp_ipsec_sad_init_global(void) +{ + odp_shm_t shm; + unsigned i; + + shm = odp_shm_reserve("ipsec_sa_table", + sizeof(ipsec_sa_table_t), + ODP_CACHE_LINE_SIZE, 0); + + ipsec_sa_tbl = odp_shm_addr(shm); + if (ipsec_sa_tbl == NULL) + return -1; + + memset(ipsec_sa_tbl, 0, sizeof(ipsec_sa_table_t)); + ipsec_sa_tbl->shm = shm; + + for (i = 0; i < ODP_CONFIG_IPSEC_SAS; i++) { + ipsec_sa_t *ipsec_sa = ipsec_sa_entry(i); + + ipsec_sa->ipsec_sa_hdl = ipsec_sa_index_to_handle(i); + ipsec_sa->ipsec_sa_idx = i; + odp_atomic_init_u32(&ipsec_sa->state, IPSEC_SA_STATE_FREE); + odp_atomic_init_u64(&ipsec_sa->bytes, 0); + odp_atomic_init_u64(&ipsec_sa->packets, 0); + } + + return 0; +} + +int _odp_ipsec_sad_term_global(void) +{ + int i; + ipsec_sa_t *ipsec_sa; + int ret = 0; + int rc = 0; + + for (i = 0; i < ODP_CONFIG_IPSEC_SAS; i++) { + ipsec_sa = ipsec_sa_entry(i); + + if (odp_atomic_load_u32(&ipsec_sa->state) != + IPSEC_SA_STATE_FREE) { + ODP_ERR("Not destroyed ipsec_sa: %u\n", + ipsec_sa->ipsec_sa_idx); + rc = -1; + } + odp_atomic_store_u32(&ipsec_sa->state, IPSEC_SA_STATE_FREE); + } + + ret = odp_shm_free(ipsec_sa_tbl->shm); + if (ret < 0) { + ODP_ERR("shm free failed"); + rc = -1; + } + + return rc; +} + +static ipsec_sa_t *ipsec_sa_reserve(void) +{ + int i; + ipsec_sa_t *ipsec_sa; + + for (i = 0; i < ODP_CONFIG_IPSEC_SAS; i++) { + uint32_t state = IPSEC_SA_STATE_FREE; + + ipsec_sa = ipsec_sa_entry(i); + + if (odp_atomic_cas_acq_u32(&ipsec_sa->state, &state, 0)) + return ipsec_sa; + } + + return NULL; +} + +static void ipsec_sa_release(ipsec_sa_t *ipsec_sa) +{ + odp_atomic_store_rel_u32(&ipsec_sa->state, IPSEC_SA_STATE_FREE); +} + +static int ipsec_sa_lock(ipsec_sa_t *ipsec_sa) +{ + int cas = 0; + uint32_t state = odp_atomic_load_u32(&ipsec_sa->state); + + while (0 == cas) { + /* + * This can be called from lookup path, so we really need this + * check + */ + if (state & IPSEC_SA_STATE_DISABLE) + return -1; + + cas = odp_atomic_cas_acq_u32(&ipsec_sa->state, &state, + state + 1); + } + + return 0; +} + +/* Do not call directly, use _odp_ipsec_sa_unuse */ +static odp_bool_t ipsec_sa_unlock(ipsec_sa_t *ipsec_sa) +{ + int cas = 0; + uint32_t state = odp_atomic_load_u32(&ipsec_sa->state); + + while (0 == cas) + cas = odp_atomic_cas_rel_u32(&ipsec_sa->state, &state, + state - 1); + + return state == IPSEC_SA_STATE_DISABLE; +} + +ipsec_sa_t *_odp_ipsec_sa_use(odp_ipsec_sa_t sa) +{ + ipsec_sa_t *ipsec_sa; + + ODP_ASSERT(ODP_IPSEC_SA_INVALID != sa); + + ipsec_sa = ipsec_sa_entry_from_hdl(sa); + + if (ipsec_sa_lock(ipsec_sa) < 0) + return NULL; + + return ipsec_sa; +} + +void _odp_ipsec_sa_unuse(ipsec_sa_t *ipsec_sa) +{ + odp_queue_t queue; + odp_ipsec_sa_t sa; + odp_ipsec_warn_t warn = { .all = 0 }; + + ODP_ASSERT(NULL != ipsec_sa); + + queue = ipsec_sa->queue; + sa = ipsec_sa->ipsec_sa_hdl; + + if (ipsec_sa_unlock(ipsec_sa) && ODP_QUEUE_INVALID != queue) + _odp_ipsec_status_send(queue, + ODP_IPSEC_STATUS_SA_DISABLE, + sa, 0, warn); +} + +void odp_ipsec_sa_param_init(odp_ipsec_sa_param_t *param) +{ + memset(param, 0, sizeof(odp_ipsec_sa_param_t)); + param->dest_queue = ODP_QUEUE_INVALID; +} + +odp_ipsec_sa_t odp_ipsec_sa_create(const odp_ipsec_sa_param_t *param) +{ + ipsec_sa_t *ipsec_sa; + odp_crypto_session_param_t crypto_param; + odp_crypto_ses_create_err_t ses_create_rc; + + ipsec_sa = ipsec_sa_reserve(); + if (NULL == ipsec_sa) { + ODP_ERR("No more free SA\n"); + return ODP_IPSEC_SA_INVALID; + } + + ipsec_sa->proto = param->proto; + ipsec_sa->spi = param->spi; + ipsec_sa->context = param->context; + ipsec_sa->queue = param->dest_queue; + ipsec_sa->mode = param->mode; + if (ODP_IPSEC_DIR_INBOUND == param->dir) { + ipsec_sa->in.lookup_mode = param->inbound.lookup_mode; + if (ODP_IPSEC_LOOKUP_DSTADDR_SPI == ipsec_sa->in.lookup_mode) + memcpy(&ipsec_sa->in.lookup_dst_ip, + param->inbound.lookup_param.dst_addr, + sizeof(ipsec_sa->in.lookup_dst_ip)); + + } else { + odp_atomic_store_u32(&ipsec_sa->out.seq, 1); + } + ipsec_sa->dec_ttl = param->opt.dec_ttl; + ipsec_sa->copy_dscp = param->opt.copy_dscp; + ipsec_sa->copy_df = param->opt.copy_df; + + odp_atomic_store_u64(&ipsec_sa->bytes, 0); + odp_atomic_store_u64(&ipsec_sa->packets, 0); + ipsec_sa->soft_limit_bytes = param->lifetime.soft_limit.bytes; + ipsec_sa->soft_limit_packets = param->lifetime.soft_limit.packets; + ipsec_sa->hard_limit_bytes = param->lifetime.hard_limit.bytes; + ipsec_sa->hard_limit_packets = param->lifetime.hard_limit.packets; + + if (ODP_IPSEC_MODE_TUNNEL == ipsec_sa->mode && + ODP_IPSEC_DIR_OUTBOUND == param->dir) { + if (param->outbound.tunnel.type != ODP_IPSEC_TUNNEL_IPV4) + goto error; + + memcpy(&ipsec_sa->out.tun_src_ip, + param->outbound.tunnel.ipv4.src_addr, + sizeof(ipsec_sa->out.tun_src_ip)); + memcpy(&ipsec_sa->out.tun_dst_ip, + param->outbound.tunnel.ipv4.dst_addr, + sizeof(ipsec_sa->out.tun_dst_ip)); + odp_atomic_init_u32(&ipsec_sa->out.tun_hdr_id, 0); + ipsec_sa->out.tun_ttl = param->outbound.tunnel.ipv4.ttl; + ipsec_sa->out.tun_dscp = param->outbound.tunnel.ipv4.dscp; + ipsec_sa->out.tun_df = param->outbound.tunnel.ipv4.df; + } + + odp_crypto_session_param_init(&crypto_param); + + /* Setup parameters and call crypto library to create session */ + crypto_param.op = (ODP_IPSEC_DIR_INBOUND == param->dir) ? + ODP_CRYPTO_OP_DECODE : + ODP_CRYPTO_OP_ENCODE; + crypto_param.auth_cipher_text = 1; + + crypto_param.op_mode = ODP_CRYPTO_SYNC; + crypto_param.compl_queue = ODP_QUEUE_INVALID; + crypto_param.output_pool = ODP_POOL_INVALID; + + crypto_param.cipher_alg = param->crypto.cipher_alg; + crypto_param.cipher_key = param->crypto.cipher_key; + crypto_param.auth_alg = param->crypto.auth_alg; + crypto_param.auth_key = param->crypto.auth_key; + + switch (crypto_param.auth_alg) { + case ODP_AUTH_ALG_NULL: + ipsec_sa->icv_len = 0; + break; +#if ODP_DEPRECATED_API + case ODP_AUTH_ALG_MD5_96: +#endif + case ODP_AUTH_ALG_MD5_HMAC: + ipsec_sa->icv_len = 12; + break; + case ODP_AUTH_ALG_SHA1_HMAC: + ipsec_sa->icv_len = 12; + break; +#if ODP_DEPRECATED_API + case ODP_AUTH_ALG_SHA256_128: +#endif + case ODP_AUTH_ALG_SHA256_HMAC: + ipsec_sa->icv_len = 16; + break; + case ODP_AUTH_ALG_SHA512_HMAC: + ipsec_sa->icv_len = 32; + break; +#if ODP_DEPRECATED_API + case ODP_AUTH_ALG_AES128_GCM: +#endif + case ODP_AUTH_ALG_AES_GCM: + ipsec_sa->icv_len = 16; + break; + default: + return ODP_IPSEC_SA_INVALID; + } + + switch (crypto_param.cipher_alg) { + case ODP_CIPHER_ALG_NULL: + ipsec_sa->esp_iv_len = 0; + ipsec_sa->esp_block_len = 1; + break; + case ODP_CIPHER_ALG_DES: + case ODP_CIPHER_ALG_3DES_CBC: + ipsec_sa->esp_iv_len = 8; + ipsec_sa->esp_block_len = 8; + break; +#if ODP_DEPRECATED_API + case ODP_CIPHER_ALG_AES128_CBC: +#endif + case ODP_CIPHER_ALG_AES_CBC: + ipsec_sa->esp_iv_len = 16; + ipsec_sa->esp_block_len = 16; + break; +#if ODP_DEPRECATED_API + case ODP_CIPHER_ALG_AES128_GCM: +#endif + case ODP_CIPHER_ALG_AES_GCM: + ipsec_sa->esp_iv_len = 8; + ipsec_sa->esp_block_len = 16; + crypto_param.iv.length = 12; + break; + default: + return ODP_IPSEC_SA_INVALID; + } + + crypto_param.auth_digest_len = ipsec_sa->icv_len; + + if (param->crypto.cipher_key_extra.length) { + if (param->crypto.cipher_key_extra.length > + IPSEC_MAX_SALT_LEN) + goto error; + + ipsec_sa->salt_length = param->crypto.cipher_key_extra.length; + memcpy(ipsec_sa->salt, + param->crypto.cipher_key_extra.data, + param->crypto.cipher_key_extra.length); + } else { + ipsec_sa->salt_length = 0; + } + + if (odp_crypto_session_create(&crypto_param, &ipsec_sa->session, + &ses_create_rc)) + goto error; + + return ipsec_sa->ipsec_sa_hdl; + +error: + ipsec_sa_release(ipsec_sa); + + return ODP_IPSEC_SA_INVALID; +} + +int odp_ipsec_sa_disable(odp_ipsec_sa_t sa) +{ + ipsec_sa_t *ipsec_sa = ipsec_sa_entry_from_hdl(sa); + uint32_t state; + int cas = 0; + + /* This is a custom rwlock implementation. It is not possible to use + * original rwlock, because there is no way to test if current code is + * the last reader when disable operation is pending. */ + state = odp_atomic_load_u32(&ipsec_sa->state); + + while (0 == cas) { + if (state & IPSEC_SA_STATE_DISABLE) + return -1; + + cas = odp_atomic_cas_acq_u32(&ipsec_sa->state, &state, + state | IPSEC_SA_STATE_DISABLE); + } + + if (ODP_QUEUE_INVALID != ipsec_sa->queue) { + odp_ipsec_warn_t warn = { .all = 0 }; + + /* + * If there were not active state when we disabled SA, + * send the event. + */ + if (0 == state) + _odp_ipsec_status_send(ipsec_sa->queue, + ODP_IPSEC_STATUS_SA_DISABLE, + ipsec_sa->ipsec_sa_hdl, + 0, warn); + + return 0; + } + + while (IPSEC_SA_STATE_DISABLE != state) { + odp_cpu_pause(); + state = odp_atomic_load_u32(&ipsec_sa->state); + } + + return 0; +} + +int odp_ipsec_sa_destroy(odp_ipsec_sa_t sa) +{ + ipsec_sa_t *ipsec_sa = ipsec_sa_entry_from_hdl(sa); + int rc = 0; + uint32_t state = odp_atomic_load_u32(&ipsec_sa->state); + + if (IPSEC_SA_STATE_DISABLE != state) { + ODP_ERR("Distroying not disabled ipsec_sa: %u\n", + ipsec_sa->ipsec_sa_idx); + return -1; + } + + if (odp_crypto_session_destroy(ipsec_sa->session) < 0) { + ODP_ERR("Error destroying crypto session for ipsec_sa: %u\n", + ipsec_sa->ipsec_sa_idx); + rc = -1; + } + + ipsec_sa_release(ipsec_sa); + + return rc; +} + +void *odp_ipsec_sa_context(odp_ipsec_sa_t sa) +{ + ipsec_sa_t *ipsec_sa = ipsec_sa_entry_from_hdl(sa); + + return ipsec_sa->context; +} + +uint64_t odp_ipsec_sa_to_u64(odp_ipsec_sa_t sa) +{ + return _odp_pri(sa); +} + +int odp_ipsec_sa_mtu_update(odp_ipsec_sa_t sa, uint32_t mtu) +{ + (void)sa; + (void)mtu; + + return -1; +} + +ipsec_sa_t *_odp_ipsec_sa_lookup(const ipsec_sa_lookup_t *lookup) +{ + (void)lookup; + + int i; + ipsec_sa_t *ipsec_sa; + ipsec_sa_t *best = NULL; + + for (i = 0; i < ODP_CONFIG_IPSEC_SAS; i++) { + ipsec_sa = ipsec_sa_entry(i); + + if (ipsec_sa_lock(ipsec_sa) < 0) + continue; + + if (ODP_IPSEC_LOOKUP_DSTADDR_SPI == ipsec_sa->in.lookup_mode && + lookup->proto == ipsec_sa->proto && + lookup->spi == ipsec_sa->spi && + !memcmp(lookup->dst_addr, &ipsec_sa->in.lookup_dst_ip, + sizeof(ipsec_sa->in.lookup_dst_ip))) { + if (NULL != best) + _odp_ipsec_sa_unuse(best); + return ipsec_sa; + } else if (ODP_IPSEC_LOOKUP_SPI == ipsec_sa->in.lookup_mode && + lookup->proto == ipsec_sa->proto && + lookup->spi == ipsec_sa->spi) { + best = ipsec_sa; + } else { + _odp_ipsec_sa_unuse(ipsec_sa); + } + } + + return best; +} + +int _odp_ipsec_sa_update_stats(ipsec_sa_t *ipsec_sa, uint32_t len, + odp_ipsec_op_status_t *status) +{ + uint64_t bytes = odp_atomic_fetch_add_u64(&ipsec_sa->bytes, len) + len; + uint64_t packets = odp_atomic_fetch_add_u64(&ipsec_sa->packets, 1) + 1; + int rc = 0; + + if (ipsec_sa->soft_limit_bytes > 0 && + bytes > ipsec_sa->soft_limit_bytes) + status->warn.soft_exp_bytes = 1; + + if (ipsec_sa->soft_limit_packets > 0 && + packets > ipsec_sa->soft_limit_packets) + status->warn.soft_exp_packets = 1; + + if (ipsec_sa->hard_limit_bytes > 0 && + bytes > ipsec_sa->hard_limit_bytes) { + status->error.hard_exp_bytes = 1; + rc = -1; + } + if (ipsec_sa->hard_limit_packets > 0 && + packets > ipsec_sa->hard_limit_packets) { + status->error.hard_exp_packets = 1; + rc = -1; + } + + return rc; +} commit 5e8f87ae22ca0c3e6137f91f15c967aec958a67e Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Wed May 3 02:13:42 2017 +0300 linux-generic: ipsec: implement events handling Add functions implementing IPsec events support. 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 eb49f455..7c288791 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -163,6 +163,7 @@ noinst_HEADERS = \ ${srcdir}/include/odp_errno_define.h \ ${srcdir}/include/odp_forward_typedefs_internal.h \ ${srcdir}/include/odp_internal.h \ + ${srcdir}/include/odp_ipsec_internal.h \ ${srcdir}/include/odp_llqueue.h \ ${srcdir}/include/odp_name_table_internal.h \ ${srcdir}/include/odp_packet_internal.h \ @@ -220,6 +221,7 @@ __LIB__libodp_linux_la_SOURCES = \ odp_init.c \ odp_impl.c \ odp_ipsec.c \ + odp_ipsec_events.c \ odp_name_table.c \ odp_packet.c \ odp_packet_flags.c \ diff --git a/platform/linux-generic/include/odp_internal.h b/platform/linux-generic/include/odp_internal.h index 3b8dd335..a959e666 100644 --- a/platform/linux-generic/include/odp_internal.h +++ b/platform/linux-generic/include/odp_internal.h @@ -74,6 +74,7 @@ enum init_stage { CLASSIFICATION_INIT, TRAFFIC_MNGR_INIT, NAME_TABLE_INIT, + IPSEC_EVENTS_INIT, MODULES_INIT, ALL_INIT /* All init stages completed */ }; @@ -133,6 +134,9 @@ int _odp_ishm_init_local(void); int _odp_ishm_term_global(void); int _odp_ishm_term_local(void); +int _odp_ipsec_events_init_global(void); +int _odp_ipsec_events_term_global(void); + int _odp_modules_init_global(void); int cpuinfo_parser(FILE *file, system_info_t *sysinfo); diff --git a/platform/linux-generic/include/odp_ipsec_internal.h b/platform/linux-generic/include/odp_ipsec_internal.h new file mode 100644 index 00000000..b31f048f --- /dev/null +++ b/platform/linux-generic/include/odp_ipsec_internal.h @@ -0,0 +1,84 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +/** + * @file + * + * ODP internal IPsec routines + */ + +#ifndef ODP_IPSEC_INTERNAL_H_ +#define ODP_IPSEC_INTERNAL_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#include <odp/api/std_types.h> +#include <odp/api/plat/strong_types.h> + +#include <odp/api/ipsec.h> + +/** @ingroup odp_ipsec + * @{ + */ + +typedef ODP_HANDLE_T(ipsec_status_t); + +#define ODP_IPSEC_STATUS_INVALID \ + _odp_cast_scalar(ipsec_status_t, 0xffffffff) + +/** + * @internal Get ipsec_status handle from event + * + * Converts an ODP_EVENT_IPSEC_STATUS type event to an IPsec status event. + * + * @param ev Event handle + * + * @return IPsec status handle + * + * @see odp_event_type() + */ +ipsec_status_t _odp_ipsec_status_from_event(odp_event_t ev); + +/** + * @internal Free IPsec status event + * + * Frees the ipsec_status into the ipsec_status pool it was allocated from. + * + * @param res IPsec status handle + */ +void _odp_ipsec_status_free(ipsec_status_t status); + +/** + * @internal Send ODP_IPSEC_STATUS event + * + * Sends the ipsec_status event using provided information + * + * @param queue destination queue + * @param id status id + * @param sa SA respective to the operation + * @param result status value + * @param warn generated warning + * + * @retval 0 on success + * @retval <0 on failure + */ +int _odp_ipsec_status_send(odp_queue_t queue, + odp_ipsec_status_id_t id, + odp_ipsec_sa_t sa, + int result, + odp_ipsec_warn_t warn); + +/** + * @} + */ + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/platform/linux-generic/odp_event.c b/platform/linux-generic/odp_event.c index 991d0e17..66bc11fe 100644 --- a/platform/linux-generic/odp_event.c +++ b/platform/linux-generic/odp_event.c @@ -13,6 +13,7 @@ #include <odp/api/timer.h> #include <odp/api/pool.h> #include <odp_buffer_internal.h> +#include <odp_ipsec_internal.h> #include <odp_buffer_inlines.h> #include <odp_debug_internal.h> @@ -51,6 +52,9 @@ void odp_event_free(odp_event_t event) case ODP_EVENT_CRYPTO_COMPL: odp_crypto_compl_free(odp_crypto_compl_from_event(event)); break; + case ODP_EVENT_IPSEC_STATUS: + _odp_ipsec_status_free(_odp_ipsec_status_from_event(event)); + break; default: ODP_ABORT("Invalid event type: %d\n", odp_event_type(event)); } diff --git a/platform/linux-generic/odp_init.c b/platform/linux-generic/odp_init.c index fdccac7c..8234df97 100644 --- a/platform/linux-generic/odp_init.c +++ b/platform/linux-generic/odp_init.c @@ -223,6 +223,12 @@ int odp_init_global(odp_instance_t *instance, } stage = NAME_TABLE_INIT; + if (_odp_ipsec_events_init_global()) { + ODP_ERR("ODP IPsec events init failed.\n"); + goto init_failed; + } + stage = IPSEC_EVENTS_INIT; + if (_odp_modules_init_global()) { ODP_ERR("ODP modules init failed\n"); goto init_failed; @@ -253,6 +259,13 @@ int _odp_term_global(enum init_stage stage) switch (stage) { case ALL_INIT: case MODULES_INIT: + case IPSEC_EVENTS_INIT: + if (_odp_ipsec_events_term_global()) { + ODP_ERR("ODP IPsec events term failed.\n"); + rc = -1; + } + /* Fall through */ + case NAME_TABLE_INIT: if (_odp_int_name_tbl_term_global()) { ODP_ERR("Name table term failed.\n"); diff --git a/platform/linux-generic/odp_ipsec.c b/platform/linux-generic/odp_ipsec.c index 04757e78..e42b488f 100644 --- a/platform/linux-generic/odp_ipsec.c +++ b/platform/linux-generic/odp_ipsec.c @@ -6,6 +6,8 @@ #include <odp/api/ipsec.h> +#include <odp_ipsec_internal.h> + #include <string.h> int odp_ipsec_capability(odp_ipsec_capability_t *capa) @@ -139,14 +141,6 @@ int odp_ipsec_result(odp_ipsec_packet_result_t *result, odp_packet_t packet) return -1; } -int odp_ipsec_status(odp_ipsec_status_t *status, odp_event_t event) -{ - (void)status; - (void)event; - - return -1; -} - int odp_ipsec_sa_mtu_update(odp_ipsec_sa_t sa, uint32_t mtu) { (void)sa; diff --git a/platform/linux-generic/odp_ipsec_events.c b/platform/linux-generic/odp_ipsec_events.c new file mode 100644 index 00000000..3a7ebd6e --- /dev/null +++ b/platform/linux-generic/odp_ipsec_events.c @@ -0,0 +1,156 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include "config.h" + +#include <odp/api/ipsec.h> +#include <odp/api/shared_memory.h> + +#include <odp_buffer_internal.h> +#include <odp_buffer_inlines.h> +#include <odp_debug_internal.h> +#include <odp_ipsec_internal.h> +#include <odp_pool_internal.h> + +typedef struct { + /* common buffer header */ + odp_buffer_hdr_t buf_hdr; + + odp_ipsec_status_t status; +} ipsec_status_hdr_t; + +static odp_pool_t ipsec_status_pool = ODP_POOL_INVALID; + +#define IPSEC_EVENTS_POOL_BUF_COUNT 1024 + +int _odp_ipsec_events_init_global(void) +{ + odp_pool_param_t param; + + odp_pool_param_init(&param); + + param.buf.size = sizeof(ipsec_status_hdr_t); + param.buf.align = 0; + param.buf.num = IPSEC_EVENTS_POOL_BUF_COUNT; + param.type = ODP_POOL_BUFFER; + + ipsec_status_pool = odp_pool_create("ipsec_status_pool", &param); + if (ODP_POOL_INVALID == ipsec_status_pool) { + ODP_ERR("Error: status pool create failed.\n"); + goto err_status; + } + + return 0; + +err_status: + return -1; +} + +int _odp_ipsec_events_term_global(void) +{ + int ret = 0; + int rc = 0; + + ret = odp_pool_destroy(ipsec_status_pool); + if (ret < 0) { + ODP_ERR("status pool destroy failed"); + rc = -1; + } + + return rc; +} + +ipsec_status_t _odp_ipsec_status_from_event(odp_event_t ev) +{ + ODP_ASSERT(ODP_EVENT_INVALID != ev); + ODP_ASSERT(ODP_EVENT_IPSEC_STATUS == odp_event_type(ev)); + + return (ipsec_status_t)ev; +} + +static odp_event_t ipsec_status_to_event(ipsec_status_t status) +{ + ODP_ASSERT(ODP_IPSEC_STATUS_INVALID != status); + + return (odp_event_t)status; +} + +static ipsec_status_hdr_t *ipsec_status_hdr_from_buf(odp_buffer_t buf) +{ + return (ipsec_status_hdr_t *)(void *)buf_hdl_to_hdr(buf); +} + +static ipsec_status_hdr_t *ipsec_status_hdr(ipsec_status_t status) +{ + odp_buffer_t buf = odp_buffer_from_event(ipsec_status_to_event(status)); + + return ipsec_status_hdr_from_buf(buf); +} + +static ipsec_status_t odp_ipsec_status_alloc(void) +{ + odp_buffer_t buf = odp_buffer_alloc(ipsec_status_pool); + + if (odp_unlikely(buf == ODP_BUFFER_INVALID)) + return ODP_IPSEC_STATUS_INVALID; + + _odp_buffer_event_type_set(buf, ODP_EVENT_IPSEC_STATUS); + + return _odp_ipsec_status_from_event(odp_buffer_to_event(buf)); +} + +void _odp_ipsec_status_free(ipsec_status_t status) +{ + odp_event_t ev = ipsec_status_to_event(status); + + odp_buffer_free(odp_buffer_from_event(ev)); +} + +int _odp_ipsec_status_send(odp_queue_t queue, + odp_ipsec_status_id_t id, + odp_ipsec_sa_t sa, + int result, + odp_ipsec_warn_t warn) +{ + ipsec_status_t ipsec_ev = odp_ipsec_status_alloc(); + ipsec_status_hdr_t *status_hdr; + + if (ODP_IPSEC_STATUS_INVALID == ipsec_ev) + return -1; + + status_hdr = ipsec_status_hdr(ipsec_ev); + + status_hdr->status.id = id; + status_hdr->status.sa = sa; + status_hdr->status.result = result; + status_hdr->status.warn = warn; + + if (odp_queue_enq(queue, ipsec_status_to_event(ipsec_ev))) { + _odp_ipsec_status_free(ipsec_ev); + return -1; + } + + return 0; +} + +int odp_ipsec_status(odp_ipsec_status_t *status, odp_event_t event) +{ + ipsec_status_t ipsec_ev; + ipsec_status_hdr_t *status_hdr; + + if (odp_unlikely(ODP_EVENT_INVALID == event)) + return -1; + + ipsec_ev = _odp_ipsec_status_from_event(event); + if (odp_unlikely(ODP_IPSEC_STATUS_INVALID == ipsec_ev)) + return -1; + + status_hdr = ipsec_status_hdr(ipsec_ev); + + *status = status_hdr->status; + + return 0; +} commit 9e10a562dfb67b7a37c67fecff3de00be798961a Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue Oct 17 17:36:33 2017 +0300 Revert "linux-gen: drop unused _odp_packet_cmp_data() function" This reverts commit fdc44dd4322f624c2a5d8c0be5306f7c45364520. _odp_packet_cmp_data() function is now used by IPsec implementation. 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/include/odp_packet_internal.h b/platform/linux-generic/include/odp_packet_internal.h index 37a51fed..051b2b20 100644 --- a/platform/linux-generic/include/odp_packet_internal.h +++ b/platform/linux-generic/include/odp_packet_internal.h @@ -326,6 +326,9 @@ int _odp_cls_parse(odp_packet_hdr_t *pkt_hdr, const uint8_t *parseptr); int _odp_packet_set_data(odp_packet_t pkt, uint32_t offset, uint8_t c, uint32_t len); +int _odp_packet_cmp_data(odp_packet_t pkt, uint32_t offset, + const void *s, uint32_t len); + #ifdef __cplusplus } #endif diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index 0f6e1b79..fc3882d3 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -1639,6 +1639,32 @@ int _odp_packet_set_data(odp_packet_t pkt, uint32_t offset, return 0; } +int _odp_packet_cmp_data(odp_packet_t pkt, uint32_t offset, + const void *s, uint32_t len) +{ + const uint8_t *ptr = s; + void *mapaddr; + uint32_t seglen = 0; /* GCC */ + uint32_t cmplen; + int ret; + odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); + + ODP_ASSERT(offset + len <= pkt_hdr->frame_len); + + while (len > 0) { + mapaddr = packet_map(pkt_hdr, offset, &seglen, NULL); + cmplen = len > seglen ? seglen : len; + ret = memcmp(mapaddr, ptr, cmplen); + if (ret != 0) + return ret; + offset += cmplen; + len -= cmplen; + ptr += cmplen; + } + + return 0; +} + /* * * Debugging commit 86d651b86c10dd77603354110644ad346dfb3e26 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Mon Jul 24 17:42:10 2017 +0300 linux-gen: packet: add support for IP-in-IP (RFC 2003) encap Don't barf on IP-in-IP packets parsing, just ignore L4 (=L3) header. 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/include/protocols/ip.h b/platform/linux-generic/include/protocols/ip.h index 2b34a753..0fc391ab 100644 --- a/platform/linux-generic/include/protocols/ip.h +++ b/platform/linux-generic/include/protocols/ip.h @@ -158,6 +158,7 @@ typedef struct ODP_PACKED { * @{*/ #define _ODP_IPPROTO_HOPOPTS 0x00 /**< IPv6 hop-by-hop options */ #define _ODP_IPPROTO_ICMPv4 0x01 /**< Internet Control Message Protocol (1) */ +#define _ODP_IPPROTO_IPIP 0x04 /**< IP Encapsulation within IP (4) */ #define _ODP_IPPROTO_TCP 0x06 /**< Transmission Control Protocol (6) */ #define _ODP_IPPROTO_UDP 0x11 /**< User Datagram Protocol (17) */ #define _ODP_IPPROTO_ROUTE 0x2B /**< IPv6 Routing header (43) */ diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index d94718dd..0f6e1b79 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -2034,6 +2034,10 @@ int packet_parse_common_l3_l4(packet_parser_t *prs, const uint8_t *parseptr, prs->input_flags.icmp = 1; break; + case _ODP_IPPROTO_IPIP: + /* Do nothing */ + break; + case _ODP_IPPROTO_TCP: if (odp_unlikely(offset + _ODP_TCPHDR_LEN > seg_len)) return -1; commit bc3cad50ec6668064bae1af164875c93832caff8 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Wed Aug 30 12:21:09 2017 +0300 linux-gen: packet: support parsing of just L3/L4 headers IPsec packet postprocessing needs parsing of packets which guarantee only L3/L4 headers. Separate parsing function doing L3/L4 headers parsing. 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/include/odp_packet_internal.h b/platform/linux-generic/include/odp_packet_internal.h index 3897b3b8..37a51fed 100644 --- a/platform/linux-generic/include/odp_packet_internal.h +++ b/platform/linux-generic/include/odp_packet_internal.h @@ -277,6 +277,12 @@ int packet_alloc_multi(odp_pool_t pool_hdl, uint32_t len, int packet_parse_layer(odp_packet_hdr_t *pkt_hdr, odp_pktio_parser_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_pktio_parser_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 e6f90211..d94718dd 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -330,7 +330,7 @@ void packet_parse_reset(odp_packet_hdr_t *pkt_hdr) pkt_hdr->p.error_flags.all = 0; pkt_hdr->p.input_flags.all = 0; pkt_hdr->p.output_flags.all = 0; - pkt_hdr->p.l2_offset = 0; + pkt_hdr->p.l2_offset = ODP_PACKET_OFFSET_INVALID; pkt_hdr->p.l3_offset = ODP_PACKET_OFFSET_INVALID; pkt_hdr->p.l4_offset = ODP_PACKET_OFFSET_INVALID; } @@ -1978,35 +1978,16 @@ static inline void parse_udp(packet_parser_t *prs, *parseptr += sizeof(_odp_udphdr_t); } -/** - * Parse common packet headers up to given layer - * - * The function expects at least PACKET_PARSE_SEG_LEN bytes of data to be - * available from the ptr. - */ -int packet_parse_common(packet_parser_t *prs, const uint8_t *ptr, - uint32_t frame_len, uint32_t seg_len, - odp_pktio_parser_layer_t layer) +static inline +int packet_parse_common_l3_l4(packet_parser_t *prs, const uint8_t *parseptr, + uint32_t offset, + uint32_t frame_len, uint32_t seg_len, + odp_pktio_parser_layer_t layer, + uint16_t ethtype) { - uint32_t offset; - uint16_t ethtype; - const uint8_t *parseptr; uint8_t ip_proto; - parseptr = ptr; - offset = 0; - - if (layer == ODP_PKTIO_PARSER_LAYER_NONE) - return 0; - - /* We only support Ethernet for now */ - prs->input_flags.eth = 1; - /* Assume valid L2 header, no CRC/FCS check in SW */ - prs->input_flags.l2 = 1; - - ethtype = parse_eth(prs, &parseptr, &offset, frame_len); - - if (layer == ODP_PKTIO_PARSER_LAYER_L2) + if (layer <= ODP_PKTIO_PARSER_LAYER_L2) return prs->error_flags.all != 0; /* Set l3_offset+flag only for known ethtypes */ @@ -2090,6 +2071,38 @@ int packet_parse_common(packet_parser_t *prs, const uint8_t *ptr, return prs->error_flags.all != 0; } +/** + * Parse common packet headers up to given layer + * + * The function expects at least PACKET_PARSE_SEG_LEN bytes of data to be + * available from the ptr. + */ +int packet_parse_common(packet_parser_t *prs, const uint8_t *ptr, + uint32_t frame_len, uint32_t seg_len, + odp_pktio_parser_layer_t layer) +{ + uint32_t offset; + uint16_t ethtype; + const uint8_t *parseptr; + + parseptr = ptr; + offset = 0; + + if (layer == ODP_PKTIO_PARSER_LAYER_NONE) + return 0; + + /* Assume valid L2 header, no CRC/FCS check in SW */ + prs->l2_offset = offset; + prs->input_flags.l2 = 1; + /* We only support Ethernet for now */ + prs->input_flags.eth = 1; + + ethtype = parse_eth(prs, &parseptr, &offset, frame_len); + + return packet_parse_common_l3_l4(prs, parseptr, offset, frame_len, + seg_len, layer, ethtype); +} + /** * Simple packet parser */ @@ -2103,6 +2116,22 @@ 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_pktio_parser_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); +} + uint64_t odp_packet_to_u64(odp_packet_t hdl) { return _odp_pri(hdl); commit 9c747985d4c448ef737376c5c8180b78ae1e7378 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Sun Jul 23 15:31:37 2017 +0300 linux-gen: packet: factor out L2 header parsing Function parse_packet_common() now becomes just a multiplexer calling other low-level parsing functions. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index 68a834a1..e6f90211 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -1766,6 +1766,78 @@ int _odp_packet_copy_md_to_packet(odp_packet_t srcpkt, odp_packet_t dstpkt) return dsthdr->buf_hdr.uarea_size < srchdr->buf_hdr.uarea_size; } +/** Parser helper function for Ethernet packets */ +static inline uint16_t parse_eth(packet_parser_t *prs, const uint8_t **parseptr, + uint32_t *offset, uint32_t frame_len) +{ + uint16_t ethtype; + const _odp_ethhdr_t *eth; + uint16_t macaddr0, macaddr2, macaddr4; + const _odp_vlanhdr_t *vlan; + + /* Detect jumbo frames */ + if (frame_len > _ODP_ETH_LEN_MAX) + prs->input_flags.jumbo = 1; + + eth = (const _odp_ethhdr_t *)*parseptr; + + /* Handle Ethernet broadcast/multicast addresses */ + macaddr0 = odp_be_to_cpu_16(*((const uint16_t *)(const void *)eth)); + prs->input_flags.eth_mcast = (macaddr0 & 0x0100) == 0x0100; + + if (macaddr0 == 0xffff) { + macaddr2 = + odp_be_to_cpu_16(*((const uint16_t *) + (const void *)eth + 1)); + macaddr4 = + odp_be_to_cpu_16(*((const uint16_t *) + (const void *)eth + 2)); + prs->input_flags.eth_bcast = + (macaddr2 == 0xffff) && (macaddr4 == 0xffff); + } else { + prs->input_flags.eth_bcast = 0; + } + + /* Get Ethertype */ + ethtype = odp_be_to_cpu_16(eth->type); + *offset += sizeof(*eth); + *parseptr += sizeof(*eth); + + /* Check for SNAP vs. DIX */ + if (ethtype < _ODP_ETH_LEN_MAX) { + prs->input_flags.snap = 1; + if (ethtype > frame_len - *offset) { + prs->error_flags.snap_len = 1; + return 0; + } + ethtype = odp_be_to_cpu_16(*((const uint16_t *)(uintptr_t) + (parseptr + 6))); + *offset += 8; + *parseptr += 8; + } + + /* Parse the VLAN header(s), if present */ + if (ethtype == _ODP_ETHTYPE_VLAN_OUTER) { + prs->input_flags.vlan_qinq = 1; + prs->input_flags.vlan = 1; + + vlan = (const _odp_vlanhdr_t *)*parseptr; + ethtype = odp_be_to_cpu_16(vlan->type); + *offset += sizeof(_odp_vlanhdr_t); + *parseptr += sizeof(_odp_vlanhdr_t); + } + + if (ethtype == _ODP_ETHTYPE_VLAN) { + prs->input_flags.vlan = 1; + vlan = (const _odp_vlanhdr_t *)*parseptr; + ethtype = odp_be_to_cpu_16(vlan->type); + *offset += sizeof(_odp_vlanhdr_t); + *parseptr += sizeof(_odp_vlanhdr_t); + } + + return ethtype; +} + /** * Parser helper function for IPv4 */ @@ -1920,9 +1992,9 @@ int packet_parse_common(packet_parser_t *prs, const uint8_t *ptr, uint16_t ethtype; const uint8_t *parseptr; uint8_t ip_proto; - const _odp_ethhdr_t *eth; - uint16_t macaddr0, macaddr2, macaddr4; - const _odp_vlanhdr_t *vlan; + + parseptr = ptr; + offset = 0; if (layer == ODP_PKTIO_PARSER_LAYER_NONE) return 0; @@ -1931,65 +2003,8 @@ int packet_parse_common(packet_parser_t *prs, const uint8_t *ptr, prs->input_flags.eth = 1; /* Assume valid L2 header, no CRC/FCS check in SW */ prs->input_flags.l2 = 1; - /* Detect jumbo frames */ - if (frame_len > _ODP_ETH_LEN_MAX) - prs->input_flags.jumbo = 1; - - offset = sizeof(_odp_ethhdr_t); - eth = (const _odp_ethhdr_t *)ptr; - /* Handle Ethernet broadcast/multicast addresses */ - macaddr0 = odp_be_to_cpu_16(*((const uint16_t *)(const void *)eth)); - prs->input_flags.eth_mcast = (macaddr0 & 0x0100) == 0x0100; - - if (macaddr0 == 0xffff) { - macaddr2 = - odp_be_to_cpu_16(*((const uint16_t *) - (const void *)eth + 1)); - macaddr4 = - odp_be_to_cpu_16(*((const uint16_t *) - (const void *)eth + 2)); - prs->input_flags.eth_bcast = - (macaddr2 == 0xffff) && (macaddr4 == 0xffff); - } else { - prs->input_flags.eth_bcast = 0; - } - - /* Get Ethertype */ - ethtype = odp_be_to_cpu_16(eth->type); - parseptr = (const uint8_t *)(eth + 1); - - /* Check for SNAP vs. DIX */ - if (ethtype < _ODP_ETH_LEN_MAX) { - prs->input_flags.snap = 1; - if (ethtype > frame_len - offset) { - prs->error_flags.snap_len = 1; - goto parse_exit; - } - ethtype = odp_be_to_cpu_16(*((const uint16_t *)(uintptr_t) - (parseptr + 6))); - offset += 8; - parseptr += 8; - } - - /* Parse the VLAN header(s), if present */ - if (ethtype == _ODP_ETHTYPE_VLAN_OUTER) { - prs->input_flags.vlan_qinq = 1; - prs->input_flags.vlan = 1; - - vlan = (const _odp_vlanhdr_t *)parseptr; - ethtype = odp_be_to_cpu_16(vlan->type); - offset += sizeof(_odp_vlanhdr_t); - parseptr += sizeof(_odp_vlanhdr_t); - } - - if (ethtype == _ODP_ETHTYPE_VLAN) { - prs->input_flags.vlan = 1; - vlan = (const _odp_vlanhdr_t *)parseptr; - ethtype = odp_be_to_cpu_16(vlan->type); - offset += sizeof(_odp_vlanhdr_t); - parseptr += sizeof(_odp_vlanhdr_t); - } + ethtype = parse_eth(prs, &parseptr, &offset, frame_len); if (layer == ODP_PKTIO_PARSER_LAYER_L2) return prs->error_flags.all != 0; @@ -2071,7 +2086,7 @@ int packet_parse_common(packet_parser_t *prs, const uint8_t *ptr, prs->l4_offset = ODP_PACKET_OFFSET_INVALID; break; } -parse_exit: + return prs->error_flags.all != 0; } commit 698f370e71db55624e1bd78063569369f86db389 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Thu May 11 01:03:42 2017 +0300 test: validation: add IPsec API testsuite Add several basic tests for IPsec API. 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/common_plat/validation/api/ipsec/Makefile.am b/test/common_plat/validation/api/ipsec/Makefile.am index 106b8dce..5a4652f5 100644 --- a/test/common_plat/validation/api/ipsec/Makefile.am +++ b/test/common_plat/validation/api/ipsec/Makefile.am @@ -1,10 +1,27 @@ include ../Makefile.inc +AM_CPPFLAGS += -Wno-error=missing-field-initializers + noinst_LTLIBRARIES = libtestipsec.la -libtestipsec_la_SOURCES = ipsec.c +libtestipsec_la_SOURCES = \ + test_vectors.h \ + ipsec_test_in.c \ + ipsec_test_out.c \ + ipsec.h \ + ipsec.c + +test_PROGRAMS = \ + ipsec_sync$(EXEEXT) \ + ipsec_async$(EXEEXT) \ + ipsec_inline_in$(EXEEXT) \ + ipsec_inline_out$(EXEEXT) -test_PROGRAMS = ipsec_main$(EXEEXT) -dist_ipsec_main_SOURCES = ipsec_main.c -ipsec_main_LDADD = libtestipsec.la $(LIBCUNIT_COMMON) $(LIBODP) +ipsec_sync_SOURCES = ipsec_sync.c +ipsec_async_SOURCES = ipsec_async.c +ipsec_inline_in_SOURCES = ipsec_inline_in.c +ipsec_inline_out_SOURCES = ipsec_inline_out.c -EXTRA_DIST = ipsec.h +ipsec_sync_LDADD = libtestipsec.la $(LIBCUNIT_COMMON) $(LIBODP) +ipsec_async_LDADD = libtestipsec.la $(LIBCUNIT_COMMON) $(LIBODP) +ipsec_inline_in_LDADD = libtestipsec.la $(LIBCUNIT_COMMON) $(LIBODP) +ipsec_inline_out_LDADD = libtestipsec.la $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/common_plat/validation/api/ipsec/ipsec.c b/test/common_plat/validation/api/ipsec/ipsec.c index 78348032..a8fdf2b1 100644 --- a/test/common_plat/validation/api/ipsec/ipsec.c +++ b/test/common_plat/validation/api/ipsec/ipsec.c @@ -4,41 +4,884 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config.h" + #include <odp_api.h> #include <odp_cunit_common.h> #include <unistd.h> #include "ipsec.h" -void ipsec_test_capability(void) +#include "test_vectors.h" + +struct suite_context_s suite_context; + +#define PKT_POOL_NUM 64 +#define PKT_POOL_LEN (1 * 1024) + +static odp_pktio_t pktio_create(odp_pool_t pool) +{ + odp_pktio_t pktio; + odp_pktio_param_t pktio_param; + odp_pktin_queue_param_t pktin_param; + odp_pktio_capability_t capa; + + int ret; + + if (pool == ODP_POOL_INVALID) + return ODP_PKTIO_INVALID; + + odp_pktio_param_init(&pktio_param); + pktio_param.in_mode = ODP_PKTIN_MODE_QUEUE; + + pktio = odp_pktio_open("loop", pool, &pktio_param); + if (pktio == ODP_PKTIO_INVALID) { + ret = odp_pool_destroy(pool); + if (ret) + fprintf(stderr, "unable to destroy pool.\n"); + return ODP_PKTIO_INVALID; + } + + if (odp_pktio_capability(pktio, &capa)) { + fprintf(stderr, "pktio capabilities failed.\n"); + return ODP_PKTIO_INVALID; + } + + odp_pktin_queue_param_init(&pktin_param); + pktin_param.queue_param.sched.sync = ODP_SCHED_SYNC_ATOMIC; + + if (odp_pktin_queue_config(pktio, &pktin_param)) { + fprintf(stderr, "pktin queue config failed.\n"); + return ODP_PKTIO_INVALID; + } + + if (odp_pktout_queue_config(pktio, NULL)) { + fprintf(stderr, "pktout queue config failed.\n"); + return ODP_PKTIO_INVALID; + } + + return pktio; +} + +static int pktio_start(odp_pktio_t pktio, odp_bool_t in, odp_bool_t out) +{ + odp_pktio_capability_t capa; + odp_pktio_config_t config; + + if (ODP_PKTIO_INVALID == pktio) + return -1; + + if (odp_pktio_capability(pktio, &capa)) + return -1; + /* If inline is not supported, return here. Tests will be marked as + * inactive when testing for IPsec capabilities. */ + if (in && !capa.config.inbound_ipsec) + return 0; + if (out && !capa.config.outbound_ipsec) + return 0; + + odp_pktio_config_init(&config); + config.parser.layer = ODP_PKTIO_PARSER_LAYER_ALL; + config.inbound_ipsec = in; + config.outbound_ipsec = out; + + if (odp_pktio_config(pktio, &config)) + return -1; + if (odp_pktio_start(pktio)) + return -1; + + suite_context.pktio = pktio; + + return 1; +} + +static void pktio_stop(odp_pktio_t pktio) +{ + odp_queue_t queue = ODP_QUEUE_INVALID; + + odp_pktin_event_queue(pktio, &queue, 1); + + if (odp_pktio_stop(pktio)) + fprintf(stderr, "IPsec pktio stop failed.\n"); + + while (1) { + odp_event_t ev = odp_queue_deq(queue); + + if (ev != ODP_EVENT_INVALID) + odp_event_free(ev); + else + break; + } +} + +#define MAX_ALG_CAPA 32 + +int ipsec_check(odp_bool_t ah, + odp_cipher_alg_t cipher, + uint32_t cipher_bits, + odp_auth_alg_t auth) { odp_ipsec_capability_t capa; + odp_crypto_cipher_capability_t cipher_capa[MAX_ALG_CAPA]; + odp_crypto_auth_capability_t auth_capa[MAX_ALG_CAPA]; + int i, num; + odp_bool_t found = false; + + if (odp_ipsec_capability(&capa) < 0) + return ODP_TEST_INACTIVE; + + if ((ODP_IPSEC_OP_MODE_SYNC == suite_context.inbound_op_mode && + ODP_SUPPORT_NO == capa.op_mode_sync) || + (ODP_IPSEC_OP_MODE_ASYNC == suite_context.outbound_op_mode && + ODP_SUPPORT_NO == capa.op_mode_sync) || + (ODP_IPSEC_OP_MODE_ASYNC == suite_context.inbound_op_mode && + ODP_SUPPORT_NO == capa.op_mode_async) || + (ODP_IPSEC_OP_MODE_ASYNC == suite_context.outbound_op_mode && + ODP_SUPPORT_NO == capa.op_mode_async) || + (ODP_IPSEC_OP_MODE_INLINE == suite_context.inbound_op_mode && + ODP_SUPPORT_NO == capa.op_mode_inline_in) || + (ODP_IPSEC_OP_MODE_INLINE == suite_context.outbound_op_mode && + ODP_SUPPORT_NO == capa.op_mode_inline_out)) + return ODP_TEST_INACTIVE; - CU_ASSERT(odp_ipsec_capability(&capa) == 0); + if (ah && (ODP_SUPPORT_NO == capa.proto_ah)) + return ODP_TEST_INACTIVE; + + /* Cipher algorithms */ + switch (cipher) { + case ODP_CIPHER_ALG_NULL: + if (!capa.ciphers.bit.null) + return ODP_TEST_INACTIVE; + break; + case ODP_CIPHER_ALG_DES: + if (!capa.ciphers.bit.des) + return ODP_TEST_INACTIVE; + break; + case ODP_CIPHER_ALG_3DES_CBC: + if (!capa.ciphers.bit.trides_cbc) + return ODP_TEST_INACTIVE; + break; + case ODP_CIPHER_ALG_AES_CBC: + if (!capa.ciphers.bit.aes_cbc) + return ODP_TEST_INACTIVE; + break; + case ODP_CIPHER_ALG_AES_GCM: + if (!capa.ciphers.bit.aes_gcm) + return ODP_TEST_INACTIVE; + break; + default: + fprintf(stderr, "Unsupported cipher algorithm\n"); + return ODP_TEST_INACTIVE; + } + + /* Authentication algorithms */ + switch (auth) { + case ODP_AUTH_ALG_NULL: + if (!capa.auths.bit.null) + return ODP_TEST_INACTIVE; + break; + case ODP_AUTH_ALG_MD5_HMAC: + if (!capa.auths.bit.md5_hmac) + return ODP_TEST_INACTIVE; + break; + case ODP_AUTH_ALG_SHA1_HMAC: + if (!capa.auths.bit.sha1_hmac) + return ODP_TEST_INACTIVE; + break; + case ODP_AUTH_ALG_SHA256_HMAC: + if (!capa.auths.bit.sha256_hmac) + return ODP_TEST_INACTIVE; + break; + case ODP_AUTH_ALG_SHA512_HMAC: + if (!capa.auths.bit.sha512_hmac) + return ODP_TEST_INACTIVE; + break; + case ODP_AUTH_ALG_AES_GCM: + if (!capa.auths.bit.aes_gcm) + return ODP_TEST_INACTIVE; + break; + default: + fprintf(stderr, "Unsupported authentication algorithm\n"); + return ODP_TEST_INACTIVE; + } + + num = odp_ipsec_cipher_capability(cipher, cipher_capa, MAX_ALG_CAPA); + if (num <= 0) { + fprintf(stderr, "Wrong cipher capabilities\n"); + return ODP_TEST_INACTIVE; + } + + /* Search for the test case */ + for (i = 0; i < num; i++) { + if (cipher_capa[i].key_len == cipher_bits / 8) { + found = 1; + break; + } + } + + if (!found) { + fprintf(stderr, "Unsupported key length\n"); + return ODP_TEST_INACTIVE; + } + + num = odp_ipsec_auth_capability(auth, auth_capa, MAX_ALG_CAPA); + if (num <= 0) { + fprintf(stderr, "Wrong auth capabilities\n"); + return ODP_TEST_INACTIVE; + } + + return ODP_TEST_ACTIVE; } -odp_testinfo_t ipsec_suite[] = { - ODP_TEST_INFO(ipsec_test_capability), - ODP_TEST_INFO_NULL -}; +int ipsec_check_ah_sha256(void) +{ + return ipsec_check_ah(ODP_AUTH_ALG_SHA256_HMAC); +} -odp_suiteinfo_t ipsec_suites[] = { - {"IPsec", NULL, NULL, ipsec_suite}, - ODP_SUITE_INFO_NULL, -}; +int ipsec_check_esp_null_sha256(void) +{ + return ipsec_check_esp(ODP_CIPHER_ALG_NULL, 0, + ODP_AUTH_ALG_SHA256_HMAC); +} -int ipsec_main(int argc, char *argv[]) +int ipsec_check_esp_aes_cbc_128_null(void) { - int ret; + return ipsec_check_esp(ODP_CIPHER_ALG_AES_CBC, 128, + ODP_AUTH_ALG_NULL); +} + +int ipsec_check_esp_aes_cbc_128_sha256(void) +{ + return ipsec_check_esp(ODP_CIPHER_ALG_AES_CBC, 128, + ODP_AUTH_ALG_SHA256_HMAC); +} + +int ipsec_check_esp_aes_gcm_128(void) +{ + return ipsec_check_esp(ODP_CIPHER_ALG_AES_GCM, 128, + ODP_AUTH_ALG_AES_GCM); +} + +int ipsec_check_esp_aes_gcm_256(void) +{ + return ipsec_check_esp(ODP_CIPHER_ALG_AES_GCM, 256, + ODP_AUTH_ALG_AES_GCM); +} + +void ipsec_sa_param_fill(odp_ipsec_sa_param_t *param, + odp_bool_t in, + odp_bool_t ah, + uint32_t spi, + odp_ipsec_tunnel_param_t *tun, + odp_cipher_alg_t cipher_alg, + const odp_crypto_key_t *cipher_key, + odp_auth_alg_t auth_alg, + const odp_crypto_key_t *auth_key, + const odp_crypto_key_t *extra_key) +{ + odp_ipsec_sa_param_init(param); + param->dir = in ? ODP_IPSEC_DIR_INBOUND : + ODP_IPSEC_DIR_OUTBOUND; + if (in) + param->inbound.lookup_mode = ODP_IPSEC_LOOKUP_SPI; + + param->proto = ah ? ODP_IPSEC_AH : + ODP_IPSEC_ESP; + + if (tun) { + param->mode = ODP_IPSEC_MODE_TUNNEL; + if (!in) + param->outbound.tunnel = *tun; + } else { + param->mode = ODP_IPSEC_MODE_TRANSPORT; + } + + param->spi = spi; + + param->dest_queue = suite_context.queue; + + param->crypto.cipher_alg = cipher_alg; + if (cipher_key) + param->crypto.cipher_key = *cipher_key; + + param->crypto.auth_alg = auth_alg; + if (auth_key) + param->crypto.auth_key = *auth_key; + + if (extra_key) + param->crypto.cipher_key_extra = *extra_key; +} + +void ipsec_sa_destroy(odp_ipsec_sa_t sa) +{ + odp_event_t event; + odp_ipsec_status_t status; + + CU_ASSERT_EQUAL(ODP_IPSEC_OK, odp_ipsec_sa_disable(sa)); + + if (ODP_QUEUE_INVALID != suite_context.queue) { + do { + event = odp_queue_deq(suite_context.queue); + } while (event == ODP_EVENT_INVALID); + + CU_ASSERT_EQUAL(ODP_EVENT_IPSEC_STATUS, odp_event_type(event)); + + CU_ASSERT_EQUAL(ODP_IPSEC_OK, odp_ipsec_status(&status, event)); + + CU_ASSERT_EQUAL(ODP_IPSEC_STATUS_SA_DISABLE, status.id); + CU_ASSERT_EQUAL(sa, status.sa); + CU_ASSERT_EQUAL(0, status.result); + CU_ASSERT_EQUAL(0, status.warn.all); + + odp_event_free(event); + } + + CU_ASSERT_EQUAL(ODP_IPSEC_OK, odp_ipsec_sa_destroy(sa)); +} + +#define PACKET_USER_PTR ((void *)0x1212fefe) + +odp_packet_t ipsec_packet(const ipsec_test_packet *itp) +{ + odp_packet_t pkt = odp_packet_alloc(suite_context.pool, itp->len); + + CU_ASSERT_NOT_EQUAL(ODP_PACKET_INVALID, pkt); + if (ODP_PACKET_INVALID == pkt) + return pkt; + + CU_ASSERT_EQUAL(0, odp_packet_copy_from_mem(pkt, 0, itp->len, + itp->data)); + if (itp->l2_offset != ODP_PACKET_OFFSET_INVALID) + CU_ASSERT_EQUAL(0, odp_packet_l2_offset_set(pkt, + itp->l2_offset)); + if (itp->l3_offset != ODP_PACKET_OFFSET_INVALID) + CU_ASSERT_EQUAL(0, odp_packet_l3_offset_set(pkt, + itp->l3_offset)); + if (itp->l4_offset != ODP_PACKET_OFFSET_INVALID) + CU_ASSERT_EQUAL(0, odp_packet_l4_offset_set(pkt, + itp->l4_offset)); + + odp_packet_user_ptr_set(pkt, PACKET_USER_PTR); + + return pkt; +} + +/* + * Compare packages ignoring everything before L3 header + */ +static void ipsec_check_packet(const ipsec_test_packet *itp, odp_packet_t pkt) +{ + uint32_t len = (ODP_PACKET_INVALID == pkt) ? 1 : odp_packet_len(pkt); + uint32_t l3, l4; + uint8_t data[len]; + + if (NULL == itp) + return; + + CU_ASSERT_NOT_EQUAL(ODP_PACKET_INVALID, pkt); + if (ODP_PACKET_INVALID == pkt) + return; + + CU_ASSERT_EQUAL(PACKET_USER_PTR, odp_packet_user_ptr(pkt)); + + l3 = odp_packet_l3_offset(pkt); + l4 = odp_packet_l4_offset(pkt); + odp_packet_copy_to_mem(pkt, 0, len, data); + + if (l3 == ODP_PACKET_OFFSET_INVALID) { + CU_ASSERT_EQUAL(itp->l3_offset, ODP_PACKET_OFFSET_INVALID); + CU_ASSERT_EQUAL(l4, ODP_PACKET_OFFSET_INVALID); + + return; + } + + CU_ASSERT_EQUAL(len - l3, itp->len - itp->l3_offset); + if (len - l3 != itp->len - itp->l3_offset) + return; + + CU_ASSERT_EQUAL(l4 - l3, itp->l4_offset - itp->l3_offset); + if (l4 - l3 != itp->l4_offset - itp->l3_offset) + return; + + CU_ASSERT_EQUAL(0, memcmp(data + l3, + itp->data + itp->l3_offset, + len - l3)); +} + +static int ipsec_send_in_one(const ipsec_test_part *part, + odp_ipsec_sa_t sa, + odp_packet_t *pkto) +{ + odp_ipsec_in_param_t param; + int num_out = part->out_pkt; + odp_packet_t pkt; + int i; + + pkt = ipsec_packet(part->pkt_in); - /* parse common options: */ - if (odp_cunit_parse_options(argc, argv)) + memset(&param, 0, sizeof(param)); + if (!part->lookup) { + param.num_sa = 1; + param.sa = &sa; + } else { + param.num_sa = 0; + param.sa = NULL; + } + + if (ODP_IPSEC_OP_MODE_SYNC == suite_context.inbound_op_mode) { + CU_ASSERT_EQUAL(part->out_pkt, odp_ipsec_in(&pkt, 1, + pkto, &num_out, + &param)); + CU_ASSERT_EQUAL(num_out, part->out_pkt); + } else if (ODP_IPSEC_OP_MODE_ASYNC == suite_context.inbound_op_mode) { + CU_ASSERT_EQUAL(1, odp_ipsec_in_enq(&pkt, 1, &param)); + + for (i = 0; i < num_out; i++) { + odp_event_t event; + odp_event_subtype_t subtype; + + do { + event = odp_queue_deq(suite_context.queue); + } while (event == ODP_EVENT_INVALID); + + CU_ASSERT_EQUAL(ODP_EVENT_PACKET, + odp_event_types(event, &subtype)); + CU_ASSERT_EQUAL(ODP_EVENT_PACKET_IPSEC, subtype); + pkto[i] = odp_ipsec_packet_from_event(event); + } + } else { + odp_queue_t queue; + odp_pktout_queue_t pktout; + + CU_ASSERT_EQUAL_FATAL(1, odp_pktout_queue(suite_context.pktio, + &pktout, 1)); + + CU_ASSERT_EQUAL(1, odp_pktout_send(pktout, &pkt, 1)); + CU_ASSERT_EQUAL_FATAL(1, + odp_pktin_event_queue(suite_context. + pktio, + &queue, 1)); + + for (i = 0; i < num_out;) { + odp_event_t ev; + odp_event_subtype_t subtype; + + ev = odp_queue_deq(queue); + if (ODP_EVENT_INVALID != ev) { + CU_ASSERT_EQUAL(ODP_EVENT_PACKET, + odp_event_types(ev, &subtype)); + CU_ASSERT_EQUAL(ODP_EVENT_PACKET_BASIC, + subtype); + CU_ASSERT(part->out[i].status.error.sa_lookup); + + pkto[i++] = odp_ipsec_packet_from_event(ev); + continue; + } + + ev = odp_queue_deq(suite_context.queue); + if (ODP_EVENT_INVALID != ev) { + CU_ASSERT_EQUAL(ODP_EVENT_PACKET, + odp_event_types(ev, &subtype)); + CU_ASSERT_EQUAL(ODP_EVENT_PACKET_IPSEC, + subtype); + CU_ASSERT(!part->out[i].status.error.sa_lookup); + + pkto[i++] = odp_ipsec_packet_from_event(ev); + continue; + } + } + } + + return num_out; +} + +static int ipsec_send_out_one(const ipsec_test_part *part, + odp_ipsec_sa_t sa, + odp_packet_t *pkto) +{ + odp_ipsec_out_param_t param; + int num_out = part->out_pkt; + odp_packet_t pkt; + int i; + + pkt = ipsec_packet(part->pkt_in); + + memset(&param, 0, sizeof(param)); + param.num_sa = 1; + param.sa = &sa; + param.num_opt = 0; + param.opt = NULL; + + if (ODP_IPSEC_OP_MODE_SYNC == suite_context.outbound_op_mode) { + CU_ASSERT_EQUAL(part->out_pkt, odp_ipsec_out(&pkt, 1, + pkto, &num_out, + &param)); + CU_ASSERT_EQUAL(num_out, part->out_pkt); + } else if (ODP_IPSEC_OP_MODE_ASYNC == suite_context.outbound_op_mode) { + CU_ASSERT_EQUAL(1, odp_ipsec_out_enq(&pkt, 1, &param)); + + for (i = 0; i < num_out; i++) { + odp_event_t event; + odp_event_subtype_t subtype; + + do { + event = odp_queue_deq(suite_context.queue); + } while (event == ODP_EVENT_INVALID); + + CU_ASSERT_EQUAL(ODP_EVENT_PACKET, + odp_event_types(event, &subtype)); + CU_ASSERT_EQUAL(ODP_EVENT_PACKET_IPSEC, subtype); + pkto[i] = odp_ipsec_packet_from_event(event); + } + } else { + struct odp_ipsec_out_inline_param_t inline_param; + odp_queue_t queue; + uint32_t hdr_len = part->out[0].pkt_out->l3_offset; + uint8_t hdr[hdr_len]; + + memcpy(hdr, part->out[0].pkt_out->data, hdr_len); + inline_param.pktio = suite_context.pktio; + inline_param.outer_hdr.ptr = hdr; + inline_param.outer_hdr.len = hdr_len; + + CU_ASSERT_EQUAL(1, odp_ipsec_out_inline(&pkt, 1, &param, + &inline_param)); + CU_ASSERT_EQUAL_FATAL(1, + odp_pktin_event_queue(suite_context. + pktio, + &queue, 1)); + + for (i = 0; i < num_out;) { + odp_event_t ev; + odp_event_subtype_t subtype; + + ev = odp_queue_deq(queue); + if (ODP_EVENT_INVALID != ev) { + CU_ASSERT_EQUAL(ODP_EVENT_PACKET, + odp_event_types(ev, &subtype)); + CU_ASSERT_EQUAL(ODP_EVENT_PACKET_BASIC, + subtype); + CU_ASSERT(!part->out[i].status.error.all); + + pkto[i++] = odp_ipsec_packet_from_event(ev); + continue; + } + + ev = odp_queue_deq(suite_context.queue); + if (ODP_EVENT_INVALID != ev) { + CU_ASSERT_EQUAL(ODP_EVENT_PACKET, + odp_event_types(ev, &subtype)); + CU_ASSERT_EQUAL(ODP_EVENT_PACKET_IPSEC, + subtype); + CU_ASSERT(part->out[i].status.error.all); + + pkto[i++] = odp_ipsec_packet_from_event(ev); + continue; + } + } + } + + return num_out; +} + +void ipsec_check_in_one(const ipsec_test_part *part, odp_ipsec_sa_t sa) +{ + int num_out = part->out_pkt; + odp_packet_t pkto[num_out]; + int i; + + num_out = ipsec_send_in_one(part, sa, pkto); + + for (i = 0; i < num_out; i++) { + odp_ipsec_packet_result_t result; + + if (ODP_PACKET_INVALID == pkto[i]) { + CU_FAIL("ODP_PACKET_INVALID received"); + continue; + } + + if (ODP_EVENT_PACKET_IPSEC != + odp_event_subtype(odp_packet_to_event(pkto[i]))) { + /* Inline packet went through loop */ + CU_ASSERT_EQUAL(1, part->out[i].status.error.sa_lookup); + } else { + CU_ASSERT_EQUAL(0, odp_ipsec_result(&result, pkto[i])); + CU_ASSERT_EQUAL(part->out[i].status.error.all, + result.status.error.all); + CU_ASSERT_EQUAL(sa, result.sa); + } + ipsec_check_packet(part->out[i].pkt_out, + pkto[i]); + odp_packet_free(pkto[i]); + } +} + +void ipsec_check_out_one(const ipsec_test_part *part, odp_ipsec_sa_t sa) +{ + int num_out = part->out_pkt; + odp_packet_t pkto[num_out]; + int i; + + num_out = ipsec_send_out_one(part, sa, pkto); + + for (i = 0; i < num_out; i++) { + odp_ipsec_packet_result_t result; + + if (ODP_PACKET_INVALID == pkto[i]) { + CU_FAIL("ODP_PACKET_INVALID received"); + continue; + } + + if (ODP_EVENT_PACKET_IPSEC != + odp_event_subtype(odp_packet_to_event(pkto[i]))) { + /* Inline packet went through loop */ + CU_ASSERT_EQUAL(0, part->out[i].status.error.all); + } else { + /* IPsec packet */ + CU_ASSERT_EQUAL(0, odp_ipsec_result(&result, pkto[i])); + CU_ASSERT_EQUAL(part->out[i].status.error.all, + result.status.error.all); + CU_ASSERT_EQUAL(sa, result.sa); + } + ipsec_check_packet(part->out[i].pkt_out, + pkto[i]); + odp_packet_free(pkto[i]); + } +} + +void ipsec_check_out_in_one(const ipsec_test_part *part, + odp_ipsec_sa_t sa, + odp_ipsec_sa_t sa_in) +{ + int num_out = part->out_pkt; + odp_packet_t pkto[num_out]; + int i; + + num_out = ipsec_send_out_one(part, sa, pkto); + + for (i = 0; i < num_out; i++) { + ipsec_test_part part_in = *part; + ipsec_test_packet pkt_in; + odp_ipsec_packet_result_t result; + + if (ODP_PACKET_INVALID == pkto[i]) { + CU_FAIL("ODP_PACKET_INVALID received"); + continue; + } + + if (ODP_EVENT_PACKET_IPSEC != + odp_event_subtype(odp_packet_to_event(pkto[i]))) { + /* Inline packet went through loop */ + CU_ASSERT_EQUAL(0, part->out[i].status.error.all); + } else { + /* IPsec packet */ + CU_ASSERT_EQUAL(0, odp_ipsec_result(&result, pkto[i])); + CU_ASSERT_EQUAL(part->out[i].status.error.all, + result.status.error.all); + CU_ASSERT_EQUAL(sa, result.sa); + } + CU_ASSERT_FATAL(odp_packet_len(pkto[i]) <= + sizeof(pkt_in.data)); + + pkt_in.len = odp_packet_len(pkto[i]); + pkt_in.l2_offset = odp_packet_l2_offset(pkto[i]); + pkt_in.l3_offset = odp_packet_l3_offset(pkto[i]); + pkt_in.l4_offset = odp_packet_l4_offset(pkto[i]); + odp_packet_copy_to_mem(pkto[i], 0, + pkt_in.len, + pkt_in.data); + part_in.pkt_in = &pkt_in; + ipsec_check_in_one(&part_in, sa_in); + odp_packet_free(pkto[i]); + } +} + +int ipsec_suite_init(void) +{ + int rc = 0; + + if (suite_context.pktio != ODP_PKTIO_INVALID) + rc = pktio_start(suite_context.pktio, + suite_context.inbound_op_mode == + ODP_IPSEC_OP_MODE_INLINE, + suite_context.outbound_op_mode == + ODP_IPSEC_OP_MODE_INLINE); + if (rc == 0) + suite_context.pktio = ODP_PKTIO_INVALID; + + return rc < 0 ? -1 : 0; +} + +static int ipsec_suite_term(odp_testinfo_t *suite) +{ + int i; + int first = 1; + + if (suite_context.pktio != ODP_PKTIO_INVALID) + pktio_stop(suite_context.pktio); + + for (i = 0; suite[i].pName; 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); + } + } + + return 0; +} + +int ipsec_in_term(void) +{ + return ipsec_suite_term(ipsec_in_suite); +} + +int ipsec_out_term(void) +{ + return ipsec_suite_term(ipsec_out_suite); +} + +int ipsec_init(odp_instance_t *inst) +{ + odp_pool_param_t params; + odp_pool_t pool; + odp_queue_t out_queue; + odp_pool_capability_t pool_capa; + odp_pktio_t pktio; + + if (0 != odp_init_global(inst, NULL, NULL)) { + fprintf(stderr, "error: odp_init_global() failed.\n"); + return -1; + } + + if (0 != odp_init_local(*inst, ODP_THREAD_CONTROL)) { + fprintf(stderr, "error: odp_init_local() failed.\n"); + return -1; + } + + if (odp_pool_capability(&pool_capa) < 0) { + fprintf(stderr, "error: odp_pool_capability() failed.\n"); + return -1; + } + + odp_pool_param_init(&params); + params.pkt.seg_len = PKT_POOL_LEN; + params.pkt.len = PKT_POOL_LEN; + params.pkt.num = PKT_POOL_NUM; + params.type = ODP_POOL_PACKET; + + if (pool_capa.pkt.max_seg_len && + PKT_POOL_LEN > pool_capa.pkt.max_seg_len) { + fprintf(stderr, "Warning: small packet segment length\n"); + params.pkt.seg_len = pool_capa.pkt.max_seg_len; + } + + if (pool_capa.pkt.max_len && + PKT_POOL_LEN > pool_capa.pkt.max_len) { + fprintf(stderr, "Pool max packet length too small\n"); return -1; + } - ret = odp_cunit_register(ipsec_suites); + pool = odp_pool_create("packet_pool", &params); - if (ret == 0) - ret = odp_cunit_run(); + if (ODP_POOL_INVALID == pool) { + fprintf(stderr, "Packet pool creation failed.\n"); + return -1; + } + out_queue = odp_queue_create("ipsec-out", NULL); + if (ODP_QUEUE_INVALID == out_queue) { + fprintf(stderr, "IPsec outq creation failed.\n"); + return -1; + } + + pktio = pktio_create(pool); + if (ODP_PKTIO_INVALID == pktio) { + fprintf(stderr, "IPsec pktio creation failed.\n"); + return -1; + } + + return 0; +} + +int ipsec_config(odp_instance_t ODP_UNUSED inst) +{ + odp_ipsec_capability_t capa; + odp_ipsec_config_t ipsec_config; + + if (odp_ipsec_capability(&capa) < 0) + return -1; + + /* If we can not setup IPsec due to mode being unsupported, don't + * return an error here. It is easier (and more correct) to filter that + * in test checking function and just say that the test is inactive. */ + if ((ODP_IPSEC_OP_MODE_SYNC == suite_context.inbound_op_mode && + ODP_SUPPORT_NO == capa.op_mode_sync) || + (ODP_IPSEC_OP_MODE_ASYNC == suite_context.outbound_op_mode && + ODP_SUPPORT_NO == capa.op_mode_sync) || + (ODP_IPSEC_OP_MODE_ASYNC == suite_context.inbound_op_mode && + ODP_SUPPORT_NO == capa.op_mode_async) || + (ODP_IPSEC_OP_MODE_ASYNC == suite_context.outbound_op_mode && + ODP_SUPPORT_NO == capa.op_mode_async) || + (ODP_IPSEC_OP_MODE_INLINE == suite_context.inbound_op_mode && + ODP_SUPPORT_NO == capa.op_mode_inline_in) || + (ODP_IPSEC_OP_MODE_INLINE == suite_context.outbound_op_mode && + ODP_SUPPORT_NO == capa.op_mode_inline_out)) + return 0; + + odp_ipsec_config_init(&ipsec_config); + ipsec_config.inbound_mode = suite_context.inbound_op_mode; + ipsec_config.outbound_mode = suite_context.outbound_op_mode; + ipsec_config.inbound.default_queue = suite_context.queue; + ipsec_config.inbound.parse = ODP_IPSEC_LAYER_ALL; + + if (ODP_IPSEC_OK != odp_ipsec_config(&ipsec_config)) + return -1; + + return 0; +} + +int ipsec_term(odp_instance_t inst) +{ + odp_pool_t pool; + odp_queue_t out_queue; + odp_pktio_t pktio; + + pktio = odp_pktio_lookup("loop"); + if (ODP_PKTIO_INVALID != pktio) { + if (odp_pktio_close(pktio)) + fprintf(stderr, "IPsec pktio close failed.\n"); + } else { + fprintf(stderr, "IPsec pktio not found.\n"); + } + + out_queue = odp_queue_lookup("ipsec-out"); + if (ODP_QUEUE_INVALID != out_queue) { + if (odp_queue_destroy(out_queue)) + fprintf(stderr, "IPsec outq destroy failed.\n"); + } else { + fprintf(stderr, "IPsec outq not found.\n"); + } + + pool = odp_pool_lookup("packet_pool"); + if (ODP_POOL_INVALID != pool) { + if (odp_pool_destroy(pool)) + fprintf(stderr, "Packet pool destroy failed.\n"); + } else { + fprintf(stderr, "Packet pool not found.\n"); + } + + if (0 != odp_term_local()) { + fprintf(stderr, "error: odp_term_local() failed.\n"); + return -1; + } + + if (0 != odp_term_global(inst)) { + fprintf(stderr, "error: odp_term_global() failed.\n"); + return -1; + } - return ret; + return 0; } diff --git a/test/common_plat/validation/api/ipsec/ipsec.h b/test/common_plat/validation/api/ipsec/ipsec.h index 290a186f..d1c6854b 100644 --- a/test/common_plat/validation/api/ipsec/ipsec.h +++ b/test/common_plat/validation/api/ipsec/ipsec.h @@ -9,16 +9,81 @@ #include <odp_cunit_common.h> -/* test functions: */ -void ipsec_test_capability(void); - /* test arrays: */ -extern odp_testinfo_t ipsec_suite[]; +extern odp_testinfo_t ipsec_in_suite[]; +extern odp_testinfo_t ipsec_out_suite[]; + +int ipsec_init(odp_instance_t *inst); +int ipsec_term(odp_instance_t inst); +int ipsec_config(odp_instance_t inst); + +int ipsec_in_inline_init(void); +int ipsec_out_inline_init(void); + +int ipsec_suite_init(void); +int ipsec_in_term(void); +int ipsec_out_term(void); + +struct suite_context_s { + odp_ipsec_op_mode_t inbound_op_mode; + odp_ipsec_op_mode_t outbound_op_mode; + odp_pool_t pool; + odp_queue_t queue; + odp_pktio_t pktio; +}; + +extern struct suite_context_s suite_context; + +typedef struct { + uint32_t len; + uint32_t l2_offset; + uint32_t l3_offset; + uint32_t l4_offset; + uint8_t data[256]; +} ipsec_test_packet; + +typedef struct { + const ipsec_test_packet *pkt_in; + odp_bool_t lookup; + int out_pkt; + struct { + odp_ipsec_op_status_t status; + const ipsec_test_packet *pkt_out; + } out[1]; +} ipsec_test_part; + +void ipsec_sa_param_fill(odp_ipsec_sa_param_t *param, + odp_bool_t in, + odp_bool_t ah, + uint32_t spi, + odp_ipsec_tunnel_param_t *tun, + odp_cipher_alg_t cipher_alg, + const odp_crypto_key_t *cipher_key, + odp_auth_alg_t auth_alg, + const odp_crypto_key_t *auth_key, + const odp_crypto_key_t *extra_key); -/* test registry: */ -extern odp_suiteinfo_t ipsec_suites[]; +void ipsec_sa_destroy(odp_ipsec_sa_t sa); +odp_packet_t ipsec_packet(const ipsec_test_packet *itp); +void ipsec_check_in_one(const ipsec_test_part *part, odp_ipsec_sa_t sa); +void ipsec_check_out_one(const ipsec_test_part *part, odp_ipsec_sa_t sa); +void ipsec_check_out_in_one(const ipsec_test_part *part, + odp_ipsec_sa_t sa, + odp_ipsec_sa_t sa_in); -/* main test program: */ -int ipsec_main(int argc, char *argv[]); +int ipsec_check(odp_bool_t ah, + odp_cipher_alg_t cipher, + uint32_t cipher_bits, + odp_auth_alg_t auth); +#define ipsec_check_ah(auth) \ + ipsec_check(true, ODP_CIPHER_ALG_NULL, 0, auth) +#define ipsec_check_esp(cipher, cipher_bits, auth) \ + ipsec_check(false, cipher, cipher_bits, auth) +int ipsec_check_ah_sha256(void); +int ipsec_check_esp_null_sha256(void); +int ipsec_check_esp_aes_cbc_128_null(void); +int ipsec_check_esp_aes_cbc_128_sha256(void); +int ipsec_check_esp_aes_gcm_128(void); +int ipsec_check_esp_aes_gcm_256(void); #endif diff --git a/test/common_plat/validation/api/ipsec/ipsec_async.c b/test/common_plat/validation/api/ipsec/ipsec_async.c new file mode 100644 index 00000000..79687923 --- /dev/null +++ b/test/common_plat/validation/api/ipsec/ipsec_async.c @@ -0,0 +1,55 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include "config.h" + +#include "ipsec.h" + +static int ipsec_async_init(odp_instance_t *inst) +{ + int rc; + + rc = ipsec_init(inst); + if (rc != 0) + return rc; + + suite_context.pool = odp_pool_lookup("packet_pool"); + if (suite_context.pool == ODP_POOL_INVALID) + return -1; + suite_context.queue = odp_queue_lookup("ipsec-out"); + if (suite_context.queue == ODP_QUEUE_INVALID) + return -1; + + suite_context.pktio = ODP_PKTIO_INVALID; + suite_context.inbound_op_mode = ODP_IPSEC_OP_MODE_ASYNC; + suite_context.outbound_op_mode = ODP_IPSEC_OP_MODE_ASYNC; + + return ipsec_config(*inst); +} + +odp_suiteinfo_t ipsec_suites[] = { + {"IPsec-in", ipsec_suite_init, ipsec_in_term, ipsec_in_suite}, + {"IPsec-out", ipsec_suite_init, ipsec_out_term, ipsec_out_suite}, + ODP_SUITE_INFO_NULL, +}; + +int main(int argc, char *argv[]) +{ + int ret; + + /* parse common options: */ + if (odp_cunit_parse_options(argc, argv)) + return -1; + + odp_cunit_register_global_init(ipsec_async_init); + odp_cunit_register_global_term(ipsec_term); + + ret = odp_cunit_register(ipsec_suites); + if (ret == 0) + ret = odp_cunit_run(); + + return ret; +} diff --git a/test/common_plat/validation/api/ipsec/ipsec_inline_in.c b/test/common_plat/validation/api/ipsec/ipsec_inline_in.c new file mode 100644 index 00000000..2a595353 --- /dev/null +++ b/test/common_plat/validation/api/ipsec/ipsec_inline_in.c @@ -0,0 +1,56 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include "config.h" + +#include "ipsec.h" + +static int ipsec_sync_init(odp_instance_t *inst) +{ + int rc; + + rc = ipsec_init(inst); + if (rc != 0) + return rc; + + suite_context.pool = odp_pool_lookup("packet_pool"); + if (suite_context.pool == ODP_POOL_INVALID) + return -1; + suite_context.queue = odp_queue_lookup("ipsec-out"); + if (suite_context.queue == ODP_QUEUE_INVALID) + return -1; + suite_context.pktio = odp_pktio_lookup("loop"); + if (suite_context.pktio == ODP_PKTIO_INVALID) + return -1; + + suite_context.inbound_op_mode = ODP_IPSEC_OP_MODE_INLINE; + suite_context.outbound_op_mode = ODP_IPSEC_OP_MODE_ASYNC; + + return ipsec_config(*inst); +} + +odp_suiteinfo_t ipsec_suites[] = { + {"IPsec-in", ipsec_suite_init, ipsec_in_term, ipsec_in_suite}, + ODP_SUITE_INFO_NULL, +}; + +int main(int argc, char *argv[]) +{ + int ret; + + /* parse common options: */ + if (odp_cunit_parse_options(argc, argv)) + return -1; + + odp_cunit_register_global_init(ipsec_sync_init); + odp_cunit_register_global_term(ipsec_term); + + ret = odp_cunit_register(ipsec_suites); + if (ret == 0) + ret = odp_cunit_run(); + + return ret; +} diff --git a/test/common_plat/validation/api/ipsec/ipsec_inline_out.c b/test/common_plat/validation/api/ipsec/ipsec_inline_out.c new file mode 100644 index 00000000..0a34e03a --- /dev/null +++ b/test/common_plat/validation/api/ipsec/ipsec_inline_out.c @@ -0,0 +1,56 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include "config.h" + +#include "ipsec.h" + +static int ipsec_sync_init(odp_instance_t *inst) +{ + int rc; + + rc = ipsec_init(inst); + if (rc != 0) + return rc; + + suite_context.pool = odp_pool_lookup("packet_pool"); + if (suite_context.pool == ODP_POOL_INVALID) + return -1; + suite_context.queue = odp_queue_lookup("ipsec-out"); + if (suite_context.queue == ODP_QUEUE_INVALID) + return -1; + suite_context.pktio = odp_pktio_lookup("loop"); + if (suite_context.pktio == ODP_PKTIO_INVALID) + return -1; + + suite_context.inbound_op_mode = ODP_IPSEC_OP_MODE_ASYNC; + suite_context.outbound_op_mode = ODP_IPSEC_OP_MODE_INLINE; + + return ipsec_config(*inst); +} + +odp_suiteinfo_t ipsec_suites[] = { + {"IPsec-out", ipsec_suite_init, ipsec_out_term, ipsec_out_suite}, + ODP_SUITE_INFO_NULL, +}; + +int main(int argc, char *argv[]) +{ + int ret; + + /* parse common options: */ + if (odp_cunit_parse_options(argc, argv)) + return -1; + + odp_cunit_register_global_init(ipsec_sync_init); + odp_cunit_register_global_term(ipsec_term); + + ret = odp_cunit_register(ipsec_suites); + if (ret == 0) + ret = odp_cunit_run(); + + return ret; +} diff --git a/test/common_plat/validation/api/ipsec/ipsec_main.c b/test/common_plat/validation/api/ipsec/ipsec_main.c deleted file mode 100644 index 63a7a55f..00000000 --- a/test/common_plat/validation/api/ipsec/ipsec_main.c +++ /dev/null @@ -1,12 +0,0 @@ -/* Copyright (c) 2017, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#include "ipsec.h" - -int main(int argc, char *argv[]) -{ - return ipsec_main(argc, argv); -} diff --git a/test/common_plat/validation/api/ipsec/ipsec_sync.c b/test/common_plat/validation/api/ipsec/ipsec_sync.c new file mode 100644 index 00000000..c22980a8 --- /dev/null +++ b/test/common_plat/validation/api/ipsec/ipsec_sync.c @@ -0,0 +1,53 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include "config.h" + +#include "ipsec.h" + +static int ipsec_sync_init(odp_instance_t *inst) +{ + int rc; + + rc = ipsec_init(inst); + if (rc != 0) + return rc; + + suite_context.pool = odp_pool_lookup("packet_pool"); + if (suite_context.pool == ODP_POOL_INVALID) + return -1; + + suite_context.queue = ODP_QUEUE_INVALID; + suite_context.pktio = ODP_PKTIO_INVALID; + suite_context.inbound_op_mode = ODP_IPSEC_OP_MODE_SYNC; + suite_context.outbound_op_mode = ODP_IPSEC_OP_MODE_SYNC; + + return ipsec_config(*inst); +} + +odp_suiteinfo_t ipsec_suites[] = { + {"IPsec-in", ipsec_suite_init, ipsec_in_term, ipsec_in_suite}, + {"IPsec-out", ipsec_suite_init, ipsec_out_term, ipsec_out_suite}, + ODP_SUITE_INFO_NULL, +}; + +int main(int argc, char *argv[]) +{ + int ret; + + /* parse common options: */ + if (odp_cunit_parse_options(argc, argv)) + return -1; + + odp_cunit_register_global_init(ipsec_sync_init); + odp_cunit_register_global_term(ipsec_term); + + ret = odp_cunit_register(ipsec_suites); + if (ret == 0) + ret = odp_cunit_run(); + + return ret; +} diff --git a/test/common_plat/validation/api/ipsec/ipsec_sync_in.c b/test/common_plat/validation/api/ipsec/ipsec_sync_in.c new file mode 100644 index 00000000..8a7fc468 --- /dev/null +++ b/test/common_plat/validation/api/ipsec/ipsec_sync_in.c @@ -0,0 +1,27 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include "config.h" + +#include "ipsec.h" + +int main(int argc, char *argv[]) +{ + int ret; + + /* parse common options: */ + if (odp_cunit_parse_options(argc, argv)) + return -1; + + odp_cunit_register_global_init(ipsec_init); + odp_cunit_register_global_term(ipsec_term); + + ret = odp_cunit_register(ipsec_suites); + if (ret == 0) + ret = odp_cunit_run(); + + return ret; +} diff --git a/test/common_plat/validation/api/ipsec/ipsec_test_in.c b/test/common_plat/validation/api/ipsec/ipsec_test_in.c new file mode 100644 index 00000000..25fc00e1 --- /dev/null +++ b/test/common_plat/validation/api/ipsec/ipsec_test_in.c @@ -0,0 +1,815 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include "config.h" + +#include "ipsec.h" + +#include "test_vectors.h" + +static void test_in_ah_sha256(void) +{ + odp_ipsec_sa_param_t param; + odp_ipsec_sa_t sa; + + ipsec_sa_param_fill(&param, + true, true, 123, NULL, + ODP_CIPHER_ALG_NULL, NULL, + ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256, + NULL); + + sa = odp_ipsec_sa_create(&param); + + CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa); + + ipsec_test_part test = { + .pkt_in = &pkt_icmp_0_ah_sha256_1, + .out_pkt = 1, + .out = { + { .status.warn.all = 0, + .status.error.all = 0, + .pkt_out = &pkt_icmp_0 }, + }, + }; + + ipsec_check_in_one(&test, sa); + + ipsec_sa_destroy(sa); +} + +static void test_in_ah_sha256_tun(void) +{ + odp_ipsec_tunnel_param_t tunnel = {}; + odp_ipsec_sa_param_t param; + odp_ipsec_sa_t sa; + + ipsec_sa_param_fill(&param, + true, true, 123, &tunnel, + ODP_CIPHER_ALG_NULL, NULL, + ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256, + NULL); + + sa = odp_ipsec_sa_create(&param); + + CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa); + + ipsec_test_part test = { + .pkt_in = &pkt_icmp_0_ah_tun_sha256_1, + .out_pkt = 1, + .out = { + { .status.warn.all = 0, + .status.error.all = 0, + .pkt_out = &pkt_icmp_0 }, + }, + }; + + ipsec_check_in_one(&test, sa); + + ipsec_sa_destroy(sa); +} + +static void test_in_ah_sha256_tun_notun(void) +{ + odp_ipsec_sa_param_t param; + odp_ipsec_sa_t sa; + + ipsec_sa_param_fill(&param, + true, true, 123, NULL, + ODP_CIPHER_ALG_NULL, NULL, + ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256, + NULL); + + sa = odp_ipsec_sa_create(&param); + + CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa); + + ipsec_test_part test = { + .pkt_in = &pkt_icmp_0_ah_tun_sha256_1, + .out_pkt = 1, + .out = { + { .status.warn.all = 0, + .status.error.all = 0, + .pkt_out = &pkt_icmp_0_ipip }, + }, + }; + + ipsec_check_in_one(&test, sa); + + ipsec_sa_destroy(sa); +} + +static void test_in_esp_null_sha256(void) +{ + odp_ipsec_sa_param_t param; + odp_ipsec_sa_t sa; + + ipsec_sa_param_fill(&param, + true, false, 123, NULL, + ODP_CIPHER_ALG_NULL, NULL, + ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256, + NULL); + + sa = odp_ipsec_sa_create(&param); + + CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa); + + ipsec_test_part test = { + .pkt_in = &pkt_icmp_0_esp_null_sha256_1, + .out_pkt = 1, + .out = { + { .status.warn.all = 0, + .status.error.all = 0, + .pkt_out = &pkt_icmp_0 }, + }, + }; + + ipsec_check_in_one(&test, sa); + + ipsec_sa_destroy(sa); +} + +static void test_in_esp_aes_cbc_null(void) +{ + odp_ipsec_sa_param_t param; + odp_ipsec_sa_t sa; + + ipsec_sa_param_fill(&param, + true, false, 123, NULL, + ODP_CIPHER_ALG_AES_CBC, &key_a5_128, + ODP_AUTH_ALG_NULL, NULL, + NULL); + + sa = odp_ipsec_sa_create(&param); + + CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa); + + ipsec_test_part test = { + .pkt_in = &pkt_icmp_0_esp_aes_cbc_null_1, + .out_pkt = 1, + .out = { + { .status.warn.all = 0, + .status.error.all = 0, + .pkt_out = &pkt_icmp_0 }, + }, + }; + + ipsec_check_in_one(&test, sa); + + ipsec_sa_destroy(sa); +} + +static void test_in_esp_aes_cbc_sha256(void) +{ + odp_ipsec_sa_param_t param; + odp_ipsec_sa_t sa; + + ipsec_sa_param_fill(&param, + true, false, 123, NULL, + ODP_CIPHER_ALG_AES_CBC, &key_a5_128, + ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256, + NULL); + + sa = odp_ipsec_sa_create(&param); + + CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa); + + ipsec_test_part test = { + .pkt_in = &pkt_icmp_0_esp_aes_cbc_sha256_1, + .out_pkt = 1, + .out = { + { .status.warn.all = 0, + .status.error.all = 0, + .pkt_out = &pkt_icmp_0 }, + }, + }; + + ipsec_check_in_one(&test, sa); + + ipsec_sa_destroy(sa); +} + +static void test_in_lookup_ah_sha256(void) +{ + odp_ipsec_sa_param_t param; + odp_ipsec_sa_t sa; + + ipsec_sa_param_fill(&param, + true, true, 123, NULL, + ODP_CIPHER_ALG_NULL, NULL, + ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256, + NULL); + + sa = odp_ipsec_sa_create(&param); + + CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa); + + ipsec_test_part test = { + .pkt_in = &pkt_icmp_0_ah_sha256_1, + .lookup = 1, + .out_pkt = 1, + .out = { + { .status.warn.all = 0, + .status.error.all = 0, + .pkt_out = &pkt_icmp_0 }, + }, + }; + + ipsec_check_in_one(&test, sa); + + ipsec_sa_destroy(sa); +} + +static void test_in_lookup_esp_null_sha256(void) +{ + odp_ipsec_sa_param_t param; + odp_ipsec_sa_t sa; + + ipsec_sa_param_fill(&param, + true, false, 123, NULL, + ODP_CIPHER_ALG_NULL, NULL, + ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256, + NULL); + + sa = odp_ipsec_sa_create(&param); + + CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa); + + ipsec_test_part test = { + .pkt_in = &pkt_icmp_0_esp_null_sha256_1, + .lookup = 1, + .out_pkt = 1, + .out = { + { .status.warn.all = 0, + .status.error.all = 0, + .pkt_out = &pkt_icmp_0 }, + }, + }; + + ipsec_check_in_one(&test, sa); + + ipsec_sa_destroy(sa); +} + +static void test_in_esp_null_sha256_tun(void) +{ + odp_ipsec_tunnel_param_t tunnel = {}; + odp_ipsec_sa_param_t param; + odp_ipsec_sa_t sa; + + ipsec_sa_param_fill(&param, + true, false, 123, &tunnel, + ODP_CIPHER_ALG_NULL, NULL, + ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256, + NULL); + + sa = odp_ipsec_sa_create(&param); + + CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa); + + ipsec_test_part test = { + .pkt_in = &pkt_icmp_0_esp_tun_null_sha256_1, + .out_pkt = 1, + .out = { + { .status.warn.all = 0, + .status.error.all = 0, + .pkt_out = &pkt_icmp_0 }, + }, + }; + + ipsec_check_in_one(&test, sa); + + ipsec_sa_destroy(sa); +} + +static void test_in_ah_esp_pkt(void) +{ + odp_ipsec_sa_param_t param; + odp_ipsec_sa_t sa; + + /* This test will not work properly inbound inline mode. + * test_in_lookup_ah_esp_pkt will be used instead. */ + if (suite_context.inbound_op_mode == ODP_IPSEC_OP_MODE_INLINE) + return; + + ipsec_sa_param_fill(&param, + true, true, 123, NULL, + ODP_CIPHER_ALG_NULL, NULL, + ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256, + NULL); + + sa = odp_ipsec_sa_create(&param); + + CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa); + + ipsec_test_part test = { + .pkt_in = &pkt_icmp_0_esp_null_sha256_1, + .out_pkt = 1, + .out = { + { .status.warn.all = 0, + .status.error.proto = 1, + .pkt_out = NULL }, + }, + }; + + ipsec_check_in_one(&test, sa); + + ipsec_sa_destroy(sa); +} + +static void test_in_esp_ah_pkt(void) +{ + odp_ipsec_sa_param_t param; + odp_ipsec_sa_t sa; + + /* This test will not work properly inbound inline mode. + * test_in_lookup_esp_ah_pkt will be used instead. */ + if (suite_context.inbound_op_mode == ODP_IPSEC_OP_MODE_INLINE) + return; + + ipsec_sa_param_fill(&param, + true, false, 123, NULL, + ODP_CIPHER_ALG_NULL, NULL, + ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256, + NULL); + + sa = odp_ipsec_sa_create(&param); + + CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa); + + ipsec_test_part test = { + .pkt_in = &pkt_icmp_0_ah_sha256_1, + .out_pkt = 1, + .out = { + { .status.warn.all = 0, + .status.error.proto = 1, + .pkt_out = NULL }, + }, + }; + + ipsec_check_in_one(&test, sa); + + ipsec_sa_destroy(sa); +} + +static void test_in_lookup_ah_esp_pkt(void) +{ + odp_ipsec_sa_param_t param; + odp_ipsec_sa_t sa; + + ipsec_sa_param_fill(&param, + true, true, 123, NULL, + ODP_CIPHER_ALG_NULL, NULL, + ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256, + NULL); + + sa = odp_ipsec_sa_create(&param); + + CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa); + + ipsec_test_part test = { + .pkt_in = &pkt_icmp_0_esp_null_sha256_1, + .lookup = 1, + .out_pkt = 1, + .out = { + { .status.warn.all = 0, + .status.error.sa_lookup = 1, + .pkt_out = NULL }, + }, + }; + + ipsec_check_in_one(&test, ODP_IPSEC_SA_INVALID); + + ipsec_sa_destroy(sa); +} + +static void test_in_lookup_esp_ah_pkt(void) +{ + odp_ipsec_sa_param_t param; + odp_ipsec_sa_t sa; + + ipsec_sa_param_fill(&param, + true, false, 123, NULL, + ODP_CIPHER_ALG_NULL, NULL, + ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256, + NULL); + + sa = odp_ipsec_sa_create(&param); + + CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa); + + ipsec_test_part test = { + .pkt_in = &pkt_icmp_0_ah_sha256_1, + .lookup = 1, + .out_pkt = 1, + .out = { + { .status.warn.all = 0, + .status.error.sa_lookup = 1, + .pkt_out = NULL }, + }, + }; + + ipsec_check_in_one(&test, ODP_IPSEC_SA_INVALID); + + ipsec_sa_destroy(sa); +} + +static void test_in_ah_sha256_bad1(void) +{ + odp_ipsec_sa_param_t param; + odp_ipsec_sa_t sa; + + ipsec_sa_param_fill(&param, + true, true, 123, NULL, + ODP_CIPHER_ALG_NULL, NULL, + ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256, + NULL); + + sa = odp_ipsec_sa_create(&param); + + CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa); + + ipsec_test_part test = { + .pkt_in = &pkt_icmp_0_ah_sha256_1_bad1, + .out_pkt = 1, + .out = { + { .status.warn.all = 0, + .status.error.auth = 1, + .pkt_out = NULL }, + }, + }; + + ipsec_check_in_one(&test, sa); + + ipsec_sa_destroy(sa); +} + +static void test_in_ah_sha256_bad2(void) +{ + odp_ipsec_sa_param_t param; + odp_ipsec_sa_t sa; + + ipsec_sa_param_fill(&param, + true, true, 123, NULL, + ODP_CIPHER_ALG_NULL, NULL, + ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256, + NULL); + + sa = odp_ipsec_sa_create(&param); + + CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa); + + ipsec_test_part test = { + .pkt_in = &pkt_icmp_0_ah_sha256_1_bad2, + .out_pkt = 1, + .out = { + { .status.warn.all = 0, + .status.error.auth = 1, + .pkt_out = NULL }, + }, + }; + + ipsec_check_in_one(&test, sa); + + ipsec_sa_destroy(sa); +} + +static void test_in_esp_null_sha256_bad1(void) +{ + odp_ipsec_sa_param_t param; + odp_ipsec_sa_t sa; + + ipsec_sa_param_fill(&param, + true, false, 123, NULL, + ODP_CIPHER_ALG_NULL, NULL, + ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256, + NULL); + + sa = odp_ipsec_sa_create(&param); + + CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa); + + ipsec_test_part test = { + .pkt_in = &pkt_icmp_0_esp_null_sha256_1_bad1, + .out_pkt = 1, + .out = { + { .status.warn.all = 0, + .status.error.auth = 1, + .pkt_out = NULL }, + }, + }; + + ipsec_check_in_one(&test, sa); + + ipsec_sa_destroy(sa); +} + +static void test_in_rfc3602_5_esp(void) +{ + odp_ipsec_sa_param_t param; + odp_ipsec_sa_t sa; + + ipsec_sa_param_fill(&param, + true, false, 0x4321, NULL, + ODP_CIPHER_ALG_AES_CBC, &key_rfc3602, + ODP_AUTH_ALG_NULL, NULL, + NULL); + + sa = odp_ipsec_sa_create(&param); + + CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa); + + ipsec_test_part test = { + .pkt_in = &pkt_rfc3602_5_esp, + .out_pkt = 1, + .out = { + { .status.warn.all = 0, + .status.error.all = 0, + .pkt_out = &pkt_rfc3602_5 }, + }, + }; + + ipsec_check_in_one(&test, sa); + + ipsec_sa_destroy(sa); +} + +static void test_in_rfc3602_6_esp(void) +{ + odp_ipsec_sa_param_t param; + odp_ipsec_sa_t sa; + + ipsec_sa_param_fill(&param, + true, false, 0x4321, NULL, + ODP_CIPHER_ALG_AES_CBC, &key_rfc3602, + ODP_AUTH_ALG_NULL, NULL, + NULL); + + sa = odp_ipsec_sa_create(&param); + + CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa); + + ipsec_test_part test = { + .pkt_in = &pkt_rfc3602_6_esp, + .out_pkt = 1, + .out = { + { .status.warn.all = 0, + .status.error.all = 0, + .pkt_out = &pkt_rfc3602_6 }, + }, + }; + + ipsec_check_in_one(&test, sa); + + ipsec_sa_destroy(sa); +} + +static void test_in_rfc3602_7_esp(void) +{ + odp_ipsec_tunnel_param_t tunnel = {}; + odp_ipsec_sa_param_t param; + odp_ipsec_sa_t sa; + + ipsec_sa_param_fill(&param, + true, false, 0x8765, &tunnel, + ODP_CIPHER_ALG_AES_CBC, &key_rfc3602_2, + ODP_AUTH_ALG_NULL, NULL, + NULL); + + sa = odp_ipsec_sa_create(&param); + + CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa); + + ipsec_test_part test = { + .pkt_in = &pkt_rfc3602_7_esp, + .out_pkt = 1, + .out = { + { .status.warn.all = 0, + .status.error.all = 0, + .pkt_out = &pkt_rfc3602_7 }, + }, + }; + + ipsec_check_in_one(&test, sa); + + ipsec_sa_destroy(sa); +} + +static void test_in_rfc3602_8_esp(void) +{ + odp_ipsec_tunnel_param_t tunnel = {}; + odp_ipsec_sa_param_t param; + odp_ipsec_sa_t sa; + + ipsec_sa_param_fill(&param, + true, false, 0x8765, &tunnel, + ODP_CIPHER_ALG_AES_CBC, &key_rfc3602_2, + ODP_AUTH_ALG_NULL, NULL, + NULL); + + sa = odp_ipsec_sa_create(&param); + + CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa); + + ipsec_test_part test = { + .pkt_in = &pkt_rfc3602_8_esp, + .out_pkt = 1, + .out = { + { .status.warn.all = 0, + .status.error.all = 0, + .pkt_out = &pkt_rfc3602_8 }, + }, + }; + + ipsec_check_in_one(&test, sa); + + ipsec_sa_destroy(sa); +} + +static void test_in_mcgrew_gcm_2_esp(void) +{ + odp_ipsec_tunnel_param_t tunnel = {}; + odp_ipsec_sa_param_t param; + odp_ipsec_sa_t sa; + + ipsec_sa_param_fill(&param, + true, false, 0xa5f8, &tunnel, + ODP_CIPHER_ALG_AES_GCM, &key_mcgrew_gcm_2, + ODP_AUTH_ALG_AES_GCM, NULL, + &key_mcgrew_gcm_salt_2); + + sa = odp_ipsec_sa_create(&param); + + CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa); + + ipsec_test_part test = { + .pkt_in = &pkt_mcgrew_gcm_test_2_esp, + .out_pkt = 1, + .out = { + { .status.warn.all = 0, + .status.error.all = 0, + .pkt_out = &pkt_mcgrew_gcm_test_2}, + }, + }; + + ipsec_check_in_one(&test, sa); + + ipsec_sa_destroy(sa); +} + +static void test_in_mcgrew_gcm_3_esp(void) +{ + odp_ipsec_tunnel_param_t tunnel = {}; + odp_ipsec_sa_param_t param; + odp_ipsec_sa_t sa; + + ipsec_sa_param_fill(&param, + true, false, 0x4a2cbfe3, &tunnel, + ODP_CIPHER_ALG_AES_GCM, &key_mcgrew_gcm_3, + ODP_AUTH_ALG_AES_GCM, NULL, + &key_mcgrew_gcm_salt_3); + + sa = odp_ipsec_sa_create(&param); + + CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa); + + ipsec_test_part test = { + .pkt_in = &pkt_mcgrew_gcm_test_3_esp, + .out_pkt = 1, + .out = { + { .status.warn.all = 0, + .status.error.all = 0, + .pkt_out = &pkt_mcgrew_gcm_test_3}, + }, + }; + + ipsec_check_in_one(&test, sa); + + ipsec_sa_destroy(sa); +} + +static void test_in_mcgrew_gcm_4_esp(void) +{ + odp_ipsec_tunnel_param_t tunnel = {}; + odp_ipsec_sa_param_t param; + odp_ipsec_sa_t sa; + + ipsec_sa_param_fill(&param, + true, false, 0x00000000, &tunnel, + ODP_CIPHER_ALG_AES_GCM, &key_mcgrew_gcm_4, + ODP_AUTH_ALG_AES_GCM, NULL, + &key_mcgrew_gcm_salt_4); + + sa = odp_ipsec_sa_create(&param); + + CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa); + + ipsec_test_part test = { + .pkt_in = &pkt_mcgrew_gcm_test_4_esp, + .out_pkt = 1, + .out = { + { .status.warn.all = 0, + .status.error.all = 0, + .pkt_out = &pkt_mcgrew_gcm_test_4}, + }, + }; + + ipsec_check_in_one(&test, sa); + + ipsec_sa_destroy(sa); +} + +static void test_in_mcgrew_gcm_12_esp(void) +{ + odp_ipsec_tunnel_param_t tunnel = {}; + odp_ipsec_sa_param_t param; + odp_ipsec_sa_t sa; + + ipsec_sa_param_fill(&param, + true, false, 0x335467ae, &tunnel, + ODP_CIPHER_ALG_AES_GCM, &key_mcgrew_gcm_12, + ODP_AUTH_ALG_AES_GCM, NULL, + &key_mcgrew_gcm_salt_12); + + sa = odp_ipsec_sa_create(&param); + + CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa); + + ipsec_test_part test = { + .pkt_in = &pkt_mcgrew_gcm_test_12_esp, + .out_pkt = 1, + .out = { + { .status.warn.all = 0, + .status.error.all = 0, + .pkt_out = &pkt_mcgrew_gcm_test_12}, + }, + }; + + ipsec_check_in_one(&test, sa); + + ipsec_sa_destroy(sa); +} + +static void ipsec_test_capability(void) +{ + odp_ipsec_capability_t capa; + + CU_ASSERT(odp_ipsec_capability(&capa) == 0); +} + +odp_testinfo_t ipsec_in_suite[] = { + ODP_TEST_INFO(ipsec_test_capability), + ODP_TEST_INFO_CONDITIONAL(test_in_rfc3602_5_esp, + ipsec_check_esp_aes_cbc_128_null), + ODP_TEST_INFO_CONDITIONAL(test_in_rfc3602_6_esp, + ipsec_check_esp_aes_cbc_128_null), + ODP_TEST_INFO_CONDITIONAL(test_in_rfc3602_7_esp, + ipsec_check_esp_aes_cbc_128_null), + ODP_TEST_INFO_CONDITIONAL(test_in_rfc3602_8_esp, + ipsec_check_esp_aes_cbc_128_null), + /* test 1, 5, 6, 8 -- 11 -- ESN */ + /* test 7 -- invalid, plaintext packet includes trl into IP length */ + ODP_TEST_INFO_CONDITIONAL(test_in_mcgrew_gcm_2_esp, + ipsec_check_esp_aes_gcm_128), + ODP_TEST_INFO_CONDITIONAL(test_in_mcgrew_gcm_3_esp, + ipsec_check_esp_aes_gcm_256), + ODP_TEST_INFO_CONDITIONAL(test_in_mcgrew_gcm_4_esp, + ipsec_check_esp_aes_gcm_128), + ODP_TEST_INFO_CONDITIONAL(test_in_mcgrew_gcm_12_esp, + ipsec_check_esp_aes_gcm_128), + ODP_TEST_INFO_CONDITIONAL(test_in_ah_sha256, + ipsec_check_ah_sha256), + ODP_TEST_INFO_CONDITIONAL(test_in_ah_sha256_tun, + ipsec_check_ah_sha256), + ODP_TEST_INFO_CONDITIONAL(test_in_ah_sha256_tun_notun, + ipsec_check_ah_sha256), + ODP_TEST_INFO_CONDITIONAL(test_in_esp_null_sha256, + ipsec_check_esp_null_sha256), + ODP_TEST_INFO_CONDITIONAL(test_in_esp_aes_cbc_null, + ipsec_check_esp_aes_cbc_128_null), + ODP_TEST_INFO_CONDITIONAL(test_in_esp_aes_cbc_sha256, + ipsec_check_esp_aes_cbc_128_sha256), + ODP_TEST_INFO_CONDITIONAL(test_in_lookup_ah_sha256, + ipsec_check_ah_sha256), + ODP_TEST_INFO_CONDITIONAL(test_in_lookup_esp_null_sha256, + ipsec_check_esp_null_sha256), + ODP_TEST_INFO_CONDITIONAL(test_in_esp_null_sha256_tun, + ipsec_check_esp_null_sha256), + ODP_TEST_INFO_CONDITIONAL(test_in_ah_esp_pkt, + ipsec_check_ah_sha256), + ODP_TEST_INFO_CONDITIONAL(test_in_esp_ah_pkt, + ipsec_check_esp_null_sha256), + ODP_TEST_INFO_CONDITIONAL(test_in_lookup_ah_esp_pkt, + ipsec_check_ah_sha256), + ODP_TEST_INFO_CONDITIONAL(test_in_lookup_esp_ah_pkt, + ipsec_check_esp_null_sha256), + ODP_TEST_INFO_CONDITIONAL(test_in_ah_sha256_bad1, + ipsec_check_ah_sha256), + ODP_TEST_INFO_CONDITIONAL(test_in_ah_sha256_bad2, + ipsec_check_ah_sha256), + ODP_TEST_INFO_CONDITIONAL(test_in_esp_null_sha256_bad1, + ipsec_check_esp_null_sha256), + ODP_TEST_INFO_NULL, +}; diff --git a/test/common_plat/validation/api/ipsec/ipsec_test_out.c b/test/common_plat/validation/api/ipsec/ipsec_test_out.c new file mode 100644 index 00000000..39a3c30f --- /dev/null +++ b/test/common_plat/validation/api/ipsec/ipsec_test_out.c @@ -0,0 +1,348 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include "config.h" + +#include "ipsec.h" + +#include "test_vectors.h" + +static void test_out_ah_sha256(void) +{ + odp_ipsec_sa_param_t param; + odp_ipsec_sa_t sa; + + ipsec_sa_param_fill(&param, + false, true, 123, NULL, + ODP_CIPHER_ALG_NULL, NULL, + ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256, + NULL); + + sa = odp_ipsec_sa_create(&param); + + CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa); + + ipsec_test_part test = { + .pkt_in = &pkt_icmp_0, + .out_pkt = 1, + .out = { + { .status.warn.all = 0, + .status.error.all = 0, + .pkt_out = &pkt_icmp_0_ah_sha256_1 }, + }, + }; + + ipsec_check_out_one(&test, sa); + + ipsec_sa_destroy(sa); +} + +#define IPV4ADDR(a, b, c, d) odp_cpu_to_be_32((a << 24) | \ + (b << 16) | \ + (c << 8) | \ + (d << 0)) + +static void test_out_ah_sha256_tun(void) +{ + uint32_t src = IPV4ADDR(10, 0, 111, 2); + uint32_t dst = IPV4ADDR(10, 0, 222, 2); + odp_ipsec_tunnel_param_t tunnel = { + .type = ODP_IPSEC_TUNNEL_IPV4, + .ipv4.src_addr = &src, + .ipv4.dst_addr = &dst, + .ipv4.ttl = 64, + }; + odp_ipsec_sa_param_t param; + odp_ipsec_sa_t sa; + + ipsec_sa_param_fill(&param, + false, true, 123, &tunnel, + ODP_CIPHER_ALG_NULL, NULL, + ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256, + NULL); + + sa = odp_ipsec_sa_create(&param); + + CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa); + + ipsec_test_part test = { + .pkt_in = &pkt_icmp_0, + .out_pkt = 1, + .out = { + { .status.warn.all = 0, + .status.error.all = 0, + .pkt_out = &pkt_icmp_0_ah_tun_sha256_1 }, + }, + }; + + ipsec_check_out_one(&test, sa); + + ipsec_sa_destroy(sa); +} + +static void test_out_esp_null_sha256_out(void) +{ + odp_ipsec_sa_param_t param; + odp_ipsec_sa_t sa; + + ipsec_sa_param_fill(&param, + false, false, 123, NULL, + ODP_CIPHER_ALG_NULL, NULL, + ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256, + NULL); + + sa = odp_ipsec_sa_create(&param); + + CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa); + + ipsec_test_part test = { + .pkt_in = &pkt_icmp_0, + .out_pkt = 1, + .out = { + { .status.warn.all = 0, + .status.error.all = 0, + .pkt_out = &pkt_icmp_0_esp_null_sha256_1 }, + }, + }; + + ipsec_check_out_one(&test, sa); + + ipsec_sa_destroy(sa); +} + +static void test_out_esp_null_sha256_tun_out(void) +{ + uint32_t src = IPV4ADDR(10, 0, 111, 2); + uint32_t dst = IPV4ADDR(10, 0, 222, 2); + odp_ipsec_tunnel_param_t tunnel = { + .type = ODP_IPSEC_TUNNEL_IPV4, + .ipv4.src_addr = &src, + .ipv4.dst_addr = &dst, + .ipv4.ttl = 64, + }; + odp_ipsec_sa_param_t param; + odp_ipsec_sa_t sa; + + ipsec_sa_param_fill(&param, + false, false, 123, &tunnel, + ODP_CIPHER_ALG_NULL, NULL, + ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256, + NULL); + + sa = odp_ipsec_sa_create(&param); + + CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa); + + ipsec_test_part test = { + .pkt_in = &pkt_icmp_0, + .out_pkt = 1, + .out = { + { .status.warn.all = 0, + .status.error.all = 0, + .pkt_out = &pkt_icmp_0_esp_tun_null_sha256_1 }, + }, + }; + + ipsec_check_out_one(&test, sa); + + ipsec_sa_destroy(sa); +} + +static void test_out_esp_null_sha256(void) +{ + odp_ipsec_sa_param_t param; + odp_ipsec_sa_t sa; + odp_ipsec_sa_t sa2; + + ipsec_sa_param_fill(&param, + false, false, 123, NULL, + ODP_CIPHER_ALG_NULL, NULL, + ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256, + NULL); + + sa = odp_ipsec_sa_create(&param); + + CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa); + + ipsec_sa_param_fill(&param, + true, false, 123, NULL, + ODP_CIPHER_ALG_NULL, NULL, + ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256, + NULL); + + sa2 = odp_ipsec_sa_create(&param); + + CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa2); + + ipsec_test_part test = { + .pkt_in = &pkt_icmp_0, + .out_pkt = 1, + .out = { + { .status.warn.all = 0, + .status.error.all = 0, + .pkt_out = &pkt_icmp_0 }, + }, + }; + + ipsec_check_out_in_one(&test, sa, sa2); + + ipsec_sa_destroy(sa2); + ipsec_sa_destroy(sa); +} + +static void test_out_esp_aes_cbc_null(void) +{ + odp_ipsec_sa_param_t param; + odp_ipsec_sa_t sa; + odp_ipsec_sa_t sa2; + + ipsec_sa_param_fill(&param, + false, false, 123, NULL, + ODP_CIPHER_ALG_AES_CBC, &key_a5_128, + ODP_AUTH_ALG_NULL, NULL, + NULL); + + sa = odp_ipsec_sa_create(&param); + + CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa); + + ipsec_sa_param_fill(&param, + true, false, 123, NULL, + ODP_CIPHER_ALG_AES_CBC, &key_a5_128, + ODP_AUTH_ALG_NULL, NULL, + NULL); + + sa2 = odp_ipsec_sa_create(&param); + + CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa2); + + ipsec_test_part test = { + .pkt_in = &pkt_icmp_0, + .out_pkt = 1, + .out = { + { .status.warn.all = 0, + .status.error.all = 0, + .pkt_out = &pkt_icmp_0 }, + }, + }; + + ipsec_check_out_in_one(&test, sa, sa2); + + ipsec_sa_destroy(sa2); + ipsec_sa_destroy(sa); +} + +static void test_out_esp_aes_cbc_sha256(void) +{ + odp_ipsec_sa_param_t param; + odp_ipsec_sa_t sa; + odp_ipsec_sa_t sa2; + + ipsec_sa_param_fill(&param, + false, false, 123, NULL, + ODP_CIPHER_ALG_AES_CBC, &key_a5_128, + ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256, + NULL); + + sa = odp_ipsec_sa_create(&param); + + CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa); + + ipsec_sa_param_fill(&param, + true, false, 123, NULL, + ODP_CIPHER_ALG_AES_CBC, &key_a5_128, + ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256, + NULL); + + sa2 = odp_ipsec_sa_create(&param); + + CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa2); + + ipsec_test_part test = { + .pkt_in = &pkt_icmp_0, + .out_pkt = 1, + .out = { + { .status.warn.all = 0, + .status.error.all = 0, + .pkt_out = &pkt_icmp_0 }, + }, + }; + + ipsec_check_out_in_one(&test, sa, sa2); + + ipsec_sa_destroy(sa2); + ipsec_sa_destroy(sa); +} + +static void test_out_esp_aes_gcm128(void) +{ + odp_ipsec_sa_param_t param; + odp_ipsec_sa_t sa; + odp_ipsec_sa_t sa2; + + ipsec_sa_param_fill(&param, + false, false, 123, NULL, + ODP_CIPHER_ALG_AES_GCM, &key_a5_128, + ODP_AUTH_ALG_AES_GCM, &key_a5_128, + &key_mcgrew_gcm_salt_2); + + sa = odp_ipsec_sa_create(&param); + + CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa); + + ipsec_sa_param_fill(&param, + true, false, 123, NULL, + ODP_CIPHER_ALG_AES_GCM, &key_a5_128, + ODP_AUTH_ALG_AES_GCM, &key_a5_128, + &key_mcgrew_gcm_salt_2); + + sa2 = odp_ipsec_sa_create(&param); + + CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa2); + + ipsec_test_part test = { + .pkt_in = &pkt_icmp_0, + .out_pkt = 1, + .out = { + { .status.warn.all = 0, + .status.error.all = 0, + .pkt_out = &pkt_icmp_0 }, + }, + }; + + ipsec_check_out_in_one(&test, sa, sa2); + + ipsec_sa_destroy(sa2); + ipsec_sa_destroy(sa); +} + +static void ipsec_test_capability(void) +{ + odp_ipsec_capability_t capa; + + CU_ASSERT(odp_ipsec_capability(&capa) == 0); +} + +odp_testinfo_t ipsec_out_suite[] = { + ODP_TEST_INFO(ipsec_test_capability), + ODP_TEST_INFO_CONDITIONAL(test_out_ah_sha256, + ipsec_check_ah_sha256), + ODP_TEST_INFO_CONDITIONAL(test_out_ah_sha256_tun, + ipsec_check_ah_sha256), + ODP_TEST_INFO_CONDITIONAL(test_out_esp_null_sha256_out, + ipsec_check_esp_null_sha256), + ODP_TEST_INFO_CONDITIONAL(test_out_esp_null_sha256_tun_out, + ipsec_check_esp_null_sha256), + ODP_TEST_INFO_CONDITIONAL(test_out_esp_null_sha256, + ipsec_check_esp_null_sha256), + ODP_TEST_INFO_CONDITIONAL(test_out_esp_aes_cbc_null, + ipsec_check_esp_aes_cbc_128_null), + ODP_TEST_INFO_CONDITIONAL(test_out_esp_aes_cbc_sha256, + ipsec_check_esp_aes_cbc_128_sha256), + ODP_TEST_INFO_CONDITIONAL(test_out_esp_aes_gcm128, + ipsec_check_esp_aes_gcm_128), + ODP_TEST_INFO_NULL, +}; diff --git a/test/common_plat/validation/api/ipsec/test_vectors.h b/test/common_plat/validation/api/ipsec/test_vectors.h new file mode 100644 index 00000000..2fb06b2b --- /dev/null +++ b/test/common_plat/validation/api/ipsec/test_vectors.h @@ -0,0 +1,965 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#ifndef _ODP_TEST_IPSEC_VECTORS_H_ +#define _ODP_TEST_IPSEC_VECTORS_H_ + +#define KEY(name, ...) \ + static uint8_t name ## _data[] = { __VA_ARGS__ }; \ + static const ODP_UNUSED odp_crypto_key_t name = { \ + .data = name ## _data, \ + .length = sizeof(name ## _data), \ + } + +KEY(key_a5_128, 0xa5, 0xa5, 0xa5, 0xa5, 0xa5, 0xa5, 0xa5, 0xa5, + 0xa5, 0xa5, 0xa5, 0xa5, 0xa5, 0xa5, 0xa5, 0xa5); +KEY(key_5a_128, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, + 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a); +KEY(key_a5_256, 0xa5, 0xa5, 0xa5, 0xa5, 0xa5, 0xa5, 0xa5, 0xa5, + 0xa5, 0xa5, 0xa5, 0xa5, 0xa5, 0xa5, 0xa5, 0xa5, + 0xa5, 0xa5, 0xa5, 0xa5, 0xa5, 0xa5, 0xa5, 0xa5, + 0xa5, 0xa5, 0xa5, 0xa5, 0xa5, 0xa5, 0xa5, 0xa5); +KEY(key_5a_256, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, + 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, + 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, + 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a); + +KEY(key_rfc3602, 0x90, 0xd3, 0x82, 0xb4, 0x10, 0xee, 0xba, 0x7a, + 0xd9, 0x38, 0xc4, 0x6c, 0xec, 0x1a, 0x82, 0xbf); +KEY(key_rfc3602_2, 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef, + 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef); +KEY(key_mcgrew_gcm_2, 0xfe, 0xff, 0xe9, 0x92, 0x86, 0x65, 0x73, 0x1c, + 0x6d, 0x6a, 0x8f, 0x94, 0x67, 0x30, 0x83, 0x08); +KEY(key_mcgrew_gcm_salt_2, 0xca, 0xfe, 0xba, 0xbe); +KEY(key_mcgrew_gcm_3, 0xab, 0xbc, 0xcd, 0xde, 0xf0, 0x01, 0x12, 0x23, + 0x34, 0x45, 0x56, 0x67, 0x78, 0x89, 0x9a, 0xab, + 0xab, 0xbc, 0xcd, 0xde, 0xf0, 0x01, 0x12, 0x23, + 0x34, 0x45, 0x56, 0x67, 0x78, 0x89, 0x9a, 0xab); +KEY(key_mcgrew_gcm_salt_3, 0x11, 0x22, 0x33, 0x44); +KEY(key_mcgrew_gcm_4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00); +KEY(key_mcgrew_gcm_salt_4, 0x00, 0x00, 0x00, 0x00); +KEY(key_mcgrew_gcm_12, 0x7d, 0x77, 0x3d, 0x00, 0xc1, 0x44, 0xc5, 0x25, + 0xac, 0x61, 0x9d, 0x18, 0xc8, 0x4a, 0x3f, 0x47); +KEY(key_mcgrew_gcm_salt_12, 0xd9, 0x66, 0x42, 0x67); + +static const ODP_UNUSED ipsec_test_packet pkt_icmp_0 = { + .len = 142, + .l2_offset = 0, + .l3_offset = 14, + .l4_offset = 34, + .data = { + /* ETH */ + 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, + 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0x08, 0x00, + + /* IP */ + 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, + }, +}; + +static const ODP_UNUSED ipsec_test_packet pkt_icmp_0_ipip = { + .len = 162, + .l2_offset = 0, + .l3_offset = 14, + .l4_offset = 34, + .data = { + /* ETH */ + 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, + 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0x08, 0x00, + + /* IP */ + 0x45, 0x00, 0x00, 0x94, 0x00, 0x00, 0x00, 0x00, + 0x40, 0x04, 0x19, 0x62, 0x0a, 0x00, 0x6f, 0x02, + 0x0a, 0x00, 0xde, 0x02, + + /* Inner IP */ + 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 + }, +}; + +static const ODP_UNUSED ipsec_test_packet pkt_icmp_0_ah_sha256_1 = { + .len = 170, + .l2_offset = 0, + .l3_offset = 14, + .l4_offset = 34, + .data = { + /* ETH */ + 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, + 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0x08, 0x00, + + /* IP */ + 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 ODP_UNUSED ipsec_test_packet pkt_icmp_0_ah_tun_sha256_1 = { + .len = 190, + .l2_offset = 0, + .l3_offset = 14, + .l4_offset = 34, + .data = { + /* ETH */ + 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, + 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0x08, 0x00, + + /* IP */ + 0x45, 0x00, 0x00, 0xb0, 0x00, 0x00, 0x00, 0x00, + 0x40, 0x33, 0x19, 0x17, 0x0a, 0x00, 0x6f, 0x02, + 0x0a, 0x00, 0xde, 0x02, + + /* AH */ + 0x04, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7b, + 0x00, 0x00, 0x00, 0x01, + 0xd5, 0x35, 0x9b, 0x21, 0xe6, 0x14, 0x9b, 0x42, + 0x1f, 0x00, 0xfa, 0x36, 0x73, 0x4c, 0x53, 0xcf, + + /* Inner IP */ + 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, + }, +}; + +static const ODP_UNUSED ipsec_test_packet pkt_icmp_0_ah_sha256_1_bad1 = { + .len = 168, + .l2_offset = 0, + .l3_offset = 14, + .l4_offset = 34, + .data = { + /* ETH */ + 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, + 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0x08, 0x00, + + /* IP */ + 0x45, 0x00, 0x00, 0x9a, 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, + }, +}; + +static const ODP_UNUSED ipsec_test_packet pkt_icmp_0_ah_sha256_1_bad2 = { + .len = 170, + .l2_offset = 0, + .l3_offset = 14, + .l4_offset = 34, + .data = { + /* ETH */ + 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, + 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0x08, 0x00, + + /* IP */ + 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, 0x5d, + }, +}; + +static const ODP_UNUSED ipsec_test_packet pkt_icmp_0_esp_null_sha256_1 = { + .len = 170, + .l2_offset = 0, + .l3_offset = 14, + .l4_offset = 34, + .data = { + /* ETH */ + 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, + 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0x08, 0x00, + + /* IP */ + 0x45, 0x00, 0x00, 0x9c, 0x00, 0x00, 0x00, 0x00, + 0x40, 0x32, 0xab, 0xda, 0xc0, 0xa8, 0x6f, 0x02, + 0xc0, 0xa8, 0xde, 0x02, + + /* ESP */ + 0x00, 0x00, 0x00, 0x7b, 0x00, 0x00, 0x00, 0x01, + + /* 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, 0x01, + + /* ICV */ + 0xe9, 0x81, 0xcd, 0x65, 0x9b, 0x25, 0x0b, 0x33, + 0xe2, 0xf3, 0x83, 0xf1, 0x6d, 0x14, 0xb4, 0x1f, + }, +}; + +static const ODP_UNUSED ipsec_test_packet pkt_icmp_0_esp_tun_null_sha256_1 = { + .len = 190, + .l2_offset = 0, + .l3_offset = 14, + .l4_offset = 34, + .data = { + /* ETH */ + 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, + 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0x08, 0x00, + + /* IP */ + 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, + + /* Inner IP */ + 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 ODP_UNUSED ipsec_test_packet pkt_icmp_0_esp_null_sha256_1_bad1 = { + .len = 170, + .l2_offset = 0, + .l3_offset = 14, + .l4_offset = 34, + .data = { + /* ETH */ + 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, + 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0x08, 0x00, + + /* IP */ + 0x45, 0x00, 0x00, 0x9c, 0x00, 0x00, 0x00, 0x00, + 0x40, 0x32, 0xab, 0xda, 0xc0, 0xa8, 0x6f, 0x02, + 0xc0, 0xa8, 0xde, 0x02, + + /* ESP */ + 0x00, 0x00, 0x00, 0x7b, 0x00, 0x00, 0x00, 0x01, + + /* 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, 0x01, + + /* ICV */ + 0x18, 0x00, 0x14, 0x3a, 0x54, 0x72, 0x98, 0xe8, + 0xc7, 0x2d, 0xfa, 0xeb, 0x70, 0xe0, 0x24, 0xdf, + }, +}; + +static const ODP_UNUSED ipsec_test_packet pkt_icmp_0_esp_aes_cbc_null_1 = { + .len = 170, + .l2_offset = 0, + .l3_offset = 14, + .l4_offset = 34, + .data = { + /* ETH */ + 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, + 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0x08, 0x00, + + /* IP */ + 0x45, 0x00, 0x00, 0x9c, 0x00, 0x00, 0x00, 0x00, + 0x40, 0x32, 0xab, 0xca, 0xc0, 0xa8, 0x6f, 0x02, + 0xc0, 0xa8, 0xde, 0x02, + + /* ESP */ + 0x00, 0x00, 0x00, 0x7b, 0x00, 0x00, 0x00, 0x01, + + /* IV */ + 0x96, 0xfa, 0x74, 0x56, 0x78, 0xe4, 0xbb, 0x0c, + 0x9e, 0x6e, 0x4a, 0xeb, 0x44, 0xd9, 0xf2, 0xe6, + + /* data */ + 0x2f, 0xb3, 0xa6, 0xfe, 0x2c, 0x2e, 0xce, 0x65, + 0x3a, 0x57, 0xe3, 0x09, 0x5d, 0x66, 0x36, 0x32, + 0xb1, 0xc2, 0x59, 0x58, 0xb6, 0xe5, 0x9e, 0xa2, + 0x07, 0xf8, 0x26, 0x4a, 0x64, 0xf5, 0x16, 0x01, + 0x51, 0x8e, 0xe5, 0x4b, 0x07, 0x2c, 0x4b, 0x23, + 0xfa, 0x4e, 0x6e, 0xdb, 0x35, 0xc7, 0x1d, 0x30, + 0x42, 0xd9, 0x0f, 0xba, 0x8a, 0x69, 0x7e, 0x29, + 0xe7, 0xbd, 0x15, 0xe9, 0x35, 0x9e, 0x81, 0xe7, + 0x9e, 0xc9, 0x7d, 0x66, 0x99, 0x58, 0xec, 0x45, + 0x29, 0xd0, 0xa4, 0xfd, 0xf1, 0xe7, 0x5b, 0x3e, + 0x2a, 0x77, 0x1d, 0x8f, 0x2b, 0x73, 0xba, 0xf8, + 0x72, 0xd2, 0xa0, 0x0b, 0x90, 0xb9, 0x73, 0x9c, + 0xde, 0x3c, 0xc3, 0xb8, 0x91, 0x97, 0xc4, 0x28, + 0xfa, 0x6d, 0xa8, 0x41, 0xb6, 0x83, 0xc8, 0xaa, + }, +}; + +static const ODP_UNUSED ipsec_test_packet pkt_icmp_0_esp_aes_cbc_sha256_1 = { + .len = 186, + .l2_offset = 0, + .l3_offset = 14, + .l4_offset = 34, + .data = { + /* ETH */ + 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, + 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0x08, 0x00, + + /* IP */ + 0x45, 0x00, 0x00, 0xac, 0x00, 0x00, 0x00, 0x00, + 0x40, 0x32, 0xab, 0xca, 0xc0, 0xa8, 0x6f, 0x02, + 0xc0, 0xa8, 0xde, 0x02, + + /* ESP */ + 0x00, 0x00, 0x00, 0x7b, 0x00, 0x00, 0x00, 0x01, + + /* IV */ + 0x96, 0xfa, 0x74, 0x56, 0x78, 0xe4, 0xbb, 0x0c, + 0x9e, 0x6e, 0x4a, 0xeb, 0x44, 0xd9, 0xf2, 0xe6, + + /* data */ + 0x2f, 0xb3, 0xa6, 0xfe, 0x2c, 0x2e, 0xce, 0x65, + 0x3a, 0x57, 0xe3, 0x09, 0x5d, 0x66, 0x36, 0x32, + 0xb1, 0xc2, 0x59, 0x58, 0xb6, 0xe5, 0x9e, 0xa2, + 0x07, 0xf8, 0x26, 0x4a, 0x64, 0xf5, 0x16, 0x01, + 0x51, 0x8e, 0xe5, 0x4b, 0x07, 0x2c, 0x4b, 0x23, + 0xfa, 0x4e, 0x6e, 0xdb, 0x35, 0xc7, 0x1d, 0x30, + 0x42, 0xd9, 0x0f, 0xba, 0x8a, 0x69, 0x7e, 0x29, + 0xe7, 0xbd, 0x15, 0xe9, 0x35, 0x9e, 0x81, 0xe7, + 0x9e, 0xc9, 0x7d, 0x66, 0x99, 0x58, 0xec, 0x45, + 0x29, 0xd0, 0xa4, 0xfd, 0xf1, 0xe7, 0x5b, 0x3e, + 0x2a, 0x77, 0x1d, 0x8f, 0x2b, 0x73, 0xba, 0xf8, + 0x72, 0xd2, 0xa0, 0x0b, 0x90, 0xb9, 0x73, 0x9c, + 0xde, 0x3c, 0xc3, 0xb8, 0x91, 0x97, 0xc4, 0x28, + 0xfa, 0x6d, 0xa8, 0x41, 0xb6, 0x83, 0xc8, 0xaa, + + /* IV */ + 0x8a, 0x39, 0x10, 0x07, 0x02, 0x97, 0xbb, 0x1c, + 0x59, 0xb7, 0x70, 0x33, 0xa4, 0x26, 0xa2, 0xb8 + }, +}; + +static const ODP_UNUSED ipsec_test_packet pkt_rfc3602_5 = { + .len = 98, + .l2_offset = 0, + .l3_offset = 14, + .l4_offset = 34, + .data = { + /* ETH - not a part of RFC, added for simplicity */ + 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, + 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0x08, 0x00, + + /* IP */ + 0x45, 0x00, 0x00, 0x54, 0x08, 0xf2, 0x00, 0x00, + 0x40, 0x01, 0xf9, 0xfe, 0xc0, 0xa8, 0x7b, 0x03, + 0xc0, 0xa8, 0x7b, 0x64, + + /* ICMP */ + 0x08, 0x00, 0x0e, 0xbd, 0xa7, 0x0a, 0x00, 0x00, + 0x8e, 0x9c, 0x08, 0x3d, 0xb9, 0x5b, 0x07, 0x00, + 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, + + }, +}; + +static const ODP_UNUSED ipsec_test_packet pkt_rfc3602_5_esp = { + .len = 138, + .l2_offset = 0, + .l3_offset = 14, + .l4_offset = 34, + .data = { + /* ETH - not a part of RFC, added for simplicity */ + 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, + 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0x08, 0x00, + + /* IP */ + 0x45, 0x00, 0x00, 0x7c, 0x08, 0xf2, 0x00, 0x00, + 0x40, 0x32, 0xf9, 0xa5, 0xc0, 0xa8, 0x7b, 0x03, + 0xc0, 0xa8, 0x7b, 0x64, + + /* ESP */ + 0x00, 0x00, 0x43, 0x21, 0x00, 0x00, 0x00, 0x01, + + /* IV */ + 0xe9, 0x6e, 0x8c, 0x08, 0xab, 0x46, 0x57, 0x63, + 0xfd, 0x09, 0x8d, 0x45, 0xdd, 0x3f, 0xf8, 0x93, + + /* data */ + 0xf6, 0x63, 0xc2, 0x5d, 0x32, 0x5c, 0x18, 0xc6, + 0xa9, 0x45, 0x3e, 0x19, 0x4e, 0x12, 0x08, 0x49, + 0xa4, 0x87, 0x0b, 0x66, 0xcc, 0x6b, 0x99, 0x65, + 0x33, 0x00, 0x13, 0xb4, 0x89, 0x8d, 0xc8, 0x56, + 0xa4, 0x69, 0x9e, 0x52, 0x3a, 0x55, 0xdb, 0x08, + 0x0b, 0x59, 0xec, 0x3a, 0x8e, 0x4b, 0x7e, 0x52, + 0x77, 0x5b, 0x07, 0xd1, 0xdb, 0x34, 0xed, 0x9c, + 0x53, 0x8a, 0xb5, 0x0c, 0x55, 0x1b, 0x87, 0x4a, + 0xa2, 0x69, 0xad, 0xd0, 0x47, 0xad, 0x2d, 0x59, + 0x13, 0xac, 0x19, 0xb7, 0xcf, 0xba, 0xd4, 0xa6, + }, +}; + +static const ipsec_test_packet pkt_rfc3602_6 = { + .len = 62, + .l2_offset = 0, + .l3_offset = 14, + .l4_offset = 34, + .data = { + /* ETH - not a part of RFC, added for simplicity */ + 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, + 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0x08, 0x00, + + /* IP */ + 0x45, 0x00, 0x00, 0x30, 0x08, 0xfe, 0x00, 0x00, + 0x40, 0x01, 0xfa, 0x16, 0xc0, 0xa8, 0x7b, 0x03, + 0xc0, 0xa8, 0x7b, 0x64, + + /* ICMP */ + 0x08, 0x00, 0xb5, 0xe8, 0xa8, 0x0a, 0x05, 0x00, + 0xa6, 0x9c, 0x08, 0x3d, 0x0b, 0x66, 0x0e, 0x00, + 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, + 0x77, 0x77, 0x77, 0x77, + }, +}; + +static const ipsec_test_packet pkt_rfc3602_6_esp = { + .len = 90, + .l2_offset = 0, + .l3_offset = 14, + .l4_offset = 34, + .data = { + /* ETH - not a part of RFC, added for simplicity */ + 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, + 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0x08, 0x00, + + /* IP */ + 0x45, 0x00, 0x00, 0x4c, 0x08, 0xfe, 0x00, 0x00, + 0x40, 0x32, 0xf9, 0xc9, 0xc0, 0xa8, 0x7b, 0x03, + 0xc0, 0xa8, 0x7b, 0x64, + + /* ESP */ + 0x00, 0x00, 0x43, 0x21, 0x00, 0x00, 0x00, 0x08, + + /* IV */ + 0x69, 0xd0, 0x8d, 0xf7, 0xd2, 0x03, 0x32, 0x9d, + 0xb0, 0x93, 0xfc, 0x49, 0x24, 0xe5, 0xbd, 0x80, + + /* data */ + 0xf5, 0x19, 0x95, 0x88, 0x1e, 0xc4, 0xe0, 0xc4, + 0x48, 0x89, 0x87, 0xce, 0x74, 0x2e, 0x81, 0x09, + 0x68, 0x9b, 0xb3, 0x79, 0xd2, 0xd7, 0x50, 0xc0, + 0xd9, 0x15, 0xdc, 0xa3, 0x46, 0xa8, 0x9f, 0x75, + }, +}; + +static const ipsec_test_packet pkt_rfc3602_7 = { + .len = 98, + .l2_offset = 0, + .l3_offset = 14, + .l4_offset = 34, + .data = { + /* ETH - not a part of RFC, added for simplicity */ + 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, + 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0x08, 0x00, + + /* IP */ + 0x45, 0x00, 0x00, 0x54, 0x09, 0x04, 0x00, 0x00, + 0x40, 0x01, 0xf9, 0x88, 0xc0, 0xa8, 0x7b, 0x03, + 0xc0, 0xa8, 0x7b, 0xc8, + + /* ICMP */ + 0x08, 0x00, 0x9f, 0x76, 0xa9, 0x0a, 0x01, 0x00, + 0xb4, 0x9c, 0x08, 0x3d, 0x02, 0xa2, 0x04, 0x00, + 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, + }, +}; + +static const ipsec_test_packet pkt_rfc3602_7_esp = { + .len = 154, + .l2_offset = 0, + .l3_offset = 14, + .l4_offset = 34, + .data = { + /* ETH - not a part of RFC, added for simplicity */ + 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, + 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0x08, 0x00, + + /* IP */ + 0x45, 0x00, 0x00, 0x8c, 0x09, 0x05, 0x00, 0x00, + 0x40, 0x32, 0xf9, 0x1e, 0xc0, 0xa8, 0x7b, 0x03, + 0xc0, 0xa8, 0x7b, 0xc8, + + /* ESP */ + 0x00, 0x00, 0x87, 0x65, 0x00, 0x00, 0x00, 0x02, + + /* IV */ + 0xf4, 0xe7, 0x65, 0x24, 0x4f, 0x64, 0x07, 0xad, + 0xf1, 0x3d, 0xc1, 0x38, 0x0f, 0x67, 0x3f, 0x37, + + /* data */ + 0x77, 0x3b, 0x52, 0x41, 0xa4, 0xc4, 0x49, 0x22, + 0x5e, 0x4f, 0x3c, 0xe5, 0xed, 0x61, 0x1b, 0x0c, + 0x23, 0x7c, 0xa9, 0x6c, 0xf7, 0x4a, 0x93, 0x01, + 0x3c, 0x1b, 0x0e, 0xa1, 0xa0, 0xcf, 0x70, 0xf8, + 0xe4, 0xec, 0xae, 0xc7, 0x8a, 0xc5, 0x3a, 0xad, + 0x7a, 0x0f, 0x02, 0x2b, 0x85, 0x92, 0x43, 0xc6, + 0x47, 0x75, 0x2e, 0x94, 0xa8, 0x59, 0x35, 0x2b, + 0x8a, 0x4d, 0x4d, 0x2d, 0xec, 0xd1, 0x36, 0xe5, + 0xc1, 0x77, 0xf1, 0x32, 0xad, 0x3f, 0xbf, 0xb2, + 0x20, 0x1a, 0xc9, 0x90, 0x4c, 0x74, 0xee, 0x0a, + 0x10, 0x9e, 0x0c, 0xa1, 0xe4, 0xdf, 0xe9, 0xd5, + 0xa1, 0x00, 0xb8, 0x42, 0xf1, 0xc2, 0x2f, 0x0d, + }, +}; + +static const ipsec_test_packet pkt_rfc3602_8 = { + .len = 82, + .l2_offset = 0, + .l3_offset = 14, + .l4_offset = 34, + .data = { + /* ETH - not a part of RFC, added for simplicity */ + 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, + 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0x08, 0x00, + + /* IP */ + 0x45, 0x00, 0x00, 0x44, 0x09, 0x0c, 0x00, 0x00, + 0x40, 0x01, 0xf9, 0x90, 0xc0, 0xa8, 0x7b, 0x03, + 0xc0, 0xa8, 0x7b, 0xc8, + + /* ICMP */ + 0x08, 0x00, 0xd6, 0x3c, 0xaa, 0x0a, 0x02, 0x00, + 0xc6, 0x9c, 0x08, 0x3d, 0xa3, 0xde, 0x03, 0x00, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + }, +}; + +static const ipsec_test_packet pkt_rfc3602_8_esp = { + .len = 138, + .l2_offset = 0, + .l3_offset = 14, + .l4_offset = 34, + .data = { + /* ETH - not a part of RFC, added for simplicity */ + 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, + 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0x08, 0x00, + + /* IP */ + 0x45, 0x00, 0x00, 0x7c, 0x09, 0x0d, 0x00, 0x00, + 0x40, 0x32, 0xf9, 0x26, 0xc0, 0xa8, 0x7b, 0x03, + 0xc0, 0xa8, 0x7b, 0xc8, + + /* ESP */ + 0x00, 0x00, 0x87, 0x65, 0x00, 0x00, 0x00, 0x05, + + /* IV */ + 0x85, 0xd4, 0x72, 0x24, 0xb5, 0xf3, 0xdd, 0x5d, + 0x21, 0x01, 0xd4, 0xea, 0x8d, 0xff, 0xab, 0x22, + + /* data */ + 0x15, 0xb9, 0x26, 0x83, 0x81, 0x95, 0x96, 0xa8, + 0x04, 0x72, 0x32, 0xcc, 0x00, 0xf7, 0x04, 0x8f, + 0xe4, 0x53, 0x18, 0xe1, 0x1f, 0x8a, 0x0f, 0x62, + 0xed, 0xe3, 0xc3, 0xfc, 0x61, 0x20, 0x3b, 0xb5, + 0x0f, 0x98, 0x0a, 0x08, 0xc9, 0x84, 0x3f, 0xd3, + 0xa1, 0xb0, 0x6d, 0x5c, 0x07, 0xff, 0x96, 0x39, + 0xb7, 0xeb, 0x7d, 0xfb, 0x35, 0x12, 0xe5, 0xde, + 0x43, 0x5e, 0x72, 0x07, 0xed, 0x97, 0x1e, 0xf3, + 0xd2, 0x72, 0x6d, 0x9b, 0x5e, 0xf6, 0xaf, 0xfc, + 0x6d, 0x17, 0xa0, 0xde, 0xcb, 0xb1, 0x38, 0x92, + }, +}; + +/* + * Several tests from draft-mcgrew-gcm-test-01. It was never completed as an + * RFC, but serves good purpopse anyway. + * + * Note: plaintext texts also contain ESP trailers, which we + * do not include here into plaintext packets. + */ +static const ipsec_test_packet pkt_mcgrew_gcm_test_2 = { + .len = 76, + .l2_offset = 0, + .l3_offset = 14, + .l4_offset = 34, + .data = { + /* ETH - not a part of RFC, added for simplicity */ + 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, + 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0x08, 0x00, + + /* IP */ + 0x45, 0x00, 0x00, 0x3e, 0x69, 0x8f, 0x00, 0x00, + 0x80, 0x11, 0x4d, 0xcc, 0xc0, 0xa8, 0x01, 0x02, + 0xc0, 0xa8, 0x01, 0x01, + + /* UDP */ + 0x0a, 0x98, 0x00, 0x35, 0x00, 0x2a, 0x23, 0x43, + 0xb2, 0xd0, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x03, 0x73, 0x69, 0x70, + 0x09, 0x63, 0x79, 0x62, 0x65, 0x72, 0x63, 0x69, + 0x74, 0x79, 0x02, 0x64, 0x6b, 0x00, 0x00, 0x01, + 0x00, 0x01, + }, +}; + +static const ipsec_test_packet pkt_mcgrew_gcm_test_2_esp = { + .len = 130, + .l2_offset = 0, + .l3_offset = 14, + .l4_offset = 34, + .data = { + /* ETH - not a part of RFC, added for simplicity */ + 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, + 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0x08, 0x00, + + /* IP - not a part of RFC, added for simplicity */ + 0x45, 0x00, 0x00, 0x74, 0x69, 0x8f, 0x00, 0x00, + 0x80, 0x32, 0x4d, 0x76, 0xc0, 0xa8, 0x01, 0x02, + 0xc0, 0xa8, 0x01, 0x01, + + /* ESP */ + 0x00, 0x00, 0xa5, 0xf8, 0x00, 0x00, 0x00, 0x0a, + + /* IV */ + 0xfa, 0xce, 0xdb, 0xad, 0xde, 0xca, 0xf8, 0x88, + + /* Data */ + 0xde, 0xb2, 0x2c, 0xd9, 0xb0, 0x7c, 0x72, 0xc1, + 0x6e, 0x3a, 0x65, 0xbe, 0xeb, 0x8d, 0xf3, 0x04, + 0xa5, 0xa5, 0x89, 0x7d, 0x33, 0xae, 0x53, 0x0f, + 0x1b, 0xa7, 0x6d, 0x5d, 0x11, 0x4d, 0x2a, 0x5c, + 0x3d, 0xe8, 0x18, 0x27, 0xc1, 0x0e, 0x9a, 0x4f, + 0x51, 0x33, 0x0d, 0x0e, 0xec, 0x41, 0x66, 0x42, + 0xcf, 0xbb, 0x85, 0xa5, 0xb4, 0x7e, 0x48, 0xa4, + 0xec, 0x3b, 0x9b, 0xa9, 0x5d, 0x91, 0x8b, 0xd1, + 0x83, 0xb7, 0x0d, 0x3a, 0xa8, 0xbc, 0x6e, 0xe4, + 0xc3, 0x09, 0xe9, 0xd8, 0x5a, 0x41, 0xad, 0x4a, + }, +}; + +static const ipsec_test_packet pkt_mcgrew_gcm_test_3 = { + .len = 62, + .l2_offset = 0, + .l3_offset = 14, + .l4_offset = 34, + .data = { + /* ETH - not a part of RFC, added for simplicity */ + 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, + 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0x08, 0x00, + + /* IP */ + 0x45, 0x00, 0x00, 0x30, 0x69, 0xa6, 0x40, 0x00, + 0x80, 0x06, 0x26, 0x90, 0xc0, 0xa8, 0x01, 0x02, + 0x93, 0x89, 0x15, 0x5e, + + /* TCP */ + 0x0a, 0x9e, 0x00, 0x8b, 0x2d, 0xc5, 0x7e, 0xe0, + 0x00, 0x00, 0x00, 0x00, 0x70, 0x02, 0x40, 0x00, + 0x20, 0xbf, 0x00, 0x00, 0x02, 0x04, 0x05, 0xb4, + 0x01, 0x01, 0x04, 0x02, + }, +}; + +static const ipsec_test_packet pkt_mcgrew_gcm_test_3_esp = { + .len = 118, + .l2_offset = 0, + .l3_offset = 14, + .l4_offset = 34, + .data = { + /* ETH - not a part of RFC, added for simplicity */ + 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, + 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0x08, 0x00, + + /* IP - not a part of RFC, added for simplicity */ + 0x45, 0x00, 0x00, 0x68, 0x69, 0x8f, 0x00, 0x00, + 0x80, 0x32, 0x4d, 0x82, 0xc0, 0xa8, 0x01, 0x02, + 0xc0, 0xa8, 0x01, 0x01, + + /* ESP */ + 0x4a, 0x2c, 0xbf, 0xe3, 0x00, 0x00, 0x00, 0x02, + + /* IV */ + 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, + + /* Data */ + 0xff, 0x42, 0x5c, 0x9b, 0x72, 0x45, 0x99, 0xdf, + 0x7a, 0x3b, 0xcd, 0x51, 0x01, 0x94, 0xe0, 0x0d, + 0x6a, 0x78, 0x10, 0x7f, 0x1b, 0x0b, 0x1c, 0xbf, + 0x06, 0xef, 0xae, 0x9d, 0x65, 0xa5, 0xd7, 0x63, + 0x74, 0x8a, 0x63, 0x79, 0x85, 0x77, 0x1d, 0x34, + 0x7f, 0x05, 0x45, 0x65, 0x9f, 0x14, 0xe9, 0x9d, + 0xef, 0x84, 0x2d, 0x8e, 0xb3, 0x35, 0xf4, 0xee, + 0xcf, 0xdb, 0xf8, 0x31, 0x82, 0x4b, 0x4c, 0x49, + 0x15, 0x95, 0x6c, 0x96, + }, +}; + +static const ipsec_test_packet pkt_mcgrew_gcm_test_4 = { + .len = 74, + .l2_offset = 0, + .l3_offset = 14, + .l4_offset = 34, + .data = { + /* ETH - not a part of RFC, added for simplicity */ + 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, + 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0x08, 0x00, + + /* IP */ + 0x45, 0x00, 0x00, 0x3c, 0x99, 0xc5, 0x00, 0x00, + 0x80, 0x01, 0xcb, 0x7a, 0x40, 0x67, 0x93, 0x18, + 0x01, 0x01, 0x01, 0x01, + + /* ICMP */ + 0x08, 0x00, 0x07, 0x5c, 0x02, 0x00, 0x44, 0x00, + 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, + 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, 0x70, + 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x61, + 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, + }, +}; + +static const ipsec_test_packet pkt_mcgrew_gcm_test_4_esp = { + .len = 130, + .l2_offset = 0, + .l3_offset = 14, + .l4_offset = 34, + .data = { + /* ETH - not a part of RFC, added for simplicity */ + 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, + 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0x08, 0x00, + + /* IP - not a part of RFC, added for simplicity */ + 0x45, 0x00, 0x00, 0x74, 0x69, 0x8f, 0x00, 0x00, + 0x80, 0x32, 0x4d, 0x76, 0xc0, 0xa8, 0x01, 0x02, + 0xc0, 0xa8, 0x01, 0x01, + + /* ESP */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, + + /* IV */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + + /* Data */ + 0x46, 0x88, 0xda, 0xf2, 0xf9, 0x73, 0xa3, 0x92, + 0x73, 0x29, 0x09, 0xc3, 0x31, 0xd5, 0x6d, 0x60, + 0xf6, 0x94, 0xab, 0xaa, 0x41, 0x4b, 0x5e, 0x7f, + 0xf5, 0xfd, 0xcd, 0xff, 0xf5, 0xe9, 0xa2, 0x84, + 0x45, 0x64, 0x76, 0x49, 0x27, 0x19, 0xff, 0xb6, + 0x4d, 0xe7, 0xd9, 0xdc, 0xa1, 0xe1, 0xd8, 0x94, + 0xbc, 0x3b, 0xd5, 0x78, 0x73, 0xed, 0x4d, 0x18, + 0x1d, 0x19, 0xd4, 0xd5, 0xc8, 0xc1, 0x8a, 0xf3, + 0xf8, 0x21, 0xd4, 0x96, 0xee, 0xb0, 0x96, 0xe9, + 0x8a, 0xd2, 0xb6, 0x9e, 0x47, 0x99, 0xc7, 0x1d, + }, +}; + +static const ipsec_test_packet pkt_mcgrew_gcm_test_12 = { + .len = 14, + .l2_offset = 0, + .l3_offset = ODP_PACKET_OFFSET_INVALID, + .l4_offset = ODP_PACKET_OFFSET_INVALID, + .data = { + /* ETH - not a part of RFC, added for simplicity */ + 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, + 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0x08, 0x00, + }, +}; + +static const ipsec_test_packet pkt_mcgrew_gcm_test_12_esp = { + .len = 70, + .l2_offset = 0, + .l3_offset = 14, + .l4_offset = 34, + .data = { + /* ETH - not a part of RFC, added for simplicity */ + 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, + 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0x08, 0x00, + + /* IP - not a part of RFC, added for simplicity */ + 0x45, 0x00, 0x00, 0x38, 0x69, 0x8f, 0x00, 0x00, + 0x80, 0x32, 0x4d, 0xb2, 0xc0, 0xa8, 0x01, 0x02, + 0xc0, 0xa8, 0x01, 0x01, + + /* ESP */ + 0x33, 0x54, 0x67, 0xae, 0xff, 0xff, 0xff, 0xff, + + /* IV */ + 0x43, 0x45, 0x7e, 0x91, 0x82, 0x44, 0x3b, 0xc6, + + /* Data */ + 0x43, 0x7f, 0x86, 0x6b, 0xcb, 0x3f, 0x69, 0x9f, + 0xe9, 0xb0, 0x82, 0x2b, 0xac, 0x96, 0x1c, 0x45, + 0x04, 0xbe, 0xf2, 0x70, + }, +}; + +#endif diff --git a/test/linux-generic/Makefile.am b/test/linux-generic/Makefile.am index 0d363588..65294739 100644 --- a/test/linux-generic/Makefile.am +++ b/test/linux-generic/Makefile.am @@ -22,7 +22,10 @@ TESTS = validation/api/pktio/pktio_run.sh \ $(ALL_API_VALIDATION_DIR)/init/init_main_ok$(EXEEXT) \ $(ALL_API_VALIDATION_DIR)/init/init_main_abort$(EXEEXT) \ $(ALL_API_VALIDATION_DIR)/init/init_main_log$(EXEEXT) \ - $(ALL_API_VALIDATION_DIR)/ipsec/ipsec_main$(EXEEXT) \ + $(ALL_API_VALIDATION_DIR)/ipsec/ipsec_sync$(EXEEXT) \ + $(ALL_API_VALIDATION_DIR)/ipsec/ipsec_async$(EXEEXT) \ + $(ALL_API_VALIDATION_DIR)/ipsec/ipsec_inline_in$(EXEEXT) \ + $(ALL_API_VALIDATION_DIR)/ipsec/ipsec_inline_out$(EXEEXT) \ $(ALL_API_VALIDATION_DIR)/lock/lock_main$(EXEEXT) \ $(ALL_API_VALIDATION_DIR)/packet/packet_main$(EXEEXT) \ $(ALL_API_VALIDATION_DIR)/pool/pool_main$(EXEEXT) \ ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/Makefile.am | 3 + platform/linux-generic/include/odp_internal.h | 8 + .../linux-generic/include/odp_ipsec_internal.h | 201 ++++ .../linux-generic/include/odp_packet_internal.h | 13 + platform/linux-generic/include/protocols/ip.h | 1 + platform/linux-generic/odp_event.c | 4 + platform/linux-generic/odp_init.c | 26 + platform/linux-generic/odp_ipsec.c | 1251 ++++++++++++++++++-- platform/linux-generic/odp_ipsec_events.c | 156 +++ platform/linux-generic/odp_ipsec_sad.c | 500 ++++++++ platform/linux-generic/odp_packet.c | 244 ++-- platform/linux-generic/pktio/loop.c | 25 + platform/linux-generic/pktio/tap.c | 115 +- test/common_plat/validation/api/ipsec/Makefile.am | 27 +- test/common_plat/validation/api/ipsec/ipsec.c | 879 +++++++++++++- test/common_plat/validation/api/ipsec/ipsec.h | 81 +- .../common_plat/validation/api/ipsec/ipsec_async.c | 55 + .../validation/api/ipsec/ipsec_inline_in.c | 56 + .../validation/api/ipsec/ipsec_inline_out.c | 56 + test/common_plat/validation/api/ipsec/ipsec_main.c | 12 - test/common_plat/validation/api/ipsec/ipsec_sync.c | 53 + .../validation/api/ipsec/ipsec_sync_in.c | 27 + .../validation/api/ipsec/ipsec_test_in.c | 815 +++++++++++++ .../validation/api/ipsec/ipsec_test_out.c | 348 ++++++ .../validation/api/ipsec/test_vectors.h | 965 +++++++++++++++ test/linux-generic/Makefile.am | 5 +- 26 files changed, 5700 insertions(+), 226 deletions(-) create mode 100644 platform/linux-generic/include/odp_ipsec_internal.h create mode 100644 platform/linux-generic/odp_ipsec_events.c create mode 100644 platform/linux-generic/odp_ipsec_sad.c create mode 100644 test/common_plat/validation/api/ipsec/ipsec_async.c create mode 100644 test/common_plat/validation/api/ipsec/ipsec_inline_in.c create mode 100644 test/common_plat/validation/api/ipsec/ipsec_inline_out.c delete mode 100644 test/common_plat/validation/api/ipsec/ipsec_main.c create mode 100644 test/common_plat/validation/api/ipsec/ipsec_sync.c create mode 100644 test/common_plat/validation/api/ipsec/ipsec_sync_in.c create mode 100644 test/common_plat/validation/api/ipsec/ipsec_test_in.c create mode 100644 test/common_plat/validation/api/ipsec/ipsec_test_out.c create mode 100644 test/common_plat/validation/api/ipsec/test_vectors.h hooks/post-receive --

8 years, 4 months

[COMMIT] branch 2.0 updated. v1.15.0.0-810-g7bab5c22

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, 2.0 has been updated via 7bab5c22f99bb4847bd941fea1f5ed59a1412899 (commit) via 5727b172ff07754aa116891aaef660a1267295fa (commit) via ed97a26cdf4555ec45cec3e4f02bc5439f94552b (commit) via d28b2ec4a1f6e1cdfd6b5edc937922b7e75a959c (commit) via fe76b3533fe42b1138eb0a1cfc99b2c9fd3e7004 (commit) via c621d709f9b14af2a335b9c84f2be50b4a54e2b1 (commit) via c75e3e7e46ac80dd0b2c1cb98cec19f56ed11014 (commit) via a9c61e3590ea4e9bc3fb30337cfa24b32ff4ea41 (commit) via 613f352da705b0076cf82c0a96e2e69473018ccd (commit) from 76f82972ecb51aa64215c97cb3d7f94e5de980f9 (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 7bab5c22f99bb4847bd941fea1f5ed59a1412899 Author: Bogdan Pricope <bogdan.pricope(a)linaro.org> Date: Fri Sep 22 16:55:35 2017 +0300 linux-gen: pktio: dpdk: use generic pktio_ops data storage Signed-off-by: Bogdan Pricope <bogdan.pricope(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Yi He <yi.he(a)linaro.org> diff --git a/platform/linux-dpdk/include/odp_packet_io_internal.h b/platform/linux-dpdk/include/odp_packet_io_internal.h index d31c449e..089ad38c 100644 --- a/platform/linux-dpdk/include/odp_packet_io_internal.h +++ b/platform/linux-dpdk/include/odp_packet_io_internal.h @@ -29,7 +29,6 @@ extern "C" { #define PKTIO_MAX_QUEUES 64 #include <linux/if_ether.h> -#include <pktio/dpdk.h> /* Forward declaration */ typedef union pktio_entry_u pktio_entry_t; @@ -42,10 +41,8 @@ typedef union pktio_entry_u pktio_entry_t; struct pktio_entry { const pktio_ops_module_t *ops; /**< Implementation specific methods */ - union { - pktio_ops_data_t ops_data; - uint8_t _ops_data[ODP_PKTIO_ODPS_DATA_MAX_SIZE]; - }; + uint8_t ops_data[ODP_PKTIO_ODPS_DATA_MAX_SIZE]; /**< IO operation + specific data */ /* These two locks together lock the whole pktio device */ odp_ticketlock_t rxl; /**< RX ticketlock */ odp_ticketlock_t txl; /**< TX ticketlock */ diff --git a/platform/linux-dpdk/pktio/dpdk.c b/platform/linux-dpdk/pktio/dpdk.c index e64f02d5..1248c130 100644 --- a/platform/linux-dpdk/pktio/dpdk.c +++ b/platform/linux-dpdk/pktio/dpdk.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include <config.h> + #include <odp_posix_extensions.h> #include <stdio.h> #include <errno.h> @@ -39,18 +41,6 @@ static pktio_ops_module_t dpdk_pktio_ops; static uint32_t mtu_get_pkt_dpdk(pktio_entry_t *pktio_entry); -static inline pktio_ops_dpdk_data_t * - __retrieve_op_data(pktio_entry_t *pktio) -{ - return (pktio_ops_dpdk_data_t *)(pktio->ops_data(dpdk)); -} - -static inline void __release_op_data(pktio_entry_t *pktio) -{ - free(pktio->ops_data(dpdk)); - pktio->ops_data(dpdk) = NULL; -} - /* Test if s has only digits or not. Dpdk pktio uses only digits.*/ static int _dpdk_netdev_is_valid(const char *s) { @@ -108,7 +98,7 @@ static int input_queues_config_pkt_dpdk(pktio_entry_t *pktio_entry, const odp_pktin_queue_param_t *p) { pktio_ops_dpdk_data_t *pkt_dpdk = - __retrieve_op_data(pktio_entry); + odp_ops_data(pktio_entry, dpdk); odp_pktin_mode_t mode = pktio_entry->s.param.in_mode; /** @@ -138,7 +128,7 @@ static int output_queues_config_pkt_dpdk(pktio_entry_t *pktio_entry, const odp_pktout_queue_param_t *p) { pktio_ops_dpdk_data_t *pkt_dpdk = - __retrieve_op_data(pktio_entry); + odp_ops_data(pktio_entry, dpdk); if (p->op_mode == ODP_PKTIO_OP_MT_UNSAFE) pkt_dpdk->lockless_tx = 1; @@ -155,7 +145,8 @@ static int setup_pkt_dpdk(odp_pktio_t pktio ODP_UNUSED, { uint8_t portid = 0; struct rte_eth_dev_info dev_info; - pktio_ops_dpdk_data_t *pkt_dpdk = NULL; + pktio_ops_dpdk_data_t *pkt_dpdk = + odp_ops_data(pktio_entry, dpdk); int i; if (!_dpdk_netdev_is_valid(netdev)) { @@ -164,9 +155,6 @@ static int setup_pkt_dpdk(odp_pktio_t pktio ODP_UNUSED, return -1; } - pktio_entry->ops_data(dpdk) = malloc(sizeof(pktio_ops_dpdk_data_t)); - pkt_dpdk = __retrieve_op_data(pktio_entry); - if (odp_unlikely(pkt_dpdk == NULL)) { ODP_ERR("Failed to allocate pktio_ops_dpdk_data_t struct"); return -1; @@ -202,12 +190,11 @@ static int setup_pkt_dpdk(odp_pktio_t pktio ODP_UNUSED, static int close_pkt_dpdk(pktio_entry_t *pktio_entry) { const pktio_ops_dpdk_data_t *pkt_dpdk = - __retrieve_op_data(pktio_entry); + odp_ops_data(pktio_entry, dpdk); if (pktio_entry->s.state == PKTIO_STATE_STOPPED) rte_eth_dev_close(pkt_dpdk->portid); - __release_op_data(pktio_entry); return 0; } @@ -215,7 +202,7 @@ static int start_pkt_dpdk(pktio_entry_t *pktio_entry) { int ret, i; pktio_ops_dpdk_data_t *pkt_dpdk = - __retrieve_op_data(pktio_entry); + odp_ops_data(pktio_entry, dpdk); uint8_t portid = pkt_dpdk->portid; int sid = rte_eth_dev_socket_id(pkt_dpdk->portid); int socket_id = sid < 0 ? 0 : sid; @@ -324,7 +311,8 @@ static int start_pkt_dpdk(pktio_entry_t *pktio_entry) static int stop_pkt_dpdk(pktio_entry_t *pktio_entry) { pktio_ops_dpdk_data_t *pkt_dpdk = - __retrieve_op_data(pktio_entry); + odp_ops_data(pktio_entry, dpdk); + rte_eth_dev_stop(pkt_dpdk->portid); return 0; } @@ -373,7 +361,7 @@ static int recv_pkt_dpdk(pktio_entry_t *pktio_entry, int index, { uint16_t nb_rx, i; pktio_ops_dpdk_data_t *pkt_dpdk = - __retrieve_op_data(pktio_entry); + odp_ops_data(pktio_entry, dpdk); odp_packet_t *saved_pkt_table; uint8_t min = pkt_dpdk->min_rx_burst; odp_time_t ts_val; @@ -490,7 +478,7 @@ static int send_pkt_dpdk(pktio_entry_t *pktio_entry, int index, { int pkts; pktio_ops_dpdk_data_t *pkt_dpdk = - __retrieve_op_data(pktio_entry); + odp_ops_data(pktio_entry, dpdk); if (!pkt_dpdk->lockless_tx) odp_ticketlock_lock(&pkt_dpdk->tx_lock[index]); @@ -543,7 +531,7 @@ static uint32_t _dpdk_vdev_mtu(uint8_t port_id) static uint32_t mtu_get_pkt_dpdk(pktio_entry_t *pktio_entry) { pktio_ops_dpdk_data_t *pkt_dpdk = - __retrieve_op_data(pktio_entry); + odp_ops_data(pktio_entry, dpdk); uint16_t mtu = 0; int ret; @@ -604,7 +592,7 @@ static int _dpdk_vdev_promisc_mode_set(uint8_t port_id, int enable) static int promisc_mode_set_pkt_dpdk(pktio_entry_t *pktio_entry, int enable) { const pktio_ops_dpdk_data_t *pkt_dpdk = - __retrieve_op_data(pktio_entry); + odp_ops_data(pktio_entry, dpdk); uint8_t portid = pkt_dpdk->portid; if (enable) @@ -648,7 +636,7 @@ static int _dpdk_vdev_promisc_mode(uint8_t port_id) static int promisc_mode_get_pkt_dpdk(pktio_entry_t *pktio_entry) { const pktio_ops_dpdk_data_t *pkt_dpdk = - __retrieve_op_data(pktio_entry); + odp_ops_data(pktio_entry, dpdk); uint8_t portid = pkt_dpdk->portid; if (pkt_dpdk->vdev_sysc_promisc) @@ -660,25 +648,27 @@ static int promisc_mode_get_pkt_dpdk(pktio_entry_t *pktio_entry) static int mac_get_pkt_dpdk(pktio_entry_t *pktio_entry, void *mac_addr) { const pktio_ops_dpdk_data_t *pkt_dpdk = - __retrieve_op_data(pktio_entry); + odp_ops_data(pktio_entry, dpdk); + rte_eth_macaddr_get(pkt_dpdk->portid, (struct ether_addr *)mac_addr); return ETH_ALEN; } - static int capability_pkt_dpdk(pktio_entry_t *pktio_entry, odp_pktio_capability_t *capa) { const pktio_ops_dpdk_data_t *pkt_dpdk = - __retrieve_op_data(pktio_entry); + odp_ops_data(pktio_entry, dpdk); + *capa = pkt_dpdk->capa; return 0; } + static int link_status_pkt_dpdk(pktio_entry_t *pktio_entry) { const pktio_ops_dpdk_data_t *pkt_dpdk = - __retrieve_op_data(pktio_entry); + odp_ops_data(pktio_entry, dpdk); struct rte_eth_link link; rte_eth_link_get(pkt_dpdk->portid, &link); @@ -702,7 +692,7 @@ static void stats_convert(struct rte_eth_stats *rte_stats, static int stats_pkt_dpdk(pktio_entry_t *pktio_entry, odp_pktio_stats_t *stats) { const pktio_ops_dpdk_data_t *pkt_dpdk = - __retrieve_op_data(pktio_entry); + odp_ops_data(pktio_entry, dpdk); int ret; struct rte_eth_stats rte_stats; @@ -721,7 +711,8 @@ static int stats_pkt_dpdk(pktio_entry_t *pktio_entry, odp_pktio_stats_t *stats) static int stats_reset_pkt_dpdk(pktio_entry_t *pktio_entry) { const pktio_ops_dpdk_data_t *pkt_dpdk = - __retrieve_op_data(pktio_entry); + odp_ops_data(pktio_entry, dpdk); + rte_eth_stats_reset(pkt_dpdk->portid); return 0; } diff --git a/platform/linux-generic/include/odp_packet_io_internal.h b/platform/linux-generic/include/odp_packet_io_internal.h index 79f5b108..b26a35d2 100644 --- a/platform/linux-generic/include/odp_packet_io_internal.h +++ b/platform/linux-generic/include/odp_packet_io_internal.h @@ -50,10 +50,8 @@ typedef union pktio_entry_u pktio_entry_t; struct pktio_entry { const pktio_ops_module_t *ops; /**< Implementation specific methods */ - union { - pktio_ops_data_t ops_data; /**< IO operation specific data */ - uint8_t _ops_data[ODP_PKTIO_ODPS_DATA_MAX_SIZE]; - }; + uint8_t ops_data[ODP_PKTIO_ODPS_DATA_MAX_SIZE]; /**< IO operation + specific data */ /* These two locks together lock the whole pktio device */ odp_ticketlock_t rxl; /**< RX ticketlock */ odp_ticketlock_t txl; /**< TX ticketlock */ diff --git a/platform/linux-generic/include/odp_pktio_ops_subsystem.h b/platform/linux-generic/include/odp_pktio_ops_subsystem.h index 64940d51..34bc5a24 100644 --- a/platform/linux-generic/include/odp_pktio_ops_subsystem.h +++ b/platform/linux-generic/include/odp_pktio_ops_subsystem.h @@ -80,21 +80,11 @@ typedef ODP_MODULE_CLASS(pktio_ops) { odp_api_proto(pktio_ops, print) print; } pktio_ops_module_t; -/* Per implementation private data - * TODO: refactory each implementation to hide it internally - */ -typedef union { - void *dpdk; -} pktio_ops_data_t; - -/* Extract pktio ops data from pktio entry structure */ -#define ops_data(mod) s.ops_data.mod - /* Maximum size of pktio specific ops data.*/ #define ODP_PKTIO_ODPS_DATA_MAX_SIZE 80000 /* Extract pktio ops data from pktio entry structure */ #define odp_ops_data(_p, _mod) \ - ((pktio_ops_ ## _mod ## _data_t *)(uintptr_t)_p->s._ops_data) + ((pktio_ops_ ## _mod ## _data_t *)(uintptr_t)_p->s.ops_data) #endif diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c index 9337ea33..563d70a3 100644 --- a/platform/linux-generic/pktio/dpdk.c +++ b/platform/linux-generic/pktio/dpdk.c @@ -14,6 +14,7 @@ #include <ctype.h> #include <unistd.h> #include <math.h> +#include <linux/if_ether.h> #include <odp/api/cpumask.h> @@ -39,18 +40,6 @@ #include <rte_tcp.h> #include <rte_string_fns.h> -static inline pktio_ops_dpdk_data_t * - __retrieve_op_data(pktio_entry_t *pktio) -{ - return (pktio_ops_dpdk_data_t *)(pktio->ops_data(dpdk)); -} - -static inline void __release_op_data(pktio_entry_t *pktio) -{ - free(pktio->ops_data(dpdk)); - pktio->ops_data(dpdk) = NULL; -} - #if ODP_DPDK_ZERO_COPY ODP_STATIC_ASSERT(CONFIG_PACKET_HEADROOM == RTE_PKTMBUF_HEADROOM, "ODP and DPDK headroom sizes not matching!"); @@ -363,6 +352,7 @@ static inline int mbuf_to_pkt(pktio_entry_t *pktio_entry, struct rte_mbuf *mbuf_table[], uint16_t mbuf_num, odp_time_t *ts) { + pktio_ops_dpdk_data_t *pkt_dpdk = odp_ops_data(pktio_entry, dpdk); odp_packet_t pkt; odp_packet_hdr_t *pkt_hdr; uint16_t pkt_len; @@ -371,11 +361,11 @@ static inline int mbuf_to_pkt(pktio_entry_t *pktio_entry, int i, j; int nb_pkts = 0; int alloc_len, num; - odp_pool_t pool = __retrieve_op_data(pktio_entry)->pool; odp_pktin_config_opt_t *pktin_cfg = &pktio_entry->s.config.pktin; + odp_pool_t pool = pkt_dpdk->pool; /* Allocate maximum sized packets */ - alloc_len = __retrieve_op_data(pktio_entry)->data_room; + alloc_len = pkt_dpdk->data_room; num = packet_alloc_multi(pool, alloc_len, pkt_table, mbuf_num); if (num != mbuf_num) { @@ -545,7 +535,7 @@ static inline int pkt_to_mbuf(pktio_entry_t *pktio_entry, const odp_packet_t pkt_table[], uint16_t num) { pktio_ops_dpdk_data_t *pkt_dpdk = - __retrieve_op_data(pktio_entry); + odp_ops_data(pktio_entry, dpdk); int i, j; char *data; uint16_t pkt_len; @@ -589,6 +579,8 @@ static inline int mbuf_to_pkt_zero(pktio_entry_t *pktio_entry, struct rte_mbuf *mbuf_table[], uint16_t mbuf_num, odp_time_t *ts) { + pktio_ops_dpdk_data_t *pkt_dpdk = + odp_ops_data(pktio_entry, dpdk); odp_packet_t pkt; odp_packet_hdr_t *pkt_hdr; uint16_t pkt_len; @@ -596,8 +588,8 @@ static inline int mbuf_to_pkt_zero(pktio_entry_t *pktio_entry, void *data; int i; int nb_pkts = 0; - odp_pool_t pool = __retrieve_op_data(pktio_entry)->pool; odp_pktin_config_opt_t *pktin_cfg = &pktio_entry->s.config.pktin; + odp_pool_t pool = pkt_dpdk->pool; for (i = 0; i < mbuf_num; i++) { odp_packet_hdr_t parsed_hdr; @@ -662,7 +654,7 @@ static inline int pkt_to_mbuf_zero(pktio_entry_t *pktio_entry, uint16_t *copy_count) { pktio_ops_dpdk_data_t *pkt_dpdk = - __retrieve_op_data(pktio_entry); + odp_ops_data(pktio_entry, dpdk); odp_pktout_config_opt_t *pktout_cfg = &pktio_entry->s.config.pktout; int i; *copy_count = 0; @@ -752,7 +744,7 @@ static uint32_t dpdk_vdev_mtu_get(uint8_t port_id) static uint32_t dpdk_mtu_get(pktio_entry_t *pktio_entry) { pktio_ops_dpdk_data_t *pkt_dpdk = - __retrieve_op_data(pktio_entry); + odp_ops_data(pktio_entry, dpdk); uint32_t mtu = 0; if (rte_eth_dev_get_mtu(pkt_dpdk->port_id, (uint16_t *)&mtu)) @@ -846,7 +838,7 @@ static int dpdk_setup_port(pktio_entry_t *pktio_entry) { int ret; pktio_ops_dpdk_data_t *pkt_dpdk = - __retrieve_op_data(pktio_entry); + odp_ops_data(pktio_entry, dpdk); struct rte_eth_rss_conf rss_conf; uint16_t hw_ip_checksum = 0; @@ -895,7 +887,7 @@ static int dpdk_setup_port(pktio_entry_t *pktio_entry) static int dpdk_close(pktio_entry_t *pktio_entry) { pktio_ops_dpdk_data_t *pkt_dpdk = - __retrieve_op_data(pktio_entry); + odp_ops_data(pktio_entry, dpdk); unsigned idx; unsigned i, j; @@ -913,7 +905,6 @@ static int dpdk_close(pktio_entry_t *pktio_entry) if (!ODP_DPDK_ZERO_COPY) rte_mempool_free(pkt_dpdk->pkt_pool); - __release_op_data(pktio_entry); return 0; } @@ -1046,6 +1037,8 @@ static int dpdk_pktio_init_local(void) static int dpdk_input_queues_config(pktio_entry_t *pktio_entry, const odp_pktin_queue_param_t *p) { + pktio_ops_dpdk_data_t *pkt_dpdk = + odp_ops_data(pktio_entry, dpdk); odp_pktin_mode_t mode = pktio_entry->s.param.in_mode; odp_bool_t lockless; @@ -1059,9 +1052,9 @@ static int dpdk_input_queues_config(pktio_entry_t *pktio_entry, lockless = 0; if (p->hash_enable && p->num_queues > 1) - __retrieve_op_data(pktio_entry)->hash = p->hash_proto; + pkt_dpdk->hash = p->hash_proto; - __retrieve_op_data(pktio_entry)->lockless_rx = lockless; + pkt_dpdk->lockless_rx = lockless; return 0; } @@ -1070,7 +1063,7 @@ static int dpdk_output_queues_config(pktio_entry_t *pktio_entry, const odp_pktout_queue_param_t *p) { pktio_ops_dpdk_data_t *pkt_dpdk = - __retrieve_op_data(pktio_entry); + odp_ops_data(pktio_entry, dpdk); odp_bool_t lockless; if (p->op_mode == ODP_PKTIO_OP_MT_UNSAFE) @@ -1087,7 +1080,7 @@ static void dpdk_init_capability(pktio_entry_t *pktio_entry, struct rte_eth_dev_info *dev_info) { pktio_ops_dpdk_data_t *pkt_dpdk = - __retrieve_op_data(pktio_entry); + odp_ops_data(pktio_entry, dpdk); odp_pktio_capability_t *capa = &pkt_dpdk->capa; int ptype_cnt; int ptype_l3_ipv4 = 0; @@ -1164,7 +1157,8 @@ static int dpdk_open(odp_pktio_t id ODP_UNUSED, const char *netdev, odp_pool_t pool) { - pktio_ops_dpdk_data_t *pkt_dpdk = NULL; + pktio_ops_dpdk_data_t *pkt_dpdk = + odp_ops_data(pktio_entry, dpdk); struct rte_eth_dev_info dev_info; struct rte_mempool *pkt_pool; char pool_name[RTE_MEMPOOL_NAMESIZE]; @@ -1192,9 +1186,6 @@ static int dpdk_open(odp_pktio_t id ODP_UNUSED, dpdk_initialized = 1; } - pktio_entry->ops_data(dpdk) = malloc(sizeof(pktio_ops_dpdk_data_t)); - pkt_dpdk = __retrieve_op_data(pktio_entry); - if (odp_unlikely(pkt_dpdk == NULL)) { ODP_ERR("Failed to allocate pktio_ops_dpdk_data_t struct"); return -1; @@ -1208,7 +1199,6 @@ static int dpdk_open(odp_pktio_t id ODP_UNUSED, if (rte_eth_dev_count() == 0) { ODP_ERR("No DPDK ports found\n"); - __release_op_data(pktio_entry); return -1; } @@ -1217,7 +1207,6 @@ static int dpdk_open(odp_pktio_t id ODP_UNUSED, mtu = dpdk_mtu_get(pktio_entry); if (mtu == 0) { ODP_ERR("Failed to read interface MTU\n"); - __release_op_data(pktio_entry); return -1; } pkt_dpdk->mtu = mtu + _ODP_ETHHDR_LEN; @@ -1254,7 +1243,6 @@ static int dpdk_open(odp_pktio_t id ODP_UNUSED, } if (pkt_pool == NULL) { ODP_ERR("Cannot init mbuf packet pool\n"); - __release_op_data(pktio_entry); return -1; } @@ -1280,7 +1268,7 @@ static int dpdk_open(odp_pktio_t id ODP_UNUSED, static int dpdk_start(pktio_entry_t *pktio_entry) { pktio_ops_dpdk_data_t *pkt_dpdk = - __retrieve_op_data(pktio_entry); + odp_ops_data(pktio_entry, dpdk); uint8_t port_id = pkt_dpdk->port_id; int ret; unsigned i; @@ -1331,7 +1319,10 @@ static int dpdk_start(pktio_entry_t *pktio_entry) static int dpdk_stop(pktio_entry_t *pktio_entry) { - rte_eth_dev_stop(__retrieve_op_data(pktio_entry)->port_id); + pktio_ops_dpdk_data_t *pkt_dpdk = + odp_ops_data(pktio_entry, dpdk); + + rte_eth_dev_stop(pkt_dpdk->port_id); return 0; } @@ -1340,7 +1331,7 @@ static int dpdk_recv(pktio_entry_t *pktio_entry, int index, odp_packet_t pkt_table[], int num) { pktio_ops_dpdk_data_t *pkt_dpdk = - __retrieve_op_data(pktio_entry); + odp_ops_data(pktio_entry, dpdk); pkt_cache_t *rx_cache = &pkt_dpdk->rx_cache[index]; odp_time_t ts_val; odp_time_t *ts = NULL; @@ -1416,7 +1407,7 @@ static int dpdk_send(pktio_entry_t *pktio_entry, int index, { struct rte_mbuf *tx_mbufs[num]; pktio_ops_dpdk_data_t *pkt_dpdk = - __retrieve_op_data(pktio_entry); + odp_ops_data(pktio_entry, dpdk); uint16_t copy_count = 0; int tx_pkts; int i; @@ -1479,16 +1470,21 @@ static int dpdk_send(pktio_entry_t *pktio_entry, int index, static int dpdk_mac_addr_get(pktio_entry_t *pktio_entry, void *mac_addr) { - rte_eth_macaddr_get(__retrieve_op_data(pktio_entry)->port_id, + pktio_ops_dpdk_data_t *pkt_dpdk = + odp_ops_data(pktio_entry, dpdk); + + rte_eth_macaddr_get(pkt_dpdk->port_id, (struct ether_addr *)mac_addr); return ETH_ALEN; } static int dpdk_promisc_mode_set(pktio_entry_t *pktio_entry, odp_bool_t enable) { - uint8_t port_id = __retrieve_op_data(pktio_entry)->port_id; + pktio_ops_dpdk_data_t *pkt_dpdk = + odp_ops_data(pktio_entry, dpdk); + uint8_t port_id = pkt_dpdk->port_id; - if (__retrieve_op_data(pktio_entry)->vdev_sysc_promisc) + if (pkt_dpdk->vdev_sysc_promisc) return dpdk_vdev_promisc_mode_set(port_id, enable); if (enable) @@ -1501,9 +1497,11 @@ 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 = __retrieve_op_data(pktio_entry)->port_id; + pktio_ops_dpdk_data_t *pkt_dpdk = + odp_ops_data(pktio_entry, dpdk); + uint8_t port_id = pkt_dpdk->port_id; - if (__retrieve_op_data(pktio_entry)->vdev_sysc_promisc) + if (pkt_dpdk->vdev_sysc_promisc) return dpdk_vdev_promisc_mode_get(port_id); else return rte_eth_promiscuous_get(port_id); @@ -1512,18 +1510,22 @@ static int dpdk_promisc_mode_get(pktio_entry_t *pktio_entry) static int dpdk_capability(pktio_entry_t *pktio_entry, odp_pktio_capability_t *capa) { - *capa = __retrieve_op_data(pktio_entry)->capa; + pktio_ops_dpdk_data_t *pkt_dpdk = + odp_ops_data(pktio_entry, dpdk); + + *capa = pkt_dpdk->capa; return 0; } static int dpdk_link_status(pktio_entry_t *pktio_entry) { + pktio_ops_dpdk_data_t *pkt_dpdk = + odp_ops_data(pktio_entry, dpdk); struct rte_eth_link link; memset(&link, 0, sizeof(struct rte_eth_link)); - rte_eth_link_get_nowait( - __retrieve_op_data(pktio_entry)->port_id, &link); + rte_eth_link_get_nowait(pkt_dpdk->port_id, &link); return link.link_status; } @@ -1542,11 +1544,12 @@ static void stats_convert(const struct rte_eth_stats *rte_stats, static int dpdk_stats(pktio_entry_t *pktio_entry, odp_pktio_stats_t *stats) { + pktio_ops_dpdk_data_t *pkt_dpdk = + odp_ops_data(pktio_entry, dpdk); int ret; struct rte_eth_stats rte_stats; - ret = rte_eth_stats_get( - __retrieve_op_data(pktio_entry)->port_id, &rte_stats); + ret = rte_eth_stats_get(pkt_dpdk->port_id, &rte_stats); if (ret == 0) { stats_convert(&rte_stats, stats); @@ -1557,7 +1560,10 @@ static int dpdk_stats(pktio_entry_t *pktio_entry, odp_pktio_stats_t *stats) static int dpdk_stats_reset(pktio_entry_t *pktio_entry) { - rte_eth_stats_reset(__retrieve_op_data(pktio_entry)->port_id); + pktio_ops_dpdk_data_t *pkt_dpdk = + odp_ops_data(pktio_entry, dpdk); + + rte_eth_stats_reset(pkt_dpdk->port_id); return 0; } commit 5727b172ff07754aa116891aaef660a1267295fa Author: Bogdan Pricope <bogdan.pricope(a)linaro.org> Date: Fri Sep 22 14:42:32 2017 +0300 linux-gen: pktio: pcap: use generic pktio_ops data storage Signed-off-by: Bogdan Pricope <bogdan.pricope(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Yi He <yi.he(a)linaro.org> diff --git a/platform/linux-generic/include/odp_pktio_ops_subsystem.h b/platform/linux-generic/include/odp_pktio_ops_subsystem.h index edc5ab8a..64940d51 100644 --- a/platform/linux-generic/include/odp_pktio_ops_subsystem.h +++ b/platform/linux-generic/include/odp_pktio_ops_subsystem.h @@ -80,15 +80,11 @@ typedef ODP_MODULE_CLASS(pktio_ops) { odp_api_proto(pktio_ops, print) print; } pktio_ops_module_t; -/* All implementations of this subsystem */ -#include <odp_pktio_ops_pcap.h> - /* Per implementation private data * TODO: refactory each implementation to hide it internally */ typedef union { void *dpdk; - pktio_ops_pcap_data_t pcap; } pktio_ops_data_t; /* Extract pktio ops data from pktio entry structure */ diff --git a/platform/linux-generic/pktio/pcap.c b/platform/linux-generic/pktio/pcap.c index 252a9048..5bfaeef0 100644 --- a/platform/linux-generic/pktio/pcap.c +++ b/platform/linux-generic/pktio/pcap.c @@ -41,6 +41,7 @@ #include <odp_api.h> #include <odp_packet_internal.h> #include <odp_packet_io_internal.h> +#include <odp_pktio_ops_pcap.h> #include <protocols/eth.h> @@ -139,8 +140,7 @@ static int _pcapif_init_tx(pktio_ops_pcap_data_t *pcap) static int pcapif_init(odp_pktio_t id ODP_UNUSED, pktio_entry_t *pktio_entry, const char *devname, odp_pool_t pool) { - pktio_ops_pcap_data_t *pcap = - &pktio_entry->ops_data(pcap); + pktio_ops_pcap_data_t *pcap = odp_ops_data(pktio_entry, pcap); int ret; memset(pcap, 0, sizeof(pktio_ops_pcap_data_t)); @@ -167,7 +167,7 @@ static int pcapif_init(odp_pktio_t id ODP_UNUSED, pktio_entry_t *pktio_entry, static int pcapif_close(pktio_entry_t *pktio_entry) { - pktio_ops_pcap_data_t *pcap = &pktio_entry->ops_data(pcap); + pktio_ops_pcap_data_t *pcap = odp_ops_data(pktio_entry, pcap); if (pcap->tx_dump) pcap_dump_close(pcap->tx_dump); @@ -214,8 +214,7 @@ static int pcapif_recv_pkt(pktio_entry_t *pktio_entry, int index ODP_UNUSED, odp_packet_t pkt; odp_packet_hdr_t *pkt_hdr; uint32_t pkt_len; - pktio_ops_pcap_data_t *pcap = - &pktio_entry->ops_data(pcap); + pktio_ops_pcap_data_t *pcap = odp_ops_data(pktio_entry, pcap); odp_time_t ts_val; odp_time_t *ts = NULL; @@ -298,8 +297,7 @@ static int _pcapif_dump_pkt(pktio_ops_pcap_data_t *pcap, odp_packet_t pkt) static int pcapif_send_pkt(pktio_entry_t *pktio_entry, int index ODP_UNUSED, const odp_packet_t pkts[], int len) { - pktio_ops_pcap_data_t *pcap = - &pktio_entry->ops_data(pcap); + pktio_ops_pcap_data_t *pcap = odp_ops_data(pktio_entry, pcap); int i; odp_ticketlock_lock(&pktio_entry->s.txl); @@ -367,8 +365,7 @@ static int pcapif_promisc_mode_set(pktio_entry_t *pktio_entry, { char filter_exp[64] = {0}; struct bpf_program bpf; - pktio_ops_pcap_data_t *pcap = - &pktio_entry->ops_data(pcap); + pktio_ops_pcap_data_t *pcap = odp_ops_data(pktio_entry, pcap); if (!pcap->rx) { pcap->promisc = enable; @@ -408,7 +405,9 @@ static int pcapif_promisc_mode_set(pktio_entry_t *pktio_entry, static int pcapif_promisc_mode_get(pktio_entry_t *pktio_entry) { - return pktio_entry->ops_data(pcap).promisc; + pktio_ops_pcap_data_t *pcap = odp_ops_data(pktio_entry, pcap); + + return pcap->promisc; } static int pcapif_stats_reset(pktio_entry_t *pktio_entry) commit ed97a26cdf4555ec45cec3e4f02bc5439f94552b Author: Bogdan Pricope <bogdan.pricope(a)linaro.org> Date: Fri Sep 22 14:34:35 2017 +0300 linux-gen: pktio: netmap: use generic pktio_ops data storage Signed-off-by: Bogdan Pricope <bogdan.pricope(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Yi He <yi.he(a)linaro.org> diff --git a/platform/linux-generic/include/odp_pktio_ops_subsystem.h b/platform/linux-generic/include/odp_pktio_ops_subsystem.h index 411d961a..edc5ab8a 100644 --- a/platform/linux-generic/include/odp_pktio_ops_subsystem.h +++ b/platform/linux-generic/include/odp_pktio_ops_subsystem.h @@ -81,7 +81,6 @@ typedef ODP_MODULE_CLASS(pktio_ops) { } pktio_ops_module_t; /* All implementations of this subsystem */ -#include <odp_pktio_ops_netmap.h> #include <odp_pktio_ops_pcap.h> /* Per implementation private data @@ -89,7 +88,6 @@ typedef ODP_MODULE_CLASS(pktio_ops) { */ typedef union { void *dpdk; - pktio_ops_netmap_data_t netmap; pktio_ops_pcap_data_t pcap; } pktio_ops_data_t; diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c index e2239bcd..beeb9c6b 100644 --- a/platform/linux-generic/odp_packet_io.c +++ b/platform/linux-generic/odp_packet_io.c @@ -29,6 +29,7 @@ #include <ifaddrs.h> #include <errno.h> #include <time.h> +#include <linux/if_ether.h> /* Sleep this many nanoseconds between pktin receive calls */ #define SLEEP_NSEC 1000 diff --git a/platform/linux-generic/pktio/netmap.c b/platform/linux-generic/pktio/netmap.c index 215e6454..84e2144f 100644 --- a/platform/linux-generic/pktio/netmap.c +++ b/platform/linux-generic/pktio/netmap.c @@ -24,6 +24,7 @@ #include <odp_classification_datamodel.h> #include <odp_classification_inlines.h> #include <odp_classification_internal.h> +#include <odp_pktio_ops_netmap.h> #include <pktio/ethtool.h> #include <pktio/common.h> @@ -49,7 +50,7 @@ static int netmap_do_ioctl(pktio_entry_t *pktio_entry, unsigned long cmd, int subcmd) { pktio_ops_netmap_data_t *pkt_nm = - &pktio_entry->ops_data(netmap); + odp_ops_data(pktio_entry, netmap); struct ethtool_value eval; struct ifreq ifr; int err; @@ -137,7 +138,7 @@ static int netmap_input_queues_config(pktio_entry_t *pktio_entry, const odp_pktin_queue_param_t *p) { pktio_ops_netmap_data_t *pkt_nm = - &pktio_entry->ops_data(netmap); + odp_ops_data(pktio_entry, netmap); odp_pktin_mode_t mode = pktio_entry->s.param.in_mode; unsigned num_queues = p->num_queues; odp_bool_t lockless; @@ -166,7 +167,7 @@ static int netmap_output_queues_config(pktio_entry_t *pktio_entry, const odp_pktout_queue_param_t *p) { pktio_ops_netmap_data_t *pkt_nm = - &pktio_entry->ops_data(netmap); + odp_ops_data(pktio_entry, netmap); pkt_nm->lockless_tx = (p->op_mode == ODP_PKTIO_OP_MT_UNSAFE); @@ -184,7 +185,7 @@ static inline void netmap_close_descriptors(pktio_entry_t *pktio_entry) { int i, j; pktio_ops_netmap_data_t *pkt_nm = - &pktio_entry->ops_data(netmap); + odp_ops_data(pktio_entry, netmap); for (i = 0; i < PKTIO_MAX_QUEUES; i++) { for (j = 0; j < NM_MAX_DESC; j++) { @@ -208,7 +209,7 @@ static inline void netmap_close_descriptors(pktio_entry_t *pktio_entry) static int netmap_close(pktio_entry_t *pktio_entry) { pktio_ops_netmap_data_t *pkt_nm = - &pktio_entry->ops_data(netmap); + odp_ops_data(pktio_entry, netmap); netmap_close_descriptors(pktio_entry); @@ -222,11 +223,13 @@ static int netmap_close(pktio_entry_t *pktio_entry) static int netmap_link_status(pktio_entry_t *pktio_entry) { - if (pktio_entry->ops_data(netmap).is_virtual) + pktio_ops_netmap_data_t *pkt_nm = + odp_ops_data(pktio_entry, netmap); + + if (pkt_nm->is_virtual) return 1; - return link_status_fd(pktio_entry->ops_data(netmap).sockfd, - pktio_entry->ops_data(netmap).if_name); + return link_status_fd(pkt_nm->sockfd, pkt_nm->if_name); } /** @@ -242,6 +245,8 @@ static inline int netmap_wait_for_link(pktio_entry_t *pktio_entry) { int i; int ret; + pktio_ops_netmap_data_t *pkt_nm = + odp_ops_data(pktio_entry, netmap); /* Wait for the link to come up */ for (i = 0; i <= NM_WAIT_TIMEOUT; i++) { @@ -253,12 +258,12 @@ static inline int netmap_wait_for_link(pktio_entry_t *pktio_entry) * until the opposing end's interface comes back up again. In * this case without the additional sleep pktio validation * tests fail. */ - if (!pktio_entry->ops_data(netmap).is_virtual) + if (!pkt_nm->is_virtual) sleep(1); if (ret == 1) return 1; } - ODP_DBG("%s link is down\n", pktio_entry->ops_data(netmap).if_name); + ODP_DBG("%s link is down\n", pkt_nm->if_name); return 0; } @@ -270,7 +275,7 @@ static inline int netmap_wait_for_link(pktio_entry_t *pktio_entry) static void netmap_init_capability(pktio_entry_t *pktio_entry) { pktio_ops_netmap_data_t *pkt_nm = - &pktio_entry->ops_data(netmap); + odp_ops_data(pktio_entry, netmap); odp_pktio_capability_t *capa = &pkt_nm->capa; memset(&pkt_nm->capa, 0, sizeof(odp_pktio_capability_t)); @@ -338,7 +343,7 @@ static int netmap_open(odp_pktio_t id ODP_UNUSED, pktio_entry_t *pktio_entry, uint32_t mtu; uint32_t buf_size; pktio_ops_netmap_data_t *pkt_nm = - &pktio_entry->ops_data(netmap); + odp_ops_data(pktio_entry, netmap); struct nm_desc *desc; struct netmap_ring *ring; odp_pktin_hash_proto_t hash_proto; @@ -462,7 +467,7 @@ error: static int netmap_start(pktio_entry_t *pktio_entry) { pktio_ops_netmap_data_t *pkt_nm = - &pktio_entry->ops_data(netmap); + odp_ops_data(pktio_entry, netmap); netmap_ring_t *desc_ring; struct nm_desc *desc_ptr; unsigned i; @@ -618,8 +623,10 @@ static inline int netmap_pkt_to_odp(pktio_entry_t *pktio_entry, netmap_slot_t slot_tbl[], int16_t slot_num, odp_time_t *ts) { + pktio_ops_netmap_data_t *pkt_nm = + odp_ops_data(pktio_entry, netmap); odp_packet_t pkt; - odp_pool_t pool = pktio_entry->ops_data(netmap).pool; + odp_pool_t pool = pkt_nm->pool; odp_packet_hdr_t *pkt_hdr; odp_packet_hdr_t parsed_hdr; int i; @@ -627,7 +634,7 @@ static inline int netmap_pkt_to_odp(pktio_entry_t *pktio_entry, int alloc_len; /* Allocate maximum sized packets */ - alloc_len = pktio_entry->ops_data(netmap).mtu; + alloc_len = pkt_nm->mtu; num = packet_alloc_multi(pool, alloc_len, pkt_tbl, slot_num); @@ -640,10 +647,9 @@ static inline int netmap_pkt_to_odp(pktio_entry_t *pktio_entry, odp_prefetch(slot.buf); - if (odp_unlikely(len > pktio_entry-> - ops_data(netmap).max_frame_len)) { + if (odp_unlikely(len > pkt_nm->max_frame_len)) { ODP_ERR("RX: frame too big %" PRIu16 " %zu!\n", len, - pktio_entry->ops_data(netmap).max_frame_len); + pkt_nm->max_frame_len); goto fail; } @@ -740,7 +746,7 @@ static int netmap_recv(pktio_entry_t *pktio_entry, int index, { struct nm_desc *desc; pktio_ops_netmap_data_t *pkt_nm = - &pktio_entry->ops_data(netmap); + odp_ops_data(pktio_entry, netmap); unsigned first_desc_id = pkt_nm->rx_desc_ring[index].s.first; unsigned last_desc_id = pkt_nm->rx_desc_ring[index].s.last; unsigned desc_id; @@ -794,7 +800,7 @@ static int netmap_send(pktio_entry_t *pktio_entry, int index, const odp_packet_t pkt_table[], int num) { pktio_ops_netmap_data_t *pkt_nm = - &pktio_entry->ops_data(netmap); + odp_ops_data(pktio_entry, netmap); struct pollfd polld; struct nm_desc *desc; struct netmap_ring *ring; @@ -869,76 +875,92 @@ static int netmap_send(pktio_entry_t *pktio_entry, int index, static int netmap_mac_addr_get(pktio_entry_t *pktio_entry, void *mac_addr) { - memcpy(mac_addr, pktio_entry->ops_data(netmap).if_mac, ETH_ALEN); + pktio_ops_netmap_data_t *pkt_nm = + odp_ops_data(pktio_entry, netmap); + + memcpy(mac_addr, pkt_nm->if_mac, ETH_ALEN); return ETH_ALEN; } static uint32_t netmap_mtu_get(pktio_entry_t *pktio_entry) { - return pktio_entry->ops_data(netmap).mtu; + pktio_ops_netmap_data_t *pkt_nm = + odp_ops_data(pktio_entry, netmap); + + return pkt_nm->mtu; } static int netmap_promisc_mode_set(pktio_entry_t *pktio_entry, odp_bool_t enable) { - if (pktio_entry->ops_data(netmap).is_virtual) { + pktio_ops_netmap_data_t *pkt_nm = + odp_ops_data(pktio_entry, netmap); + + if (pkt_nm->is_virtual) { __odp_errno = ENOTSUP; return -1; } - return promisc_mode_set_fd( - pktio_entry->ops_data(netmap).sockfd, - pktio_entry->ops_data(netmap).if_name, enable); + return promisc_mode_set_fd(pkt_nm->sockfd, pkt_nm->if_name, enable); } static int netmap_promisc_mode_get(pktio_entry_t *pktio_entry) { - if (pktio_entry->ops_data(netmap).is_virtual) + pktio_ops_netmap_data_t *pkt_nm = + odp_ops_data(pktio_entry, netmap); + + if (pkt_nm->is_virtual) return 0; - return promisc_mode_get_fd( - pktio_entry->ops_data(netmap).sockfd, - pktio_entry->ops_data(netmap).if_name); + return promisc_mode_get_fd(pkt_nm->sockfd, pkt_nm->if_name); } static int netmap_capability(pktio_entry_t *pktio_entry, odp_pktio_capability_t *capa) { - *capa = pktio_entry->ops_data(netmap).capa; + pktio_ops_netmap_data_t *pkt_nm = + odp_ops_data(pktio_entry, netmap); + + *capa = pkt_nm->capa; return 0; } static int netmap_stats(pktio_entry_t *pktio_entry, odp_pktio_stats_t *stats) { + pktio_ops_netmap_data_t *pkt_nm = + odp_ops_data(pktio_entry, netmap); + if (pktio_entry->s.stats_type == STATS_UNSUPPORTED) { memset(stats, 0, sizeof(*stats)); return 0; } return sock_stats_fd(pktio_entry, - stats, - pktio_entry->ops_data(netmap).sockfd); + stats, pkt_nm->sockfd); } static int netmap_stats_reset(pktio_entry_t *pktio_entry) { + pktio_ops_netmap_data_t *pkt_nm = + odp_ops_data(pktio_entry, netmap); + if (pktio_entry->s.stats_type == STATS_UNSUPPORTED) { memset(&pktio_entry->s.stats, 0, sizeof(odp_pktio_stats_t)); return 0; } - return sock_stats_reset_fd(pktio_entry, - pktio_entry->ops_data(netmap).sockfd); + return sock_stats_reset_fd(pktio_entry, pkt_nm->sockfd); } static void netmap_print(pktio_entry_t *pktio_entry) { odp_pktin_hash_proto_t hash_proto; + pktio_ops_netmap_data_t *pkt_nm = + odp_ops_data(pktio_entry, netmap); - if (rss_conf_get_fd(pktio_entry->ops_data(netmap).sockfd, - pktio_entry->ops_data(netmap).if_name, &hash_proto)) + if (rss_conf_get_fd(pkt_nm->sockfd, pkt_nm->if_name, &hash_proto)) rss_conf_print(&hash_proto); } commit d28b2ec4a1f6e1cdfd6b5edc937922b7e75a959c Author: Bogdan Pricope <bogdan.pricope(a)linaro.org> Date: Fri Sep 22 14:27:20 2017 +0300 linux-gen: pktio: ipc: use generic pktio_ops data storage Signed-off-by: Bogdan Pricope <bogdan.pricope(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Yi He <yi.he(a)linaro.org> diff --git a/platform/linux-generic/include/odp_pktio_ops_subsystem.h b/platform/linux-generic/include/odp_pktio_ops_subsystem.h index 56b7a5fc..411d961a 100644 --- a/platform/linux-generic/include/odp_pktio_ops_subsystem.h +++ b/platform/linux-generic/include/odp_pktio_ops_subsystem.h @@ -81,7 +81,6 @@ typedef ODP_MODULE_CLASS(pktio_ops) { } pktio_ops_module_t; /* All implementations of this subsystem */ -#include <odp_pktio_ops_ipc.h> #include <odp_pktio_ops_netmap.h> #include <odp_pktio_ops_pcap.h> @@ -90,7 +89,6 @@ typedef ODP_MODULE_CLASS(pktio_ops) { */ typedef union { void *dpdk; - pktio_ops_ipc_data_t ipc; pktio_ops_netmap_data_t netmap; pktio_ops_pcap_data_t pcap; } pktio_ops_data_t; diff --git a/platform/linux-generic/pktio/ipc.c b/platform/linux-generic/pktio/ipc.c index 6e3fdfdb..6505d787 100644 --- a/platform/linux-generic/pktio/ipc.c +++ b/platform/linux-generic/pktio/ipc.c @@ -11,10 +11,12 @@ #include <odp/api/system_info.h> #include <odp_shm_internal.h> #include <_ishm_internal.h> +#include <odp_pktio_ops_ipc.h> #include <sys/mman.h> #include <sys/stat.h> #include <fcntl.h> +#include <linux/if_ether.h> #define IPC_ODP_DEBUG_PRINT 0 @@ -45,7 +47,8 @@ static const char *_ipc_odp_buffer_pool_shm_name(odp_pool_t pool_hdl) static int _ipc_master_start(pktio_entry_t *pktio_entry) { - struct pktio_info *pinfo = pktio_entry->ops_data(ipc).pinfo; + pktio_ops_ipc_data_t *pkt_ipc = odp_ops_data(pktio_entry, ipc); + struct pktio_info *pinfo = pkt_ipc->pinfo; odp_shm_t shm; if (pinfo->slave.init_done == 0) @@ -59,11 +62,11 @@ static int _ipc_master_start(pktio_entry_t *pktio_entry) return -1; } - pktio_entry->ops_data(ipc).remote_pool_shm = shm; - pktio_entry->ops_data(ipc).pool_base = odp_shm_addr(shm); - pktio_entry->ops_data(ipc).pool_mdata_base = (char *)odp_shm_addr(shm); + pkt_ipc->remote_pool_shm = shm; + pkt_ipc->pool_base = odp_shm_addr(shm); + pkt_ipc->pool_mdata_base = (char *)odp_shm_addr(shm); - odp_atomic_store_u32(&pktio_entry->ops_data(ipc).ready, 1); + odp_atomic_store_u32(&pkt_ipc->ready, 1); IPC_ODP_DBG("%s started.\n", pktio_entry->s.name); return 0; @@ -73,6 +76,7 @@ static int _ipc_init_master(pktio_entry_t *pktio_entry, const char *dev, odp_pool_t pool_hdl) { + pktio_ops_ipc_data_t *pkt_ipc = odp_ops_data(pktio_entry, ipc); char ipc_shm_name[ODP_POOL_NAME_LEN + sizeof("_m_prod")]; pool_t *pool; struct pktio_info *pinfo; @@ -90,62 +94,62 @@ static int _ipc_init_master(pktio_entry_t *pktio_entry, * to be processed packets ring. */ snprintf(ipc_shm_name, sizeof(ipc_shm_name), "%s_m_prod", dev); - pktio_entry->ops_data(ipc).tx.send = _ring_create(ipc_shm_name, + pkt_ipc->tx.send = _ring_create(ipc_shm_name, PKTIO_IPC_ENTRIES, _RING_SHM_PROC | _RING_NO_LIST); - if (!pktio_entry->ops_data(ipc).tx.send) { + if (!pkt_ipc->tx.send) { ODP_ERR("pid %d unable to create ipc ring %s name\n", getpid(), ipc_shm_name); return -1; } ODP_DBG("Created IPC ring: %s, count %d, free %d\n", - ipc_shm_name, _ring_count(pktio_entry->ops_data(ipc).tx.send), - _ring_free_count(pktio_entry->ops_data(ipc).tx.send)); + ipc_shm_name, _ring_count(pkt_ipc->tx.send), + _ring_free_count(pkt_ipc->tx.send)); /* generate name in shm like ipc_pktio_p for * already processed packets */ snprintf(ipc_shm_name, sizeof(ipc_shm_name), "%s_m_cons", dev); - pktio_entry->ops_data(ipc).tx.free = _ring_create(ipc_shm_name, + pkt_ipc->tx.free = _ring_create(ipc_shm_name, PKTIO_IPC_ENTRIES, _RING_SHM_PROC | _RING_NO_LIST); - if (!pktio_entry->ops_data(ipc).tx.free) { + if (!pkt_ipc->tx.free) { ODP_ERR("pid %d unable to create ipc ring %s name\n", getpid(), ipc_shm_name); goto free_m_prod; } ODP_DBG("Created IPC ring: %s, count %d, free %d\n", - ipc_shm_name, _ring_count(pktio_entry->ops_data(ipc).tx.free), - _ring_free_count(pktio_entry->ops_data(ipc).tx.free)); + ipc_shm_name, _ring_count(pkt_ipc->tx.free), + _ring_free_count(pkt_ipc->tx.free)); snprintf(ipc_shm_name, sizeof(ipc_shm_name), "%s_s_prod", dev); - pktio_entry->ops_data(ipc).rx.recv = _ring_create(ipc_shm_name, + pkt_ipc->rx.recv = _ring_create(ipc_shm_name, PKTIO_IPC_ENTRIES, _RING_SHM_PROC | _RING_NO_LIST); - if (!pktio_entry->ops_data(ipc).rx.recv) { + if (!pkt_ipc->rx.recv) { ODP_ERR("pid %d unable to create ipc ring %s name\n", getpid(), ipc_shm_name); goto free_m_cons; } ODP_DBG("Created IPC ring: %s, count %d, free %d\n", - ipc_shm_name, _ring_count(pktio_entry->ops_data(ipc).rx.recv), - _ring_free_count(pktio_entry->ops_data(ipc).rx.recv)); + ipc_shm_name, _ring_count(pkt_ipc->rx.recv), + _ring_free_count(pkt_ipc->rx.recv)); snprintf(ipc_shm_name, sizeof(ipc_shm_name), "%s_s_cons", dev); - pktio_entry->ops_data(ipc).rx.free = _ring_create(ipc_shm_name, + pkt_ipc->rx.free = _ring_create(ipc_shm_name, PKTIO_IPC_ENTRIES, _RING_SHM_PROC | _RING_NO_LIST); - if (!pktio_entry->ops_data(ipc).rx.free) { + if (!pkt_ipc->rx.free) { ODP_ERR("pid %d unable to create ipc ring %s name\n", getpid(), ipc_shm_name); goto free_s_prod; } ODP_DBG("Created IPC ring: %s, count %d, free %d\n", - ipc_shm_name, _ring_count(pktio_entry->ops_data(ipc).rx.free), - _ring_free_count(pktio_entry->ops_data(ipc).rx.free)); + ipc_shm_name, _ring_count(pkt_ipc->rx.free), + _ring_free_count(pkt_ipc->rx.free)); /* Set up pool name for remote info */ - pinfo = pktio_entry->ops_data(ipc).pinfo; + pinfo = pkt_ipc->pinfo; pool_name = _ipc_odp_buffer_pool_shm_name(pool_hdl); if (strlen(pool_name) > ODP_POOL_NAME_LEN) { ODP_ERR("pid %d ipc pool name %s is too big %d\n", @@ -158,7 +162,7 @@ static int _ipc_init_master(pktio_entry_t *pktio_entry, pinfo->slave.pid = 0; pinfo->slave.init_done = 0; - pktio_entry->ops_data(ipc).pool = pool_hdl; + pkt_ipc->pool = pool_hdl; ODP_DBG("Pre init... DONE.\n"); pinfo->master.init_done = 1; @@ -224,15 +228,18 @@ static int _ipc_init_slave(const char *dev, pktio_entry_t *pktio_entry, odp_pool_t pool) { + pktio_ops_ipc_data_t *pkt_ipc = odp_ops_data(pktio_entry, ipc); + if (strlen(dev) > (ODP_POOL_NAME_LEN - sizeof("_slave_r"))) ODP_ABORT("too big ipc name\n"); - pktio_entry->ops_data(ipc).pool = pool; + pkt_ipc->pool = pool; return 0; } static int _ipc_slave_start(pktio_entry_t *pktio_entry) { + pktio_ops_ipc_data_t *pkt_ipc = odp_ops_data(pktio_entry, ipc); char ipc_shm_name[ODP_POOL_NAME_LEN + sizeof("_slave_r")]; struct pktio_info *pinfo; odp_shm_t shm; @@ -248,61 +255,61 @@ static int _ipc_slave_start(pktio_entry_t *pktio_entry) sprintf(dev, "ipc:%s", tail); snprintf(ipc_shm_name, sizeof(ipc_shm_name), "%s_m_prod", dev); - pktio_entry->ops_data(ipc).rx.recv = _ipc_shm_map(ipc_shm_name, pid); - if (!pktio_entry->ops_data(ipc).rx.recv) { + pkt_ipc->rx.recv = _ipc_shm_map(ipc_shm_name, pid); + if (!pkt_ipc->rx.recv) { ODP_DBG("pid %d unable to find ipc ring %s name\n", getpid(), dev); sleep(1); return -1; } ODP_DBG("Connected IPC ring: %s, count %d, free %d\n", - ipc_shm_name, _ring_count(pktio_entry->ops_data(ipc).rx.recv), - _ring_free_count(pktio_entry->ops_data(ipc).rx.recv)); + ipc_shm_name, _ring_count(pkt_ipc->rx.recv), + _ring_free_count(pkt_ipc->rx.recv)); snprintf(ipc_shm_name, sizeof(ipc_shm_name), "%s_m_cons", dev); - pktio_entry->ops_data(ipc).rx.free = _ipc_shm_map(ipc_shm_name, pid); - if (!pktio_entry->ops_data(ipc).rx.free) { + pkt_ipc->rx.free = _ipc_shm_map(ipc_shm_name, pid); + if (!pkt_ipc->rx.free) { ODP_ERR("pid %d unable to find ipc ring %s name\n", getpid(), dev); goto free_m_prod; } ODP_DBG("Connected IPC ring: %s, count %d, free %d\n", - ipc_shm_name, _ring_count(pktio_entry->ops_data(ipc).rx.free), - _ring_free_count(pktio_entry->ops_data(ipc).rx.free)); + ipc_shm_name, _ring_count(pkt_ipc->rx.free), + _ring_free_count(pkt_ipc->rx.free)); snprintf(ipc_shm_name, sizeof(ipc_shm_name), "%s_s_prod", dev); - pktio_entry->ops_data(ipc).tx.send = _ipc_shm_map(ipc_shm_name, pid); - if (!pktio_entry->ops_data(ipc).tx.send) { + pkt_ipc->tx.send = _ipc_shm_map(ipc_shm_name, pid); + if (!pkt_ipc->tx.send) { ODP_ERR("pid %d unable to find ipc ring %s name\n", getpid(), dev); goto free_m_cons; } ODP_DBG("Connected IPC ring: %s, count %d, free %d\n", - ipc_shm_name, _ring_count(pktio_entry->ops_data(ipc).tx.send), - _ring_free_count(pktio_entry->ops_data(ipc).tx.send)); + ipc_shm_name, _ring_count(pkt_ipc->tx.send), + _ring_free_count(pkt_ipc->tx.send)); snprintf(ipc_shm_name, sizeof(ipc_shm_name), "%s_s_cons", dev); - pktio_entry->ops_data(ipc).tx.free = _ipc_shm_map(ipc_shm_name, pid); - if (!pktio_entry->ops_data(ipc).tx.free) { + pkt_ipc->tx.free = _ipc_shm_map(ipc_shm_name, pid); + if (!pkt_ipc->tx.free) { ODP_ERR("pid %d unable to find ipc ring %s name\n", getpid(), dev); goto free_s_prod; } ODP_DBG("Connected IPC ring: %s, count %d, free %d\n", - ipc_shm_name, _ring_count(pktio_entry->ops_data(ipc).tx.free), - _ring_free_count(pktio_entry->ops_data(ipc).tx.free)); + ipc_shm_name, _ring_count(pkt_ipc->tx.free), + _ring_free_count(pkt_ipc->tx.free)); /* Get info about remote pool */ - pinfo = pktio_entry->ops_data(ipc).pinfo; + pinfo = pkt_ipc->pinfo; shm = _ipc_map_remote_pool(pinfo->master.pool_name, pid); - pktio_entry->ops_data(ipc).remote_pool_shm = shm; - pktio_entry->ops_data(ipc).pool_mdata_base = (char *)odp_shm_addr(shm); - pktio_entry->ops_data(ipc).pkt_size = pinfo->master.block_size; + pkt_ipc->remote_pool_shm = shm; + pkt_ipc->pool_mdata_base = (char *)odp_shm_addr(shm); + pkt_ipc->pkt_size = pinfo->master.block_size; - _ipc_export_pool(pinfo, pktio_entry->ops_data(ipc).pool); + _ipc_export_pool(pinfo, pkt_ipc->pool); - odp_atomic_store_u32(&pktio_entry->ops_data(ipc).ready, 1); + odp_atomic_store_u32(&pkt_ipc->ready, 1); pinfo->slave.init_done = 1; ODP_DBG("%s started.\n", pktio_entry->s.name); @@ -334,6 +341,7 @@ static int ipc_pktio_open(odp_pktio_t id ODP_UNUSED, char name[ODP_POOL_NAME_LEN + sizeof("_info")]; char tail[ODP_POOL_NAME_LEN]; odp_shm_t shm; + pktio_ops_ipc_data_t *pkt_ipc = odp_ops_data(pktio_entry, ipc); ODP_STATIC_ASSERT(ODP_POOL_NAME_LEN == _RING_NAMESIZE, "mismatch pool and ring name arrays"); @@ -341,15 +349,15 @@ static int ipc_pktio_open(odp_pktio_t id ODP_UNUSED, if (strncmp(dev, "ipc", 3)) return -1; - odp_atomic_init_u32(&pktio_entry->ops_data(ipc).ready, 0); + odp_atomic_init_u32(&pkt_ipc->ready, 0); - pktio_entry->ops_data(ipc).rx.cache = _ring_create("ipc_rx_cache", + pkt_ipc->rx.cache = _ring_create("ipc_rx_cache", PKTIO_IPC_ENTRIES, _RING_NO_LIST); /* Shared info about remote pktio */ if (sscanf(dev, "ipc:%d:%s", &pid, tail) == 2) { - pktio_entry->ops_data(ipc).type = PKTIO_TYPE_IPC_SLAVE; + pkt_ipc->type = PKTIO_TYPE_IPC_SLAVE; snprintf(name, sizeof(name), "ipc:%s_info", tail); IPC_ODP_DBG("lookup for name %s for pid %d\n", name, pid); @@ -362,12 +370,12 @@ static int ipc_pktio_open(odp_pktio_t id ODP_UNUSED, odp_shm_free(shm); return -1; } - pktio_entry->ops_data(ipc).pinfo = pinfo; - pktio_entry->ops_data(ipc).pinfo_shm = shm; + pkt_ipc->pinfo = pinfo; + pkt_ipc->pinfo_shm = shm; ODP_DBG("process %d is slave\n", getpid()); ret = _ipc_init_slave(name, pktio_entry, pool); } else { - pktio_entry->ops_data(ipc).type = PKTIO_TYPE_IPC_MASTER; + pkt_ipc->type = PKTIO_TYPE_IPC_MASTER; snprintf(name, sizeof(name), "%s_info", dev); shm = odp_shm_reserve(name, sizeof(struct pktio_info), ODP_CACHE_LINE_SIZE, @@ -380,8 +388,8 @@ static int ipc_pktio_open(odp_pktio_t id ODP_UNUSED, pinfo = odp_shm_addr(shm); pinfo->master.init_done = 0; pinfo->master.pool_name[0] = 0; - pktio_entry->ops_data(ipc).pinfo = pinfo; - pktio_entry->ops_data(ipc).pinfo_shm = shm; + pkt_ipc->pinfo = pinfo; + pkt_ipc->pinfo_shm = shm; ODP_DBG("process %d is master\n", getpid()); ret = _ipc_init_master(pktio_entry, dev, pool); } @@ -391,6 +399,7 @@ static int ipc_pktio_open(odp_pktio_t id ODP_UNUSED, static void _ipc_free_ring_packets(pktio_entry_t *pktio_entry, _ring_t *r) { + pktio_ops_ipc_data_t *pkt_ipc = odp_ops_data(pktio_entry, ipc); uintptr_t offsets[PKTIO_IPC_ENTRIES]; int ret; void **rbuf_p; @@ -401,7 +410,7 @@ static void _ipc_free_ring_packets(pktio_entry_t *pktio_entry, _ring_t *r) if (!r) return; - pool = pool_entry_from_hdl(pktio_entry->ops_data(ipc).pool); + pool = pool_entry_from_hdl(pkt_ipc->pool); addr = odp_shm_addr(pool->shm); rbuf_p = (void *)&offsets; @@ -426,6 +435,7 @@ static void _ipc_free_ring_packets(pktio_entry_t *pktio_entry, _ring_t *r) static int ipc_pktio_recv_lockless(pktio_entry_t *pktio_entry, odp_packet_t pkt_table[], int len) { + pktio_ops_ipc_data_t *pkt_ipc = odp_ops_data(pktio_entry, ipc); int pkts = 0; int i; _ring_t *r; @@ -435,16 +445,16 @@ static int ipc_pktio_recv_lockless(pktio_entry_t *pktio_entry, uint32_t ready; int pkts_ring; - ready = odp_atomic_load_u32(&pktio_entry->ops_data(ipc).ready); + ready = odp_atomic_load_u32(&pkt_ipc->ready); if (odp_unlikely(!ready)) { IPC_ODP_DBG("start pktio is missing before usage?\n"); return 0; } - _ipc_free_ring_packets(pktio_entry, pktio_entry->ops_data(ipc).tx.free); + _ipc_free_ring_packets(pktio_entry, pkt_ipc->tx.free); /* rx from cache */ - r = pktio_entry->ops_data(ipc).rx.cache; + r = pkt_ipc->rx.cache; pkts = _ring_mc_dequeue_burst(r, ipcbufs_p, len); if (odp_unlikely(pkts < 0)) ODP_ABORT("internal error dequeue\n"); @@ -452,7 +462,7 @@ static int ipc_pktio_recv_lockless(pktio_entry_t *pktio_entry, /* rx from other app */ if (pkts == 0) { ipcbufs_p = (void *)&offsets[0]; - r = pktio_entry->ops_data(ipc).rx.recv; + r = pkt_ipc->rx.recv; pkts = _ring_mc_dequeue_burst(r, ipcbufs_p, len); if (odp_unlikely(pkts < 0)) ODP_ABORT("internal error dequeue\n"); @@ -470,10 +480,10 @@ static int ipc_pktio_recv_lockless(pktio_entry_t *pktio_entry, uint64_t data_pool_off; void *rmt_data_ptr; - phdr = (void *)((uint8_t *)pktio_entry-> - ops_data(ipc).pool_mdata_base + offsets[i]); + phdr = (void *)((uint8_t *)pkt_ipc->pool_mdata_base + + offsets[i]); - pool = pktio_entry->ops_data(ipc).pool; + pool = pkt_ipc->pool; if (odp_unlikely(pool == ODP_POOL_INVALID)) ODP_ABORT("invalid pool"); @@ -497,12 +507,11 @@ static int ipc_pktio_recv_lockless(pktio_entry_t *pktio_entry, pkt_data = odp_packet_data(pkt); if (odp_unlikely(!pkt_data)) ODP_ABORT("unable to map pkt_data ipc_slave %d\n", - (PKTIO_TYPE_IPC_SLAVE == - pktio_entry->ops_data(ipc).type)); + (PKTIO_TYPE_IPC_SLAVE == pkt_ipc->type)); /* Copy packet data from shared pool to local pool. */ - rmt_data_ptr = (uint8_t *)pktio_entry-> - ops_data(ipc).pool_mdata_base + data_pool_off; + rmt_data_ptr = (uint8_t *)pkt_ipc->pool_mdata_base + + data_pool_off; memcpy(pkt_data, rmt_data_ptr, phdr->frame_len); /* Copy packets L2, L3 parsed offsets and size */ @@ -521,7 +530,7 @@ static int ipc_pktio_recv_lockless(pktio_entry_t *pktio_entry, /* put back to rx ring dequed but not processed packets*/ if (pkts != i) { ipcbufs_p = (void *)&offsets[i]; - r_p = pktio_entry->ops_data(ipc).rx.cache; + r_p = pkt_ipc->rx.cache; pkts_ring = _ring_mp_enqueue_burst(r_p, ipcbufs_p, pkts - i); if (pkts_ring != (pkts - i)) @@ -529,14 +538,13 @@ static int ipc_pktio_recv_lockless(pktio_entry_t *pktio_entry, if (i == 0) return 0; - } /*num of actually received packets*/ pkts = i; /* Now tell other process that we no longer need that buffers.*/ - r_p = pktio_entry->ops_data(ipc).rx.free; + r_p = pkt_ipc->rx.free; repeat: @@ -580,11 +588,12 @@ static int ipc_pktio_recv(pktio_entry_t *pktio_entry, int index ODP_UNUSED, static int ipc_pktio_send_lockless(pktio_entry_t *pktio_entry, const odp_packet_t pkt_table[], int len) { + pktio_ops_ipc_data_t *pkt_ipc = odp_ops_data(pktio_entry, ipc); _ring_t *r; void **rbuf_p; int ret; int i; - uint32_t ready = odp_atomic_load_u32(&pktio_entry->ops_data(ipc).ready); + uint32_t ready = odp_atomic_load_u32(&pkt_ipc->ready); odp_packet_t pkt_table_mapped[len]; /**< Ready to send packet has to be * in memory mapped pool. */ uintptr_t offsets[len]; @@ -592,7 +601,7 @@ static int ipc_pktio_send_lockless(pktio_entry_t *pktio_entry, if (odp_unlikely(!ready)) return 0; - _ipc_free_ring_packets(pktio_entry, pktio_entry->ops_data(ipc).tx.free); + _ipc_free_ring_packets(pktio_entry, pkt_ipc->tx.free); /* Copy packets to shm shared pool if they are in different * pool, or if they are references (we can't share across IPC). @@ -600,7 +609,7 @@ static int ipc_pktio_send_lockless(pktio_entry_t *pktio_entry, for (i = 0; i < len; i++) { odp_packet_t pkt = pkt_table[i]; pool_t *ipc_pool = pool_entry_from_hdl( - pktio_entry->ops_data(ipc).pool); + pkt_ipc->pool); odp_packet_hdr_t *pkt_hdr; pool_t *pool; @@ -611,8 +620,7 @@ static int ipc_pktio_send_lockless(pktio_entry_t *pktio_entry, odp_packet_has_ref(pkt)) { odp_packet_t newpkt; - newpkt = odp_packet_copy( - pkt, pktio_entry->ops_data(ipc).pool); + newpkt = odp_packet_copy(pkt, pkt_ipc->pool); if (newpkt == ODP_PACKET_INVALID) ODP_ABORT("Unable to copy packet\n"); @@ -644,20 +652,17 @@ static int ipc_pktio_send_lockless(pktio_entry_t *pktio_entry, odp_packet_to_u64(pkt), odp_pool_to_u64(pool_hdl), pkt_hdr, pkt_hdr->buf_hdr.ipc_data_offset, offsets[i], odp_shm_addr(pool->shm), - odp_shm_addr(pool_entry_from_hdl(pktio_entry-> - ops_data(ipc).pool)->shm)); + odp_shm_addr(pool_entry_from_hdl( + pkt_ipc->pool)->shm)); } /* Put packets to ring to be processed by other process. */ rbuf_p = (void *)&offsets[0]; - r = pktio_entry->ops_data(ipc).tx.send; + r = pkt_ipc->tx.send; ret = _ring_mp_enqueue_burst(r, rbuf_p, len); if (odp_unlikely(ret < 0)) { ODP_ERR("pid %d odp_ring_mp_enqueue_bulk fail, ipc_slave %d, ret %d\n", - getpid(), - (PKTIO_TYPE_IPC_SLAVE == - pktio_entry->ops_data(ipc).type), - ret); + getpid(), (PKTIO_TYPE_IPC_SLAVE == pkt_ipc->type), ret); ODP_ERR("odp_ring_full: %d, odp_ring_count %d, _ring_free_count %d\n", _ring_full(r), _ring_count(r), _ring_free_count(r)); @@ -696,15 +701,15 @@ static int ipc_mac_addr_get(pktio_entry_t *pktio_entry ODP_UNUSED, static int ipc_start(pktio_entry_t *pktio_entry) { - uint32_t ready = odp_atomic_load_u32( - &pktio_entry->ops_data(ipc).ready); + pktio_ops_ipc_data_t *pkt_ipc = odp_ops_data(pktio_entry, ipc); + uint32_t ready = odp_atomic_load_u32(&pkt_ipc->ready); if (ready) { ODP_ABORT("%s Already started\n", pktio_entry->s.name); return -1; } - if (pktio_entry->ops_data(ipc).type == PKTIO_TYPE_IPC_MASTER) + if (pkt_ipc->type == PKTIO_TYPE_IPC_MASTER) return _ipc_master_start(pktio_entry); else return _ipc_slave_start(pktio_entry); @@ -712,24 +717,23 @@ static int ipc_start(pktio_entry_t *pktio_entry) static int ipc_stop(pktio_entry_t *pktio_entry) { + pktio_ops_ipc_data_t *pkt_ipc = odp_ops_data(pktio_entry, ipc); unsigned tx_send = 0, tx_free = 0; - odp_atomic_store_u32(&pktio_entry->ops_data(ipc).ready, 0); + odp_atomic_store_u32(&pkt_ipc->ready, 0); - if (pktio_entry->ops_data(ipc).tx.send) - _ipc_free_ring_packets(pktio_entry, - pktio_entry->ops_data(ipc).tx.send); + if (pkt_ipc->tx.send) + _ipc_free_ring_packets(pktio_entry, pkt_ipc->tx.send); /* other process can transfer packets from one ring to * other, use delay here to free that packets. */ sleep(1); - if (pktio_entry->ops_data(ipc).tx.free) - _ipc_free_ring_packets(pktio_entry, - pktio_entry->ops_data(ipc).tx.free); - - if (pktio_entry->ops_data(ipc).tx.send) - tx_send = _ring_count(pktio_entry->ops_data(ipc).tx.send); - if (pktio_entry->ops_data(ipc).tx.free) - tx_free = _ring_count(pktio_entry->ops_data(ipc).tx.free); + if (pkt_ipc->tx.free) + _ipc_free_ring_packets(pktio_entry, pkt_ipc->tx.free); + + if (pkt_ipc->tx.send) + tx_send = _ring_count(pkt_ipc->tx.send); + if (pkt_ipc->tx.free) + tx_free = _ring_count(pkt_ipc->tx.free); if (tx_send | tx_free) { ODP_DBG("IPC rings: tx send %d tx free %d\n", tx_send, tx_free); @@ -740,6 +744,7 @@ static int ipc_stop(pktio_entry_t *pktio_entry) static int ipc_close(pktio_entry_t *pktio_entry) { + pktio_ops_ipc_data_t *pkt_ipc = odp_ops_data(pktio_entry, ipc); char ipc_shm_name[ODP_POOL_NAME_LEN + sizeof("_m_prod")]; char *dev = pktio_entry->s.name; char name[ODP_POOL_NAME_LEN]; @@ -748,7 +753,7 @@ static int ipc_close(pktio_entry_t *pktio_entry) ipc_stop(pktio_entry); - odp_shm_free(pktio_entry->ops_data(ipc).remote_pool_shm); + odp_shm_free(pkt_ipc->remote_pool_shm); if (sscanf(dev, "ipc:%d:%s", &pid, tail) == 2) snprintf(name, sizeof(name), "ipc:%s", tail); @@ -756,7 +761,7 @@ static int ipc_close(pktio_entry_t *pktio_entry) snprintf(name, sizeof(name), "%s", dev); /* unlink this pktio info for both master and slave */ - odp_shm_free(pktio_entry->ops_data(ipc).pinfo_shm); + odp_shm_free(pkt_ipc->pinfo_shm); /* destroy rings */ snprintf(ipc_shm_name, sizeof(ipc_shm_name), "%s_s_cons", name); commit fe76b3533fe42b1138eb0a1cfc99b2c9fd3e7004 Author: Bogdan Pricope <bogdan.pricope(a)linaro.org> Date: Fri Sep 22 13:45:23 2017 +0300 linux-gen: pktio: tap: use generic pktio_ops data storage Signed-off-by: Bogdan Pricope <bogdan.pricope(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Yi He <yi.he(a)linaro.org> diff --git a/platform/linux-generic/include/odp_pktio_ops_subsystem.h b/platform/linux-generic/include/odp_pktio_ops_subsystem.h index d945a5cc..56b7a5fc 100644 --- a/platform/linux-generic/include/odp_pktio_ops_subsystem.h +++ b/platform/linux-generic/include/odp_pktio_ops_subsystem.h @@ -84,7 +84,6 @@ typedef ODP_MODULE_CLASS(pktio_ops) { #include <odp_pktio_ops_ipc.h> #include <odp_pktio_ops_netmap.h> #include <odp_pktio_ops_pcap.h> -#include <odp_pktio_ops_tap.h> /* Per implementation private data * TODO: refactory each implementation to hide it internally @@ -94,7 +93,6 @@ typedef union { pktio_ops_ipc_data_t ipc; pktio_ops_netmap_data_t netmap; pktio_ops_pcap_data_t pcap; - pktio_ops_tap_data_t tap; } pktio_ops_data_t; /* Extract pktio ops data from pktio entry structure */ diff --git a/platform/linux-generic/include/odp_pktio_ops_tap.h b/platform/linux-generic/include/odp_pktio_ops_tap.h index e8e2e270..d9ce8e71 100644 --- a/platform/linux-generic/include/odp_pktio_ops_tap.h +++ b/platform/linux-generic/include/odp_pktio_ops_tap.h @@ -7,6 +7,7 @@ #ifndef ODP_PACKET_OPS_TAP_H_ #define ODP_PACKET_OPS_TAP_H_ +#include <linux/if_ether.h> #include <odp/api/pool.h> typedef struct { diff --git a/platform/linux-generic/pktio/tap.c b/platform/linux-generic/pktio/tap.c index 6cef64f1..e256eec3 100644 --- a/platform/linux-generic/pktio/tap.c +++ b/platform/linux-generic/pktio/tap.c @@ -45,6 +45,7 @@ #include <odp_packet_internal.h> #include <odp_packet_io_internal.h> #include <odp_classification_internal.h> +#include <odp_pktio_ops_tap.h> #include <pktio/common.h> #define BUF_SIZE 65536 @@ -66,7 +67,7 @@ static int tap_pktio_open(odp_pktio_t id ODP_UNUSED, int fd, skfd, flags; uint32_t mtu; struct ifreq ifr; - pktio_ops_tap_data_t *tap = &pktio_entry->ops_data(tap); + pktio_ops_tap_data_t *tap = odp_ops_data(pktio_entry, tap); if (strncmp(devname, "tap:", 4) != 0) return -1; @@ -166,7 +167,7 @@ tap_err: static int tap_pktio_close(pktio_entry_t *pktio_entry) { int ret = 0; - pktio_ops_tap_data_t *tap = &pktio_entry->ops_data(tap); + pktio_ops_tap_data_t *tap = odp_ops_data(pktio_entry, tap); if (tap->fd != -1 && close(tap->fd) != 0) { __odp_errno = errno; @@ -186,6 +187,7 @@ static int tap_pktio_close(pktio_entry_t *pktio_entry) static odp_packet_t pack_odp_pkt(pktio_entry_t *pktio_entry, const void *data, unsigned int len, odp_time_t *ts) { + pktio_ops_tap_data_t *tap = odp_ops_data(pktio_entry, tap); odp_packet_t pkt; odp_packet_hdr_t *pkt_hdr; odp_packet_hdr_t parsed_hdr; @@ -193,13 +195,12 @@ static odp_packet_t pack_odp_pkt(pktio_entry_t *pktio_entry, const void *data, if (pktio_cls_enabled(pktio_entry)) { if (cls_classify_packet(pktio_entry, data, len, len, - &pktio_entry->ops_data(tap).pool, - &parsed_hdr)) { + &tap->pool, &parsed_hdr)) { return ODP_PACKET_INVALID; } } - num = packet_alloc_multi(pktio_entry->ops_data(tap).pool, len, &pkt, 1); + num = packet_alloc_multi(tap->pool, len, &pkt, 1); if (num != 1) return ODP_PACKET_INVALID; @@ -230,7 +231,7 @@ static int tap_pktio_recv(pktio_entry_t *pktio_entry, int index ODP_UNUSED, ssize_t retval; int i; uint8_t buf[BUF_SIZE]; - pktio_ops_tap_data_t *tap = &pktio_entry->ops_data(tap); + pktio_ops_tap_data_t *tap = odp_ops_data(pktio_entry, tap); odp_time_t ts_val; odp_time_t *ts = NULL; @@ -270,7 +271,7 @@ static int tap_pktio_send_lockless(pktio_entry_t *pktio_entry, int i, n; uint32_t pkt_len; uint8_t buf[BUF_SIZE]; - pktio_ops_tap_data_t *tap = &pktio_entry->ops_data(tap); + pktio_ops_tap_data_t *tap = odp_ops_data(pktio_entry, tap); for (i = 0; i < len; i++) { pkt_len = odp_packet_len(pkts[i]); @@ -332,11 +333,11 @@ static int tap_pktio_send(pktio_entry_t *pktio_entry, int index ODP_UNUSED, static uint32_t tap_mtu_get(pktio_entry_t *pktio_entry) { uint32_t ret; + pktio_ops_tap_data_t *tap = odp_ops_data(pktio_entry, tap); - ret = mtu_get_fd(pktio_entry->ops_data(tap).skfd, - pktio_entry->s.name + 4); + ret = mtu_get_fd(tap->skfd, pktio_entry->s.name + 4); if (ret > 0) - pktio_entry->ops_data(tap).mtu = ret; + tap->mtu = ret; return ret; } @@ -344,19 +345,24 @@ static uint32_t tap_mtu_get(pktio_entry_t *pktio_entry) static int tap_promisc_mode_set(pktio_entry_t *pktio_entry, odp_bool_t enable) { - return promisc_mode_set_fd(pktio_entry->ops_data(tap).skfd, + pktio_ops_tap_data_t *tap = odp_ops_data(pktio_entry, tap); + + return promisc_mode_set_fd(tap->skfd, pktio_entry->s.name + 4, enable); } static int tap_promisc_mode_get(pktio_entry_t *pktio_entry) { - return promisc_mode_get_fd(pktio_entry->ops_data(tap).skfd, - pktio_entry->s.name + 4); + pktio_ops_tap_data_t *tap = odp_ops_data(pktio_entry, tap); + + return promisc_mode_get_fd(tap->skfd, pktio_entry->s.name + 4); } static int tap_mac_addr_get(pktio_entry_t *pktio_entry, void *mac_addr) { - memcpy(mac_addr, pktio_entry->ops_data(tap).if_mac, ETH_ALEN); + pktio_ops_tap_data_t *tap = odp_ops_data(pktio_entry, tap); + + memcpy(mac_addr, tap->if_mac, ETH_ALEN); return ETH_ALEN; } commit c621d709f9b14af2a335b9c84f2be50b4a54e2b1 Author: Bogdan Pricope <bogdan.pricope(a)linaro.org> Date: Fri Sep 22 11:28:19 2017 +0300 linux-gen: pktio: socket: use generic pktio_ops data storage Signed-off-by: Bogdan Pricope <bogdan.pricope(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Yi He <yi.he(a)linaro.org> diff --git a/platform/linux-generic/include/odp_pktio_ops_subsystem.h b/platform/linux-generic/include/odp_pktio_ops_subsystem.h index 241ce467..d945a5cc 100644 --- a/platform/linux-generic/include/odp_pktio_ops_subsystem.h +++ b/platform/linux-generic/include/odp_pktio_ops_subsystem.h @@ -84,7 +84,6 @@ typedef ODP_MODULE_CLASS(pktio_ops) { #include <odp_pktio_ops_ipc.h> #include <odp_pktio_ops_netmap.h> #include <odp_pktio_ops_pcap.h> -#include <odp_pktio_ops_socket.h> #include <odp_pktio_ops_tap.h> /* Per implementation private data @@ -95,8 +94,6 @@ typedef union { pktio_ops_ipc_data_t ipc; pktio_ops_netmap_data_t netmap; pktio_ops_pcap_data_t pcap; - pktio_ops_socket_data_t socket; - pktio_ops_socket_mmap_data_t mmap; pktio_ops_tap_data_t tap; } pktio_ops_data_t; diff --git a/platform/linux-generic/pktio/socket.c b/platform/linux-generic/pktio/socket.c index 0a2e268c..238cd67f 100644 --- a/platform/linux-generic/pktio/socket.c +++ b/platform/linux-generic/pktio/socket.c @@ -43,6 +43,7 @@ #include <odp_classification_inlines.h> #include <odp_classification_internal.h> #include <odp/api/hints.h> +#include <odp_pktio_ops_socket.h> #include <pktio/common.h> #include <pktio/ethtool.h> @@ -107,7 +108,7 @@ int sendmmsg(int fd, struct mmsghdr *vmessages, unsigned int vlen, int flags) static int sock_close(pktio_entry_t *pktio_entry) { pktio_ops_socket_data_t *pkt_sock = - &pktio_entry->ops_data(socket); + odp_ops_data(pktio_entry, socket); if (pkt_sock->sockfd != -1 && close(pkt_sock->sockfd) != 0) { __odp_errno = errno; @@ -131,7 +132,7 @@ static int sock_setup_pkt(pktio_entry_t *pktio_entry, const char *netdev, struct sockaddr_ll sa_ll; char shm_name[ODP_SHM_NAME_LEN]; pktio_ops_socket_data_t *pkt_sock = - &pktio_entry->ops_data(socket); + odp_ops_data(pktio_entry, socket); odp_pktio_stats_t cur_stats; /* Init pktio entry */ @@ -256,7 +257,7 @@ static int sock_mmsg_recv(pktio_entry_t *pktio_entry, int index ODP_UNUSED, odp_packet_t pkt_table[], int len) { pktio_ops_socket_data_t *pkt_sock = - &pktio_entry->ops_data(socket); + odp_ops_data(pktio_entry, socket); odp_pool_t pool = pkt_sock->pool; odp_time_t ts_val; odp_time_t *ts = NULL; @@ -372,7 +373,7 @@ static int sock_mmsg_send(pktio_entry_t *pktio_entry, int index ODP_UNUSED, const odp_packet_t pkt_table[], int len) { pktio_ops_socket_data_t *pkt_sock = - &pktio_entry->ops_data(socket); + odp_ops_data(pktio_entry, socket); struct mmsghdr msgvec[len]; struct iovec iovecs[len][MAX_SEGS]; int ret; @@ -418,7 +419,10 @@ static int sock_mmsg_send(pktio_entry_t *pktio_entry, int index ODP_UNUSED, */ static uint32_t sock_mtu_get(pktio_entry_t *pktio_entry) { - return pktio_entry->ops_data(socket).mtu; + pktio_ops_socket_data_t *pkt_sock = + odp_ops_data(pktio_entry, socket); + + return pkt_sock->mtu; } /* @@ -427,7 +431,10 @@ static uint32_t sock_mtu_get(pktio_entry_t *pktio_entry) static int sock_mac_addr_get(pktio_entry_t *pktio_entry, void *mac_addr) { - memcpy(mac_addr, pktio_entry->ops_data(socket).if_mac, ETH_ALEN); + pktio_ops_socket_data_t *pkt_sock = + odp_ops_data(pktio_entry, socket); + + memcpy(mac_addr, pkt_sock->if_mac, ETH_ALEN); return ETH_ALEN; } @@ -437,7 +444,10 @@ static int sock_mac_addr_get(pktio_entry_t *pktio_entry, static int sock_promisc_mode_set(pktio_entry_t *pktio_entry, odp_bool_t enable) { - return promisc_mode_set_fd(pktio_entry->ops_data(socket).sockfd, + pktio_ops_socket_data_t *pkt_sock = + odp_ops_data(pktio_entry, socket); + + return promisc_mode_set_fd(pkt_sock->sockfd, pktio_entry->s.name, enable); } @@ -446,13 +456,19 @@ static int sock_promisc_mode_set(pktio_entry_t *pktio_entry, */ static int sock_promisc_mode_get(pktio_entry_t *pktio_entry) { - return promisc_mode_get_fd(pktio_entry->ops_data(socket).sockfd, + pktio_ops_socket_data_t *pkt_sock = + odp_ops_data(pktio_entry, socket); + + return promisc_mode_get_fd(pkt_sock->sockfd, pktio_entry->s.name); } static int sock_link_status(pktio_entry_t *pktio_entry) { - return link_status_fd(pktio_entry->ops_data(socket).sockfd, + pktio_ops_socket_data_t *pkt_sock = + odp_ops_data(pktio_entry, socket); + + return link_status_fd(pkt_sock->sockfd, pktio_entry->s.name); } @@ -474,26 +490,29 @@ static int sock_capability(pktio_entry_t *pktio_entry ODP_UNUSED, static int sock_stats(pktio_entry_t *pktio_entry, odp_pktio_stats_t *stats) { + pktio_ops_socket_data_t *pkt_sock = + odp_ops_data(pktio_entry, socket); + if (pktio_entry->s.stats_type == STATS_UNSUPPORTED) { memset(stats, 0, sizeof(*stats)); return 0; } - return sock_stats_fd(pktio_entry, - stats, - pktio_entry->ops_data(socket).sockfd); + return sock_stats_fd(pktio_entry, stats, pkt_sock->sockfd); } static int sock_stats_reset(pktio_entry_t *pktio_entry) { + pktio_ops_socket_data_t *pkt_sock = + odp_ops_data(pktio_entry, socket); + if (pktio_entry->s.stats_type == STATS_UNSUPPORTED) { memset(&pktio_entry->s.stats, 0, sizeof(odp_pktio_stats_t)); return 0; } - return sock_stats_reset_fd(pktio_entry, - pktio_entry->ops_data(socket).sockfd); + return sock_stats_reset_fd(pktio_entry, pkt_sock->sockfd); } static int sock_init_global(void) diff --git a/platform/linux-generic/pktio/socket_mmap.c b/platform/linux-generic/pktio/socket_mmap.c index 1605b7ff..3b62979d 100644 --- a/platform/linux-generic/pktio/socket_mmap.c +++ b/platform/linux-generic/pktio/socket_mmap.c @@ -32,6 +32,7 @@ #include <odp_classification_inlines.h> #include <odp_classification_internal.h> #include <odp/api/hints.h> +#include <odp_pktio_ops_socket.h> #include <pktio/common.h> #include <pktio/ethtool.h> @@ -491,7 +492,7 @@ static int mmap_bind_sock(pktio_ops_socket_mmap_data_t *pkt_sock, static int sock_mmap_close(pktio_entry_t *entry) { pktio_ops_socket_mmap_data_t - *const pkt_sock = &entry->ops_data(mmap); + *const pkt_sock = odp_ops_data(entry, socket_mmap); int ret; ret = mmap_unmap_sock(pkt_sock); @@ -521,7 +522,7 @@ static int sock_mmap_open(odp_pktio_t id ODP_UNUSED, return -1; pktio_ops_socket_mmap_data_t - *const pkt_sock = &pktio_entry->ops_data(mmap); + *const pkt_sock = odp_ops_data(pktio_entry, socket_mmap); int fanout = 1; /* Init pktio entry */ @@ -607,7 +608,7 @@ static int sock_mmap_recv(pktio_entry_t *pktio_entry, int index ODP_UNUSED, odp_packet_t pkt_table[], int len) { pktio_ops_socket_mmap_data_t - *const pkt_sock = &pktio_entry->ops_data(mmap); + *const pkt_sock = odp_ops_data(pktio_entry, socket_mmap); int ret; odp_ticketlock_lock(&pktio_entry->s.rxl); @@ -623,7 +624,7 @@ static int sock_mmap_send(pktio_entry_t *pktio_entry, int index ODP_UNUSED, { int ret; pktio_ops_socket_mmap_data_t - *const pkt_sock = &pktio_entry->ops_data(mmap); + *const pkt_sock = odp_ops_data(pktio_entry, socket_mmap); odp_ticketlock_lock(&pktio_entry->s.txl); ret = pkt_mmap_v2_tx(pkt_sock->tx_ring.sock, &pkt_sock->tx_ring, @@ -635,33 +636,46 @@ static int sock_mmap_send(pktio_entry_t *pktio_entry, int index ODP_UNUSED, static uint32_t sock_mmap_mtu_get(pktio_entry_t *pktio_entry) { - return mtu_get_fd(pktio_entry->ops_data(mmap).sockfd, - pktio_entry->s.name); + pktio_ops_socket_mmap_data_t + *const pkt_sock = odp_ops_data(pktio_entry, socket_mmap); + + return mtu_get_fd(pkt_sock->sockfd, pktio_entry->s.name); } static int sock_mmap_mac_addr_get(pktio_entry_t *pktio_entry, void *mac_addr) { - memcpy(mac_addr, pktio_entry->ops_data(mmap).if_mac, ETH_ALEN); + pktio_ops_socket_mmap_data_t + *const pkt_sock = odp_ops_data(pktio_entry, socket_mmap); + + memcpy(mac_addr, pkt_sock->if_mac, ETH_ALEN); return ETH_ALEN; } static int sock_mmap_promisc_mode_set(pktio_entry_t *pktio_entry, odp_bool_t enable) { - return promisc_mode_set_fd(pktio_entry->ops_data(mmap).sockfd, + pktio_ops_socket_mmap_data_t + *const pkt_sock = odp_ops_data(pktio_entry, socket_mmap); + + return promisc_mode_set_fd(pkt_sock->sockfd, pktio_entry->s.name, enable); } static int sock_mmap_promisc_mode_get(pktio_entry_t *pktio_entry) { - return promisc_mode_get_fd(pktio_entry->ops_data(mmap).sockfd, + pktio_ops_socket_mmap_data_t + *const pkt_sock = odp_ops_data(pktio_entry, socket_mmap); + + return promisc_mode_get_fd(pkt_sock->sockfd, pktio_entry->s.name); } static int sock_mmap_link_status(pktio_entry_t *pktio_entry) { - return link_status_fd(pktio_entry->ops_data(mmap).sockfd, - pktio_entry->s.name); + pktio_ops_socket_mmap_data_t + *const pkt_sock = odp_ops_data(pktio_entry, socket_mmap); + + return link_status_fd(pkt_sock->sockfd, pktio_entry->s.name); } static int sock_mmap_capability(pktio_entry_t *pktio_entry ODP_UNUSED, @@ -682,26 +696,30 @@ static int sock_mmap_capability(pktio_entry_t *pktio_entry ODP_UNUSED, static int sock_mmap_stats(pktio_entry_t *pktio_entry, odp_pktio_stats_t *stats) { + pktio_ops_socket_mmap_data_t + *const pkt_sock = odp_ops_data(pktio_entry, socket_mmap); + if (pktio_entry->s.stats_type == STATS_UNSUPPORTED) { memset(stats, 0, sizeof(*stats)); return 0; } return sock_stats_fd(pktio_entry, - stats, - pktio_entry->ops_data(mmap).sockfd); + stats, pkt_sock->sockfd); } static int sock_mmap_stats_reset(pktio_entry_t *pktio_entry) { + pktio_ops_socket_mmap_data_t + *const pkt_sock = odp_ops_data(pktio_entry, socket_mmap); + if (pktio_entry->s.stats_type == STATS_UNSUPPORTED) { memset(&pktio_entry->s.stats, 0, sizeof(odp_pktio_stats_t)); return 0; } - return sock_stats_reset_fd(pktio_entry, - pktio_entry->ops_data(mmap).sockfd); + return sock_stats_reset_fd(pktio_entry, pkt_sock->sockfd); } static int sock_mmap_init_global(void) commit c75e3e7e46ac80dd0b2c1cb98cec19f56ed11014 Author: Bogdan Pricope <bogdan.pricope(a)linaro.org> Date: Fri Sep 22 11:13:40 2017 +0300 linux-gen: pktio: socket: move common code away from socket pktios Signed-off-by: Bogdan Pricope <bogdan.pricope(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Yi He <yi.he(a)linaro.org> diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index d5ddb4db..27741814 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -175,6 +175,8 @@ noinst_HEADERS = \ ${srcdir}/include/odp_packet_internal.h \ ${srcdir}/include/odp_packet_io_internal.h \ ${srcdir}/include/odp_packet_io_ring_internal.h \ + ${srcdir}/pktio/ethtool.h \ + ${srcdir}/pktio/common.h \ ${srcdir}/pktio/dpdk.h \ ${srcdir}/include/odp_pktio_ops_ipc.h \ ${srcdir}/include/odp_pktio_ops_loopback.h \ diff --git a/platform/linux-generic/include/odp_pktio_ops_socket.h b/platform/linux-generic/include/odp_pktio_ops_socket.h index 32c49c08..5ed444df 100644 --- a/platform/linux-generic/include/odp_pktio_ops_socket.h +++ b/platform/linux-generic/include/odp_pktio_ops_socket.h @@ -93,80 +93,4 @@ ethaddrs_equal(unsigned char mac_a[], unsigned char mac_b[]) return !memcmp(mac_a, mac_b, ETH_ALEN); } -/** - * Read the MAC address from a packet socket - */ -int mac_addr_get_fd(int fd, const char *name, unsigned char mac_dst[]); - -/** - * Read the MTU from a packet socket - */ -uint32_t mtu_get_fd(int fd, const char *name); - -/** - * Enable/Disable promisc mode for a packet socket - */ -int promisc_mode_set_fd(int fd, const char *name, int enable); - -/** - * Return promisc mode of a packet socket - */ -int promisc_mode_get_fd(int fd, const char *name); - -/** - * Return link status of a packet socket (up/down) - */ -int link_status_fd(int fd, const char *name); - -/** - * Get enabled RSS hash protocols of a packet socket - * - * @param fd Socket file descriptor - * @param name Interface name - * @param hash_proto[out] Hash protocols - * - * @returns Number enabled hash protocols - */ -int rss_conf_get_fd(int fd, const char *name, - odp_pktin_hash_proto_t *hash_proto); - -/** - * Get supported RSS hash protocols of a packet socket - * - * Can be both read and modified. - * - * @param fd Socket file descriptor - * @param name Interface name - * @param hash_proto[out] Hash protocols - * - * @returns Number of supported hash protocols - */ -int rss_conf_get_supported_fd(int fd, const char *name, - odp_pktin_hash_proto_t *hash_proto); - -/** - * Set RSS hash protocols of a packet socket - * - * @param fd Socket file descriptor - * @param name Interface name - * @param hash_proto Hash protocols - * - * @retval 0 on success - * @retval <0 on failure - */ -int rss_conf_set_fd(int fd, const char *name, - const odp_pktin_hash_proto_t *proto); - -/** - * Print enabled RSS hash protocols - * - * @param hash_proto Hash protocols - */ -void rss_conf_print(const odp_pktin_hash_proto_t *hash_proto); - -/** - * Get ethtool statistics of a packet socket - */ -int ethtool_stats_get_fd(int fd, const char *name, odp_pktio_stats_t *stats); - #endif diff --git a/platform/linux-generic/pktio/common.c b/platform/linux-generic/pktio/common.c index 94add061..4c952e46 100644 --- a/platform/linux-generic/pktio/common.c +++ b/platform/linux-generic/pktio/common.c @@ -9,7 +9,17 @@ #include <odp_packet_io_internal.h> #include <odp_classification_internal.h> +#include <pktio/ethtool.h> +#include <pktio/common.h> #include <errno.h> +#include <sys/ioctl.h> +#include <sys/types.h> +#include <sys/socket.h> +#include <net/if.h> +#include <linux/ethtool.h> +#include <linux/sockios.h> +#include <linux/if_packet.h> +#include <linux/if_ether.h> int sock_stats_reset_fd(pktio_entry_t *pktio_entry, int fd) { @@ -82,3 +92,360 @@ int sock_stats_fd(pktio_entry_t *pktio_entry, return ret; } + +/* + * ODP_PACKET_SOCKET_MMSG: + * ODP_PACKET_SOCKET_MMAP: + * ODP_PACKET_NETMAP: + */ +uint32_t mtu_get_fd(int fd, const char *name) +{ + struct ifreq ifr; + int ret; + + snprintf(ifr.ifr_name, IF_NAMESIZE, "%s", name); + ret = ioctl(fd, SIOCGIFMTU, &ifr); + if (ret < 0) { + __odp_errno = errno; + ODP_DBG("ioctl(SIOCGIFMTU): %s: \"%s\".\n", strerror(errno), + ifr.ifr_name); + return 0; + } + return ifr.ifr_mtu; +} + +/** + * ODP_PACKET_SOCKET_MMSG: + * ODP_PACKET_SOCKET_MMAP: + * ODP_PACKET_NETMAP: + */ +int mac_addr_get_fd(int fd, const char *name, unsigned char mac_dst[]) +{ + struct ifreq ethreq; + int ret; + + memset(&ethreq, 0, sizeof(ethreq)); + snprintf(ethreq.ifr_name, IF_NAMESIZE, "%s", name); + ret = ioctl(fd, SIOCGIFHWADDR, &ethreq); + if (ret != 0) { + __odp_errno = errno; + ODP_ERR("ioctl(SIOCGIFHWADDR): %s: \"%s\".\n", strerror(errno), + ethreq.ifr_name); + return -1; + } + + memcpy(mac_dst, (unsigned char *)ethreq.ifr_ifru.ifru_hwaddr.sa_data, + ETH_ALEN); + return 0; +} + +/* + * ODP_PACKET_SOCKET_MMSG: + * ODP_PACKET_SOCKET_MMAP: + * ODP_PACKET_NETMAP: + */ +int promisc_mode_set_fd(int fd, const char *name, int enable) +{ + struct ifreq ifr; + int ret; + + snprintf(ifr.ifr_name, IF_NAMESIZE, "%s", name); + ret = ioctl(fd, SIOCGIFFLAGS, &ifr); + if (ret < 0) { + __odp_errno = errno; + ODP_DBG("ioctl(SIOCGIFFLAGS): %s: \"%s\".\n", strerror(errno), + ifr.ifr_name); + return -1; + } + + if (enable) + ifr.ifr_flags |= IFF_PROMISC; + else + ifr.ifr_flags &= ~(IFF_PROMISC); + + ret = ioctl(fd, SIOCSIFFLAGS, &ifr); + if (ret < 0) { + __odp_errno = errno; + ODP_DBG("ioctl(SIOCSIFFLAGS): %s: \"%s\".\n", strerror(errno), + ifr.ifr_name); + return -1; + } + return 0; +} + +/* + * ODP_PACKET_SOCKET_MMSG: + * ODP_PACKET_SOCKET_MMAP: + * ODP_PACKET_NETMAP: + */ +int promisc_mode_get_fd(int fd, const char *name) +{ + struct ifreq ifr; + int ret; + + snprintf(ifr.ifr_name, IF_NAMESIZE, "%s", name); + ret = ioctl(fd, SIOCGIFFLAGS, &ifr); + if (ret < 0) { + __odp_errno = errno; + ODP_DBG("ioctl(SIOCGIFFLAGS): %s: \"%s\".\n", strerror(errno), + ifr.ifr_name); + return -1; + } + + return !!(ifr.ifr_flags & IFF_PROMISC); +} + +/* + * ODP_PACKET_SOCKET_MMSG: + * ODP_PACKET_SOCKET_MMAP: + * ODP_PACKET_NETMAP: + */ +int link_status_fd(int fd, const char *name) +{ + struct ifreq ifr; + int ret; + + snprintf(ifr.ifr_name, IF_NAMESIZE, "%s", name); + ret = ioctl(fd, SIOCGIFFLAGS, &ifr); + if (ret < 0) { + __odp_errno = errno; + ODP_DBG("ioctl(SIOCGIFFLAGS): %s: \"%s\".\n", strerror(errno), + ifr.ifr_name); + return -1; + } + + return !!(ifr.ifr_flags & IFF_RUNNING); +} + +/** + * Get enabled hash options of a packet socket + * + * @param fd Socket file descriptor + * @param name Interface name + * @param flow_type Packet flow type + * @param options[out] Enabled hash options + * + * @retval 0 on success + * @retval <0 on failure + */ +static inline int get_rss_hash_options(int fd, const char *name, + uint32_t flow_type, uint64_t *options) +{ + struct ifreq ifr; + struct ethtool_rxnfc rsscmd; + + memset(&ifr, 0, sizeof(ifr)); + memset(&rsscmd, 0, sizeof(rsscmd)); + *options = 0; + + snprintf(ifr.ifr_name, IF_NAMESIZE, "%s", name); + + rsscmd.cmd = ETHTOOL_GRXFH; + rsscmd.flow_type = flow_type; + + ifr.ifr_data = (void *)&rsscmd; + + if (ioctl(fd, SIOCETHTOOL, &ifr) < 0) + return -1; + + *options = rsscmd.data; + return 0; +} + +int rss_conf_get_fd(int fd, const char *name, + odp_pktin_hash_proto_t *hash_proto) +{ + uint64_t options; + int rss_enabled = 0; + + memset(hash_proto, 0, sizeof(odp_pktin_hash_proto_t)); + + get_rss_hash_options(fd, name, IPV4_FLOW, &options); + if ((options & RXH_IP_SRC) && (options & RXH_IP_DST)) { + hash_proto->proto.ipv4 = 1; + rss_enabled++; + } + get_rss_hash_options(fd, name, TCP_V4_FLOW, &options); + if ((options & RXH_IP_SRC) && (options & RXH_IP_DST) && + (options & RXH_L4_B_0_1) && (options & RXH_L4_B_2_3)) { + hash_proto->proto.ipv4_tcp = 1; + rss_enabled++; + } + get_rss_hash_options(fd, name, UDP_V4_FLOW, &options); + if ((options & RXH_IP_SRC) && (options & RXH_IP_DST) && + (options & RXH_L4_B_0_1) && (options & RXH_L4_B_2_3)) { + hash_proto->proto.ipv4_udp = 1; + rss_enabled++; + } + get_rss_hash_options(fd, name, IPV6_FLOW, &options); + if ((options & RXH_IP_SRC) && (options & RXH_IP_DST)) { + hash_proto->proto.ipv6 = 1; + rss_enabled++; + } + get_rss_hash_options(fd, name, TCP_V6_FLOW, &options); + if ((options & RXH_IP_SRC) && (options & RXH_IP_DST) && + (options & RXH_L4_B_0_1) && (options & RXH_L4_B_2_3)) { + hash_proto->proto.ipv6_tcp = 1; + rss_enabled++; + } + get_rss_hash_options(fd, name, UDP_V6_FLOW, &options); + if ((options & RXH_IP_SRC) && (options & RXH_IP_DST) && + (options & RXH_L4_B_0_1) && (options & RXH_L4_B_2_3)) { + hash_proto->proto.ipv6_udp = 1; + rss_enabled++; + } + return rss_enabled; +} + +/** + * Set hash options of a packet socket + * + * @param fd Socket file descriptor + * @param name Interface name + * @param flow_type Packet flow type + * @param options Hash options + * + * @retval 0 on success + * @retval <0 on failure + */ +static inline int set_rss_hash(int fd, const char *name, + uint32_t flow_type, uint64_t options) +{ + struct ifreq ifr; + struct ethtool_rxnfc rsscmd; + + memset(&rsscmd, 0, sizeof(rsscmd)); + + snprintf(ifr.ifr_name, IF_NAMESIZE, "%s", name); + + rsscmd.cmd = ETHTOOL_SRXFH; + rsscmd.flow_type = flow_type; + rsscmd.data = options; + + ifr.ifr_data = (void *)&rsscmd; + + if (ioctl(fd, SIOCETHTOOL, &ifr) < 0) + return -1; + + return 0; +} + +int rss_conf_set_fd(int fd, const char *name, + const odp_pktin_hash_proto_t *hash_proto) +{ + uint64_t options; + odp_pktin_hash_proto_t cur_hash; + + /* Compare to currently set hash protocols */ + rss_conf_get_fd(fd, name, &cur_hash); + + if (hash_proto->proto.ipv4_udp && !cur_hash.proto.ipv4_udp) { + options = RXH_IP_SRC | RXH_IP_DST | RXH_L4_B_0_1 | RXH_L4_B_2_3; + if (set_rss_hash(fd, name, UDP_V4_FLOW, options)) + return -1; + } + if (hash_proto->proto.ipv4_tcp && !cur_hash.proto.ipv4_tcp) { + options = RXH_IP_SRC | RXH_IP_DST | RXH_L4_B_0_1 | RXH_L4_B_2_3; + if (set_rss_hash(fd, name, TCP_V4_FLOW, options)) + return -1; + } + if (hash_proto->proto.ipv6_udp && !cur_hash.proto.ipv6_udp) { + options = RXH_IP_SRC | RXH_IP_DST | RXH_L4_B_0_1 | RXH_L4_B_2_3; + if (set_rss_hash(fd, name, UDP_V6_FLOW, options)) + return -1; + } + if (hash_proto->proto.ipv6_tcp && !cur_hash.proto.ipv6_tcp) { + options = RXH_IP_SRC | RXH_IP_DST | RXH_L4_B_0_1 | RXH_L4_B_2_3; + if (set_rss_hash(fd, name, TCP_V6_FLOW, options)) + return -1; + } + if (hash_proto->proto.ipv4 && !cur_hash.proto.ipv4) { + options = RXH_IP_SRC | RXH_IP_DST; + if (set_rss_hash(fd, name, IPV4_FLOW, options)) + return -1; + } + if (hash_proto->proto.ipv6 && !cur_hash.proto.ipv6) { + options = RXH_IP_SRC | RXH_IP_DST; + if (set_rss_hash(fd, name, IPV6_FLOW, options)) + return -1; + } + return 0; +} + +int rss_conf_get_supported_fd(int fd, const char *name, + odp_pktin_hash_proto_t *hash_proto) +{ + uint64_t options; + int rss_supported = 0; + + memset(hash_proto, 0, sizeof(odp_pktin_hash_proto_t)); + + if (!get_rss_hash_options(fd, name, IPV4_FLOW, &options)) { + if (!set_rss_hash(fd, name, IPV4_FLOW, options)) { + hash_proto->proto.ipv4 = 1; + rss_supported++; + } + } + if (!get_rss_hash_options(fd, name, TCP_V4_FLOW, &options)) { + if (!set_rss_hash(fd, name, TCP_V4_FLOW, options)) { + hash_proto->proto.ipv4_tcp = 1; + rss_supported++; + } + } + if (!get_rss_hash_options(fd, name, UDP_V4_FLOW, &options)) { + if (!set_rss_hash(fd, name, UDP_V4_FLOW, options)) { + hash_proto->proto.ipv4_udp = 1; + rss_supported++; + } + } + if (!get_rss_hash_options(fd, name, IPV6_FLOW, &options)) { + if (!set_rss_hash(fd, name, IPV6_FLOW, options)) { + hash_proto->proto.ipv6 = 1; + rss_supported++; + } + } + if (!get_rss_hash_options(fd, name, TCP_V6_FLOW, &options)) { + if (!set_rss_hash(fd, name, TCP_V6_FLOW, options)) { + hash_proto->proto.ipv6_tcp = 1; + rss_supported++; + } + } + if (!get_rss_hash_options(fd, name, UDP_V6_FLOW, &options)) { + if (!set_rss_hash(fd, name, UDP_V6_FLOW, options)) { + hash_proto->proto.ipv6_udp = 1; + rss_supported++; + } + } + return rss_supported; +} + +void rss_conf_print(const odp_pktin_hash_proto_t *hash_proto) +{ int max_len = 512; + char str[max_len]; + int len = 0; + int n = max_len - 1; + + len += snprintf(&str[len], n - len, " rss conf\n"); + + if (hash_proto->proto.ipv4) + len += snprintf(&str[len], n - len, + " IPV4\n"); + if (hash_proto->proto.ipv4_tcp) + len += snprintf(&str[len], n - len, + " IPV4 TCP\n"); + if (hash_proto->proto.ipv4_udp) + len += snprintf(&str[len], n - len, + " IPV4 UDP\n"); + if (hash_proto->proto.ipv6) + len += snprintf(&str[len], n - len, + " IPV6\n"); + if (hash_proto->proto.ipv6_tcp) + len += snprintf(&str[len], n - len, + " IPV6 TCP\n"); + if (hash_proto->proto.ipv6_udp) + len += snprintf(&str[len], n - len, + " IPV6 UDP\n"); + str[len] = '\0'; + + ODP_PRINT("%s\n", str); +} diff --git a/platform/linux-generic/pktio/common.h b/platform/linux-generic/pktio/common.h new file mode 100644 index 00000000..2940af14 --- /dev/null +++ b/platform/linux-generic/pktio/common.h @@ -0,0 +1,81 @@ +/* Copyright (c) 2016, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#ifndef ODP_PKTIO_COMMON_H_ +#define ODP_PKTIO_COMMON_H_ + +/** + * Read the MTU from a packet socket + */ +uint32_t mtu_get_fd(int fd, const char *name); + +/** + * Read the MAC address from a packet socket + */ +int mac_addr_get_fd(int fd, const char *name, unsigned char mac_dst[]); + +/** + * Enable/Disable promisc mode for a packet socket + */ +int promisc_mode_set_fd(int fd, const char *name, int enable); + +/** + * Return promisc mode of a packet socket + */ +int promisc_mode_get_fd(int fd, const char *name); + +/** + * Return link status of a packet socket (up/down) + */ +int link_status_fd(int fd, const char *name); + +/** + * Get enabled RSS hash protocols of a packet socket + * + * @param fd Socket file descriptor + * @param name Interface name + * @param hash_proto[out] Hash protocols + * + * @returns Number enabled hash protocols + */ +int rss_conf_get_fd(int fd, const char *name, + odp_pktin_hash_proto_t *hash_proto); + +/** + * Get supported RSS hash protocols of a packet socket + * + * Can be both read and modified. + * + * @param fd Socket file descriptor + * @param name Interface name + * @param hash_proto[out] Hash protocols + * + * @returns Number of supported hash protocols + */ +int rss_conf_get_supported_fd(int fd, const char *name, + odp_pktin_hash_proto_t *hash_proto); + +/** + * Set RSS hash protocols of a packet socket + * + * @param fd Socket file descriptor + * @param name Interface name + * @param hash_proto Hash protocols + * + * @retval 0 on success + * @retval <0 on failure + */ +int rss_conf_set_fd(int fd, const char *name, + const odp_pktin_hash_proto_t *proto); + +/** + * Print enabled RSS hash protocols + * + * @param hash_proto Hash protocols + */ +void rss_conf_print(const odp_pktin_hash_proto_t *hash_proto); + +#endif /*ODP_PKTIO_COMMON_H_*/ diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c index c3261522..9337ea33 100644 --- a/platform/linux-generic/pktio/dpdk.c +++ b/platform/linux-generic/pktio/dpdk.c @@ -24,6 +24,7 @@ #include <odp_classification_internal.h> #include <odp_debug_internal.h> +#include <pktio/common.h> #include <pktio/dpdk.h> #include <protocols/eth.h> diff --git a/platform/linux-generic/pktio/ethtool.c b/platform/linux-generic/pktio/ethtool.c index b41ce444..b71666a3 100644 --- a/platform/linux-generic/pktio/ethtool.c +++ b/platform/linux-generic/pktio/ethtool.c @@ -19,6 +19,7 @@ #include <odp_api.h> #include <odp_debug_internal.h> #include <odp_packet_io_internal.h> +#include <pktio/ethtool.h> static struct ethtool_gstrings *get_stringset(int fd, struct ifreq *ifr) { diff --git a/platform/linux-generic/pktio/ethtool.h b/platform/linux-generic/pktio/ethtool.h new file mode 100644 index 00000000..c5a81123 --- /dev/null +++ b/platform/linux-generic/pktio/ethtool.h @@ -0,0 +1,15 @@ +/* Copyright (c) 2016, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#ifndef ODP_PKTIO_ETHTOOL_H_ +#define ODP_PKTIO_ETHTOOL_H_ + +/** + * Get ethtool statistics of a packet socket + */ +int ethtool_stats_get_fd(int fd, const char *name, odp_pktio_stats_t *stats); + +#endif /*ODP_PKTIO_ETHTOOL_H_*/ diff --git a/platform/linux-generic/pktio/netmap.c b/platform/linux-generic/pktio/netmap.c index d4b5636b..215e6454 100644 --- a/platform/linux-generic/pktio/netmap.c +++ b/platform/linux-generic/pktio/netmap.c @@ -24,6 +24,8 @@ #include <odp_classification_datamodel.h> #include <odp_classification_inlines.h> #include <odp_classification_internal.h> +#include <pktio/ethtool.h> +#include <pktio/common.h> #include <inttypes.h> diff --git a/platform/linux-generic/pktio/socket.c b/platform/linux-generic/pktio/socket.c index df277e67..0a2e268c 100644 --- a/platform/linux-generic/pktio/socket.c +++ b/platform/linux-generic/pktio/socket.c @@ -43,6 +43,8 @@ #include <odp_classification_inlines.h> #include <odp_classification_internal.h> #include <odp/api/hints.h> +#include <pktio/common.h> +#include <pktio/ethtool.h> #include <protocols/eth.h> #include <protocols/ip.h> @@ -99,358 +101,6 @@ int sendmmsg(int fd, struct mmsghdr *vmessages, unsigned int vlen, int flags) #define ETHBUF_ALIGN(buf_ptr) ((uint8_t *)ODP_ALIGN_ROUNDUP_PTR((buf_ptr), \ sizeof(uint32_t)) + ETHBUF_OFFSET) -/** - * ODP_PACKET_SOCKET_MMSG: - * ODP_PACKET_SOCKET_MMAP: - * ODP_PACKET_NETMAP: - */ -int mac_addr_get_fd(int fd, const char *name, unsigned char mac_dst[]) -{ - struct ifreq ethreq; - int ret; - - memset(&ethreq, 0, sizeof(ethreq)); - snprintf(ethreq.ifr_name, IF_NAMESIZE, "%s", name); - ret = ioctl(fd, SIOCGIFHWADDR, &ethreq); - if (ret != 0) { - __odp_errno = errno; - ODP_ERR("ioctl(SIOCGIFHWADDR): %s: \"%s\".\n", strerror(errno), - ethreq.ifr_name); - return -1; - } - - memcpy(mac_dst, (unsigned char *)ethreq.ifr_ifru.ifru_hwaddr.sa_data, - ETH_ALEN); - return 0; -} - -/* - * ODP_PACKET_SOCKET_MMSG: - * ODP_PACKET_SOCKET_MMAP: - * ODP_PACKET_NETMAP: - */ -uint32_t mtu_get_fd(int fd, const char *name) -{ - struct ifreq ifr; - int ret; - - snprintf(ifr.ifr_name, IF_NAMESIZE, "%s", name); - ret = ioctl(fd, SIOCGIFMTU, &ifr); - if (ret < 0) { - __odp_errno = errno; - ODP_DBG("ioctl(SIOCGIFMTU): %s: \"%s\".\n", strerror(errno), - ifr.ifr_name); - return 0; - } - return ifr.ifr_mtu; -} - -/* - * ODP_PACKET_SOCKET_MMSG: - * ODP_PACKET_SOCKET_MMAP: - * ODP_PACKET_NETMAP: - */ -int promisc_mode_set_fd(int fd, const char *name, int enable) -{ - struct ifreq ifr; - int ret; - - snprintf(ifr.ifr_name, IF_NAMESIZE, "%s", name); - ret = ioctl(fd, SIOCGIFFLAGS, &ifr); - if (ret < 0) { - __odp_errno = errno; - ODP_DBG("ioctl(SIOCGIFFLAGS): %s: \"%s\".\n", strerror(errno), - ifr.ifr_name); - return -1; - } - - if (enable) - ifr.ifr_flags |= IFF_PROMISC; - else - ifr.ifr_flags &= ~(IFF_PROMISC); - - ret = ioctl(fd, SIOCSIFFLAGS, &ifr); - if (ret < 0) { - __odp_errno = errno; - ODP_DBG("ioctl(SIOCSIFFLAGS): %s: \"%s\".\n", strerror(errno), - ifr.ifr_name); - return -1; - } - return 0; -} - -/* - * ODP_PACKET_SOCKET_MMSG: - * ODP_PACKET_SOCKET_MMAP: - * ODP_PACKET_NETMAP: - */ -int promisc_mode_get_fd(int fd, const char *name) -{ - struct ifreq ifr; - int ret; - - snprintf(ifr.ifr_name, IF_NAMESIZE, "%s", name); - ret = ioctl(fd, SIOCGIFFLAGS, &ifr); - if (ret < 0) { - __odp_errno = errno; - ODP_DBG("ioctl(SIOCGIFFLAGS): %s: \"%s\".\n", strerror(errno), - ifr.ifr_name); - return -1; - } - - return !!(ifr.ifr_flags & IFF_PROMISC); -} - -int link_status_fd(int fd, const char *name) -{ - struct ifreq ifr; - int ret; - - snprintf(ifr.ifr_name, IF_NAMESIZE, "%s", name); - ret = ioctl(fd, SIOCGIFFLAGS, &ifr); - if (ret < 0) { - __odp_errno = errno; - ODP_DBG("ioctl(SIOCGIFFLAGS): %s: \"%s\".\n", strerror(errno), - ifr.ifr_name); - return -1; - } - - return !!(ifr.ifr_flags & IFF_RUNNING); -} - -/** - * Get enabled hash options of a packet socket - * - * @param fd Socket file descriptor - * @param name Interface name - * @param flow_type Packet flow type - * @param options[out] Enabled hash options - * - * @retval 0 on success - * @retval <0 on failure - */ -static inline int get_rss_hash_options(int fd, const char *name, - uint32_t flow_type, uint64_t *options) -{ - struct ifreq ifr; - struct ethtool_rxnfc rsscmd; - - memset(&ifr, 0, sizeof(ifr)); - memset(&rsscmd, 0, sizeof(rsscmd)); - *options = 0; - - snprintf(ifr.ifr_name, IF_NAMESIZE, "%s", name); - - rsscmd.cmd = ETHTOOL_GRXFH; - rsscmd.flow_type = flow_type; - - ifr.ifr_data = (caddr_t)&rsscmd; - - if (ioctl(fd, SIOCETHTOOL, &ifr) < 0) - return -1; - - *options = rsscmd.data; - return 0; -} - -int rss_conf_get_fd(int fd, const char *name, - odp_pktin_hash_proto_t *hash_proto) -{ - uint64_t options; - int rss_enabled = 0; - - memset(hash_proto, 0, sizeof(odp_pktin_hash_proto_t)); - - get_rss_hash_options(fd, name, IPV4_FLOW, &options); - if ((options & RXH_IP_SRC) && (options & RXH_IP_DST)) { - hash_proto->proto.ipv4 = 1; - rss_enabled++; - } - get_rss_hash_options(fd, name, TCP_V4_FLOW, &options); - if ((options & RXH_IP_SRC) && (options & RXH_IP_DST) && - (options & RXH_L4_B_0_1) && (options & RXH_L4_B_2_3)) { - hash_proto->proto.ipv4_tcp = 1; - rss_enabled++; - } - get_rss_hash_options(fd, name, UDP_V4_FLOW, &options); - if ((options & RXH_IP_SRC) && (options & RXH_IP_DST) && - (options & RXH_L4_B_0_1) && (options & RXH_L4_B_2_3)) { - hash_proto->proto.ipv4_udp = 1; - rss_enabled++; - } - get_rss_hash_options(fd, name, IPV6_FLOW, &options); - if ((options & RXH_IP_SRC) && (options & RXH_IP_DST)) { - hash_proto->proto.ipv6 = 1; - rss_enabled++; - } - get_rss_hash_options(fd, name, TCP_V6_FLOW, &options); - if ((options & RXH_IP_SRC) && (options & RXH_IP_DST) && - (options & RXH_L4_B_0_1) && (options & RXH_L4_B_2_3)) { - hash_proto->proto.ipv6_tcp = 1; - rss_enabled++; - } - get_rss_hash_options(fd, name, UDP_V6_FLOW, &options); - if ((options & RXH_IP_SRC) && (options & RXH_IP_DST) && - (options & RXH_L4_B_0_1) && (options & RXH_L4_B_2_3)) { - hash_proto->proto.ipv6_udp = 1; - rss_enabled++; - } - return rss_enabled; -} - -/** - * Set hash options of a packet socket - * - * @param fd Socket file descriptor - * @param name Interface name - * @param flow_type Packet flow type - * @param options Hash options - * - * @retval 0 on success - * @retval <0 on failure - */ -static inline int set_rss_hash(int fd, const char *name, - uint32_t flow_type, uint64_t options) -{ - struct ifreq ifr; - struct ethtool_rxnfc rsscmd; - - memset(&rsscmd, 0, sizeof(rsscmd)); - - snprintf(ifr.ifr_name, IF_NAMESIZE, "%s", name); - - rsscmd.cmd = ETHTOOL_SRXFH; - rsscmd.flow_type = flow_type; - rsscmd.data = options; - - ifr.ifr_data = (caddr_t)&rsscmd; - - if (ioctl(fd, SIOCETHTOOL, &ifr) < 0) - return -1; - - return 0; -} - -int rss_conf_set_fd(int fd, const char *name, - const odp_pktin_hash_proto_t *hash_proto) -{ - uint64_t options; - odp_pktin_hash_proto_t cur_hash; - - /* Compare to currently set hash protocols */ - rss_conf_get_fd(fd, name, &cur_hash); - - if (hash_proto->proto.ipv4_udp && !cur_hash.proto.ipv4_udp) { - options = RXH_IP_SRC | RXH_IP_DST | RXH_L4_B_0_1 | RXH_L4_B_2_3; - if (set_rss_hash(fd, name, UDP_V4_FLOW, options)) - return -1; - } - if (hash_proto->proto.ipv4_tcp && !cur_hash.proto.ipv4_tcp) { - options = RXH_IP_SRC | RXH_IP_DST | RXH_L4_B_0_1 | RXH_L4_B_2_3; - if (set_rss_hash(fd, name, TCP_V4_FLOW, options)) - return -1; - } - if (hash_proto->proto.ipv6_udp && !cur_hash.proto.ipv6_udp) { - options = RXH_IP_SRC | RXH_IP_DST | RXH_L4_B_0_1 | RXH_L4_B_2_3; - if (set_rss_hash(fd, name, UDP_V6_FLOW, options)) - return -1; - } - if (hash_proto->proto.ipv6_tcp && !cur_hash.proto.ipv6_tcp) { - options = RXH_IP_SRC | RXH_IP_DST | RXH_L4_B_0_1 | RXH_L4_B_2_3; - if (set_rss_hash(fd, name, TCP_V6_FLOW, options)) - return -1; - } - if (hash_proto->proto.ipv4 && !cur_hash.proto.ipv4) { - options = RXH_IP_SRC | RXH_IP_DST; - if (set_rss_hash(fd, name, IPV4_FLOW, options)) - return -1; - } - if (hash_proto->proto.ipv6 && !cur_hash.proto.ipv6) { - options = RXH_IP_SRC | RXH_IP_DST; - if (set_rss_hash(fd, name, IPV6_FLOW, options)) - return -1; - } - return 0; -} - -int rss_conf_get_supported_fd(int fd, const char *name, - odp_pktin_hash_proto_t *hash_proto) -{ - uint64_t options; - int rss_supported = 0; - - memset(hash_proto, 0, sizeof(odp_pktin_hash_proto_t)); - - if (!get_rss_hash_options(fd, name, IPV4_FLOW, &options)) { - if (!set_rss_hash(fd, name, IPV4_FLOW, options)) { - hash_proto->proto.ipv4 = 1; - rss_supported++; - } - } - if (!get_rss_hash_options(fd, name, TCP_V4_FLOW, &options)) { - if (!set_rss_hash(fd, name, TCP_V4_FLOW, options)) { - hash_proto->proto.ipv4_tcp = 1; - rss_supported++; - } - } - if (!get_rss_hash_options(fd, name, UDP_V4_FLOW, &options)) { - if (!set_rss_hash(fd, name, UDP_V4_FLOW, options)) { - hash_proto->proto.ipv4_udp = 1; - rss_supported++; - } - } - if (!get_rss_hash_options(fd, name, IPV6_FLOW, &options)) { - if (!set_rss_hash(fd, name, IPV6_FLOW, options)) { - hash_proto->proto.ipv6 = 1; - rss_supported++; - } - } - if (!get_rss_hash_options(fd, name, TCP_V6_FLOW, &options)) { - if (!set_rss_hash(fd, name, TCP_V6_FLOW, options)) { - hash_proto->proto.ipv6_tcp = 1; - rss_supported++; - } - } - if (!get_rss_hash_options(fd, name, UDP_V6_FLOW, &options)) { - if (!set_rss_hash(fd, name, UDP_V6_FLOW, options)) { - hash_proto->proto.ipv6_udp = 1; - rss_supported++; - } - } - return rss_supported; -} - -void rss_conf_print(const odp_pktin_hash_proto_t *hash_proto) -{ int max_len = 512; - char str[max_len]; - int len = 0; - int n = max_len - 1; - - len += snprintf(&str[len], n - len, " rss conf\n"); - - if (hash_proto->proto.ipv4) - len += snprintf(&str[len], n - len, - " IPV4\n"); - if (hash_proto->proto.ipv4_tcp) - len += snprintf(&str[len], n - len, - " IPV4 TCP\n"); - if (hash_proto->proto.ipv4_udp) - len += snprintf(&str[len], n - len, - " IPV4 UDP\n"); - if (hash_proto->proto.ipv6) - len += snprintf(&str[len], n - len, - " IPV6\n"); - if (hash_proto->proto.ipv6_tcp) - len += snprintf(&str[len], n - len, - " IPV6 TCP\n"); - if (hash_proto->proto.ipv6_udp) - len += snprintf(&str[len], n - len, - " IPV6 UDP\n"); - str[len] = '\0'; - - ODP_PRINT("%s\n", str); -} - /* * ODP_PACKET_SOCKET_MMSG: */ diff --git a/platform/linux-generic/pktio/socket_mmap.c b/platform/linux-generic/pktio/socket_mmap.c index 3930ade2..1605b7ff 100644 --- a/platform/linux-generic/pktio/socket_mmap.c +++ b/platform/linux-generic/pktio/socket_mmap.c @@ -32,6 +32,8 @@ #include <odp_classification_inlines.h> #include <odp_classification_internal.h> #include <odp/api/hints.h> +#include <pktio/common.h> +#include <pktio/ethtool.h> #include <protocols/eth.h> #include <protocols/ip.h> diff --git a/platform/linux-generic/pktio/tap.c b/platform/linux-generic/pktio/tap.c index bb7efe05..6cef64f1 100644 --- a/platform/linux-generic/pktio/tap.c +++ b/platform/linux-generic/pktio/tap.c @@ -45,6 +45,7 @@ #include <odp_packet_internal.h> #include <odp_packet_io_internal.h> #include <odp_classification_internal.h> +#include <pktio/common.h> #define BUF_SIZE 65536 commit a9c61e3590ea4e9bc3fb30337cfa24b32ff4ea41 Author: Bogdan Pricope <bogdan.pricope(a)linaro.org> Date: Thu Sep 21 14:38:53 2017 +0300 linux-gen: pktio: loopback: use generic pktio_ops data storage Signed-off-by: Bogdan Pricope <bogdan.pricope(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Yi He <yi.he(a)linaro.org> diff --git a/platform/linux-generic/include/odp_pktio_ops_subsystem.h b/platform/linux-generic/include/odp_pktio_ops_subsystem.h index 07c5dbee..241ce467 100644 --- a/platform/linux-generic/include/odp_pktio_ops_subsystem.h +++ b/platform/linux-generic/include/odp_pktio_ops_subsystem.h @@ -82,7 +82,6 @@ typedef ODP_MODULE_CLASS(pktio_ops) { /* All implementations of this subsystem */ #include <odp_pktio_ops_ipc.h> -#include <odp_pktio_ops_loopback.h> #include <odp_pktio_ops_netmap.h> #include <odp_pktio_ops_pcap.h> #include <odp_pktio_ops_socket.h> @@ -94,7 +93,6 @@ typedef ODP_MODULE_CLASS(pktio_ops) { typedef union { void *dpdk; pktio_ops_ipc_data_t ipc; - pktio_ops_loopback_data_t loopback; pktio_ops_netmap_data_t netmap; pktio_ops_pcap_data_t pcap; pktio_ops_socket_data_t socket; diff --git a/platform/linux-generic/pktio/loopback.c b/platform/linux-generic/pktio/loopback.c index b17868a3..01bbc8bc 100644 --- a/platform/linux-generic/pktio/loopback.c +++ b/platform/linux-generic/pktio/loopback.c @@ -14,6 +14,7 @@ #include <odp_debug_internal.h> #include <odp/api/hints.h> #include <odp_queue_if.h> +#include <odp_pktio_ops_loopback.h> #include <protocols/eth.h> #include <protocols/ip.h> @@ -21,6 +22,7 @@ #include <errno.h> #include <inttypes.h> #include <limits.h> +#include <linux/if_ether.h> /* MAC address for the "loop" interface */ static const char pktio_loop_mac[] = {0x02, 0xe9, 0x34, 0x80, 0x73, 0x01}; @@ -30,6 +32,9 @@ static int loopback_stats_reset(pktio_entry_t *pktio_entry); static int loopback_open(odp_pktio_t id, pktio_entry_t *pktio_entry, const char *devname, odp_pool_t pool ODP_UNUSED) { + pktio_ops_loopback_data_t *pkt_lbk = + odp_ops_data(pktio_entry, loopback); + if (strcmp(devname, "loop")) return -1; @@ -37,10 +42,9 @@ static int loopback_open(odp_pktio_t id, pktio_entry_t *pktio_entry, snprintf(loopq_name, sizeof(loopq_name), "%" PRIu64 "-pktio_loopq", odp_pktio_to_u64(id)); - pktio_entry->ops_data(loopback).loopq = - odp_queue_create(loopq_name, NULL); + pkt_lbk->loopq = odp_queue_create(loopq_name, NULL); - if (pktio_entry->ops_data(loopback).loopq == ODP_QUEUE_INVALID) + if (pkt_lbk->loopq == ODP_QUEUE_INVALID) return -1; loopback_stats_reset(pktio_entry); @@ -50,7 +54,10 @@ static int loopback_open(odp_pktio_t id, pktio_entry_t *pktio_entry, static int loopback_close(pktio_entry_t *pktio_entry) { - return odp_queue_destroy(pktio_entry->ops_data(loopback).loopq); + pktio_ops_loopback_data_t *pkt_lbk = + odp_ops_data(pktio_entry, loopback); + + return odp_queue_destroy(pkt_lbk->loopq); } static int loopback_recv(pktio_entry_t *pktio_entry, int index ODP_UNUSED, @@ -65,13 +72,15 @@ static int loopback_recv(pktio_entry_t *pktio_entry, int index ODP_UNUSED, odp_time_t *ts = NULL; int num_rx = 0; int failed = 0; + pktio_ops_loopback_data_t *pkt_lbk = + odp_ops_data(pktio_entry, loopback); if (odp_unlikely(len > QUEUE_MULTI_MAX)) len = QUEUE_MULTI_MAX; odp_ticketlock_lock(&pktio_entry->s.rxl); - queue = queue_fn->from_ext(pktio_entry->ops_data(loopback).loopq); + queue = queue_fn->from_ext(pkt_lbk->loopq); nbr = queue_fn->deq_multi(queue, hdr_tbl, len); if (pktio_entry->s.config.pktin.bit.ts_all || @@ -155,6 +164,8 @@ static int loopback_send(pktio_entry_t *pktio_entry, int index ODP_UNUSED, int i; int ret; uint32_t bytes = 0; + pktio_ops_loopback_data_t *pkt_lbk = + odp_ops_data(pktio_entry, loopback); if (odp_unlikely(len > QUEUE_MULTI_MAX)) len = QUEUE_MULTI_MAX; @@ -166,7 +177,7 @@ static int loopback_send(pktio_entry_t *pktio_entry, int index ODP_UNUSED, odp_ticketlock_lock(&pktio_entry->s.txl); - queue = queue_fn->from_ext(pktio_entry->ops_data(loopback).loopq); + queue = queue_fn->from_ext(pkt_lbk->loopq); ret = queue_fn->enq_multi(queue, hdr_tbl, len); if (ret > 0) { @@ -219,13 +230,19 @@ static int loopback_capability(pktio_entry_t *pktio_entry ODP_UNUSED, static int loopback_promisc_mode_set(pktio_entry_t *pktio_entry, odp_bool_t enable) { - pktio_entry->ops_data(loopback).promisc = enable; + pktio_ops_loopback_data_t *pkt_lbk = + odp_ops_data(pktio_entry, loopback); + + pkt_lbk->promisc = enable; return 0; } static int loopback_promisc_mode_get(pktio_entry_t *pktio_entry) { - return pktio_entry->ops_data(loopback).promisc ? 1 : 0; + pktio_ops_loopback_data_t *pkt_lbk = + odp_ops_data(pktio_entry, loopback); + + return pkt_lbk->promisc ? 1 : 0; } static int loopback_stats(pktio_entry_t *pktio_entry, commit 613f352da705b0076cf82c0a96e2e69473018ccd Author: Bogdan Pricope <bogdan.pricope(a)linaro.org> Date: Thu Sep 21 13:32:47 2017 +0300 linux-gen: pktio: introduce generic pktio_ops data storage Signed-off-by: Bogdan Pricope <bogdan.pricope(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Yi He <yi.he(a)linaro.org> diff --git a/platform/linux-dpdk/include/odp_packet_io_internal.h b/platform/linux-dpdk/include/odp_packet_io_internal.h index 10760ca4..d31c449e 100644 --- a/platform/linux-dpdk/include/odp_packet_io_internal.h +++ b/platform/linux-dpdk/include/odp_packet_io_internal.h @@ -42,7 +42,10 @@ typedef union pktio_entry_u pktio_entry_t; struct pktio_entry { const pktio_ops_module_t *ops; /**< Implementation specific methods */ - pktio_ops_data_t ops_data; + union { + pktio_ops_data_t ops_data; + uint8_t _ops_data[ODP_PKTIO_ODPS_DATA_MAX_SIZE]; + }; /* These two locks together lock the whole pktio device */ odp_ticketlock_t rxl; /**< RX ticketlock */ odp_ticketlock_t txl; /**< TX ticketlock */ diff --git a/platform/linux-generic/include/odp_packet_io_internal.h b/platform/linux-generic/include/odp_packet_io_internal.h index dacea47c..79f5b108 100644 --- a/platform/linux-generic/include/odp_packet_io_internal.h +++ b/platform/linux-generic/include/odp_packet_io_internal.h @@ -50,7 +50,10 @@ typedef union pktio_entry_u pktio_entry_t; struct pktio_entry { const pktio_ops_module_t *ops; /**< Implementation specific methods */ - pktio_ops_data_t ops_data; /**< IO operation specific data */ + union { + pktio_ops_data_t ops_data; /**< IO operation specific data */ + uint8_t _ops_data[ODP_PKTIO_ODPS_DATA_MAX_SIZE]; + }; /* These two locks together lock the whole pktio device */ odp_ticketlock_t rxl; /**< RX ticketlock */ odp_ticketlock_t txl; /**< TX ticketlock */ diff --git a/platform/linux-generic/include/odp_pktio_ops_subsystem.h b/platform/linux-generic/include/odp_pktio_ops_subsystem.h index 3843ac70..07c5dbee 100644 --- a/platform/linux-generic/include/odp_pktio_ops_subsystem.h +++ b/platform/linux-generic/include/odp_pktio_ops_subsystem.h @@ -105,4 +105,11 @@ typedef union { /* Extract pktio ops data from pktio entry structure */ #define ops_data(mod) s.ops_data.mod +/* Maximum size of pktio specific ops data.*/ +#define ODP_PKTIO_ODPS_DATA_MAX_SIZE 80000 + +/* Extract pktio ops data from pktio entry structure */ +#define odp_ops_data(_p, _mod) \ + ((pktio_ops_ ## _mod ## _data_t *)(uintptr_t)_p->s._ops_data) + #endif ----------------------------------------------------------------------- Summary of changes: .../linux-dpdk/include/odp_packet_io_internal.h | 4 +- platform/linux-dpdk/pktio/dpdk.c | 57 ++- platform/linux-generic/Makefile.am | 2 + .../linux-generic/include/odp_packet_io_internal.h | 3 +- .../linux-generic/include/odp_pktio_ops_socket.h | 76 ---- .../include/odp_pktio_ops_subsystem.h | 26 +- platform/linux-generic/include/odp_pktio_ops_tap.h | 1 + platform/linux-generic/odp_packet_io.c | 1 + platform/linux-generic/pktio/common.c | 367 +++++++++++++++++++ platform/linux-generic/pktio/common.h | 81 +++++ platform/linux-generic/pktio/dpdk.c | 101 +++--- platform/linux-generic/pktio/ethtool.c | 1 + platform/linux-generic/pktio/ethtool.h | 15 + platform/linux-generic/pktio/ipc.c | 201 ++++++----- platform/linux-generic/pktio/loopback.c | 33 +- platform/linux-generic/pktio/netmap.c | 98 +++-- platform/linux-generic/pktio/pcap.c | 19 +- platform/linux-generic/pktio/socket.c | 401 ++------------------- platform/linux-generic/pktio/socket_mmap.c | 50 ++- platform/linux-generic/pktio/tap.c | 35 +- 20 files changed, 843 insertions(+), 729 deletions(-) create mode 100644 platform/linux-generic/pktio/common.h create mode 100644 platform/linux-generic/pktio/ethtool.h hooks/post-receive --

8 years, 4 months

[COMMIT] branch master updated. v1.15.0.0-268-gec0c3145

by git＠git-us.linaro.org

8 years, 4 months

[COMMIT] branch master updated. v1.15.0.0-286-g54228421

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 54228421977f94d9da752290540c6ec4dc5306a0 (commit) via 605e77187211dbb0716e4124f249c7f0f88567f7 (commit) via 940c54bbd1c0c16ea2b6a6f6737d151deeba1e43 (commit) via 91ceea49a975c6fcd61ab1c992a502350d673eeb (commit) via b46702e5ef368c9aaf9d6cea7d32b07adb881ce3 (commit) via 48dfcade1602e9cc9bb8cd3251037508aef146cd (commit) via 2aa9a05b11bdfac0c0126384d4677b3f9c561a78 (commit) via df978d9b4e766c8e1cb1a88a28d98318840fee22 (commit) via 482eeee380d40596131826c1103ed89247bd17e5 (commit) via 254190ffcdb51549ee23846f33fd45513656b78c (commit) via 52877c96e12bf62614df0482175384565a851083 (commit) via 133e7fc06147486fff5ab3393b1a791ab97d19d3 (commit) via 8c9ce8c63eed9d01fec54c09bd17040914abd623 (commit) via 2b57c7d7b96eef16c36b8b0020b3dd78acc82660 (commit) via cbced85824c4c03c0b35396d559ebfb187237569 (commit) via 1217fbaed0aee2ee395c131bb7fd2e201214ed31 (commit) via 927b57f21124f31e23fd7f72dddcc93a5248ed53 (commit) via 1bcf171f00973bcc21baadf9919a61cd6abdf713 (commit) from ec0c3145fcafa09ae3a79875e7e07dd4794583cc (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 54228421977f94d9da752290540c6ec4dc5306a0 Author: Matias Elo <matias.elo(a)nokia.com> Date: Mon Oct 16 12:29:57 2017 +0300 validation: packet: adjust segmented test packet length Adjust 'segmented_packet_len' so that the test packet pool is able to allocate at least PACKET_POOL_NUM_SEG possibly segmented test packets. Several validation tests allocate new packets, so it is not enough to be able allocate a single segmented packet. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/packet/packet.c b/test/validation/api/packet/packet.c index 64165464..bf8f5f44 100644 --- a/test/validation/api/packet/packet.c +++ b/test/validation/api/packet/packet.c @@ -16,6 +16,11 @@ #define PACKET_TAILROOM_RESERVE 4 /* Number of packets in the test packet pool */ #define PACKET_POOL_NUM 300 +/* Number of large, possibly segmented, test packets */ +#define PACKET_POOL_NUM_SEG 4 +ODP_STATIC_ASSERT(PACKET_POOL_NUM_SEG > 1 && + PACKET_POOL_NUM_SEG < PACKET_POOL_NUM, + "Invalid PACKET_POOL_NUM_SEG value"); static odp_pool_t packet_pool, packet_pool_no_uarea, packet_pool_double_uarea; static uint32_t packet_len; @@ -108,11 +113,13 @@ int packet_suite_init(void) { odp_pool_param_t params; odp_pool_capability_t capa; + odp_packet_t pkt_tbl[PACKET_POOL_NUM_SEG]; struct udata_struct *udat; uint32_t udat_size; uint8_t data = 0; uint32_t i; uint32_t num = PACKET_POOL_NUM; + int ret; if (odp_pool_capability(&capa) < 0) { printf("pool_capability failed\n"); @@ -178,14 +185,26 @@ int packet_suite_init(void) data++; } - /* Try to allocate the largest possible packet to see + /* Try to allocate PACKET_POOL_NUM_SEG largest possible packets to see * if segmentation is supported */ do { - segmented_test_packet = odp_packet_alloc(packet_pool, - segmented_packet_len); - if (segmented_test_packet == ODP_PACKET_INVALID) + ret = odp_packet_alloc_multi(packet_pool, segmented_packet_len, + pkt_tbl, PACKET_POOL_NUM_SEG); + if (ret != PACKET_POOL_NUM_SEG) { + if (ret > 0) + odp_packet_free_multi(pkt_tbl, ret); segmented_packet_len -= capa.pkt.min_seg_len; - } while (segmented_test_packet == ODP_PACKET_INVALID); + continue; + } + } while (ret != PACKET_POOL_NUM_SEG && + segmented_packet_len > capa.pkt.min_seg_len); + + if (ret != PACKET_POOL_NUM_SEG) { + printf("packet alloc failed\n"); + return -1; + } + segmented_test_packet = pkt_tbl[0]; + odp_packet_free_multi(&pkt_tbl[1], PACKET_POOL_NUM_SEG - 1); if (odp_packet_is_valid(test_packet) == 0 || odp_packet_is_valid(segmented_test_packet) == 0) { commit 605e77187211dbb0716e4124f249c7f0f88567f7 Author: Matias Elo <matias.elo(a)nokia.com> Date: Tue Oct 10 09:08:51 2017 +0300 linux-gen: pool: select packet pool segment size at runtime Use stored packet pool segment length (pool_t.seg_len) instead of a define. This enables creating packet pools with different segment sizes. 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_internal.h b/platform/linux-generic/include/odp_packet_internal.h index 73a3e934..3b3dec95 100644 --- a/platform/linux-generic/include/odp_packet_internal.h +++ b/platform/linux-generic/include/odp_packet_internal.h @@ -194,6 +194,7 @@ static inline seg_entry_t *seg_entry_last(odp_packet_hdr_t *hdr) */ static inline void packet_init(odp_packet_hdr_t *pkt_hdr, uint32_t len) { + pool_t *pool = pool_entry_from_hdl(pkt_hdr->buf_hdr.pool_hdl); uint32_t seg_len; int num = pkt_hdr->buf_hdr.segcount; @@ -203,7 +204,7 @@ static inline void packet_init(odp_packet_hdr_t *pkt_hdr, uint32_t len) } else { seg_entry_t *last; - seg_len = len - ((num - 1) * CONFIG_PACKET_MAX_SEG_LEN); + seg_len = len - ((num - 1) * pool->seg_len); /* Last segment data length */ last = seg_entry_last(pkt_hdr); @@ -226,8 +227,7 @@ static inline void packet_init(odp_packet_hdr_t *pkt_hdr, uint32_t len) pkt_hdr->frame_len = len; pkt_hdr->shared_len = 0; pkt_hdr->headroom = CONFIG_PACKET_HEADROOM; - pkt_hdr->tailroom = CONFIG_PACKET_MAX_SEG_LEN - seg_len + - CONFIG_PACKET_TAILROOM; + pkt_hdr->tailroom = pool->seg_len - seg_len + CONFIG_PACKET_TAILROOM; pkt_hdr->input = ODP_PKTIO_INVALID; } diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index 54c98646..94aa01de 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -23,9 +23,6 @@ #include <stdio.h> #include <inttypes.h> -/* Initial packet segment data length */ -#define BASE_LEN CONFIG_PACKET_MAX_SEG_LEN - #include <odp/visibility_begin.h> /* Fill in packet header field offsets for inline functions */ @@ -341,6 +338,7 @@ static inline void link_segments(odp_packet_hdr_t *pkt_hdr[], int num) int cur, i; odp_packet_hdr_t *hdr; odp_packet_hdr_t *head = pkt_hdr[0]; + uint32_t seg_len = pool_entry_from_hdl(head->buf_hdr.pool_hdl)->seg_len; cur = 0; @@ -353,7 +351,7 @@ static inline void link_segments(odp_packet_hdr_t *pkt_hdr[], int num) buf_hdr = &pkt_hdr[cur]->buf_hdr; hdr->buf_hdr.seg[i].hdr = buf_hdr; hdr->buf_hdr.seg[i].data = buf_hdr->base_data; - hdr->buf_hdr.seg[i].len = BASE_LEN; + hdr->buf_hdr.seg[i].len = seg_len; cur++; if (cur == num) { @@ -373,13 +371,15 @@ static inline void link_segments(odp_packet_hdr_t *pkt_hdr[], int num) static inline void init_segments(odp_packet_hdr_t *pkt_hdr[], int num) { odp_packet_hdr_t *hdr; + uint32_t seg_len; /* First segment is the packet descriptor */ hdr = pkt_hdr[0]; + seg_len = pool_entry_from_hdl(hdr->buf_hdr.pool_hdl)->seg_len; /* Defaults for single segment packet */ hdr->buf_hdr.seg[0].data = hdr->buf_hdr.base_data; - hdr->buf_hdr.seg[0].len = BASE_LEN; + hdr->buf_hdr.seg[0].len = seg_len; if (!CONFIG_PACKET_SEG_DISABLED) { hdr->buf_hdr.segcount = num; @@ -399,6 +399,7 @@ static inline void reset_seg(odp_packet_hdr_t *pkt_hdr, int first, int num) void *base; int i; seg_entry_t *seg; + uint32_t seg_len = pool_entry_from_hdl(hdr->buf_hdr.pool_hdl)->seg_len; uint8_t idx; seg_entry_find_idx(&hdr, &idx, first); @@ -406,27 +407,25 @@ static inline void reset_seg(odp_packet_hdr_t *pkt_hdr, int first, int num) for (i = 0; i < num; i++) { base = hdr->buf_hdr.base_data; seg = seg_entry_next(&hdr, &idx); - seg->len = BASE_LEN; + seg->len = seg_len; seg->data = base; } } /* Calculate the number of segments */ -static inline int num_segments(uint32_t len) +static inline int num_segments(uint32_t len, uint32_t seg_len) { - uint32_t max_seg_len; int num; if (CONFIG_PACKET_SEG_DISABLED) return 1; num = 1; - max_seg_len = CONFIG_PACKET_MAX_SEG_LEN; - if (odp_unlikely(len > max_seg_len)) { - num = len / max_seg_len; + if (odp_unlikely(len > seg_len)) { + num = len / seg_len; - if (odp_likely((num * max_seg_len) != len)) + if (odp_likely((num * seg_len) != len)) num += 1; } @@ -793,7 +792,7 @@ int packet_alloc_multi(odp_pool_t pool_hdl, uint32_t len, pool_t *pool = pool_entry_from_hdl(pool_hdl); int num, num_seg; - num_seg = num_segments(len); + num_seg = num_segments(len, pool->seg_len); num = packet_alloc(pool, len, max_num, num_seg, pkt); return num; @@ -813,7 +812,7 @@ odp_packet_t odp_packet_alloc(odp_pool_t pool_hdl, uint32_t len) if (odp_unlikely(len > pool->max_len)) return ODP_PACKET_INVALID; - num_seg = num_segments(len); + num_seg = num_segments(len, pool->seg_len); num = packet_alloc(pool, len, 1, num_seg, &pkt); if (odp_unlikely(num == 0)) @@ -836,7 +835,7 @@ int odp_packet_alloc_multi(odp_pool_t pool_hdl, uint32_t len, if (odp_unlikely(len > pool->max_len)) return -1; - num_seg = num_segments(len); + num_seg = num_segments(len, pool->seg_len); num = packet_alloc(pool, len, max_num, num_seg, pkt); return num; @@ -977,7 +976,7 @@ int odp_packet_extend_head(odp_packet_t *pkt, uint32_t len, if (odp_unlikely((frame_len + len) > pool->max_len)) return -1; - num = num_segments(len - headroom); + num = num_segments(len - headroom, pool->seg_len); push_head(pkt_hdr, headroom); ptr = add_segments(pkt_hdr, pool, len - headroom, num, 1); @@ -1079,7 +1078,7 @@ int odp_packet_extend_tail(odp_packet_t *pkt, uint32_t len, if (odp_unlikely((frame_len + len) > pool->max_len)) return -1; - num = num_segments(len - tailroom); + num = num_segments(len - tailroom, pool->seg_len); push_tail(pkt_hdr, tailroom); ptr = add_segments(pkt_hdr, pool, len - tailroom, num, 0); diff --git a/platform/linux-generic/odp_pool.c b/platform/linux-generic/odp_pool.c index ab26bbf8..3e47993c 100644 --- a/platform/linux-generic/odp_pool.c +++ b/platform/linux-generic/odp_pool.c @@ -382,12 +382,33 @@ static odp_pool_t pool_create(const char *name, odp_pool_param_t *params, break; case ODP_POOL_PACKET: + seg_len = CONFIG_PACKET_MAX_SEG_LEN; + max_len = CONFIG_PACKET_MAX_LEN; + + if (params->pkt.len && + params->pkt.len < CONFIG_PACKET_MAX_SEG_LEN) + seg_len = params->pkt.len; + if (params->pkt.seg_len && params->pkt.seg_len > seg_len) + seg_len = params->pkt.seg_len; + if (seg_len < CONFIG_PACKET_SEG_LEN_MIN) + seg_len = CONFIG_PACKET_SEG_LEN_MIN; + + /* Make sure that at least one 'max_len' packet can fit in the + * pool. */ + if (params->pkt.max_len != 0) + max_len = params->pkt.max_len; + if ((max_len + seg_len - 1) / seg_len > CONFIG_PACKET_MAX_SEGS) + seg_len = (max_len + CONFIG_PACKET_MAX_SEGS - 1) / + CONFIG_PACKET_MAX_SEGS; + if (seg_len > CONFIG_PACKET_MAX_SEG_LEN) { + ODP_ERR("Pool unable to store 'max_len' packet"); + return ODP_POOL_INVALID; + } + headroom = CONFIG_PACKET_HEADROOM; tailroom = CONFIG_PACKET_TAILROOM; num = params->pkt.num; uarea_size = params->pkt.uarea_size; - seg_len = CONFIG_PACKET_MAX_SEG_LEN; - max_len = CONFIG_PACKET_MAX_LEN; break; case ODP_POOL_TIMEOUT: @@ -887,7 +908,7 @@ int odp_pool_capability(odp_pool_capability_t *capa) capa->pkt.min_headroom = CONFIG_PACKET_HEADROOM; capa->pkt.min_tailroom = CONFIG_PACKET_TAILROOM; capa->pkt.max_segs_per_pkt = CONFIG_PACKET_MAX_SEGS; - capa->pkt.min_seg_len = max_seg_len; + capa->pkt.min_seg_len = CONFIG_PACKET_SEG_LEN_MIN; capa->pkt.max_seg_len = max_seg_len; capa->pkt.max_uarea_size = MAX_SIZE; diff --git a/platform/linux-generic/pktio/netmap.c b/platform/linux-generic/pktio/netmap.c index 4d771fcb..4c72a658 100644 --- a/platform/linux-generic/pktio/netmap.c +++ b/platform/linux-generic/pktio/netmap.c @@ -350,7 +350,7 @@ static int netmap_open(odp_pktio_t id ODP_UNUSED, pktio_entry_t *pktio_entry, pkt_nm->pool = pool; /* max frame len taking into account the l2-offset */ - pkt_nm->max_frame_len = CONFIG_PACKET_MAX_SEG_LEN; + pkt_nm->max_frame_len = pool_entry_from_hdl(pool)->max_len; /* allow interface to be opened with or without the 'netmap:' prefix */ prefix = "netmap:"; commit 940c54bbd1c0c16ea2b6a6f6737d151deeba1e43 Author: Matias Elo <matias.elo(a)nokia.com> Date: Wed Oct 11 10:41:12 2017 +0300 linux-gen: packet: fix build error with single segment packet header Fix invalid gcc error ('array subscript is above array bounds') when CONFIG_PACKET_SEGS_PER_HDR is set to one. Tested with gcc 5.4.0. 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/odp_packet.c b/platform/linux-generic/odp_packet.c index abd06044..54c98646 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -2151,7 +2151,10 @@ odp_packet_t odp_packet_ref(odp_packet_t pkt, uint32_t offset) link_hdr->buf_hdr.seg[0].len = seg->len - seg_offset; buffer_ref_inc(seg->hdr); - for (i = 1; i < num_copy; i++) { + /* The 'CONFIG_PACKET_SEGS_PER_HDR > 1' condition is required to fix an + * invalid error ('array subscript is above array bounds') thrown by + * gcc (5.4.0). */ + for (i = 1; CONFIG_PACKET_SEGS_PER_HDR > 1 && i < num_copy; i++) { /* Update link header reference count */ if (idx == 0 && seg_is_link(hdr)) buffer_ref_inc((odp_buffer_hdr_t *)hdr); commit 91ceea49a975c6fcd61ab1c992a502350d673eeb Author: Matias Elo <matias.elo(a)nokia.com> Date: Thu Oct 12 16:28:04 2017 +0300 linux-gen: pool: modify packet pool config defines Use separate defines for the maximum number of segments per packet (CONFIG_PACKET_MAX_SEGS) and the number of segments stored in a packet header (CONFIG_PACKET_SEGS_PER_HDR). A separate define is also added for the maximum packet length. 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_buffer_internal.h b/platform/linux-generic/include/odp_buffer_internal.h index 5d40303b..aefb1352 100644 --- a/platform/linux-generic/include/odp_buffer_internal.h +++ b/platform/linux-generic/include/odp_buffer_internal.h @@ -71,7 +71,7 @@ struct odp_buffer_hdr_t { /* --- 40 bytes --- */ /* Segments */ - seg_entry_t seg[CONFIG_PACKET_MAX_SEGS]; + seg_entry_t seg[CONFIG_PACKET_SEGS_PER_HDR]; /* Burst counts */ uint8_t burst_num; @@ -122,8 +122,8 @@ struct odp_buffer_hdr_t { uint8_t data[0]; } ODP_ALIGNED_CACHE; -ODP_STATIC_ASSERT(CONFIG_PACKET_MAX_SEGS < 256, - "CONFIG_PACKET_MAX_SEGS_TOO_LARGE"); +ODP_STATIC_ASSERT(CONFIG_PACKET_SEGS_PER_HDR < 256, + "CONFIG_PACKET_SEGS_PER_HDR_TOO_LARGE"); ODP_STATIC_ASSERT(BUFFER_BURST_SIZE < 256, "BUFFER_BURST_SIZE_TOO_LARGE"); diff --git a/platform/linux-generic/include/odp_config_internal.h b/platform/linux-generic/include/odp_config_internal.h index a798851f..598f26e1 100644 --- a/platform/linux-generic/include/odp_config_internal.h +++ b/platform/linux-generic/include/odp_config_internal.h @@ -75,7 +75,22 @@ extern "C" { /* * Maximum number of segments per packet */ -#define CONFIG_PACKET_MAX_SEGS 6 +#define CONFIG_PACKET_MAX_SEGS 255 + +/* + * Packet segmentation disabled + */ +#define CONFIG_PACKET_SEG_DISABLED (CONFIG_PACKET_MAX_SEGS == 1) + +/* + * Number of segments stored in a packet header + */ +#define CONFIG_PACKET_SEGS_PER_HDR 6 + +/* + * Maximum packet data length in bytes + */ +#define CONFIG_PACKET_MAX_LEN (64 * 1024) /* * Maximum packet segment size including head- and tailrooms diff --git a/platform/linux-generic/include/odp_packet_internal.h b/platform/linux-generic/include/odp_packet_internal.h index 15cb53f4..73a3e934 100644 --- a/platform/linux-generic/include/odp_packet_internal.h +++ b/platform/linux-generic/include/odp_packet_internal.h @@ -197,7 +197,7 @@ static inline void packet_init(odp_packet_hdr_t *pkt_hdr, uint32_t len) uint32_t seg_len; int num = pkt_hdr->buf_hdr.segcount; - if (odp_likely(CONFIG_PACKET_MAX_SEGS == 1 || num == 1)) { + if (odp_likely(CONFIG_PACKET_SEG_DISABLED || num == 1)) { seg_len = len; pkt_hdr->buf_hdr.seg[0].len = len; } else { diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index c330c629..abd06044 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -179,7 +179,7 @@ static inline void *packet_seg_data(odp_packet_hdr_t *pkt_hdr, uint32_t seg_idx) static inline uint16_t packet_last_seg(odp_packet_hdr_t *pkt_hdr) { - if (CONFIG_PACKET_MAX_SEGS == 1) + if (CONFIG_PACKET_SEG_DISABLED) return 0; else return pkt_hdr->buf_hdr.segcount - 1; @@ -291,7 +291,7 @@ static inline void *packet_map(odp_packet_hdr_t *pkt_hdr, if (odp_unlikely(offset >= pkt_hdr->frame_len)) return NULL; - if (odp_likely(CONFIG_PACKET_MAX_SEGS == 1 || seg_count == 1)) { + if (odp_likely(CONFIG_PACKET_SEG_DISABLED || seg_count == 1)) { addr = pkt_hdr->buf_hdr.seg[0].data + offset; len = pkt_hdr->buf_hdr.seg[0].len - offset; } else { @@ -347,7 +347,7 @@ static inline void link_segments(odp_packet_hdr_t *pkt_hdr[], int num) while (1) { hdr = pkt_hdr[cur]; - for (i = 0; i < CONFIG_PACKET_MAX_SEGS; i++) { + for (i = 0; i < CONFIG_PACKET_SEGS_PER_HDR; i++) { odp_buffer_hdr_t *buf_hdr; buf_hdr = &pkt_hdr[cur]->buf_hdr; @@ -365,7 +365,7 @@ static inline void link_segments(odp_packet_hdr_t *pkt_hdr[], int num) } } - hdr->buf_hdr.num_seg = CONFIG_PACKET_MAX_SEGS; + hdr->buf_hdr.num_seg = CONFIG_PACKET_SEGS_PER_HDR; hdr->buf_hdr.next_seg = pkt_hdr[cur]; } } @@ -377,22 +377,19 @@ static inline void init_segments(odp_packet_hdr_t *pkt_hdr[], int num) /* First segment is the packet descriptor */ hdr = pkt_hdr[0]; + /* Defaults for single segment packet */ hdr->buf_hdr.seg[0].data = hdr->buf_hdr.base_data; hdr->buf_hdr.seg[0].len = BASE_LEN; - /* Link segments */ - if (CONFIG_PACKET_MAX_SEGS != 1) { + if (!CONFIG_PACKET_SEG_DISABLED) { hdr->buf_hdr.segcount = num; - - /* Defaults for single segment packet */ hdr->buf_hdr.num_seg = 1; hdr->buf_hdr.next_seg = NULL; hdr->buf_hdr.last_seg = &hdr->buf_hdr; - if (odp_unlikely(num > 1)) { + /* Link segments */ + if (odp_unlikely(num > 1)) link_segments(pkt_hdr, num); - - } } } @@ -420,7 +417,7 @@ static inline int num_segments(uint32_t len) uint32_t max_seg_len; int num; - if (CONFIG_PACKET_MAX_SEGS == 1) + if (CONFIG_PACKET_SEG_DISABLED) return 1; num = 1; @@ -850,7 +847,7 @@ void odp_packet_free(odp_packet_t pkt) odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); int num_seg = pkt_hdr->buf_hdr.segcount; - if (odp_likely(CONFIG_PACKET_MAX_SEGS == 1 || num_seg == 1)) { + if (odp_likely(CONFIG_PACKET_SEG_DISABLED || num_seg == 1)) { odp_buffer_hdr_t *buf_hdr[2]; int num = 1; @@ -1027,7 +1024,7 @@ int odp_packet_trunc_head(odp_packet_t *pkt, uint32_t len, if (len < seg_len) { pull_head(pkt_hdr, len); - } else if (CONFIG_PACKET_MAX_SEGS != 1) { + } else if (!CONFIG_PACKET_SEG_DISABLED) { int num = 0; uint32_t pull_len = 0; @@ -1131,7 +1128,7 @@ int odp_packet_trunc_tail(odp_packet_t *pkt, uint32_t len, if (len < seg_len) { pull_tail(pkt_hdr, len); - } else if (CONFIG_PACKET_MAX_SEGS != 1) { + } else if (!CONFIG_PACKET_SEG_DISABLED) { int num = 0; uint32_t pull_len = 0; diff --git a/platform/linux-generic/odp_pool.c b/platform/linux-generic/odp_pool.c index 44a40e83..ab26bbf8 100644 --- a/platform/linux-generic/odp_pool.c +++ b/platform/linux-generic/odp_pool.c @@ -386,8 +386,8 @@ static odp_pool_t pool_create(const char *name, odp_pool_param_t *params, tailroom = CONFIG_PACKET_TAILROOM; num = params->pkt.num; uarea_size = params->pkt.uarea_size; - seg_len = CONFIG_PACKET_MAX_SEG_LEN; - max_len = CONFIG_PACKET_MAX_SEGS * seg_len; + seg_len = CONFIG_PACKET_MAX_SEG_LEN; + max_len = CONFIG_PACKET_MAX_LEN; break; case ODP_POOL_TIMEOUT: @@ -882,7 +882,7 @@ int odp_pool_capability(odp_pool_capability_t *capa) /* Packet pools */ capa->pkt.max_pools = ODP_CONFIG_POOLS; - capa->pkt.max_len = CONFIG_PACKET_MAX_SEGS * max_seg_len; + capa->pkt.max_len = CONFIG_PACKET_MAX_LEN; capa->pkt.max_num = CONFIG_POOL_MAX_NUM; capa->pkt.min_headroom = CONFIG_PACKET_HEADROOM; capa->pkt.min_tailroom = CONFIG_PACKET_TAILROOM; commit b46702e5ef368c9aaf9d6cea7d32b07adb881ce3 Author: Matias Elo <matias.elo(a)nokia.com> Date: Mon Oct 9 15:48:23 2017 +0300 linux-gen: pool: combine overlapping struct pool_t members Struct pool_t members 'data_size' and 'max_seg_len' were both used to store the same value. Replace them with a single 'seg_len' member. 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_pool_internal.h b/platform/linux-generic/include/odp_pool_internal.h index edf75d6e..48945ee1 100644 --- a/platform/linux-generic/include/odp_pool_internal.h +++ b/platform/linux-generic/include/odp_pool_internal.h @@ -60,9 +60,8 @@ typedef struct pool_t { uint32_t align; uint32_t headroom; uint32_t tailroom; - uint32_t data_size; + uint32_t seg_len; uint32_t max_len; - uint32_t max_seg_len; uint32_t uarea_size; uint32_t block_size; uint32_t shm_size; diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index fff01ad9..c330c629 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -476,8 +476,8 @@ static inline odp_packet_hdr_t *add_segments(odp_packet_hdr_t *pkt_hdr, if (new_hdr == NULL) return NULL; - seg_len = len - ((num - 1) * pool->max_seg_len); - offset = pool->max_seg_len - seg_len; + seg_len = len - ((num - 1) * pool->seg_len); + offset = pool->seg_len - seg_len; if (head) { /* add into the head*/ @@ -906,7 +906,7 @@ int odp_packet_reset(odp_packet_t pkt, uint32_t len) pool_t *pool = pkt_hdr->buf_hdr.pool_ptr; int num = pkt_hdr->buf_hdr.segcount; - if (odp_unlikely(len > (pool->max_seg_len * num))) + if (odp_unlikely(len > (pool->seg_len * num))) return -1; reset_seg(pkt_hdr, 0, num); diff --git a/platform/linux-generic/odp_pool.c b/platform/linux-generic/odp_pool.c index 40cbb397..44a40e83 100644 --- a/platform/linux-generic/odp_pool.c +++ b/platform/linux-generic/odp_pool.c @@ -285,7 +285,7 @@ static void init_buffers(pool_t *pool) memset(buf_hdr, 0, (uintptr_t)data - (uintptr_t)buf_hdr); - seg_size = pool->headroom + pool->data_size + pool->tailroom; + seg_size = pool->headroom + pool->seg_len + pool->tailroom; /* Initialize buffer metadata */ buf_hdr->index = i; @@ -305,13 +305,13 @@ static void init_buffers(pool_t *pool) /* Pointer to data start (of the first segment) */ buf_hdr->seg[0].hdr = buf_hdr; buf_hdr->seg[0].data = &data[offset]; - buf_hdr->seg[0].len = pool->data_size; + buf_hdr->seg[0].len = pool->seg_len; odp_atomic_init_u32(&buf_hdr->ref_cnt, 0); /* Store base values for fast init */ buf_hdr->base_data = buf_hdr->seg[0].data; - buf_hdr->buf_end = &data[offset + pool->data_size + + buf_hdr->buf_end = &data[offset + pool->seg_len + pool->tailroom]; /* Store buffer index into the global pool */ @@ -341,8 +341,8 @@ static odp_pool_t pool_create(const char *name, odp_pool_param_t *params, pool_t *pool; uint32_t uarea_size, headroom, tailroom; odp_shm_t shm; - uint32_t data_size, align, num, hdr_size, block_size; - uint32_t max_len, max_seg_len; + uint32_t seg_len, align, num, hdr_size, block_size; + uint32_t max_len; uint32_t ring_size; uint32_t num_extra = 0; int name_len; @@ -371,15 +371,14 @@ static odp_pool_t pool_create(const char *name, odp_pool_param_t *params, headroom = 0; tailroom = 0; - data_size = 0; + seg_len = 0; max_len = 0; - max_seg_len = 0; uarea_size = 0; switch (params->type) { case ODP_POOL_BUFFER: num = params->buf.num; - data_size = params->buf.size; + seg_len = params->buf.size; break; case ODP_POOL_PACKET: @@ -387,9 +386,8 @@ static odp_pool_t pool_create(const char *name, odp_pool_param_t *params, tailroom = CONFIG_PACKET_TAILROOM; num = params->pkt.num; uarea_size = params->pkt.uarea_size; - data_size = CONFIG_PACKET_MAX_SEG_LEN; - max_seg_len = CONFIG_PACKET_MAX_SEG_LEN; - max_len = CONFIG_PACKET_MAX_SEGS * max_seg_len; + seg_len = CONFIG_PACKET_MAX_SEG_LEN; + max_len = CONFIG_PACKET_MAX_SEGS * seg_len; break; case ODP_POOL_TIMEOUT: @@ -428,8 +426,8 @@ static odp_pool_t pool_create(const char *name, odp_pool_param_t *params, hdr_size = sizeof(odp_packet_hdr_t); hdr_size = ROUNDUP_CACHE_LINE(hdr_size); - block_size = ROUNDUP_CACHE_LINE(hdr_size + align + headroom + - data_size + tailroom); + block_size = ROUNDUP_CACHE_LINE(hdr_size + align + headroom + seg_len + + tailroom); /* Allocate extra memory for skipping packet buffers which cross huge * page boundaries. */ @@ -449,9 +447,8 @@ static odp_pool_t pool_create(const char *name, odp_pool_param_t *params, pool->num = num; pool->align = align; pool->headroom = headroom; - pool->data_size = data_size; + pool->seg_len = seg_len; pool->max_len = max_len; - pool->max_seg_len = max_seg_len; pool->tailroom = tailroom; pool->block_size = block_size; pool->uarea_size = uarea_size; @@ -924,9 +921,8 @@ void odp_pool_print(odp_pool_t pool_hdl) printf(" num %u\n", pool->num); printf(" align %u\n", pool->align); printf(" headroom %u\n", pool->headroom); - printf(" data size %u\n", pool->data_size); + printf(" seg len %u\n", pool->seg_len); printf(" max data len %u\n", pool->max_len); - printf(" max seg len %u\n", pool->max_seg_len); printf(" tailroom %u\n", pool->tailroom); printf(" block size %u\n", pool->block_size); printf(" uarea size %u\n", pool->uarea_size); diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c index 26ca0d6b..2e50a55f 100644 --- a/platform/linux-generic/pktio/dpdk.c +++ b/platform/linux-generic/pktio/dpdk.c @@ -174,7 +174,7 @@ static struct rte_mempool *mbuf_pool_create(const char *name, } num = pool_entry->num; - data_room_size = pool_entry->max_seg_len + CONFIG_PACKET_HEADROOM; + data_room_size = pool_entry->seg_len + CONFIG_PACKET_HEADROOM; elt_size = sizeof(struct rte_mbuf) + (unsigned)data_room_size; mbp_priv.mbuf_data_room_size = data_room_size; mbp_priv.mbuf_priv_size = 0; @@ -231,7 +231,7 @@ static int pool_dequeue_bulk(struct rte_mempool *mp, void **obj_table, int pkts; int i; - pkts = packet_alloc_multi(pool, pool_entry->max_seg_len, packet_tbl, + pkts = packet_alloc_multi(pool, pool_entry->seg_len, packet_tbl, num); if (odp_unlikely(pkts != (int)num)) { @@ -1230,7 +1230,7 @@ static int dpdk_open(odp_pktio_t id ODP_UNUSED, data_room = rte_pktmbuf_data_room_size(pkt_dpdk->pkt_pool) - RTE_PKTMBUF_HEADROOM; - pkt_dpdk->data_room = RTE_MIN(pool_entry->max_seg_len, data_room); + pkt_dpdk->data_room = RTE_MIN(pool_entry->seg_len, data_room); /* Mbuf chaining not yet supported */ pkt_dpdk->mtu = RTE_MIN(pkt_dpdk->mtu, pkt_dpdk->data_room); diff --git a/platform/linux-generic/pktio/socket_mmap.c b/platform/linux-generic/pktio/socket_mmap.c index f7118023..42f4a262 100644 --- a/platform/linux-generic/pktio/socket_mmap.c +++ b/platform/linux-generic/pktio/socket_mmap.c @@ -357,7 +357,7 @@ static void mmap_fill_ring(struct ring *ring, odp_pool_t pool_hdl, int fanout) pool = pool_entry_from_hdl(pool_hdl); /* Frame has to capture full packet which can fit to the pool block.*/ - ring->req.tp_frame_size = (pool->headroom + pool->data_size + + ring->req.tp_frame_size = (pool->headroom + pool->seg_len + pool->tailroom + TPACKET_HDRLEN + TPACKET_ALIGNMENT + + (pz - 1)) & (-pz); commit 48dfcade1602e9cc9bb8cd3251037508aef146cd Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Wed Oct 18 16:08:11 2017 +0300 linux-gen: pktio: simplify ret code Simplify ret code. Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c index 4363711f..f972bb78 100644 --- a/platform/linux-generic/odp_packet_io.c +++ b/platform/linux-generic/odp_packet_io.c @@ -215,27 +215,25 @@ static odp_pktio_t setup_pktio_entry(const char *name, odp_pool_t pool, for (pktio_if = 0; pktio_if_ops[pktio_if]; ++pktio_if) { ret = pktio_if_ops[pktio_if]->open(hdl, pktio_entry, name, pool); - - if (!ret) { - pktio_entry->s.ops = pktio_if_ops[pktio_if]; - ODP_DBG("%s uses %s\n", - name, pktio_if_ops[pktio_if]->name); + if (!ret) break; - } } if (ret != 0) { pktio_entry->s.state = PKTIO_STATE_FREE; - hdl = ODP_PKTIO_INVALID; + unlock_entry(pktio_entry); ODP_ERR("Unable to init any I/O type.\n"); - } else { - snprintf(pktio_entry->s.name, - sizeof(pktio_entry->s.name), "%s", name); - pktio_entry->s.state = PKTIO_STATE_OPENED; + return ODP_PKTIO_INVALID; } + snprintf(pktio_entry->s.name, + sizeof(pktio_entry->s.name), "%s", name); + pktio_entry->s.state = PKTIO_STATE_OPENED; + pktio_entry->s.ops = pktio_if_ops[pktio_if]; unlock_entry(pktio_entry); + ODP_DBG("%s uses %s\n", name, pktio_if_ops[pktio_if]->name); + return hdl; } commit 2aa9a05b11bdfac0c0126384d4677b3f9c561a78 Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Wed Oct 18 15:58:24 2017 +0300 linux-gen: pktio test odp_shm_reserve return code Better to check odp_shm_reserve() code than address. Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c index c2e6742b..4363711f 100644 --- a/platform/linux-generic/odp_packet_io.c +++ b/platform/linux-generic/odp_packet_io.c @@ -59,11 +59,10 @@ int odp_pktio_init_global(void) shm = odp_shm_reserve("odp_pktio_entries", sizeof(pktio_table_t), sizeof(pktio_entry_t), 0); - pktio_tbl = odp_shm_addr(shm); - - if (pktio_tbl == NULL) + if (shm == ODP_SHM_INVALID) return -1; + pktio_tbl = odp_shm_addr(shm); memset(pktio_tbl, 0, sizeof(pktio_table_t)); odp_spinlock_init(&pktio_tbl->lock); commit df978d9b4e766c8e1cb1a88a28d98318840fee22 Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Wed Oct 18 15:50:02 2017 +0300 linux-gen: pktio: add missing unlock add missing unlock on return. https://bugs.linaro.org/show_bug.cgi?id=3242 Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c index 5cf94a14..c2e6742b 100644 --- a/platform/linux-generic/odp_packet_io.c +++ b/platform/linux-generic/odp_packet_io.c @@ -202,8 +202,10 @@ static odp_pktio_t setup_pktio_entry(const char *name, odp_pool_t pool, /* if successful, alloc_pktio_entry() returns with the entry locked */ pktio_entry = get_pktio_entry(hdl); - if (!pktio_entry) + if (!pktio_entry) { + unlock_entry(pktio_entry); return ODP_PKTIO_INVALID; + } pktio_entry->s.pool = pool; memcpy(&pktio_entry->s.param, param, sizeof(odp_pktio_param_t)); commit 482eeee380d40596131826c1103ed89247bd17e5 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue Oct 17 15:17:27 2017 +0300 linux-gen: use EXEEXT in shmem_linux test Use EXEEXT environment variable when calling test programs during shmem_linux test. 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/test/validation/api/shmem/shmem_linux.c b/platform/linux-generic/test/validation/api/shmem/shmem_linux.c index 10bbb6a4..7f0343cf 100644 --- a/platform/linux-generic/test/validation/api/shmem/shmem_linux.c +++ b/platform/linux-generic/test/validation/api/shmem/shmem_linux.c @@ -218,10 +218,14 @@ int main(int argc __attribute__((unused)), char *argv[]) int app2_status; uid_t uid = getuid(); char *shm_dir = getenv("ODP_SHM_DIR"); + const char *exeext = getenv("EXEEXT"); + + if (exeext == NULL) + exeext = ""; /* odp_app1 is in the same directory as this file: */ strncpy(prg_name, argv[0], PATH_MAX - 1); - sprintf(odp_name1, "%s/%s", dirname(prg_name), ODP_APP1_NAME); + sprintf(odp_name1, "%s/%s%s", dirname(prg_name), ODP_APP1_NAME, exeext); /* start the ODP application: */ odp_app1 = fork(); @@ -292,7 +296,7 @@ int main(int argc __attribute__((unused)), char *argv[]) /* odp_app2 is in the same directory as this file: */ strncpy(prg_name, argv[0], PATH_MAX - 1); - sprintf(odp_name2, "%s/%s", dirname(prg_name), ODP_APP2_NAME); + sprintf(odp_name2, "%s/%s%s", dirname(prg_name), ODP_APP2_NAME, exeext); /* start the second ODP application with pid of ODP_APP1 as parameter:*/ sprintf(pid1, "%d", odp_app1); commit 254190ffcdb51549ee23846f33fd45513656b78c Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue Oct 17 15:14:07 2017 +0300 linux-gen: use ${EXEEXT} when calling shmem_linux test 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/test/Makefile.am b/platform/linux-generic/test/Makefile.am index 1f4910ad..97784a02 100644 --- a/platform/linux-generic/test/Makefile.am +++ b/platform/linux-generic/test/Makefile.am @@ -6,7 +6,7 @@ SUBDIRS = performance if test_vald TESTS = validation/api/pktio/pktio_run.sh \ validation/api/pktio/pktio_run_tap.sh \ - validation/api/shmem/shmem_linux \ + validation/api/shmem/shmem_linux$(EXEEXT) \ ring/ring_main$(EXEEXT) SUBDIRS += validation/api/pktio\ commit 52877c96e12bf62614df0482175384565a851083 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue Oct 17 15:11:57 2017 +0300 helper: add ${EXEEXT} when calling compiled programs 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/helper/test/Makefile.am b/helper/test/Makefile.am index 620c1673..8eee643b 100644 --- a/helper/test/Makefile.am +++ b/helper/test/Makefile.am @@ -1,3 +1,5 @@ +TESTS_ENVIRONMENT = EXEEXT=${EXEEXT} + LIB = $(top_builddir)/lib #in the following line, the libs using the symbols should come before diff --git a/helper/test/odpthreads_as_processes b/helper/test/odpthreads_as_processes index 89405f36..01d65883 100755 --- a/helper/test/odpthreads_as_processes +++ b/helper/test/odpthreads_as_processes @@ -11,4 +11,4 @@ PATH=.:$PATH # The odpthreads test recognise the "--odph_proc" option to create # odp threads as linux processes: -odpthreads --odph_proc +odpthreads${EXEEXT} --odph_proc diff --git a/helper/test/odpthreads_as_pthreads b/helper/test/odpthreads_as_pthreads index ef569c3d..cd68a9e9 100755 --- a/helper/test/odpthreads_as_pthreads +++ b/helper/test/odpthreads_as_pthreads @@ -11,4 +11,4 @@ PATH=.:$PATH # The odpthreads test without the "--odph_proc" option defaults to create # odp threads as linux pthreads: -odpthreads +odpthreads${EXEEXT} commit 133e7fc06147486fff5ab3393b1a791ab97d19d3 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue Oct 17 15:11:57 2017 +0300 example: add ${EXEEXT} when calling compiled programs 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/example/Makefile.inc b/example/Makefile.inc index 12edc46c..1609066e 100644 --- a/example/Makefile.inc +++ b/example/Makefile.inc @@ -1,3 +1,5 @@ +TESTS_ENVIRONMENT = EXEEXT=${EXEEXT} + LIB = $(top_builddir)/lib LDADD = $(LIB)/libodp-linux.la $(LIB)/libodphelper.la $(DPDK_PMDS) AM_CFLAGS = \ diff --git a/example/l2fwd_simple/l2fwd_simple_run.sh b/example/l2fwd_simple/l2fwd_simple_run.sh index 130a3a84..089d9f97 100755 --- a/example/l2fwd_simple/l2fwd_simple_run.sh +++ b/example/l2fwd_simple/l2fwd_simple_run.sh @@ -9,7 +9,8 @@ PCAP_IN=`find . ${TEST_DIR} $(dirname $0) -name udp64.pcap -print -quit` echo "using PCAP_IN = ${PCAP_IN}" -./odp_l2fwd_simple pcap:in=${PCAP_IN} pcap:out=pcapout.pcap 02:00:00:00:00:01 02:00:00:00:00:02 & +./odp_l2fwd_simple${EXEEXT} pcap:in=${PCAP_IN} pcap:out=pcapout.pcap \ + 02:00:00:00:00:01 02:00:00:00:00:02 & sleep 1 kill -s SIGINT $! diff --git a/example/l3fwd/odp_l3fwd_run.sh b/example/l3fwd/odp_l3fwd_run.sh index 6f0b11a0..dff3afd7 100755 --- a/example/l3fwd/odp_l3fwd_run.sh +++ b/example/l3fwd/odp_l3fwd_run.sh @@ -11,7 +11,7 @@ PCAP_OUT="pcapout.pcap" PCAP_IN_SIZE=`stat -c %s ${PCAP_IN}` echo "using PCAP_IN = ${PCAP_IN}, PCAP_OUT = ${PCAP_OUT}" -./odp_l3fwd -i pcap:in=${PCAP_IN},pcap:out=${PCAP_OUT} \ +./odp_l3fwd${EXEEXT} -i pcap:in=${PCAP_IN},pcap:out=${PCAP_OUT} \ -r "10.0.0.0/24,pcap:out=${PCAP_OUT}" -d 30 STATUS=$? diff --git a/example/packet/pktio_run.sh b/example/packet/pktio_run.sh index 3adb2d62..122418b6 100755 --- a/example/packet/pktio_run.sh +++ b/example/packet/pktio_run.sh @@ -12,7 +12,7 @@ PCAP_IN_SIZE=`stat -c %s ${PCAP_IN}` echo "using PCAP in=${PCAP_IN}:out=${PCAP_OUT} size %${PCAP_IN_SIZE}" # burst mode -./odp_pktio -ipcap:in=${PCAP_IN}:out=${PCAP_OUT} -t 5 -m 0 +./odp_pktio${EXEEXT} -ipcap:in=${PCAP_IN}:out=${PCAP_OUT} -t 5 -m 0 STATUS=$? PCAP_OUT_SIZE=`stat -c %s ${PCAP_OUT}` rm -f ${PCAP_OUT} @@ -24,7 +24,7 @@ fi echo "Pass -m 0: status ${STATUS}, in:${PCAP_IN_SIZE} out:${PCAP_OUT_SIZE}" # queue mode -./odp_pktio -ipcap:in=${PCAP_IN}:out=${PCAP_OUT} -t 5 -m 1 +./odp_pktio${EXEEXT} -ipcap:in=${PCAP_IN}:out=${PCAP_OUT} -t 5 -m 1 STATUS=$? PCAP_OUT_SIZE=`stat -c %s ${PCAP_OUT}` rm -f ${PCAP_OUT} @@ -36,7 +36,7 @@ fi echo "Pass -m 1: status ${STATUS}, in:${PCAP_IN_SIZE} out:${PCAP_OUT_SIZE}" # sched/queue mode -./odp_pktio -ipcap:in=${PCAP_IN}:out=${PCAP_OUT} -t 5 -m 2 +./odp_pktio${EXEEXT} -ipcap:in=${PCAP_IN}:out=${PCAP_OUT} -t 5 -m 2 STATUS=$? PCAP_OUT_SIZE=`stat -c %s ${PCAP_OUT}` rm -f ${PCAP_OUT} @@ -48,7 +48,7 @@ fi echo "Pass -m 2: status ${STATUS}, in:${PCAP_IN_SIZE} out:${PCAP_OUT_SIZE}" # cpu number option test 1 -./odp_pktio -ipcap:in=${PCAP_IN}:out=${PCAP_OUT} -t 5 -m 0 -c 1 +./odp_pktio${EXEEXT} -ipcap:in=${PCAP_IN}:out=${PCAP_OUT} -t 5 -m 0 -c 1 STATUS=$? PCAP_OUT_SIZE=`stat -c %s ${PCAP_OUT}` rm -f ${PCAP_OUT} diff --git a/example/switch/switch_run.sh b/example/switch/switch_run.sh index d9aa8bd0..9a8e8480 100755 --- a/example/switch/switch_run.sh +++ b/example/switch/switch_run.sh @@ -19,7 +19,7 @@ do RX_PORTS="${RX_PORTS},pcap:out=pcapout${i}.pcap" done -./odp_switch -i pcap:in=${PCAP_IN}${RX_PORTS} -t 1 +./odp_switch${EXEEXT} -i pcap:in=${PCAP_IN}${RX_PORTS} -t 1 STATUS=$? if [ "$STATUS" -ne 0 ]; then echo "Error: status was: $STATUS, expected 0" commit 8c9ce8c63eed9d01fec54c09bd17040914abd623 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue Oct 17 15:11:57 2017 +0300 linux-gen: drop unused EXEEXT suffix 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/test/mmap_vlan_ins/Makefile.am b/platform/linux-generic/test/mmap_vlan_ins/Makefile.am index e42b5254..8559e55b 100644 --- a/platform/linux-generic/test/mmap_vlan_ins/Makefile.am +++ b/platform/linux-generic/test/mmap_vlan_ins/Makefile.am @@ -10,7 +10,7 @@ dist_check_DATA = vlan.pcap test_SCRIPTS = $(dist_check_SCRIPTS) test_DATA = $(dist_check_DATA) -test_PROGRAMS = plat_mmap_vlan_ins$(EXEEXT) +test_PROGRAMS = plat_mmap_vlan_ins # Clonned from example odp_l2fwd simple plat_mmap_vlan_ins_SOURCES = mmap_vlan_ins.c diff --git a/platform/linux-generic/test/ring/Makefile.am b/platform/linux-generic/test/ring/Makefile.am index 57ba82ae..37604755 100644 --- a/platform/linux-generic/test/ring/Makefile.am +++ b/platform/linux-generic/test/ring/Makefile.am @@ -1,6 +1,6 @@ include ../Makefile.inc -test_PROGRAMS = ring_main$(EXEEXT) +test_PROGRAMS = ring_main ring_main_SOURCES = \ ring_main.c \ ring_suites.c ring_suites.h \ diff --git a/platform/linux-generic/test/validation/api/shmem/Makefile.am b/platform/linux-generic/test/validation/api/shmem/Makefile.am index 962450e5..131a511b 100644 --- a/platform/linux-generic/test/validation/api/shmem/Makefile.am +++ b/platform/linux-generic/test/validation/api/shmem/Makefile.am @@ -1,7 +1,7 @@ include ../Makefile.inc #the main test program is shmem_linux, which, in turn, starts a shmem_odp: -test_PROGRAMS = shmem_linux$(EXEEXT) shmem_odp1$(EXEEXT) shmem_odp2$(EXEEXT) +test_PROGRAMS = shmem_linux shmem_odp1 shmem_odp2 #shmem_linux is stand alone, pure linux (no ODP): shmem_linux_SOURCES = shmem_linux.c shmem_linux.h shmem_common.h commit 2b57c7d7b96eef16c36b8b0020b3dd78acc82660 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue Oct 17 15:11:31 2017 +0300 test: drop unused EXEEXT suffix 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/miscellaneous/Makefile.am b/test/miscellaneous/Makefile.am index 7d42b07e..3ea5d5e8 100644 --- a/test/miscellaneous/Makefile.am +++ b/test/miscellaneous/Makefile.am @@ -1,8 +1,8 @@ include $(top_srcdir)/test/Makefile.inc if test_cpp -bin_PROGRAMS = odp_api_from_cpp$(EXEEXT) -TESTS = odp_api_from_cpp$(EXEEXT) +bin_PROGRAMS = odp_api_from_cpp +TESTS = odp_api_from_cpp endif odp_api_from_cpp_SOURCES = odp_api_from_cpp.cpp diff --git a/test/performance/Makefile.am b/test/performance/Makefile.am index 8d9fd359..1dccd82e 100644 --- a/test/performance/Makefile.am +++ b/test/performance/Makefile.am @@ -2,14 +2,14 @@ include $(top_srcdir)/test/Makefile.inc TESTS_ENVIRONMENT += TEST_DIR=${builddir} -EXECUTABLES = odp_bench_packet$(EXEEXT) \ - odp_crypto$(EXEEXT) \ - odp_pktio_perf$(EXEEXT) - -COMPILE_ONLY = odp_l2fwd$(EXEEXT) \ - odp_pktio_ordered$(EXEEXT) \ - odp_sched_latency$(EXEEXT) \ - odp_scheduling$(EXEEXT) +EXECUTABLES = odp_bench_packet \ + odp_crypto \ + odp_pktio_perf + +COMPILE_ONLY = odp_l2fwd \ + odp_pktio_ordered \ + odp_sched_latency \ + odp_scheduling TESTSCRIPTS = odp_l2fwd_run.sh \ odp_pktio_ordered_run.sh \ diff --git a/test/validation/api/atomic/Makefile.am b/test/validation/api/atomic/Makefile.am index b09d3b88..859e3c51 100644 --- a/test/validation/api/atomic/Makefile.am +++ b/test/validation/api/atomic/Makefile.am @@ -1,5 +1,5 @@ include ../Makefile.inc -test_PROGRAMS = atomic_main$(EXEEXT) +test_PROGRAMS = atomic_main atomic_main_SOURCES = atomic_main.c atomic.c atomic.h atomic_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/barrier/Makefile.am b/test/validation/api/barrier/Makefile.am index 4dfb1d1e..b0310e3a 100644 --- a/test/validation/api/barrier/Makefile.am +++ b/test/validation/api/barrier/Makefile.am @@ -1,5 +1,5 @@ include ../Makefile.inc -test_PROGRAMS = barrier_main$(EXEEXT) +test_PROGRAMS = barrier_main barrier_main_SOURCES = barrier_main.c barrier.c barrier.h barrier_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/buffer/Makefile.am b/test/validation/api/buffer/Makefile.am index ae6ce0a4..59639ff7 100644 --- a/test/validation/api/buffer/Makefile.am +++ b/test/validation/api/buffer/Makefile.am @@ -1,5 +1,5 @@ include ../Makefile.inc -test_PROGRAMS = buffer_main$(EXEEXT) +test_PROGRAMS = buffer_main buffer_main_SOURCES = buffer_main.c buffer.c buffer.h buffer_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/classification/Makefile.am b/test/validation/api/classification/Makefile.am index f177528e..b5870307 100644 --- a/test/validation/api/classification/Makefile.am +++ b/test/validation/api/classification/Makefile.am @@ -1,6 +1,6 @@ include ../Makefile.inc -test_PROGRAMS = classification_main$(EXEEXT) +test_PROGRAMS = classification_main classification_main_SOURCES = classification_main.c \ odp_classification_basic.c \ odp_classification_tests.c \ diff --git a/test/validation/api/cpumask/Makefile.am b/test/validation/api/cpumask/Makefile.am index ddafb9ab..ff12f56f 100644 --- a/test/validation/api/cpumask/Makefile.am +++ b/test/validation/api/cpumask/Makefile.am @@ -1,5 +1,5 @@ include ../Makefile.inc -test_PROGRAMS = cpumask_main$(EXEEXT) +test_PROGRAMS = cpumask_main cpumask_main_SOURCES = cpumask_main.c cpumask.c cpumask.h cpumask_main_LDADD = $(LIBCPUMASK_COMMON) $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/crypto/Makefile.am b/test/validation/api/crypto/Makefile.am index 6660e1b2..94f1c1ca 100644 --- a/test/validation/api/crypto/Makefile.am +++ b/test/validation/api/crypto/Makefile.am @@ -1,6 +1,6 @@ include ../Makefile.inc -test_PROGRAMS = crypto_main$(EXEEXT) +test_PROGRAMS = crypto_main crypto_main_SOURCES = crypto_main.c \ crypto.c \ crypto.h \ diff --git a/test/validation/api/errno/Makefile.am b/test/validation/api/errno/Makefile.am index 8f7b2e88..9eddfb48 100644 --- a/test/validation/api/errno/Makefile.am +++ b/test/validation/api/errno/Makefile.am @@ -1,5 +1,5 @@ include ../Makefile.inc -test_PROGRAMS = errno_main$(EXEEXT) +test_PROGRAMS = errno_main errno_main_SOURCES = errno_main.c errno.c errno.h errno_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/hash/Makefile.am b/test/validation/api/hash/Makefile.am index b37f2e00..bd098ffb 100644 --- a/test/validation/api/hash/Makefile.am +++ b/test/validation/api/hash/Makefile.am @@ -1,5 +1,5 @@ include ../Makefile.inc -test_PROGRAMS = hash_main$(EXEEXT) +test_PROGRAMS = hash_main hash_main_SOURCES = hash_main.c hash.c hash.h hash_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/init/Makefile.am b/test/validation/api/init/Makefile.am index ba25c61f..522c3a18 100644 --- a/test/validation/api/init/Makefile.am +++ b/test/validation/api/init/Makefile.am @@ -3,7 +3,7 @@ include ../Makefile.inc # most platforms are expected not to support multiple ODP inits # following each other: therefore 3 separate binaries are # created, each containing its ODP init test. -test_PROGRAMS = init_main_abort$(EXEEXT) init_main_log$(EXEEXT) init_main_ok$(EXEEXT) +test_PROGRAMS = init_main_abort init_main_log init_main_ok init_main_abort_SOURCES = init_main_abort.c init.c init.h init_main_log_SOURCES = init_main_log.c init.c init.h init_main_ok_SOURCES = init_main_ok.c init.c init.h diff --git a/test/validation/api/lock/Makefile.am b/test/validation/api/lock/Makefile.am index 80740282..b434fe77 100644 --- a/test/validation/api/lock/Makefile.am +++ b/test/validation/api/lock/Makefile.am @@ -1,5 +1,5 @@ include ../Makefile.inc -test_PROGRAMS = lock_main$(EXEEXT) +test_PROGRAMS = lock_main lock_main_SOURCES = lock_main.c lock.c lock.h lock_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/packet/Makefile.am b/test/validation/api/packet/Makefile.am index fb356997..43300ed0 100644 --- a/test/validation/api/packet/Makefile.am +++ b/test/validation/api/packet/Makefile.am @@ -1,5 +1,5 @@ include ../Makefile.inc -test_PROGRAMS = packet_main$(EXEEXT) +test_PROGRAMS = packet_main packet_main_SOURCES = packet_main.c packet.c packet.h packet_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/pktio/Makefile.am b/test/validation/api/pktio/Makefile.am index eb4b6038..a416fd1d 100644 --- a/test/validation/api/pktio/Makefile.am +++ b/test/validation/api/pktio/Makefile.am @@ -1,5 +1,5 @@ include ../Makefile.inc -test_PROGRAMS = pktio_main$(EXEEXT) +test_PROGRAMS = pktio_main pktio_main_SOURCES = pktio_main.c parser.c parser.h pktio.c pktio.h pktio_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/pool/Makefile.am b/test/validation/api/pool/Makefile.am index 85a37b05..9e7c42b5 100644 --- a/test/validation/api/pool/Makefile.am +++ b/test/validation/api/pool/Makefile.am @@ -1,5 +1,5 @@ include ../Makefile.inc -test_PROGRAMS = pool_main$(EXEEXT) +test_PROGRAMS = pool_main pool_main_SOURCES = pool_main.c pool.c pool.h pool_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/queue/Makefile.am b/test/validation/api/queue/Makefile.am index a5b6a9b1..9b1c6b77 100644 --- a/test/validation/api/queue/Makefile.am +++ b/test/validation/api/queue/Makefile.am @@ -1,5 +1,5 @@ include ../Makefile.inc -test_PROGRAMS = queue_main$(EXEEXT) +test_PROGRAMS = queue_main queue_main_SOURCES = queue_main.c queue.c queue.h queue_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/random/Makefile.am b/test/validation/api/random/Makefile.am index e026f045..e9e7ffc0 100644 --- a/test/validation/api/random/Makefile.am +++ b/test/validation/api/random/Makefile.am @@ -1,5 +1,5 @@ include ../Makefile.inc -test_PROGRAMS = random_main$(EXEEXT) +test_PROGRAMS = random_main random_main_SOURCES = random_main.c random.c random.h random_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/scheduler/Makefile.am b/test/validation/api/scheduler/Makefile.am index 6c71b010..34abf7d6 100644 --- a/test/validation/api/scheduler/Makefile.am +++ b/test/validation/api/scheduler/Makefile.am @@ -1,5 +1,5 @@ include ../Makefile.inc -test_PROGRAMS = scheduler_main$(EXEEXT) +test_PROGRAMS = scheduler_main scheduler_main_SOURCES = scheduler_main.c scheduler.c scheduler.h scheduler_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/shmem/Makefile.am b/test/validation/api/shmem/Makefile.am index d955cc22..8c5d7f70 100644 --- a/test/validation/api/shmem/Makefile.am +++ b/test/validation/api/shmem/Makefile.am @@ -1,5 +1,5 @@ include ../Makefile.inc -test_PROGRAMS = shmem_main$(EXEEXT) +test_PROGRAMS = shmem_main shmem_main_SOURCES = shmem_main.c shmem.c shmem.h shmem_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/std_clib/Makefile.am b/test/validation/api/std_clib/Makefile.am index 919c2556..dc75c95c 100644 --- a/test/validation/api/std_clib/Makefile.am +++ b/test/validation/api/std_clib/Makefile.am @@ -1,5 +1,5 @@ include ../Makefile.inc -test_PROGRAMS = std_clib_main$(EXEEXT) +test_PROGRAMS = std_clib_main std_clib_main_SOURCES = std_clib_main.c std_clib.c std_clib.h std_clib_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/system/Makefile.am b/test/validation/api/system/Makefile.am index 15e6d49a..123d3a69 100644 --- a/test/validation/api/system/Makefile.am +++ b/test/validation/api/system/Makefile.am @@ -1,5 +1,5 @@ include ../Makefile.inc -test_PROGRAMS = system_main$(EXEEXT) +test_PROGRAMS = system_main system_main_SOURCES = system_main.c system.c system.h system_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/thread/Makefile.am b/test/validation/api/thread/Makefile.am index 59e136b2..1c56574f 100644 --- a/test/validation/api/thread/Makefile.am +++ b/test/validation/api/thread/Makefile.am @@ -1,6 +1,6 @@ include ../Makefile.inc -test_PROGRAMS = thread_main$(EXEEXT) +test_PROGRAMS = thread_main thread_main_CPPFLAGS = $(AM_CPPFLAGS) -DTEST_THRMASK thread_main_SOURCES = thread_main.c thread.c thread.h thread_main_LDADD = $(LIBTHRMASK_COMMON) $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/time/Makefile.am b/test/validation/api/time/Makefile.am index faed577f..669d1226 100644 --- a/test/validation/api/time/Makefile.am +++ b/test/validation/api/time/Makefile.am @@ -7,7 +7,7 @@ TEST_EXTENSIONS = .sh TESTS = $(TESTSCRIPTS) -test_PROGRAMS = time_main$(EXEEXT) +test_PROGRAMS = time_main time_main_SOURCES = time_main.c time.c time_test.h time_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/timer/Makefile.am b/test/validation/api/timer/Makefile.am index 4f79020d..c953dcb3 100644 --- a/test/validation/api/timer/Makefile.am +++ b/test/validation/api/timer/Makefile.am @@ -1,5 +1,5 @@ include ../Makefile.inc -test_PROGRAMS = timer_main$(EXEEXT) +test_PROGRAMS = timer_main timer_main_SOURCES = timer_main.c timer.c timer.h timer_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/traffic_mngr/Makefile.am b/test/validation/api/traffic_mngr/Makefile.am index 3884a13c..dc4f8709 100644 --- a/test/validation/api/traffic_mngr/Makefile.am +++ b/test/validation/api/traffic_mngr/Makefile.am @@ -7,7 +7,7 @@ TEST_EXTENSIONS = .sh TESTS = $(TESTSCRIPTS) -test_PROGRAMS = traffic_mngr_main$(EXEEXT) +test_PROGRAMS = traffic_mngr_main traffic_mngr_main_SOURCES = traffic_mngr_main.c traffic_mngr.c traffic_mngr.h traffic_mngr_main_LDADD = -lm $(LIBCUNIT_COMMON) $(LIBODP) commit cbced85824c4c03c0b35396d559ebfb187237569 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue Oct 17 12:38:07 2017 +0300 configure: cleanup per-platform if Move setting IMPLEMENTATION_NAME to platform configure.m4. Use AS_IF instead of handcoded if. Use AC_MSG_ERROR instead of echo & exit. 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 89ff486f..4bce0534 100644 --- a/configure.ac +++ b/configure.ac @@ -165,15 +165,9 @@ AC_SUBST([with_platform]) ########################################################################## # Run platform specific checks and settings ########################################################################## -IMPLEMENTATION_NAME="" -if test "${with_platform}" = "linux-generic"; -then - m4_include([./platform/linux-generic/m4/configure.m4]) - IMPLEMENTATION_NAME="odp-linux" -else - echo "UNSUPPORTED PLATFORM: ${with_platform}" - exit 1 -fi +AS_IF([test "${with_platform}" = "linux-generic"], + [m4_include([./platform/linux-generic/m4/configure.m4])], + [AC_MSG_ERROR([UNSUPPORTED PLATFORM: ${with_platform}])]) AC_DEFINE_UNQUOTED([IMPLEMENTATION_NAME], ["$IMPLEMENTATION_NAME"], [Define to the name of the implementation]) diff --git a/platform/linux-generic/m4/configure.m4 b/platform/linux-generic/m4/configure.m4 index 68a270d8..5d7ad35a 100644 --- a/platform/linux-generic/m4/configure.m4 +++ b/platform/linux-generic/m4/configure.m4 @@ -1,3 +1,5 @@ +IMPLEMENTATION_NAME="odp-linux" + ODP_VISIBILITY ODP_ATOMIC commit 1217fbaed0aee2ee395c131bb7fd2e201214ed31 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue Oct 17 12:36:24 2017 +0300 configure: drop SDK_INSTALL_PATH variable 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 9144c418..89ff486f 100644 --- a/configure.ac +++ b/configure.ac @@ -186,16 +186,6 @@ m4_include([./example/m4/configure.m4]) m4_include([./helper/m4/configure.m4]) m4_include([./test/m4/configure.m4]) -########################################################################## -# Set SDK install path -########################################################################## -AC_ARG_WITH([sdk-install-path], -AS_HELP_STRING([--with-sdk-install-path=DIR path to external libs and headers], - [(or in the default path if not specified).]), -[SDK_INSTALL_PATH=$withval SDK_INSTALL_PATH_=1],[SDK_INSTALL_PATH_=]) - -AC_SUBST(SDK_INSTALL_PATH) - ########################################################################## # Set the install directory for test binaries/scripts ########################################################################## @@ -211,7 +201,6 @@ AM_CONDITIONAL([test_installdir], [test "x$testdir" != "xno"]) ########################################################################## # Set conditionals as computed within platform specific files ########################################################################## -AM_CONDITIONAL([SDK_INSTALL_PATH_], [test "x${SDK_INSTALL_PATH_}" = "x1"]) AM_CONDITIONAL([HAVE_DOXYGEN], [test "x${DOXYGEN}" = "xdoxygen"]) AM_CONDITIONAL([user_guide], [test "x${user_guides}" = "xyes" ]) AM_CONDITIONAL([HAVE_MSCGEN], [test "x${MSCGEN}" = "xmscgen"]) commit 927b57f21124f31e23fd7f72dddcc93a5248ed53 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue Oct 17 12:35:00 2017 +0300 configure: use AC_CONFIG_COMMANDS_PRE to set conditionals 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 dfea5d20..9144c418 100644 --- a/configure.ac +++ b/configure.ac @@ -162,9 +162,6 @@ AC_ARG_WITH([platform], AC_SUBST([with_platform]) -AM_CONDITIONAL([PLATFORM_IS_LINUX_GENERIC], - [test "x$with_platform" = "xlinux-generic"]) - ########################################################################## # Run platform specific checks and settings ########################################################################## diff --git a/platform/linux-generic/m4/configure.m4 b/platform/linux-generic/m4/configure.m4 index 7dc83bf8..68a270d8 100644 --- a/platform/linux-generic/m4/configure.m4 +++ b/platform/linux-generic/m4/configure.m4 @@ -11,6 +11,9 @@ m4_include([platform/linux-generic/m4/odp_schedule.m4]) m4_include([platform/linux-generic/m4/performance.m4]) +AC_CONFIG_COMMANDS_PRE([dnl +AM_CONDITIONAL([PLATFORM_IS_LINUX_GENERIC], + [test "${with_platform}" = "linux-generic"]) AC_CONFIG_FILES([platform/linux-generic/Makefile platform/linux-generic/libodp-linux.pc platform/linux-generic/include/odp/api/plat/static_inline.h @@ -21,3 +24,4 @@ AC_CONFIG_FILES([platform/linux-generic/Makefile platform/linux-generic/test/pktio_ipc/Makefile platform/linux-generic/test/ring/Makefile platform/linux-generic/test/performance/Makefile]) +]) diff --git a/platform/linux-generic/m4/odp_netmap.m4 b/platform/linux-generic/m4/odp_netmap.m4 index 24ed4bc1..85462c92 100644 --- a/platform/linux-generic/m4/odp_netmap.m4 +++ b/platform/linux-generic/m4/odp_netmap.m4 @@ -43,4 +43,6 @@ fi ########################################################################## CPPFLAGS=$OLD_CPPFLAGS +AC_CONFIG_COMMANDS_PRE([dnl AM_CONDITIONAL([netmap_support], [test x$netmap_support = xyes ]) +]) diff --git a/platform/linux-generic/m4/odp_pcap.m4 b/platform/linux-generic/m4/odp_pcap.m4 index 0b5b8a2e..0a8f3518 100644 --- a/platform/linux-generic/m4/odp_pcap.m4 +++ b/platform/linux-generic/m4/odp_pcap.m4 @@ -15,4 +15,6 @@ fi AC_SUBST([PCAP_LIBS]) -AM_CONDITIONAL([HAVE_PCAP], [test $have_pcap = yes]) +AC_CONFIG_COMMANDS_PRE([dnl +AM_CONDITIONAL([HAVE_PCAP], [test x$have_pcap = xyes]) +]) diff --git a/platform/linux-generic/m4/performance.m4 b/platform/linux-generic/m4/performance.m4 index 05b3a990..f2e7107c 100644 --- a/platform/linux-generic/m4/performance.m4 +++ b/platform/linux-generic/m4/performance.m4 @@ -5,4 +5,6 @@ AC_ARG_ENABLE([test-perf-proc], [AS_HELP_STRING([--enable-test-perf-proc], [run test in test/performance in process mode])], [test_perf_proc=$enableval], [test_perf_proc=yes]) +AC_CONFIG_COMMANDS_PRE([dnl AM_CONDITIONAL([test_perf_proc], [test x$test_perf_proc = xyes ]) +]) commit 1bcf171f00973bcc21baadf9919a61cd6abdf713 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue Oct 17 12:33:08 2017 +0300 configure: use AS_HELP_STRING instead of AC_HELP_STRING AC_HELP_STRING was replaced loong time ago by AS_HELP_STRING (it was before Autoconf 2.60). Let's use new macro instead of the obsolete one. 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 80bc3122..dfea5d20 100644 --- a/configure.ac +++ b/configure.ac @@ -193,7 +193,7 @@ m4_include([./test/m4/configure.m4]) # Set SDK install path ########################################################################## AC_ARG_WITH([sdk-install-path], -AC_HELP_STRING([--with-sdk-install-path=DIR path to external libs and headers], +AS_HELP_STRING([--with-sdk-install-path=DIR path to external libs and headers], [(or in the default path if not specified).]), [SDK_INSTALL_PATH=$withval SDK_INSTALL_PATH_=1],[SDK_INSTALL_PATH_=]) @@ -203,7 +203,7 @@ AC_SUBST(SDK_INSTALL_PATH) # Set the install directory for test binaries/scripts ########################################################################## AC_ARG_WITH([testdir], - [AC_HELP_STRING([--with-testdir=DIR], [installation directory for tests])], + [AS_HELP_STRING([--with-testdir=DIR], [installation directory for tests])], [testdir=$withval], [testdir=no]) AS_IF([test "x$testdir" = "xyes"], [testdir=$libdir/odp/tests], diff --git a/m4/odp_openssl.m4 b/m4/odp_openssl.m4 index 72568a8a..428470dc 100644 --- a/m4/odp_openssl.m4 +++ b/m4/odp_openssl.m4 @@ -10,7 +10,7 @@ AC_ARG_VAR([OPENSSL_STATIC_LIBS], [static linker flags for OpenSSL crypto librar # Set optional OpenSSL path ########################################################################## AC_ARG_WITH([openssl-path], -[AC_HELP_STRING([--with-openssl-path=DIR], +[AS_HELP_STRING([--with-openssl-path=DIR], [path to openssl libs and headers (use system path if not provided)])], [OPENSSL_CPPFLAGS="-I$withval/include" OPENSSL_LIBS="-L$withval/lib -lcrypto"], diff --git a/platform/linux-generic/m4/odp_dpdk.m4 b/platform/linux-generic/m4/odp_dpdk.m4 index b6554165..9d90bbab 100644 --- a/platform/linux-generic/m4/odp_dpdk.m4 +++ b/platform/linux-generic/m4/odp_dpdk.m4 @@ -3,7 +3,7 @@ ########################################################################## pktio_dpdk_support=no AC_ARG_WITH([dpdk-path], -AC_HELP_STRING([--with-dpdk-path=DIR path to dpdk build directory]), +AS_HELP_STRING([--with-dpdk-path=DIR path to dpdk build directory]), [DPDK_PATH="$withval" DPDK_CPPFLAGS="-msse4.2 -isystem $DPDK_PATH/include" pktio_dpdk_support=yes],[]) diff --git a/platform/linux-generic/m4/odp_netmap.m4 b/platform/linux-generic/m4/odp_netmap.m4 index bd04824b..24ed4bc1 100644 --- a/platform/linux-generic/m4/odp_netmap.m4 +++ b/platform/linux-generic/m4/odp_netmap.m4 @@ -12,7 +12,7 @@ AC_ARG_ENABLE([netmap_support], # Set optional netmap path ########################################################################## AC_ARG_WITH([netmap-path], -AC_HELP_STRING([--with-netmap-path=DIR path to netmap root directory], +AS_HELP_STRING([--with-netmap-path=DIR path to netmap root directory], [(or in the default path if not specified).]), [NETMAP_PATH=$withval NETMAP_CPPFLAGS="-isystem $NETMAP_PATH/sys" ----------------------------------------------------------------------- Summary of changes: configure.ac | 28 ++------- example/Makefile.inc | 2 + example/l2fwd_simple/l2fwd_simple_run.sh | 3 +- example/l3fwd/odp_l3fwd_run.sh | 2 +- example/packet/pktio_run.sh | 8 +-- example/switch/switch_run.sh | 2 +- helper/test/Makefile.am | 2 + helper/test/odpthreads_as_processes | 2 +- helper/test/odpthreads_as_pthreads | 2 +- m4/odp_openssl.m4 | 2 +- .../linux-generic/include/odp_buffer_internal.h | 6 +- .../linux-generic/include/odp_config_internal.h | 17 +++++- .../linux-generic/include/odp_packet_internal.h | 8 +-- platform/linux-generic/include/odp_pool_internal.h | 3 +- platform/linux-generic/m4/configure.m4 | 6 ++ platform/linux-generic/m4/odp_dpdk.m4 | 2 +- platform/linux-generic/m4/odp_netmap.m4 | 4 +- platform/linux-generic/m4/odp_pcap.m4 | 4 +- platform/linux-generic/m4/performance.m4 | 2 + platform/linux-generic/odp_packet.c | 71 +++++++++++----------- platform/linux-generic/odp_packet_io.c | 29 +++++---- platform/linux-generic/odp_pool.c | 55 +++++++++++------ platform/linux-generic/pktio/dpdk.c | 6 +- platform/linux-generic/pktio/netmap.c | 2 +- platform/linux-generic/pktio/socket_mmap.c | 2 +- platform/linux-generic/test/Makefile.am | 2 +- .../linux-generic/test/mmap_vlan_ins/Makefile.am | 2 +- platform/linux-generic/test/ring/Makefile.am | 2 +- .../test/validation/api/shmem/Makefile.am | 2 +- .../test/validation/api/shmem/shmem_linux.c | 8 ++- test/miscellaneous/Makefile.am | 4 +- test/performance/Makefile.am | 16 ++--- test/validation/api/atomic/Makefile.am | 2 +- test/validation/api/barrier/Makefile.am | 2 +- test/validation/api/buffer/Makefile.am | 2 +- test/validation/api/classification/Makefile.am | 2 +- test/validation/api/cpumask/Makefile.am | 2 +- test/validation/api/crypto/Makefile.am | 2 +- test/validation/api/errno/Makefile.am | 2 +- test/validation/api/hash/Makefile.am | 2 +- test/validation/api/init/Makefile.am | 2 +- test/validation/api/lock/Makefile.am | 2 +- test/validation/api/packet/Makefile.am | 2 +- test/validation/api/packet/packet.c | 29 +++++++-- test/validation/api/pktio/Makefile.am | 2 +- test/validation/api/pool/Makefile.am | 2 +- test/validation/api/queue/Makefile.am | 2 +- test/validation/api/random/Makefile.am | 2 +- test/validation/api/scheduler/Makefile.am | 2 +- test/validation/api/shmem/Makefile.am | 2 +- test/validation/api/std_clib/Makefile.am | 2 +- test/validation/api/system/Makefile.am | 2 +- test/validation/api/thread/Makefile.am | 2 +- test/validation/api/time/Makefile.am | 2 +- test/validation/api/timer/Makefile.am | 2 +- test/validation/api/traffic_mngr/Makefile.am | 2 +- 56 files changed, 215 insertions(+), 166 deletions(-) hooks/post-receive --

8 years, 4 months

[COMMIT] branch master updated. v1.15.0.0-268-gec0c3145

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 discards 48dfcade1602e9cc9bb8cd3251037508aef146cd (commit) discards 2aa9a05b11bdfac0c0126384d4677b3f9c561a78 (commit) discards df978d9b4e766c8e1cb1a88a28d98318840fee22 (commit) discards 482eeee380d40596131826c1103ed89247bd17e5 (commit) discards 254190ffcdb51549ee23846f33fd45513656b78c (commit) discards 52877c96e12bf62614df0482175384565a851083 (commit) discards 133e7fc06147486fff5ab3393b1a791ab97d19d3 (commit) discards 8c9ce8c63eed9d01fec54c09bd17040914abd623 (commit) discards 2b57c7d7b96eef16c36b8b0020b3dd78acc82660 (commit) discards cbced85824c4c03c0b35396d559ebfb187237569 (commit) discards 1217fbaed0aee2ee395c131bb7fd2e201214ed31 (commit) discards 927b57f21124f31e23fd7f72dddcc93a5248ed53 (commit) discards 1bcf171f00973bcc21baadf9919a61cd6abdf713 (commit) This update discarded existing revisions and left the branch pointing at a previous point in the repository history. * -- * -- N (ec0c3145fcafa09ae3a79875e7e07dd4794583cc) \ O -- O -- O (48dfcade1602e9cc9bb8cd3251037508aef146cd) The removed revisions are not necessarily gone - if another reference still refers to them they will stay in the repository. No new revisions were added by this update. Summary of changes: configure.ac | 28 ++++++++++++++++++--- example/Makefile.inc | 2 -- example/l2fwd_simple/l2fwd_simple_run.sh | 3 +-- example/l3fwd/odp_l3fwd_run.sh | 2 +- example/packet/pktio_run.sh | 8 +++--- example/switch/switch_run.sh | 2 +- helper/test/Makefile.am | 2 -- helper/test/odpthreads_as_processes | 2 +- helper/test/odpthreads_as_pthreads | 2 +- m4/odp_openssl.m4 | 2 +- platform/linux-generic/m4/configure.m4 | 6 ----- platform/linux-generic/m4/odp_dpdk.m4 | 2 +- platform/linux-generic/m4/odp_netmap.m4 | 4 +-- platform/linux-generic/m4/odp_pcap.m4 | 4 +-- platform/linux-generic/m4/performance.m4 | 2 -- platform/linux-generic/odp_packet_io.c | 29 +++++++++++----------- platform/linux-generic/test/Makefile.am | 2 +- .../linux-generic/test/mmap_vlan_ins/Makefile.am | 2 +- platform/linux-generic/test/ring/Makefile.am | 2 +- .../test/validation/api/shmem/Makefile.am | 2 +- .../test/validation/api/shmem/shmem_linux.c | 8 ++---- test/miscellaneous/Makefile.am | 4 +-- test/performance/Makefile.am | 16 ++++++------ test/validation/api/atomic/Makefile.am | 2 +- test/validation/api/barrier/Makefile.am | 2 +- test/validation/api/buffer/Makefile.am | 2 +- test/validation/api/classification/Makefile.am | 2 +- test/validation/api/cpumask/Makefile.am | 2 +- test/validation/api/crypto/Makefile.am | 2 +- test/validation/api/errno/Makefile.am | 2 +- test/validation/api/hash/Makefile.am | 2 +- test/validation/api/init/Makefile.am | 2 +- test/validation/api/lock/Makefile.am | 2 +- test/validation/api/packet/Makefile.am | 2 +- test/validation/api/pktio/Makefile.am | 2 +- test/validation/api/pool/Makefile.am | 2 +- test/validation/api/queue/Makefile.am | 2 +- test/validation/api/random/Makefile.am | 2 +- test/validation/api/scheduler/Makefile.am | 2 +- test/validation/api/shmem/Makefile.am | 2 +- test/validation/api/std_clib/Makefile.am | 2 +- test/validation/api/system/Makefile.am | 2 +- test/validation/api/thread/Makefile.am | 2 +- test/validation/api/time/Makefile.am | 2 +- test/validation/api/timer/Makefile.am | 2 +- test/validation/api/traffic_mngr/Makefile.am | 2 +- 46 files changed, 91 insertions(+), 91 deletions(-) hooks/post-receive --

8 years, 4 months

[COMMIT] branch api-next updated. v1.15.0.0-760-gedca8cd1

by git＠git-us.linaro.org

8 years, 4 months

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

git-lng-odp