git-lng-odp

git-lng-odp@lists.linaro.org

1203 discussions

[COMMIT] branch master updated. v1.13.0.0-18-g0d6c080

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 0d6c0804640151f8aa9970cc74f1fef28a11fac1 (commit) from b17aeea11a9bac1f5d55463e81904af12c99b4c7 (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 0d6c0804640151f8aa9970cc74f1fef28a11fac1 Author: Christophe Milard <christophe.milard(a)linaro.org> Date: Mon Jan 23 16:38:37 2017 +0100 linux-gen: _ishmphy: fix possible race with malloc _ishm prereserves address space for _ODP_ISHM_SINGLE_VA allocated memory by reserving unreachable "memory", using PROT_NONE, hence really allocating virtual space (as the memory cannot be hit). The problem came when trying to use some of this preallocated space: strangely, if a new mapping on the preallocated virtual space failed (e.g. due to lack of huge pages), linux would returned MAP_FAILED (OK) but also cancel the previous PROT_NONE mapping, hence making the virtual memory space available for further mmaps. (code Point A) Before this patch, the code simply re-reserved (PROT_NONE) the area (point B): This was NOT OK: yes, _ishm_reserve calls are mutexed, so no other odpthread 2 could do a reserve between point A and B of opdthread1, but if thread2 did its own mmap(), malloc(),..., there was a chance for thread 2 to get virtual space from the preserved area (which should be blocked). This patch does not allow any A-B window by first doing an mmap (non fixed) and then performing a second mapping at the correct address (in the pre-reserved area), which is guaranteed to succeed, and finally removing the non-fixed mapping. The non-fix mapping just acts as a failure guard when the proper maping is done. Fixes https://bugs.linaro.org/show_bug.cgi?id=2834 (but very hard to trigger i.e. to prove) Signed-off-by: Christophe Milard <christophe.milard(a)linaro.org> Reviewed-and-tested-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/_ishmphy.c b/platform/linux-generic/_ishmphy.c index 2b2d100..d519af6 100644 --- a/platform/linux-generic/_ishmphy.c +++ b/platform/linux-generic/_ishmphy.c @@ -94,7 +94,7 @@ int _odp_ishmphy_unbook_va(void) void *_odp_ishmphy_map(int fd, void *start, uint64_t size, int flags) { - void *mapped_addr; + void *mapped_addr_tmp, *mapped_addr; int mmap_flags = 0; if (flags & _ODP_ISHM_SINGLE_VA) { @@ -103,15 +103,37 @@ void *_odp_ishmphy_map(int fd, void *start, uint64_t size, return NULL; } /* maps over fragment of reserved VA: */ - mapped_addr = mmap(start, size, PROT_READ | PROT_WRITE, - MAP_SHARED | MAP_FIXED | mmap_flags, fd, 0); - /* if mapping fails, re-block the space we tried to take - * as it seems a mapping failure still affect what was there??*/ - if (mapped_addr == MAP_FAILED) { - mmap_flags = MAP_SHARED | MAP_FIXED | - MAP_ANONYMOUS | MAP_NORESERVE; - mmap(start, size, PROT_NONE, mmap_flags, -1, 0); - mprotect(start, size, PROT_NONE); + /* first, try a normal map. If that works, remap it where it + * should (on the prereverved space), and remove the initial + * normal mapping: + * This is because it turned out that if a mapping fails + * on a the prereserved virtual address space, then + * the prereserved address space which was tried to be mapped + * on becomes available to the kernel again! This was not + * according to expectations: the assumption was that if a + * mapping fails, the system should remain unchanged, but this + * is obvioulsy not true (at least for huge pages when + * exhausted). + * So the strategy is to first map at a non reserved place + * (which can then be freed and returned to the kernel on + * failure) and peform a new map to the prereserved space on + * success (which is then guaranteed to work). + * The initial free maping can then be removed. + */ + mapped_addr = MAP_FAILED; + mapped_addr_tmp = mmap(NULL, size, PROT_READ | PROT_WRITE, + MAP_SHARED | mmap_flags, fd, 0); + if (mapped_addr_tmp != MAP_FAILED) { + /* If OK, do new map at right fixed location... */ + mapped_addr = mmap(start, + size, PROT_READ | PROT_WRITE, + MAP_SHARED | MAP_FIXED | mmap_flags, + fd, 0); + if (mapped_addr != start) + ODP_ERR("new map failed:%s\n", strerror(errno)); + /* ... and remove initial mapping: */ + if (munmap(mapped_addr_tmp, size)) + ODP_ERR("munmap failed:%s\n", strerror(errno)); } } else { /* just do a new mapping in the VA space: */ ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/_ishmphy.c | 42 +++++++++++++++++++++++++++++---------- 1 file changed, 32 insertions(+), 10 deletions(-) hooks/post-receive --

8 years, 5 months

[COMMIT] branch master updated. v1.13.0.0-17-gb17aeea

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 b17aeea11a9bac1f5d55463e81904af12c99b4c7 (commit) via ffabb755ea070ee33fd23a88d920b832da5521e1 (commit) from f603483a31d03e5647c409f8ce71d72ebaadd93b (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 b17aeea11a9bac1f5d55463e81904af12c99b4c7 Author: Matias Elo <matias.elo(a)nokia.com> Date: Tue Jan 24 12:11:46 2017 +0200 test: pktio_ordered: add test script Enable application testing using pcap pktio. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-and-tested-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/common_plat/performance/Makefile.am b/test/common_plat/performance/Makefile.am index 318563d..1074ade 100644 --- a/test/common_plat/performance/Makefile.am +++ b/test/common_plat/performance/Makefile.am @@ -12,6 +12,7 @@ COMPILE_ONLY = odp_l2fwd$(EXEEXT) \ odp_scheduling$(EXEEXT) TESTSCRIPTS = odp_l2fwd_run.sh \ + odp_pktio_ordered_run.sh \ odp_sched_latency_run.sh \ odp_scheduling_run.sh diff --git a/test/common_plat/performance/odp_pktio_ordered_run.sh b/test/common_plat/performance/odp_pktio_ordered_run.sh new file mode 100755 index 0000000..d91211c --- /dev/null +++ b/test/common_plat/performance/odp_pktio_ordered_run.sh @@ -0,0 +1,42 @@ +#!/bin/bash +# +# Copyright (c) 2016, Linaro Limited +# All rights reserved. +# +# SPDX-License-Identifier: BSD-3-Clause +# + +DURATION=5 +LOG=odp_pktio_ordered.log +LOOPS=100000000 +PASS_PPS=5000 +PCAP_IN=`find . ${TEST_DIR} $(dirname $0) -name udp64.pcap -print -quit` +PCAP_OUT=/dev/null + +# This just turns off output buffering so that you still get periodic +# output while piping to tee, as long as stdbuf is available. +if [ "$(which stdbuf)" != "" ]; then + STDBUF="stdbuf -o 0" +else + STDBUF= +fi + +$STDBUF ./odp_pktio_ordered${EXEEXT} -i pcap:in=${PCAP_IN}:loops=$LOOPS,\ +pcap:out=${PCAP_OUT} -t $DURATION | tee $LOG + +ret=$? + +if [ ! -f $LOG ]; then + echo "FAIL: $LOG not found" + ret=1 +elif [ $ret -eq 0 ]; then + MAX_PPS=$(awk '/TEST RESULT/ {print $3}' $LOG) + if [ "$MAX_PPS" -lt "$PASS_PPS" ]; then + echo "FAIL: pps below threshold $MAX_PPS < $PASS_PPS" + ret=1 + fi +fi + +rm -f $LOG + +exit $ret diff --git a/test/common_plat/performance/udp64.pcap b/test/common_plat/performance/udp64.pcap new file mode 100644 index 0000000..45f9d6e Binary files /dev/null and b/test/common_plat/performance/udp64.pcap differ commit ffabb755ea070ee33fd23a88d920b832da5521e1 Author: Matias Elo <matias.elo(a)nokia.com> Date: Tue Jan 24 12:11:45 2017 +0200 test: perf: add new ordered pktio application Add new test application for ordered queue functionality and performance validation. The application sets sequence numbers to incoming packets using ordered pktin queues and ordered context locks. After being tagged packets are enqueued to atomic queues based on flow hash (IPv4 5-tuple). In atomic flow processing the sequence number is validated and packet is sent to selected output interface. Main options: -m: Input queue type can be changed to atomic or parallel to enable easy performance comparison. With parallel input queues the packet order is not maintained. -r: Number of input queues per interface -f: Number of atomic flow queues per interface -e: Number of extra input processing rounds. This can be used to simulate "fat pipe" traffic processing. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-and-tested-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/common_plat/performance/.gitignore b/test/common_plat/performance/.gitignore index eeacf2f..72035e0 100644 --- a/test/common_plat/performance/.gitignore +++ b/test/common_plat/performance/.gitignore @@ -4,6 +4,7 @@ odp_atomic odp_bench_packet odp_crypto odp_l2fwd +odp_pktio_ordered odp_pktio_perf odp_sched_latency odp_scheduling diff --git a/test/common_plat/performance/Makefile.am b/test/common_plat/performance/Makefile.am index bcbf9cd..318563d 100644 --- a/test/common_plat/performance/Makefile.am +++ b/test/common_plat/performance/Makefile.am @@ -7,6 +7,7 @@ EXECUTABLES = odp_bench_packet$(EXEEXT) \ odp_pktio_perf$(EXEEXT) COMPILE_ONLY = odp_l2fwd$(EXEEXT) \ + odp_pktio_ordered$(EXEEXT) \ odp_sched_latency$(EXEEXT) \ odp_scheduling$(EXEEXT) @@ -26,16 +27,20 @@ odp_bench_packet_LDFLAGS = $(AM_LDFLAGS) -static odp_bench_packet_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/test odp_crypto_LDFLAGS = $(AM_LDFLAGS) -static odp_crypto_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/test +odp_pktio_ordered_LDFLAGS = $(AM_LDFLAGS) -static +odp_pktio_ordered_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/test odp_sched_latency_LDFLAGS = $(AM_LDFLAGS) -static odp_sched_latency_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/test odp_scheduling_LDFLAGS = $(AM_LDFLAGS) -static odp_scheduling_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/test noinst_HEADERS = \ - $(top_srcdir)/test/test_debug.h + $(top_srcdir)/test/test_debug.h \ + dummy_crc.h dist_odp_bench_packet_SOURCES = odp_bench_packet.c dist_odp_crypto_SOURCES = odp_crypto.c +dist_odp_pktio_ordered_SOURCES = odp_pktio_ordered.c dist_odp_sched_latency_SOURCES = odp_sched_latency.c dist_odp_scheduling_SOURCES = odp_scheduling.c dist_odp_pktio_perf_SOURCES = odp_pktio_perf.c diff --git a/test/common_plat/performance/dummy_crc.h b/test/common_plat/performance/dummy_crc.h new file mode 100644 index 0000000..38da444 --- /dev/null +++ b/test/common_plat/performance/dummy_crc.h @@ -0,0 +1,493 @@ +/* Copyright (c) 2016, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +/*- + * BSD LICENSE + * + * Copyright(c) 2010-2013 Intel Corporation. All rights reserved. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * * Neither the name of Intel Corporation nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** + * @file + * + * This file is meant only for generating dummy processing work. + */ + +#include <stdint.h> +#include <stddef.h> + +static const uint32_t dummy_crc32c_tables[8][256] = {{ + 0x00000000, 0xF26B8303, 0xE13B70F7, 0x1350F3F4, 0xC79A971F, 0x35F1141C, + 0x26A1E7E8, 0xD4CA64EB, 0x8AD958CF, 0x78B2DBCC, 0x6BE22838, 0x9989AB3B, + 0x4D43CFD0, 0xBF284CD3, 0xAC78BF27, 0x5E133C24, 0x105EC76F, 0xE235446C, + 0xF165B798, 0x030E349B, 0xD7C45070, 0x25AFD373, 0x36FF2087, 0xC494A384, + 0x9A879FA0, 0x68EC1CA3, 0x7BBCEF57, 0x89D76C54, 0x5D1D08BF, 0xAF768BBC, + 0xBC267848, 0x4E4DFB4B, 0x20BD8EDE, 0xD2D60DDD, 0xC186FE29, 0x33ED7D2A, + 0xE72719C1, 0x154C9AC2, 0x061C6936, 0xF477EA35, 0xAA64D611, 0x580F5512, + 0x4B5FA6E6, 0xB93425E5, 0x6DFE410E, 0x9F95C20D, 0x8CC531F9, 0x7EAEB2FA, + 0x30E349B1, 0xC288CAB2, 0xD1D83946, 0x23B3BA45, 0xF779DEAE, 0x05125DAD, + 0x1642AE59, 0xE4292D5A, 0xBA3A117E, 0x4851927D, 0x5B016189, 0xA96AE28A, + 0x7DA08661, 0x8FCB0562, 0x9C9BF696, 0x6EF07595, 0x417B1DBC, 0xB3109EBF, + 0xA0406D4B, 0x522BEE48, 0x86E18AA3, 0x748A09A0, 0x67DAFA54, 0x95B17957, + 0xCBA24573, 0x39C9C670, 0x2A993584, 0xD8F2B687, 0x0C38D26C, 0xFE53516F, + 0xED03A29B, 0x1F682198, 0x5125DAD3, 0xA34E59D0, 0xB01EAA24, 0x42752927, + 0x96BF4DCC, 0x64D4CECF, 0x77843D3B, 0x85EFBE38, 0xDBFC821C, 0x2997011F, + 0x3AC7F2EB, 0xC8AC71E8, 0x1C661503, 0xEE0D9600, 0xFD5D65F4, 0x0F36E6F7, + 0x61C69362, 0x93AD1061, 0x80FDE395, 0x72966096, 0xA65C047D, 0x5437877E, + 0x4767748A, 0xB50CF789, 0xEB1FCBAD, 0x197448AE, 0x0A24BB5A, 0xF84F3859, + 0x2C855CB2, 0xDEEEDFB1, 0xCDBE2C45, 0x3FD5AF46, 0x7198540D, 0x83F3D70E, + 0x90A324FA, 0x62C8A7F9, 0xB602C312, 0x44694011, 0x5739B3E5, 0xA55230E6, + 0xFB410CC2, 0x092A8FC1, 0x1A7A7C35, 0xE811FF36, 0x3CDB9BDD, 0xCEB018DE, + 0xDDE0EB2A, 0x2F8B6829, 0x82F63B78, 0x709DB87B, 0x63CD4B8F, 0x91A6C88C, + 0x456CAC67, 0xB7072F64, 0xA457DC90, 0x563C5F93, 0x082F63B7, 0xFA44E0B4, + 0xE9141340, 0x1B7F9043, 0xCFB5F4A8, 0x3DDE77AB, 0x2E8E845F, 0xDCE5075C, + 0x92A8FC17, 0x60C37F14, 0x73938CE0, 0x81F80FE3, 0x55326B08, 0xA759E80B, + 0xB4091BFF, 0x466298FC, 0x1871A4D8, 0xEA1A27DB, 0xF94AD42F, 0x0B21572C, + 0xDFEB33C7, 0x2D80B0C4, 0x3ED04330, 0xCCBBC033, 0xA24BB5A6, 0x502036A5, + 0x4370C551, 0xB11B4652, 0x65D122B9, 0x97BAA1BA, 0x84EA524E, 0x7681D14D, + 0x2892ED69, 0xDAF96E6A, 0xC9A99D9E, 0x3BC21E9D, 0xEF087A76, 0x1D63F975, + 0x0E330A81, 0xFC588982, 0xB21572C9, 0x407EF1CA, 0x532E023E, 0xA145813D, + 0x758FE5D6, 0x87E466D5, 0x94B49521, 0x66DF1622, 0x38CC2A06, 0xCAA7A905, + 0xD9F75AF1, 0x2B9CD9F2, 0xFF56BD19, 0x0D3D3E1A, 0x1E6DCDEE, 0xEC064EED, + 0xC38D26C4, 0x31E6A5C7, 0x22B65633, 0xD0DDD530, 0x0417B1DB, 0xF67C32D8, + 0xE52CC12C, 0x1747422F, 0x49547E0B, 0xBB3FFD08, 0xA86F0EFC, 0x5A048DFF, + 0x8ECEE914, 0x7CA56A17, 0x6FF599E3, 0x9D9E1AE0, 0xD3D3E1AB, 0x21B862A8, + 0x32E8915C, 0xC083125F, 0x144976B4, 0xE622F5B7, 0xF5720643, 0x07198540, + 0x590AB964, 0xAB613A67, 0xB831C993, 0x4A5A4A90, 0x9E902E7B, 0x6CFBAD78, + 0x7FAB5E8C, 0x8DC0DD8F, 0xE330A81A, 0x115B2B19, 0x020BD8ED, 0xF0605BEE, + 0x24AA3F05, 0xD6C1BC06, 0xC5914FF2, 0x37FACCF1, 0x69E9F0D5, 0x9B8273D6, + 0x88D28022, 0x7AB90321, 0xAE7367CA, 0x5C18E4C9, 0x4F48173D, 0xBD23943E, + 0xF36E6F75, 0x0105EC76, 0x12551F82, 0xE03E9C81, 0x34F4F86A, 0xC69F7B69, + 0xD5CF889D, 0x27A40B9E, 0x79B737BA, 0x8BDCB4B9, 0x988C474D, 0x6AE7C44E, + 0xBE2DA0A5, 0x4C4623A6, 0x5F16D052, 0xAD7D5351, +}, +{ + 0x00000000, 0x13A29877, 0x274530EE, 0x34E7A899, 0x4E8A61DC, 0x5D28F9AB, + 0x69CF5132, 0x7A6DC945, 0x9D14C3B8, 0x8EB65BCF, 0xBA51F356, 0xA9F36B21, + 0xD39EA264, 0xC03C3A13, 0xF4DB928A, 0xE7790AFD, 0x3FC5F181, 0x2C6769F6, + 0x1880C16F, 0x0B225918, 0x714F905D, 0x62ED082A, 0x560AA0B3, 0x45A838C4, + 0xA2D13239, 0xB173AA4E, 0x859402D7, 0x96369AA0, 0xEC5B53E5, 0xFFF9CB92, + 0xCB1E630B, 0xD8BCFB7C, 0x7F8BE302, 0x6C297B75, 0x58CED3EC, 0x4B6C4B9B, + 0x310182DE, 0x22A31AA9, 0x1644B230, 0x05E62A47, 0xE29F20BA, 0xF13DB8CD, + 0xC5DA1054, 0xD6788823, 0xAC154166, 0xBFB7D911, 0x8B507188, 0x98F2E9FF, + 0x404E1283, 0x53EC8AF4, 0x670B226D, 0x74A9BA1A, 0x0EC4735F, 0x1D66EB28, + 0x298143B1, 0x3A23DBC6, 0xDD5AD13B, 0xCEF8494C, 0xFA1FE1D5, 0xE9BD79A2, + 0x93D0B0E7, 0x80722890, 0xB4958009, 0xA737187E, 0xFF17C604, 0xECB55E73, + 0xD852F6EA, 0xCBF06E9D, 0xB19DA7D8, 0xA23F3FAF, 0x96D89736, 0x857A0F41, + 0x620305BC, 0x71A19DCB, 0x45463552, 0x56E4AD25, 0x2C896460, 0x3F2BFC17, + 0x0BCC548E, 0x186ECCF9, 0xC0D23785, 0xD370AFF2, 0xE797076B, 0xF4359F1C, + 0x8E585659, 0x9DFACE2E, 0xA91D66B7, 0xBABFFEC0, 0x5DC6F43D, 0x4E646C4A, + 0x7A83C4D3, 0x69215CA4, 0x134C95E1, 0x00EE0D96, 0x3409A50F, 0x27AB3D78, + 0x809C2506, 0x933EBD71, 0xA7D915E8, 0xB47B8D9F, 0xCE1644DA, 0xDDB4DCAD, + 0xE9537434, 0xFAF1EC43, 0x1D88E6BE, 0x0E2A7EC9, 0x3ACDD650, 0x296F4E27, + 0x53028762, 0x40A01F15, 0x7447B78C, 0x67E52FFB, 0xBF59D487, 0xACFB4CF0, + 0x981CE469, 0x8BBE7C1E, 0xF1D3B55B, 0xE2712D2C, 0xD69685B5, 0xC5341DC2, + 0x224D173F, 0x31EF8F48, 0x050827D1, 0x16AABFA6, 0x6CC776E3, 0x7F65EE94, + 0x4B82460D, 0x5820DE7A, 0xFBC3FAF9, 0xE861628E, 0xDC86CA17, 0xCF245260, + 0xB5499B25, 0xA6EB0352, 0x920CABCB, 0x81AE33BC, 0x66D73941, 0x7575A136, + 0x419209AF, 0x523091D8, 0x285D589D, 0x3BFFC0EA, 0x0F186873, 0x1CBAF004, + 0xC4060B78, 0xD7A4930F, 0xE3433B96, 0xF0E1A3E1, 0x8A8C6AA4, 0x992EF2D3, + 0xADC95A4A, 0xBE6BC23D, 0x5912C8C0, 0x4AB050B7, 0x7E57F82E, 0x6DF56059, + 0x1798A91C, 0x043A316B, 0x30DD99F2, 0x237F0185, 0x844819FB, 0x97EA818C, + 0xA30D2915, 0xB0AFB162, 0xCAC27827, 0xD960E050, 0xED8748C9, 0xFE25D0BE, + 0x195CDA43, 0x0AFE4234, 0x3E19EAAD, 0x2DBB72DA, 0x57D6BB9F, 0x447423E8, + 0x70938B71, 0x63311306, 0xBB8DE87A, 0xA82F700D, 0x9CC8D894, 0x8F6A40E3, + 0xF50789A6, 0xE6A511D1, 0xD242B948, 0xC1E0213F, 0x26992BC2, 0x353BB3B5, + 0x01DC1B2C, 0x127E835B, 0x68134A1E, 0x7BB1D269, 0x4F567AF0, 0x5CF4E287, + 0x04D43CFD, 0x1776A48A, 0x23910C13, 0x30339464, 0x4A5E5D21, 0x59FCC556, + 0x6D1B6DCF, 0x7EB9F5B8, 0x99C0FF45, 0x8A626732, 0xBE85CFAB, 0xAD2757DC, + 0xD74A9E99, 0xC4E806EE, 0xF00FAE77, 0xE3AD3600, 0x3B11CD7C, 0x28B3550B, + 0x1C54FD92, 0x0FF665E5, 0x759BACA0, 0x663934D7, 0x52DE9C4E, 0x417C0439, + 0xA6050EC4, 0xB5A796B3, 0x81403E2A, 0x92E2A65D, 0xE88F6F18, 0xFB2DF76F, + 0xCFCA5FF6, 0xDC68C781, 0x7B5FDFFF, 0x68FD4788, 0x5C1AEF11, 0x4FB87766, + 0x35D5BE23, 0x26772654, 0x12908ECD, 0x013216BA, 0xE64B1C47, 0xF5E98430, + 0xC10E2CA9, 0xD2ACB4DE, 0xA8C17D9B, 0xBB63E5EC, 0x8F844D75, 0x9C26D502, + 0x449A2E7E, 0x5738B609, 0x63DF1E90, 0x707D86E7, 0x0A104FA2, 0x19B2D7D5, + 0x2D557F4C, 0x3EF7E73B, 0xD98EEDC6, 0xCA2C75B1, 0xFECBDD28, 0xED69455F, + 0x97048C1A, 0x84A6146D, 0xB041BCF4, 0xA3E32483, +}, +{ + 0x00000000, 0xA541927E, 0x4F6F520D, 0xEA2EC073, 0x9EDEA41A, 0x3B9F3664, + 0xD1B1F617, 0x74F06469, 0x38513EC5, 0x9D10ACBB, 0x773E6CC8, 0xD27FFEB6, + 0xA68F9ADF, 0x03CE08A1, 0xE9E0C8D2, 0x4CA15AAC, 0x70A27D8A, 0xD5E3EFF4, + 0x3FCD2F87, 0x9A8CBDF9, 0xEE7CD990, 0x4B3D4BEE, 0xA1138B9D, 0x045219E3, + 0x48F3434F, 0xEDB2D131, 0x079C1142, 0xA2DD833C, 0xD62DE755, 0x736C752B, + 0x9942B558, 0x3C032726, 0xE144FB14, 0x4405696A, 0xAE2BA919, 0x0B6A3B67, + 0x7F9A5F0E, 0xDADBCD70, 0x30F50D03, 0x95B49F7D, 0xD915C5D1, 0x7C5457AF, + 0x967A97DC, 0x333B05A2, 0x47CB61CB, 0xE28AF3B5, 0x08A433C6, 0xADE5A1B8, + 0x91E6869E, 0x34A714E0, 0xDE89D493, 0x7BC846ED, 0x0F382284, 0xAA79B0FA, + 0x40577089, 0xE516E2F7, 0xA9B7B85B, 0x0CF62A25, 0xE6D8EA56, 0x43997828, + 0x37691C41, 0x92288E3F, 0x78064E4C, 0xDD47DC32, 0xC76580D9, 0x622412A7, + 0x880AD2D4, 0x2D4B40AA, 0x59BB24C3, 0xFCFAB6BD, 0x16D476CE, 0xB395E4B0, + 0xFF34BE1C, 0x5A752C62, 0xB05BEC11, 0x151A7E6F, 0x61EA1A06, 0xC4AB8878, + 0x2E85480B, 0x8BC4DA75, 0xB7C7FD53, 0x12866F2D, 0xF8A8AF5E, 0x5DE93D20, + 0x29195949, 0x8C58CB37, 0x66760B44, 0xC337993A, 0x8F96C396, 0x2AD751E8, + 0xC0F9919B, 0x65B803E5, 0x1148678C, 0xB409F5F2, 0x5E273581, 0xFB66A7FF, + 0x26217BCD, 0x8360E9B3, 0x694E29C0, 0xCC0FBBBE, 0xB8FFDFD7, 0x1DBE4DA9, + 0xF7908DDA, 0x52D11FA4, 0x1E704508, 0xBB31D776, 0x511F1705, 0xF45E857B, + 0x80AEE112, 0x25EF736C, 0xCFC1B31F, 0x6A802161, 0x56830647, 0xF3C29439, + 0x19EC544A, 0xBCADC634, 0xC85DA25D, 0x6D1C3023, 0x8732F050, 0x2273622E, + 0x6ED23882, 0xCB93AAFC, 0x21BD6A8F, 0x84FCF8F1, 0xF00C9C98, 0x554D0EE6, + 0xBF63CE95, 0x1A225CEB, 0x8B277743, 0x2E66E53D, 0xC448254E, 0x6109B730, + 0x15F9D359, 0xB0B84127, 0x5A968154, 0xFFD7132A, 0xB3764986, 0x1637DBF8, + 0xFC191B8B, 0x595889F5, 0x2DA8ED9C, 0x88E97FE2, 0x62C7BF91, 0xC7862DEF, + 0xFB850AC9, 0x5EC498B7, 0xB4EA58C4, 0x11ABCABA, 0x655BAED3, 0xC01A3CAD, + 0x2A34FCDE, 0x8F756EA0, 0xC3D4340C, 0x6695A672, 0x8CBB6601, 0x29FAF47F, + 0x5D0A9016, 0xF84B0268, 0x1265C21B, 0xB7245065, 0x6A638C57, 0xCF221E29, + 0x250CDE5A, 0x804D4C24, 0xF4BD284D, 0x51FCBA33, 0xBBD27A40, 0x1E93E83E, + 0x5232B292, 0xF77320EC, 0x1D5DE09F, 0xB81C72E1, 0xCCEC1688, 0x69AD84F6, + 0x83834485, 0x26C2D6FB, 0x1AC1F1DD, 0xBF8063A3, 0x55AEA3D0, 0xF0EF31AE, + 0x841F55C7, 0x215EC7B9, 0xCB7007CA, 0x6E3195B4, 0x2290CF18, 0x87D15D66, + 0x6DFF9D15, 0xC8BE0F6B, 0xBC4E6B02, 0x190FF97C, 0xF321390F, 0x5660AB71, + 0x4C42F79A, 0xE90365E4, 0x032DA597, 0xA66C37E9, 0xD29C5380, 0x77DDC1FE, + 0x9DF3018D, 0x38B293F3, 0x7413C95F, 0xD1525B21, 0x3B7C9B52, 0x9E3D092C, + 0xEACD6D45, 0x4F8CFF3B, 0xA5A23F48, 0x00E3AD36, 0x3CE08A10, 0x99A1186E, + 0x738FD81D, 0xD6CE4A63, 0xA23E2E0A, 0x077FBC74, 0xED517C07, 0x4810EE79, + 0x04B1B4D5, 0xA1F026AB, 0x4BDEE6D8, 0xEE9F74A6, 0x9A6F10CF, 0x3F2E82B1, + 0xD50042C2, 0x7041D0BC, 0xAD060C8E, 0x08479EF0, 0xE2695E83, 0x4728CCFD, + 0x33D8A894, 0x96993AEA, 0x7CB7FA99, 0xD9F668E7, 0x9557324B, 0x3016A035, + 0xDA386046, 0x7F79F238, 0x0B899651, 0xAEC8042F, 0x44E6C45C, 0xE1A75622, + 0xDDA47104, 0x78E5E37A, 0x92CB2309, 0x378AB177, 0x437AD51E, 0xE63B4760, + 0x0C158713, 0xA954156D, 0xE5F54FC1, 0x40B4DDBF, 0xAA9A1DCC, 0x0FDB8FB2, + 0x7B2BEBDB, 0xDE6A79A5, 0x3444B9D6, 0x91052BA8, +}, +{ + 0x00000000, 0xDD45AAB8, 0xBF672381, 0x62228939, 0x7B2231F3, 0xA6679B4B, + 0xC4451272, 0x1900B8CA, 0xF64463E6, 0x2B01C95E, 0x49234067, 0x9466EADF, + 0x8D665215, 0x5023F8AD, 0x32017194, 0xEF44DB2C, 0xE964B13D, 0x34211B85, + 0x560392BC, 0x8B463804, 0x924680CE, 0x4F032A76, 0x2D21A34F, 0xF06409F7, + 0x1F20D2DB, 0xC2657863, 0xA047F15A, 0x7D025BE2, 0x6402E328, 0xB9474990, + 0xDB65C0A9, 0x06206A11, 0xD725148B, 0x0A60BE33, 0x6842370A, 0xB5079DB2, + 0xAC072578, 0x71428FC0, 0x136006F9, 0xCE25AC41, 0x2161776D, 0xFC24DDD5, + 0x9E0654EC, 0x4343FE54, 0x5A43469E, 0x8706EC26, 0xE524651F, 0x3861CFA7, + 0x3E41A5B6, 0xE3040F0E, 0x81268637, 0x5C632C8F, 0x45639445, 0x98263EFD, + 0xFA04B7C4, 0x27411D7C, 0xC805C650, 0x15406CE8, 0x7762E5D1, 0xAA274F69, + 0xB327F7A3, 0x6E625D1B, 0x0C40D422, 0xD1057E9A, 0xABA65FE7, 0x76E3F55F, + 0x14C17C66, 0xC984D6DE, 0xD0846E14, 0x0DC1C4AC, 0x6FE34D95, 0xB2A6E72D, + 0x5DE23C01, 0x80A796B9, 0xE2851F80, 0x3FC0B538, 0x26C00DF2, 0xFB85A74A, + 0x99A72E73, 0x44E284CB, 0x42C2EEDA, 0x9F874462, 0xFDA5CD5B, 0x20E067E3, + 0x39E0DF29, 0xE4A57591, 0x8687FCA8, 0x5BC25610, 0xB4868D3C, 0x69C32784, + 0x0BE1AEBD, 0xD6A40405, 0xCFA4BCCF, 0x12E11677, 0x70C39F4E, 0xAD8635F6, + 0x7C834B6C, 0xA1C6E1D4, 0xC3E468ED, 0x1EA1C255, 0x07A17A9F, 0xDAE4D027, + 0xB8C6591E, 0x6583F3A6, 0x8AC7288A, 0x57828232, 0x35A00B0B, 0xE8E5A1B3, + 0xF1E51979, 0x2CA0B3C1, 0x4E823AF8, 0x93C79040, 0x95E7FA51, 0x48A250E9, + 0x2A80D9D0, 0xF7C57368, 0xEEC5CBA2, 0x3380611A, 0x51A2E823, 0x8CE7429B, + 0x63A399B7, 0xBEE6330F, 0xDCC4BA36, 0x0181108E, 0x1881A844, 0xC5C402FC, + 0xA7E68BC5, 0x7AA3217D, 0x52A0C93F, 0x8FE56387, 0xEDC7EABE, 0x30824006, + 0x2982F8CC, 0xF4C75274, 0x96E5DB4D, 0x4BA071F5, 0xA4E4AAD9, 0x79A10061, + 0x1B838958, 0xC6C623E0, 0xDFC69B2A, 0x02833192, 0x60A1B8AB, 0xBDE41213, + 0xBBC47802, 0x6681D2BA, 0x04A35B83, 0xD9E6F13B, 0xC0E649F1, 0x1DA3E349, + 0x7F816A70, 0xA2C4C0C8, 0x4D801BE4, 0x90C5B15C, 0xF2E73865, 0x2FA292DD, + 0x36A22A17, 0xEBE780AF, 0x89C50996, 0x5480A32E, 0x8585DDB4, 0x58C0770C, + 0x3AE2FE35, 0xE7A7548D, 0xFEA7EC47, 0x23E246FF, 0x41C0CFC6, 0x9C85657E, + 0x73C1BE52, 0xAE8414EA, 0xCCA69DD3, 0x11E3376B, 0x08E38FA1, 0xD5A62519, + 0xB784AC20, 0x6AC10698, 0x6CE16C89, 0xB1A4C631, 0xD3864F08, 0x0EC3E5B0, + 0x17C35D7A, 0xCA86F7C2, 0xA8A47EFB, 0x75E1D443, 0x9AA50F6F, 0x47E0A5D7, + 0x25C22CEE, 0xF8878656, 0xE1873E9C, 0x3CC29424, 0x5EE01D1D, 0x83A5B7A5, + 0xF90696D8, 0x24433C60, 0x4661B559, 0x9B241FE1, 0x8224A72B, 0x5F610D93, + 0x3D4384AA, 0xE0062E12, 0x0F42F53E, 0xD2075F86, 0xB025D6BF, 0x6D607C07, + 0x7460C4CD, 0xA9256E75, 0xCB07E74C, 0x16424DF4, 0x106227E5, 0xCD278D5D, + 0xAF050464, 0x7240AEDC, 0x6B401616, 0xB605BCAE, 0xD4273597, 0x09629F2F, + 0xE6264403, 0x3B63EEBB, 0x59416782, 0x8404CD3A, 0x9D0475F0, 0x4041DF48, + 0x22635671, 0xFF26FCC9, 0x2E238253, 0xF36628EB, 0x9144A1D2, 0x4C010B6A, + 0x5501B3A0, 0x88441918, 0xEA669021, 0x37233A99, 0xD867E1B5, 0x05224B0D, + 0x6700C234, 0xBA45688C, 0xA345D046, 0x7E007AFE, 0x1C22F3C7, 0xC167597F, + 0xC747336E, 0x1A0299D6, 0x782010EF, 0xA565BA57, 0xBC65029D, 0x6120A825, + 0x0302211C, 0xDE478BA4, 0x31035088, 0xEC46FA30, 0x8E647309, 0x5321D9B1, + 0x4A21617B, 0x9764CBC3, 0xF54642FA, 0x2803E842, +}, +{ + 0x00000000, 0x38116FAC, 0x7022DF58, 0x4833B0F4, 0xE045BEB0, 0xD854D11C, + 0x906761E8, 0xA8760E44, 0xC5670B91, 0xFD76643D, 0xB545D4C9, 0x8D54BB65, + 0x2522B521, 0x1D33DA8D, 0x55006A79, 0x6D1105D5, 0x8F2261D3, 0xB7330E7F, + 0xFF00BE8B, 0xC711D127, 0x6F67DF63, 0x5776B0CF, 0x1F45003B, 0x27546F97, + 0x4A456A42, 0x725405EE, 0x3A67B51A, 0x0276DAB6, 0xAA00D4F2, 0x9211BB5E, + 0xDA220BAA, 0xE2336406, 0x1BA8B557, 0x23B9DAFB, 0x6B8A6A0F, 0x539B05A3, + 0xFBED0BE7, 0xC3FC644B, 0x8BCFD4BF, 0xB3DEBB13, 0xDECFBEC6, 0xE6DED16A, + 0xAEED619E, 0x96FC0E32, 0x3E8A0076, 0x069B6FDA, 0x4EA8DF2E, 0x76B9B082, + 0x948AD484, 0xAC9BBB28, 0xE4A80BDC, 0xDCB96470, 0x74CF6A34, 0x4CDE0598, + 0x04EDB56C, 0x3CFCDAC0, 0x51EDDF15, 0x69FCB0B9, 0x21CF004D, 0x19DE6FE1, + 0xB1A861A5, 0x89B90E09, 0xC18ABEFD, 0xF99BD151, 0x37516AAE, 0x0F400502, + 0x4773B5F6, 0x7F62DA5A, 0xD714D41E, 0xEF05BBB2, 0xA7360B46, 0x9F2764EA, + 0xF236613F, 0xCA270E93, 0x8214BE67, 0xBA05D1CB, 0x1273DF8F, 0x2A62B023, + 0x625100D7, 0x5A406F7B, 0xB8730B7D, 0x806264D1, 0xC851D425, 0xF040BB89, + 0x5836B5CD, 0x6027DA61, 0x28146A95, 0x10050539, 0x7D1400EC, 0x45056F40, + 0x0D36DFB4, 0x3527B018, 0x9D51BE5C, 0xA540D1F0, 0xED736104, 0xD5620EA8, + 0x2CF9DFF9, 0x14E8B055, 0x5CDB00A1, 0x64CA6F0D, 0xCCBC6149, 0xF4AD0EE5, + 0xBC9EBE11, 0x848FD1BD, 0xE99ED468, 0xD18FBBC4, 0x99BC0B30, 0xA1AD649C, + 0x09DB6AD8, 0x31CA0574, 0x79F9B580, 0x41E8DA2C, 0xA3DBBE2A, 0x9BCAD186, + 0xD3F96172, 0xEBE80EDE, 0x439E009A, 0x7B8F6F36, 0x33BCDFC2, 0x0BADB06E, + 0x66BCB5BB, 0x5EADDA17, 0x169E6AE3, 0x2E8F054F, 0x86F90B0B, 0xBEE864A7, + 0xF6DBD453, 0xCECABBFF, 0x6EA2D55C, 0x56B3BAF0, 0x1E800A04, 0x269165A8, + 0x8EE76BEC, 0xB6F60440, 0xFEC5B4B4, 0xC6D4DB18, 0xABC5DECD, 0x93D4B161, + 0xDBE70195, 0xE3F66E39, 0x4B80607D, 0x73910FD1, 0x3BA2BF25, 0x03B3D089, + 0xE180B48F, 0xD991DB23, 0x91A26BD7, 0xA9B3047B, 0x01C50A3F, 0x39D46593, + 0x71E7D567, 0x49F6BACB, 0x24E7BF1E, 0x1CF6D0B2, 0x54C56046, 0x6CD40FEA, + 0xC4A201AE, 0xFCB36E02, 0xB480DEF6, 0x8C91B15A, 0x750A600B, 0x4D1B0FA7, + 0x0528BF53, 0x3D39D0FF, 0x954FDEBB, 0xAD5EB117, 0xE56D01E3, 0xDD7C6E4F, + 0xB06D6B9A, 0x887C0436, 0xC04FB4C2, 0xF85EDB6E, 0x5028D52A, 0x6839BA86, + 0x200A0A72, 0x181B65DE, 0xFA2801D8, 0xC2396E74, 0x8A0ADE80, 0xB21BB12C, + 0x1A6DBF68, 0x227CD0C4, 0x6A4F6030, 0x525E0F9C, 0x3F4F0A49, 0x075E65E5, + 0x4F6DD511, 0x777CBABD, 0xDF0AB4F9, 0xE71BDB55, 0xAF286BA1, 0x9739040D, + 0x59F3BFF2, 0x61E2D05E, 0x29D160AA, 0x11C00F06, 0xB9B60142, 0x81A76EEE, + 0xC994DE1A, 0xF185B1B6, 0x9C94B463, 0xA485DBCF, 0xECB66B3B, 0xD4A70497, + 0x7CD10AD3, 0x44C0657F, 0x0CF3D58B, 0x34E2BA27, 0xD6D1DE21, 0xEEC0B18D, + 0xA6F30179, 0x9EE26ED5, 0x36946091, 0x0E850F3D, 0x46B6BFC9, 0x7EA7D065, + 0x13B6D5B0, 0x2BA7BA1C, 0x63940AE8, 0x5B856544, 0xF3F36B00, 0xCBE204AC, + 0x83D1B458, 0xBBC0DBF4, 0x425B0AA5, 0x7A4A6509, 0x3279D5FD, 0x0A68BA51, + 0xA21EB415, 0x9A0FDBB9, 0xD23C6B4D, 0xEA2D04E1, 0x873C0134, 0xBF2D6E98, + 0xF71EDE6C, 0xCF0FB1C0, 0x6779BF84, 0x5F68D028, 0x175B60DC, 0x2F4A0F70, + 0xCD796B76, 0xF56804DA, 0xBD5BB42E, 0x854ADB82, 0x2D3CD5C6, 0x152DBA6A, + 0x5D1E0A9E, 0x650F6532, 0x081E60E7, 0x300F0F4B, 0x783CBFBF, 0x402DD013, + 0xE85BDE57, 0xD04AB1FB, 0x9879010F, 0xA0686EA3, +}, +{ + 0x00000000, 0xEF306B19, 0xDB8CA0C3, 0x34BCCBDA, 0xB2F53777, 0x5DC55C6E, + 0x697997B4, 0x8649FCAD, 0x6006181F, 0x8F367306, 0xBB8AB8DC, 0x54BAD3C5, + 0xD2F32F68, 0x3DC34471, 0x097F8FAB, 0xE64FE4B2, 0xC00C303E, 0x2F3C5B27, + 0x1B8090FD, 0xF4B0FBE4, 0x72F90749, 0x9DC96C50, 0xA975A78A, 0x4645CC93, + 0xA00A2821, 0x4F3A4338, 0x7B8688E2, 0x94B6E3FB, 0x12FF1F56, 0xFDCF744F, + 0xC973BF95, 0x2643D48C, 0x85F4168D, 0x6AC47D94, 0x5E78B64E, 0xB148DD57, + 0x370121FA, 0xD8314AE3, 0xEC8D8139, 0x03BDEA20, 0xE5F20E92, 0x0AC2658B, + 0x3E7EAE51, 0xD14EC548, 0x570739E5, 0xB83752FC, 0x8C8B9926, 0x63BBF23F, + 0x45F826B3, 0xAAC84DAA, 0x9E748670, 0x7144ED69, 0xF70D11C4, 0x183D7ADD, + 0x2C81B107, 0xC3B1DA1E, 0x25FE3EAC, 0xCACE55B5, 0xFE729E6F, 0x1142F576, + 0x970B09DB, 0x783B62C2, 0x4C87A918, 0xA3B7C201, 0x0E045BEB, 0xE13430F2, + 0xD588FB28, 0x3AB89031, 0xBCF16C9C, 0x53C10785, 0x677DCC5F, 0x884DA746, + 0x6E0243F4, 0x813228ED, 0xB58EE337, 0x5ABE882E, 0xDCF77483, 0x33C71F9A, + 0x077BD440, 0xE84BBF59, 0xCE086BD5, 0x213800CC, 0x1584CB16, 0xFAB4A00F, + 0x7CFD5CA2, 0x93CD37BB, 0xA771FC61, 0x48419778, 0xAE0E73CA, 0x413E18D3, + 0x7582D309, 0x9AB2B810, 0x1CFB44BD, 0xF3CB2FA4, 0xC777E47E, 0x28478F67, + 0x8BF04D66, 0x64C0267F, 0x507CEDA5, 0xBF4C86BC, 0x39057A11, 0xD6351108, + 0xE289DAD2, 0x0DB9B1CB, 0xEBF65579, 0x04C63E60, 0x307AF5BA, 0xDF4A9EA3, + 0x5903620E, 0xB6330917, 0x828FC2CD, 0x6DBFA9D4, 0x4BFC7D58, 0xA4CC1641, + 0x9070DD9B, 0x7F40B682, 0xF9094A2F, 0x16392136, 0x2285EAEC, 0xCDB581F5, + 0x2BFA6547, 0xC4CA0E5E, 0xF076C584, 0x1F46AE9D, 0x990F5230, 0x763F3929, + 0x4283F2F3, 0xADB399EA, 0x1C08B7D6, 0xF338DCCF, 0xC7841715, 0x28B47C0C, + 0xAEFD80A1, 0x41CDEBB8, 0x75712062, 0x9A414B7B, 0x7C0EAFC9, 0x933EC4D0, + 0xA7820F0A, 0x48B26413, 0xCEFB98BE, 0x21CBF3A7, 0x1577387D, 0xFA475364, + 0xDC0487E8, 0x3334ECF1, 0x0788272B, 0xE8B84C32, 0x6EF1B09F, 0x81C1DB86, + 0xB57D105C, 0x5A4D7B45, 0xBC029FF7, 0x5332F4EE, 0x678E3F34, 0x88BE542D, + 0x0EF7A880, 0xE1C7C399, 0xD57B0843, 0x3A4B635A, 0x99FCA15B, 0x76CCCA42, + 0x42700198, 0xAD406A81, 0x2B09962C, 0xC439FD35, 0xF08536EF, 0x1FB55DF6, + 0xF9FAB944, 0x16CAD25D, 0x22761987, 0xCD46729E, 0x4B0F8E33, 0xA43FE52A, + 0x90832EF0, 0x7FB345E9, 0x59F09165, 0xB6C0FA7C, 0x827C31A6, 0x6D4C5ABF, + 0xEB05A612, 0x0435CD0B, 0x308906D1, 0xDFB96DC8, 0x39F6897A, 0xD6C6E263, + 0xE27A29B9, 0x0D4A42A0, 0x8B03BE0D, 0x6433D514, 0x508F1ECE, 0xBFBF75D7, + 0x120CEC3D, 0xFD3C8724, 0xC9804CFE, 0x26B027E7, 0xA0F9DB4A, 0x4FC9B053, + 0x7B757B89, 0x94451090, 0x720AF422, 0x9D3A9F3B, 0xA98654E1, 0x46B63FF8, + 0xC0FFC355, 0x2FCFA84C, 0x1B736396, 0xF443088F, 0xD200DC03, 0x3D30B71A, + 0x098C7CC0, 0xE6BC17D9, 0x60F5EB74, 0x8FC5806D, 0xBB794BB7, 0x544920AE, + 0xB206C41C, 0x5D36AF05, 0x698A64DF, 0x86BA0FC6, 0x00F3F36B, 0xEFC39872, + 0xDB7F53A8, 0x344F38B1, 0x97F8FAB0, 0x78C891A9, 0x4C745A73, 0xA344316A, + 0x250DCDC7, 0xCA3DA6DE, 0xFE816D04, 0x11B1061D, 0xF7FEE2AF, 0x18CE89B6, + 0x2C72426C, 0xC3422975, 0x450BD5D8, 0xAA3BBEC1, 0x9E87751B, 0x71B71E02, + 0x57F4CA8E, 0xB8C4A197, 0x8C786A4D, 0x63480154, 0xE501FDF9, 0x0A3196E0, + 0x3E8D5D3A, 0xD1BD3623, 0x37F2D291, 0xD8C2B988, 0xEC7E7252, 0x034E194B, + 0x8507E5E6, 0x6A378EFF, 0x5E8B4525, 0xB1BB2E3C, +}, +{ + 0x00000000, 0x68032CC8, 0xD0065990, 0xB8057558, 0xA5E0C5D1, 0xCDE3E919, + 0x75E69C41, 0x1DE5B089, 0x4E2DFD53, 0x262ED19B, 0x9E2BA4C3, 0xF628880B, + 0xEBCD3882, 0x83CE144A, 0x3BCB6112, 0x53C84DDA, 0x9C5BFAA6, 0xF458D66E, + 0x4C5DA336, 0x245E8FFE, 0x39BB3F77, 0x51B813BF, 0xE9BD66E7, 0x81BE4A2F, + 0xD27607F5, 0xBA752B3D, 0x02705E65, 0x6A7372AD, 0x7796C224, 0x1F95EEEC, + 0xA7909BB4, 0xCF93B77C, 0x3D5B83BD, 0x5558AF75, 0xED5DDA2D, 0x855EF6E5, + 0x98BB466C, 0xF0B86AA4, 0x48BD1FFC, 0x20BE3334, 0x73767EEE, 0x1B755226, + 0xA370277E, 0xCB730BB6, 0xD696BB3F, 0xBE9597F7, 0x0690E2AF, 0x6E93CE67, + 0xA100791B, 0xC90355D3, 0x7106208B, 0x19050C43, 0x04E0BCCA, 0x6CE39002, + 0xD4E6E55A, 0xBCE5C992, 0xEF2D8448, 0x872EA880, 0x3F2BDDD8, 0x5728F110, + 0x4ACD4199, 0x22CE6D51, 0x9ACB1809, 0xF2C834C1, 0x7AB7077A, 0x12B42BB2, + 0xAAB15EEA, 0xC2B27222, 0xDF57C2AB, 0xB754EE63, 0x0F519B3B, 0x6752B7F3, + 0x349AFA29, 0x5C99D6E1, 0xE49CA3B9, 0x8C9F8F71, 0x917A3FF8, 0xF9791330, + 0x417C6668, 0x297F4AA0, 0xE6ECFDDC, 0x8EEFD114, 0x36EAA44C, 0x5EE98884, + 0x430C380D, 0x2B0F14C5, 0x930A619D, 0xFB094D55, 0xA8C1008F, 0xC0C22C47, + 0x78C7591F, 0x10C475D7, 0x0D21C55E, 0x6522E996, 0xDD279CCE, 0xB524B006, + 0x47EC84C7, 0x2FEFA80F, 0x97EADD57, 0xFFE9F19F, 0xE20C4116, 0x8A0F6DDE, + 0x320A1886, 0x5A09344E, 0x09C17994, 0x61C2555C, 0xD9C72004, 0xB1C40CCC, + 0xAC21BC45, 0xC422908D, 0x7C27E5D5, 0x1424C91D, 0xDBB77E61, 0xB3B452A9, + 0x0BB127F1, 0x63B20B39, 0x7E57BBB0, 0x16549778, 0xAE51E220, 0xC652CEE8, + 0x959A8332, 0xFD99AFFA, 0x459CDAA2, 0x2D9FF66A, 0x307A46E3, 0x58796A2B, + 0xE07C1F73, 0x887F33BB, 0xF56E0EF4, 0x9D6D223C, 0x25685764, 0x4D6B7BAC, + 0x508ECB25, 0x388DE7ED, 0x808892B5, 0xE88BBE7D, 0xBB43F3A7, 0xD340DF6F, + 0x6B45AA37, 0x034686FF, 0x1EA33676, 0x76A01ABE, 0xCEA56FE6, 0xA6A6432E, + 0x6935F452, 0x0136D89A, 0xB933ADC2, 0xD130810A, 0xCCD53183, 0xA4D61D4B, + 0x1CD36813, 0x74D044DB, 0x27180901, 0x4F1B25C9, 0xF71E5091, 0x9F1D7C59, + 0x82F8CCD0, 0xEAFBE018, 0x52FE9540, 0x3AFDB988, 0xC8358D49, 0xA036A181, + 0x1833D4D9, 0x7030F811, 0x6DD54898, 0x05D66450, 0xBDD31108, 0xD5D03DC0, + 0x8618701A, 0xEE1B5CD2, 0x561E298A, 0x3E1D0542, 0x23F8B5CB, 0x4BFB9903, + 0xF3FEEC5B, 0x9BFDC093, 0x546E77EF, 0x3C6D5B27, 0x84682E7F, 0xEC6B02B7, + 0xF18EB23E, 0x998D9EF6, 0x2188EBAE, 0x498BC766, 0x1A438ABC, 0x7240A674, + 0xCA45D32C, 0xA246FFE4, 0xBFA34F6D, 0xD7A063A5, 0x6FA516FD, 0x07A63A35, + 0x8FD9098E, 0xE7DA2546, 0x5FDF501E, 0x37DC7CD6, 0x2A39CC5F, 0x423AE097, + 0xFA3F95CF, 0x923CB907, 0xC1F4F4DD, 0xA9F7D815, 0x11F2AD4D, 0x79F18185, + 0x6414310C, 0x0C171DC4, 0xB412689C, 0xDC114454, 0x1382F328, 0x7B81DFE0, + 0xC384AAB8, 0xAB878670, 0xB66236F9, 0xDE611A31, 0x66646F69, 0x0E6743A1, + 0x5DAF0E7B, 0x35AC22B3, 0x8DA957EB, 0xE5AA7B23, 0xF84FCBAA, 0x904CE762, + 0x2849923A, 0x404ABEF2, 0xB2828A33, 0xDA81A6FB, 0x6284D3A3, 0x0A87FF6B, + 0x17624FE2, 0x7F61632A, 0xC7641672, 0xAF673ABA, 0xFCAF7760, 0x94AC5BA8, + 0x2CA92EF0, 0x44AA0238, 0x594FB2B1, 0x314C9E79, 0x8949EB21, 0xE14AC7E9, + 0x2ED97095, 0x46DA5C5D, 0xFEDF2905, 0x96DC05CD, 0x8B39B544, 0xE33A998C, + 0x5B3FECD4, 0x333CC01C, 0x60F48DC6, 0x08F7A10E, 0xB0F2D456, 0xD8F1F89E, + 0xC5144817, 0xAD1764DF, 0x15121187, 0x7D113D4F, +}, +{ + 0x00000000, 0x493C7D27, 0x9278FA4E, 0xDB448769, 0x211D826D, 0x6821FF4A, + 0xB3657823, 0xFA590504, 0x423B04DA, 0x0B0779FD, 0xD043FE94, 0x997F83B3, + 0x632686B7, 0x2A1AFB90, 0xF15E7CF9, 0xB86201DE, 0x847609B4, 0xCD4A7493, + 0x160EF3FA, 0x5F328EDD, 0xA56B8BD9, 0xEC57F6FE, 0x37137197, 0x7E2F0CB0, + 0xC64D0D6E, 0x8F717049, 0x5435F720, 0x1D098A07, 0xE7508F03, 0xAE6CF224, + 0x7528754D, 0x3C14086A, 0x0D006599, 0x443C18BE, 0x9F789FD7, 0xD644E2F0, + 0x2C1DE7F4, 0x65219AD3, 0xBE651DBA, 0xF759609D, 0x4F3B6143, 0x06071C64, + 0xDD439B0D, 0x947FE62A, 0x6E26E32E, 0x271A9E09, 0xFC5E1960, 0xB5626447, + 0x89766C2D, 0xC04A110A, 0x1B0E9663, 0x5232EB44, 0xA86BEE40, 0xE1579367, + 0x3A13140E, 0x732F6929, 0xCB4D68F7, 0x827115D0, 0x593592B9, 0x1009EF9E, + 0xEA50EA9A, 0xA36C97BD, 0x782810D4, 0x31146DF3, 0x1A00CB32, 0x533CB615, + 0x8878317C, 0xC1444C5B, 0x3B1D495F, 0x72213478, 0xA965B311, 0xE059CE36, + 0x583BCFE8, 0x1107B2CF, 0xCA4335A6, 0x837F4881, 0x79264D85, 0x301A30A2, + 0xEB5EB7CB, 0xA262CAEC, 0x9E76C286, 0xD74ABFA1, 0x0C0E38C8, 0x453245EF, + 0xBF6B40EB, 0xF6573DCC, 0x2D13BAA5, 0x642FC782, 0xDC4DC65C, 0x9571BB7B, + 0x4E353C12, 0x07094135, 0xFD504431, 0xB46C3916, 0x6F28BE7F, 0x2614C358, + 0x1700AEAB, 0x5E3CD38C, 0x857854E5, 0xCC4429C2, 0x361D2CC6, 0x7F2151E1, + 0xA465D688, 0xED59ABAF, 0x553BAA71, 0x1C07D756, 0xC743503F, 0x8E7F2D18, + 0x7426281C, 0x3D1A553B, 0xE65ED252, 0xAF62AF75, 0x9376A71F, 0xDA4ADA38, + 0x010E5D51, 0x48322076, 0xB26B2572, 0xFB575855, 0x2013DF3C, 0x692FA21B, + 0xD14DA3C5, 0x9871DEE2, 0x4335598B, 0x0A0924AC, 0xF05021A8, 0xB96C5C8F, + 0x6228DBE6, 0x2B14A6C1, 0x34019664, 0x7D3DEB43, 0xA6796C2A, 0xEF45110D, + 0x151C1409, 0x5C20692E, 0x8764EE47, 0xCE589360, 0x763A92BE, 0x3F06EF99, + 0xE44268F0, 0xAD7E15D7, 0x572710D3, 0x1E1B6DF4, 0xC55FEA9D, 0x8C6397BA, + 0xB0779FD0, 0xF94BE2F7, 0x220F659E, 0x6B3318B9, 0x916A1DBD, 0xD856609A, + 0x0312E7F3, 0x4A2E9AD4, 0xF24C9B0A, 0xBB70E62D, 0x60346144, 0x29081C63, + 0xD3511967, 0x9A6D6440, 0x4129E329, 0x08159E0E, 0x3901F3FD, 0x703D8EDA, + 0xAB7909B3, 0xE2457494, 0x181C7190, 0x51200CB7, 0x8A648BDE, 0xC358F6F9, + 0x7B3AF727, 0x32068A00, 0xE9420D69, 0xA07E704E, 0x5A27754A, 0x131B086D, + 0xC85F8F04, 0x8163F223, 0xBD77FA49, 0xF44B876E, 0x2F0F0007, 0x66337D20, + 0x9C6A7824, 0xD5560503, 0x0E12826A, 0x472EFF4D, 0xFF4CFE93, 0xB67083B4, + 0x6D3404DD, 0x240879FA, 0xDE517CFE, 0x976D01D9, 0x4C2986B0, 0x0515FB97, + 0x2E015D56, 0x673D2071, 0xBC79A718, 0xF545DA3F, 0x0F1CDF3B, 0x4620A21C, + 0x9D642575, 0xD4585852, 0x6C3A598C, 0x250624AB, 0xFE42A3C2, 0xB77EDEE5, + 0x4D27DBE1, 0x041BA6C6, 0xDF5F21AF, 0x96635C88, 0xAA7754E2, 0xE34B29C5, + 0x380FAEAC, 0x7133D38B, 0x8B6AD68F, 0xC256ABA8, 0x19122CC1, 0x502E51E6, + 0xE84C5038, 0xA1702D1F, 0x7A34AA76, 0x3308D751, 0xC951D255, 0x806DAF72, + 0x5B29281B, 0x1215553C, 0x230138CF, 0x6A3D45E8, 0xB179C281, 0xF845BFA6, + 0x021CBAA2, 0x4B20C785, 0x906440EC, 0xD9583DCB, 0x613A3C15, 0x28064132, + 0xF342C65B, 0xBA7EBB7C, 0x4027BE78, 0x091BC35F, 0xD25F4436, 0x9B633911, + 0xA777317B, 0xEE4B4C5C, 0x350FCB35, 0x7C33B612, 0x866AB316, 0xCF56CE31, + 0x14124958, 0x5D2E347F, 0xE54C35A1, 0xAC704886, 0x7734CFEF, 0x3E08B2C8, + 0xC451B7CC, 0x8D6DCAEB, 0x56294D82, 0x1F1530A5, +} }; + +#define DUMMY_CRC32_UPD(crc, n) \ + (dummy_crc32c_tables[(n)][(crc) & 0xff] ^ \ + dummy_crc32c_tables[(n) - 1][((crc) >> 8) & 0xff]) + +static inline uint32_t dummy_crc32c_u32(uint32_t data, uint32_t init_val) +{ + uint32_t crc, term1, term2; + + crc = init_val; + crc ^= data; + + term1 = DUMMY_CRC32_UPD(crc, 3); + term2 = crc >> 16; + crc = term1 ^ DUMMY_CRC32_UPD(term2, 1); + + return crc; +} + +static inline uint32_t dummy_crc32c_u64(uint64_t data, uint32_t init_val) +{ + union { + uint64_t u64; + uint32_t u32[2]; + } d; + d.u64 = data; + + uint32_t crc, term1, term2; + + crc = init_val; + crc ^= d.u32[0]; + + term1 = DUMMY_CRC32_UPD(crc, 7); + term2 = crc >> 16; + crc = term1 ^ DUMMY_CRC32_UPD(term2, 5); + term1 = DUMMY_CRC32_UPD(d.u32[1], 3); + term2 = d.u32[1] >> 16; + crc ^= term1 ^ DUMMY_CRC32_UPD(term2, 1); + + return crc; +} + +static inline uint32_t dummy_hash_crc32c(const void *data, uint32_t data_len, + uint32_t init_val) +{ + size_t i; + uint64_t temp = 0; + uintptr_t pd = (uintptr_t)data; + + for (i = 0; i < data_len / 8; i++) { + init_val = dummy_crc32c_u64(*(const uint64_t *)pd, init_val); + pd += 8; + } + + switch (7 - (data_len & 0x07)) { + case 0: + temp |= (uint64_t)*((const uint8_t *)pd + 6) << 48; + /* Fallthrough */ + case 1: + temp |= (uint64_t)*((const uint8_t *)pd + 5) << 40; + /* Fallthrough */ + case 2: + temp |= (uint64_t)*((const uint8_t *)pd + 4) << 32; + temp |= *(const uint32_t *)pd; + init_val = dummy_crc32c_u64(temp, init_val); + break; + case 3: + init_val = dummy_crc32c_u32(*(const uint32_t *)pd, init_val); + break; + case 4: + temp |= *((const uint8_t *)pd + 2) << 16; + /* Fallthrough */ + case 5: + temp |= *((const uint8_t *)pd + 1) << 8; + /* Fallthrough */ + case 6: + temp |= *(const uint8_t *)pd; + init_val = dummy_crc32c_u32(temp, init_val); + /* Fallthrough */ + default: + break; + } + + return init_val; +} diff --git a/test/common_plat/performance/odp_pktio_ordered.c b/test/common_plat/performance/odp_pktio_ordered.c new file mode 100644 index 0000000..bff4586 --- /dev/null +++ b/test/common_plat/performance/odp_pktio_ordered.c @@ -0,0 +1,1342 @@ +/* Copyright (c) 2016, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +/** + * @file + * + * @example odp_pktio_ordered.c ODP ordered pktio test application + */ + +/** enable strtok */ +#ifndef _GNU_SOURCE +#define _GNU_SOURCE +#endif + +#include <stdlib.h> +#include <getopt.h> +#include <unistd.h> +#include <errno.h> +#include <inttypes.h> + +#include <test_debug.h> +#include <dummy_crc.h> + +#include <odp_api.h> +#include <odp/helper/threads.h> +#include <odp/helper/eth.h> +#include <odp/helper/ip.h> +#include <odp/helper/udp.h> + +/** Jenkins hash support. + * + * Copyright (C) 2006 Bob Jenkins (bob_jenkins(a)burtleburtle.net) + * + * http://burtleburtle.net/bob/hash/ + * + * These are the credits from Bob's sources: + * + * lookup3.c, by Bob Jenkins, May 2006, Public Domain. + * + * These are functions for producing 32-bit hashes for hash table lookup. + * hashword(), hashlittle(), hashlittle2(), hashbig(), mix(), and final() + * are externally useful functions. Routines to test the hash are included + * if SELF_TEST is defined. You can use this free for any purpose. It's in + * the public domain. It has no warranty. + * + * $FreeBSD$ + */ +#define rot(x, k) (((x) << (k)) | ((x) >> (32 - (k)))) + +#define mix(a, b, c) \ +{ \ + a -= c; a ^= rot(c, 4); c += b; \ + b -= a; b ^= rot(a, 6); a += c; \ + c -= b; c ^= rot(b, 8); b += a; \ + a -= c; a ^= rot(c, 16); c += b; \ + b -= a; b ^= rot(a, 19); a += c; \ + c -= b; c ^= rot(b, 4); b += a; \ +} + +#define final(a, b, c) \ +{ \ + c ^= b; c -= rot(b, 14); \ + a ^= c; a -= rot(c, 11); \ + b ^= a; b -= rot(a, 25); \ + c ^= b; c -= rot(b, 16); \ + a ^= c; a -= rot(c, 4); \ + b ^= a; b -= rot(a, 14); \ + c ^= b; c -= rot(b, 24); \ +} + +#define JHASH_GOLDEN_RATIO 0x9e3779b9 + +/** Maximum number of worker threads */ +#define MAX_WORKERS 64 + +/** Number of packet buffers in the memory pool */ +#define PKT_POOL_SIZE 8192 + +/** Buffer size of the packet pool buffer in bytes*/ +#define PKT_POOL_BUF_SIZE 1856 + +/** Packet user area size in bytes */ +#define PKT_UAREA_SIZE 32 + +/** Maximum number of packets in a burst */ +#define MAX_PKT_BURST 32 + +/** Maximum number of pktio queues per interface */ +#define MAX_QUEUES 32 + +/** Maximum number of pktio interfaces */ +#define MAX_PKTIOS 8 + +/** Maximum number of packet flows */ +#define MAX_FLOWS 128 + +ODP_STATIC_ASSERT(MAX_PKTIOS < MAX_FLOWS, + "MAX_FLOWS must be greater than MAX_PKTIOS\n"); + +/** Minimum valid packet length */ +#define MIN_PACKET_LEN (ODPH_ETHHDR_LEN + ODPH_IPV4HDR_LEN + ODPH_UDPHDR_LEN) + +/** Default number of input queues */ +#define DEF_NUM_RX_QUEUES 1 + +/** Default number of flows */ +#define DEF_NUM_FLOWS 12 + +/** Default number of extra processing rounds */ +#define DEF_EXTRA_ROUNDS 15 + +/** Default statistics print interval in seconds */ +#define DEF_STATS_INT 1 + +/** Get rid of path in filename - only for unix-type paths using '/' */ +#define NO_PATH(file_name) (strrchr((file_name), '/') ? \ + strrchr((file_name), '/') + 1 : (file_name)) + +/** + * Packet input mode + */ +typedef enum pktin_mode_t { + SCHED_ORDERED = 0, + SCHED_ATOMIC, + SCHED_PARALLEL +} pktin_mode_t; + +/** + * Parsed command line application arguments + */ +typedef struct { + int cpu_count; /**< CPU count */ + int if_count; /**< Number of interfaces to be used */ + int addr_count; /**< Number of dst addresses to be used */ + int num_rx_q; /**< Number of input queues per interface */ + int num_flows; /**< Number of packet flows */ + int extra_rounds; /**< Number of extra input processing rounds */ + char **if_names; /**< Array of pointers to interface names */ + odph_ethaddr_t addrs[MAX_PKTIOS]; /**< Array of dst addresses */ + pktin_mode_t in_mode; /**< Packet input mode */ + int time; /**< Time in seconds to run. */ + int accuracy; /**< Statistics print interval */ + char *if_str; /**< Storage for interface names */ +} appl_args_t; + +static int exit_threads; /**< Break workers loop if set to 1 */ + +/** + * Queue context + */ +typedef struct { + odp_bool_t input_queue; /**< Input queue */ + uint64_t idx; /**< Queue index */ + uint64_t seq[MAX_FLOWS]; /**< Per flow sequence numbers */ +} qcontext_t; + +/** + * Flow info stored in the packet user area + */ +typedef struct { + uint64_t seq; /**< Sequence number */ + uint32_t crc; /**< CRC hash */ + uint16_t idx; /**< Flow index */ + uint8_t src_idx; /**< Source port index */ + uint8_t dst_idx; /**< Destination port index */ + +} flow_t; +ODP_STATIC_ASSERT(sizeof(flow_t) <= PKT_UAREA_SIZE, + "Flow data doesn't fit in the packet user area\n"); + +/** + * Statistics + */ +typedef union { + struct { + /** Number of forwarded packets */ + uint64_t packets; + /** Packets dropped due to a receive error */ + uint64_t rx_drops; + /** Packets dropped due to a transmit error */ + uint64_t tx_drops; + /** Packets with invalid sequence number */ + uint64_t invalid_seq; + } s; + + uint8_t padding[ODP_CACHE_LINE_SIZE]; +} stats_t ODP_ALIGNED_CACHE; + +/** + * IPv4 5-tuple + */ +typedef struct { + int32_t src_ip; + int32_t dst_ip; + int16_t src_port; + int16_t dst_port; + int8_t proto; + int8_t pad0; + int16_t pad1; +} ipv4_tuple5_t; + +/** + * Packet headers + */ +typedef struct { + odph_ethhdr_t *eth; + odph_ipv4hdr_t *ipv4; + odph_udphdr_t *udp; +} packet_hdr_t; + +/** + * Thread specific arguments + */ +typedef struct thread_args_t { + stats_t *stats; /**< Pointer to per thread statistics */ +} thread_args_t; + +/** + * Grouping of all global data + */ +typedef struct { + /** Per thread packet stats */ + stats_t stats[MAX_WORKERS]; + /** Application (parsed) arguments */ + appl_args_t appl; + /** Thread specific arguments */ + thread_args_t thread[MAX_WORKERS]; + /** Table of port ethernet addresses */ + odph_ethaddr_t port_eth_addr[MAX_PKTIOS]; + /** Table of dst ethernet addresses */ + odph_ethaddr_t dst_eth_addr[MAX_PKTIOS]; + /** Table of dst ports */ + int dst_port[MAX_PKTIOS]; + /** Table of atomic queues for flows */ + odp_queue_t fqueue[MAX_PKTIOS][MAX_FLOWS]; + /** Table of flow queue contexts */ + qcontext_t flow_qcontext[MAX_PKTIOS][MAX_FLOWS]; + /** Table of input queue contexts */ + qcontext_t input_qcontext[MAX_PKTIOS][MAX_QUEUES]; + /** Table of pktio handles */ + struct { + odp_pktio_t pktio; + odp_pktout_queue_t pktout[MAX_FLOWS]; + odp_queue_t pktin[MAX_QUEUES]; + int num_rx_queue; + int num_tx_queue; + } pktios[MAX_PKTIOS]; +} args_t; + +/** Global pointer to args */ +static args_t *gbl_args; + +/** Global barrier to synchronize main and workers */ +static odp_barrier_t barrier; + +/** + * Lookup the destination port for a given packet + * + * @param pkt ODP packet handle + */ +static inline int lookup_dest_port(odp_packet_t pkt) +{ + int i, src_idx; + odp_pktio_t pktio_src; + + pktio_src = odp_packet_input(pkt); + + for (src_idx = -1, i = 0; gbl_args->pktios[i].pktio + != ODP_PKTIO_INVALID; i++) + if (gbl_args->pktios[i].pktio == pktio_src) + src_idx = i; + + if (src_idx == -1) + LOG_ABORT("Failed to determine pktio input\n"); + + return gbl_args->dst_port[src_idx]; +} + +/** + * Map required packet headers + * + * @param pkt Packet handle + * @param hdr[out] Packet headers + * + * @retval 0 on success + * @retval -1 on failure + */ +static inline int packet_hdr(odp_packet_t pkt, packet_hdr_t *hdr) +{ + uint8_t *udp; + uint16_t eth_type; + uint8_t ihl; + + if (odp_unlikely(odp_packet_seg_len(pkt) < MIN_PACKET_LEN)) + return -1; + + if (odp_unlikely(!odp_packet_has_eth(pkt))) + return -1; + + hdr->eth = odp_packet_l2_ptr(pkt, NULL); + eth_type = odp_be_to_cpu_16(hdr->eth->type); + if (odp_unlikely(eth_type != ODPH_ETHTYPE_IPV4)) + return -1; + + hdr->ipv4 = (odph_ipv4hdr_t *)(hdr->eth + 1); + if (odp_unlikely(hdr->ipv4->proto != ODPH_IPPROTO_UDP)) + return -1; + + ihl = ODPH_IPV4HDR_IHL(hdr->ipv4->ver_ihl); + if (odp_unlikely(ihl < ODPH_IPV4HDR_IHL_MIN)) + return -1; + + udp = (uint8_t *)hdr->ipv4 + (ihl * 4); + + hdr->udp = (odph_udphdr_t *)udp; + + return 0; +} + +/** + * Compute hash from a 5-tuple + * + * @param key IPv4 5-tuple + * + * @return 32-bit hash value + */ +static inline uint64_t calc_ipv4_5tuple_hash(ipv4_tuple5_t *tuple) +{ + uint32_t a, b, c; + + a = tuple->proto + JHASH_GOLDEN_RATIO; + b = tuple->src_ip + JHASH_GOLDEN_RATIO; + c = tuple->dst_ip + JHASH_GOLDEN_RATIO; + + mix(a, b, c); + + a += (tuple->src_port << 16) + tuple->dst_port + JHASH_GOLDEN_RATIO; + final(a, b, c); + + return c; +} + +/** + * Compute packet flow index + * + * @param hdr Packet headers + * + * @return Flow index + */ +static inline uint64_t calc_flow_idx(packet_hdr_t *hdr) +{ + ipv4_tuple5_t tuple; + uint64_t idx; + + tuple.dst_ip = odp_be_to_cpu_32(hdr->ipv4->dst_addr); + tuple.src_ip = odp_be_to_cpu_32(hdr->ipv4->src_addr); + tuple.proto = hdr->ipv4->proto; + tuple.src_port = odp_be_to_cpu_16(hdr->udp->src_port); + tuple.dst_port = odp_be_to_cpu_16(hdr->udp->dst_port); + tuple.pad0 = 0; + tuple.pad1 = 0; + idx = calc_ipv4_5tuple_hash(&tuple); + + return idx % gbl_args->appl.num_flows; +} + +/** + * Fill packet's eth addresses according to the destination port + * + * @param hdr[out] Packet headers + * @param dst_port Destination port + */ +static inline void fill_eth_addrs(packet_hdr_t *hdr, int dst_port) +{ + hdr->eth->src = gbl_args->port_eth_addr[dst_port]; + hdr->eth->dst = gbl_args->dst_eth_addr[dst_port]; +} + +/** + * Process flow queue + * + * @param ev_tbl Array of events + * @param num Number of events in the array + * @param stats Pointer for storing thread statistics + * @param qcontext Source queue context + * @param pktout Arrays of output queues + */ +static inline void process_flow(odp_event_t ev_tbl[], int num, stats_t *stats, + qcontext_t *qcontext, + odp_pktout_queue_t pktout[][MAX_FLOWS]) +{ + odp_packet_t pkt; + flow_t *flow; + uint64_t queue_seq; + int dst_if; + int i; + int sent; + + for (i = 0; i < num; i++) { + pkt = odp_packet_from_event(ev_tbl[i]); + + flow = odp_packet_user_area(pkt); + + queue_seq = qcontext->seq[flow->src_idx]; + + /* Check sequence number */ + if (gbl_args->appl.in_mode != SCHED_PARALLEL && + odp_unlikely(flow->seq != queue_seq)) { + printf("Invalid sequence number: packet_seq=%" PRIu64 "" + " queue_seq=%" PRIu64 ", src_if=%" PRIu8 ", " + "dst_if=%" PRIu8 ", flow=%" PRIu16 "\n", + flow->seq, queue_seq, flow->src_idx, + flow->dst_idx, flow->idx); + qcontext->seq[flow->src_idx] = flow->seq + 1; + stats->s.invalid_seq++; + } else { + qcontext->seq[flow->src_idx]++; + } + + dst_if = flow->dst_idx; + sent = odp_pktout_send(pktout[dst_if][flow->idx], &pkt, 1); + + if (odp_unlikely(sent != 1)) { + stats->s.tx_drops++; + odp_packet_free(pkt); + } + stats->s.packets++; + } +} + +/** + * Process input queue + * + * @param ev_tbl Array of events + * @param num Number of events in the array + * @param stats Pointer for storing thread statistics + * @param qcontext Source queue context + */ +static inline void process_input(odp_event_t ev_tbl[], int num, stats_t *stats, + qcontext_t *qcontext) +{ + flow_t *flow; + flow_t *flow_tbl[MAX_PKT_BURST]; + int ret; + int i, j; + int pkts = 0; + + for (i = 0; i < num; i++) { + odp_packet_t pkt; + packet_hdr_t hdr; + int flow_idx; + + pkt = odp_packet_from_event(ev_tbl[i]); + + odp_packet_prefetch(pkt, 0, MIN_PACKET_LEN); + + ret = packet_hdr(pkt, &hdr); + if (odp_unlikely(ret)) { + odp_packet_free(pkt); + stats->s.rx_drops++; + continue; + } + + flow_idx = calc_flow_idx(&hdr); + + fill_eth_addrs(&hdr, flow_idx); + + flow = odp_packet_user_area(pkt); + flow->idx = flow_idx; + flow->src_idx = qcontext->idx; + flow->dst_idx = lookup_dest_port(pkt); + flow_tbl[pkts] = flow; + + /* Simulate "fat pipe" processing by generating extra work */ + for (j = 0; j < gbl_args->appl.extra_rounds; j++) + flow->crc = dummy_hash_crc32c(odp_packet_data(pkt), + odp_packet_len(pkt), 0); + pkts++; + } + + if (odp_unlikely(!pkts)) + return; + + /* Set sequence numbers */ + if (gbl_args->appl.in_mode == SCHED_ORDERED) + odp_schedule_order_lock(0); + + for (i = 0; i < pkts; i++) { + flow = flow_tbl[i]; + flow->seq = qcontext->seq[flow->idx]++; + } + + if (gbl_args->appl.in_mode == SCHED_ORDERED) + odp_schedule_order_unlock(0); + + for (i = 0; i < pkts; i++) { + flow = flow_tbl[i]; + ret = odp_queue_enq(gbl_args->fqueue[flow->dst_idx][flow->idx], + ev_tbl[i]); + + if (odp_unlikely(ret != 0)) { + LOG_ERR("odp_queue_enq() failed\n"); + stats->s.tx_drops++; + odp_event_free(ev_tbl[i]); + } else { + stats->s.packets++; + } + } +} + +/** + * Worker thread + * + * @param arg Thread arguments of type 'thread_args_t *' + */ +static int run_worker(void *arg) +{ + odp_event_t ev_tbl[MAX_PKT_BURST]; + odp_queue_t queue; + odp_pktout_queue_t pktout[MAX_PKTIOS][MAX_FLOWS]; + qcontext_t *qcontext; + thread_args_t *thr_args = arg; + stats_t *stats = thr_args->stats; + int pkts; + int i, j; + + memset(pktout, 0, sizeof(pktout)); + + for (i = 0; i < gbl_args->appl.if_count; i++) { + for (j = 0; j < gbl_args->appl.num_flows; j++) { + pktout[i][j] = gbl_args->pktios[i].pktout[j % + gbl_args->pktios[i].num_tx_queue]; + } + } + odp_barrier_wait(&barrier); + + /* Loop packets */ + while (!exit_threads) { + pkts = odp_schedule_multi(&queue, ODP_SCHED_NO_WAIT, ev_tbl, + MAX_PKT_BURST); + if (pkts <= 0) + continue; + + qcontext = odp_queue_context(queue); + + if (qcontext->input_queue) + process_input(ev_tbl, pkts, stats, qcontext); + else + process_flow(ev_tbl, pkts, stats, qcontext, pktout); + } + + /* Free remaining events in queues */ + while (1) { + odp_event_t ev; + + ev = odp_schedule(NULL, + odp_schedule_wait_time(ODP_TIME_SEC_IN_NS)); + + if (ev == ODP_EVENT_INVALID) + break; + + odp_event_free(ev); + } + + return 0; +} + +/** + * Create a pktio handle and associate with input queues + * + * @param dev Name of device to open + * @param index Pktio index + * @param num_rx Number of input queues + * @param num_tx Number of output queues + * @param pool Pool to associate with device for packet RX/TX + * + * @retval 0 on success + * @retval -1 on failure + */ +static int create_pktio(const char *dev, int idx, int num_rx, int num_tx, + odp_pool_t pool) +{ + odp_pktio_t pktio; + odp_pktio_param_t pktio_param; + odp_pktio_capability_t capa; + odp_pktin_queue_param_t pktin_param; + odp_pktout_queue_param_t pktout_param; + odp_pktio_op_mode_t mode_rx; + odp_pktio_op_mode_t mode_tx; + int i; + + odp_pktio_param_init(&pktio_param); + + pktio_param.in_mode = ODP_PKTIN_MODE_SCHED; + + pktio = odp_pktio_open(dev, pool, &pktio_param); + if (pktio == ODP_PKTIO_INVALID) { + LOG_ERR("Error: failed to open %s\n", dev); + return -1; + } + + printf("Created pktio %" PRIu64 " (%s)\n", + odp_pktio_to_u64(pktio), dev); + + if (odp_pktio_capability(pktio, &capa)) { + LOG_ERR("Error: capability query failed %s\n", dev); + odp_pktio_close(pktio); + return -1; + } + + odp_pktin_queue_param_init(&pktin_param); + odp_pktout_queue_param_init(&pktout_param); + + mode_tx = ODP_PKTIO_OP_MT; + mode_rx = ODP_PKTIO_OP_MT; + + if (gbl_args->appl.in_mode == SCHED_ATOMIC) { + pktin_param.queue_param.sched.sync = ODP_SCHED_SYNC_ATOMIC; + } else if (gbl_args->appl.in_mode == SCHED_PARALLEL) { + pktin_param.queue_param.sched.sync = ODP_SCHED_SYNC_PARALLEL; + } else { + pktin_param.queue_param.sched.sync = ODP_SCHED_SYNC_ORDERED; + pktin_param.queue_param.sched.lock_count = 1; + } + pktin_param.queue_param.sched.prio = ODP_SCHED_PRIO_DEFAULT; + pktin_param.queue_param.sched.group = ODP_SCHED_GROUP_ALL; + + if (num_rx > (int)capa.max_input_queues) { + printf("Allocating %i shared input queues, %i requested\n", + capa.max_input_queues, num_rx); + num_rx = capa.max_input_queues; + mode_rx = ODP_PKTIO_OP_MT; + } + + if (num_tx > (int)capa.max_output_queues) { + printf("Allocating %i shared output queues, %i requested\n", + capa.max_output_queues, num_tx); + num_tx = capa.max_output_queues; + mode_tx = ODP_PKTIO_OP_MT; + } + + pktin_param.hash_enable = 1; + pktin_param.hash_proto.proto.ipv4_udp = 1; + pktin_param.num_queues = num_rx; + pktin_param.op_mode = mode_rx; + + pktout_param.op_mode = mode_tx; + pktout_param.num_queues = num_tx; + + if (odp_pktin_queue_config(pktio, &pktin_param)) { + LOG_ERR("Error: input queue config failed %s\n", dev); + return -1; + } + + if (odp_pktout_queue_config(pktio, &pktout_param)) { + LOG_ERR("Error: output queue config failed %s\n", dev); + return -1; + } + + if (odp_pktin_event_queue(pktio, gbl_args->pktios[idx].pktin, + num_rx) != num_rx) { + LOG_ERR("Error: pktin event queue query failed %s\n", + dev); + return -1; + } + + /* Set queue contexts */ + for (i = 0; i < num_rx; i++) { + gbl_args->input_qcontext[idx][i].idx = idx; + gbl_args->input_qcontext[idx][i].input_queue = 1; + + if (odp_queue_context_set(gbl_args->pktios[idx].pktin[i], + &gbl_args->input_qcontext[idx][i], + sizeof(qcontext_t))) { + LOG_ERR("Error: pktin queue context set failed %s\n", + dev); + return -1; + } + } + + if (odp_pktout_queue(pktio, + gbl_args->pktios[idx].pktout, + num_tx) != num_tx) { + LOG_ERR("Error: pktout queue query failed %s\n", dev); + return -1; + } + + printf("Created %i input and %i output queues on (%s)\n", + num_rx, num_tx, dev); + + gbl_args->pktios[idx].num_rx_queue = num_rx; + gbl_args->pktios[idx].num_tx_queue = num_tx; + gbl_args->pktios[idx].pktio = pktio; + + return 0; +} + +/** + * Print statistics + * + * @param num_workers Number of worker threads + * @param thr_stats Pointer to stats storage + * @param duration Number of seconds to loop in + * @param timeout Number of seconds for stats calculation + * + */ +static int print_speed_stats(int num_workers, stats_t *thr_stats, + int duration, int timeout) +{ + uint64_t pkts = 0; + uint64_t pkts_prev = 0; + uint64_t pps; + uint64_t rx_drops, tx_drops, invalid_seq; + uint64_t maximum_pps = 0; + int i; + int elapsed = 0; + int stats_enabled = 1; + int loop_forever = (duration == 0); + + if (timeout <= 0) { + stats_enabled = 0; + timeout = 1; + } + /* Wait for all threads to be ready*/ + odp_barrier_wait(&barrier); + + do { + pkts = 0; + rx_drops = 0; + tx_drops = 0; + invalid_seq = 0; + + sleep(timeout); + + for (i = 0; i < num_workers; i++) { + pkts += thr_stats[i].s.packets; + rx_drops += thr_stats[i].s.rx_drops; + tx_drops += thr_stats[i].s.tx_drops; + invalid_seq += thr_stats[i].s.invalid_seq; + } + if (stats_enabled) { + pps = (pkts - pkts_prev) / timeout; + if (pps > maximum_pps) + maximum_pps = pps; + printf("%" PRIu64 " pps, %" PRIu64 " max pps, ", pps, + maximum_pps); + + printf("%" PRIu64 " rx drops, %" PRIu64 " tx drops, ", + rx_drops, tx_drops); + + printf("%" PRIu64 " invalid seq\n", invalid_seq); + + pkts_prev = pkts; + } + elapsed += timeout; + } while (loop_forever || (elapsed < duration)); + + if (stats_enabled) + printf("TEST RESULT: %" PRIu64 " maximum packets per second.\n", + maximum_pps); + + return (pkts > 100 && !invalid_seq) ? 0 : -1; +} + +/** + * Find the destination port for a given input port + * + * @param port Input port index + */ +static int find_dest_port(int port) +{ + /* Even number of ports */ + if (gbl_args->appl.if_count % 2 == 0) + return (port % 2 == 0) ? port + 1 : port - 1; + + /* Odd number of ports */ + if (port == gbl_args->appl.if_count - 1) + return 0; + else + return port + 1; +} + +/** + * Initialize port forwarding table + */ +static void init_forwarding_tbl(void) +{ + int rx_idx; + + for (rx_idx = 0; rx_idx < gbl_args->appl.if_count; rx_idx++) + gbl_args->dst_port[rx_idx] = find_dest_port(rx_idx); +} + +/** + * Prinf usage information + */ +static void usage(char *progname) +{ + printf("\n" + "OpenDataPlane ordered pktio application.\n" + "\n" + "Usage: %s OPTIONS\n" + " E.g. %s -i eth0,eth1\n" + " In the above example,\n" + " eth0 will send pkts to eth1 and vice versa\n" + "\n" + "Mandatory OPTIONS:\n" + " -i, --interface Eth interfaces (comma-separated, no spaces)\n" + " Interface count min 1, max %i\n" + "\n" + "Optional OPTIONS:\n" + " -m, --mode Packet input mode\n" + " 0: Scheduled ordered queues (default)\n" + " 1: Scheduled atomic queues\n" + " 2: Scheduled parallel queues (packet order not maintained)\n" + " -r, --num_rx_q Number of RX queues per interface\n" + " -f, --num_flows Number of packet flows\n" + " -e, --extra_input <number> Number of extra input processing rounds\n" + " -c, --count <number> CPU count.\n" + " -t, --time <number> Time in seconds to run.\n" + " -a, --accuracy <number> Statistics print interval in seconds\n" + " (default is 1 second).\n" + " -d, --dst_addr Destination addresses (comma-separated, no spaces)\n" + " -h, --help Display help and exit.\n\n" + "\n", NO_PATH(progname), NO_PATH(progname), MAX_PKTIOS + ); +} + +/** + * Parse and store the command line arguments + * + * @param argc argument count + * @param argv[] argument vector + * @param appl_args Store application arguments here + */ +static void parse_args(int argc, char *argv[], appl_args_t *appl_args) +{ + int opt; + int long_index; + char *token; + char *addr_str; + size_t len; + int i; + static const struct option longopts[] = { + {"count", required_argument, NULL, 'c'}, + {"time", required_argument, NULL, 't'}, + {"accuracy", required_argument, NULL, 'a'}, + {"interface", required_argument, NULL, 'i'}, + {"mode", required_argument, NULL, 'm'}, + {"dst_addr", required_argument, NULL, 'd'}, + {"num_rx_q", required_argument, NULL, 'r'}, + {"num_flows", required_argument, NULL, 'f'}, + {"extra_input", required_argument, NULL, 'e'}, + {"help", no_argument, NULL, 'h'}, + {NULL, 0, NULL, 0} + }; + + static const char *shortopts = "+c:+t:+a:i:m:d:r:f:e:h"; + + /* let helper collect its own arguments (e.g. --odph_proc) */ + odph_parse_options(argc, argv, shortopts, longopts); + + appl_args->time = 0; /* loop forever if time to run is 0 */ + appl_args->accuracy = DEF_STATS_INT; + appl_args->num_rx_q = DEF_NUM_RX_QUEUES; + appl_args->num_flows = DEF_NUM_FLOWS; + appl_args->extra_rounds = DEF_EXTRA_ROUNDS; + + opterr = 0; /* do not issue errors on helper options */ + + while (1) { + opt = getopt_long(argc, argv, shortopts, longopts, &long_index); + + if (opt == -1) + break; /* No more options */ + + switch (opt) { + case 'c': + appl_args->cpu_count = atoi(optarg); + break; + case 't': + appl_args->time = atoi(optarg); + break; + case 'a': + appl_args->accuracy = atoi(optarg); + break; + /* parse packet-io interface names */ + case 'd': + len = strlen(optarg); + if (len == 0) { + usage(argv[0]); + exit(EXIT_FAILURE); + } + len += 1; /* add room for '\0' */ + + addr_str = malloc(len); + if (addr_str == NULL) { + usage(argv[0]); + exit(EXIT_FAILURE); + } + + /* store the mac addresses names */ + strcpy(addr_str, optarg); + for (token = strtok(addr_str, ","), i = 0; + token != NULL; token = strtok(NULL, ","), i++) { + if (i >= MAX_PKTIOS) { + printf("too many MAC addresses\n"); + usage(argv[0]); + exit(EXIT_FAILURE); + } + if (odph_eth_addr_parse(&appl_args->addrs[i], + token) != 0) { + printf("invalid MAC address\n"); + usage(argv[0]); + exit(EXIT_FAILURE); + } + } + appl_args->addr_count = i; + if (appl_args->addr_count < 1) { + usage(argv[0]); + exit(EXIT_FAILURE); + } + free(addr_str); + break; + case 'i': + len = strlen(optarg); + if (len == 0) { + usage(argv[0]); + exit(EXIT_FAILURE); + } + len += 1; /* add room for '\0' */ + + appl_args->if_str = malloc(len); + if (appl_args->if_str == NULL) { + usage(argv[0]); + exit(EXIT_FAILURE); + } + + /* count the number of tokens separated by ',' */ + strcpy(appl_args->if_str, optarg); + for (token = strtok(appl_args->if_str, ","), i = 0; + token != NULL; + token = strtok(NULL, ","), i++) + ; + + appl_args->if_count = i; + + if (appl_args->if_count < 1 || + appl_args->if_count > MAX_PKTIOS) { + usage(argv[0]); + exit(EXIT_FAILURE); + } + + /* allocate storage for the if names */ + appl_args->if_names = + calloc(appl_args->if_count, sizeof(char *)); + + /* store the if names (reset names string) */ + strcpy(appl_args->if_str, optarg); + for (token = strtok(appl_args->if_str, ","), i = 0; + token != NULL; token = strtok(NULL, ","), i++) { + appl_args->if_names[i] = token; + } + break; + case 'm': + i = atoi(optarg); + if (i == 1) + appl_args->in_mode = SCHED_ATOMIC; + else if (i == 2) + appl_args->in_mode = SCHED_PARALLEL; + else + appl_args->in_mode = SCHED_ORDERED; + break; + case 'r': + appl_args->num_rx_q = atoi(optarg); + break; + case 'f': + appl_args->num_flows = atoi(optarg); + break; + case 'e': + appl_args->extra_rounds = atoi(optarg); + break; + case 'h': + usage(argv[0]); + exit(EXIT_SUCCESS); + break; + default: + break; + } + } + + if (appl_args->cpu_count > MAX_WORKERS) { + printf("Too many workers requested %d, max: %d\n", + appl_args->cpu_count, MAX_WORKERS); + exit(EXIT_FAILURE); + } + + if (appl_args->num_flows > MAX_FLOWS) { + printf("Too many flows requested %d, max: %d\n", + appl_args->num_flows, MAX_FLOWS); + exit(EXIT_FAILURE); + } + + if (appl_args->if_count == 0 || appl_args->num_flows == 0 || + appl_args->num_rx_q == 0) { + usage(argv[0]); + exit(EXIT_FAILURE); + } + if (appl_args->addr_count != 0 && + appl_args->addr_count != appl_args->if_count) { + printf("Number of destination addresses differs from number" + " of interfaces\n"); + usage(argv[0]); + exit(EXIT_FAILURE); + } + + optind = 1; /* reset 'extern optind' from the getopt lib */ +} + +/** + * Print system and application info + */ +static void print_info(char *progname, appl_args_t *appl_args) +{ + int i; + + printf("\n" + "ODP system info\n" + "---------------\n" + "ODP API version: %s\n" + "ODP impl name: %s\n" + "CPU model: %s\n" + "CPU freq (hz): %" PRIu64 "\n" + "Cache line size: %i\n" + "CPU count: %i\n" + "\n", + odp_version_api_str(), odp_version_impl_name(), + odp_cpu_model_str(), odp_cpu_hz_max(), + odp_sys_cache_line_size(), odp_cpu_count()); + + printf("Running ODP appl: \"%s\"\n" + "-----------------\n" + "IF-count: %i\n" + "Using IFs: ", + progname, appl_args->if_count); + for (i = 0; i < appl_args->if_count; ++i) + printf(" %s", appl_args->if_names[i]); + printf("\n\n"); + fflush(NULL); +} + +static void gbl_args_init(args_t *args) +{ + int pktio, queue; + + memset(args, 0, sizeof(args_t)); + + for (pktio = 0; pktio < MAX_PKTIOS; pktio++) { + args->pktios[pktio].pktio = ODP_PKTIO_INVALID; + + for (queue = 0; queue < MAX_QUEUES; queue++) + args->pktios[pktio].pktin[queue] = ODP_QUEUE_INVALID; + } +} + +/** + * ODP ordered pktio application + */ +int main(int argc, char *argv[]) +{ + odp_cpumask_t cpumask; + odp_instance_t instance; + odp_pool_t pool; + odp_pool_param_t params; + odp_shm_t shm; + odp_queue_capability_t capa; + odph_ethaddr_t new_addr; + odph_odpthread_t thread_tbl[MAX_WORKERS]; + stats_t *stats; + char cpumaskstr[ODP_CPUMASK_STR_SIZE]; + int cpu; + int i, j; + int if_count; + int ret; + int num_workers; + int in_mode; + + /* Init ODP before calling anything else */ + if (odp_init_global(&instance, NULL, NULL)) { + LOG_ERR("Error: ODP global init failed.\n"); + exit(EXIT_FAILURE); + } + + /* Init this thread */ + if (odp_init_local(instance, ODP_THREAD_CONTROL)) { + LOG_ERR("Error: ODP local init failed.\n"); + exit(EXIT_FAILURE); + } + + /* Reserve memory for args from shared mem */ + shm = odp_shm_reserve("shm_args", sizeof(args_t), + ODP_CACHE_LINE_SIZE, 0); + + if (shm == ODP_SHM_INVALID) { + LOG_ERR("Error: shared mem reserve failed.\n"); + exit(EXIT_FAILURE); + } + + gbl_args = odp_shm_addr(shm); + + if (gbl_args == NULL) { + LOG_ERR("Error: shared mem alloc failed.\n"); + odp_shm_free(shm); + exit(EXIT_FAILURE); + } + gbl_args_init(gbl_args); + + /* Parse and store the application arguments */ + parse_args(argc, argv, &gbl_args->appl); + + if (gbl_args->appl.in_mode == SCHED_ORDERED) { + /* At least one ordered lock required */ + odp_queue_capability(&capa); + if (capa.max_ordered_locks < 1) { + LOG_ERR("Error: Ordered locks not available.\n"); + exit(EXIT_FAILURE); + } + } + /* Print both system and application information */ + print_info(NO_PATH(argv[0]), &gbl_args->appl); + + /* Default to system CPU count unless user specified */ + num_workers = MAX_WORKERS; + if (gbl_args->appl.cpu_count) + num_workers = gbl_args->appl.cpu_count; + + /* Get default worker cpumask */ + num_workers = odp_cpumask_default_worker(&cpumask, num_workers); + (void)odp_cpumask_to_str(&cpumask, cpumaskstr, sizeof(cpumaskstr)); + + if_count = gbl_args->appl.if_count; + + printf("Num worker threads: %i\n", num_workers); + printf("First CPU: %i\n", odp_cpumask_first(&cpumask)); + printf("CPU mask: %s\n\n", cpumaskstr); + + /* Create packet pool */ + odp_pool_param_init(&params); + params.pkt.seg_len = PKT_POOL_BUF_SIZE; + params.pkt.len = PKT_POOL_BUF_SIZE; + params.pkt.num = PKT_POOL_SIZE; + params.pkt.uarea_size = PKT_UAREA_SIZE; + params.type = ODP_POOL_PACKET; + + pool = odp_pool_create("packet pool", &params); + + if (pool == ODP_POOL_INVALID) { + LOG_ERR("Error: packet pool create failed.\n"); + exit(EXIT_FAILURE); + } + odp_pool_print(pool); + + init_forwarding_tbl(); + + for (i = 0; i < if_count; ++i) { + const char *dev = gbl_args->appl.if_names[i]; + int num_rx, num_tx; + + num_rx = gbl_args->appl.num_rx_q; + num_tx = gbl_args->appl.num_flows; + + if (create_pktio(dev, i, num_rx, num_tx, pool)) + exit(EXIT_FAILURE); + + /* Save interface ethernet address */ + if (odp_pktio_mac_addr(gbl_args->pktios[i].pktio, + gbl_args->port_eth_addr[i].addr, + ODPH_ETHADDR_LEN) != ODPH_ETHADDR_LEN) { + LOG_ERR("Error: interface ethernet address unknown\n"); + exit(EXIT_FAILURE); + } + + odp_pktio_print(gbl_args->pktios[i].pktio); + + /* Save destination eth address */ + /* 02:00:00:00:00:XX */ + memset(&new_addr, 0, sizeof(odph_ethaddr_t)); + if (gbl_args->appl.addr_count) { + memcpy(&new_addr, &gbl_args->appl.addrs[i], + sizeof(odph_ethaddr_t)); + } else { + new_addr.addr[0] = 0x02; + new_addr.addr[5] = i; + } + gbl_args->dst_eth_addr[i] = new_addr; + } + + gbl_args->pktios[i].pktio = ODP_PKTIO_INVALID; + + /* Allocate the same number of flows to each interface */ + for (i = 0; i < if_count; i++) { + odp_pktio_capability_t capa; + + if (odp_pktio_capability(gbl_args->pktios[i].pktio, &capa)) { + LOG_ERR("Error: pktio capability failed.\n"); + exit(EXIT_FAILURE); + } + + if ((unsigned)gbl_args->appl.num_flows > capa.max_output_queues) + gbl_args->appl.num_flows = capa.max_output_queues; + } + + /* Create atomic queues for packet tagging */ + for (i = 0; i < if_count; i++) { + for (j = 0; j < gbl_args->appl.num_flows; j++) { + odp_queue_t queue; + odp_queue_param_t qparam; + char qname[ODP_QUEUE_NAME_LEN]; + + snprintf(qname, sizeof(qname), "flow_%d_%d", i, j); + + odp_queue_param_init(&qparam); + qparam.type = ODP_QUEUE_TYPE_SCHED; + qparam.sched.prio = ODP_SCHED_PRIO_DEFAULT; + qparam.sched.sync = ODP_SCHED_SYNC_ATOMIC; + qparam.sched.group = ODP_SCHED_GROUP_ALL; + + gbl_args->flow_qcontext[i][j].idx = i; + gbl_args->flow_qcontext[i][j].input_queue = 0; + qparam.context = &gbl_args->flow_qcontext[i][j]; + qparam.context_len = sizeof(qcontext_t); + + queue = odp_queue_create(qname, &qparam); + if (queue == ODP_QUEUE_INVALID) { + LOG_ERR("Error: flow queue create failed.\n"); + exit(EXIT_FAILURE); + } + + gbl_args->fqueue[i][j] = queue; + } + } + + in_mode = gbl_args->appl.in_mode; + printf("\nApplication parameters\n" + "----------------------\n" + "Input queues: %d\n" + "Mode: %s\n" + "Flows: %d\n" + "Extra rounds: %d\n\n", gbl_args->appl.num_rx_q, + (in_mode == SCHED_ATOMIC) ? "PKTIN_SCHED_ATOMIC" : + (in_mode == SCHED_PARALLEL ? "PKTIN_SCHED_PARALLEL" : + "PKTIN_SCHED_ORDERED"), gbl_args->appl.num_flows, + gbl_args->appl.extra_rounds); + + memset(thread_tbl, 0, sizeof(thread_tbl)); + + stats = gbl_args->stats; + + odp_barrier_init(&barrier, num_workers + 1); + + /* Create worker threads */ + cpu = odp_cpumask_first(&cpumask); + for (i = 0; i < num_workers; ++i) { + odp_cpumask_t thd_mask; + odph_odpthread_params_t thr_params; + + memset(&thr_params, 0, sizeof(thr_params)); + thr_params.start = run_worker; + thr_params.arg = &gbl_args->thread[i]; + thr_params.thr_type = ODP_THREAD_WORKER; + thr_params.instance = instance; + + gbl_args->thread[i].stats = &stats[i]; + + odp_cpumask_zero(&thd_mask); + odp_cpumask_set(&thd_mask, cpu); + odph_odpthreads_create(&thread_tbl[i], &thd_mask, + &thr_params); + cpu = odp_cpumask_next(&cpumask, cpu); + } + + /* Start packet receive and transmit */ + for (i = 0; i < if_count; ++i) { + odp_pktio_t pktio; + + pktio = gbl_args->pktios[i].pktio; + ret = odp_pktio_start(pktio); + if (ret) { + LOG_ERR("Error: unable to start %s\n", + gbl_args->appl.if_names[i]); + exit(EXIT_FAILURE); + } + } + + ret = print_speed_stats(num_workers, stats, gbl_args->appl.time, + gbl_args->appl.accuracy); + + /* Stop receiving new packet */ + for (i = 0; i < if_count; i++) + odp_pktio_stop(gbl_args->pktios[i].pktio); + + exit_threads = 1; + + /* Master thread waits for other threads to exit */ + for (i = 0; i < num_workers; ++i) + odph_odpthreads_join(&thread_tbl[i]); + + for (i = 0; i < if_count; i++) { + odp_pktio_close(gbl_args->pktios[i].pktio); + + for (j = 0; j < gbl_args->appl.num_flows; j++) + odp_queue_destroy(gbl_args->fqueue[i][j]); + } + + free(gbl_args->appl.if_names); + free(gbl_args->appl.if_str); + + if (odp_pool_destroy(pool)) { + LOG_ERR("Error: pool destroy\n"); + exit(EXIT_FAILURE); + } + + if (odp_shm_free(shm)) { + LOG_ERR("Error: shm free\n"); + exit(EXIT_FAILURE); + } + + if (odp_term_local()) { + LOG_ERR("Error: term local\n"); + exit(EXIT_FAILURE); + } + + if (odp_term_global(instance)) { + LOG_ERR("Error: term global\n"); + exit(EXIT_FAILURE); + } + + return ret; +} ----------------------------------------------------------------------- Summary of changes: test/common_plat/performance/.gitignore | 1 + test/common_plat/performance/Makefile.am | 8 +- .../common_plat/performance/dummy_crc.h | 46 +- test/common_plat/performance/odp_pktio_ordered.c | 1342 ++++++++++++++++++++ .../performance/odp_pktio_ordered_run.sh | 42 + .../common_plat/performance}/udp64.pcap | Bin 6 files changed, 1417 insertions(+), 22 deletions(-) copy platform/linux-generic/odp_hash.c => test/common_plat/performance/dummy_crc.h (96%) create mode 100644 test/common_plat/performance/odp_pktio_ordered.c create mode 100755 test/common_plat/performance/odp_pktio_ordered_run.sh copy {example/l2fwd_simple => test/common_plat/performance}/udp64.pcap (100%) hooks/post-receive --

8 years, 5 months

[COMMIT] branch master updated. v1.13.0.0-15-gf603483

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 f603483a31d03e5647c409f8ce71d72ebaadd93b (commit) via 29889bf258fc52ae7c950c11eb17503883cff47e (commit) via 88ed645e7378b955c580ec2b8ce9b846a5fb48f0 (commit) via 722fd6f8286722d30d50c00769fa4fcad5935dd2 (commit) from bbabb79cfaf5e28ec9e804b95a23605038b39d39 (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 f603483a31d03e5647c409f8ce71d72ebaadd93b Author: Mike Holmes <mike.holmes(a)linaro.org> Date: Mon Jan 23 14:46:08 2017 -0500 examples: use odph_api.h clean up all the examples and just use odph_api.h Signed-off-by: Mike Holmes <mike.holmes(a)linaro.org> Reviewed-by: Christophe Milard <christophe.milard(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/example/classifier/odp_classifier.c b/example/classifier/odp_classifier.c index c2f69d4..d67fe5a 100644 --- a/example/classifier/odp_classifier.c +++ b/example/classifier/odp_classifier.c @@ -12,9 +12,7 @@ #include <example_debug.h> #include <odp_api.h> -#include <odp/helper/eth.h> -#include <odp/helper/ip.h> -#include <odp/helper/threads.h> +#include <odp/helper/odph_api.h> #include <strings.h> #include <errno.h> #include <stdio.h> diff --git a/example/generator/odp_generator.c b/example/generator/odp_generator.c index 194c0a0..6ac8f2d 100644 --- a/example/generator/odp_generator.c +++ b/example/generator/odp_generator.c @@ -20,11 +20,7 @@ #include <odp_api.h> -#include <odp/helper/threads.h> -#include <odp/helper/eth.h> -#include <odp/helper/ip.h> -#include <odp/helper/udp.h> -#include <odp/helper/icmp.h> +#include <odp/helper/odph_api.h> #define MAX_WORKERS 32 /**< max number of works */ #define SHM_PKT_POOL_SIZE (512*2048) /**< pkt pool size */ diff --git a/example/ipsec/odp_ipsec.c b/example/ipsec/odp_ipsec.c index d686160..9ed3aa2 100644 --- a/example/ipsec/odp_ipsec.c +++ b/example/ipsec/odp_ipsec.c @@ -24,11 +24,7 @@ #include <odp_api.h> -#include <odp/helper/threads.h> -#include <odp/helper/eth.h> -#include <odp/helper/ip.h> -#include <odp/helper/icmp.h> -#include <odp/helper/ipsec.h> +#include <odp/helper/odph_api.h> #include <stdbool.h> #include <sys/socket.h> diff --git a/example/ipsec/odp_ipsec_fwd_db.h b/example/ipsec/odp_ipsec_fwd_db.h index 748ae04..152bdfb 100644 --- a/example/ipsec/odp_ipsec_fwd_db.h +++ b/example/ipsec/odp_ipsec_fwd_db.h @@ -12,7 +12,6 @@ extern "C" { #endif #include <odp_api.h> -#include <odp/helper/eth.h> #include <odp_ipsec_misc.h> #define OIF_LEN 32 diff --git a/example/ipsec/odp_ipsec_loop_db.h b/example/ipsec/odp_ipsec_loop_db.h index 0778186..1f9ade6 100644 --- a/example/ipsec/odp_ipsec_loop_db.h +++ b/example/ipsec/odp_ipsec_loop_db.h @@ -12,7 +12,6 @@ extern "C" { #endif #include <odp_api.h> -#include <odp/helper/eth.h> #include <odp_ipsec_misc.h> /** diff --git a/example/ipsec/odp_ipsec_misc.h b/example/ipsec/odp_ipsec_misc.h index 6a49dcb..e0320eb 100644 --- a/example/ipsec/odp_ipsec_misc.h +++ b/example/ipsec/odp_ipsec_misc.h @@ -12,9 +12,7 @@ extern "C" { #endif #include <odp_api.h> -#include <odp/helper/eth.h> -#include <odp/helper/ip.h> -#include <odp/helper/ipsec.h> +#include <odp/helper/odph_api.h> #ifndef TRUE #define TRUE 1 diff --git a/example/ipsec/odp_ipsec_stream.c b/example/ipsec/odp_ipsec_stream.c index 4dc9acf..428ec04 100644 --- a/example/ipsec/odp_ipsec_stream.c +++ b/example/ipsec/odp_ipsec_stream.c @@ -21,9 +21,7 @@ #include <odp_api.h> -#include <odp/helper/eth.h> -#include <odp/helper/ip.h> -#include <odp/helper/icmp.h> +#include <odp/helper/odph_api.h> #include <odp_ipsec_stream.h> #include <odp_ipsec_loop_db.h> diff --git a/example/l2fwd_simple/odp_l2fwd_simple.c b/example/l2fwd_simple/odp_l2fwd_simple.c index 2473a11..b97808f 100644 --- a/example/l2fwd_simple/odp_l2fwd_simple.c +++ b/example/l2fwd_simple/odp_l2fwd_simple.c @@ -10,9 +10,7 @@ #include <signal.h> #include <odp_api.h> -#include <odp/helper/eth.h> -#include <odp/helper/ip.h> -#include <odp/helper/threads.h> +#include <odp/helper/odph_api.h> #define POOL_NUM_PKT 8192 #define POOL_SEG_LEN 1856 diff --git a/example/l3fwd/odp_l3fwd.c b/example/l3fwd/odp_l3fwd.c index 4e35b64..ba06972 100644 --- a/example/l3fwd/odp_l3fwd.c +++ b/example/l3fwd/odp_l3fwd.c @@ -14,11 +14,7 @@ #include <test_debug.h> #include <odp_api.h> -#include <odp/helper/eth.h> -#include <odp/helper/ip.h> -#include <odp/helper/udp.h> -#include <odp/helper/tcp.h> -#include <odp/helper/threads.h> +#include <odp/helper/odph_api.h> #include "odp_l3fwd_db.h" #include "odp_l3fwd_lpm.h" diff --git a/example/l3fwd/odp_l3fwd_db.h b/example/l3fwd/odp_l3fwd_db.h index 1b24f1a..8df2999 100644 --- a/example/l3fwd/odp_l3fwd_db.h +++ b/example/l3fwd/odp_l3fwd_db.h @@ -12,7 +12,7 @@ extern "C" { #endif #include <odp_api.h> -#include <odp/helper/eth.h> +#include <odp/helper/odph_api.h> #define OIF_LEN 32 #define MAX_DB 32 diff --git a/example/packet/odp_pktio.c b/example/packet/odp_pktio.c index 6e24deb..ea84282 100644 --- a/example/packet/odp_pktio.c +++ b/example/packet/odp_pktio.c @@ -13,9 +13,7 @@ #include <example_debug.h> #include <odp_api.h> -#include <odp/helper/eth.h> -#include <odp/helper/ip.h> -#include <odp/helper/threads.h> +#include <odp/helper/odph_api.h> /** @def MAX_WORKERS * @brief Maximum number of worker threads diff --git a/example/switch/odp_switch.c b/example/switch/odp_switch.c index 2bbce10..561c293 100644 --- a/example/switch/odp_switch.c +++ b/example/switch/odp_switch.c @@ -11,9 +11,7 @@ #include <inttypes.h> #include <odp_api.h> -#include <odp/helper/eth.h> -#include <odp/helper/ip.h> -#include <odp/helper/threads.h> +#include <odp/helper/odph_api.h> /** Maximum number of worker threads */ #define MAX_WORKERS 32 diff --git a/example/time/time_global_test.c b/example/time/time_global_test.c index dd33949..e24e9f4 100644 --- a/example/time/time_global_test.c +++ b/example/time/time_global_test.c @@ -8,7 +8,7 @@ #include <odp_api.h> #include <example_debug.h> -#include <odp/helper/threads.h> +#include <odp/helper/odph_api.h> #define MAX_WORKERS 32 #define ITERATION_NUM 2048 diff --git a/example/timer/odp_timer_test.c b/example/timer/odp_timer_test.c index b847e2b..1088a74 100644 --- a/example/timer/odp_timer_test.c +++ b/example/timer/odp_timer_test.c @@ -14,7 +14,7 @@ #include <odp_api.h> /* ODP helper for Linux apps */ -#include <odp/helper/threads.h> +#include <odp/helper/odph_api.h> /* GNU lib C */ #include <getopt.h> commit 29889bf258fc52ae7c950c11eb17503883cff47e Author: Mike Holmes <mike.holmes(a)linaro.org> Date: Mon Jan 23 14:46:07 2017 -0500 test: use odph_api.h Clean up all the includes and replace them with odph_api.h Signed-off-by: Mike Holmes <mike.holmes(a)linaro.org> Reviewed-by: Christophe Milard <christophe.milard(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/common_plat/common/odp_cunit_common.c b/test/common_plat/common/odp_cunit_common.c index 6d18fa0..d3328af 100644 --- a/test/common_plat/common/odp_cunit_common.c +++ b/test/common_plat/common/odp_cunit_common.c @@ -7,7 +7,7 @@ #include <string.h> #include <odp_api.h> #include <odp_cunit_common.h> -#include <odp/helper/threads.h> +#include <odp/helper/odph_api.h> /* Globals */ static odph_odpthread_t thread_tbl[MAX_WORKERS]; static odp_instance_t instance; diff --git a/test/common_plat/performance/odp_crypto.c b/test/common_plat/performance/odp_crypto.c index bff20e5..954bdb7 100644 --- a/test/common_plat/performance/odp_crypto.c +++ b/test/common_plat/performance/odp_crypto.c @@ -17,7 +17,7 @@ #include <sys/resource.h> #include <odp_api.h> -#include <odp/helper/threads.h> +#include <odp/helper/odph_api.h> #define app_err(fmt, ...) \ fprintf(stderr, "%s:%d:%s(): Error: " fmt, __FILE__, \ diff --git a/test/common_plat/performance/odp_l2fwd.c b/test/common_plat/performance/odp_l2fwd.c index fa59d5e..54dc4cf 100644 --- a/test/common_plat/performance/odp_l2fwd.c +++ b/test/common_plat/performance/odp_l2fwd.c @@ -25,9 +25,7 @@ #include <test_debug.h> #include <odp_api.h> -#include <odp/helper/threads.h> -#include <odp/helper/eth.h> -#include <odp/helper/ip.h> +#include <odp/helper/odph_api.h> /** @def MAX_WORKERS * @brief Maximum number of worker threads diff --git a/test/common_plat/performance/odp_pktio_perf.c b/test/common_plat/performance/odp_pktio_perf.c index ee3b8ab..0946308 100644 --- a/test/common_plat/performance/odp_pktio_perf.c +++ b/test/common_plat/performance/odp_pktio_perf.c @@ -22,10 +22,7 @@ */ #include <odp_api.h> -#include <odp/helper/eth.h> -#include <odp/helper/ip.h> -#include <odp/helper/udp.h> -#include <odp/helper/threads.h> +#include <odp/helper/odph_api.h> #include <getopt.h> #include <stdlib.h> diff --git a/test/common_plat/performance/odp_sched_latency.c b/test/common_plat/performance/odp_sched_latency.c index 2066f91..2b28cd7 100644 --- a/test/common_plat/performance/odp_sched_latency.c +++ b/test/common_plat/performance/odp_sched_latency.c @@ -20,7 +20,7 @@ #include <odp_api.h> /* ODP helper for Linux apps */ -#include <odp/helper/threads.h> +#include <odp/helper/odph_api.h> /* GNU lib C */ #include <getopt.h> diff --git a/test/common_plat/performance/odp_scheduling.c b/test/common_plat/performance/odp_scheduling.c index 713dba1..c74a071 100644 --- a/test/common_plat/performance/odp_scheduling.c +++ b/test/common_plat/performance/odp_scheduling.c @@ -20,7 +20,7 @@ #include <odp_api.h> /* ODP helper for Linux apps */ -#include <odp/helper/threads.h> +#include <odp/helper/odph_api.h> /* Needs librt*/ #include <time.h> diff --git a/test/common_plat/validation/api/classification/odp_classification_common.c b/test/common_plat/validation/api/classification/odp_classification_common.c index 2923a71..f7ec6e5 100644 --- a/test/common_plat/validation/api/classification/odp_classification_common.c +++ b/test/common_plat/validation/api/classification/odp_classification_common.c @@ -7,10 +7,6 @@ #include "odp_classification_testsuites.h" #include "classification.h" #include <odp_cunit_common.h> -#include <odp/helper/eth.h> -#include <odp/helper/ip.h> -#include <odp/helper/udp.h> -#include <odp/helper/tcp.h> #include "test_debug.h" typedef struct cls_test_packet { diff --git a/test/common_plat/validation/api/classification/odp_classification_test_pmr.c b/test/common_plat/validation/api/classification/odp_classification_test_pmr.c index 88fbf8f..a54954e 100644 --- a/test/common_plat/validation/api/classification/odp_classification_test_pmr.c +++ b/test/common_plat/validation/api/classification/odp_classification_test_pmr.c @@ -7,10 +7,6 @@ #include "odp_classification_testsuites.h" #include "classification.h" #include <odp_cunit_common.h> -#include <odp/helper/eth.h> -#include <odp/helper/ip.h> -#include <odp/helper/udp.h> -#include <odp/helper/tcp.h> static odp_pool_t pkt_pool; diff --git a/test/common_plat/validation/api/classification/odp_classification_tests.c b/test/common_plat/validation/api/classification/odp_classification_tests.c index ed45518..4f1aecd 100644 --- a/test/common_plat/validation/api/classification/odp_classification_tests.c +++ b/test/common_plat/validation/api/classification/odp_classification_tests.c @@ -7,10 +7,6 @@ #include "odp_classification_testsuites.h" #include "classification.h" #include <odp_cunit_common.h> -#include <odp/helper/eth.h> -#include <odp/helper/ip.h> -#include <odp/helper/udp.h> -#include <odp/helper/tcp.h> static odp_cos_t cos_list[CLS_ENTRIES]; static odp_pmr_t pmr_list[CLS_ENTRIES]; diff --git a/test/common_plat/validation/api/classification/odp_classification_testsuites.h b/test/common_plat/validation/api/classification/odp_classification_testsuites.h index aea3de1..f9fd908 100644 --- a/test/common_plat/validation/api/classification/odp_classification_testsuites.h +++ b/test/common_plat/validation/api/classification/odp_classification_testsuites.h @@ -8,6 +8,7 @@ #define ODP_CLASSIFICATION_TESTSUITES_H_ #include <odp_api.h> +#include <odp/helper/odph_api.h> #include <odp_cunit_common.h> #include <stdbool.h> diff --git a/test/common_plat/validation/api/pktio/pktio.c b/test/common_plat/validation/api/pktio/pktio.c index c23e2cc..4f3c0c0 100644 --- a/test/common_plat/validation/api/pktio/pktio.c +++ b/test/common_plat/validation/api/pktio/pktio.c @@ -6,9 +6,7 @@ #include <odp_api.h> #include <odp_cunit_common.h> -#include <odp/helper/eth.h> -#include <odp/helper/ip.h> -#include <odp/helper/udp.h> +#include <odp/helper/odph_api.h> #include <stdlib.h> #include "pktio.h" diff --git a/test/common_plat/validation/api/timer/timer.c b/test/common_plat/validation/api/timer/timer.c index 304b1d5..b7d84c6 100644 --- a/test/common_plat/validation/api/timer/timer.c +++ b/test/common_plat/validation/api/timer/timer.c @@ -15,7 +15,7 @@ #include <time.h> #include <odp.h> -#include <odp/helper/threads.h> +#include <odp/helper/odph_api.h> #include "odp_cunit_common.h" #include "test_debug.h" #include "timer.h" diff --git a/test/common_plat/validation/api/traffic_mngr/traffic_mngr.c b/test/common_plat/validation/api/traffic_mngr/traffic_mngr.c index 0271758..88a7d8c 100644 --- a/test/common_plat/validation/api/traffic_mngr/traffic_mngr.c +++ b/test/common_plat/validation/api/traffic_mngr/traffic_mngr.c @@ -12,11 +12,7 @@ #include <unistd.h> #include <math.h> #include <odp.h> -#include <odp/helper/eth.h> -#include <odp/helper/ip.h> -#include <odp/helper/udp.h> -#include <odp/helper/tcp.h> -#include <odp/helper/chksum.h> +#include <odp/helper/odph_api.h> #include <test_debug.h> #include "odp_cunit_common.h" #include "traffic_mngr.h" diff --git a/test/linux-generic/mmap_vlan_ins/mmap_vlan_ins.c b/test/linux-generic/mmap_vlan_ins/mmap_vlan_ins.c index a12eb3c..bda810e 100644 --- a/test/linux-generic/mmap_vlan_ins/mmap_vlan_ins.c +++ b/test/linux-generic/mmap_vlan_ins/mmap_vlan_ins.c @@ -10,9 +10,7 @@ #include <signal.h> #include <odp_api.h> -#include <odp/helper/threads.h> -#include <odp/helper/eth.h> -#include <odp/helper/ip.h> +#include <odp/helper/odph_api.h> #define POOL_NUM_PKT 8192 #define POOL_SEG_LEN 1856 diff --git a/test/linux-generic/pktio_ipc/ipc_common.h b/test/linux-generic/pktio_ipc/ipc_common.h index d2a355d..6245577 100644 --- a/test/linux-generic/pktio_ipc/ipc_common.h +++ b/test/linux-generic/pktio_ipc/ipc_common.h @@ -17,10 +17,7 @@ #include <example_debug.h> #include <odp.h> -#include <odp/helper/threads.h> -#include <odp/helper/eth.h> -#include <odp/helper/ip.h> -#include <odp/helper/udp.h> +#include <odp/helper/odph_api.h> /** @def SHM_PKT_POOL_SIZE * @brief Size of the shared memory block diff --git a/test/linux-generic/ring/ring_stress.c b/test/linux-generic/ring/ring_stress.c index 19bd65b..b6ddb34 100644 --- a/test/linux-generic/ring/ring_stress.c +++ b/test/linux-generic/ring/ring_stress.c @@ -18,7 +18,7 @@ #include <unistd.h> #include <odp_api.h> -#include <odp/helper/threads.h> +#include <odp/helper/odph_api.h> #include <odp_packet_io_ring_internal.h> #include <test_debug.h> #include <odp_cunit_common.h> commit 88ed645e7378b955c580ec2b8ce9b846a5fb48f0 Author: Mike Holmes <mike.holmes(a)linaro.org> Date: Mon Jan 23 14:46:06 2017 -0500 helper: use odph_api.h for test include for unexported files Adding the previously missing table functions to the public helper api allows the tests to use just odph_api.h Signed-off-by: Mike Holmes <mike.holmes(a)linaro.org> Reviewed-by: Christophe Milard <christophe.milard(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/helper/Makefile.am b/helper/Makefile.am index 76cad1b..4d24a69 100644 --- a/helper/Makefile.am +++ b/helper/Makefile.am @@ -20,6 +20,10 @@ helperinclude_HEADERS = \ $(srcdir)/include/odp/helper/ip.h\ $(srcdir)/include/odp/helper/ipsec.h\ $(srcdir)/include/odp/helper/odph_api.h\ + $(srcdir)/include/odp/helper/odph_cuckootable.h\ + $(srcdir)/include/odp/helper/odph_hashtable.h\ + $(srcdir)/include/odp/helper/odph_iplookuptable.h\ + $(srcdir)/include/odp/helper/odph_lineartable.h\ $(srcdir)/include/odp/helper/strong_types.h\ $(srcdir)/include/odp/helper/tcp.h\ $(srcdir)/include/odp/helper/table.h\ @@ -33,11 +37,7 @@ endif noinst_HEADERS = \ $(srcdir)/odph_debug.h \ - $(srcdir)/odph_hashtable.h \ - $(srcdir)/odph_lineartable.h \ - $(srcdir)/odph_cuckootable.h \ - $(srcdir)/odph_list_internal.h \ - $(srcdir)/odph_iplookuptable.h + $(srcdir)/odph_list_internal.h __LIB__libodphelper_@with_platform@_la_SOURCES = \ eth.c \ diff --git a/helper/cuckootable.c b/helper/cuckootable.c index b4fce6c..83647ec 100644 --- a/helper/cuckootable.c +++ b/helper/cuckootable.c @@ -42,7 +42,7 @@ #include <errno.h> #include <stdio.h> -#include "odph_cuckootable.h" +#include "odp/helper/odph_cuckootable.h" #include "odph_debug.h" #include <odp_api.h> diff --git a/helper/hashtable.c b/helper/hashtable.c index 8bb1ae5..983b3da 100644 --- a/helper/hashtable.c +++ b/helper/hashtable.c @@ -7,7 +7,7 @@ #include <string.h> #include <malloc.h> -#include "odph_hashtable.h" +#include "odp/helper/odph_hashtable.h" #include "odph_list_internal.h" #include "odph_debug.h" #include <odp_api.h> diff --git a/helper/include/odp/helper/odph_api.h b/helper/include/odp/helper/odph_api.h index ae6e77b..7ed0e77 100644 --- a/helper/include/odp/helper/odph_api.h +++ b/helper/include/odp/helper/odph_api.h @@ -19,10 +19,14 @@ extern "C" { #endif #include <odp/helper/chksum.h> +#include <odp/helper/odph_cuckootable.h> #include <odp/helper/eth.h> +#include <odp/helper/odph_hashtable.h> #include <odp/helper/icmp.h> #include <odp/helper/ip.h> #include <odp/helper/ipsec.h> +#include <odp/helper/odph_lineartable.h> +#include <odp/helper/odph_iplookuptable.h> #include <odp/helper/strong_types.h> #include <odp/helper/tcp.h> #include <odp/helper/table.h> diff --git a/helper/odph_cuckootable.h b/helper/include/odp/helper/odph_cuckootable.h similarity index 100% rename from helper/odph_cuckootable.h rename to helper/include/odp/helper/odph_cuckootable.h diff --git a/helper/odph_hashtable.h b/helper/include/odp/helper/odph_hashtable.h similarity index 100% rename from helper/odph_hashtable.h rename to helper/include/odp/helper/odph_hashtable.h diff --git a/helper/odph_iplookuptable.h b/helper/include/odp/helper/odph_iplookuptable.h similarity index 100% rename from helper/odph_iplookuptable.h rename to helper/include/odp/helper/odph_iplookuptable.h diff --git a/helper/odph_lineartable.h b/helper/include/odp/helper/odph_lineartable.h similarity index 100% rename from helper/odph_lineartable.h rename to helper/include/odp/helper/odph_lineartable.h diff --git a/helper/iplookuptable.c b/helper/iplookuptable.c index 5f80743..f6d6f88 100644 --- a/helper/iplookuptable.c +++ b/helper/iplookuptable.c @@ -9,7 +9,7 @@ #include <errno.h> #include <stdio.h> -#include "odph_iplookuptable.h" +#include <odp/helper/odph_iplookuptable.h> #include "odph_list_internal.h" #include "odph_debug.h" #include <odp_api.h> diff --git a/helper/lineartable.c b/helper/lineartable.c index e82c165..8917901 100644 --- a/helper/lineartable.c +++ b/helper/lineartable.c @@ -8,7 +8,7 @@ #include <string.h> #include <malloc.h> -#include "odph_lineartable.h" +#include "odp/helper/odph_lineartable.h" #include "odph_debug.h" #include <odp_api.h> diff --git a/helper/test/cuckootable.c b/helper/test/cuckootable.c index 6736f2b..002e52e 100644 --- a/helper/test/cuckootable.c +++ b/helper/test/cuckootable.c @@ -49,7 +49,7 @@ #include <odp_api.h> #include <odph_debug.h> -#include <../odph_cuckootable.h> +#include <odp/helper/odph_api.h> /******************************************************************************* * Hash function performance test configuration section. diff --git a/helper/test/iplookuptable.c b/helper/test/iplookuptable.c index 86aa1b3..b5d774c 100644 --- a/helper/test/iplookuptable.c +++ b/helper/test/iplookuptable.c @@ -12,7 +12,7 @@ #include <odp_api.h> #include <odph_debug.h> -#include <../odph_iplookuptable.h> +#include <odp/helper/odph_api.h> #include <odp/helper/ip.h> static void print_prefix_info( diff --git a/helper/test/table.c b/helper/test/table.c index 3b74b22..ac454da 100644 --- a/helper/test/table.c +++ b/helper/test/table.c @@ -5,8 +5,7 @@ */ #include <odph_debug.h> -#include <../odph_hashtable.h> -#include <../odph_lineartable.h> +#include <odp/helper/odph_api.h> #include <odp_api.h> /** commit 722fd6f8286722d30d50c00769fa4fcad5935dd2 Author: Mike Holmes <mike.holmes(a)linaro.org> Date: Mon Jan 23 14:46:05 2017 -0500 helper: add odph_api.h for existing exported headers Rather than have all applications include a variable number of helper api files, consolidate them into one include odph_api.h Signed-off-by: Mike Holmes <mike.holmes(a)linaro.org> Reviewed-by: Christophe Milard <christophe.milard(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/helper/Makefile.am b/helper/Makefile.am index 9b2f18a..76cad1b 100644 --- a/helper/Makefile.am +++ b/helper/Makefile.am @@ -19,6 +19,7 @@ helperinclude_HEADERS = \ $(srcdir)/include/odp/helper/icmp.h\ $(srcdir)/include/odp/helper/ip.h\ $(srcdir)/include/odp/helper/ipsec.h\ + $(srcdir)/include/odp/helper/odph_api.h\ $(srcdir)/include/odp/helper/strong_types.h\ $(srcdir)/include/odp/helper/tcp.h\ $(srcdir)/include/odp/helper/table.h\ diff --git a/helper/include/odp/helper/odph_api.h b/helper/include/odp/helper/odph_api.h new file mode 100644 index 0000000..ae6e77b --- /dev/null +++ b/helper/include/odp/helper/odph_api.h @@ -0,0 +1,35 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +/** + * @file + * + * The OpenDataPlane helper API + * + */ + +#ifndef ODP_HELPER_H_ +#define ODP_HELPER_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#include <odp/helper/chksum.h> +#include <odp/helper/eth.h> +#include <odp/helper/icmp.h> +#include <odp/helper/ip.h> +#include <odp/helper/ipsec.h> +#include <odp/helper/strong_types.h> +#include <odp/helper/tcp.h> +#include <odp/helper/table.h> +#include <odp/helper/threads.h> +#include <odp/helper/udp.h> + +#ifdef __cplusplus +} +#endif +#endif diff --git a/helper/test/chksum.c b/helper/test/chksum.c index 7c572ae..1beae47 100644 --- a/helper/test/chksum.c +++ b/helper/test/chksum.c @@ -6,9 +6,7 @@ #include "odph_debug.h" #include <odp_api.h> -#include <odp/helper/eth.h> -#include <odp/helper/ip.h> -#include <odp/helper/udp.h> +#include <odp/helper/odph_api.h> struct udata_struct { uint64_t u64; diff --git a/helper/test/odpthreads.c b/helper/test/odpthreads.c index 4bb3c3b..219e1b6 100644 --- a/helper/test/odpthreads.c +++ b/helper/test/odpthreads.c @@ -15,7 +15,7 @@ #include <odph_debug.h> #include <odp_api.h> -#include <odp/helper/threads.h> +#include <odp/helper/odph_api.h> #define NUMBER_WORKERS 16 diff --git a/helper/test/parse.c b/helper/test/parse.c index 26dfc68..0429f2c 100644 --- a/helper/test/parse.c +++ b/helper/test/parse.c @@ -7,8 +7,7 @@ #include <odph_debug.h> #include <odp_api.h> -#include <odp/helper/eth.h> -#include <odp/helper/ip.h> +#include <odp/helper/odph_api.h> #include <stdio.h> #include <string.h> ----------------------------------------------------------------------- Summary of changes: example/classifier/odp_classifier.c | 4 +-- example/generator/odp_generator.c | 6 +--- example/ipsec/odp_ipsec.c | 6 +--- example/ipsec/odp_ipsec_fwd_db.h | 1 - example/ipsec/odp_ipsec_loop_db.h | 1 - example/ipsec/odp_ipsec_misc.h | 4 +-- example/ipsec/odp_ipsec_stream.c | 4 +-- example/l2fwd_simple/odp_l2fwd_simple.c | 4 +-- example/l3fwd/odp_l3fwd.c | 6 +--- example/l3fwd/odp_l3fwd_db.h | 2 +- example/packet/odp_pktio.c | 4 +-- example/switch/odp_switch.c | 4 +-- example/time/time_global_test.c | 2 +- example/timer/odp_timer_test.c | 2 +- helper/Makefile.am | 11 +++--- helper/cuckootable.c | 2 +- helper/hashtable.c | 2 +- helper/include/odp/helper/odph_api.h | 39 ++++++++++++++++++++++ helper/{ => include/odp/helper}/odph_cuckootable.h | 0 helper/{ => include/odp/helper}/odph_hashtable.h | 0 .../{ => include/odp/helper}/odph_iplookuptable.h | 0 helper/{ => include/odp/helper}/odph_lineartable.h | 0 helper/iplookuptable.c | 2 +- helper/lineartable.c | 2 +- helper/test/chksum.c | 4 +-- helper/test/cuckootable.c | 2 +- helper/test/iplookuptable.c | 2 +- helper/test/odpthreads.c | 2 +- helper/test/parse.c | 3 +- helper/test/table.c | 3 +- test/common_plat/common/odp_cunit_common.c | 2 +- test/common_plat/performance/odp_crypto.c | 2 +- test/common_plat/performance/odp_l2fwd.c | 4 +-- test/common_plat/performance/odp_pktio_perf.c | 5 +-- test/common_plat/performance/odp_sched_latency.c | 2 +- test/common_plat/performance/odp_scheduling.c | 2 +- .../api/classification/odp_classification_common.c | 4 --- .../classification/odp_classification_test_pmr.c | 4 --- .../api/classification/odp_classification_tests.c | 4 --- .../classification/odp_classification_testsuites.h | 1 + test/common_plat/validation/api/pktio/pktio.c | 4 +-- test/common_plat/validation/api/timer/timer.c | 2 +- .../validation/api/traffic_mngr/traffic_mngr.c | 6 +--- test/linux-generic/mmap_vlan_ins/mmap_vlan_ins.c | 4 +-- test/linux-generic/pktio_ipc/ipc_common.h | 5 +-- test/linux-generic/ring/ring_stress.c | 2 +- 46 files changed, 80 insertions(+), 97 deletions(-) create mode 100644 helper/include/odp/helper/odph_api.h rename helper/{ => include/odp/helper}/odph_cuckootable.h (100%) rename helper/{ => include/odp/helper}/odph_hashtable.h (100%) rename helper/{ => include/odp/helper}/odph_iplookuptable.h (100%) rename helper/{ => include/odp/helper}/odph_lineartable.h (100%) hooks/post-receive --

8 years, 5 months

[COMMIT] branch master updated. v1.13.0.0-11-gbbabb79

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 bbabb79cfaf5e28ec9e804b95a23605038b39d39 (commit) from c14ec3dc896e0dd14d0491f09f81ce09e9d53bc2 (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 bbabb79cfaf5e28ec9e804b95a23605038b39d39 Author: Christophe Milard <christophe.milard(a)linaro.org> Date: Mon Jan 23 09:25:23 2017 +0100 linux-gen: _ishm: checking fstat return value. Hence fixing CID 174663 (Fixes https://bugs.linaro.org/show_bug.cgi?id=2827) Signed-off-by: Christophe Milard <christophe.milard(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/_ishm.c b/platform/linux-generic/_ishm.c index 3797f20..c1efd7d 100644 --- a/platform/linux-generic/_ishm.c +++ b/platform/linux-generic/_ishm.c @@ -818,7 +818,14 @@ int _odp_ishm_reserve(const char *name, uint64_t size, int fd, /* If a file descriptor is provided, get the real size and map: */ if (fd >= 0) { - fstat(fd, &statbuf); + if (fstat(fd, &statbuf) < 0) { + close(fd); + odp_spinlock_unlock(&ishm_tbl->lock); + ODP_ERR("_ishm_reserve failed (fstat failed: %s).\n", + strerror(errno)); + __odp_errno = errno; + return -1; + } len = statbuf.st_size; /* note that the huge page flag is meningless here as huge * page is determined by the provided file descriptor: */ ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/_ishm.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) hooks/post-receive --

8 years, 5 months

[COMMIT] branch master updated. v1.13.0.0-10-gc14ec3d

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 c14ec3dc896e0dd14d0491f09f81ce09e9d53bc2 (commit) from 50ebc616ddd9d05651923134d7bfaa02c103fbce (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 c14ec3dc896e0dd14d0491f09f81ce09e9d53bc2 Author: Christophe Milard <christophe.milard(a)linaro.org> Date: Mon Jan 23 09:47:57 2017 +0100 linux-gen: _ishm: fix normal page fallback Fixing failure due to lack of huge pages. Fixes: https://bugs.linaro.org/show_bug.cgi?id=2842 Signed-off-by: Christophe Milard <christophe.milard(a)linaro.org> Reviewed-and-tested-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/_ishm.c b/platform/linux-generic/_ishm.c index f889834..3797f20 100644 --- a/platform/linux-generic/_ishm.c +++ b/platform/linux-generic/_ishm.c @@ -547,7 +547,7 @@ static void *do_map(int block_index, uint64_t len, uint32_t align, addr = alloc_fragment(len, block_index, align, &fragment); if (!addr) { ODP_ERR("alloc_fragment failed.\n"); - if (new_block->filename[0]) { + if (!new_block->external_fd) { close(*fd); *fd = -1; delete_file(new_block); @@ -562,7 +562,7 @@ static void *do_map(int block_index, uint64_t len, uint32_t align, if (mapped_addr == NULL) { if (flags & _ODP_ISHM_SINGLE_VA) free_fragment(fragment); - if (new_block->filename[0]) { + if (!new_block->external_fd) { close(*fd); *fd = -1; delete_file(new_block); ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/_ishm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) hooks/post-receive --

8 years, 5 months

[COMMIT] branch api-next updated. v1.12.0.0-245-gf8efe73

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 f8efe73e2991c480d76eb636be61ab90f1053591 (commit) via 91d481e072a0283216979e1a88467fdeef5cca6b (commit) via 0ae648ccc23a8d71086746656a10b68a7c5ebe80 (commit) via 355f20a9f0eaa99359fa1bddcce8b192fef36ad5 (commit) via a8cf3e576ab37b597a3d7e28130affc4988f2579 (commit) from 1588c49a0bf0332512d5e08e1feaad5e4005df31 (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 f8efe73e2991c480d76eb636be61ab90f1053591 Author: Christophe Milard <christophe.milard(a)linaro.org> Date: Tue Jan 24 18:48:06 2017 +0100 linux-gen: modules: adding initial file to load modules The shared objects listed in the ODP configuration files are loaded at init time. The odp configuration file lists the shared objects to be loaded as shown in the following example: module = { modules = ["enumerator1.so", "driver1.so"]; }; Signed-off-by: Christophe Milard <christophe.milard(a)linaro.org> Reviewed-and-tested-by: Yi He <yi.he(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/configure.ac b/configure.ac index 3a20959..e2b4f9d 100644 --- a/configure.ac +++ b/configure.ac @@ -55,7 +55,7 @@ AC_PROG_MAKE_SET AM_PROG_AR #Use libtool -LT_INIT([]) +LT_INIT([dlopen]) AC_SUBST([LIBTOOL_DEPS]) AM_PROG_LIBTOOL @@ -66,7 +66,7 @@ AC_CHECK_FUNCS([bzero clock_gettime gethostbyname getpagesize gettimeofday memse # Checks for header files. AC_HEADER_RESOLV -AC_CHECK_HEADERS([arpa/inet.h fcntl.h inttypes.h limits.h netdb.h netinet/in.h stddef.h stdint.h stdlib.h string.h sys/ioctl.h sys/socket.h sys/time.h unistd.h]) +AC_CHECK_HEADERS([arpa/inet.h fcntl.h inttypes.h limits.h netdb.h netinet/in.h stddef.h stdint.h stdlib.h string.h sys/ioctl.h sys/socket.h sys/time.h unistd.h dlfcn.h]) # Checks for typedefs, structures, and compiler characteristics. AC_HEADER_STDBOOL diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 579fc3c..f4ef497 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -177,6 +177,7 @@ __LIB__libodp_linux_la_SOURCES = \ _ishm.c \ _ishmphy.c \ _ishmpool.c \ + _modules.c \ odp_atomic.c \ odp_barrier.c \ odp_bitmap.c \ diff --git a/platform/linux-generic/_modules.c b/platform/linux-generic/_modules.c new file mode 100644 index 0000000..6bb854e --- /dev/null +++ b/platform/linux-generic/_modules.c @@ -0,0 +1,53 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp_config_internal.h> + +#include <odp/api/std_types.h> +#include <odp/api/debug.h> +#include <odp_debug_internal.h> +#include <libconfig.h> +#include <dlfcn.h> + +static int load_modules(void) +{ + config_t *cf; + const config_setting_t *modules_section; + int module_count; + int i; + const char *module_name; + + cf = &odp_global_data.configuration; + modules_section = config_lookup(cf, "module.modules"); + if (!modules_section) + return 0; + + module_count = config_setting_length(modules_section); + if (!module_count) + return 0; + + for (i = 0; i < module_count; i++) { + module_name = config_setting_get_string_elem(modules_section, + i); + if (dlopen(module_name, RTLD_NOW) == NULL) { + ODP_ERR("dlopen failed for %s: %s\n", + module_name, dlerror()); + return -1; + } + ODP_DBG("module %s loaded.\n", module_name); + } + + return 0; +} + +int _odp_modules_init_global(void) +{ + /* load modules (enumerator and drivers...) */ + if (load_modules()) + return -1; + + return 0; +} diff --git a/platform/linux-generic/include/odp_internal.h b/platform/linux-generic/include/odp_internal.h index 9d1fc58..05c8a42 100644 --- a/platform/linux-generic/include/odp_internal.h +++ b/platform/linux-generic/include/odp_internal.h @@ -71,6 +71,7 @@ enum init_stage { CLASSIFICATION_INIT, TRAFFIC_MNGR_INIT, NAME_TABLE_INIT, + MODULES_INIT, ALL_INIT /* All init stages completed */ }; @@ -129,6 +130,8 @@ int _odp_ishm_init_local(void); int _odp_ishm_term_global(void); int _odp_ishm_term_local(void); +int _odp_modules_init_global(void); + int cpuinfo_parser(FILE *file, system_info_t *sysinfo); uint64_t odp_cpu_hz_current(int id); diff --git a/platform/linux-generic/m4/configure.m4 b/platform/linux-generic/m4/configure.m4 index 5fab0cc..f5f076a 100644 --- a/platform/linux-generic/m4/configure.m4 +++ b/platform/linux-generic/m4/configure.m4 @@ -42,6 +42,7 @@ fi m4_include([platform/linux-generic/m4/odp_pthread.m4]) m4_include([platform/linux-generic/m4/odp_openssl.m4]) 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_ipc.m4]) diff --git a/platform/linux-generic/m4/odp_modules.m4 b/platform/linux-generic/m4/odp_modules.m4 new file mode 100644 index 0000000..03f61f8 --- /dev/null +++ b/platform/linux-generic/m4/odp_modules.m4 @@ -0,0 +1,11 @@ +########################################################################## +# Check for dlopen and lt equivalent availability +########################################################################## + +AC_SEARCH_LIBS([dlopen], [dl dld], + [ + AM_LDFLAGS="$AM_LDFLAGS -ldl" + ], + [ + AC_MSG_ERROR([Error! dlopen not available!]) + ]) diff --git a/platform/linux-generic/odp_init.c b/platform/linux-generic/odp_init.c index 0e9167c..2cd8fe3 100644 --- a/platform/linux-generic/odp_init.c +++ b/platform/linux-generic/odp_init.c @@ -259,6 +259,12 @@ int odp_init_global(odp_instance_t *instance, ODP_ERR("ODP name table init failed\n"); goto init_failed; } + stage = NAME_TABLE_INIT; + + if (_odp_modules_init_global()) { + ODP_ERR("ODP modules init failed\n"); + goto init_failed; + } *instance = (odp_instance_t)odp_global_data.main_pid; @@ -284,6 +290,7 @@ int _odp_term_global(enum init_stage stage) switch (stage) { case ALL_INIT: + case MODULES_INIT: case NAME_TABLE_INIT: if (_odp_int_name_tbl_term_global()) { ODP_ERR("Name table term failed.\n"); commit 91d481e072a0283216979e1a88467fdeef5cca6b Author: Christophe Milard <christophe.milard(a)linaro.org> Date: Tue Jan 24 18:48:05 2017 +0100 test: preventing odp.conf loading for tests The tests should not be affected by any system or user ODP configuration file. The ODP_SYSCONFIG_FILE environment variables is therefore set to "none" in TESTS_ENVIRONMENT. Tests which need specific a configuration file will have to overwrite this setting. Note that tests ran manually (not using make check) may be affected by configuration files. Setting ODP_SYSCONFIG_FILE to an appropriate value (possibly "none") may be required. Signed-off-by: Christophe Milard <christophe.milard(a)linaro.org> Reviewed-and-tested-by: Yi He <yi.he(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/Makefile.inc b/test/Makefile.inc index 1ebc047..896f863 100644 --- a/test/Makefile.inc +++ b/test/Makefile.inc @@ -22,4 +22,6 @@ AM_LDFLAGS += -L$(LIB) @VALGRIND_CHECK_RULES@ valgrind_tools = memcheck -TESTS_ENVIRONMENT= ODP_PLATFORM=${with_platform} EXEEXT=${EXEEXT} +TESTS_ENVIRONMENT = ODP_PLATFORM=${with_platform} \ + EXEEXT=${EXEEXT} \ + ODP_SYSCONFIG_FILE=none commit 0ae648ccc23a8d71086746656a10b68a7c5ebe80 Author: Christophe Milard <christophe.milard(a)linaro.org> Date: Tue Jan 24 18:48:04 2017 +0100 linux-gen: init: adding configuration file parsing The parsing of the odp.conf configuration file is added. The file is searched first in filename specified in the environment variable $ODP_SYSCONFIG_FILE (where the special string "none" prevent any file loading) The file is then searched in the user home directory (~) and then is the $prefix/etc directory. This requires libconfig (sudo apt-get install libconfig-dev) Signed-off-by: Christophe Milard <christophe.milard(a)linaro.org> Reviewed-and-tested-by: Yi He <yi.he(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/.travis.yml b/.travis.yml index 03e61b1..a6f770c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,7 @@ sudo: required before_install: - sudo apt-get -qq update - - sudo apt-get install automake autoconf libtool libssl-dev graphviz mscgen doxygen + - sudo apt-get install automake autoconf libtool libssl-dev graphviz mscgen doxygen libconfig-dev - sudo apt-get install libpcap-dev linux-headers-`uname -r` - gem install asciidoctor diff --git a/DEPENDENCIES b/DEPENDENCIES index f1f0edd..f285783 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -18,18 +18,18 @@ Prerequisites for building the OpenDataPlane (ODP) API 3. Required libraries - Libraries currently required to link: openssl + Libraries currently required to link: openssl, libconfig -3.1 OpenSSL native compile +3.1 OpenSSL and libconf native compile For native compilation, simply load the necessary libraries using the appropriate tool set. On Debian/Ubuntu systems: - $ sudo apt-get install libssl-dev + $ sudo apt-get install libssl-dev libconfig-dev On CentOS/RedHat/Fedora systems: - $ sudo yum install openssl-devel + $ sudo yum install openssl-devel libconfig-devel 3.2 OpenSSL cross compilation diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 2d97414..579fc3c 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -8,6 +8,7 @@ AM_CFLAGS += -I$(srcdir)/include AM_CFLAGS += -I$(top_srcdir)/include AM_CFLAGS += -I$(top_builddir)/include AM_CFLAGS += -Iinclude +AM_CFLAGS += -DSYSCONFDIR=\"@sysconfdir@\" include_HEADERS = \ $(top_srcdir)/include/odp.h \ diff --git a/platform/linux-generic/include/odp_internal.h b/platform/linux-generic/include/odp_internal.h index b313b1f..9d1fc58 100644 --- a/platform/linux-generic/include/odp_internal.h +++ b/platform/linux-generic/include/odp_internal.h @@ -22,6 +22,7 @@ extern "C" { #include <odp/api/thread.h> #include <stdio.h> #include <sys/types.h> +#include <libconfig.h> extern __thread int __odp_errno; @@ -50,6 +51,7 @@ struct odp_global_data_s { odp_cpumask_t control_cpus; odp_cpumask_t worker_cpus; int num_cpus_installed; + config_t configuration; }; enum init_stage { diff --git a/platform/linux-generic/m4/configure.m4 b/platform/linux-generic/m4/configure.m4 index d3e5528..5fab0cc 100644 --- a/platform/linux-generic/m4/configure.m4 +++ b/platform/linux-generic/m4/configure.m4 @@ -28,6 +28,17 @@ AC_LINK_IFELSE( echo "Use newer version. For gcc > 4.7.0" exit -1) +# Check for libconfig (required) +AC_CHECK_HEADERS([libconfig.h], HEADER_LIBCONFIG="yes") +PKG_CHECK_MODULES([PKGCONFIG], [libconfig >= 1.3.2], LIBRARY_LIBCONFIG="yes") +if test "x$LIBRARY_LIBCONFIG" != "x" && test "x$HEADER_LIBCONFIG" != "x" ; then + CFLAGS="$CFLAGS $PKGCONFIG_CFLAGS" + LIBS="$LIBS $PKGCONFIG_LIBS" + AM_CPPFLAGS="$AM_CPPFLAGS `pkg-config --cflags-only-I libconfig`" +else + AC_MSG_FAILURE([libconfig not found (required)]) +fi + m4_include([platform/linux-generic/m4/odp_pthread.m4]) m4_include([platform/linux-generic/m4/odp_openssl.m4]) m4_include([platform/linux-generic/m4/odp_pcap.m4]) diff --git a/platform/linux-generic/odp_init.c b/platform/linux-generic/odp_init.c index 06c6143..0e9167c 100644 --- a/platform/linux-generic/odp_init.c +++ b/platform/linux-generic/odp_init.c @@ -10,6 +10,8 @@ #include <odp_internal.h> #include <odp_schedule_if.h> #include <string.h> +#include <libconfig.h> +#include <stdlib.h> #include <stdio.h> #include <linux/limits.h> #include <dirent.h> @@ -21,6 +23,15 @@ #define _ODP_FILES_FMT "odp-%d-" #define _ODP_TMPDIR "/tmp" +/* the name of the ODP configuration file: */ +#define CONFIGURATION_FILE_ENV_NONE "none" +#define CONFIGURATION_FILE "odp.conf" +#define CONFIGURATION_FILE_USR ("." CONFIGURATION_FILE) +#define CONFIGURATION_FILE_SYS (SYSCONFDIR "/" CONFIGURATION_FILE) + +/* the ODP configuration file name can also be oveerwritten by env. variable: */ +#define ODP_SYSCONFIG_FILE_ENV "ODP_SYSCONFIG_FILE" + struct odp_global_data_s odp_global_data; /* remove all files staring with "odp-<pid>" from a directory "dir" */ @@ -65,6 +76,72 @@ static int cleanup_files(const char *dirpath, int odp_pid) return 0; } +/* read the odp configuration file + * + * the configuration file is read from: + * 1) Wherever env variable ODP_SYSCONFIG_FILE says (or "none") + * 2) ./odp.conf + * 3) the @sysconfig@/odp.conf + * (checked in reverse order overwritting each-other) + * So the environment variable setting supperseeds any other file. + * If the environment variable exists and set to the string "none" + * the configuration file reading is inibited (used to prevent + * test which do not need a file to read the user or system files) + */ +static int read_configfile(void) +{ + config_t *cf; + const char *config_filename; + char user_config_filename[PATH_MAX]; + char *env_config_filename; + + /* initialize and read the configuration file if any: */ + cf = &odp_global_data.configuration; + config_init(cf); + config_filename = NULL; + /* check if the system config file can be reached :*/ + if (access(CONFIGURATION_FILE_SYS, R_OK) != -1) + config_filename = CONFIGURATION_FILE_SYS; + /* check if the user config file can be reached (overwrite if so) :*/ + strncpy(user_config_filename, getenv("HOME"), PATH_MAX); + if (user_config_filename[0]) { + strncat(user_config_filename, "/", PATH_MAX); + strncat(user_config_filename, CONFIGURATION_FILE_USR, PATH_MAX); + if ((access(user_config_filename, R_OK) != -1)) + config_filename = user_config_filename; + } + /* check if other config file is specified via env (overwrite if so):*/ + env_config_filename = getenv(ODP_SYSCONFIG_FILE_ENV); + if (env_config_filename) { + /* none means "read no file": */ + if (!strcmp(env_config_filename, CONFIGURATION_FILE_ENV_NONE)) + return 0; + if (access(env_config_filename, R_OK) != -1) { + config_filename = env_config_filename; + } else { + ODP_ERR("Cannot read ODP configurattion file %s " + "(set by env variable " + ODP_SYSCONFIG_FILE_ENV ")\n", + env_config_filename); + config_filename = NULL; + return -1; + } + } + if (config_filename) { + ODP_DBG("Reading configuration file: %s\n", config_filename); + if (!config_read_file(cf, config_filename)) { + ODP_ERR("%s:%d - %s\n", + config_error_file(cf), + config_error_line(cf), + config_error_text(cf)); + config_destroy(cf); + return(-1); + } + } + + return 0; +} + int odp_init_global(odp_instance_t *instance, const odp_init_t *params, const odp_platform_init_t *platform_params ODP_UNUSED) @@ -87,6 +164,9 @@ int odp_init_global(odp_instance_t *instance, cleanup_files(_ODP_TMPDIR, odp_global_data.main_pid); + if (read_configfile()) + goto init_failed; + if (odp_cpumask_init_global(params)) { ODP_ERR("ODP cpumask init failed.\n"); goto init_failed; commit 355f20a9f0eaa99359fa1bddcce8b192fef36ad5 Author: Christophe Milard <christophe.milard(a)linaro.org> Date: Tue Jan 24 18:48:03 2017 +0100 linux-gen: adding enum, devio and driver registration interface (stub) The linux implementation for the enumerator class registration function, enumerator instance registration function, devio and driver registration functions (stub) Signed-off-by: Christophe Milard <christophe.milard(a)linaro.org> Reviewed-and-tested-by: Yi He <yi.he(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/include/odp_drv.h b/include/odp_drv.h index 0959879..96d81ba 100644 --- a/include/odp_drv.h +++ b/include/odp_drv.h @@ -23,6 +23,7 @@ extern C { #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> diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 74e606d..2d97414 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -109,6 +109,7 @@ odpdrvinclude_HEADERS = \ $(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 \ @@ -119,6 +120,7 @@ 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/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 @@ -233,6 +235,7 @@ __LIB__libodp_linux_la_SOURCES = \ odp_weak.c \ drv_atomic.c \ drv_barrier.c \ + drv_driver.c \ drv_shm.c \ drv_spinlock.c \ arch/@ARCH_DIR@/odp_cpu_arch.c \ diff --git a/platform/linux-generic/drv_driver.c b/platform/linux-generic/drv_driver.c new file mode 100644 index 0000000..529da48 --- /dev/null +++ b/platform/linux-generic/drv_driver.c @@ -0,0 +1,64 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp_config_internal.h> + +#include <odp/api/std_types.h> +#include <odp/api/debug.h> +#include <odp/drv/driver.h> +#include <odp_debug_internal.h> + +odpdrv_enumr_class_t odpdrv_enumr_class_register(odpdrv_enumr_class_param_t + *param) +{ + ODP_ERR("NOT Supported yet! Enumerator Class %s Registration!\n.", + param->name); + + return ODPDRV_ENUMR_CLASS_INVALID; +} + +odpdrv_enumr_t odpdrv_enumr_register(odpdrv_enumr_param_t *param) +{ + ODP_ERR("NOT Supported yet! Enumerator API %s Registration!\n.", + param->api_name); + + return ODPDRV_ENUMR_INVALID; +} + +odpdrv_device_t odpdrv_device_create(odpdrv_device_param_t *param) +{ + ODP_ERR("odpdrv_device_create not Supported yet! devaddress: %s\n.", + param->address); + return ODPDRV_DEVICE_INVALID; +} + +void odpdrv_device_destroy(odpdrv_device_t dev) +{ + if (dev == ODPDRV_DEVICE_INVALID) + ODP_ERR("Invalid device\n"); +} + +odpdrv_devio_t odpdrv_devio_register(odpdrv_devio_param_t *param) +{ + ODP_ERR("NOT Supported yet! Driver %s Registration!\n.", + param->api_name); + + return ODPDRV_DEVIO_INVALID; +} + +odpdrv_driver_t odpdrv_driver_register(odpdrv_driver_param_t *param) +{ + ODP_ERR("NOT Supported yet! Driver %s Registration!\n.", + param->name); + + return ODPDRV_DRIVER_INVALID; +} + +int odpdrv_print_all(void) +{ + ODP_ERR("odpdrv_print_all not Supported yet!\n."); + return 0; +} diff --git a/platform/linux-generic/include/odp/drv/driver.h b/platform/linux-generic/include/odp/drv/driver.h new file mode 100644 index 0000000..b12c83d --- /dev/null +++ b/platform/linux-generic/include/odp/drv/driver.h @@ -0,0 +1,37 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +/** + * @file + * + * ODPDRV drivers + */ + +#ifndef ODPDRV_PLAT_DRIVER_H_ +#define ODPDRV_PLAT_DRIVER_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#include <odp/drv/plat/driver_types.h> + +/** @ingroup odpdrv_driver + * @{ + */ + +/** + * @} + */ + +#include <odp/drv/std_types.h> +#include <odp/drv/spec/driver.h> + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/platform/linux-generic/include/odp/drv/plat/driver_types.h b/platform/linux-generic/include/odp/drv/plat/driver_types.h new file mode 100644 index 0000000..6c611bd --- /dev/null +++ b/platform/linux-generic/include/odp/drv/plat/driver_types.h @@ -0,0 +1,52 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +/** + * @file + * + * ODP shared memory + */ + +#ifndef ODPDRV_DRIVER_TYPES_H_ +#define ODPDRV_DRIVER_TYPES_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#include <odp/drv/std_types.h> +#include <odp/drv/plat/strong_types.h> + +/** @addtogroup odpdrv_driver ODPDRV DRIVER + * Operations on driver related items (enumerator class, enumerators, + * devios and drivers). + * @{ + */ + +typedef ODPDRV_HANDLE_T(odpdrv_enumr_class_t); +#define ODPDRV_ENUMR_CLASS_INVALID _odpdrv_cast_scalar(odpdrv_enumr_class_t, 0) + +typedef ODPDRV_HANDLE_T(odpdrv_enumr_t); +#define ODPDRV_ENUMR_INVALID _odpdrv_cast_scalar(odpdrv_enumr_t, 0) + +typedef ODPDRV_HANDLE_T(odpdrv_device_t); +#define ODPDRV_DEVICE_INVALID _odpdrv_cast_scalar(odpdrv_device_t, 0) + +typedef ODPDRV_HANDLE_T(odpdrv_devio_t); +#define ODPDRV_DEVIO_INVALID _odpdrv_cast_scalar(odpdrv_devio_t, 0) + +typedef ODPDRV_HANDLE_T(odpdrv_driver_t); +#define ODPDRV_DRIVER_INVALID _odpdrv_cast_scalar(odpdrv_driver_t, 0) + +/** + * @} + */ + +#ifdef __cplusplus +} +#endif + +#endif commit a8cf3e576ab37b597a3d7e28130affc4988f2579 Author: Christophe Milard <christophe.milard(a)linaro.org> Date: Tue Jan 24 18:48:02 2017 +0100 drv: adding driver registration interface (stub) The enumerator class, enumerator instance, devio and driver registration functions prototypes (and a draft of their parameters) are defined, the goal being to define the registration framework only. Signed-off-by: Christophe Milard <christophe.milard(a)linaro.org> Reviewed-and-tested-by: Yi He <yi.he(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/include/odp/drv/spec/driver.h b/include/odp/drv/spec/driver.h new file mode 100644 index 0000000..d83e907 --- /dev/null +++ b/include/odp/drv/spec/driver.h @@ -0,0 +1,389 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +/** + * @file + * + * ODPDRV driver + */ + +#ifndef ODPDRV_DRIVER_H_ +#define ODPDRV_DRIVER_H_ +#include <odp/visibility_begin.h> + +#ifdef __cplusplus +extern "C" { +#endif + +/** +* @addtogroup odpdrv_driver +* @details +* enumerator and driver interface to ODP +* +* 1) ODP loads the different modules (i.e. it loads shared libraries, *.so). +* In the context of drivers, shared libraries may contain enumerators, +* drivers and devios. These register in step 2. +* +* 2) +* @code +* odpdrv_enumr_class_register(int (probe*)()...) +* -----------------------------------------------------------> +* odpdrv_driver_register(int (probe*)()...) +* -----------------------------------------------------------> +* odpdrv_devio_register() +* -----------------------------------------------------------> +* @endcode +* A number of device_enumerator_classes are registered at the ODP startup. +* Many classes are expected: static, ACPI, PCI, switchdev, virtual, DPAA2... +* A number of drivers also register to ODP (passing their own probe function). +* A number of device IO may also register to ODP (defining available devices +* interfaces). +* +* 3) ODP calls the probe function of each enumerator class <BR> +* @code +* enumerator class probe() +* <----------------------------------------------------------- +* odpdrv_emum_register(int (probe*)()...) +* -----------------------------------------------------------> +* -----------------------------------------------------------> +* -----------------------------------------------------------> +* odpdrv_devio_register(...) +* -----------------------------------------------------------> +* -----------------------------------------------------------> +* -----------------------------------------------------------> +* @endcode +* ODP calls the probe function of each registered enumerator_class. +* This result in the enumerator_class registering some +* enumerators (instances of the class) by calling +* odpdrv_emumerator_register() for each instance. +* A given enumerator_class may create many enumerators based on its platform: +* For instance Linux defines a number of PCI domains that can be viewed as +* multiple PCI enumerators. In addition, it could be considered that each PCI +* root of each processor socket in a NUMA environment has its own PCI +* enumerator. +* For enumerator class PCI, there could be one instance for each PCI +* domain. +* The devios delivered with their enumerator may also register at this stage. +* +* 4) +* @code +* enumerator probe() +* <----------------------------------------------------------- +* odpdrv_device_create() +* -----------------------------------------------------------> +* odpdrv_device_create() +* -----------------------------------------------------------> +* odpdrv_device_create() +* -----------------------------------------------------------> +* @endcode +* For each enumerator instance, odp calls the probe function. +* This will trigger devices creation (Enumerators calls odpdrv +* odpdrv_device_create() for each new device). Enumerators are allowed +* to call odpdrv_device_create() at any time once they have been probed +* (hotplug). They also may call odpdrv_device_destroy() if needed. +* +* 5) The driver framework calls the drivers probe(D,I) functions of the +* drivers, with device D and devio I as parameter, assuming that: +* -devio I was on the driver supported list of devio (and version matches) +* -the devio I is registered and found its enumerator interface(E) api +* (name and version) +* -device D was enumerated by an enumerator providing interface E. +* The return value of the driver probe function tells whether the driver +* can handle the device or not. +* +* @{ +*/ + +/* Forward declarations for a top down description of structures */ +/** Parameters for enumerator class registration */ +typedef struct odpdrv_enumr_class_param_t odpdrv_enumr_class_param_t; +/** Parameters for enumerator registration */ +typedef struct odpdrv_enumr_param_t odpdrv_enumr_param_t; +/** Parameters for new device creation */ +typedef struct odpdrv_device_param_t odpdrv_device_param_t; +/** Parameters for devio registration*/ +typedef struct odpdrv_devio_param_t odpdrv_devio_param_t; +/** Parameters for driver registration*/ +typedef struct odpdrv_driver_param_t odpdrv_driver_param_t; + +/** + * @typedef odpdrv_enumr_class_t + * ODPDRV enumerator class, such as PCI. + */ +/** + * @def ODPDRV_ENUMR_CLASS_INVALID + * Invalid odpdrv enumerator class + */ + +/** + * @typedef odpdrv_enumr_t + * ODPDRV enumerator. Instance of odpdrv_enumr_class_t. + */ +/** + * @def ODPDRV_ENUMR_INVALID + * Invalid odpdrv enumerator + */ + +/** + * @typedef odpdrv_device_t + * ODPDRV device. Created and destroyed by enumerators + */ +/** + * @def ODPDRV_DEVICE_INVALID + * Invalid odpdrv device + */ + +/** + * @typedef odpdrv_devio_t + * ODPDRV device IO interface. + */ +/** + * @def ODPDRV_DEVIO_INVALID + * Invalid odpdrv device IO + */ + +/** + * @typedef odpdrv_driver_t + * ODPDRV device driver. + */ +/** + * @def ODPDRV_DRIVER_INVALID + * Invalid odpdrv driver + */ + +/** Maximum size for driver and enumerator names */ +#define ODPDRV_NAME_SIZE 32 + +/** Maximum size for the enumerator dependent address */ +#define ODPDRV_NAME_ADDR_SZ 64 + +/** The maximum number of interfaces a driver may support */ +#define ODPDRV_MAX_DEVIOS 3 + +/** +* Parameters to be given at enumerator class registration +*/ +struct odpdrv_enumr_class_param_t { + /** Enumerator name: mostly used for debug purpose. + * Name must be unique (e.g. "PCI-DPAA2") + */ + const char name[ODPDRV_NAME_SIZE]; + + /** Probe function: + * Called by ODP to get the enumerator class instances registered + */ + int (*probe)(void); + + /** Remove function: + * Free whatever resource the class may have allocated. + */ + int (*remove)(void); +}; + +/** +* Parameter to be given at enumerator (instance) registration +*/ +struct odpdrv_enumr_param_t { + /** Class + * Identifies the class of the enumerator + */ + odpdrv_enumr_class_t enumr_class; + + /** Enumerator api_name and version are used by the devio + * to make sure the device can be accessed: + * E.g. "PCI" + * The format of the enum_dev part for the odpdrv_device_param_t + * structure is identified by the api-name and version below + */ + const char api_name[ODPDRV_NAME_SIZE]; + uint32_t api_version; /**<< the version of the provided API */ + + /** Probe function: + * Called by ODP when it is ready for device creation/deletion + * returns an negative value on error or 0 on success. + */ + int (*probe)(void); + + /** Remove function: + * destroy all enumerated devices and release all resources + */ + int (*remove)(void); + + /** Register event notifier function for hotplug events: + * register_notifier(fcnt,event_mask) registers fcnt as a callback when + * one of the event specified in event_mask occurs. + */ + int (*register_notifier)(void (*event_handler) (uint64_t event), + int64_t event_mask); +}; + +/* The following events are supported by enumerators */ +#define ODPDRV_ENUM_EV_REMOVED 0x0000000000000001 /**<< remove event */ + +/** This structure defines a generic enumerated device, or actually the +* common part between all devices, the enumerator specific part being pointed +* by the enum_dev field below. +*/ +struct odpdrv_device_param_t { + /** enumerator + * enumerator which enumerated the device: as returned by + * odpdrv_enumr_register + * devices with parents get destroyed when the parents dies. + */ + odpdrv_enumr_t enumerator; + + /** Device address: + * An enumerator dependent string giving the device address, + * e.g. "0000.23.12.1" for PCI domain 0, bus 23, device 12, function 1. + * This string identifies the device uniquely. + */ + const char address[ODPDRV_NAME_ADDR_SZ]; + + /** Enumerator dependent part + * This part is allocated by the enumerator and is enumerator dependent + * (i.e. different devices types will have different contents for + * enum_dev). + */ + void *enum_dev; +}; + +/** + * Parameter to be given at devio registration + */ +struct odpdrv_devio_param_t { + /** Devio name + * Identifies devio interface implemented by this devio + * (i.e:many devios may have the same name, but none of those + * with same provided interface should refer to a common enumerator + * class) + */ + const char api_name[ODPDRV_NAME_SIZE]; + uint32_t api_version; /**<< the version of the provided API */ + + /** Enumerator interface name and version + * The enumerator interface this devio needs. + */ + const char enumr_api_name[ODPDRV_NAME_SIZE]; + uint32_t enumr_api_version; /**<< required enumerator API version */ + + /** Ops + * Pointer to a devio ops structure (specific to each devio) + */ + void *ops; +}; + +/** +* Parameter to be given at driver registration +*/ +struct odpdrv_driver_param_t { + /** Driver name + * The driver name (the pair {driver-name, enum-api-name} must + * be unique) + */ + const char name[ODPDRV_NAME_SIZE]; + + /** Supported devios: + * The list of supported devio: one of the following devio + * (with correct version) must be available for the driver to work: + */ + struct { + const char api_name[ODPDRV_NAME_SIZE]; /**<< devio API name */ + uint32_t api_version; /**<< devio API version */ + } devios[ODPDRV_MAX_DEVIOS]; + + /** Probe function: + * Called by ODP to see if the driver can drive a given device + * + */ + int (*probe)(odpdrv_device_t *dev); + + /** Remove function: + * Only called with devices whose probe() returned true + * + */ + int (*remove)(odpdrv_device_param_t *dev); + +}; + +/** +* Register an enumerator class. +* Each enumerator class calls this function at init time. +* (probably using gcc/clang * __constructor__ attribute.) +* +* @param param Pointer to a enumerator class registration structure. +* @return an enumerator class handle or ODPDRV_ENUMR_CLASS_INVALID on error. +* On errors, enumerators classes should release allocated resources and return. +*/ +odpdrv_enumr_class_t odpdrv_enumr_class_register(odpdrv_enumr_class_param_t + *param); + +/** +* Register an enumerator. +* Each enumerator calls this function at init time. +* (probably using gcc/clang * __constructor__ attribute.) +* +* @param param Pointer to a enumerator registration parameter structure. +* @return an enumerator handle or ODPDRV_ENUMR_INVALID on error. +* On errors, enumerators should release allocated resources and return. +*/ +odpdrv_enumr_t odpdrv_enumr_register(odpdrv_enumr_param_t *param); + +/** +* Create a device +* Called by each enumerator at probe time, or anytime later, for each +* new created device +* @param param Pointer to a device parameter structure. +* @return an odpdrv devuice handle or ODPDRV_DEVICE_INVALID on error. +*/ +odpdrv_device_t odpdrv_device_create(odpdrv_device_param_t *param); + +/** +* Destroy a device +* Called by each enumerator at probe time, or anytime later, for each +* destroyed created device +* @param dev A odpdrv device handle as returned by odpdrv_device_create. +* @return 0 on success or a negative value on error. +*/ +void odpdrv_device_destroy(odpdrv_device_t dev); + +/** +* Register an devio. +* Each devio calls this function at init time. +* (probably using gcc/clang * __constructor__ attribute.) +* +* @param param Pointer to a devio registration structure. +* @return an odpdrv_devio_t handle or ODPDRV_DEVIO_INVALID on error. +*/ +odpdrv_devio_t odpdrv_devio_register(odpdrv_devio_param_t *param); + +/** +* Register a Driver. +* Each driver calls this function at init time. +* (probably using gcc/clang * __constructor__ attribute.) +* +* @param param Pointer to a driver registration structure. +* @return an odpdrv_driver_t handle or ODPDRV_DRIVER_INVALID on error. +* On errors, drivers should release allocated resources and return. +*/ +odpdrv_driver_t odpdrv_driver_register(odpdrv_driver_param_t *param); + +/** +* Print (ODP_DBG) the driver interface status (debug). +* +* @return 0 on success, less than zero on error (inconsistency detected) +*/ +int odpdrv_print_all(void); + +/** +* @} +*/ + +#ifdef __cplusplus +} +#endif + +#include <odp/visibility_end.h> +#endif diff --git a/platform/Makefile.inc b/platform/Makefile.inc index aefbf9a..57026d0 100644 --- a/platform/Makefile.inc +++ b/platform/Makefile.inc @@ -68,6 +68,7 @@ odpdrvspecinclude_HEADERS = \ $(top_srcdir)/include/odp/drv/spec/barrier.h \ $(top_srcdir)/include/odp/drv/spec/byteorder.h \ $(top_srcdir)/include/odp/drv/spec/compiler.h \ + $(top_srcdir)/include/odp/drv/spec/driver.h \ $(top_srcdir)/include/odp/drv/spec/shm.h \ $(top_srcdir)/include/odp/drv/spec/spinlock.h \ $(top_srcdir)/include/odp/drv/spec/std_types.h \ ----------------------------------------------------------------------- Summary of changes: .travis.yml | 2 +- DEPENDENCIES | 8 +- configure.ac | 4 +- include/odp/drv/spec/driver.h | 389 +++++++++++++++++++++ include/odp_drv.h | 1 + platform/Makefile.inc | 1 + platform/linux-generic/Makefile.am | 5 + platform/linux-generic/_modules.c | 53 +++ platform/linux-generic/drv_driver.c | 64 ++++ platform/linux-generic/include/odp/drv/driver.h | 37 ++ .../include/odp/drv/plat/driver_types.h | 52 +++ platform/linux-generic/include/odp_internal.h | 5 + platform/linux-generic/m4/configure.m4 | 12 + platform/linux-generic/m4/odp_modules.m4 | 11 + platform/linux-generic/odp_init.c | 87 +++++ test/Makefile.inc | 4 +- 16 files changed, 727 insertions(+), 8 deletions(-) create mode 100644 include/odp/drv/spec/driver.h create mode 100644 platform/linux-generic/_modules.c create mode 100644 platform/linux-generic/drv_driver.c create mode 100644 platform/linux-generic/include/odp/drv/driver.h create mode 100644 platform/linux-generic/include/odp/drv/plat/driver_types.h create mode 100644 platform/linux-generic/m4/odp_modules.m4 hooks/post-receive --

8 years, 5 months

[COMMIT] branch master updated. v1.13.0.0-9-g50ebc61

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 50ebc616ddd9d05651923134d7bfaa02c103fbce (commit) via 1ff6b7a7e44e7d7376920f1e1ee81dbf28f95563 (commit) from c15da68b8dc3187c1929ff7d7705a0958856cbad (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 50ebc616ddd9d05651923134d7bfaa02c103fbce Author: Matias Elo <matias.elo(a)nokia.com> Date: Mon Jan 9 12:56:14 2017 +0200 linux-gen: netmap: bump supported netmap version to 11.2 Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/DEPENDENCIES b/DEPENDENCIES index f1f0edd..574859c 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -83,13 +83,13 @@ Prerequisites for building the OpenDataPlane (ODP) API 3.3.1 Building netmap kernel modules ODP works at least with the latest release version of netmap, which is - currently 11.1. However, if possible one should try to use the latest netmap + currently 11.2. However, if possible one should try to use the latest netmap master branch commit for the best performance and the latest bug fixes. # Checkout netmap code $ git clone https://github.com/luigirizzo/netmap.git $ cd netmap - $ git checkout v11.1 (optional) + $ git checkout v11.2 (optional) This is enough to build ODP. If you don't want to build netmap kernel modules you can jump to section 3.3.2. commit 1ff6b7a7e44e7d7376920f1e1ee81dbf28f95563 Author: Matias Elo <matias.elo(a)nokia.com> Date: Mon Jan 9 12:56:13 2017 +0200 linux-gen: netmap: fix interface flags initialization Previously netmap interface flags parsed by nm_open() were always overwritten by netmap_start() function. In netmap v11.2 release this breaks pipe interface initialization. Fix this by setting the netmap flags only when needed. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/pktio/netmap.c b/platform/linux-generic/pktio/netmap.c index 8eb8145..208984b 100644 --- a/platform/linux-generic/pktio/netmap.c +++ b/platform/linux-generic/pktio/netmap.c @@ -452,7 +452,7 @@ static int netmap_start(pktio_entry_t *pktio_entry) { pkt_netmap_t *pkt_nm = &pktio_entry->s.pkt_nm; netmap_ring_t *desc_ring; - struct nm_desc base_desc; + struct nm_desc *desc_ptr; unsigned i; unsigned j; unsigned num_rx_desc = 0; @@ -503,18 +503,27 @@ static int netmap_start(pktio_entry_t *pktio_entry) pktio_entry->s.num_out_queue, pktio_entry->s.num_out_queue); - memset(&base_desc, 0, sizeof(struct nm_desc)); - base_desc.self = &base_desc; - base_desc.mem = NULL; - memcpy(base_desc.req.nr_name, pkt_nm->if_name, sizeof(pkt_nm->if_name)); - base_desc.req.nr_flags &= ~NR_REG_MASK; + /* Use nm_open() to parse netmap flags from interface name */ + desc_ptr = nm_open(pkt_nm->nm_name, NULL, 0, NULL); + if (desc_ptr == NULL) { + ODP_ERR("nm_start(%s) failed\n", pkt_nm->nm_name); + goto error; + } + struct nm_desc base_desc = *desc_ptr; - if (num_rx_desc == 1) - base_desc.req.nr_flags |= NR_REG_ALL_NIC; - else - base_desc.req.nr_flags |= NR_REG_ONE_NIC; + nm_close(desc_ptr); + base_desc.self = &base_desc; + base_desc.mem = NULL; base_desc.req.nr_ringid = 0; + if ((base_desc.req.nr_flags & NR_REG_MASK) == NR_REG_ALL_NIC || + (base_desc.req.nr_flags & NR_REG_MASK) == NR_REG_ONE_NIC) { + base_desc.req.nr_flags &= ~NR_REG_MASK; + if (num_rx_desc == 1) + base_desc.req.nr_flags |= NR_REG_ALL_NIC; + else + base_desc.req.nr_flags |= NR_REG_ONE_NIC; + } /* Only the first rx descriptor does mmap */ desc_ring = pkt_nm->rx_desc_ring; @@ -548,8 +557,12 @@ static int netmap_start(pktio_entry_t *pktio_entry) /* Open tx descriptors */ desc_ring = pkt_nm->tx_desc_ring; flags = NM_OPEN_IFNAME | NM_OPEN_NO_MMAP; - base_desc.req.nr_flags &= ~NR_REG_ALL_NIC; - base_desc.req.nr_flags |= NR_REG_ONE_NIC; + + if ((base_desc.req.nr_flags & NR_REG_MASK) == NR_REG_ALL_NIC) { + base_desc.req.nr_flags &= ~NR_REG_ALL_NIC; + base_desc.req.nr_flags |= NR_REG_ONE_NIC; + } + for (i = 0; i < pktio_entry->s.num_out_queue; i++) { for (j = desc_ring[i].s.first; j <= desc_ring[i].s.last; j++) { base_desc.req.nr_ringid = j; ----------------------------------------------------------------------- Summary of changes: DEPENDENCIES | 4 ++-- platform/linux-generic/pktio/netmap.c | 37 +++++++++++++++++++++++------------ 2 files changed, 27 insertions(+), 14 deletions(-) hooks/post-receive --

8 years, 5 months

[COMMIT] branch master updated. v1.13.0.0-7-gc15da68

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 c15da68b8dc3187c1929ff7d7705a0958856cbad (commit) via 16dd00616f73f7e49c53e4b0ea957ac789125b25 (commit) from a5609cc551f4bc71fb69746f3d6cafaf64b87fbf (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 c15da68b8dc3187c1929ff7d7705a0958856cbad Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Fri Jan 20 11:14:03 2017 +0200 linux-gen: align: clean up macros Removed unused macros from odp_align_internal.h. Renamed remaining macros without ODP_ prefix and with shorter names. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-and-tested-by: Yi He <yi.he(a)linaro.org> Reviewed-and-tested-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/include/odp_align_internal.h b/platform/linux-generic/include/odp_align_internal.h index e5b2f37..61ff200 100644 --- a/platform/linux-generic/include/odp_align_internal.h +++ b/platform/linux-generic/include/odp_align_internal.h @@ -20,14 +20,6 @@ extern "C" { #include <odp/api/align.h> #include <stdint.h> -/** @addtogroup odp_compiler_optim - * @{ - */ - -/* - * Round up - */ - /* Macros to calculate ODP_ROUNDUP_POWER2_U32() in five rounds of shift * and OR operations. */ #define _RSHIFT_U32(x, y) (((uint32_t)(x)) >> (y)) @@ -42,95 +34,31 @@ extern "C" { * The value is not round up, if it's already a power of two (including 1). * The value must be larger than 0 and not exceed 0x80000000. */ -#define ODP_ROUNDUP_POWER2_U32(x) \ +#define ROUNDUP_POWER2_U32(x) \ ((((uint32_t)(x)) > 0x80000000) ? 0 : (_POW2_U32_R5(x - 1) + 1)) -/** - * @internal +/* * Round up 'x' to alignment 'align' */ -#define ODP_ALIGN_ROUNDUP(x, align)\ +#define ROUNDUP_ALIGN(x, align)\ ((align) * (((x) + (align) - 1) / (align))) -/** - * @internal - * Round up pointer 'x' to alignment 'align' - */ -#define ODP_ALIGN_ROUNDUP_PTR(x, align)\ - ((void *)ODP_ALIGN_ROUNDUP((uintptr_t)(x), (uintptr_t)(align))) - -/** - * @internal +/* * Round up 'x' to cache line size alignment */ -#define ODP_CACHE_LINE_SIZE_ROUNDUP(x)\ - ODP_ALIGN_ROUNDUP(x, ODP_CACHE_LINE_SIZE) - -/** - * @internal - * Round up pointer 'x' to cache line size alignment - */ -#define ODP_CACHE_LINE_SIZE_ROUNDUP_PTR(x)\ - ((void *)ODP_CACHE_LINE_SIZE_ROUNDUP((uintptr_t)(x))) - -/** - * @internal - * Round up 'x' to page size alignment - */ -#define ODP_PAGE_SIZE_ROUNDUP(x)\ - ODP_ALIGN_ROUNDUP(x, ODP_PAGE_SIZE) +#define ROUNDUP_CACHE_LINE(x)\ + ROUNDUP_ALIGN(x, ODP_CACHE_LINE_SIZE) /* - * Round down - */ - -/** - * @internal * Round down 'x' to 'align' alignment, which is a power of two */ -#define ODP_ALIGN_ROUNDDOWN_POWER_2(x, align)\ +#define ROUNDDOWN_POWER2(x, align)\ ((x) & (~((align) - 1))) -/** - * @internal - * Round down 'x' to cache line size alignment - */ -#define ODP_CACHE_LINE_SIZE_ROUNDDOWN(x)\ - ODP_ALIGN_ROUNDDOWN_POWER_2(x, ODP_CACHE_LINE_SIZE) - -/** - * @internal - * Round down pointer 'x' to 'align' alignment, which is a power of two - */ -#define ODP_ALIGN_ROUNDDOWN_PTR_POWER_2(x, align)\ -((void *)ODP_ALIGN_ROUNDDOWN_POWER_2((uintptr_t)(x), (uintptr_t)(align))) - -/** - * @internal - * Round down pointer 'x' to cache line size alignment - */ -#define ODP_CACHE_LINE_SIZE_ROUNDDOWN_PTR(x)\ - ((void *)ODP_CACHE_LINE_SIZE_ROUNDDOWN((uintptr_t)(x))) /* - * Check align - */ - -/** - * @internal - * Check if pointer 'x' is aligned to 'align', which is a power of two - */ -#define ODP_ALIGNED_CHECK_POWER_2(x, align)\ - ((((uintptr_t)(x)) & (((uintptr_t)(align))-1)) == 0) - -/** - * @internal * Check if value is a power of two */ -#define ODP_VAL_IS_POWER_2(x) ((((x)-1) & (x)) == 0) - -/** - * @} - */ +#define CHECK_IS_POWER2(x) ((((x) - 1) & (x)) == 0) #ifdef __cplusplus } diff --git a/platform/linux-generic/include/odp_classification_datamodel.h b/platform/linux-generic/include/odp_classification_datamodel.h index 8505c67..f6393ee 100644 --- a/platform/linux-generic/include/odp_classification_datamodel.h +++ b/platform/linux-generic/include/odp_classification_datamodel.h @@ -92,7 +92,7 @@ struct cos_s { typedef union cos_u { struct cos_s s; - uint8_t pad[ODP_CACHE_LINE_SIZE_ROUNDUP(sizeof(struct cos_s))]; + uint8_t pad[ROUNDUP_CACHE_LINE(sizeof(struct cos_s))]; } cos_t; @@ -112,7 +112,7 @@ struct pmr_s { typedef union pmr_u { struct pmr_s s; - uint8_t pad[ODP_CACHE_LINE_SIZE_ROUNDUP(sizeof(struct pmr_s))]; + uint8_t pad[ROUNDUP_CACHE_LINE(sizeof(struct pmr_s))]; } pmr_t; /** diff --git a/platform/linux-generic/include/odp_packet_dpdk.h b/platform/linux-generic/include/odp_packet_dpdk.h index c63685e..4d7e0fc 100644 --- a/platform/linux-generic/include/odp_packet_dpdk.h +++ b/platform/linux-generic/include/odp_packet_dpdk.h @@ -42,7 +42,7 @@ struct pkt_cache_t { typedef union { struct pkt_cache_t s; - uint8_t pad[ODP_CACHE_LINE_SIZE_ROUNDUP(sizeof(struct pkt_cache_t))]; + uint8_t pad[ROUNDUP_CACHE_LINE(sizeof(struct pkt_cache_t))]; } pkt_cache_t ODP_ALIGNED_CACHE; /** Packet IO using DPDK interface */ diff --git a/platform/linux-generic/include/odp_packet_io_internal.h b/platform/linux-generic/include/odp_packet_io_internal.h index 2001c42..89bb6f3 100644 --- a/platform/linux-generic/include/odp_packet_io_internal.h +++ b/platform/linux-generic/include/odp_packet_io_internal.h @@ -176,7 +176,7 @@ struct pktio_entry { typedef union { struct pktio_entry s; - uint8_t pad[ODP_CACHE_LINE_SIZE_ROUNDUP(sizeof(struct pktio_entry))]; + uint8_t pad[ROUNDUP_CACHE_LINE(sizeof(struct pktio_entry))]; } pktio_entry_t; typedef struct { diff --git a/platform/linux-generic/include/odp_packet_netmap.h b/platform/linux-generic/include/odp_packet_netmap.h index 2aadbed..a6f68d5 100644 --- a/platform/linux-generic/include/odp_packet_netmap.h +++ b/platform/linux-generic/include/odp_packet_netmap.h @@ -32,7 +32,7 @@ struct netmap_ring_t { typedef union { struct netmap_ring_t s; - uint8_t pad[ODP_CACHE_LINE_SIZE_ROUNDUP(sizeof(struct netmap_ring_t))]; + uint8_t pad[ROUNDUP_CACHE_LINE(sizeof(struct netmap_ring_t))]; } netmap_ring_t ODP_ALIGNED_CACHE; /** Netmap ring slot */ diff --git a/platform/linux-generic/include/odp_queue_internal.h b/platform/linux-generic/include/odp_queue_internal.h index 8b55de1..560f826 100644 --- a/platform/linux-generic/include/odp_queue_internal.h +++ b/platform/linux-generic/include/odp_queue_internal.h @@ -79,7 +79,7 @@ struct queue_entry_s { union queue_entry_u { struct queue_entry_s s; - uint8_t pad[ODP_CACHE_LINE_SIZE_ROUNDUP(sizeof(struct queue_entry_s))]; + uint8_t pad[ROUNDUP_CACHE_LINE(sizeof(struct queue_entry_s))]; }; diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index f632a51..34d720c 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -1498,7 +1498,7 @@ int odp_packet_align(odp_packet_t *pkt, uint32_t offset, uint32_t len, if (seglen >= len) { misalign = align <= 1 ? 0 : - ODP_ALIGN_ROUNDUP(uaddr, align) - uaddr; + ROUNDUP_ALIGN(uaddr, align) - uaddr; if (misalign == 0) return 0; shift = align - misalign; @@ -1508,7 +1508,7 @@ int odp_packet_align(odp_packet_t *pkt, uint32_t offset, uint32_t len, shift = len - seglen; uaddr -= shift; misalign = align <= 1 ? 0 : - ODP_ALIGN_ROUNDUP(uaddr, align) - uaddr; + ROUNDUP_ALIGN(uaddr, align) - uaddr; if (misalign) shift += align - misalign; } diff --git a/platform/linux-generic/odp_pool.c b/platform/linux-generic/odp_pool.c index 0d12d0b..cf7c2c4 100644 --- a/platform/linux-generic/odp_pool.c +++ b/platform/linux-generic/odp_pool.c @@ -311,7 +311,7 @@ static odp_pool_t pool_create(const char *name, odp_pool_param_t *params, /* Validate requested buffer alignment */ if (align > ODP_CONFIG_BUFFER_ALIGN_MAX || - align != ODP_ALIGN_ROUNDDOWN_POWER_2(align, align)) { + align != ROUNDDOWN_POWER2(align, align)) { ODP_ERR("Bad align requirement"); return ODP_POOL_INVALID; } @@ -349,7 +349,7 @@ static odp_pool_t pool_create(const char *name, odp_pool_param_t *params, } if (uarea_size) - uarea_size = ODP_CACHE_LINE_SIZE_ROUNDUP(uarea_size); + uarea_size = ROUNDUP_CACHE_LINE(uarea_size); pool = reserve_pool(); @@ -373,15 +373,15 @@ static odp_pool_t pool_create(const char *name, odp_pool_param_t *params, pool->params = *params; hdr_size = sizeof(odp_packet_hdr_t); - hdr_size = ODP_CACHE_LINE_SIZE_ROUNDUP(hdr_size); + hdr_size = ROUNDUP_CACHE_LINE(hdr_size); - block_size = ODP_CACHE_LINE_SIZE_ROUNDUP(hdr_size + align + headroom + - data_size + tailroom); + block_size = ROUNDUP_CACHE_LINE(hdr_size + align + headroom + + data_size + tailroom); if (num <= RING_SIZE_MIN) ring_size = RING_SIZE_MIN; else - ring_size = ODP_ROUNDUP_POWER2_U32(num); + ring_size = ROUNDUP_POWER2_U32(num); pool->ring_mask = ring_size - 1; pool->num = num; diff --git a/platform/linux-generic/odp_schedule.c b/platform/linux-generic/odp_schedule.c index 645630a..e14d145 100644 --- a/platform/linux-generic/odp_schedule.c +++ b/platform/linux-generic/odp_schedule.c @@ -82,20 +82,20 @@ ODP_STATIC_ASSERT((ODP_SCHED_PRIO_NORMAL > 0) && #define PRIO_QUEUE_EMPTY ((uint32_t)-1) /* For best performance, the number of queues should be a power of two. */ -ODP_STATIC_ASSERT(ODP_VAL_IS_POWER_2(ODP_CONFIG_QUEUES), +ODP_STATIC_ASSERT(CHECK_IS_POWER2(ODP_CONFIG_QUEUES), "Number_of_queues_is_not_power_of_two"); /* Ring size must be power of two, so that MAX_QUEUE_IDX_MASK can be used. */ -ODP_STATIC_ASSERT(ODP_VAL_IS_POWER_2(PRIO_QUEUE_RING_SIZE), +ODP_STATIC_ASSERT(CHECK_IS_POWER2(PRIO_QUEUE_RING_SIZE), "Ring_size_is_not_power_of_two"); /* Ring size must be power of two, so that PKTIO_RING_MASK can be used. */ -ODP_STATIC_ASSERT(ODP_VAL_IS_POWER_2(PKTIO_RING_SIZE), +ODP_STATIC_ASSERT(CHECK_IS_POWER2(PKTIO_RING_SIZE), "pktio_ring_size_is_not_power_of_two"); /* Number of commands queues must be power of two, so that PKTIO_CMD_QUEUE_MASK * can be used. */ -ODP_STATIC_ASSERT(ODP_VAL_IS_POWER_2(PKTIO_CMD_QUEUES), +ODP_STATIC_ASSERT(CHECK_IS_POWER2(PKTIO_CMD_QUEUES), "pktio_cmd_queues_is_not_power_of_two"); /* Mask of queues per priority */ diff --git a/platform/linux-generic/odp_schedule_sp.c b/platform/linux-generic/odp_schedule_sp.c index 5ccd32d..ad01bfe 100644 --- a/platform/linux-generic/odp_schedule_sp.c +++ b/platform/linux-generic/odp_schedule_sp.c @@ -27,18 +27,17 @@ #define PKTIN_PRIO (NUM_PRIO - 1) #define CMD_QUEUE 0 #define CMD_PKTIO 1 -#define ROUNDUP_CACHE(x) ODP_CACHE_LINE_SIZE_ROUNDUP(x) #define GROUP_ALL ODP_SCHED_GROUP_ALL #define GROUP_WORKER ODP_SCHED_GROUP_WORKER #define GROUP_CONTROL ODP_SCHED_GROUP_CONTROL #define GROUP_PKTIN GROUP_ALL /* Maximum number of commands: one priority/group for all queues and pktios */ -#define RING_SIZE (ODP_ROUNDUP_POWER2_U32(NUM_QUEUE + NUM_PKTIO)) +#define RING_SIZE (ROUNDUP_POWER2_U32(NUM_QUEUE + NUM_PKTIO)) #define RING_MASK (RING_SIZE - 1) /* Ring size must be power of two */ -ODP_STATIC_ASSERT(ODP_VAL_IS_POWER_2(RING_SIZE), +ODP_STATIC_ASSERT(CHECK_IS_POWER2(RING_SIZE), "Ring_size_is_not_power_of_two"); ODP_STATIC_ASSERT(NUM_ORDERED_LOCKS <= CONFIG_QUEUE_MAX_ORD_LOCKS, @@ -60,7 +59,7 @@ struct sched_cmd_s { typedef struct sched_cmd_t { struct sched_cmd_s s; - uint8_t pad[ROUNDUP_CACHE(sizeof(struct sched_cmd_s)) - + uint8_t pad[ROUNDUP_CACHE_LINE(sizeof(struct sched_cmd_s)) - sizeof(struct sched_cmd_s)]; } sched_cmd_t ODP_ALIGNED_CACHE; diff --git a/platform/linux-generic/odp_timer.c b/platform/linux-generic/odp_timer.c index 53fec08..cf610bf 100644 --- a/platform/linux-generic/odp_timer.c +++ b/platform/linux-generic/odp_timer.c @@ -233,12 +233,9 @@ static odp_timer_pool_t odp_timer_pool_new(const char *name, __odp_errno = ENFILE; /* Table overflow */ return ODP_TIMER_POOL_INVALID; } - size_t sz0 = ODP_ALIGN_ROUNDUP(sizeof(odp_timer_pool), - ODP_CACHE_LINE_SIZE); - size_t sz1 = ODP_ALIGN_ROUNDUP(sizeof(tick_buf_t) * param->num_timers, - ODP_CACHE_LINE_SIZE); - size_t sz2 = ODP_ALIGN_ROUNDUP(sizeof(odp_timer) * param->num_timers, - ODP_CACHE_LINE_SIZE); + size_t sz0 = ROUNDUP_CACHE_LINE(sizeof(odp_timer_pool)); + size_t sz1 = ROUNDUP_CACHE_LINE(sizeof(tick_buf_t) * param->num_timers); + size_t sz2 = ROUNDUP_CACHE_LINE(sizeof(odp_timer) * param->num_timers); odp_shm_t shm = odp_shm_reserve(name, sz0 + sz1 + sz2, ODP_CACHE_LINE_SIZE, ODP_SHM_SW_ONLY); if (odp_unlikely(shm == ODP_SHM_INVALID)) commit 16dd00616f73f7e49c53e4b0ea957ac789125b25 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Fri Jan 20 11:14:02 2017 +0200 linux-gen: align: round up power of two as macro Implement round up to power of two as a macro. Macro enables preprocessor to calculate the constant value and avoid code generation. Also dependency to __builtin_clz() is not needed anymore. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-and-tested-by: Yi He <yi.he(a)linaro.org> Reviewed-and-tested-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/include/odp_align_internal.h b/platform/linux-generic/include/odp_align_internal.h index d9cd30b..e5b2f37 100644 --- a/platform/linux-generic/include/odp_align_internal.h +++ b/platform/linux-generic/include/odp_align_internal.h @@ -18,6 +18,7 @@ extern "C" { #endif #include <odp/api/align.h> +#include <stdint.h> /** @addtogroup odp_compiler_optim * @{ @@ -27,6 +28,23 @@ extern "C" { * Round up */ +/* Macros to calculate ODP_ROUNDUP_POWER2_U32() in five rounds of shift + * and OR operations. */ +#define _RSHIFT_U32(x, y) (((uint32_t)(x)) >> (y)) +#define _POW2_U32_R1(x) (((uint32_t)(x)) | _RSHIFT_U32(x, 1)) +#define _POW2_U32_R2(x) (_POW2_U32_R1(x) | _RSHIFT_U32(_POW2_U32_R1(x), 2)) +#define _POW2_U32_R3(x) (_POW2_U32_R2(x) | _RSHIFT_U32(_POW2_U32_R2(x), 4)) +#define _POW2_U32_R4(x) (_POW2_U32_R3(x) | _RSHIFT_U32(_POW2_U32_R3(x), 8)) +#define _POW2_U32_R5(x) (_POW2_U32_R4(x) | _RSHIFT_U32(_POW2_U32_R4(x), 16)) + +/* Round up a uint32_t value 'x' to the next power of two. + * + * The value is not round up, if it's already a power of two (including 1). + * The value must be larger than 0 and not exceed 0x80000000. + */ +#define ODP_ROUNDUP_POWER2_U32(x) \ + ((((uint32_t)(x)) > 0x80000000) ? 0 : (_POW2_U32_R5(x - 1) + 1)) + /** * @internal * Round up 'x' to alignment 'align' @@ -36,14 +54,6 @@ extern "C" { /** * @internal - * When 'x' is not already a power of two, round it up to the next - * power of two value. Zero is not supported as an input value. - */ -#define ODP_ROUNDUP_POWER_2(x)\ - (1 << (((int)(8 * sizeof(x))) - __builtin_clz((x) - 1))) - -/** - * @internal * Round up pointer 'x' to alignment 'align' */ #define ODP_ALIGN_ROUNDUP_PTR(x, align)\ diff --git a/platform/linux-generic/odp_pool.c b/platform/linux-generic/odp_pool.c index 090a55f..0d12d0b 100644 --- a/platform/linux-generic/odp_pool.c +++ b/platform/linux-generic/odp_pool.c @@ -381,7 +381,7 @@ static odp_pool_t pool_create(const char *name, odp_pool_param_t *params, if (num <= RING_SIZE_MIN) ring_size = RING_SIZE_MIN; else - ring_size = ODP_ROUNDUP_POWER_2(num); + ring_size = ODP_ROUNDUP_POWER2_U32(num); pool->ring_mask = ring_size - 1; pool->num = num; diff --git a/platform/linux-generic/odp_schedule_sp.c b/platform/linux-generic/odp_schedule_sp.c index 5150d28..5ccd32d 100644 --- a/platform/linux-generic/odp_schedule_sp.c +++ b/platform/linux-generic/odp_schedule_sp.c @@ -34,7 +34,7 @@ #define GROUP_PKTIN GROUP_ALL /* Maximum number of commands: one priority/group for all queues and pktios */ -#define RING_SIZE (ODP_ROUNDUP_POWER_2(NUM_QUEUE + NUM_PKTIO)) +#define RING_SIZE (ODP_ROUNDUP_POWER2_U32(NUM_QUEUE + NUM_PKTIO)) #define RING_MASK (RING_SIZE - 1) /* Ring size must be power of two */ ----------------------------------------------------------------------- Summary of changes: .../linux-generic/include/odp_align_internal.h | 108 +++++---------------- .../include/odp_classification_datamodel.h | 4 +- platform/linux-generic/include/odp_packet_dpdk.h | 2 +- .../linux-generic/include/odp_packet_io_internal.h | 2 +- platform/linux-generic/include/odp_packet_netmap.h | 2 +- .../linux-generic/include/odp_queue_internal.h | 2 +- platform/linux-generic/odp_packet.c | 4 +- platform/linux-generic/odp_pool.c | 12 +-- platform/linux-generic/odp_schedule.c | 8 +- platform/linux-generic/odp_schedule_sp.c | 7 +- platform/linux-generic/odp_timer.c | 9 +- 11 files changed, 47 insertions(+), 113 deletions(-) hooks/post-receive --

8 years, 5 months

[COMMIT] branch master updated. v1.13.0.0-5-ga5609cc

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 a5609cc551f4bc71fb69746f3d6cafaf64b87fbf (commit) from 03aafc317489232bab7e9048f9bd96a24e6f598d (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 a5609cc551f4bc71fb69746f3d6cafaf64b87fbf Author: Matias Elo <matias.elo(a)nokia.com> Date: Mon Jan 23 16:35:35 2017 +0200 test: perf: add new packet function microbenchmark application The application calls each packet function TEST_REPEAT_COUNT times and calculates the average cycle count per call. Main options: -b: Burst size for *_multi operations -i: Benchmark index to run indefinitely The application prints benchmark results as a table, which can be copied as is to a spreadsheet application. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-and-tested-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/common_plat/performance/.gitignore b/test/common_plat/performance/.gitignore index 1527d25..eeacf2f 100644 --- a/test/common_plat/performance/.gitignore +++ b/test/common_plat/performance/.gitignore @@ -1,6 +1,7 @@ *.log *.trs odp_atomic +odp_bench_packet odp_crypto odp_l2fwd odp_pktio_perf diff --git a/test/common_plat/performance/Makefile.am b/test/common_plat/performance/Makefile.am index f184609..bcbf9cd 100644 --- a/test/common_plat/performance/Makefile.am +++ b/test/common_plat/performance/Makefile.am @@ -2,7 +2,9 @@ include $(top_srcdir)/test/Makefile.inc TESTS_ENVIRONMENT += TEST_DIR=${builddir} -EXECUTABLES = odp_crypto$(EXEEXT) odp_pktio_perf$(EXEEXT) +EXECUTABLES = odp_bench_packet$(EXEEXT) \ + odp_crypto$(EXEEXT) \ + odp_pktio_perf$(EXEEXT) COMPILE_ONLY = odp_l2fwd$(EXEEXT) \ odp_sched_latency$(EXEEXT) \ @@ -20,6 +22,8 @@ endif bin_PROGRAMS = $(EXECUTABLES) $(COMPILE_ONLY) +odp_bench_packet_LDFLAGS = $(AM_LDFLAGS) -static +odp_bench_packet_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/test odp_crypto_LDFLAGS = $(AM_LDFLAGS) -static odp_crypto_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/test odp_sched_latency_LDFLAGS = $(AM_LDFLAGS) -static @@ -30,6 +34,7 @@ odp_scheduling_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/test noinst_HEADERS = \ $(top_srcdir)/test/test_debug.h +dist_odp_bench_packet_SOURCES = odp_bench_packet.c dist_odp_crypto_SOURCES = odp_crypto.c dist_odp_sched_latency_SOURCES = odp_sched_latency.c dist_odp_scheduling_SOURCES = odp_scheduling.c diff --git a/test/common_plat/performance/odp_bench_packet.c b/test/common_plat/performance/odp_bench_packet.c new file mode 100644 index 0000000..1aa9d81 --- /dev/null +++ b/test/common_plat/performance/odp_bench_packet.c @@ -0,0 +1,1611 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +/** + * @file + * + * @example odp_bench_packet.c Microbenchmarks for packet functions + */ + +#include <stdlib.h> +#include <getopt.h> +#include <unistd.h> +#include <errno.h> +#include <inttypes.h> +#include <signal.h> + +#include <test_debug.h> + +#include <odp_api.h> +#include <odp/helper/threads.h> +#include <odp/helper/eth.h> +#include <odp/helper/ip.h> +#include <odp/helper/udp.h> + +/** Minimum number of packet data bytes in the first segment */ +#define PKT_POOL_SEG_LEN 128 + +/** Packet user area size in bytes */ +#define PKT_POOL_UAREA_SIZE 8 + +/** Minimum test packet size */ +#define TEST_MIN_PKT_SIZE 64 + +/** Maximum test packet size */ +#define TEST_MAX_PKT_SIZE 2048 + +/** Number of test runs per individual benchmark */ +#define TEST_REPEAT_COUNT 1000 + +/** Number of times to run tests for each packet size */ +#define TEST_SIZE_RUN_COUNT 10 + +/** Maximum burst size for *_multi operations */ +#define TEST_MAX_BURST 64 + +/** Offset of the contiguous area */ +#define TEST_ALIGN_OFFSET 16 + +/** Length of the contiguous area */ +#define TEST_ALIGN_LEN 32 + +/** Minimum byte alignment of contiguous area */ +#define TEST_ALIGN 32 + +/** Test packet offsets */ +#define TEST_L2_OFFSET 0 +#define TEST_L3_OFFSET (TEST_MIN_PKT_SIZE / 4) +#define TEST_L4_OFFSET (TEST_MIN_PKT_SIZE / 2) + +/** Default burst size for *_multi operations */ +#define TEST_DEF_BURST 8 + +/** Get rid of path in filename - only for unix-type paths using '/' */ +#define NO_PATH(file_name) (strrchr((file_name), '/') ? \ + strrchr((file_name), '/') + 1 : (file_name)) + +#define BENCH_INFO(run, init, term, name) \ + {#run, run, init, term, name} + +ODP_STATIC_ASSERT((TEST_ALIGN_OFFSET + TEST_ALIGN_LEN) <= TEST_MIN_PKT_SIZE, + "Invalid_alignment"); + +/** Warm up round packet size */ +#define WARM_UP TEST_MIN_PKT_SIZE + +/** Test packet sizes */ +const uint32_t test_packet_len[] = {WARM_UP, TEST_MIN_PKT_SIZE, 128, 256, 512, + 1024, 1518, TEST_MAX_PKT_SIZE}; + +/** + * Parsed command line arguments + */ +typedef struct { + int bench_idx; /** Benchmark index to run indefinitely */ + int burst_size; /** Burst size for *_multi operations */ +} appl_args_t; + +/** + * Initialize benchmark resources + */ +typedef void (*bench_init_fn_t)(void); + +/** + * Run benchmark + * + * @retval >0 on success + * */ +typedef int (*bench_run_fn_t)(void); + +/** + * Release benchmark resources + */ +typedef void (*bench_term_fn_t)(void); + +/** + * Benchmark data + */ +typedef struct { + const char *name; + bench_run_fn_t run; + bench_init_fn_t init; + bench_term_fn_t term; + const char *desc; +} bench_info_t; + +/** + * Grouping of all global data + */ +typedef struct { + /** Application (parsed) arguments */ + appl_args_t appl; + /** Packet pool */ + odp_pool_t pool; + /** Benchmark functions */ + bench_info_t *bench; + /** Number of benchmark functions */ + int num_bench; + struct { + /** Test packet length */ + uint32_t len; + /** Minimum test packet headroom */ + uint32_t headroom; + /** Minimum test packet tailroom */ + uint32_t tailroom; + /** Minimum test packet segment length */ + uint32_t seg_len; + } pkt; + /** Array for storing test packets */ + odp_packet_t pkt_tbl[TEST_REPEAT_COUNT * TEST_MAX_BURST]; + /** Array for storing test packets */ + odp_packet_t pkt2_tbl[TEST_REPEAT_COUNT]; + /** Array for storing test event */ + odp_event_t event_tbl[TEST_REPEAT_COUNT]; + /** Array for storing test pointers */ + void *ptr_tbl[TEST_REPEAT_COUNT]; + /** Array for storing test segments */ + odp_packet_seg_t seg_tbl[TEST_REPEAT_COUNT]; + /** Array for storing test outputs */ + uint32_t output_tbl[TEST_REPEAT_COUNT]; + /** Array for storing test pool handles */ + odp_pool_t pool_tbl[TEST_REPEAT_COUNT]; + /** Array for storing test pktio handles */ + odp_pktio_t pktio_tbl[TEST_REPEAT_COUNT]; + /** Array for storing test timestamps */ + odp_time_t ts_tbl[TEST_REPEAT_COUNT]; + /** Array for storing test data */ + uint8_t data_tbl[TEST_REPEAT_COUNT][TEST_MAX_PKT_SIZE]; + /** Benchmark run failed */ + uint8_t bench_failed; +} args_t; + +/** Global pointer to args */ +static args_t *gbl_args; +/** Global barrier to synchronize main and worker */ +static odp_barrier_t barrier; +/** Break worker loop if set to 1 */ +static int exit_thread; + +static void sig_handler(int signo ODP_UNUSED) +{ + exit_thread = 1; +} + +/** + * Run given benchmark indefinitely + */ +static void run_indef(args_t *args, int idx) +{ + const char *desc; + + desc = args->bench[idx].desc != NULL ? + args->bench[idx].desc : args->bench[idx].name; + + printf("Running %s() indefinitely\n", desc); + + while (!exit_thread) { + int ret; + + if (args->bench[idx].init != NULL) + args->bench[idx].init(); + + ret = args->bench[idx].run(); + + if (args->bench[idx].term != NULL) + args->bench[idx].term(); + + if (!ret) + LOG_ABORT("Benchmark %s failed\n", desc); + } +} + +/** + * Master function for running the microbenchmarks + */ +static int run_benchmarks(void *arg) +{ + int i, j, k; + args_t *args = arg; + int num_sizes = sizeof(test_packet_len) / sizeof(test_packet_len[0]); + double results[gbl_args->num_bench][num_sizes]; + + memset(results, 0, sizeof(results)); + + printf("\nRunning benchmarks (cycles per call)\n" + "------------------------------------\n"); + + for (i = 0; i < num_sizes; i++) { + uint64_t tot_cycles = 0; + + printf("\nPacket length: %6d bytes\n" + "---------------------------\n", test_packet_len[i]); + + gbl_args->pkt.len = test_packet_len[i]; + + for (j = 0, k = 1; j < gbl_args->num_bench; k++) { + int ret; + uint64_t c1, c2; + const char *desc; + + if (args->appl.bench_idx && + (j + 1) != args->appl.bench_idx) { + j++; + continue; + } else if (args->appl.bench_idx && + (j + 1) == args->appl.bench_idx) { + run_indef(args, j); + return 0; + } + + desc = args->bench[j].desc != NULL ? + args->bench[j].desc : + args->bench[j].name; + + if (args->bench[j].init != NULL) + args->bench[j].init(); + + c1 = odp_cpu_cycles(); + ret = args->bench[j].run(); + c2 = odp_cpu_cycles(); + + if (args->bench[j].term != NULL) + args->bench[j].term(); + + if (!ret) { + LOG_ERR("Benchmark %s failed\n", desc); + args->bench_failed = 1; + return -1; + } + + tot_cycles += odp_cpu_cycles_diff(c2, c1); + + if (k >= TEST_SIZE_RUN_COUNT) { + double cycles; + + /** Each benchmark runs internally + * TEST_REPEAT_COUNT times. */ + cycles = ((double)tot_cycles) / + (TEST_SIZE_RUN_COUNT * + TEST_REPEAT_COUNT); + results[j][i] = cycles; + + printf("%-30s: %8.1f\n", desc, cycles); + + j++; + k = 0; + tot_cycles = 0; + } + } + } + printf("\n%-30s", "Benchmark / packet_size [B]"); + for (i = 0; i < num_sizes; i++) { + if (i == 0) + printf(" WARM UP "); + else + printf("%8.1d ", test_packet_len[i]); + } + printf("\n---------------------------------"); + for (i = 0; i < num_sizes; i++) + printf("----------"); + + for (i = 0; i < gbl_args->num_bench; i++) { + printf("\n[%02d] %-30s", i + 1, args->bench[i].desc != NULL ? + args->bench[i].desc : args->bench[i].name); + + for (j = 0; j < num_sizes; j++) + printf("%8.1f ", results[i][j]); + } + printf("\n\n"); + return 0; +} + +static void allocate_test_packets(uint32_t len, odp_packet_t pkt[], int num) +{ + int pkts = 0; + + while (pkts < num) { + int ret; + + ret = odp_packet_alloc_multi(gbl_args->pool, len, &pkt[pkts], + num - pkts); + if (ret < 0) + LOG_ABORT("Allocating test packets failed\n"); + + pkts += ret; + } +} + +static void alloc_packets_half(void) +{ + allocate_test_packets(gbl_args->pkt.len / 2, gbl_args->pkt_tbl, + TEST_REPEAT_COUNT); +} + +static void alloc_packets_multi(void) +{ + allocate_test_packets(gbl_args->pkt.len, gbl_args->pkt_tbl, + TEST_REPEAT_COUNT * gbl_args->appl.burst_size); +} + +static void alloc_concat_packets(void) +{ + allocate_test_packets(gbl_args->pkt.len / 2, gbl_args->pkt_tbl, + TEST_REPEAT_COUNT); + allocate_test_packets(gbl_args->pkt.len / 2, gbl_args->pkt2_tbl, + TEST_REPEAT_COUNT); +} + +static void alloc_packets_twice(void) +{ + allocate_test_packets(gbl_args->pkt.len, gbl_args->pkt_tbl, + TEST_REPEAT_COUNT); + allocate_test_packets(gbl_args->pkt.len, gbl_args->pkt2_tbl, + TEST_REPEAT_COUNT); +} + +static void create_packets(void) +{ + int i; + uint32_t headroom, tailroom, seg_len; + uint32_t min_headroom = 0; + uint32_t min_tailroom = 0; + uint32_t min_seg_len = 0; + odp_packet_t *pkt_tbl = gbl_args->pkt_tbl; + odp_packet_seg_t *seg_tbl = gbl_args->seg_tbl; + + allocate_test_packets(gbl_args->pkt.len, gbl_args->pkt_tbl, + TEST_REPEAT_COUNT); + + for (i = 0; i < TEST_REPEAT_COUNT; i++) { + headroom = odp_packet_headroom(pkt_tbl[i]); + tailroom = odp_packet_tailroom(pkt_tbl[i]); + seg_len = odp_packet_seg_len(pkt_tbl[i]); + + seg_tbl[i] = odp_packet_first_seg(pkt_tbl[i]); + + if (i == 0) { + min_headroom = headroom; + min_tailroom = tailroom; + min_seg_len = seg_len; + } else { + if (headroom < min_headroom) + min_headroom = headroom; + if (tailroom < min_tailroom) + min_tailroom = tailroom; + if (seg_len < min_seg_len) + min_seg_len = seg_len; + } + + if (odp_packet_l2_offset_set(pkt_tbl[i], TEST_L2_OFFSET) || + odp_packet_l3_offset_set(pkt_tbl[i], TEST_L3_OFFSET) || + odp_packet_l4_offset_set(pkt_tbl[i], TEST_L4_OFFSET)) + LOG_ABORT("Setting test packet offsets failed\n"); + + odp_packet_flow_hash_set(pkt_tbl[i], i); + odp_packet_ts_set(pkt_tbl[i], odp_time_local()); + } + gbl_args->pkt.headroom = min_headroom; + gbl_args->pkt.tailroom = min_tailroom; + gbl_args->pkt.seg_len = min_seg_len; +} + +static void create_events(void) +{ + int i; + odp_packet_t *pkt_tbl = gbl_args->pkt_tbl; + + create_packets(); + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + gbl_args->event_tbl[i] = odp_packet_to_event(pkt_tbl[i]); +} + +static void free_packets(void) +{ + odp_packet_free_multi(gbl_args->pkt_tbl, TEST_REPEAT_COUNT); +} + +static void free_packets_multi(void) +{ + odp_packet_free_multi(gbl_args->pkt_tbl, + TEST_REPEAT_COUNT * gbl_args->appl.burst_size); +} + +static void free_packets_twice(void) +{ + odp_packet_free_multi(gbl_args->pkt_tbl, TEST_REPEAT_COUNT); + odp_packet_free_multi(gbl_args->pkt2_tbl, TEST_REPEAT_COUNT); +} + +static int bench_empty(void) +{ + int i; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + gbl_args->output_tbl[i] = i; + + return i; +} + +static int bench_packet_alloc(void) +{ + int i; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) { + odp_packet_t pkt; + + pkt = odp_packet_alloc(gbl_args->pool, gbl_args->pkt.len); + + gbl_args->pkt_tbl[i] = pkt; + } + + return i; +} + +static int bench_packet_alloc_multi(void) +{ + int i; + int pkts = 0; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + pkts += odp_packet_alloc_multi(gbl_args->pool, + gbl_args->pkt.len, + &gbl_args->pkt_tbl[pkts], + gbl_args->appl.burst_size); + return pkts; +} + +static int bench_packet_free(void) +{ + int i; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + odp_packet_free(gbl_args->pkt_tbl[i]); + + return i; +} + +static int bench_packet_free_multi(void) +{ + int i; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) { + int pkt_idx = i * gbl_args->appl.burst_size; + + odp_packet_free_multi(&gbl_args->pkt_tbl[pkt_idx], + gbl_args->appl.burst_size); + } + return i; +} + +static int bench_packet_alloc_free(void) +{ + int i; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) { + odp_packet_t pkt; + + pkt = odp_packet_alloc(gbl_args->pool, gbl_args->pkt.len); + + odp_packet_free(pkt); + } + return i; +} + +static int bench_packet_alloc_free_multi(void) +{ + int i; + int pkts; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) { + pkts = odp_packet_alloc_multi(gbl_args->pool, gbl_args->pkt.len, + gbl_args->pkt_tbl, + gbl_args->appl.burst_size); + odp_packet_free_multi(gbl_args->pkt_tbl, pkts); + } + return i; +} + +static int bench_packet_reset(void) +{ + int i; + int ret = 0; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + ret += odp_packet_reset(gbl_args->pkt_tbl[i], + gbl_args->pkt.len); + return !ret; +} + +static int bench_packet_from_event(void) +{ + int i; + odp_packet_t *pkt_tbl = gbl_args->pkt_tbl; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + pkt_tbl[i] = odp_packet_from_event(gbl_args->event_tbl[i]); + + return i; +} + +static int bench_packet_to_event(void) +{ + int i; + odp_packet_t *pkt_tbl = gbl_args->pkt_tbl; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + gbl_args->event_tbl[i] = odp_packet_to_event(pkt_tbl[i]); + + return i; +} + +static int bench_packet_head(void) +{ + int i; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + gbl_args->ptr_tbl[i] = odp_packet_head(gbl_args->pkt_tbl[i]); + + return i; +} + +static int bench_packet_buf_len(void) +{ + int i; + uint32_t ret = 0; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + ret += odp_packet_buf_len(gbl_args->pkt_tbl[i]); + + return ret; +} + +static int bench_packet_data(void) +{ + int i; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + gbl_args->ptr_tbl[i] = odp_packet_data(gbl_args->pkt_tbl[i]); + + return i; +} + +static int bench_packet_seg_len(void) +{ + int i; + uint32_t ret = 0; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + ret += odp_packet_seg_len(gbl_args->pkt_tbl[i]); + + return ret; +} + +static int bench_packet_len(void) +{ + int i; + uint32_t ret = 0; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + ret += odp_packet_len(gbl_args->pkt_tbl[i]); + + return ret; +} + +static int bench_packet_headroom(void) +{ + int i; + uint32_t ret = 0; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + ret += odp_packet_headroom(gbl_args->pkt_tbl[i]); + + return ret; +} + +static int bench_packet_tailroom(void) +{ + int i; + uint32_t ret = 0; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + ret += odp_packet_tailroom(gbl_args->pkt_tbl[i]); + + return ret; +} + +static int bench_packet_tail(void) +{ + int i; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + gbl_args->ptr_tbl[i] = odp_packet_tail(gbl_args->pkt_tbl[i]); + + return i; +} + +static int bench_packet_offset(void) +{ + int i; + uint32_t offset = gbl_args->pkt.len / 2; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + gbl_args->ptr_tbl[i] = odp_packet_offset(gbl_args->pkt_tbl[i], + offset, NULL, NULL); + return i; +} + +static int bench_packet_prefetch(void) +{ + int i; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + odp_packet_prefetch(gbl_args->pkt_tbl[i], 0, gbl_args->pkt.len); + + return i; +} + +static int bench_packet_push_head(void) +{ + int i; + odp_packet_t *pkt_tbl = gbl_args->pkt_tbl; + uint32_t hroom = gbl_args->pkt.headroom; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + gbl_args->ptr_tbl[i] = odp_packet_push_head(pkt_tbl[i], hroom); + + return i; +} + +static int bench_packet_pull_head(void) +{ + int i; + uint32_t len = gbl_args->pkt.seg_len - 1; + odp_packet_t *pkt_tbl = gbl_args->pkt_tbl; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + gbl_args->ptr_tbl[i] = odp_packet_pull_head(pkt_tbl[i], len); + + return i; +} + +static int bench_packet_push_tail(void) +{ + int i; + odp_packet_t *pkt_tbl = gbl_args->pkt_tbl; + uint32_t troom = gbl_args->pkt.tailroom; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + gbl_args->ptr_tbl[i] = odp_packet_push_tail(pkt_tbl[i], troom); + + return i; +} + +static int bench_packet_pull_tail(void) +{ + int i; + uint32_t len = gbl_args->pkt.seg_len - 1; + odp_packet_t *pkt_tbl = gbl_args->pkt_tbl; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + gbl_args->ptr_tbl[i] = odp_packet_pull_tail(pkt_tbl[i], len); + + return i; +} + +static int bench_packet_extend_head(void) +{ + int i; + int ret = 0; + uint32_t len = gbl_args->pkt.len / 2; + odp_packet_t *pkt_tbl = gbl_args->pkt_tbl; + void **ptr_tbl = gbl_args->ptr_tbl; + uint32_t *data_tbl = gbl_args->output_tbl; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + ret += odp_packet_extend_head(&pkt_tbl[i], len, ptr_tbl[i], + &data_tbl[i]); + return ret >= 0; +} + +static int bench_packet_trunc_head(void) +{ + int i; + int ret = 0; + uint32_t len = gbl_args->pkt.len / 2; + odp_packet_t *pkt_tbl = gbl_args->pkt_tbl; + void **ptr_tbl = gbl_args->ptr_tbl; + uint32_t *data_tbl = gbl_args->output_tbl; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + ret += odp_packet_trunc_head(&pkt_tbl[i], len, ptr_tbl[i], + &data_tbl[i]); + return ret >= 0; +} + +static int bench_packet_extend_tail(void) +{ + int i; + int ret = 0; + uint32_t len = gbl_args->pkt.len / 2; + odp_packet_t *pkt_tbl = gbl_args->pkt_tbl; + void **ptr_tbl = gbl_args->ptr_tbl; + uint32_t *data_tbl = gbl_args->output_tbl; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + ret += odp_packet_extend_tail(&pkt_tbl[i], len, ptr_tbl[i], + &data_tbl[i]); + return ret >= 0; +} + +static int bench_packet_trunc_tail(void) +{ + int i; + int ret = 0; + uint32_t len = gbl_args->pkt.len / 2; + odp_packet_t *pkt_tbl = gbl_args->pkt_tbl; + void **ptr_tbl = gbl_args->ptr_tbl; + uint32_t *data_tbl = gbl_args->output_tbl; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + ret += odp_packet_trunc_tail(&pkt_tbl[i], len, ptr_tbl[i], + &data_tbl[i]); + return ret >= 0; +} + +static int bench_packet_add_data(void) +{ + int i; + int ret = 0; + odp_packet_t *pkt_tbl = gbl_args->pkt_tbl; + uint32_t len = gbl_args->pkt.len / 2; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + ret += odp_packet_add_data(&pkt_tbl[i], 0, len); + + return ret >= 0; +} + +static int bench_packet_rem_data(void) +{ + int i; + int ret = 0; + odp_packet_t *pkt_tbl = gbl_args->pkt_tbl; + uint32_t len = gbl_args->pkt.len / 2; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + ret += odp_packet_rem_data(&pkt_tbl[i], 0, len); + + return ret >= 0; +} + +static int bench_packet_align(void) +{ + int i; + int ret = 0; + odp_packet_t *pkt_tbl = gbl_args->pkt_tbl; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + ret += odp_packet_align(&pkt_tbl[i], TEST_ALIGN_OFFSET, + TEST_ALIGN_LEN, TEST_ALIGN); + return ret >= 0; +} + +static int bench_packet_is_segmented(void) +{ + int i; + uint32_t ret = 0; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + ret += odp_packet_is_segmented(gbl_args->pkt_tbl[i]); + + return (ret == 0) ? 1 : ret; +} + +static int bench_packet_num_segs(void) +{ + int i; + uint32_t ret = 0; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + ret += odp_packet_num_segs(gbl_args->pkt_tbl[i]); + + return ret; +} + +static int bench_packet_first_seg(void) +{ + int i; + odp_packet_t *pkt_tbl = gbl_args->pkt_tbl; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + gbl_args->seg_tbl[i] = odp_packet_first_seg(pkt_tbl[i]); + + return i; +} + +static int bench_packet_last_seg(void) +{ + int i; + odp_packet_t *pkt_tbl = gbl_args->pkt_tbl; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + gbl_args->seg_tbl[i] = odp_packet_last_seg(pkt_tbl[i]); + + return i; +} + +static int bench_packet_next_seg(void) +{ + int i; + odp_packet_t *pkt_tbl = gbl_args->pkt_tbl; + odp_packet_seg_t *seg_tbl = gbl_args->seg_tbl; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + gbl_args->seg_tbl[i] = odp_packet_next_seg(pkt_tbl[i], + seg_tbl[i]); + return i; +} + +static int bench_packet_seg_data(void) +{ + int i; + odp_packet_t *pkt_tbl = gbl_args->pkt_tbl; + odp_packet_seg_t *seg_tbl = gbl_args->seg_tbl; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + gbl_args->ptr_tbl[i] = odp_packet_seg_data(pkt_tbl[i], + seg_tbl[i]); + return i; +} + +static int bench_packet_seg_data_len(void) +{ + int i; + uint32_t ret = 0; + odp_packet_t *pkt_tbl = gbl_args->pkt_tbl; + odp_packet_seg_t *seg_tbl = gbl_args->seg_tbl; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + ret += odp_packet_seg_data_len(pkt_tbl[i], seg_tbl[i]); + + return ret; +} + +static int bench_packet_concat(void) +{ + int i; + int ret = 0; + odp_packet_t *pkt_tbl = gbl_args->pkt_tbl; + odp_packet_t *frag_tbl = gbl_args->pkt2_tbl; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + ret += odp_packet_concat(&pkt_tbl[i], frag_tbl[i]); + + return ret >= 0; +} + +static int bench_packet_split(void) +{ + int i; + int ret = 0; + uint32_t head_len; + odp_packet_t *pkt_tbl = gbl_args->pkt_tbl; + odp_packet_t *frag_tbl = gbl_args->pkt2_tbl; + + head_len = odp_packet_len(pkt_tbl[0]) / 2; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + ret += odp_packet_split(&pkt_tbl[i], head_len, &frag_tbl[i]); + + return ret >= 0; +} + +static int bench_packet_copy(void) +{ + int i; + odp_packet_t *pkt_tbl = gbl_args->pkt_tbl; + odp_packet_t *cpy_tbl = gbl_args->pkt2_tbl; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + cpy_tbl[i] = odp_packet_copy(pkt_tbl[i], gbl_args->pool); + + return i; +} + +static int bench_packet_copy_part(void) +{ + int i; + uint32_t len = gbl_args->pkt.len / 2; + odp_packet_t *pkt_tbl = gbl_args->pkt_tbl; + odp_packet_t *cpy_tbl = gbl_args->pkt2_tbl; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + cpy_tbl[i] = odp_packet_copy_part(pkt_tbl[i], 0, len, + gbl_args->pool); + return i; +} + +static int bench_packet_copy_to_mem(void) +{ + int i; + uint32_t ret = 0; + uint32_t len = gbl_args->pkt.len; + odp_packet_t *pkt_tbl = gbl_args->pkt_tbl; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + ret += odp_packet_copy_to_mem(pkt_tbl[i], 0, len, + gbl_args->data_tbl[i]); + return !ret; +} + +static int bench_packet_copy_from_mem(void) +{ + int i; + uint32_t ret = 0; + uint32_t len = gbl_args->pkt.len; + odp_packet_t *pkt_tbl = gbl_args->pkt_tbl; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + ret += odp_packet_copy_from_mem(pkt_tbl[i], 0, len, + gbl_args->data_tbl[i]); + return !ret; +} + +static int bench_packet_copy_from_pkt(void) +{ + int i; + uint32_t ret = 0; + uint32_t len = gbl_args->pkt.len; + odp_packet_t *dst_tbl = gbl_args->pkt_tbl; + odp_packet_t *src_tbl = gbl_args->pkt2_tbl; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + ret += odp_packet_copy_from_pkt(dst_tbl[i], 0, src_tbl[i], 0, + len); + return !ret; +} + +static int bench_packet_copy_data(void) +{ + int i; + uint32_t ret = 0; + uint32_t len = gbl_args->pkt.len / 2; + odp_packet_t *pkt_tbl = gbl_args->pkt_tbl; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + ret += odp_packet_copy_data(pkt_tbl[i], 0, len, len); + + return !ret; +} + +static int bench_packet_move_data(void) +{ + int i; + uint32_t ret = 0; + uint32_t len = gbl_args->pkt.len / 2; + uint32_t offset = len / 2; + odp_packet_t *pkt_tbl = gbl_args->pkt_tbl; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + ret += odp_packet_move_data(pkt_tbl[i], offset, len, len); + + return !ret; +} + +static int bench_packet_pool(void) +{ + int i; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + gbl_args->pool_tbl[i] = odp_packet_pool(gbl_args->pkt_tbl[i]); + + return i; +} + +static int bench_packet_input(void) +{ + int i; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + gbl_args->pktio_tbl[i] = odp_packet_input(gbl_args->pkt_tbl[i]); + + return i; +} + +static int bench_packet_input_index(void) +{ + int i; + int ret = 0; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + ret += odp_packet_input_index(gbl_args->pkt_tbl[i]); + + return (ret == 0) ? 1 : ret; +} + +static int bench_packet_user_ptr(void) +{ + int i; + odp_packet_t *pkt_tbl = gbl_args->pkt_tbl; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + gbl_args->ptr_tbl[i] = odp_packet_user_ptr(pkt_tbl[i]); + + return i; +} + +static int bench_packet_user_ptr_set(void) +{ + int i; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + odp_packet_user_ptr_set(gbl_args->pkt_tbl[i], + gbl_args->ptr_tbl[i]); + + return i; +} + +static int bench_packet_user_area(void) +{ + int i; + odp_packet_t *pkt_tbl = gbl_args->pkt_tbl; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + gbl_args->ptr_tbl[i] = odp_packet_user_area(pkt_tbl[i]); + + return i; +} + +static int bench_packet_user_area_size(void) +{ + int i; + uint32_t ret = 0; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + ret += odp_packet_user_area_size(gbl_args->pkt_tbl[i]); + + return ret; +} + +static int bench_packet_l2_ptr(void) +{ + int i; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + gbl_args->ptr_tbl[i] = odp_packet_l2_ptr(gbl_args->pkt_tbl[i], + NULL); + return i; +} + +static int bench_packet_l2_offset(void) +{ + int i; + int ret = 0; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + ret += odp_packet_l2_offset(gbl_args->pkt_tbl[i]); + + return ret >= 0; +} + +static int bench_packet_l2_offset_set(void) +{ + int i; + uint32_t ret = 0; + uint32_t offset = gbl_args->pkt.len / 2; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + ret += odp_packet_l2_offset_set(gbl_args->pkt_tbl[i], offset); + + return !ret; +} + +static int bench_packet_l3_ptr(void) +{ + int i; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + gbl_args->ptr_tbl[i] = odp_packet_l3_ptr(gbl_args->pkt_tbl[i], + NULL); + return i; +} + +static int bench_packet_l3_offset(void) +{ + int i; + int ret = 0; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + ret += odp_packet_l3_offset(gbl_args->pkt_tbl[i]); + + return ret >= 0; +} + +static int bench_packet_l3_offset_set(void) +{ + int i; + uint32_t ret = 0; + uint32_t offset = gbl_args->pkt.len / 2; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + ret += odp_packet_l3_offset_set(gbl_args->pkt_tbl[i], offset); + + return !ret; +} + +static int bench_packet_l4_ptr(void) +{ + int i; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + gbl_args->ptr_tbl[i] = odp_packet_l4_ptr(gbl_args->pkt_tbl[i], + NULL); + return i; +} + +static int bench_packet_l4_offset(void) +{ + int i; + int ret = 0; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + ret += odp_packet_l4_offset(gbl_args->pkt_tbl[i]); + + return ret >= 0; +} + +static int bench_packet_l4_offset_set(void) +{ + int i; + uint32_t ret = 0; + uint32_t offset = gbl_args->pkt.len / 2; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + ret += odp_packet_l4_offset_set(gbl_args->pkt_tbl[i], offset); + + return !ret; +} + +static int bench_packet_flow_hash(void) +{ + int i; + uint32_t ret = 0; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + ret += odp_packet_flow_hash(gbl_args->pkt_tbl[i]); + + return ret; +} + +static int bench_packet_flow_hash_set(void) +{ + int i; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + odp_packet_flow_hash_set(gbl_args->pkt_tbl[i], i); + + return i; +} + +static int bench_packet_ts(void) +{ + int i; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + gbl_args->ts_tbl[i] = odp_packet_ts(gbl_args->pkt_tbl[i]); + + return i; +} + +static int bench_packet_ts_set(void) +{ + int i; + odp_time_t ts = odp_time_local(); + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + odp_packet_ts_set(gbl_args->pkt_tbl[i], ts); + + return i; +} + +/** + * Prinf usage information + */ +static void usage(char *progname) +{ + printf("\n" + "OpenDataPlane Packet function microbenchmark.\n" + "\n" + "Usage: %s OPTIONS\n" + " E.g. %s\n" + "\n" + "Optional OPTIONS:\n" + " -b, --burst Test packet burst size.\n" + " -i, --index Benchmark index to run indefinitely.\n" + " -h, --help Display help and exit.\n\n" + "\n", NO_PATH(progname), NO_PATH(progname)); +} + +/** + * Parse and store the command line arguments + * + * @param argc argument count + * @param argv[] argument vector + * @param appl_args Store application arguments here + */ +static void parse_args(int argc, char *argv[], appl_args_t *appl_args) +{ + int opt; + int long_index; + static const struct option longopts[] = { + {"burst", required_argument, NULL, 'b'}, + {"help", no_argument, NULL, 'h'}, + {"index", required_argument, NULL, 'i'}, + {NULL, 0, NULL, 0} + }; + + static const char *shortopts = "b:i:h"; + + /* Let helper collect its own arguments (e.g. --odph_proc) */ + odph_parse_options(argc, argv, shortopts, longopts); + + opterr = 0; /* Do not issue errors on helper options */ + + appl_args->bench_idx = 0; /* Run all benchmarks */ + appl_args->burst_size = TEST_DEF_BURST; + + while (1) { + opt = getopt_long(argc, argv, shortopts, longopts, &long_index); + + if (opt == -1) + break; /* No more options */ + + switch (opt) { + case 'b': + appl_args->burst_size = atoi(optarg); + break; + case 'h': + usage(argv[0]); + exit(EXIT_SUCCESS); + break; + case 'i': + appl_args->bench_idx = atoi(optarg); + break; + default: + break; + } + } + + if (appl_args->burst_size < 1 || + appl_args->burst_size > TEST_MAX_BURST) { + printf("Invalid burst size (max %d)\n", TEST_MAX_BURST); + exit(EXIT_FAILURE); + } + + optind = 1; /* Reset 'extern optind' from the getopt lib */ +} + +/** + * Print system and application info + */ +static void print_info(char *progname, appl_args_t *appl_args ODP_UNUSED) +{ + printf("\n" + "ODP system info\n" + "---------------\n" + "ODP API version: %s\n" + "ODP impl name: %s\n" + "CPU model: %s\n" + "CPU freq (hz): %" PRIu64 "\n" + "Cache line size: %i\n" + "CPU count: %i\n" + "\n", + odp_version_api_str(), odp_version_impl_name(), + odp_cpu_model_str(), odp_cpu_hz_max(), + odp_sys_cache_line_size(), odp_cpu_count()); + + printf("Running ODP appl: \"%s\"\n" + "-----------------\n", progname); + fflush(NULL); +} + +/** + * Test functions + */ +bench_info_t test_suite[] = { + BENCH_INFO(bench_empty, NULL, NULL, NULL), + BENCH_INFO(bench_packet_alloc, NULL, free_packets, NULL), + BENCH_INFO(bench_packet_alloc_multi, NULL, free_packets_multi, + NULL), + BENCH_INFO(bench_packet_free, create_packets, NULL, NULL), + BENCH_INFO(bench_packet_free_multi, alloc_packets_multi, NULL, + NULL), + BENCH_INFO(bench_packet_alloc_free, NULL, NULL, NULL), + BENCH_INFO(bench_packet_alloc_free_multi, NULL, NULL, NULL), + BENCH_INFO(bench_packet_reset, create_packets, free_packets, + NULL), + BENCH_INFO(bench_packet_from_event, create_events, free_packets, + NULL), + BENCH_INFO(bench_packet_to_event, create_packets, free_packets, + NULL), + BENCH_INFO(bench_packet_head, create_packets, free_packets, + NULL), + BENCH_INFO(bench_packet_buf_len, create_packets, free_packets, + NULL), + BENCH_INFO(bench_packet_data, create_packets, free_packets, + NULL), + BENCH_INFO(bench_packet_seg_len, create_packets, free_packets, + NULL), + BENCH_INFO(bench_packet_len, create_packets, free_packets, + NULL), + BENCH_INFO(bench_packet_headroom, create_packets, free_packets, + NULL), + BENCH_INFO(bench_packet_tailroom, create_packets, free_packets, + NULL), + BENCH_INFO(bench_packet_tail, create_packets, free_packets, + NULL), + BENCH_INFO(bench_packet_offset, create_packets, free_packets, + NULL), + BENCH_INFO(bench_packet_prefetch, create_packets, free_packets, + NULL), + BENCH_INFO(bench_packet_push_head, create_packets, free_packets, + NULL), + BENCH_INFO(bench_packet_pull_head, create_packets, free_packets, + NULL), + BENCH_INFO(bench_packet_push_tail, create_packets, free_packets, + NULL), + BENCH_INFO(bench_packet_pull_tail, create_packets, free_packets, + NULL), + BENCH_INFO(bench_packet_extend_head, alloc_packets_half, + free_packets, NULL), + BENCH_INFO(bench_packet_trunc_head, create_packets, + free_packets, NULL), + BENCH_INFO(bench_packet_extend_tail, alloc_packets_half, + free_packets, NULL), + BENCH_INFO(bench_packet_trunc_tail, create_packets, + free_packets, NULL), + BENCH_INFO(bench_packet_add_data, alloc_packets_half, + free_packets, NULL), + BENCH_INFO(bench_packet_rem_data, create_packets, free_packets, + NULL), + BENCH_INFO(bench_packet_align, create_packets, free_packets, + NULL), + BENCH_INFO(bench_packet_is_segmented, create_packets, + free_packets, NULL), + BENCH_INFO(bench_packet_num_segs, create_packets, free_packets, + NULL), + BENCH_INFO(bench_packet_first_seg, create_packets, free_packets, + NULL), + BENCH_INFO(bench_packet_last_seg, create_packets, free_packets, + NULL), + BENCH_INFO(bench_packet_next_seg, create_packets, free_packets, + NULL), + BENCH_INFO(bench_packet_seg_data, create_packets, free_packets, + NULL), + BENCH_INFO(bench_packet_seg_data_len, create_packets, + free_packets, NULL), + BENCH_INFO(bench_packet_concat, alloc_concat_packets, + free_packets, NULL), + BENCH_INFO(bench_packet_split, create_packets, + free_packets_twice, NULL), + BENCH_INFO(bench_packet_copy, create_packets, + free_packets_twice, NULL), + BENCH_INFO(bench_packet_copy_part, create_packets, + free_packets_twice, NULL), + BENCH_INFO(bench_packet_copy_to_mem, create_packets, + free_packets, NULL), + BENCH_INFO(bench_packet_copy_from_mem, create_packets, + free_packets, NULL), + BENCH_INFO(bench_packet_copy_from_pkt, alloc_packets_twice, + free_packets_twice, NULL), + BENCH_INFO(bench_packet_copy_data, create_packets, free_packets, + NULL), + BENCH_INFO(bench_packet_move_data, create_packets, free_packets, + NULL), + BENCH_INFO(bench_packet_pool, create_packets, free_packets, + NULL), + BENCH_INFO(bench_packet_input, create_packets, free_packets, + NULL), + BENCH_INFO(bench_packet_input_index, create_packets, + free_packets, NULL), + BENCH_INFO(bench_packet_user_ptr, create_packets, free_packets, + NULL), + BENCH_INFO(bench_packet_user_ptr_set, create_packets, + free_packets, NULL), + BENCH_INFO(bench_packet_user_area, create_packets, free_packets, + NULL), + BENCH_INFO(bench_packet_user_area_size, create_packets, + free_packets, NULL), + BENCH_INFO(bench_packet_l2_ptr, create_packets, free_packets, + NULL), + BENCH_INFO(bench_packet_l2_offset, create_packets, free_packets, + NULL), + BENCH_INFO(bench_packet_l2_offset_set, create_packets, + free_packets, NULL), + BENCH_INFO(bench_packet_l3_ptr, create_packets, free_packets, + NULL), + BENCH_INFO(bench_packet_l3_offset, create_packets, free_packets, + NULL), + BENCH_INFO(bench_packet_l3_offset_set, create_packets, + free_packets, NULL), + BENCH_INFO(bench_packet_l4_ptr, create_packets, free_packets, + NULL), + BENCH_INFO(bench_packet_l4_offset, create_packets, free_packets, + NULL), + BENCH_INFO(bench_packet_l4_offset_set, create_packets, + free_packets, NULL), + BENCH_INFO(bench_packet_flow_hash, create_packets, free_packets, + NULL), + BENCH_INFO(bench_packet_flow_hash_set, create_packets, + free_packets, NULL), + BENCH_INFO(bench_packet_ts, create_packets, free_packets, NULL), + BENCH_INFO(bench_packet_ts_set, create_packets, free_packets, + NULL), +}; + +/** + * ODP packet microbenchmark application + */ +int main(int argc, char *argv[]) +{ + odph_odpthread_t worker_thread; + int cpu; + odp_shm_t shm; + odp_cpumask_t cpumask; + char cpumaskstr[ODP_CPUMASK_STR_SIZE]; + odp_pool_capability_t capa; + odp_pool_param_t params; + odp_instance_t instance; + uint32_t pkt_num; + uint8_t ret; + + /* Init ODP before calling anything else */ + if (odp_init_global(&instance, NULL, NULL)) { + LOG_ERR("Error: ODP global init failed.\n"); + exit(EXIT_FAILURE); + } + + /* Init this thread */ + if (odp_init_local(instance, ODP_THREAD_CONTROL)) { + LOG_ERR("Error: ODP local init failed.\n"); + exit(EXIT_FAILURE); + } + + /* Reserve memory for args from shared mem */ + shm = odp_shm_reserve("shm_args", sizeof(args_t), + ODP_CACHE_LINE_SIZE, 0); + + if (shm == ODP_SHM_INVALID) { + LOG_ERR("Error: shared mem reserve failed.\n"); + exit(EXIT_FAILURE); + } + + gbl_args = odp_shm_addr(shm); + + if (gbl_args == NULL) { + LOG_ERR("Error: shared mem alloc failed.\n"); + exit(EXIT_FAILURE); + } + + memset(gbl_args, 0, sizeof(args_t)); + + gbl_args->bench = test_suite; + gbl_args->num_bench = sizeof(test_suite) / sizeof(test_suite[0]); + + /* Parse and store the application arguments */ + parse_args(argc, argv, &gbl_args->appl); + + /* Print both system and application information */ + print_info(NO_PATH(argv[0]), &gbl_args->appl); + + /* Get default worker cpumask */ + if (odp_cpumask_default_worker(&cpumask, 1) != 1) { + LOG_ERR("Error: unable to allocate worker thread.\n"); + exit(EXIT_FAILURE); + } + + (void)odp_cpumask_to_str(&cpumask, cpumaskstr, sizeof(cpumaskstr)); + + /* Check pool capability */ + if (odp_pool_capability(&capa)) { + LOG_ERR("Error: unable to query pool capability.\n"); + exit(EXIT_FAILURE); + } + + /* At least 2 x TEST_REPEAT_COUNT packets required */ + pkt_num = (gbl_args->appl.burst_size > 2) ? + gbl_args->appl.burst_size * TEST_REPEAT_COUNT : + 2 * TEST_REPEAT_COUNT; + + if (capa.pkt.max_num && capa.pkt.max_num < pkt_num) { + LOG_ERR("Error: packet pool size not supported.\n"); + printf("MAX: %" PRIu32 "\n", capa.pkt.max_num); + exit(EXIT_FAILURE); + } else if (capa.pkt.max_len && capa.pkt.max_len < TEST_MAX_PKT_SIZE) { + LOG_ERR("Error: packet length not supported.\n"); + exit(EXIT_FAILURE); + } else if (capa.pkt.max_seg_len && + capa.pkt.max_seg_len < PKT_POOL_SEG_LEN) { + LOG_ERR("Error: segment length not supported.\n"); + exit(EXIT_FAILURE); + } else if (capa.pkt.max_uarea_size && + capa.pkt.max_uarea_size < PKT_POOL_UAREA_SIZE) { + LOG_ERR("Error: user area size not supported.\n"); + exit(EXIT_FAILURE); + } + + /* Create packet pool */ + odp_pool_param_init(&params); + params.pkt.seg_len = PKT_POOL_SEG_LEN; + params.pkt.len = TEST_MAX_PKT_SIZE; + params.pkt.num = pkt_num; + params.pkt.uarea_size = PKT_POOL_UAREA_SIZE; + params.type = ODP_POOL_PACKET; + + gbl_args->pool = odp_pool_create("packet pool", &params); + + if (gbl_args->pool == ODP_POOL_INVALID) { + LOG_ERR("Error: packet pool create failed.\n"); + exit(EXIT_FAILURE); + } + + printf("CPU: %i\n", odp_cpumask_first(&cpumask)); + printf("CPU mask: %s\n", cpumaskstr); + printf("Burst size: %d\n", gbl_args->appl.burst_size); + printf("Bench repeat: %d\n", TEST_REPEAT_COUNT); + + odp_pool_print(gbl_args->pool); + + memset(&worker_thread, 0, sizeof(odph_odpthread_t)); + + odp_barrier_init(&barrier, 1 + 1); + + signal(SIGINT, sig_handler); + + /* Create worker threads */ + cpu = odp_cpumask_first(&cpumask); + + odp_cpumask_t thd_mask; + odph_odpthread_params_t thr_params; + + memset(&thr_params, 0, sizeof(thr_params)); + thr_params.start = run_benchmarks; + thr_params.arg = gbl_args; + thr_params.thr_type = ODP_THREAD_WORKER; + thr_params.instance = instance; + + odp_cpumask_zero(&thd_mask); + odp_cpumask_set(&thd_mask, cpu); + odph_odpthreads_create(&worker_thread, &thd_mask, + &thr_params); + + odph_odpthreads_join(&worker_thread); + + ret = gbl_args->bench_failed; + + if (odp_pool_destroy(gbl_args->pool)) { + LOG_ERR("Error: pool destroy\n"); + exit(EXIT_FAILURE); + } + + if (odp_shm_free(shm)) { + LOG_ERR("Error: shm free\n"); + exit(EXIT_FAILURE); + } + + if (odp_term_local()) { + LOG_ERR("Error: term local\n"); + exit(EXIT_FAILURE); + } + + if (odp_term_global(instance)) { + LOG_ERR("Error: term global\n"); + exit(EXIT_FAILURE); + } + + return ret; +} ----------------------------------------------------------------------- Summary of changes: test/common_plat/performance/.gitignore | 1 + test/common_plat/performance/Makefile.am | 7 +- test/common_plat/performance/odp_bench_packet.c | 1611 +++++++++++++++++++++++ 3 files changed, 1618 insertions(+), 1 deletion(-) create mode 100644 test/common_plat/performance/odp_bench_packet.c hooks/post-receive --

8 years, 5 months

[COMMIT] branch api-next updated. v1.12.0.0-240-g1588c49

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 discards 49c833125d8f9e072080579221532d0d4a978e6b (commit) discards 3875d6ebf690e07b69f11621caefab1afc58e100 (commit) discards b99095485be4ac14d16bef372b5c6521b396abaa (commit) discards f53fda91d2919eee33b5a177ef818be1092c890b (commit) discards 46e088c2f56d1463a598b4ac23308e19bf2b9031 (commit) discards 0b1dc8a9a69252ce56d13521284683faff0e3e35 (commit) discards 4132497ff67871d67c088c99b782cba10817bd28 (commit) discards cd83d5d1114a40abf554c59bd92c8a8199b10c7a (commit) discards 112209c3fc672aee4a3074aa784aefe00f32d250 (commit) discards 1837825e219b6bd62a3ecda2ed68873a958b8171 (commit) discards fda9a9e4887eff3f0526c7bcef5e29ff511cd4d8 (commit) discards 4aaa74fceecee7b1538546d0b67347569c1239c6 (commit) discards 4d0b7588251ed6a5de781f9220c3ace2831a68b2 (commit) discards 41febe9fe6ac762174579e86874d65ec8a2c5485 (commit) discards 6e09a7a90079b6789b83d9234306ac02a8f6d8da (commit) discards 6388e398998426c4b18cde893131d54630879bdf (commit) discards ca3b3950cc901d0e8db1f2bb9961c3bac9491c88 (commit) discards dd3031076b80cf6d8b9df6024c44555c77b150fb (commit) discards dfeba061509fb1451351ffb168a458e7d9ae4126 (commit) discards f20066c7949466430186cce217589910fa75fd61 (commit) discards 9fe4043f4cf402a4695e8c0e4887e87da60fcb33 (commit) discards 4d9de3d54c49ec69d2366a01ad5b2b987943a5c5 (commit) discards 970f7a4ae91932c49d1b9dc00bfa861f7f2a0197 (commit) discards 8ae51b0364e25e45eddb4cf2e175b269c0736436 (commit) discards 76543549b422a53dde44de5900071554f65aa212 (commit) discards 2c060a9d3b9f067f4cca2094be845e54392077ec (commit) discards b6e1fea7ef8a443579c8f197c96ca2acc7c0577d (commit) discards fe182fb0a97c1989747ae96b401a10d34c878480 (commit) discards 82c67c0b1755f4d4e0f5b1df2e6356150cca4166 (commit) discards 80a30e1513a9614622e08657b94dca56db9e250f (commit) discards 8ab727c5f3a5b5aa556a84e04870f1f3fe3a073b (commit) discards 2b36166d647c64aa545e6ecc23a1d464fcd2c3c0 (commit) discards d3a7028a5708506b63dc6a06846cd05c7552bbf4 (commit) discards 4208ef3e2ce9f6093ae540af7de20759849782b6 (commit) discards dba0f42c9e24d090b29df165f610fc0df051b018 (commit) discards 46b88467e667e26fed282b234c481a14fcecff62 (commit) discards f195caa92ef8457c2c670fd3449ea6521e7ad823 (commit) discards 7f97683b1afc4826825f0db0fcac40858892494a (commit) discards 52592157f25c9e2e3876dc3624cf91b1b71127ad (commit) discards 4a320c0af291c07f33b1a295f72704215169d562 (commit) discards f5cde8870a425d51d08df7a1b4b3fb1cf06406f0 (commit) discards c3830c3936b76faa423563bbd104e732120f9523 (commit) discards cc52f0675d1674a80cf1806dc8c1c4e3887afdd1 (commit) discards 4b698023210b7f742c053707ba131097b570276d (commit) discards 2eb3e87bc56b2a02cb10637e5ce3a7d1157472cf (commit) discards ba203281cfd10b88a5d5b8f143ea34d14d373b58 (commit) discards 527ee67cb434e5e7c8015fa8c7d15f2ac25b1d20 (commit) discards 101e8188088b91e8d85e0fef0d6674dae05c306e (commit) discards 343579dda50fcefd5498cfe146a438b8fdb3c065 (commit) discards b4e0a8b91a422cbf28e0406a5076025894103984 (commit) discards a611a514682dea61ca142b51a28194a39a286fa7 (commit) discards d345d75c975bd98f61bc2e04907b3e232d88083c (commit) discards 7e40217271ae17ce19abd873140439c51a525fb1 (commit) discards fbc400dc8c35c220cbb41531d12c933f7c4226d1 (commit) discards 6cef872afcac78016d095d426fa9f3d9055c3856 (commit) discards ffb22c37e4a483cc647c8ba8f4a9329fa83639aa (commit) discards 3fd85fb6f45d859e6f19eeadda69992858f06f22 (commit) discards e91877df47118468e940a58047d94fe4195e4b1e (commit) discards 4194d93ab8095ef850e332a1433d8d810b7418a1 (commit) discards f723bcef66945acb0738acc8a40b8ebd5851b84d (commit) discards fa4063b4104784bdc1c20fe3b519716e4413c245 (commit) discards 9c4d778148d514adf8586939123acdcdc022e8e5 (commit) discards b06ee329f944aeb7f3d03646aac384f88a00a7a5 (commit) discards a2676059469f61f1ffd58090b74f4dd975d172ac (commit) discards 39acf771084aa4f16b60a6bdf9e5f3bed4f88cd9 (commit) discards 0d6d0923b2dd4d3097ea992af76408fd4281d84e (commit) discards 2997a78f270cdb34c82f805f8103f660ed1bcdf2 (commit) discards bacd73a34768ce859f8136f29bda70bbccbdb45e (commit) discards 63ef9b3714c9410dd1b5a55e3bd50de49f23dfcb (commit) discards 4ee154864b47712a45cfdb23ea6c22b46bfb1abf (commit) discards 552e46339939933ee7ed305f1dda82ead362ece9 (commit) discards 1d61093f4ea7a9f62cc69e6fdb6fb82b246af817 (commit) discards 6d78d33df6d33ebe1b933383c4858df5e9f7f33b (commit) discards 4cf84d158adc7e84bed69ceac34bbbb3dee9587e (commit) discards 67abee1a4548878ccc93b57fbd84c3fe68147bf6 (commit) discards afb2ecf5e45e10b0e1258c85fc1b80f8ce447646 (commit) discards fe9c6cc8e5e88e068ee9f1f4dc29b7f32411f4d7 (commit) discards 6b5b78245c2ebbc0c907dba9809e9002c7214959 (commit) discards ba23aa731a85709a84ea0137a918b07cf4811fc2 (commit) discards 4b7e6b82f14ef2d09b91b1c197e84dbfe0e8a09b (commit) discards 683a975963d150e5dae12649cbd1abc003ee2c39 (commit) discards dcffa7faecf3bf4a66e6f5ce745bcde3a4f0b7ed (commit) discards c247659448bfd45c1bb648d7508f7db0b225b7b8 (commit) discards 95918aa496a22794af654c582830e2a2d8b914a7 (commit) discards 7bcd45812c020a9e67cf4d848e5bbef1384f58af (commit) discards 9e95d6a1a9025bfafb846b4d805b1dc146657a10 (commit) discards bd4a9492d862e0636fba99bd76aaa19952de2f44 (commit) discards d858987a1dfea90625389ab5a8e14379a23dbb52 (commit) discards 01ea9db19e2eb2f978d4fd22b1e341a741bb1e9c (commit) discards 0a0e4a684f8e5420295eda3df4fece6361b4d797 (commit) discards c6dc829d0c6a54a08756e13e2f3388f0bda61245 (commit) discards a296693d3dbbe98a5616406d6535dee85cbd31ba (commit) discards ec7a8e0fabe2269cf824ab809ad52a8763739be1 (commit) discards 02c46a3a671bca6de5159a59be45663bca516753 (commit) discards 123327606c2dd95a6a85c80e74ad172932195631 (commit) discards 936ce9f30a85285f70e26038eb5ea8637622fea2 (commit) discards ac2d233f2bcfb8d70fa005ae8fa19cce41b4a238 (commit) discards 97f2672e48ea08abd00ed7f3b1fd8420a217779c (commit) discards d9615289bf6f60bd3a04f8138d5b487efda96a49 (commit) discards b9877d54ec4c2259dec17751f6580f110fd447a5 (commit) discards ac563d15b95d884764ffa2f48eedce6f5b408fca (commit) discards 279ecc54b69ad1621fbba837bee31adcc9fd704a (commit) discards ad7f8f4ea11a8e40d853cd9b2b0bc3e6f7876a8b (commit) discards 50cfbff244a1fa29314520eb9ca9bdf5df445df6 (commit) discards 234dd2f623d73b069e43282baf96b48473d0ef1c (commit) discards b93fd7af775a04c50a064a241d82ba3b7bf999f7 (commit) discards 1e1312c15e96be77eccc0fb8e3aa35d4c7da72f6 (commit) discards eda2ce7c6d9998155edde42617501cbaea5e03f5 (commit) discards 9b648c4cd201ff8fbcbaf12512482b0a8f952d8f (commit) discards f62c9aa3f3f48080a61a1e71cd649f1d65539ff5 (commit) discards 244916315fdcb665f66b4f235782feee26a53c89 (commit) discards e5d2edccc685fcde88793f5514d1fdb2654ecfa4 (commit) discards 52553fa3972109a47e948321236dcabf29503f61 (commit) discards 4b751b4dd7e2f000d2ed0268d51878c5ff982c2b (commit) discards 21dad81b51443c49dc51ede63516f4a434e217cc (commit) discards 474dac39b8d4ad7f2ac3768887e36610188c16c2 (commit) discards b8c6689e4c81277067a2dd5f30598e0ddc7dc2c5 (commit) discards ff56734fa58db5043a6bb358611cdc2a1c5de4a3 (commit) discards fd86c7fd19820e21c182e2c0e043331e6aab6282 (commit) discards 4a58145d0ca4e62ff41b052ed800acee7d0a97e1 (commit) discards b2d4275c2df6a7fcd9796fafed74b59292cee26e (commit) This update discarded existing revisions and left the branch pointing at a previous point in the repository history. * -- * -- N (1588c49a0bf0332512d5e08e1feaad5e4005df31) \ O -- O -- O (49c833125d8f9e072080579221532d0d4a978e6b) 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: CHANGELOG | 178 -------- configure.ac | 6 +- platform/linux-generic/Makefile.am | 5 - .../linux-generic/include/odp_config_internal.h | 6 +- platform/linux-generic/odp_packet.c | 12 - platform/linux-generic/odp_schedule.c | 21 - .../validation/api/crypto/odp_crypto_test_inp.c | 53 --- test/common_plat/validation/api/packet/packet.c | 477 --------------------- 8 files changed, 8 insertions(+), 750 deletions(-) hooks/post-receive --

8 years, 5 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

git-lng-odp