git-lng-odp

git-lng-odp@lists.linaro.org

1 participants
1239 discussions

[COMMIT] branch api-next updated. v1.16.0.0-558-ga1312ccf

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 a1312ccf383637b5711c0f8c4bab6f43e63325dc (commit) via 4da1cb6040dece2ece108cd383ab4212e7f7fe85 (commit) via f6d3bc302664e2c4121e798e86758d93fdb156f5 (commit) via 6333b39f1bd5ebe184780260566b84340104efeb (commit) via 78ced32df325dac7ff58ff28684fdb941f5ec1b3 (commit) via fbb6a7feba146acb1495fbdcd93e1b691a7363a0 (commit) via 23b6eee83bc5717f4797441bddbb035e3388ff10 (commit) via 0ec5bc6b5c3a178d7b316bdf9e18db452ba5ed58 (commit) via 9c389e1785fd000203eb2198f9fc2778be8f83e6 (commit) from 3d254a24a1a911aad72f0535412644824872307f (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 a1312ccf383637b5711c0f8c4bab6f43e63325dc Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Fri Oct 20 11:08:52 2017 +0300 validation: packet: add call to ones complement Call ones complement function. Actual validation of correctness of the sum is to be done, when an implementation exist which sets the sum on packet input. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/packet/packet.c b/test/validation/api/packet/packet.c index f96347b5..ce4d66c0 100644 --- a/test/validation/api/packet/packet.c +++ b/test/validation/api/packet/packet.c @@ -504,6 +504,7 @@ void packet_test_basic_metadata(void) { odp_packet_t pkt = test_packet; odp_time_t ts; + odp_packet_data_range_t range; CU_ASSERT_PTR_NOT_NULL(odp_packet_head(pkt)); CU_ASSERT_PTR_NOT_NULL(odp_packet_data(pkt)); @@ -513,6 +514,11 @@ void packet_test_basic_metadata(void) CU_ASSERT(odp_packet_input(pkt) == ODP_PKTIO_INVALID); CU_ASSERT(odp_packet_input_index(pkt) < 0); + /* Packet was not received from a packet IO, shouldn't have ones + * complement calculated. */ + odp_packet_ones_comp(pkt, &range); + CU_ASSERT(range.length == 0); + odp_packet_flow_hash_set(pkt, UINT32_MAX); CU_ASSERT(odp_packet_has_flow_hash(pkt)); CU_ASSERT(odp_packet_flow_hash(pkt) == UINT32_MAX); diff --git a/test/validation/api/pktio/pktio.c b/test/validation/api/pktio/pktio.c index 72070735..004379cd 100644 --- a/test/validation/api/pktio/pktio.c +++ b/test/validation/api/pktio/pktio.c @@ -48,6 +48,9 @@ static int num_ifaces; interface that just become up.*/ static bool wait_for_network; +/* Dummy global variable to avoid compiler optimizing out API calls */ +static volatile uint64_t test_pktio_dummy_u64; + /** local container for pktio attributes */ typedef struct { const char *name; @@ -661,10 +664,24 @@ static void pktio_txrx_multi(pktio_info_t *pktio_a, pktio_info_t *pktio_b, CU_ASSERT(num_rx == num_pkts); for (i = 0; i < num_rx; ++i) { - CU_ASSERT_FATAL(rx_pkt[i] != ODP_PACKET_INVALID); - CU_ASSERT(odp_packet_input(rx_pkt[i]) == pktio_b->id); - CU_ASSERT(odp_packet_has_error(rx_pkt[i]) == 0); - odp_packet_free(rx_pkt[i]); + odp_packet_data_range_t range; + uint16_t sum; + odp_packet_t pkt = rx_pkt[i]; + + CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID); + CU_ASSERT(odp_packet_input(pkt) == pktio_b->id); + CU_ASSERT(odp_packet_has_error(pkt) == 0); + + /* Dummy read to ones complement in case pktio has set it */ + sum = odp_packet_ones_comp(pkt, &range); + if (range.length > 0) + test_pktio_dummy_u64 += sum; + + /* Dummy read to flow hash in case pktio has set it */ + if (odp_packet_has_flow_hash(pkt)) + test_pktio_dummy_u64 += odp_packet_flow_hash(pkt); + + odp_packet_free(pkt); } } commit 4da1cb6040dece2ece108cd383ab4212e7f7fe85 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Thu Oct 19 17:07:33 2017 +0300 linux-gen: packet: dummy ones complement implementation Added dummy implementation of ones complement calls. Linux generic implementation does not calculate the sum for all incoming packets as it would be wasteful in SW. It's better to wait until application asks it with odp_chksum_ones_comp16(). Later on, the sum could be stored into the packet header, if we found a way to get it from the HW. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index 0bba3098..74e3ff2b 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -1284,6 +1284,14 @@ int odp_packet_l4_offset_set(odp_packet_t pkt, uint32_t offset) return 0; } +uint16_t odp_packet_ones_comp(odp_packet_t pkt, odp_packet_data_range_t *range) +{ + (void)pkt; + range->length = 0; + range->offset = 0; + return 0; +} + void odp_packet_flow_hash_set(odp_packet_t pkt, uint32_t flow_hash) { odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); commit f6d3bc302664e2c4121e798e86758d93fdb156f5 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Thu Oct 19 16:48:45 2017 +0300 api: packet: ones complement sum Added packet metadata for ones complement sum over packet data. Some NICs calculate the sum during packet input (at least for IP fragments) and store the value into the packet descriptor. This offloads L4 checksum calculation for IP fragments as SW does not need sum all payload data, but just combine pre-calculated sums from packet descriptors and remove extra header fields from the sum. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/include/odp/api/spec/packet.h b/include/odp/api/spec/packet.h index da522c6c..b897c9d3 100644 --- a/include/odp/api/spec/packet.h +++ b/include/odp/api/spec/packet.h @@ -1556,6 +1556,26 @@ void odp_packet_l3_chksum_insert(odp_packet_t pkt, int insert); */ void odp_packet_l4_chksum_insert(odp_packet_t pkt, int insert); +/** + * Ones' complement sum of packet data + * + * Returns 16-bit ones' complement sum that was calculated over a portion of + * packet data during a packet processing operation (e.g. packet input or + * IPSEC offload). The data range is output with 'range' parameter, and usually + * includes IP payload (L4 headers and payload). When 'range.length' is zero, + * the sum has not been calculated. In case of odd number of bytes, + * calculation uses a zero byte as padding at the end. The sum may be used as + * part of e.g. UDP/TCP checksum checking, especially with IP fragments. + * + * @param pkt Packet handle + * @param[out] range Data range of the sum (output). The calculation started + * from range.offset and included range.length bytes. When + * range.length is zero, the sum has not been calculated. + * + * @return Ones' complement sum over the data range + */ +uint16_t odp_packet_ones_comp(odp_packet_t pkt, odp_packet_data_range_t *range); + /** * Packet flow hash value * commit 6333b39f1bd5ebe184780260566b84340104efeb Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Wed Nov 8 14:40:13 2017 +0200 validation: packet: add parse tests Added validation tests for the new packet parse APIs. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/packet/packet.c b/test/validation/api/packet/packet.c index 37550a2f..f96347b5 100644 --- a/test/validation/api/packet/packet.c +++ b/test/validation/api/packet/packet.c @@ -10,6 +10,7 @@ #include <odp_api.h> #include <odp_cunit_common.h> +#include <test_packet_parser.h> #include "packet.h" /* Reserve some tailroom for tests */ @@ -2390,6 +2391,201 @@ void packet_test_ref(void) odp_packet_free(ref_pkt[1]); } +void packet_test_parse(void) +{ + odp_pool_t pool; + odp_pool_param_t param; + odp_packet_parse_param_t parse; + int ret, num_test_pkt, i; + uint32_t len, max_len; + int num_pkt = 10; + odp_packet_t pkt[num_pkt]; + uint32_t offset[num_pkt]; + uint32_t test_pkt_len[] = {sizeof(test_packet_arp), + sizeof(test_packet_ipv4_icmp), + sizeof(test_packet_ipv4_tcp), + sizeof(test_packet_ipv4_udp), + sizeof(test_packet_vlan_ipv4_udp), + sizeof(test_packet_vlan_qinq_ipv4_udp), + sizeof(test_packet_ipv6_icmp), + sizeof(test_packet_ipv6_tcp), + sizeof(test_packet_ipv6_udp), + sizeof(test_packet_vlan_ipv6_udp) }; + + num_test_pkt = sizeof(test_pkt_len) / sizeof(uint32_t); + max_len = 0; + + for (i = 0; i < num_test_pkt; i++) { + if (max_len < test_pkt_len[i]) + max_len = test_pkt_len[i]; + } + + odp_pool_param_init(&param); + + param.type = ODP_POOL_PACKET; + param.pkt.seg_len = max_len; + param.pkt.len = max_len; + param.pkt.num = 100; + + pool = odp_pool_create("test_parse_pool", &param); + CU_ASSERT_FATAL(pool != ODP_POOL_INVALID); + + /* Ethernet/IPv4/UDP */ + len = sizeof(test_packet_ipv4_udp); + ret = odp_packet_alloc_multi(pool, len, pkt, num_pkt); + CU_ASSERT_FATAL(ret == num_pkt); + + for (i = 0; i < num_pkt; i++) { + ret = odp_packet_copy_from_mem(pkt[i], 0, len, + test_packet_ipv4_udp); + CU_ASSERT(ret == 0); + + offset[i] = 0; + } + + parse.proto = ODP_PROTO_ETH; + parse.layer = ODP_PROTO_LAYER_ALL; + parse.all_check = 0; + + CU_ASSERT(odp_packet_parse(pkt[0], offset[0], &parse) == 0); + CU_ASSERT(odp_packet_parse_multi(&pkt[1], &offset[1], + num_pkt - 1, &parse) == (num_pkt - 1)); + + for (i = 0; i < num_pkt; i++) { + CU_ASSERT(odp_packet_has_eth(pkt[i])); + CU_ASSERT(odp_packet_has_ipv4(pkt[i])); + CU_ASSERT(odp_packet_has_udp(pkt[i])); + CU_ASSERT(!odp_packet_has_ipv6(pkt[i])); + CU_ASSERT(!odp_packet_has_tcp(pkt[i])); + } + + odp_packet_free_multi(pkt, num_pkt); + + /* IPv4/UDP */ + len = sizeof(test_packet_ipv4_udp); + ret = odp_packet_alloc_multi(pool, len, pkt, num_pkt); + CU_ASSERT_FATAL(ret == num_pkt); + + for (i = 0; i < num_pkt; i++) { + ret = odp_packet_copy_from_mem(pkt[i], 0, len, + test_packet_ipv4_udp); + CU_ASSERT(ret == 0); + + offset[i] = 14; + } + + parse.proto = ODP_PROTO_IPV4; + parse.layer = ODP_PROTO_LAYER_L4; + parse.all_check = 0; + + CU_ASSERT(odp_packet_parse(pkt[0], offset[0], &parse) == 0); + CU_ASSERT(odp_packet_parse_multi(&pkt[1], &offset[1], + num_pkt - 1, &parse) == (num_pkt - 1)); + + for (i = 0; i < num_pkt; i++) { + CU_ASSERT(odp_packet_has_ipv4(pkt[i])); + CU_ASSERT(odp_packet_has_udp(pkt[i])); + CU_ASSERT(!odp_packet_has_ipv6(pkt[i])); + CU_ASSERT(!odp_packet_has_tcp(pkt[i])); + } + + odp_packet_free_multi(pkt, num_pkt); + + /* Ethernet/IPv4/TCP */ + len = sizeof(test_packet_ipv4_tcp); + ret = odp_packet_alloc_multi(pool, len, pkt, num_pkt); + CU_ASSERT_FATAL(ret == num_pkt); + + for (i = 0; i < num_pkt; i++) { + ret = odp_packet_copy_from_mem(pkt[i], 0, len, + test_packet_ipv4_tcp); + CU_ASSERT(ret == 0); + + offset[i] = 0; + } + + parse.proto = ODP_PROTO_ETH; + parse.layer = ODP_PROTO_LAYER_L4; + parse.all_check = 0; + + CU_ASSERT(odp_packet_parse(pkt[0], offset[0], &parse) == 0); + CU_ASSERT(odp_packet_parse_multi(&pkt[1], &offset[1], + num_pkt - 1, &parse) == (num_pkt - 1)); + + for (i = 0; i < num_pkt; i++) { + CU_ASSERT(odp_packet_has_ipv4(pkt[i])); + CU_ASSERT(odp_packet_has_tcp(pkt[i])); + CU_ASSERT(!odp_packet_has_ipv6(pkt[i])); + CU_ASSERT(!odp_packet_has_udp(pkt[i])); + } + + odp_packet_free_multi(pkt, num_pkt); + + /* Ethernet/IPv6/UDP */ + len = sizeof(test_packet_ipv6_udp); + ret = odp_packet_alloc_multi(pool, len, pkt, num_pkt); + CU_ASSERT_FATAL(ret == num_pkt); + + for (i = 0; i < num_pkt; i++) { + ret = odp_packet_copy_from_mem(pkt[i], 0, len, + test_packet_ipv6_udp); + CU_ASSERT(ret == 0); + + offset[i] = 0; + } + + parse.proto = ODP_PROTO_ETH; + parse.layer = ODP_PROTO_LAYER_L4; + parse.all_check = 0; + + CU_ASSERT(odp_packet_parse(pkt[0], offset[0], &parse) == 0); + CU_ASSERT(odp_packet_parse_multi(&pkt[1], &offset[1], + num_pkt - 1, &parse) == (num_pkt - 1)); + + for (i = 0; i < num_pkt; i++) { + CU_ASSERT(odp_packet_has_eth(pkt[i])); + CU_ASSERT(odp_packet_has_ipv6(pkt[i])); + CU_ASSERT(odp_packet_has_udp(pkt[i])); + CU_ASSERT(!odp_packet_has_ipv4(pkt[i])); + CU_ASSERT(!odp_packet_has_tcp(pkt[i])); + } + + odp_packet_free_multi(pkt, num_pkt); + + /* Ethernet/IPv6/TCP */ + len = sizeof(test_packet_ipv6_tcp); + ret = odp_packet_alloc_multi(pool, len, pkt, num_pkt); + CU_ASSERT_FATAL(ret == num_pkt); + + for (i = 0; i < num_pkt; i++) { + ret = odp_packet_copy_from_mem(pkt[i], 0, len, + test_packet_ipv6_tcp); + CU_ASSERT(ret == 0); + + offset[i] = 0; + } + + parse.proto = ODP_PROTO_ETH; + parse.layer = ODP_PROTO_LAYER_ALL; + parse.all_check = 0; + + CU_ASSERT(odp_packet_parse(pkt[0], offset[0], &parse) == 0); + CU_ASSERT(odp_packet_parse_multi(&pkt[1], &offset[1], + num_pkt - 1, &parse) == (num_pkt - 1)); + + for (i = 0; i < num_pkt; i++) { + CU_ASSERT(odp_packet_has_eth(pkt[i])); + CU_ASSERT(odp_packet_has_ipv6(pkt[i])); + CU_ASSERT(odp_packet_has_tcp(pkt[i])); + CU_ASSERT(!odp_packet_has_ipv4(pkt[i])); + CU_ASSERT(!odp_packet_has_udp(pkt[i])); + } + + odp_packet_free_multi(pkt, num_pkt); + + odp_pool_destroy(pool); +} + odp_testinfo_t packet_suite[] = { ODP_TEST_INFO(packet_test_alloc_free), ODP_TEST_INFO(packet_test_alloc_free_multi), @@ -2420,6 +2616,7 @@ odp_testinfo_t packet_suite[] = { ODP_TEST_INFO(packet_test_align), ODP_TEST_INFO(packet_test_offset), ODP_TEST_INFO(packet_test_ref), + ODP_TEST_INFO(packet_test_parse), ODP_TEST_INFO_NULL, }; diff --git a/test/validation/api/packet/packet.h b/test/validation/api/packet/packet.h index 783b7a11..4e99679e 100644 --- a/test/validation/api/packet/packet.h +++ b/test/validation/api/packet/packet.h @@ -39,6 +39,7 @@ void packet_test_extend_ref(void); void packet_test_align(void); void packet_test_offset(void); void packet_test_ref(void); +void packet_test_parse(void); /* test arrays: */ extern odp_testinfo_t packet_suite[]; commit 78ced32df325dac7ff58ff28684fdb941f5ec1b3 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Wed Nov 8 13:52:13 2017 +0200 validation: pktio: add parser test packet header Moved parser test packet definitions into a new, common header file. The same test packets can be used in various test suites. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/common/Makefile.am b/test/common/Makefile.am index a3419e0f..fbd5d52f 100644 --- a/test/common/Makefile.am +++ b/test/common/Makefile.am @@ -14,5 +14,5 @@ libthrmask_common_la_CFLAGS = $(AM_CFLAGS) -DTEST_THRMASK endif -noinst_HEADERS = test_debug.h +noinst_HEADERS = test_debug.h test_packet_parser.h dist_test_SCRIPTS = run-test.sh diff --git a/test/validation/api/pktio/parser.h b/test/common/test_packet_parser.h similarity index 88% copy from test/validation/api/pktio/parser.h copy to test/common/test_packet_parser.h index 5cc2b988..918e0ad6 100644 --- a/test/validation/api/pktio/parser.h +++ b/test/common/test_packet_parser.h @@ -4,29 +4,20 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef _ODP_TEST_PARSER_H_ -#define _ODP_TEST_PARSER_H_ - -#include <odp_cunit_common.h> - -/* test functions: */ -void parser_test_arp(void); -void parser_test_ipv4_icmp(void); -void parser_test_ipv4_tcp(void); -void parser_test_ipv4_udp(void); -void parser_test_vlan_ipv4_udp(void); -void parser_test_vlan_qinq_ipv4_udp(void); -void parser_test_ipv6_icmp(void); -void parser_test_ipv6_tcp(void); -void parser_test_ipv6_udp(void); -void parser_test_vlan_ipv6_udp(void); - -/* test array init/term functions: */ -int parser_suite_term(void); -int parser_suite_init(void); - -/* test arrays: */ -extern odp_testinfo_t parser_suite[]; +/** + * @file + * + * Test packets for parser tests + */ + +#ifndef TEST_PACKET_PARSER_H_ +#define TEST_PACKET_PARSER_H_ + +#include <stdint.h> + +#ifdef __cplusplus +extern "C" { +#endif /* Test packets without CRC */ @@ -177,4 +168,8 @@ static const uint8_t test_packet_vlan_ipv6_udp[] = { 0x9B, 0x68 }; +#ifdef __cplusplus +} +#endif + #endif diff --git a/test/validation/api/pktio/parser.c b/test/validation/api/pktio/parser.c index dd293a44..66e726d0 100644 --- a/test/validation/api/pktio/parser.c +++ b/test/validation/api/pktio/parser.c @@ -8,6 +8,7 @@ #include <odp_api.h> #include <odp_cunit_common.h> +#include <test_packet_parser.h> #include <odp/helper/odph_api.h> diff --git a/test/validation/api/pktio/parser.h b/test/validation/api/pktio/parser.h index 5cc2b988..d95ecca1 100644 --- a/test/validation/api/pktio/parser.h +++ b/test/validation/api/pktio/parser.h @@ -28,153 +28,4 @@ int parser_suite_init(void); /* test arrays: */ extern odp_testinfo_t parser_suite[]; -/* Test packets without CRC */ - -/** - * ARP request - */ -static const uint8_t test_packet_arp[] = { - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, - 0x09, 0x00, 0x04, 0x00, 0x08, 0x06, 0x00, 0x01, - 0x08, 0x00, 0x06, 0x04, 0x00, 0x01, 0x00, 0x00, - 0x09, 0x00, 0x04, 0x00, 0xC0, 0xA8, 0x01, 0x01, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0xA8, - 0x01, 0x02, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, - 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, - 0x0E, 0x0F, 0x10, 0x11 -}; - -/** - * ICMPv4 echo reply - */ -static const uint8_t test_packet_ipv4_icmp[] = { - 0x00, 0x00, 0x09, 0x00, 0x05, 0x00, 0x00, 0x00, - 0x09, 0x00, 0x04, 0x00, 0x08, 0x00, 0x45, 0x00, - 0x00, 0x2E, 0x00, 0x00, 0x00, 0x00, 0x40, 0x01, - 0xF3, 0x7B, 0xC0, 0xA8, 0x01, 0x01, 0xC4, 0xA8, - 0x01, 0x02, 0x00, 0x00, 0xB7, 0xAB, 0x00, 0x01, - 0x00, 0x02, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, - 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, - 0x0E, 0x0F, 0x10, 0x11 -}; - -/** - * IPv4 TCP - */ -static const uint8_t test_packet_ipv4_tcp[] = { - 0x00, 0x00, 0x09, 0x00, 0x05, 0x00, 0x00, 0x00, - 0x09, 0x00, 0x04, 0x00, 0x08, 0x00, 0x45, 0x00, - 0x00, 0x2E, 0x00, 0x00, 0x00, 0x00, 0x40, 0x06, - 0xF3, 0x76, 0xC0, 0xA8, 0x01, 0x02, 0xC4, 0xA8, - 0x01, 0x01, 0x04, 0xD2, 0x10, 0xE1, 0x00, 0x00, - 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x50, 0x00, - 0x00, 0x00, 0x0C, 0xCC, 0x00, 0x00, 0x00, 0x01, - 0x02, 0x03, 0x04, 0x05 -}; - -/** - * IPv4 UDP - */ -static const uint8_t test_packet_ipv4_udp[] = { - 0x00, 0x00, 0x09, 0x00, 0x05, 0x00, 0x00, 0x00, - 0x09, 0x00, 0x04, 0x00, 0x08, 0x00, 0x45, 0x00, - 0x00, 0x2E, 0x00, 0x00, 0x00, 0x00, 0x40, 0x11, - 0xF3, 0x6B, 0xC0, 0xA8, 0x01, 0x02, 0xC4, 0xA8, - 0x01, 0x01, 0x00, 0x3F, 0x00, 0x3F, 0x00, 0x1A, - 0x2F, 0x97, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, - 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, - 0x0E, 0x0F, 0x10, 0x11 -}; - -/** - * VLAN IPv4 UDP - * - ID: 23 - */ -static const uint8_t test_packet_vlan_ipv4_udp[] = { - 0x00, 0x00, 0x09, 0x00, 0x05, 0x00, 0x00, 0x00, - 0x09, 0x00, 0x04, 0x00, 0x81, 0x00, 0x00, 0x17, - 0x08, 0x00, 0x45, 0x00, 0x00, 0x2A, 0x00, 0x00, - 0x00, 0x00, 0x40, 0x11, 0xF3, 0x6F, 0xC0, 0xA8, - 0x01, 0x02, 0xC4, 0xA8, 0x01, 0x01, 0x00, 0x3F, - 0x00, 0x3F, 0x00, 0x16, 0x4D, 0xBF, 0x00, 0x01, - 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, - 0x0A, 0x0B, 0x0C, 0x0D -}; - -/** - * VLAN Q-in-Q IPv4 UDP - * - Outer: Tag Protocol ID 0x88a8, VLAN ID 1 - * - Inner: Tag Protocol ID 0x8100, VLAN ID 2 - */ -static const uint8_t test_packet_vlan_qinq_ipv4_udp[] = { - 0x00, 0x00, 0x09, 0x00, 0x05, 0x00, 0x00, 0x00, - 0x09, 0x00, 0x04, 0x00, 0x88, 0xA8, 0x00, 0x01, - 0x81, 0x00, 0x00, 0x02, 0x08, 0x00, 0x45, 0x00, - 0x00, 0x26, 0x00, 0x00, 0x00, 0x00, 0x40, 0x11, - 0xF3, 0x73, 0xC0, 0xA8, 0x01, 0x02, 0xC4, 0xA8, - 0x01, 0x01, 0x00, 0x3F, 0x00, 0x3F, 0x00, 0x12, - 0x63, 0xDF, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, - 0x06, 0x07, 0x08, 0x09 -}; - -/** - * ICMPv6 echo request - */ -static const uint8_t test_packet_ipv6_icmp[] = { - 0x00, 0x00, 0x09, 0x00, 0x05, 0x00, 0x00, 0x00, - 0x09, 0x00, 0x04, 0x00, 0x86, 0xDD, 0x60, 0x30, - 0x00, 0x00, 0x00, 0x08, 0x3A, 0xFF, 0xFE, 0x80, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, - 0x09, 0xFF, 0xFE, 0x00, 0x04, 0x00, 0x35, 0x55, - 0x55, 0x55, 0x66, 0x66, 0x66, 0x66, 0x77, 0x77, - 0x77, 0x77, 0x88, 0x88, 0x88, 0x88, 0x80, 0x00, - 0x1B, 0xC2, 0x00, 0x01, 0x00, 0x02 -}; - -/** - * IPv6 TCP - */ -static const uint8_t test_packet_ipv6_tcp[] = { - 0x00, 0x00, 0x09, 0x00, 0x05, 0x00, 0x00, 0x00, - 0x09, 0x00, 0x04, 0x00, 0x86, 0xDD, 0x60, 0x30, - 0x00, 0x00, 0x00, 0x14, 0x06, 0xFF, 0xFE, 0x80, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, - 0x09, 0xFF, 0xFE, 0x00, 0x04, 0x00, 0x35, 0x55, - 0x55, 0x55, 0x66, 0x66, 0x66, 0x66, 0x77, 0x77, - 0x77, 0x77, 0x88, 0x88, 0x88, 0x88, 0x04, 0xD2, - 0x10, 0xE1, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, - 0x00, 0x02, 0x50, 0x00, 0x00, 0x00, 0x36, 0x37, - 0x00, 0x00 -}; - -/** - * IPv6 UDP - */ -static const uint8_t test_packet_ipv6_udp[] = { - 0x00, 0x00, 0x09, 0x00, 0x05, 0x00, 0x00, 0x00, - 0x09, 0x00, 0x04, 0x00, 0x86, 0xDD, 0x60, 0x30, - 0x00, 0x00, 0x00, 0x08, 0x11, 0xFF, 0xFE, 0x80, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, - 0x09, 0xFF, 0xFE, 0x00, 0x04, 0x00, 0x35, 0x55, - 0x55, 0x55, 0x66, 0x66, 0x66, 0x66, 0x77, 0x77, - 0x77, 0x77, 0x88, 0x88, 0x88, 0x88, 0x00, 0x3F, - 0x00, 0x3F, 0x00, 0x08, 0x9B, 0x68 -}; - -/** - * VLAN IPv6 - * - ID: 23 - */ -static const uint8_t test_packet_vlan_ipv6_udp[] = { - 0x00, 0x00, 0x09, 0x00, 0x05, 0x00, 0x00, 0x00, - 0x09, 0x00, 0x04, 0x00, 0x81, 0x00, 0x00, 0x17, - 0x86, 0xDD, 0x60, 0x30, 0x00, 0x00, 0x00, 0x08, - 0x11, 0xFF, 0xFE, 0x80, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x02, 0x00, 0x09, 0xFF, 0xFE, 0x00, - 0x04, 0x00, 0x35, 0x55, 0x55, 0x55, 0x66, 0x66, - 0x66, 0x66, 0x77, 0x77, 0x77, 0x77, 0x88, 0x88, - 0x88, 0x88, 0x00, 0x3F, 0x00, 0x3F, 0x00, 0x08, - 0x9B, 0x68 -}; - #endif commit fbb6a7feba146acb1495fbdcd93e1b691a7363a0 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Wed Nov 8 13:31:27 2017 +0200 linux-gen: packet: add parse API Implemented new API functions for packet parsing. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/include/odp_packet_internal.h b/platform/linux-generic/include/odp_packet_internal.h index fed562aa..97efcec4 100644 --- a/platform/linux-generic/include/odp_packet_internal.h +++ b/platform/linux-generic/include/odp_packet_internal.h @@ -322,8 +322,7 @@ static inline void packet_set_ts(odp_packet_hdr_t *pkt_hdr, odp_time_t *ts) } int packet_parse_common(packet_parser_t *pkt_hdr, const uint8_t *ptr, - uint32_t pkt_len, uint32_t seg_len, - odp_pktio_parser_layer_t layer); + uint32_t pkt_len, uint32_t seg_len, int layer); int _odp_cls_parse(odp_packet_hdr_t *pkt_hdr, const uint8_t *parseptr); diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index 3b2fac21..0bba3098 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -2098,8 +2098,7 @@ static inline int packet_parse_common_l3_l4(packet_parser_t *prs, const uint8_t *parseptr, uint32_t offset, uint32_t frame_len, uint32_t seg_len, - odp_pktio_parser_layer_t layer, - uint16_t ethtype) + int layer, uint16_t ethtype) { uint8_t ip_proto; @@ -2199,7 +2198,7 @@ int packet_parse_common_l3_l4(packet_parser_t *prs, const uint8_t *parseptr, */ int packet_parse_common(packet_parser_t *prs, const uint8_t *ptr, uint32_t frame_len, uint32_t seg_len, - odp_pktio_parser_layer_t layer) + int layer) { uint32_t offset; uint16_t ethtype; @@ -2252,6 +2251,63 @@ int packet_parse_l3_l4(odp_packet_hdr_t *pkt_hdr, layer, ethtype); } +int odp_packet_parse(odp_packet_t pkt, uint32_t offset, + const odp_packet_parse_param_t *param) +{ + odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); + void *data; + uint32_t seg_len; + uint32_t packet_len = pkt_hdr->frame_len; + odp_proto_t proto = param->proto; + odp_proto_layer_t layer = param->layer; + int ret; + uint16_t ethtype; + + if (proto == ODP_PROTO_NONE || layer == ODP_PROTO_LAYER_NONE) + return -1; + + data = packet_map(pkt_hdr, offset, &seg_len, NULL); + + if (data == NULL) + return -1; + + packet_parse_reset(pkt_hdr); + + if (proto == ODP_PROTO_ETH) { + ret = packet_parse_common(&pkt_hdr->p, data, packet_len, + seg_len, layer); + + if (ret) + return -1; + } else { + if (proto == ODP_PROTO_IPV4) + ethtype = _ODP_ETHTYPE_IPV4; + else + ethtype = _ODP_ETHTYPE_IPV6; + + ret = packet_parse_common_l3_l4(&pkt_hdr->p, data, offset, + packet_len, seg_len, + layer, ethtype); + + if (ret) + return -1; + } + + return 0; +} + +int odp_packet_parse_multi(const odp_packet_t pkt[], const uint32_t offset[], + int num, const odp_packet_parse_param_t *param) +{ + int i; + + for (i = 0; i < num; i++) + if (odp_packet_parse(pkt[i], offset[i], param)) + return i; + + return num; +} + uint64_t odp_packet_to_u64(odp_packet_t hdl) { return _odp_pri(hdl); commit 23b6eee83bc5717f4797441bddbb035e3388ff10 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Fri Nov 3 14:19:52 2017 +0200 api: ipsec: use common protocol layer enum Use common values between ipsec parse and packet protocol layer enums. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/include/odp/api/spec/ipsec.h b/include/odp/api/spec/ipsec.h index 26e852fc..4a33af8e 100644 --- a/include/odp/api/spec/ipsec.h +++ b/include/odp/api/spec/ipsec.h @@ -74,19 +74,19 @@ typedef enum odp_ipsec_op_mode_t { */ typedef enum odp_ipsec_proto_layer_t { /** No layers */ - ODP_IPSEC_LAYER_NONE = 0, + ODP_IPSEC_LAYER_NONE = ODP_PROTO_LAYER_NONE, /** Layer L2 protocols (Ethernet, VLAN, etc) */ - ODP_IPSEC_LAYER_L2, + ODP_IPSEC_LAYER_L2 = ODP_PROTO_LAYER_L2, /** Layer L3 protocols (IPv4, IPv6, ICMP, IPSEC, etc) */ - ODP_IPSEC_LAYER_L3, + ODP_IPSEC_LAYER_L3 = ODP_PROTO_LAYER_L3, /** Layer L4 protocols (UDP, TCP, SCTP) */ - ODP_IPSEC_LAYER_L4, + ODP_IPSEC_LAYER_L4 = ODP_PROTO_LAYER_L4, /** All layers */ - ODP_IPSEC_LAYER_ALL + ODP_IPSEC_LAYER_ALL = ODP_PROTO_LAYER_ALL } odp_ipsec_proto_layer_t; commit 0ec5bc6b5c3a178d7b316bdf9e18db452ba5ed58 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Fri Nov 3 13:48:38 2017 +0200 api: pktio: use common protocol layer enum Use common values between pktio parser layer and packet protocol layer enums. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/include/odp/api/spec/packet_io.h b/include/odp/api/spec/packet_io.h index 52af646a..6e4f8810 100644 --- a/include/odp/api/spec/packet_io.h +++ b/include/odp/api/spec/packet_io.h @@ -23,6 +23,7 @@ extern "C" { #include <odp/api/packet_io_stats.h> #include <odp/api/queue.h> #include <odp/api/time.h> +#include <odp/api/packet.h> /** @defgroup odp_packet_io ODP PACKET IO * Operations on a packet Input/Output interface. @@ -381,19 +382,19 @@ typedef union odp_pktout_config_opt_t { */ typedef enum odp_pktio_parser_layer_t { /** No layers */ - ODP_PKTIO_PARSER_LAYER_NONE = 0, + ODP_PKTIO_PARSER_LAYER_NONE = ODP_PROTO_LAYER_NONE, /** Layer L2 protocols (Ethernet, VLAN, ARP, etc) */ - ODP_PKTIO_PARSER_LAYER_L2, + ODP_PKTIO_PARSER_LAYER_L2 = ODP_PROTO_LAYER_L2, /** Layer L3 protocols (IPv4, IPv6, ICMP, IPsec, etc) */ - ODP_PKTIO_PARSER_LAYER_L3, + ODP_PKTIO_PARSER_LAYER_L3 = ODP_PROTO_LAYER_L3, /** Layer L4 protocols (UDP, TCP, SCTP) */ - ODP_PKTIO_PARSER_LAYER_L4, + ODP_PKTIO_PARSER_LAYER_L4 = ODP_PROTO_LAYER_L4, /** All layers */ - ODP_PKTIO_PARSER_LAYER_ALL + ODP_PKTIO_PARSER_LAYER_ALL = ODP_PROTO_LAYER_ALL } odp_pktio_parser_layer_t; diff --git a/platform/linux-generic/include/odp/api/plat/packet_inlines.h b/platform/linux-generic/include/odp/api/plat/packet_inlines.h index 1804fa6f..22f5aca3 100644 --- a/platform/linux-generic/include/odp/api/plat/packet_inlines.h +++ b/platform/linux-generic/include/odp/api/plat/packet_inlines.h @@ -15,7 +15,9 @@ #include <odp/api/plat/packet_types.h> #include <odp/api/pool.h> -#include <odp/api/packet_io.h> +#include <odp/api/time.h> +#include <odp/api/plat/packet_io_types.h> +#include <odp/api/plat/buffer_types.h> #include <odp/api/hints.h> /** @internal Inline function offsets */ commit 9c389e1785fd000203eb2198f9fc2778be8f83e6 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Thu Nov 2 16:02:32 2017 +0200 api: packet: add parse functions Application may need help on packet parsing e.g. after decrypt or IP reassembly of a packet. Application specifies from where to start and where to stop parsing. Implementation may be vectorized (more efficient) when multiple packets are parsed together with the same parse requirements. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/include/odp/api/spec/packet.h b/include/odp/api/spec/packet.h index fac7790b..da522c6c 100644 --- a/include/odp/api/spec/packet.h +++ b/include/odp/api/spec/packet.h @@ -71,6 +71,45 @@ extern "C" { * Packet is red */ +/** + * Protocol + */ +typedef enum odp_proto_t { + /** No protocol defined */ + ODP_PROTO_NONE = 0, + + /** Ethernet (including VLAN) */ + ODP_PROTO_ETH, + + /** IP version 4 */ + ODP_PROTO_IPV4, + + /** IP version 6 */ + ODP_PROTO_IPV6 + +} odp_proto_t; + +/** + * Protocol layer + */ +typedef enum odp_proto_layer_t { + /** No layers */ + ODP_PROTO_LAYER_NONE = 0, + + /** Layer L2 protocols (Ethernet, VLAN, etc) */ + ODP_PROTO_LAYER_L2, + + /** Layer L3 protocols (IPv4, IPv6, ICMP, IPSEC, etc) */ + ODP_PROTO_LAYER_L3, + + /** Layer L4 protocols (UDP, TCP, SCTP) */ + ODP_PROTO_LAYER_L4, + + /** All layers */ + ODP_PROTO_LAYER_ALL + +} odp_proto_layer_t; + /** * Packet API data range specifier */ @@ -1139,6 +1178,87 @@ int odp_packet_move_data(odp_packet_t pkt, uint32_t dst_offset, * */ +/** + * Packet parse parameters + */ +typedef struct odp_packet_parse_param_t { + /** Protocol header at parse starting point. Valid values for this + * field are: ODP_PROTO_ETH, ODP_PROTO_IPV4, ODP_PROTO_IPV6. */ + odp_proto_t proto; + + /** Continue parsing until this layer. Must be the same or higher + * layer than the layer of 'proto'. */ + odp_proto_layer_t layer; + + /** Flags to control payload data checks up to the selected parse + * layer. Checksum checking status can be queried for each packet with + * odp_packet_l3_chksum_status() and odp_packet_l4_chksum_status(). + */ + union { + /** Individual check bits. */ + struct { + /** Check IPv4 header checksum */ + uint32_t ipv4_chksum : 1; + + /** Check UDP checksum */ + uint32_t udp_chksum : 1; + + /** Check TCP checksum */ + uint32_t tcp_chksum : 1; + + /** Check SCTP checksum */ + uint32_t sctp_chksum : 1; + + } check; + + /** All check bits. This can be used to set/clear all flags. */ + uint32_t all_check; + }; + +} odp_packet_parse_param_t; + +/** + * Parse packet + * + * Parse protocol headers in packet data. Parsing starts at 'offset', which + * is the first header byte of protocol 'param.proto'. Parameter 'param.layer' + * defines the last layer application is interested about. + * Use ODP_PROTO_LAYER_ALL for all layers. A successful operation sets or resets + * packet metadata for all layers from the layer of 'param.proto' to the + * application defined last layer. Metadata of other layers have undefined + * values. When operation fails, metadata of all protocol layers have undefined + * values. + * + * @param pkt Packet handle + * @param offset Byte offset into the packet + * @param param Parse parameters. Proto and layer fields must be set. Clear + * all check bits that are not used. + * + * @retval 0 on success + * @retval <0 on failure + */ +int odp_packet_parse(odp_packet_t pkt, uint32_t offset, + const odp_packet_parse_param_t *param); + +/** + * Parse multiple packets + * + * Otherwise like odp_packet_parse(), but parses multiple packets. Packets may + * have unique offsets, but must start with the same protocol. Also, packets are + * parsed up to the same protocol layer. + * + * @param pkt Packet handle array + * @param offset Byte offsets into the packets + * @param num Number of packets and offsets + * @param param Parse parameters. Proto and layer fields must be set. Clear + * all check bits that are not used. + * + * @return Number of packets parsed successfully (0 ... num) + * @retval <0 on failure + */ +int odp_packet_parse_multi(const odp_packet_t pkt[], const uint32_t offset[], + int num, const odp_packet_parse_param_t *param); + /** * Packet pool * ----------------------------------------------------------------------- Summary of changes: include/odp/api/spec/ipsec.h | 10 +- include/odp/api/spec/packet.h | 140 ++++++++++++++ include/odp/api/spec/packet_io.h | 11 +- .../include/odp/api/plat/packet_inlines.h | 4 +- .../linux-generic/include/odp_packet_internal.h | 3 +- platform/linux-generic/odp_packet.c | 70 ++++++- test/common/Makefile.am | 2 +- .../pktio/parser.h => common/test_packet_parser.h} | 41 ++--- test/validation/api/packet/packet.c | 203 +++++++++++++++++++++ test/validation/api/packet/packet.h | 1 + test/validation/api/pktio/parser.c | 1 + test/validation/api/pktio/parser.h | 149 --------------- test/validation/api/pktio/pktio.c | 25 ++- 13 files changed, 467 insertions(+), 193 deletions(-) copy test/{validation/api/pktio/parser.h => common/test_packet_parser.h} (88%) hooks/post-receive --

8 years, 10 months

[COMMIT] branch api-next updated. v1.16.0.0-549-g3d254a24

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 3d254a24a1a911aad72f0535412644824872307f (commit) via 2cfe11680ecc2186339183e94f291ce586740f8b (commit) via bb6abbb8a5a8f92a7b18c7c2b3336be1ef264e11 (commit) via 45d422099d86461c48871879e0f7abbf37acfd5c (commit) via 614161c1a440d13d866975dc13df13cde2e8b3f3 (commit) via 279621af7fd8bf2b84b16acce85ff5bf040e7771 (commit) via 29195afb96cd539e4d4a94bd3d64336acf34bcaa (commit) via b653ea8ac54aea1a81ce9f49d4ec60f81bec2d2d (commit) via 3c8f24c52d80bd7e032ba3a1788c8dbc4d5ea0ad (commit) via 9b98d35daf7736b34e51400c6a7e32bf81537ce6 (commit) via 774b652640be4ab7147db0a337f84ce8d602b665 (commit) via 8999344484a2c3b4c08b84c5b27e2b355fa312d5 (commit) via e475a06dba8b79eace4131ea7327e87a10546351 (commit) via c5fbca288838d39f3f6434d381acb25f12c1dc9e (commit) via 22921366d8a2f9155d43f7022d645c6d364c8b58 (commit) via 0278905b45145a168f5b63afa0dbf0be30e808be (commit) via da0198f610f10c8af2c19eb4148001d1759eb401 (commit) via 6b24e0905df12ba075d86e471a48035f6c7b91ef (commit) via c8f25051021015221ec8d46cf2e06914eb8ca868 (commit) via 5f095cc66bc3fcafe8f44ed7348ef127f40c9026 (commit) via 3d6cf1de61e0b5c846317b3ffcbd0cfd07531b90 (commit) via 43d7f57b9f9f24526330c51fda8554d52414b82f (commit) via c4a8f43ff08b954d14857c5a59544f8d914205e3 (commit) via f972ef61a9693b7895cb7f85084c1c53c3b13131 (commit) via b6b667b1e95635a6ba77a19078d7d28013bcde1d (commit) via bae53291795e9c19cbfde9c0d0e11a19d9870623 (commit) via dd31792d10772c3e41519fc0b6d68cf13b0fe9d4 (commit) via 0e04be4851ecc94da8b4cac3c576260c0518c936 (commit) via d59c00c5f0255a5f1fc462332eef291bb2993f64 (commit) via 29c7a054f7151d33795a0d8d7df5594bf4fddb55 (commit) from fd192cba9c4e1f36a1bf3819f35f5e684ca80b1e (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 3d254a24a1a911aad72f0535412644824872307f Merge: fd192cba 2cfe1168 Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Fri Nov 10 16:31:14 2017 +0300 Merge branch 'master' into api-next Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> ----------------------------------------------------------------------- Summary of changes: CHANGELOG | 222 ++++++++++++++++++++++++++++++++++++ configure.ac | 6 +- example/l2fwd/README | 3 +- example/l2fwd/odp_l2fwd.c | 2 +- platform/linux-generic/odp_crypto.c | 19 +-- test/performance/odp_l2fwd_run.sh | 6 +- 6 files changed, 235 insertions(+), 23 deletions(-) hooks/post-receive --

8 years, 10 months

[COMMIT] branch master updated. v1.16.0.0

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 2cfe11680ecc2186339183e94f291ce586740f8b (commit) via bb6abbb8a5a8f92a7b18c7c2b3336be1ef264e11 (commit) via 45d422099d86461c48871879e0f7abbf37acfd5c (commit) via 614161c1a440d13d866975dc13df13cde2e8b3f3 (commit) via 279621af7fd8bf2b84b16acce85ff5bf040e7771 (commit) via 29195afb96cd539e4d4a94bd3d64336acf34bcaa (commit) via b653ea8ac54aea1a81ce9f49d4ec60f81bec2d2d (commit) via 3c8f24c52d80bd7e032ba3a1788c8dbc4d5ea0ad (commit) via 9b98d35daf7736b34e51400c6a7e32bf81537ce6 (commit) via 774b652640be4ab7147db0a337f84ce8d602b665 (commit) via 8999344484a2c3b4c08b84c5b27e2b355fa312d5 (commit) via e475a06dba8b79eace4131ea7327e87a10546351 (commit) via c5fbca288838d39f3f6434d381acb25f12c1dc9e (commit) via 22921366d8a2f9155d43f7022d645c6d364c8b58 (commit) via 0278905b45145a168f5b63afa0dbf0be30e808be (commit) via da0198f610f10c8af2c19eb4148001d1759eb401 (commit) via 6b24e0905df12ba075d86e471a48035f6c7b91ef (commit) via c8f25051021015221ec8d46cf2e06914eb8ca868 (commit) via 5f095cc66bc3fcafe8f44ed7348ef127f40c9026 (commit) via 3d6cf1de61e0b5c846317b3ffcbd0cfd07531b90 (commit) via 43d7f57b9f9f24526330c51fda8554d52414b82f (commit) via c4a8f43ff08b954d14857c5a59544f8d914205e3 (commit) via f972ef61a9693b7895cb7f85084c1c53c3b13131 (commit) via b6b667b1e95635a6ba77a19078d7d28013bcde1d (commit) via bae53291795e9c19cbfde9c0d0e11a19d9870623 (commit) via dd31792d10772c3e41519fc0b6d68cf13b0fe9d4 (commit) from 0e04be4851ecc94da8b4cac3c576260c0518c936 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: CHANGELOG | 222 +++++++++++++++++++++ configure.ac | 6 +- doc/Doxyfile_common | 12 ++ doc/application-api-guide/Doxyfile | 2 - doc/helper-guide/Doxyfile | 8 - doc/images/reflen.svg | 45 ----- doc/platform-api-guide/Doxyfile | 9 - doc/users-guide/users-guide-packet.adoc | 26 +-- doc/users-guide/users-guide.adoc | 36 +++- include/Makefile.am | 1 + include/odp/api/spec/feature.h | 69 +++++++ include/odp/api/spec/init.h | 15 ++ include/odp/api/spec/packet.h | 40 ++-- include/odp/api/spec/packet_io.h | 13 +- include/odp/api/spec/system_info.h | 19 ++ include/odp/api/spec/timer.h | 36 +++- include/odp/api/spec/traffic_mngr.h | 6 +- include/odp/arch/default/api/abi/event.h | 3 +- include/odp_api.h | 1 + platform/linux-generic/Makefile.am | 1 + .../include/odp/api/{deprecated.h => feature.h} | 16 +- .../linux-generic/include/odp_debug_internal.h | 2 +- .../linux-generic/include/odp_packet_internal.h | 2 - platform/linux-generic/odp_init.c | 5 + platform/linux-generic/odp_packet.c | 88 +++++--- platform/linux-generic/odp_packet_io.c | 2 +- platform/linux-generic/odp_system_info.c | 36 ++++ scripts/Dockerfile | 4 +- test/Makefile.inc | 4 +- test/performance/odp_bench_packet.c | 13 -- test/performance/odp_pktio_ordered.c | 4 + test/validation/api/init/init.c | 8 +- test/validation/api/packet/packet.c | 154 +------------- test/validation/api/system/system.c | 21 ++ test/validation/api/system/system.h | 1 + 35 files changed, 595 insertions(+), 335 deletions(-) delete mode 100644 doc/images/reflen.svg create mode 100644 include/odp/api/spec/feature.h copy platform/linux-generic/include/odp/api/{deprecated.h => feature.h} (57%) hooks/post-receive --

8 years, 10 months

[COMMIT] branch api-next updated. v1.15.0.0-852-gfd192cba

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 fd192cba9c4e1f36a1bf3819f35f5e684ca80b1e (commit) via 43cff7996bcdd6264bf6066a8be9424b2e12ca21 (commit) via 2dd964e170d71078cfe03d4c9e00c6f592b4326b (commit) via 449c693b2678bc29577b64fb76003bb10b86db6e (commit) via b13eba4e9b9cb814f115627addf763322fe22a76 (commit) via ea9f2aa440a653a77cbcadc2862c5af298205272 (commit) via 5e840b83992bba2f64750bb3a4599478d6ea9260 (commit) from d22c949cc466bf28de559855a1cb525740578137 (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 fd192cba9c4e1f36a1bf3819f35f5e684ca80b1e Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Fri Nov 3 12:28:39 2017 +0300 drv: remove remaining of files from api-next Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/doc/Doxyfile_common b/doc/Doxyfile_common index 0471dcf3..779442d0 100644 --- a/doc/Doxyfile_common +++ b/doc/Doxyfile_common @@ -33,12 +33,9 @@ DOT_IMAGE_FORMAT = svg PREDEFINED = __GNUC__ \ __attribute__(x)= \ ODP_ALIGNED(x)= \ - ODPDRV_ALIGNED(x)= \ __BIG_ENDIAN_BITFIELD \ __LITTLE_ENDIAN_BITFIELD \ __x86_64__ \ ODP_PACKED \ - ODPDRV_PACKED \ ODP_DEPRECATE(x)=x \ - "ODP_HANDLE_T(type)=odp_handle_t type" \ - "ODPDRV_HANDLE_T(type)=odpdrv_handle_t type" + "ODP_HANDLE_T(type)=odp_handle_t type" diff --git a/include/Makefile.am b/include/Makefile.am index d53181ce..4e2d748b 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -1,7 +1,6 @@ include_HEADERS = \ odp.h \ - odp_api.h \ - odp_drv.h + odp_api.h odpapispecincludedir= $(includedir)/odp/api/spec odpapispecinclude_HEADERS = \ @@ -54,19 +53,6 @@ nodist_odpapispecinclude_HEADERS = \ odp/api/spec/deprecated.h \ odp/api/spec/version.h -odpdrvspecincludedir= $(includedir)/odp/drv/spec -odpdrvspecinclude_HEADERS = \ - odp/drv/spec/align.h \ - odp/drv/spec/atomic.h \ - odp/drv/spec/barrier.h \ - odp/drv/spec/byteorder.h \ - odp/drv/spec/compiler.h \ - odp/drv/spec/driver.h \ - odp/drv/spec/shm.h \ - odp/drv/spec/spinlock.h \ - odp/drv/spec/std_types.h \ - odp/drv/spec/sync.h - odpapiabidefaultincludedir= $(includedir)/odp/arch/default/api/abi odpapiabidefaultinclude_HEADERS = \ odp/arch/default/api/abi/buffer.h \ diff --git a/include/odp/drv/spec/align.h b/include/odp/drv/spec/align.h deleted file mode 100644 index 2b2f32c5..00000000 --- a/include/odp/drv/spec/align.h +++ /dev/null @@ -1,78 +0,0 @@ -/* Copyright (c) 2016, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -/** - * @file - * - * ODPDRV alignments - */ - -#ifndef ODPDRV_API_ALIGN_H_ -#define ODPDRV_API_ALIGN_H_ -#include <odp/visibility_begin.h> - -#ifdef __cplusplus -extern "C" { -#endif - -/** @addtogroup odpdrv_compiler_optim - * Macros that allow cache line size configuration, check that - * alignment is a power of two etc. - * @{ - */ - -/* Checkpatch complains, but cannot use __aligned(size) for this purpose. */ - -/** - * @def ODPDRV_ALIGNED - * Defines type/struct/variable alignment in bytes - */ - -/** - * @def ODPDRV_PACKED - * Defines type/struct to be packed - */ - -/** - * @def ODPDRV_OFFSETOF - * Returns offset of member in type - */ - -/** - * @def ODPDRV_FIELD_SIZEOF - * Returns sizeof member - */ - -/** - * @def ODPDRV_CACHE_LINE_SIZE - * Cache line size - */ - -/** - * @def ODPDRV_PAGE_SIZE - * Page size - */ - -/** - * @def ODPDRV_ALIGNED_CACHE - * Defines type/struct/variable to be cache line size aligned - */ - -/** - * @def ODPDRV_ALIGNED_PAGE - * Defines type/struct/variable to be page size aligned - */ - -/** - * @} - */ - -#ifdef __cplusplus -} -#endif - -#include <odp/visibility_end.h> -#endif diff --git a/include/odp/drv/spec/atomic.h b/include/odp/drv/spec/atomic.h deleted file mode 100644 index 3cb6e9bb..00000000 --- a/include/odp/drv/spec/atomic.h +++ /dev/null @@ -1,634 +0,0 @@ -/* Copyright (c) 2016, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -/** - * @file - * - * ODPDRV atomic operations - */ - -#ifndef ODPDRV_API_ATOMIC_H_ -#define ODPDRV_API_ATOMIC_H_ -#include <odp/visibility_begin.h> - -#ifdef __cplusplus -extern "C" { -#endif - -/** - * @defgroup odpdrv_atomic ODPDRV ATOMIC - * @details - * Atomic integers using relaxed memory ordering - * - * Atomic integer types (odpdrv_atomic_u32_t and odpdrv_atomic_u64_t) can be - * used to implement e.g. shared counters. If not otherwise documented, - * operations in this API are implemented using RELAXED memory ordering - * (see memory order descriptions in the C11 specification). Relaxed operations - * do not provide synchronization or ordering for other memory accesses - * (initiated before or after the operation), only atomicity of the operation - * itself is guaranteed. - * - * Operations with non-relaxed memory ordering - * - * An operation with RELEASE memory ordering - * (odpdrv_atomic_xxx_rel_xxx()) ensures that other threads loading the same - * atomic variable with ACQUIRE memory ordering see all stores (from the - * calling thread) that happened before this releasing store. - * - * An operation with ACQUIRE memory ordering - * (odpdrv_atomic_xxx_acq_xxx()) ensures that the calling thread sees all stores - * (done by the releasing thread) that happened before a RELEASE memory ordered - * store to the same atomic variable. - * - * An operation with ACQUIRE-and-RELEASE memory ordering - * (odpdrv_atomic_xxx_acq_rel_xxx()) combines the effects of ACQUIRE and RELEASE - * memory orders. A single operation acts as both an acquiring load and - * a releasing store. - * - * @{ - */ - -/** - * @typedef odpdrv_atomic_u64_t - * Atomic 64-bit unsigned integer - * - * @typedef odpdrv_atomic_u32_t - * Atomic 32-bit unsigned integer - */ - -/* - * 32-bit operations in RELAXED memory ordering - * -------------------------------------------- - */ - -/** - * Initialize atomic uint32 variable - * - * Initializes the atomic variable with 'val'. This operation is not atomic. - * Drivers must ensure that there's no race condition while initializing - * the variable. - * - * @param atom Pointer to atomic variable - * @param val Value to initialize the variable with - */ -void odpdrv_atomic_init_u32(odpdrv_atomic_u32_t *atom, uint32_t val); - -/** - * Load value of atomic uint32 variable - * - * @param atom Pointer to atomic variable - * - * @return Value of the variable - */ -uint32_t odpdrv_atomic_load_u32(odpdrv_atomic_u32_t *atom); - -/** - * Store value to atomic uint32 variable - * - * @param atom Pointer to atomic variable - * @param val Value to store in the variable - */ -void odpdrv_atomic_store_u32(odpdrv_atomic_u32_t *atom, uint32_t val); - -/** - * Fetch and add to atomic uint32 variable - * - * @param atom Pointer to atomic variable - * @param val Value to be added to the variable - * - * @return Value of the variable before the addition - */ -uint32_t odpdrv_atomic_fetch_add_u32(odpdrv_atomic_u32_t *atom, uint32_t val); - -/** - * Add to atomic uint32 variable - * - * @param atom Pointer to atomic variable - * @param val Value to be added to the variable - */ -void odpdrv_atomic_add_u32(odpdrv_atomic_u32_t *atom, uint32_t val); - -/** - * Fetch and subtract from atomic uint32 variable - * - * @param atom Pointer to atomic variable - * @param val Value to be subracted from the variable - * - * @return Value of the variable before the subtraction - */ -uint32_t odpdrv_atomic_fetch_sub_u32(odpdrv_atomic_u32_t *atom, uint32_t val); - -/** - * Subtract from atomic uint32 variable - * - * @param atom Pointer to atomic variable - * @param val Value to be subtracted from the variable - */ -void odpdrv_atomic_sub_u32(odpdrv_atomic_u32_t *atom, uint32_t val); - -/** - * Fetch and increment atomic uint32 variable - * - * @param atom Pointer to atomic variable - * - * @return Value of the variable before the increment - */ -uint32_t odpdrv_atomic_fetch_inc_u32(odpdrv_atomic_u32_t *atom); - -/** - * Increment atomic uint32 variable - * - * @param atom Pointer to atomic variable - */ -void odpdrv_atomic_inc_u32(odpdrv_atomic_u32_t *atom); - -/** - * Fetch and decrement atomic uint32 variable - * - * @param atom Pointer to atomic variable - * - * @return Value of the variable before the subtraction - */ -uint32_t odpdrv_atomic_fetch_dec_u32(odpdrv_atomic_u32_t *atom); - -/** - * Decrement atomic uint32 variable - * - * @param atom Pointer to atomic variable - */ -void odpdrv_atomic_dec_u32(odpdrv_atomic_u32_t *atom); - -/** - * Update maximum value of atomic uint32 variable - * - * Compares value of atomic variable to the new maximum value. If the new value - * is greater than the current value, writes the new value into the variable. - * - * @param atom Pointer to atomic variable - * @param new_max New maximum value to be written into the atomic variable - */ -void odpdrv_atomic_max_u32(odpdrv_atomic_u32_t *atom, uint32_t new_max); - -/** - * Update minimum value of atomic uint32 variable - * - * Compares value of atomic variable to the new minimum value. If the new value - * is less than the current value, writes the new value into the variable. - * - * @param atom Pointer to atomic variable - * @param new_min New minimum value to be written into the atomic variable - */ -void odpdrv_atomic_min_u32(odpdrv_atomic_u32_t *atom, uint32_t new_min); - -/** - * Compare and swap atomic uint32 variable - * - * Compares value of atomic variable to the value pointed by 'old_val'. - * If values are equal, the operation writes 'new_val' into the atomic variable - * and returns success. If they are not equal, the operation writes current - * value of atomic variable into 'old_val' and returns failure. - * - * @param atom Pointer to atomic variable - * @param[in,out] old_val Pointer to the old value of the atomic variable. - * Operation updates this value on failure. - * @param new_val New value to be written into the atomic variable - * - * @return 0 on failure, !0 on success - * - */ -int odpdrv_atomic_cas_u32(odpdrv_atomic_u32_t *atom, uint32_t *old_val, - uint32_t new_val); - -/** - * Exchange value of atomic uint32 variable - * - * Atomically replaces the value of atomic variable with the new value. Returns - * the old value. - * - * @param atom Pointer to atomic variable - * @param new_val New value of the atomic variable - * - * @return Value of the variable before the operation - */ -uint32_t odpdrv_atomic_xchg_u32(odpdrv_atomic_u32_t *atom, uint32_t new_val); - -/* - * 64-bit operations in RELAXED memory ordering - * -------------------------------------------- - */ - -/** - * Initialize atomic uint64 variable - * - * Initializes the atomic variable with 'val'. This operation is not atomic. - * Drivers must ensure that there's no race condition while initializing - * the variable. - * - * @param atom Pointer to atomic variable - * @param val Value to initialize the variable with - */ -void odpdrv_atomic_init_u64(odpdrv_atomic_u64_t *atom, uint64_t val); - -/** - * Load value of atomic uint64 variable - * - * @param atom Pointer to atomic variable - * - * @return Value of the variable - */ -uint64_t odpdrv_atomic_load_u64(odpdrv_atomic_u64_t *atom); - -/** - * Store value to atomic uint64 variable - * - * @param atom Pointer to atomic variable - * @param val Value to store in the variable - */ -void odpdrv_atomic_store_u64(odpdrv_atomic_u64_t *atom, uint64_t val); - -/** - * Fetch and add to atomic uint64 variable - * - * @param atom Pointer to atomic variable - * @param val Value to be added to the variable - * - * @return Value of the variable before the addition - */ -uint64_t odpdrv_atomic_fetch_add_u64(odpdrv_atomic_u64_t *atom, uint64_t val); - -/** - * Add to atomic uint64 variable - * - * @param atom Pointer to atomic variable - * @param val Value to be added to the variable - */ -void odpdrv_atomic_add_u64(odpdrv_atomic_u64_t *atom, uint64_t val); - -/** - * Fetch and subtract from atomic uint64 variable - * - * @param atom Pointer to atomic variable - * @param val Value to be subtracted from the variable - * - * @return Value of the variable before the subtraction - */ -uint64_t odpdrv_atomic_fetch_sub_u64(odpdrv_atomic_u64_t *atom, uint64_t val); - -/** - * Subtract from atomic uint64 variable - * - * @param atom Pointer to atomic variable - * @param val Value to be subtracted from the variable - */ -void odpdrv_atomic_sub_u64(odpdrv_atomic_u64_t *atom, uint64_t val); - -/** - * Fetch and increment atomic uint64 variable - * - * @param atom Pointer to atomic variable - * - * @return Value of the variable before the increment - */ -uint64_t odpdrv_atomic_fetch_inc_u64(odpdrv_atomic_u64_t *atom); - -/** - * Increment atomic uint64 variable - * - * @param atom Pointer to atomic variable - */ -void odpdrv_atomic_inc_u64(odpdrv_atomic_u64_t *atom); - -/** - * Fetch and decrement atomic uint64 variable - * - * @param atom Pointer to atomic variable - * - * @return Value of the variable before the decrement - */ -uint64_t odpdrv_atomic_fetch_dec_u64(odpdrv_atomic_u64_t *atom); - -/** - * Decrement atomic uint64 variable - * - * @param atom Pointer to atomic variable - */ -void odpdrv_atomic_dec_u64(odpdrv_atomic_u64_t *atom); - -/** - * Update maximum value of atomic uint64 variable - * - * Compares value of atomic variable to the new maximum value. If the new value - * is greater than the current value, writes the new value into the variable. - * - * @param atom Pointer to atomic variable - * @param new_max New maximum value to be written into the atomic variable - */ -void odpdrv_atomic_max_u64(odpdrv_atomic_u64_t *atom, uint64_t new_max); - -/** - * Update minimum value of atomic uint64 variable - * - * Compares value of atomic variable to the new minimum value. If the new value - * is less than the current value, writes the new value into the variable. - * - * @param atom Pointer to atomic variable - * @param new_min New minimum value to be written into the atomic variable - */ -void odpdrv_atomic_min_u64(odpdrv_atomic_u64_t *atom, uint64_t new_min); - -/** - * Compare and swap atomic uint64 variable - * - * Compares value of atomic variable to the value pointed by 'old_val'. - * If values are equal, the operation writes 'new_val' into the atomic variable - * and returns success. If they are not equal, the operation writes current - * value of atomic variable into 'old_val' and returns failure. - * - * @param atom Pointer to atomic variable - * @param[in,out] old_val Pointer to the old value of the atomic variable. - * Operation updates this value on failure. - * @param new_val New value to be written into the atomic variable - * - * @return 0 on failure, !0 on success - */ -int odpdrv_atomic_cas_u64(odpdrv_atomic_u64_t *atom, uint64_t *old_val, - uint64_t new_val); - -/** - * Exchange value of atomic uint64 variable - * - * Atomically replaces the value of atomic variable with the new value. Returns - * the old value. - * - * @param atom Pointer to atomic variable - * @param new_val New value of the atomic variable - * - * @return Value of the variable before the operation - */ -uint64_t odpdrv_atomic_xchg_u64(odpdrv_atomic_u64_t *atom, uint64_t new_val); - -/* - * 32-bit operations in non-RELAXED memory ordering - * ------------------------------------------------ - */ - -/** - * Load value of atomic uint32 variable using ACQUIRE memory ordering - * - * Otherwise identical to odpdrv_atomic_load_u32() but ensures ACQUIRE memory - * ordering. - * - * @param atom Pointer to atomic variable - * - * @return Value of the variable - */ -uint32_t odpdrv_atomic_load_acq_u32(odpdrv_atomic_u32_t *atom); - -/** - * Store value to atomic uint32 variable using RELEASE memory ordering - * - * Otherwise identical to odpdrv_atomic_store_u32() but ensures RELEASE memory - * ordering. - * - * @param atom Pointer to atomic variable - * @param val Value to store in the variable - */ -void odpdrv_atomic_store_rel_u32(odpdrv_atomic_u32_t *atom, uint32_t val); - -/** - * Add to atomic uint32 variable using RELEASE memory ordering - * - * Otherwise identical to odpdrv_atomic_add_u32() but ensures RELEASE memory - * ordering. - * - * @param atom Pointer to atomic variable - * @param val Value to be added to the variable - */ -void odpdrv_atomic_add_rel_u32(odpdrv_atomic_u32_t *atom, uint32_t val); - -/** - * Subtract from atomic uint32 variable using RELEASE memory ordering - * - * Otherwise identical to odpdrv_atomic_sub_u32() but ensures RELEASE memory - * ordering. - * - * @param atom Pointer to atomic variable - * @param val Value to be subtracted from the variable - */ -void odpdrv_atomic_sub_rel_u32(odpdrv_atomic_u32_t *atom, uint32_t val); - -/** - * Compare and swap atomic uint32 variable using ACQUIRE memory ordering - * - * Otherwise identical to odpdrv_atomic_cas_u32() but ensures ACQUIRE memory - * ordering on success. Memory ordering is RELAXED on failure. - * - * @param atom Pointer to atomic variable - * @param[in,out] old_val Pointer to the old value of the atomic variable. - * Operation updates this value on failure. - * @param new_val New value to be written into the atomic variable - * - * @return 0 on failure, !0 on success - */ -int odpdrv_atomic_cas_acq_u32(odpdrv_atomic_u32_t *atom, uint32_t *old_val, - uint32_t new_val); - -/** - * Compare and swap atomic uint32 variable using RELEASE memory ordering - * - * Otherwise identical to odpdrv_atomic_cas_u32() but ensures RELEASE memory - * ordering on success. Memory ordering is RELAXED on failure. - * - * @param atom Pointer to atomic variable - * @param[in,out] old_val Pointer to the old value of the atomic variable. - * Operation updates this value on failure. - * @param new_val New value to be written into the atomic variable - * - * @return 0 on failure, !0 on success - */ -int odpdrv_atomic_cas_rel_u32(odpdrv_atomic_u32_t *atom, uint32_t *old_val, - uint32_t new_val); - -/** - * Compare and swap atomic uint32 variable using ACQUIRE-and-RELEASE memory - * ordering - * - * Otherwise identical to odpdrv_atomic_cas_u32() but ensures - * ACQUIRE-and-RELEASE memory ordering on success. - * Memory ordering is RELAXED on failure. - * - * @param atom Pointer to atomic variable - * @param[in,out] old_val Pointer to the old value of the atomic variable. - * Operation updates this value on failure. - * @param new_val New value to be written into the atomic variable - * - * @return 0 on failure, !0 on success - */ -int odpdrv_atomic_cas_acq_rel_u32(odpdrv_atomic_u32_t *atom, uint32_t *old_val, - uint32_t new_val); - -/* - * 64-bit operations in non-RELAXED memory ordering - * ------------------------------------------------ - */ - -/** - * Load value of atomic uint64 variable using ACQUIRE memory ordering - * - * Otherwise identical to odpdrv_atomic_load_u64() but ensures ACQUIRE memory - * ordering. - * - * @param atom Pointer to atomic variable - * - * @return Value of the variable - */ -uint64_t odpdrv_atomic_load_acq_u64(odpdrv_atomic_u64_t *atom); - -/** - * Store value to atomic uint64 variable using RELEASE memory ordering - * - * Otherwise identical to odpdrv_atomic_store_u64() but ensures RELEASE memory - * ordering. - * - * @param atom Pointer to atomic variable - * @param val Value to store in the variable - */ -void odpdrv_atomic_store_rel_u64(odpdrv_atomic_u64_t *atom, uint64_t val); - -/** - * Add to atomic uint64 variable using RELEASE memory ordering - * - * Otherwise identical to odpdrv_atomic_add_u64() but ensures RELEASE memory - * ordering. - * - * @param atom Pointer to atomic variable - * @param val Value to be added to the variable - */ -void odpdrv_atomic_add_rel_u64(odpdrv_atomic_u64_t *atom, uint64_t val); - -/** - * Subtract from atomic uint64 variable using RELEASE memory ordering - * - * Otherwise identical to odpdrv_atomic_sub_u64() but ensures RELEASE memory - * ordering. - * - * @param atom Pointer to atomic variable - * @param val Value to be subtracted from the variable - */ -void odpdrv_atomic_sub_rel_u64(odpdrv_atomic_u64_t *atom, uint64_t val); - -/** - * Compare and swap atomic uint64 variable using ACQUIRE memory ordering - * - * Otherwise identical to odpdrv_atomic_cas_u64() but ensures ACQUIRE memory - * ordering on success. Memory ordering is RELAXED on failure. - * - * @param atom Pointer to atomic variable - * @param[in,out] old_val Pointer to the old value of the atomic variable. - * Operation updates this value on failure. - * @param new_val New value to be written into the atomic variable - * - * @return 0 on failure, !0 on success - */ -int odpdrv_atomic_cas_acq_u64(odpdrv_atomic_u64_t *atom, uint64_t *old_val, - uint64_t new_val); - -/** - * Compare and swap atomic uint64 variable using RELEASE memory ordering - * - * Otherwise identical to odpdrv_atomic_cas_u64() but ensures RELEASE memory - * ordering on success. Memory ordering is RELAXED on failure. - * - * @param atom Pointer to atomic variable - * @param[in,out] old_val Pointer to the old value of the atomic variable. - * Operation updates this value on failure. - * @param new_val New value to be written into the atomic variable - * - * @return 0 on failure, !0 on success - */ -int odpdrv_atomic_cas_rel_u64(odpdrv_atomic_u64_t *atom, uint64_t *old_val, - uint64_t new_val); - -/** - * Compare and swap atomic uint64 variable using ACQUIRE-and-RELEASE memory - * ordering - * - * Otherwise identical to odpdrv_atomic_cas_u64() but ensures - * ACQUIRE-and-RELEASE memory ordering on success. Memory ordering is RELAXED - * on failure. - * - * @param atom Pointer to atomic variable - * @param[in,out] old_val Pointer to the old value of the atomic variable. - * Operation updates this value on failure. - * @param new_val New value to be written into the atomic variable - * - * @return 0 on failure, !0 on success - */ -int odpdrv_atomic_cas_acq_rel_u64(odpdrv_atomic_u64_t *atom, uint64_t *old_val, - uint64_t new_val); - -/** - * Atomic operations - * - * Atomic operations listed in a bit field structure. - */ -typedef union odpdrv_atomic_op_t { - /** Operation flags */ - struct { - uint32_t init : 1; /**< Init atomic variable */ - uint32_t load : 1; /**< Atomic load */ - uint32_t store : 1; /**< Atomic store */ - uint32_t fetch_add : 1; /**< Atomic fetch and add */ - uint32_t add : 1; /**< Atomic add */ - uint32_t fetch_sub : 1; /**< Atomic fetch and subtract */ - uint32_t sub : 1; /**< Atomic subtract */ - uint32_t fetch_inc : 1; /**< Atomic fetch and increment */ - uint32_t inc : 1; /**< Atomic increment */ - uint32_t fetch_dec : 1; /**< Atomic fetch and decrement */ - uint32_t dec : 1; /**< Atomic decrement */ - uint32_t min : 1; /**< Atomic minimum */ - uint32_t max : 1; /**< Atomic maximum */ - uint32_t cas : 1; /**< Atomic compare and swap */ - uint32_t xchg : 1; /**< Atomic exchange */ - } op; - - /** All bits of the bit field structure. - * Operation flag mapping is architecture specific. This field can be - * used to set/clear all flags, or bitwise operations over the entire - * structure. */ - uint32_t all_bits; -} odpdrv_atomic_op_t; - -/** - * Query which atomic uint64 operations are lock-free - * - * Lock-free implementations have higher performance and scale better than - * implementations using locks. User can decide to use e.g. uint32 atomic - * variables instead of uint64 to optimize performance on platforms that - * implement a performance critical operation using locks. - * - * Init operations (e.g. odpdrv_atomic_init_64()) are not atomic. This function - * clears the op.init bit but will never set it to one. - * - * @param atomic_op Pointer to atomic operation structure for storing - * operation flags. All bits are initialized to zero during - * the operation. The parameter is ignored when NULL. - * @retval 0 None of the operations are lock-free - * @retval 1 Some of the operations are lock-free - * @retval 2 All operations are lock-free - */ -int odpdrv_atomic_lock_free_u64(odpdrv_atomic_op_t *atomic_op); - -/** - * @} - */ - -#ifdef __cplusplus -} -#endif - -#include <odp/visibility_end.h> -#endif diff --git a/include/odp/drv/spec/barrier.h b/include/odp/drv/spec/barrier.h deleted file mode 100644 index 5ac65a30..00000000 --- a/include/odp/drv/spec/barrier.h +++ /dev/null @@ -1,66 +0,0 @@ -/* Copyright (c) 2016, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -/** - * @file - * - * ODPDRV execution barriers - */ - -#ifndef ODPDRV_API_BARRIER_H_ -#define ODPDRV_API_BARRIER_H_ -#include <odp/visibility_begin.h> - -#ifdef __cplusplus -extern "C" { -#endif - -/** - * @defgroup odpdrv_barrier ODPDRV BARRIER - * Thread execution and memory ordering barriers. - * - * @details - * Thread execution barrier (odpdrv_barrier_t) - * - * Thread execution barrier synchronizes a group of threads to wait on the - * barrier until the entire group has reached the barrier. - * @{ - */ - -/** - * @typedef odpdrv_barrier_t - * ODPDRV thread synchronization barrier - */ - -/** - * Initialize barrier with thread count. - * - * @param barr Pointer to a barrier variable - * @param count Thread count - */ -void odpdrv_barrier_init(odpdrv_barrier_t *barr, int count); - -/** - * Synchronize thread execution on barrier. - * Wait for all threads to arrive at the barrier until they are let loose again. - * Threads will block (spin) until the last thread has arrived at the barrier. - * All memory operations before the odpdrv_barrier_wait() call will be visible - * to all threads when they leave the barrier. - * - * @param barr Pointer to a barrier variable - */ -void odpdrv_barrier_wait(odpdrv_barrier_t *barr); - -/** - * @} - */ - -#ifdef __cplusplus -} -#endif - -#include <odp/visibility_end.h> -#endif diff --git a/include/odp/drv/spec/byteorder.h b/include/odp/drv/spec/byteorder.h deleted file mode 100644 index bf363f59..00000000 --- a/include/odp/drv/spec/byteorder.h +++ /dev/null @@ -1,181 +0,0 @@ -/* Copyright (c) 2016, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -/** - * @file - * - * ODPDRV byteorder - */ - -#ifndef ODPDRV_BYTEORDER_H_ -#define ODPDRV_BYTEORDER_H_ -#include <odp/visibility_begin.h> - -#ifdef __cplusplus -extern "C" { -#endif - -/** @addtogroup odpdrv_compiler_optim ODPDRV COMPILER / OPTIMIZATION - * Macros that check byte order and operations for byte order conversion. - * @{ - */ - -/** - * @def ODPDRV_BIG_ENDIAN - * Big endian byte order - * - * @def ODPDRV_LITTLE_ENDIAN - * Little endian byte order - * - * @def ODPDRV_BIG_ENDIAN_BITFIELD - * Big endian bit field - * - * @def ODPDRV_LITTLE_ENDIAN_BITFIELD - * Little endian bit field - * - * @def ODPDRV_BYTE_ORDER - * Selected byte order - * - * @def ODPDRV_BITFIELD_ORDER - * Selected bitfield order - */ - -/** - * @typedef odpdrv_u16le_t - * unsigned 16bit little endian - * - * @typedef odpdrv_u16be_t - * unsigned 16bit big endian - * - * @typedef odpdrv_u32le_t - * unsigned 32bit little endian - * - * @typedef odpdrv_u32be_t - * unsigned 32bit big endian - * - * @typedef odpdrv_u64le_t - * unsigned 64bit little endian - * - * @typedef odpdrv_u64be_t - * unsigned 64bit big endian - * - * @typedef odpdrv_u16sum_t - * unsigned 16bit bitwise - * - * @typedef odpdrv_u32sum_t - * unsigned 32bit bitwise - */ - -/* - * Big Endian -> CPU byte order: - */ - -/** - * Convert 16bit big endian to cpu native uint16_t - * @param be16 big endian 16bit - * @return cpu native uint16_t - */ -uint16_t odpdrv_be_to_cpu_16(odpdrv_u16be_t be16); - -/** - * Convert 32bit big endian to cpu native uint32_t - * @param be32 big endian 32bit - * @return cpu native uint32_t - */ -uint32_t odpdrv_be_to_cpu_32(odpdrv_u32be_t be32); - -/** - * Convert 64bit big endian to cpu native uint64_t - * @param be64 big endian 64bit - * @return cpu native uint64_t - */ -uint64_t odpdrv_be_to_cpu_64(odpdrv_u64be_t be64); - -/* - * CPU byte order -> Big Endian: - */ - -/** - * Convert cpu native uint16_t to 16bit big endian - * @param cpu16 uint16_t in cpu native format - * @return big endian 16bit - */ -odpdrv_u16be_t odpdrv_cpu_to_be_16(uint16_t cpu16); - -/** - * Convert cpu native uint32_t to 32bit big endian - * @param cpu32 uint32_t in cpu native format - * @return big endian 32bit - */ -odpdrv_u32be_t odpdrv_cpu_to_be_32(uint32_t cpu32); - -/** - * Convert cpu native uint64_t to 64bit big endian - * @param cpu64 uint64_t in cpu native format - * @return big endian 64bit - */ -odpdrv_u64be_t odpdrv_cpu_to_be_64(uint64_t cpu64); - -/* - * Little Endian -> CPU byte order: - */ - -/** - * Convert 16bit little endian to cpu native uint16_t - * @param le16 little endian 16bit - * @return cpu native uint16_t - */ -uint16_t odpdrv_le_to_cpu_16(odpdrv_u16le_t le16); - -/** - * Convert 32bit little endian to cpu native uint32_t - * @param le32 little endian 32bit - * @return cpu native uint32_t - */ -uint32_t odpdrv_le_to_cpu_32(odpdrv_u32le_t le32); - -/** - * Convert 64bit little endian to cpu native uint64_t - * @param le64 little endian 64bit - * @return cpu native uint64_t - */ -uint64_t odpdrv_le_to_cpu_64(odpdrv_u64le_t le64); - -/* - * CPU byte order -> Little Endian: - */ - -/** - * Convert cpu native uint16_t to 16bit little endian - * @param cpu16 uint16_t in cpu native format - * @return little endian 16bit - */ -odpdrv_u16le_t odpdrv_cpu_to_le_16(uint16_t cpu16); - -/** - * Convert cpu native uint32_t to 32bit little endian - * @param cpu32 uint32_t in cpu native format - * @return little endian 32bit - */ -odpdrv_u32le_t odpdrv_cpu_to_le_32(uint32_t cpu32); - -/** - * Convert cpu native uint64_t to 64bit little endian - * @param cpu64 uint64_t in cpu native format - * @return little endian 64bit - */ -odpdrv_u64le_t odpdrv_cpu_to_le_64(uint64_t cpu64); - -/** - * @} - */ - -#ifdef __cplusplus -} -#endif - -#include <odp/visibility_end.h> -#endif diff --git a/include/odp/drv/spec/driver.h b/include/odp/drv/spec/driver.h deleted file mode 100644 index d83e907c..00000000 --- a/include/odp/drv/spec/driver.h +++ /dev/null @@ -1,389 +0,0 @@ -/* 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 -* @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/include/odp/drv/spec/shm.h b/include/odp/drv/spec/shm.h deleted file mode 100644 index ee8181f2..00000000 --- a/include/odp/drv/spec/shm.h +++ /dev/null @@ -1,330 +0,0 @@ -/* Copyright (c) 2016, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -/** - * @file - * - * ODPRDV shared memory (shm) - */ - -#ifndef ODPDRV_SHM_H_ -#define ODPDRV_SHM_H_ -#include <odp/visibility_begin.h> - -#ifdef __cplusplus -extern "C" { -#endif - -/** @addtogroup odpdrv_shm ODPDRV SHARED MEMORY - * Operations on driver shared memory. - * @{ - */ - -/** - * @typedef odpdrv_shm_t - * odpdrv shared memory block - */ - -/** - * @def ODPDRV_SHM_INVALID - * Invalid odpdrv shared memory block - */ - -/** Maximum shared memory block name length in chars */ -#define ODPDRV_SHM_NAME_LEN 32 - -/* - * Shared memory flags - */ -#define ODPDRV_SHM_SINGLE_VA 0x01 /**< Memory shall be mapped at same VA */ -#define ODPDRV_SHM_LOCK 0x02 /**< Memory shall be locked (no swap) */ - -/** - * Shared memory block info - */ -typedef struct odpdrv_shm_info_t { - const char *name; /**< Block name */ - void *addr; /**< Block address */ - uint64_t size; /**< Block size in bytes */ - uint64_t page_size; /**< Memory page size */ - uint32_t flags; /**< ODPDRV_SHM_* flags */ -} odpdrv_shm_info_t; - -/** - * Shared memory capabilities - */ -typedef struct odpdrv_shm_capability_t { - /** Maximum number of shared memory blocks - * - * This number of separate shared memory blocks can be - * reserved concurrently. */ - unsigned max_blocks; - - /** Maximum memory block size in bytes - * - * The value of zero means that size is limited only by the available - * memory size. */ - uint64_t max_size; - - /** Maximum memory block alignment in bytes - * - * The value of zero means that alignment is limited only by the - * available memory size. */ - uint64_t max_align; - -} odpdrv_shm_capability_t; - -/** - * Query shared memory capabilities - * - * Outputs shared memory capabilities on success. - * - * @param[out] capa Pointer to capability structure for output - * - * @retval 0 on success - * @retval <0 on failure - */ -int odpdrv_shm_capability(odpdrv_shm_capability_t *capa); - -/** - * Reserve a contiguous block of shared memory - * - * @param[in] name Name of the block (maximum ODPDRV_SHM_NAME_LEN - 1 chars) - * @param[in] size Block size in bytes - * @param[in] align Block alignment in bytes - * @param[in] flags Shared memory parameter flags (ODPDRV_SHM_*). - * Default value is 0. - * - * @return Handle of the reserved block - * @retval ODPDRV_SHM_INVALID on failure - */ -odpdrv_shm_t odpdrv_shm_reserve(const char *name, uint64_t size, uint64_t align, - uint32_t flags); - -/** - * Free a contiguous block of shared memory - * - * Frees a previously reserved block of shared memory (found by its handle). - * @note Freeing memory that is in use will result in UNDEFINED behavior - * - * @param[in] shm odpdrv_shm Block handle - * - * @retval 0 on success - * @retval <0 on failure - */ -int odpdrv_shm_free_by_handle(odpdrv_shm_t shm); - -/** - * Free a contiguous block of shared memory (found from its name) - * - * Frees a previously reserved block of shared memory. - * @note Freeing memory that is in use will result in UNDEFINED behavior - * - * @param[in] name odpdrv_shm Block name - * - * @retval 0 on success - * @retval <0 on failure - */ -int odpdrv_shm_free_by_name(const char *name); - -/** - * Free a contiguous block of shared memory (found from its address) - * - * Frees a previously reserved block of shared memory. - * @note Freeing memory that is in use will result in UNDEFINED behavior - * - * @param[in] address odpdrv_shm Block address - * - * @retval 0 on success - * @retval <0 on failure - */ -int odpdrv_shm_free_by_address(void *address); - -/** - * Lookup and map a block of shared memory (identified by its handle) - * - * @param[in] shm odpdrv_shm Block handle - * - * @return The address of the newly mapped block. - * @retval NULL on failure - */ -void *odpdrv_shm_lookup_by_handle(odpdrv_shm_t shm); - -/** - * Lookup and map a block of shared memory (identified by its name) - * - * @param[in] name odpdrv_shm Block name - * - * @return The handle of the newly mapped block. - * @retval ODPDRV_SHM_INVALID on failure - */ -odpdrv_shm_t odpdrv_shm_lookup_by_name(const char *name); - -/** - * Lookup and map a block of shared memory (identified by its address) - * - * @note This only works when the flag ODPDRV_SHM_SINGLE_VA was set, - * as otherwise addresses are odp-thread local and hence meaningless to - * identify the block between odp-threads. - * - * @param[in] address odpdrv_shm Block address - * - * @return The handle of the newly mapped block. - * @retval ODPDRV_SHM_INVALID on failure - */ -odpdrv_shm_t odpdrv_shm_lookup_by_address(void *address); - -/** - * Get a Shared memory block address - * - * @param[in] shm odpdrv_shm Block handle - * - * @return Memory block address - * @retval NULL on failure - */ -void *odpdrv_shm_addr(odpdrv_shm_t shm); - -/** - * Shared memory block info - * - * @param[in] shm Odpdrv_shm block handle - * @param[out] info Block info pointer for output - * - * @retval 0 on success - * @retval <0 on failure - */ -int odpdrv_shm_info(odpdrv_shm_t shm, odpdrv_shm_info_t *info); - -/** - * Print all shared memory blocks and returns the number of allocated blocks. - * This function is meant for debug. - * @param title A string to be printed before the shared memory status - * @return The total number of allocated blocks - */ -int odpdrv_shm_print_all(const char *title); - -/** - * Get printable value for an odpdrv_shm_t - * - * @param hdl odpdrv_shm_t handle to be printed - * @return uint64_t value that can be used to print/display this - * handle - * - * @note This routine is intended to be used for diagnostic purposes - * to enable applications to generate a printable value that represents - * an odpdrv_shm_t handle. - */ -uint64_t odpdrv_shm_to_u64(odpdrv_shm_t hdl); - -/** - * drv shm pool parameters - * Used to communicate pool creation options. - */ -typedef struct { - /** Sum of all (simultaneous) allocs (bytes)*/ - uint64_t pool_size; - - /** Minimum alloc size user will request from pool (bytes)*/ - uint64_t min_alloc; - - /** Maximum alloc size user will request from pool (bytes)*/ - uint64_t max_alloc; -} odpdrv_shm_pool_param_t; - -/** - * @typedef odpdrv_shm_pool_t - * odpdrv shared memory pool - */ - -/** - * @def ODPDRV_SHM_POOL_INVALID - * Invalid odpdrv shared memory pool - */ - -/** - * Create a memory pool - * - * This routine is used to create a memory pool. The use of pool name is - * optional. - * Unique names are not required. However, odpdrv_shm_pool_lookup() - * returns only a single matching pool. - * - * @param pool_name Name of the pool or NULL. - * @param param Pool parameters. - * - * @return Handle of the created drv shm memory pool - * @retval ODPDRV_SHM_POOL_INVALID Pool could not be created - */ -odpdrv_shm_pool_t odpdrv_shm_pool_create(const char *pool_name, - odpdrv_shm_pool_param_t *param); - -/** - * Destroy a pool previously created by odpdrv_shm_pool_create() - * - * @param pool Handle of the pool to be destroyed - * - * @retval 0 Success - * @retval <0 Failure - * - * @note This routine destroys a previously created pool, and will destroy any - * internal shared memory objects associated with the pool. Results are - * undefined if an attempt is made to destroy a pool that contains allocated - * or otherwise active allocations. - */ -int odpdrv_shm_pool_destroy(odpdrv_shm_pool_t pool); - -/** - * Find a memory pool by name - * - * @param name Name of the pool - * - * @return Handle of the first matching pool - * @retval ODPDRV_SHM_POOL_INVALID Pool could not be found - */ -odpdrv_shm_pool_t odpdrv_shm_pool_lookup(const char *name); - -/** - * Allocate memory from a memory pool - * - * @param pool Memory pool handle - * @param size Number of bytes to allocate (bytes) - * - * @return A pointer to the allocated memory - * @retval NULL on error. - */ -void *odpdrv_shm_pool_alloc(odpdrv_shm_pool_t pool, uint64_t size); - -/** - * Free memory back to a memory pool - * - * @param pool Memory pool handle - * @param addr pointer to a previously allocated memory - * (as returned by a previous call to odpdrv_shm_pool_alloc) - */ -void odpdrv_shm_pool_free(odpdrv_shm_pool_t pool, void *addr); - -/** - * Print memory pool info - * - * @param title A string to be printed as a title (e.g. location) - * @param pool Memory pool handle - * - * @return 0 on success, negative value if pool inconsistency is detected. - * - * @note This routine writes implementation-defined information about the - * specified pool to the ODP log. The intended use is for debugging. - */ -int odpdrv_shm_pool_print(const char *title, odpdrv_shm_pool_t pool); -/** - * @} - */ - -#ifdef __cplusplus -} -#endif - -#include <odp/visibility_end.h> -#endif diff --git a/include/odp/drv/spec/spinlock.h b/include/odp/drv/spec/spinlock.h deleted file mode 100644 index 52efb565..00000000 --- a/include/odp/drv/spec/spinlock.h +++ /dev/null @@ -1,86 +0,0 @@ -/* Copyright (c) 2016, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -/** - * @file - * - * ODPDRV spinlock - */ - -#ifndef ODPDRV_API_SPINLOCK_H_ -#define ODPDRV_API_SPINLOCK_H_ -#include <odp/visibility_begin.h> - -#ifdef __cplusplus -extern "C" { -#endif - -/** - * @addtogroup odpdrv_locks - * @details - * Spin lock (odpdrv_spinlock_t) - * - * Spinlock simply re-tries to acquire the lock as long as takes to succeed. - * Spinlock is not fair since some threads may succeed more often than others. - * @{ - */ - -/** - * @typedef odpdrv_spinlock_t - * ODPDRV spinlock - */ - -/** - * Initialize spin lock. - * - * @param splock Pointer to a spin lock - */ -void odpdrv_spinlock_init(odpdrv_spinlock_t *splock); - -/** - * Acquire spin lock. - * - * @param splock Pointer to a spin lock - */ -void odpdrv_spinlock_lock(odpdrv_spinlock_t *splock); - -/** - * Try to acquire spin lock. - * - * @param splock Pointer to a spin lock - * - * @retval 0 lock not acquired - * @retval !0 lock acquired - */ -int odpdrv_spinlock_trylock(odpdrv_spinlock_t *splock); - -/** - * Release spin lock. - * - * @param splock Pointer to a spin lock - */ -void odpdrv_spinlock_unlock(odpdrv_spinlock_t *splock); - -/** - * Check if spin lock is busy (locked). - * - * @param splock Pointer to a spin lock - * - * @retval 1 lock busy (locked) - * @retval 0 lock not busy. - */ -int odpdrv_spinlock_is_locked(odpdrv_spinlock_t *splock); - -/** - * @} - */ - -#ifdef __cplusplus -} -#endif - -#include <odp/visibility_end.h> -#endif diff --git a/include/odp/drv/spec/sync.h b/include/odp/drv/spec/sync.h deleted file mode 100644 index ea606855..00000000 --- a/include/odp/drv/spec/sync.h +++ /dev/null @@ -1,91 +0,0 @@ -/* Copyright (c) 2016, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -/** - * @file - * - * ODPDRV memory barriers - */ - -#ifndef ODPDRV_API_SYNC_H_ -#define ODPDRV_API_SYNC_H_ -#include <odp/visibility_begin.h> - -#ifdef __cplusplus -extern "C" { -#endif - -/** - * @addtogroup odpdrv_barrier - * @details - * Memory barriers - * - * Memory barriers enforce ordering of memory load and store operations - * specified before and after the barrier. These barriers may affect both - * compiler optimizations and CPU out-of-order execution. All ODPDRV - * synchronization mechanisms (e.g. execution barriers, locks, queues, etc ) - * include all necessary memory barriers, so these calls are not needed when - * using those. Also ODPDRV atomic operations have memory ordered versions. - * These explicit barriers may be needed when thread synchronization is based on - * a non-ODPDRV defined mechanism. Depending on the HW platform, heavy usage of - * memory barriers may cause significant performance degradation. - * - * @{ - */ - -/** - * Memory barrier for release operations - * - * This memory barrier has release semantics. It synchronizes with a pairing - * barrier for acquire operations. The releasing and acquiring threads - * synchronize through shared memory. The releasing thread must call this - * barrier before signaling the acquiring thread. After the acquiring thread - * receives the signal, it must call odpdrv_mb_acquire() before it reads the - * memory written by the releasing thread. - * - * This call is not needed when using ODPDRV defined synchronization mechanisms. - * - * @see odpdrv_mb_acquire() - */ -void odpdrv_mb_release(void); - -/** - * Memory barrier for acquire operations - * - * This memory barrier has acquire semantics. It synchronizes with a pairing - * barrier for release operations. The releasing and acquiring threads - * synchronize through shared memory. The releasing thread must call - * odpdrv_mb_release() before signaling the acquiring thread. After the - * acquiring thread receives the signal, it must call this barrier before it - * read the memory written by the releasing thread. - * - * This call is not needed when using ODPDRV defined synchronization mechanisms. - * - * @see odpdrv_mb_release() - */ -void odpdrv_mb_acquire(void); - -/** - * Full memory barrier - * - * This is a full memory barrier. It guarantees that all load and store - * operations specified before it are visible to other threads before - * all load and store operations specified after it. - * - * This call is not needed when using ODPDRV defined synchronization mechanisms. - */ -void odpdrv_mb_full(void); - -/** - * @} - */ - -#ifdef __cplusplus -} -#endif - -#include <odp/visibility_end.h> -#endif diff --git a/include/odp_drv.h b/include/odp_drv.h deleted file mode 100644 index 96d81ba6..00000000 --- a/include/odp_drv.h +++ /dev/null @@ -1,35 +0,0 @@ -/* Copyright (c) 2016, Linaro Limited - * All rights reserved - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -/** - * @file - * - * The OpenDataPlane nic driver programming interface - * - */ - -#ifndef ODP_DRV_H_ -#define ODP_DRV_H_ - -#ifdef __cplusplus -extern C { -#endif - -#include <odp/drv/align.h> -#include <odp/drv/atomic.h> -#include <odp/drv/barrier.h> -#include <odp/drv/byteorder.h> -#include <odp/drv/compiler.h> -#include <odp/drv/driver.h> -#include <odp/drv/shm.h> -#include <odp/drv/spinlock.h> -#include <odp/drv/std_types.h> -#include <odp/drv/sync.h> - -#ifdef __cplusplus -} -#endif -#endif diff --git a/platform/linux-generic/_ishm.c b/platform/linux-generic/_ishm.c index 238efb81..45fd0714 100644 --- a/platform/linux-generic/_ishm.c +++ b/platform/linux-generic/_ishm.c @@ -54,7 +54,6 @@ #include <odp/api/align.h> #include <odp/api/system_info.h> #include <odp/api/debug.h> -#include <odp/drv/shm.h> #include <odp_shm_internal.h> #include <odp_debug_internal.h> #include <odp_align_internal.h> @@ -86,7 +85,7 @@ * if some of the block ownwers never procsync() after free). This number * should take that into account) */ -#define ISHM_MAX_NB_BLOCKS ODPDRV_CONFIG_SHM_BLOCKS +#define ISHM_MAX_NB_BLOCKS 128 /* * Maximum internal shared memory block name length in chars diff --git a/platform/linux-generic/_ishmpool.c b/platform/linux-generic/_ishmpool.c index f196a6d8..c72209d9 100644 --- a/platform/linux-generic/_ishmpool.c +++ b/platform/linux-generic/_ishmpool.c @@ -48,7 +48,6 @@ #include <odp/api/spinlock.h> #include <odp/api/align.h> #include <odp/api/debug.h> -#include <odp/drv/shm.h> #include <odp_shm_internal.h> #include <odp_debug_internal.h> #include <odp_align_internal.h> diff --git a/platform/linux-generic/drv_atomic.c b/platform/linux-generic/drv_atomic.c deleted file mode 100644 index 72c85e84..00000000 --- a/platform/linux-generic/drv_atomic.c +++ /dev/null @@ -1,26 +0,0 @@ -/* Copyright (c) 2016, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#include <odp/drv/atomic.h> - -int odpdrv_atomic_lock_free_u64(odpdrv_atomic_op_t *atomic_op) -{ -#if __GCC_ATOMIC_LLONG_LOCK_FREE < 2 - /* All operations have locks */ - if (atomic_op) - atomic_op->all_bits = 0; - - return 0; -#else - /* All operations are lock-free */ - if (atomic_op) { - atomic_op->all_bits = ~((uint32_t)0); - atomic_op->op.init = 0; - } - - return 2; -#endif -} diff --git a/platform/linux-generic/drv_barrier.c b/platform/linux-generic/drv_barrier.c deleted file mode 100644 index 7a83981f..00000000 --- a/platform/linux-generic/drv_barrier.c +++ /dev/null @@ -1,50 +0,0 @@ -/* Copyright (c) 2016, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#include <odp/drv/barrier.h> -#include <odp/drv/sync.h> -#include <odp/api/cpu.h> -#include <odp/drv/atomic.h> - -void odpdrv_barrier_init(odpdrv_barrier_t *barrier, int count) -{ - barrier->count = (uint32_t)count; - odpdrv_atomic_init_u32(&barrier->bar, 0); -} - -/* - * Efficient barrier_sync - - * - * Barriers are initialized with a count of the number of callers - * that must sync on the barrier before any may proceed. - * - * To avoid race conditions and to permit the barrier to be fully - * reusable, the barrier value cycles between 0..2*count-1. When - * synchronizing the wasless variable simply tracks which half of - * the cycle the barrier was in upon entry. Exit is when the - * barrier crosses to the other half of the cycle. - */ -void odpdrv_barrier_wait(odpdrv_barrier_t *barrier) -{ - uint32_t count; - int wasless; - - odpdrv_mb_full(); - - count = odpdrv_atomic_fetch_inc_u32(&barrier->bar); - wasless = count < barrier->count; - - if (count == 2 * barrier->count - 1) { - /* Wrap around *atomically* */ - odpdrv_atomic_sub_u32(&barrier->bar, 2 * barrier->count); - } else { - while ((odpdrv_atomic_load_u32(&barrier->bar) < barrier->count) - == wasless) - odp_cpu_pause(); - } - - odpdrv_mb_full(); -} diff --git a/platform/linux-generic/drv_driver.c b/platform/linux-generic/drv_driver.c deleted file mode 100644 index 529da48f..00000000 --- a/platform/linux-generic/drv_driver.c +++ /dev/null @@ -1,64 +0,0 @@ -/* 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/drv_shm.c b/platform/linux-generic/drv_shm.c deleted file mode 100644 index 325632e1..00000000 --- a/platform/linux-generic/drv_shm.c +++ /dev/null @@ -1,146 +0,0 @@ -/* Copyright (c) 2016, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#include <odp_config_internal.h> -#include <odp/api/std_types.h> -#include <odp/drv/shm.h> -#include <_ishm_internal.h> -#include <_ishmpool_internal.h> - -static inline uint32_t from_handle(odpdrv_shm_t shm) -{ - return _odpdrv_typeval(shm) - 1; -} - -static inline odpdrv_shm_t to_handle(uint32_t index) -{ - return _odpdrv_cast_scalar(odpdrv_shm_t, index + 1); -} - -int odpdrv_shm_capability(odpdrv_shm_capability_t *capa) -{ - capa->max_blocks = ODPDRV_CONFIG_SHM_BLOCKS; - capa->max_size = 0; - capa->max_align = 0; - - return 0; -} - -odpdrv_shm_t odpdrv_shm_reserve(const char *name, uint64_t size, uint64_t align, - uint32_t flags) -{ - int block_index; - int flgs = 0; /* internal ishm flags */ - - /* set internal ishm flags according to API flags: */ - flgs |= (flags & ODPDRV_SHM_SINGLE_VA) ? _ODP_ISHM_SINGLE_VA : 0; - flgs |= (flags & ODPDRV_SHM_LOCK) ? _ODP_ISHM_LOCK : 0; - - block_index = _odp_ishm_reserve(name, size, -1, align, flgs, flags); - if (block_index >= 0) - return to_handle(block_index); - else - return ODPDRV_SHM_INVALID; -} - -int odpdrv_shm_free_by_handle(odpdrv_shm_t shm) -{ - return _odp_ishm_free_by_index(from_handle(shm)); -} - -int odpdrv_shm_free_by_name(const char *name) -{ - return _odp_ishm_free_by_name(name); -} - -int odpdrv_shm_free_by_address(void *address) -{ - return _odp_ishm_free_by_address(address); -} - -void *odpdrv_shm_lookup_by_handle(odpdrv_shm_t shm) -{ - return _odp_ishm_lookup_by_index(from_handle(shm)); -} - -odpdrv_shm_t odpdrv_shm_lookup_by_name(const char *name) -{ - return to_handle(_odp_ishm_lookup_by_name(name)); -} - -odpdrv_shm_t odpdrv_shm_lookup_by_address(void *address) -{ - return to_handle(_odp_ishm_lookup_by_address(address)); -} - -void *odpdrv_shm_addr(odpdrv_shm_t shm) -{ - return _odp_ishm_address(from_handle(shm)); -} - -int odpdrv_shm_info(odpdrv_shm_t shm, odpdrv_shm_info_t *info) -{ - _odp_ishm_info_t ishm_info; - - if (_odp_ishm_info(from_handle(shm), &ishm_info)) - return -1; - - info->name = ishm_info.name; - info->addr = ishm_info.addr; - info->size = ishm_info.size; - info->page_size = ishm_info.page_size; - info->flags = ishm_info.user_flags; - - return 0; -} - -int odpdrv_shm_print_all(const char *title) -{ - return _odp_ishm_status(title); -} - -odpdrv_shm_pool_t odpdrv_shm_pool_create(const char *pool_name, - odpdrv_shm_pool_param_t *param) -{ - int flags; - - /* force unique address for all ODP threads */ - flags = _ODP_ISHM_SINGLE_VA; - return (odpdrv_shm_pool_t)_odp_ishm_pool_create(pool_name, - param->pool_size, - param->min_alloc, - param->max_alloc, - flags); -} - -int odpdrv_shm_pool_destroy(odpdrv_shm_pool_t pool) -{ - return _odp_ishm_pool_destroy((_odp_ishm_pool_t *)(void*)pool); -} - -odpdrv_shm_pool_t odpdrv_shm_pool_lookup(const char *name) -{ - return (odpdrv_shm_pool_t)_odp_ishm_pool_lookup(name); -} - -void *odpdrv_shm_pool_alloc(odpdrv_shm_pool_t pool, uint64_t size) -{ - return _odp_ishm_pool_alloc((_odp_ishm_pool_t *)(void*)pool, size); -} - -void odpdrv_shm_pool_free(odpdrv_shm_pool_t pool, void *addr) -{ - (void)_odp_ishm_pool_free((_odp_ishm_pool_t *)(void*)pool, addr); -} - -int odpdrv_shm_pool_print(const char *title, odpdrv_shm_pool_t pool) -{ - return _odp_ishm_pool_status(title, (_odp_ishm_pool_t *)(void*)pool); -} - -/** - * @} - */ diff --git a/platform/linux-generic/drv_spinlock.c b/platform/linux-generic/drv_spinlock.c deleted file mode 100644 index 69e3da76..00000000 --- a/platform/linux-generic/drv_spinlock.c +++ /dev/null @@ -1,39 +0,0 @@ -/* Copyright (c) 2016, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#include <odp/drv/spinlock.h> -#include <odp_atomic_internal.h> - -void odpdrv_spinlock_init(odpdrv_spinlock_t *spinlock) -{ - _odp_atomic_flag_init(&spinlock->lock, 0); -} - -void odpdrv_spinlock_lock(odpdrv_spinlock_t *spinlock) -{ - /* While the lock is already taken... */ - while (_odp_atomic_flag_tas(&spinlock->lock)) - /* ...spin reading the flag (relaxed MM), - * the loop will exit when the lock becomes available - * and we will retry the TAS operation above */ - while (_odp_atomic_flag_load(&spinlock->lock)) - odp_cpu_pause(); -} - -int odpdrv_spinlock_trylock(odpdrv_spinlock_t *spinlock) -{ - return (_odp_atomic_flag_tas(&spinlock->lock) == 0); -} - -void odpdrv_spinlock_unlock(odpdrv_spinlock_t *spinlock) -{ - _odp_atomic_flag_clear(&spinlock->lock); -} - -int odpdrv_spinlock_is_locked(odpdrv_spinlock_t *spinlock) -{ - return _odp_atomic_flag_load(&spinlock->lock) != 0; -} diff --git a/platform/linux-generic/include/odp/drv/align.h b/platform/linux-generic/include/odp/drv/align.h deleted file mode 100644 index 7636f893..00000000 --- a/platform/linux-generic/include/odp/drv/align.h +++ /dev/null @@ -1,58 +0,0 @@ -/* Copyright (c) 2016, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -/** - * @file - * - * ODPDRV alignments - */ - -#ifndef ODPDRV_PLAT_ALIGN_H_ -#define ODPDRV_PLAT_ALIGN_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -#include <odp/api/cpu_arch.h> - -/** @ingroup odpdrv_compiler_optim - * @{ - */ - -#ifdef __GNUC__ - -#define ODPDRV_ALIGNED(x) __attribute__((__aligned__(x))) - -#define ODPDRV_PACKED __attribute__((__packed__)) - -#define ODPDRV_OFFSETOF(type, member) __builtin_offsetof(type, member) - -#define ODPDRV_FIELD_SIZEOF(type, member) sizeof(((type *)0)->member) - -#else -#error Non-gcc compatible compiler -#endif - -#define ODPDRV_CACHE_LINE_SIZE _ODP_CACHE_LINE_SIZE - -#define ODPDRV_PAGE_SIZE 4096 - -#define ODPDRV_ALIGNED_CACHE ODPDRV_ALIGNED(ODPDRV_CACHE_LINE_SIZE) - -#define ODPDRV_ALIGNED_PAGE ODPDRV_ALIGNED(ODPDRV_PAGE_SIZE) - -/** - * @} - */ - -#include <odp/drv/spec/align.h> - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/platform/linux-generic/include/odp/drv/atomic.h b/platform/linux-generic/include/odp/drv/atomic.h deleted file mode 100644 index 7d922da2..00000000 --- a/platform/linux-generic/include/odp/drv/atomic.h +++ /dev/null @@ -1,430 +0,0 @@ -/* Copyright (c) 2016, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -/** - * @file - * - * ODPDRV atomic operations - */ - -#ifndef ODPDRV_PLAT_ATOMIC_H_ -#define ODPDRV_PLAT_ATOMIC_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -#include <odp/drv/align.h> -#include <odp/drv/plat/atomic_types.h> - -/** @ingroup odpdrv_atomic - * @{ - */ - -static inline void odpdrv_atomic_init_u32(odpdrv_atomic_u32_t *atom, - uint32_t val) -{ - __atomic_store_n(&atom->v, val, __ATOMIC_RELAXED); -} - -static inline uint32_t odpdrv_atomic_load_u32(odpdrv_atomic_u32_t *atom) -{ - return __atomic_load_n(&atom->v, __ATOMIC_RELAXED); -} - -static inline void odpdrv_atomic_store_u32(odpdrv_atomic_u32_t *atom, - uint32_t val) -{ - __atomic_store_n(&atom->v, val, __ATOMIC_RELAXED); -} - -static inline uint32_t odpdrv_atomic_fetch_add_u32(odpdrv_atomic_u32_t *atom, - uint32_t val) -{ - return __atomic_fetch_add(&atom->v, val, __ATOMIC_RELAXED); -} - -static inline void odpdrv_atomic_add_u32(odpdrv_atomic_u32_t *atom, - uint32_t val) -{ - (void)__atomic_fetch_add(&atom->v, val, __ATOMIC_RELAXED); -} - -static inline uint32_t odpdrv_atomic_fetch_sub_u32(odpdrv_atomic_u32_t *atom, - uint32_t val) -{ - return __atomic_fetch_sub(&atom->v, val, __ATOMIC_RELAXED); -} - -static inline void odpdrv_atomic_sub_u32(odpdrv_atomic_u32_t *atom, - uint32_t val) -{ - (void)__atomic_fetch_sub(&atom->v, val, __ATOMIC_RELAXED); -} - -static inline uint32_t odpdrv_atomic_fetch_inc_u32(odpdrv_atomic_u32_t *atom) -{ - return __atomic_fetch_add(&atom->v, 1, __ATOMIC_RELAXED); -} - -static inline void odpdrv_atomic_inc_u32(odpdrv_atomic_u32_t *atom) -{ - (void)__atomic_fetch_add(&atom->v, 1, __ATOMIC_RELAXED); -} - -static inline uint32_t odpdrv_atomic_fetch_dec_u32(odpdrv_atomic_u32_t *atom) -{ - return __atomic_fetch_sub(&atom->v, 1, __ATOMIC_RELAXED); -} - -static inline void odpdrv_atomic_dec_u32(odpdrv_atomic_u32_t *atom) -{ - (void)__atomic_fetch_sub(&atom->v, 1, __ATOMIC_RELAXED); -} - -static inline int odpdrv_atomic_cas_u32(odpdrv_atomic_u32_t *atom, - uint32_t *old_val, uint32_t new_val) -{ - return __atomic_compare_exchange_n(&atom->v, old_val, new_val, - 0 /* strong */, - __ATOMIC_RELAXED, - __ATOMIC_RELAXED); -} - -static inline uint32_t odpdrv_atomic_xchg_u32(odpdrv_atomic_u32_t *atom, - uint32_t new_val) -{ - return __atomic_exchange_n(&atom->v, new_val, __ATOMIC_RELAXED); -} - -static inline void odpdrv_atomic_max_u32(odpdrv_atomic_u32_t *atom, - uint32_t new_max) -{ - uint32_t old_val; - - old_val = odpdrv_atomic_load_u32(atom); - - while (new_max > old_val) { - if (odpdrv_atomic_cas_u32(atom, &old_val, new_max)) - break; - } -} - -static inline void odpdrv_atomic_min_u32(odpdrv_atomic_u32_t *atom, - uint32_t new_min) -{ - uint32_t old_val; - - old_val = odpdrv_atomic_load_u32(atom); - - while (new_min < old_val) { - if (odpdrv_atomic_cas_u32(atom, &old_val, new_min)) - break; - } -} - -static inline void odpdrv_atomic_init_u64(odpdrv_atomic_u64_t *atom, - uint64_t val) -{ - atom->v = val; -#if __GCC_ATOMIC_LLONG_LOCK_FREE < 2 - __atomic_clear(&atom->lock, __ATOMIC_RELAXED); -#endif -} - -static inline uint64_t odpdrv_atomic_load_u64(odpdrv_atomic_u64_t *atom) -{ -#if __GCC_ATOMIC_LLONG_LOCK_FREE < 2 - return ATOMIC_OP(atom, (void)0); -#else - return __atomic_load_n(&atom->v, __ATOMIC_RELAXED); -#endif -} - -static inline void odpdrv_atomic_store_u64(odpdrv_atomic_u64_t *atom, - uint64_t val) -{ -#if __GCC_ATOMIC_LLONG_LOCK_FREE < 2 - (void)ATOMIC_OP(atom, atom->v = val); -#else - __atomic_store_n(&atom->v, val, __ATOMIC_RELAXED); -#endif -} - -static inline uint64_t odpdrv_atomic_fetch_add_u64(odpdrv_atomic_u64_t *atom, - uint64_t val) -{ -#if __GCC_ATOMIC_LLONG_LOCK_FREE < 2 - return ATOMIC_OP(atom, atom->v += val); -#else - return __atomic_fetch_add(&atom->v, val, __ATOMIC_RELAXED); -#endif -} - -static inline void odpdrv_atomic_add_u64(odpdrv_atomic_u64_t *atom, - uint64_t val) -{ -#if __GCC_ATOMIC_LLONG_LOCK_FREE < 2 - (void)ATOMIC_OP(atom, atom->v += val); -#else - (void)__atomic_fetch_add(&atom->v, val, __ATOMIC_RELAXED); -#endif -} - -static inline uint64_t odpdrv_atomic_fetch_sub_u64(odpdrv_atomic_u64_t *atom, - uint64_t val) -{ -#if __GCC_ATOMIC_LLONG_LOCK_FREE < 2 - return ATOMIC_OP(atom, atom->v -= val); -#else - return __atomic_fetch_sub(&atom->v, val, __ATOMIC_RELAXED); -#endif -} - -static inline void odpdrv_atomic_sub_u64(odpdrv_atomic_u64_t *atom, - uint64_t val) -{ -#if __GCC_ATOMIC_LLONG_LOCK_FREE < 2 - (void)ATOMIC_OP(atom, atom->v -= val); -#else - (void)__atomic_fetch_sub(&atom->v, val, __ATOMIC_RELAXED); -#endif -} - -static inline uint64_t odpdrv_atomic_fetch_inc_u64(odpdrv_atomic_u64_t *atom) -{ -#if __GCC_ATOMIC_LLONG_LOCK_FREE < 2 - return ATOMIC_OP(atom, atom->v++); -#else - return __atomic_fetch_add(&atom->v, 1, __ATOMIC_RELAXED); -#endif -} - -static inline void odpdrv_atomic_inc_u64(odpdrv_atomic_u64_t *atom) -{ -#if __GCC_ATOMIC_LLONG_LOCK_FREE < 2 - (void)ATOMIC_OP(atom, atom->v++); -#else - (void)__atomic_fetch_add(&atom->v, 1, __ATOMIC_RELAXED); -#endif -} - -static inline uint64_t odpdrv_atomic_fetch_dec_u64(odpdrv_atomic_u64_t *atom) -{ -#if __GCC_ATOMIC_LLONG_LOCK_FREE < 2 - return ATOMIC_OP(atom, atom->v--); -#else - return __atomic_fetch_sub(&atom->v, 1, __ATOMIC_RELAXED); -#endif -} - -static inline void odpdrv_atomic_dec_u64(odpdrv_atomic_u64_t *atom) -{ -#if __GCC_ATOMIC_LLONG_LOCK_FREE < 2 - (void)ATOMIC_OP(atom, atom->v--); -#else - (void)__atomic_fetch_sub(&atom->v, 1, __ATOMIC_RELAXED); -#endif -} - -static inline int odpdrv_atomic_cas_u64(odpdrv_atomic_u64_t *atom, - uint64_t *old_val, uint64_t new_val) -{ -#if __GCC_ATOMIC_LLONG_LOCK_FREE < 2 - int ret; - *old_val = ATOMIC_OP(atom, ATOMIC_CAS_OP(&ret, *old_val, new_val)); - return ret; -#else - return __atomic_compare_exchange_n(&atom->v, old_val, new_val, - 0 /* strong */, - __ATOMIC_RELAXED, - __ATOMIC_RELAXED); -#endif -} - -static inline uint64_t odpdrv_atomic_xchg_u64(odpdrv_atomic_u64_t *atom, - uint64_t new_val) -{ -#if __GCC_ATOMIC_LLONG_LOCK_FREE < 2 - return ATOMIC_OP(atom, atom->v = new_val); -#else - return __atomic_exchange_n(&atom->v, new_val, __ATOMIC_RELAXED); -#endif -} - -static inline void odpdrv_atomic_max_u64(odpdrv_atomic_u64_t *atom, - uint64_t new_max) -{ - uint64_t old_val; - - old_val = odpdrv_atomic_load_u64(atom); - - while (new_max > old_val) { - if (odpdrv_atomic_cas_u64(atom, &old_val, new_max)) - break; - } -} - -static inline void odpdrv_atomic_min_u64(odpdrv_atomic_u64_t *atom, - uint64_t new_min) -{ - uint64_t old_val; - - old_val = odpdrv_atomic_load_u64(atom); - - while (new_min < old_val) { - if (odpdrv_atomic_cas_u64(atom, &old_val, new_min)) - break; - } -} - -static inline uint32_t odpdrv_atomic_load_acq_u32(odpdrv_atomic_u32_t *atom) -{ - return __atomic_load_n(&atom->v, __ATOMIC_ACQUIRE); -} - -static inline void odpdrv_atomic_store_rel_u32(odpdrv_atomic_u32_t *atom, - uint32_t val) -{ - __atomic_store_n(&atom->v, val, __ATOMIC_RELEASE); -} - -static inline void odpdrv_atomic_add_rel_u32(odpdrv_atomic_u32_t *atom, - uint32_t val) -{ - (void)__atomic_fetch_add(&atom->v, val, __ATOMIC_RELEASE); -} - -static inline void odpdrv_atomic_sub_rel_u32(odpdrv_atomic_u32_t *atom, - uint32_t val) -{ - (void)__atomic_fetch_sub(&atom->v, val, __ATOMIC_RELEASE); -} - -static inline int odpdrv_atomic_cas_acq_u32(odpdrv_atomic_u32_t *atom, - uint32_t *old_val, uint32_t new_val) -{ - return __atomic_compare_exchange_n(&atom->v, old_val, new_val, - 0 /* strong */, - __ATOMIC_ACQUIRE, - __ATOMIC_RELAXED); -} - -static inline int odpdrv_atomic_cas_rel_u32(odpdrv_atomic_u32_t *atom, - uint32_t *old_val, uint32_t new_val) -{ - return __atomic_compare_exchange_n(&atom->v, old_val, new_val, - 0 /* strong */, - __ATOMIC_RELEASE, - __ATOMIC_RELAXED); -} - -static inline int odpdrv_atomic_cas_acq_rel_u32(odpdrv_atomic_u32_t *atom, - uint32_t *old_val, - uint32_t new_val) -{ - return __atomic_compare_exchange_n(&atom->v, old_val, new_val, - 0 /* strong */, - __ATOMIC_ACQ_REL, - __ATOMIC_RELAXED); -} - -static inline uint64_t odpdrv_atomic_load_acq_u64(odpdrv_atomic_u64_t *atom) -{ -#if __GCC_ATOMIC_LLONG_LOCK_FREE < 2 - return ATOMIC_OP(atom, (void)0); -#else - return __atomic_load_n(&atom->v, __ATOMIC_ACQUIRE); -#endif -} - -static inline void odpdrv_atomic_store_rel_u64(odpdrv_atomic_u64_t *atom, - uint64_t val) -{ -#if __GCC_ATOMIC_LLONG_LOCK_FREE < 2 - (void)ATOMIC_OP(atom, atom->v = val); -#else - __atomic_store_n(&atom->v, val, __ATOMIC_RELEASE); -#endif -} - -static inline void odpdrv_atomic_add_rel_u64(odpdrv_atomic_u64_t *atom, - uint64_t val) -{ -#if __GCC_ATOMIC_LLONG_LOCK_FREE < 2 - (void)ATOMIC_OP(atom, atom->v += val); -#else - (void)__atomic_fetch_add(&atom->v, val, __ATOMIC_RELEASE); -#endif -} - -static inline void odpdrv_atomic_sub_rel_u64(odpdrv_atomic_u64_t *atom, - uint64_t val) -{ -#if __GCC_ATOMIC_LLONG_LOCK_FREE < 2 - (void)ATOMIC_OP(atom, atom->v -= val); -#else - (void)__atomic_fetch_sub(&atom->v, val, __ATOMIC_RELEASE); -#endif -} - -static inline int odpdrv_atomic_cas_acq_u64(odpdrv_atomic_u64_t *atom, - uint64_t *old_val, uint64_t new_val) -{ -#if __GCC_ATOMIC_LLONG_LOCK_FREE < 2 - int ret; - *old_val = ATOMIC_OP(atom, ATOMIC_CAS_OP(&ret, *old_val, new_val)); - return ret; -#else - return __atomic_compare_exchange_n(&atom->v, old_val, new_val, - 0 /* strong */, - __ATOMIC_ACQUIRE, - __ATOMIC_RELAXED); -#endif -} - -static inline int odpdrv_atomic_cas_rel_u64(odpdrv_atomic_u64_t *atom, - uint64_t *old_val, uint64_t new_val) -{ -#if __GCC_ATOMIC_LLONG_LOCK_FREE < 2 - int ret; - *old_val = ATOMIC_OP(atom, ATOMIC_CAS_OP(&ret, *old_val, new_val)); - return ret; -#else - return __atomic_compare_exchange_n(&atom->v, old_val, new_val, - 0 /* strong */, - __ATOMIC_RELEASE, - __ATOMIC_RELAXED); -#endif -} - -static inline int odpdrv_atomic_cas_acq_rel_u64(odpdrv_atomic_u64_t *atom, - uint64_t *old_val, - uint64_t new_val) -{ -#if __GCC_ATOMIC_LLONG_LOCK_FREE < 2 - int ret; - *old_val = ATOMIC_OP(atom, ATOMIC_CAS_OP(&ret, *old_val, new_val)); - return ret; -#else - return __atomic_compare_exchange_n(&atom->v, old_val, new_val, - 0 /* strong */, - __ATOMIC_ACQ_REL, - __ATOMIC_RELAXED); -#endif -} - -/** - * @} - */ - -#include <odp/drv/spec/atomic.h> - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/platform/linux-generic/include/odp/drv/barrier.h b/platform/linux-generic/include/odp/drv/barrier.h deleted file mode 100644 index 877cacf8..00000000 --- a/platform/linux-generic/include/odp/drv/barrier.h +++ /dev/null @@ -1,30 +0,0 @@ -/* Copyright (c) 2016, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -/** - * @file - * - * ODPDRV execution barriers - */ - -#ifndef ODPDRV_PLAT_BARRIER_H_ -#define ODPDRV_PLAT_BARRIER_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -#include <odp/drv/std_types.h> -#include <odp/drv/atomic.h> -#include <odp/drv/plat/barrier_types.h> - -#include <odp/drv/spec/barrier.h> - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/platform/linux-generic/include/odp/drv/byteorder.h b/platform/linux-generic/include/odp/drv/byteorder.h deleted file mode 100644 index 3991b265..00000000 --- a/platform/linux-generic/include/odp/drv/byteorder.h +++ /dev/null @@ -1,146 +0,0 @@ -/* Copyright (c) 2016, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -/** - * @file - * - * ODPDRV byteorder - */ - -#ifndef ODPDRV_PLAT_BYTEORDER_H_ -#define ODPDRV_PLAT_BYTEORDER_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -#include <odp/drv/plat/byteorder_types.h> -#include <odp/drv/std_types.h> -#include <odp/drv/compiler.h> - -/** @ingroup odpdrv_compiler_optim - * @{ - */ - -static inline uint16_t odpdrv_be_to_cpu_16(odpdrv_u16be_t be16) -{ -#if ODPDRV_BYTE_ORDER == ODPDRV_LITTLE_ENDIAN - return __odpdrv_builtin_bswap16((__odpdrv_force uint16_t)be16); -#else - return (__odpdrv_force uint16_t)be16; -#endif -} - -static inline uint32_t odpdrv_be_to_cpu_32(odpdrv_u32be_t be32) -{ -#if ODPDRV_BYTE_ORDER == ODPDRV_LITTLE_ENDIAN - return __builtin_bswap32((__odpdrv_force uint32_t)be32); -#else - return (__odpdrv_force uint32_t)be32; -#endif -} - -static inline uint64_t odpdrv_be_to_cpu_64(odpdrv_u64be_t be64) -{ -#if ODPDRV_BYTE_ORDER == ODPDRV_LITTLE_ENDIAN - return __builtin_bswap64((__odpdrv_force uint64_t)be64); -#else - return (__odpdrv_force uint64_t)be64; -#endif -} - -static inline odpdrv_u16be_t odpdrv_cpu_to_be_16(uint16_t cpu16) -{ -#if ODPDRV_BYTE_ORDER == ODPDRV_LITTLE_ENDIAN - return (__odpdrv_force odpdrv_u16be_t)__odpdrv_builtin_bswap16(cpu16); -#else - return (__odpdrv_force odpdrv_u16be_t)cpu16; -#endif -} - -static inline odpdrv_u32be_t odpdrv_cpu_to_be_32(uint32_t cpu32) -{ -#if ODPDRV_BYTE_ORDER == ODPDRV_LITTLE_ENDIAN - return (__odpdrv_force odpdrv_u32be_t)__builtin_bswap32(cpu32); -#else - return (__odpdrv_force odpdrv_u32be_t)cpu32; -#endif -} - -static inline odpdrv_u64be_t odpdrv_cpu_to_be_64(uint64_t cpu64) -{ -#if ODPDRV_BYTE_ORDER == ODPDRV_LITTLE_ENDIAN - return (__odpdrv_force odpdrv_u64be_t)__builtin_bswap64(cpu64); -#else - return (__odpdrv_force odpdrv_u64be_t)cpu64; -#endif -} - -static inline uint16_t odpdrv_le_to_cpu_16(odpdrv_u16le_t le16) -{ -#if ODPDRV_BYTE_ORDER == ODPDRV_LITTLE_ENDIAN - return (__odpdrv_force uint16_t)le16; -#else - return __odpdrv_builtin_bswap16((__odpdrv_force uint16_t)le16); -#endif -} - -static inline uint32_t odpdrv_le_to_cpu_32(odpdrv_u32le_t le32) -{ -#if ODPDRV_BYTE_ORDER == ODPDRV_LITTLE_ENDIAN - return (__odpdrv_force uint32_t)le32; -#else - return __builtin_bswap32((__odpdrv_force uint32_t)le32); -#endif -} - -static inline uint64_t odpdrv_le_to_cpu_64(odpdrv_u64le_t le64) -{ -#if ODPDRV_BYTE_ORDER == ODPDRV_LITTLE_ENDIAN - return (__odpdrv_force uint64_t)le64; -#else - return __builtin_bswap64((__odpdrv_force uint64_t)le64); -#endif -} - -static inline odpdrv_u16le_t odpdrv_cpu_to_le_16(uint16_t cpu16) -{ -#if ODPDRV_BYTE_ORDER == ODPDRV_LITTLE_ENDIAN - return (__odpdrv_force odpdrv_u16le_t)cpu16; -#else - return (__odpdrv_force odpdrv_u16le_t)__odpdrv_builtin_bswap16(cpu16); -#endif -} - -static inline odpdrv_u32le_t odpdrv_cpu_to_le_32(uint32_t cpu32) -{ -#if ODPDRV_BYTE_ORDER == ODPDRV_LITTLE_ENDIAN - return (__odpdrv_force odpdrv_u32le_t)cpu32; -#else - return (__odpdrv_force odpdrv_u32le_t)__builtin_bswap32(cpu32); -#endif -} - -static inline odpdrv_u64le_t odpdrv_cpu_to_le_64(uint64_t cpu64) -{ -#if ODPDRV_BYTE_ORDER == ODPDRV_LITTLE_ENDIAN - return (__odpdrv_force odpdrv_u64le_t)cpu64; -#else - return (__odpdrv_force odpdrv_u64le_t)__builtin_bswap64(cpu64); -#endif -} - -/** - * @} - */ - -#include <odp/drv/spec/byteorder.h> - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/platform/linux-generic/include/odp/drv/driver.h b/platform/linux-generic/include/odp/drv/driver.h deleted file mode 100644 index b12c83da..00000000 --- a/platform/linux-generic/include/odp/drv/driver.h +++ /dev/null @@ -1,37 +0,0 @@ -/* 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/atomic_types.h b/platform/linux-generic/include/odp/drv/plat/atomic_types.h deleted file mode 100644 index 6a7ff0d7..00000000 --- a/platform/linux-generic/include/odp/drv/plat/atomic_types.h +++ /dev/null @@ -1,88 +0,0 @@ -/* Copyright (c) 2016, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -/** - * @file - * - * ODPDRV atomic operations - */ - -#ifndef ODPDRV_ATOMIC_TYPES_H_ -#define ODPDRV_ATOMIC_TYPES_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -#include <odp/drv/std_types.h> -#include <odp/drv/align.h> - -/** - * @internal - * Atomic 64-bit unsigned integer - */ -struct odpdrv_atomic_u64_s { - uint64_t v; /**< Actual storage for the atomic variable */ -#if __GCC_ATOMIC_LLONG_LOCK_FREE < 2 - /* Some architectures do not support lock-free operations on 64-bit - * data types. We use a spin lock to ensure atomicity. */ - char lock; /**< Spin lock (if needed) used to ensure atomic access */ -#endif -} ODPDRV_ALIGNED(sizeof(uint64_t)); /* Enforce alignement! */; - -/** - * @internal - * Atomic 32-bit unsigned integer - */ -struct odpdrv_atomic_u32_s { - uint32_t v; /**< Actual storage for the atomic variable */ -} ODPDRV_ALIGNED(sizeof(uint32_t)); /* Enforce alignement! */; - -#if __GCC_ATOMIC_LLONG_LOCK_FREE < 2 - -/** - * @internal - * CAS operation expression for the ATOMIC_OP macro - */ -#define ATOMIC_CAS_OP(ret_ptr, old_val, new_val) \ -({ \ - if (atom->v == (old_val)) { \ - atom->v = (new_val); \ - *(ret_ptr) = 1; \ - } else { \ - *(ret_ptr) = 0; \ - } \ -}) - -/** - * @internal - * Helper macro for lock-based atomic operations on 64-bit integers - * @param[in,out] atom Pointer to the 64-bit atomic variable - * @param expr Expression used update the variable. - * @return The old value of the variable. - */ -#define ATOMIC_OP(atom, expr) \ -({ \ - uint64_t _old_val; \ - /* Loop while lock is already taken, stop when lock becomes clear */ \ - while (__atomic_test_and_set(&(atom)->lock, __ATOMIC_ACQUIRE)) \ - (void)0; \ - _old_val = (atom)->v; \ - (expr); /* Perform whatever update is desired */ \ - __atomic_clear(&(atom)->lock, __ATOMIC_RELEASE); \ - _old_val; /* Return old value */ \ -}) -#endif - -typedef struct odpdrv_atomic_u64_s odpdrv_atomic_u64_t; - -typedef struct odpdrv_atomic_u32_s odpdrv_atomic_u32_t; - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/platform/linux-generic/include/odp/drv/plat/barrier_types.h b/platform/linux-generic/include/odp/drv/plat/barrier_types.h deleted file mode 100644 index 32264a13..00000000 --- a/platform/linux-generic/include/odp/drv/plat/barrier_types.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright (c) 2016, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -/** - * @file - * - * ODPDRV barrier - */ - -#ifndef ODPDRV_BARRIER_TYPES_H_ -#define ODPDRV_BARRIER_TYPES_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -#include <odp/drv/std_types.h> -#include <odp/drv/atomic.h> - -/** - * @internal - * ODPDRV thread synchronization barrier - */ -struct odpdrv_barrier_s { - uint32_t count; /**< Thread count */ - odpdrv_atomic_u32_t bar; /**< Barrier counter */ -}; - -typedef struct odpdrv_barrier_s odpdrv_barrier_t; - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/platform/linux-generic/include/odp/drv/plat/byteorder_types.h b/platform/linux-generic/include/odp/drv/plat/byteorder_types.h deleted file mode 100644 index 5dd182d9..00000000 --- a/platform/linux-generic/include/odp/drv/plat/byteorder_types.h +++ /dev/null @@ -1,84 +0,0 @@ -/* Copyright (c) 2016, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -/** - * @file - * - * ODPDRV byteorder - */ - -#ifndef ODPDRV_BYTEORDER_TYPES_H_ -#define ODPDRV_BYTEORDER_TYPES_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -#ifndef __BYTE_ORDER__ -#error __BYTE_ORDER not defined! -#endif - -#ifndef __ORDER_BIG_ENDIAN__ -#error __BIG_ENDIAN not defined! -#endif - -#ifndef __ORDER_LITTLE_ENDIAN__ -#error __LITTLE_ENDIAN not defined! -#endif - -/* for use with type checkers such as sparse */ -#ifdef __CHECKER__ -/** @internal bitwise attribute */ -#define __odpdrv_bitwise __attribute__((bitwise)) -/** @internal force attribute */ -#define __odpdrv_force __attribute__((force)) -#else -/** @internal bitwise attribute */ -#define __odpdrv_bitwise -/** @internal force attribute */ -#define __odpdrv_force -#endif - -/** @addtogroup odpdrv_compiler_optim - * @{ - */ -#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ - #define ODPDRV_LITTLE_ENDIAN 1 - #define ODPDRV_BIG_ENDIAN 0 - #define ODPDRV_BYTE_ORDER ODPDRV_LITTLE_ENDIAN - #define ODPDRV_LITTLE_ENDIAN_BITFIELD 1 - #define ODPDRV_BIG_ENDIAN_BITFIELD 0 - #define ODPDRV_BITFIELD_ORDER ODPDRV_LITTLE_ENDIAN_BITFIELD -#else - #define ODPDRV_LITTLE_ENDIAN 0 - #define ODPDRV_BIG_ENDIAN 1 - #define ODPDRV_BYTE_ORDER ODPDRV_BIG_ENDIAN - #define ODPDRV_LITTLE_ENDIAN_BITFIELD 0 - #define ODPDRV_BIG_ENDIAN_BITFIELD 1 - #define ODPDRV_BITFIELD_ORDER ODPDRV_BIG_ENDIAN_BITFIELD -#endif - -typedef uint16_t __odpdrv_bitwise odpdrv_u16le_t; -typedef uint16_t __odpdrv_bitwise odpdrv_u16be_t; - -typedef uint32_t __odpdrv_bitwise odpdrv_u32le_t; -typedef uint32_t __odpdrv_bitwise odpdrv_u32be_t; - -typedef uint64_t __odpdrv_bitwise odpdrv_u64le_t; -typedef uint64_t __odpdrv_bitwise odpdrv_u64be_t; - -typedef uint16_t __odpdrv_bitwise odpdrv_u16sum_t; -typedef uint32_t __odpdrv_bitwise odpdrv_u32sum_t; - -/** - * @} - */ - -#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 deleted file mode 100644 index 6c611bd9..00000000 --- a/platform/linux-generic/include/odp/drv/plat/driver_types.h +++ /dev/null @@ -1,52 +0,0 @@ -/* 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 diff --git a/platform/linux-generic/include/odp/drv/plat/shm_types.h b/platform/linux-generic/include/odp/drv/plat/shm_types.h deleted file mode 100644 index 50a08377..00000000 --- a/platform/linux-generic/include/odp/drv/plat/shm_types.h +++ /dev/null @@ -1,49 +0,0 @@ -/* Copyright (c) 2016, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -/** - * @file - * - * ODP shared memory - */ - -#ifndef ODPDRV_SHM_TYPES_H_ -#define ODPDRV_SHM_TYPES_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -#include <odp/drv/std_types.h> -#include <odp/drv/plat/strong_types.h> - -/** @addtogroup odpdrv_shm ODPDRV SHARED MEMORY - * Operations on driver shared memory. - * @{ - */ - -typedef ODPDRV_HANDLE_T(odpdrv_shm_t); - -#define ODPDRV_SHM_INVALID _odpdrv_cast_scalar(odpdrv_shm_t, 0) - -/** Get printable format of odpdrv_shm_t */ -static inline uint64_t odpdrv_shm_to_u64(odpdrv_shm_t hdl) -{ - return _odpdrv_pri(hdl); -} - -typedef ODPDRV_HANDLE_T(odpdrv_shm_pool_t); - -#define ODPDRV_SHM_POOL_INVALID _odpdrv_cast_scalar(odpdrv_shm_pool_t, NULL) -/** - * @} - */ - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/platform/linux-generic/include/odp/drv/plat/spinlock_types.h b/platform/linux-generic/include/odp/drv/plat/spinlock_types.h deleted file mode 100644 index 41dd9acc..00000000 --- a/platform/linux-generic/include/odp/drv/plat/spinlock_types.h +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright (c) 2016, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -/** - * @file - * - * ODPDRV spinlock - */ - -#ifndef ODPDRV_SPINLOCK_TYPES_H_ -#define ODPDRV_SPINLOCK_TYPES_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -#include <odp/drv/std_types.h> - -/** @internal */ -struct odpdrv_spinlock_s { - char lock; /**< lock flag, should match odpdrv_atomic_flag_t */ -}; - -typedef struct odpdrv_spinlock_s odpdrv_spinlock_t; - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/platform/linux-generic/include/odp/drv/plat/strong_types.h b/platform/linux-generic/include/odp/drv/plat/strong_types.h deleted file mode 100644 index a9c48efb..00000000 --- a/platform/linux-generic/include/odp/drv/plat/strong_types.h +++ /dev/null @@ -1,35 +0,0 @@ -/* Copyright (c) 2016, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -/** - * @file - * - * ODPDRV Strong Types. Common macros for implementing strong typing - * for ODPDRV abstract data types - */ - -#ifndef ODPDRV_STRONG_TYPES_H_ -#define ODPDRV_STRONG_TYPES_H_ - -/** Use strong typing for ODPDRV types */ -#ifdef __cplusplus -#define ODPDRV_HANDLE_T(type) struct _##type { uint8_t unused_dummy_var; } *type -#else -#define odpdrv_handle_t struct { uint8_t unused_dummy_var; } * -/** C/C++ helper macro for strong typing */ -#define ODPDRV_HANDLE_T(type) odpdrv_handle_t type -#endif - -/** Internal macro to get value of an ODPDRV handle */ -#define _odpdrv_typeval(handle) ((uint32_t)(uintptr_t)(handle)) - -/** Internal macro to get printable value of an ODPDRV handle */ -#define _odpdrv_pri(handle) ((uint64_t)_odpdrv_typeval(handle)) - -/** Internal macro to convert a scalar to a typed handle */ -#define _odpdrv_cast_scalar(type, val) ((type)(uintptr_t)(val)) - -#endif diff --git a/platform/linux-generic/include/odp/drv/shm.h b/platform/linux-generic/include/odp/drv/shm.h deleted file mode 100644 index 644b0366..00000000 --- a/platform/linux-generic/include/odp/drv/shm.h +++ /dev/null @@ -1,36 +0,0 @@ -/* Copyright (c) 2016, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -/** - * @file - * - * ODPDRV shared memory - */ - -#ifndef ODPDRV_PLAT_SHM_H_ -#define ODPDRV_PLAT_SHM_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -#include <odp/drv/plat/shm_types.h> - -/** @ingroup odpdrv_shm - * @{ - */ - -/** - * @} - */ - -#include <odp/drv/spec/shm.h> - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/platform/linux-generic/include/odp/drv/spinlock.h b/platform/linux-generic/include/odp/drv/spinlock.h deleted file mode 100644 index dd05f8c6..00000000 --- a/platform/linux-generic/include/odp/drv/spinlock.h +++ /dev/null @@ -1,28 +0,0 @@ -/* Copyright (c) 2016, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -/** - * @file - * - * ODPDRV spinlock - */ - -#ifndef ODPDRV_PLAT_SPINLOCK_H_ -#define ODPDRV_PLAT_SPINLOCK_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -#include <odp/drv/plat/spinlock_types.h> - -#include <odp/drv/spec/spinlock.h> - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/platform/linux-generic/include/odp/drv/sync.h b/platform/linux-generic/include/odp/drv/sync.h deleted file mode 100644 index 58521382..00000000 --- a/platform/linux-generic/include/odp/drv/sync.h +++ /dev/null @@ -1,49 +0,0 @@ -/* Copyright (c) 2016, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -/** - * @file - * - * ODPDRV synchronisation - */ - -#ifndef ODPDRV_PLAT_SYNC_H_ -#define ODPDRV_PLAT_SYNC_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -/** @ingroup odpdrv_barrier - * @{ - */ - -static inline void odpdrv_mb_release(void) -{ - __atomic_thread_fence(__ATOMIC_RELEASE); -} - -static inline void odpdrv_mb_acquire(void) -{ - __atomic_thread_fence(__ATOMIC_ACQUIRE); -} - -static inline void odpdrv_mb_full(void) -{ - __atomic_thread_fence(__ATOMIC_SEQ_CST); -} - -/** - * @} - */ - -#include <odp/drv/spec/sync.h> - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/platform/linux-generic/include/odp_config_internal.h b/platform/linux-generic/include/odp_config_internal.h index 9b334df4..c83e573b 100644 --- a/platform/linux-generic/include/odp_config_internal.h +++ b/platform/linux-generic/include/odp_config_internal.h @@ -134,12 +134,6 @@ */ #define ODP_CONFIG_ISHM_VA_PREALLOC_SZ (536870912L) -/* Maximum number of shared memory blocks available on the driver interface. - * - * This the the number of separate SHM areas that can be reserved concurrently - */ -#define ODPDRV_CONFIG_SHM_BLOCKS 48 - /* Maximum event burst size * * This controls the burst size on various enqueue, dequeue, etc calls. Large diff --git a/test/m4/configure.m4 b/test/m4/configure.m4 index 92bb53ad..ef6096e8 100644 --- a/test/m4/configure.m4 +++ b/test/m4/configure.m4 @@ -32,7 +32,4 @@ AC_CONFIG_FILES([test/Makefile test/validation/api/thread/Makefile test/validation/api/time/Makefile test/validation/api/timer/Makefile - test/validation/api/traffic_mngr/Makefile - test/validation/drv/Makefile - test/validation/drv/drvatomic/Makefile - test/validation/drv/drvshmem/Makefile]) + test/validation/api/traffic_mngr/Makefile]) diff --git a/test/validation/Makefile.am b/test/validation/Makefile.am index 17e0444b..32854378 100644 --- a/test/validation/Makefile.am +++ b/test/validation/Makefile.am @@ -1,4 +1,3 @@ if test_vald - SUBDIRS = api \ - drv + SUBDIRS = api endif diff --git a/test/validation/drv/.gitignore b/test/validation/drv/.gitignore deleted file mode 100644 index 7e563b8b..00000000 --- a/test/validation/drv/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -*.log -*.trs diff --git a/test/validation/drv/Makefile.am b/test/validation/drv/Makefile.am deleted file mode 100644 index e445adf5..00000000 --- a/test/validation/drv/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -ODPDRV_MODULES = drvatomic \ - drvshmem - -SUBDIRS = $(ODPDRV_MODULES) diff --git a/test/validation/drv/Makefile.inc b/test/validation/drv/Makefile.inc deleted file mode 100644 index 5f8fbbb6..00000000 --- a/test/validation/drv/Makefile.inc +++ /dev/null @@ -1 +0,0 @@ -include $(top_srcdir)/test/validation/Makefile.inc diff --git a/test/validation/drv/README b/test/validation/drv/README deleted file mode 100644 index d1a9e6f4..00000000 --- a/test/validation/drv/README +++ /dev/null @@ -1,35 +0,0 @@ -Copyright (c) 2016, Linaro Limited -All rights reserved. - -SPDX-License-Identifier: BSD-3-Clause - - -To add tests in here, please observe the rules listed below. This list -is a brief overview, for a more detailed explanation of the test -framework refer to the ODP Implementers' Guide, which can built as -follows: - - ./configure --enable-user-guides - make - -Output will be in doc/output/. If this fails, check the documentation -section of the DEPENDENCIES file. - -Rules for all tests under this tree: - -1. Tests must be placed in the directory of the module they belong to. - -2. Tests must be platform agnostic, i.e. - - - should be written in plain C only. - - may only use C standard library functions, CUnit functions and of - course ODP functions - - should be expected to pass on all ODP implementations - - Tests that do not follow these rules should be placed in the platform - specific test area (currently platform/<platform>/test/). - -3. If a new ODP DRV module is created, please update the Makefile.am. - -4. Symbols exported from test libraries must respect the naming - convention detailed in the ODP Implementers' Guide. diff --git a/test/validation/drv/drvatomic/.gitignore b/test/validation/drv/drvatomic/.gitignore deleted file mode 100644 index 3b5e5102..00000000 --- a/test/validation/drv/drvatomic/.gitignore +++ /dev/null @@ -1 +0,0 @@ -drvatomic_main diff --git a/test/validation/drv/drvatomic/Makefile.am b/test/validation/drv/drvatomic/Makefile.am deleted file mode 100644 index 53e971c9..00000000 --- a/test/validation/drv/drvatomic/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -include ../Makefile.inc - -noinst_LTLIBRARIES = libtestdrvatomic.la -libtestdrvatomic_la_SOURCES = drvatomic.c - -test_PROGRAMS = drvatomic_main$(EXEEXT) -dist_drvatomic_main_SOURCES = drvatomic_main.c -drvatomic_main_LDADD = libtestdrvatomic.la $(LIBCUNIT_COMMON) $(LIBODP) - -EXTRA_DIST = drvatomic.h diff --git a/test/validation/drv/drvatomic/drvatomic.c b/test/validation/drv/drvatomic/drvatomic.c deleted file mode 100644 index cc5e4415..00000000 --- a/test/validation/drv/drvatomic/drvatomic.c +++ /dev/null @@ -1,892 +0,0 @@ -/* Copyright (c) 2016, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#include <malloc.h> -#include <odp_api.h> -#include <odp_drv.h> -#include <CUnit/Basic.h> -#include <odp_cunit_common.h> -#include <unistd.h> -#include "drvatomic.h" - -#define VERBOSE 0 -#define MAX_ITERATIONS 1000 - -#define ADD_SUB_CNT 5 - -#define CNT 10 -#define U32_INIT_VAL (1UL << 10) -#define U64_INIT_VAL (1ULL << 33) -#define U32_MAGIC 0xa23f65b2 -#define U64_MAGIC 0xf2e1c5430cb6a52e - -#define GLOBAL_SHM_NAME "GlobalLockTest" - -#define UNUSED __attribute__((__unused__)) - -#define CHECK_MAX_MIN (1 << 0) -#define CHECK_XCHG (1 << 2) - -static odpdrv_atomic_u32_t a32u; -static odpdrv_atomic_u64_t a64u; -static odpdrv_atomic_u32_t a32u_min; -static odpdrv_atomic_u32_t a32u_max; -static odpdrv_atomic_u64_t a64u_min; -static odpdrv_atomic_u64_t a64u_max; -static odpdrv_atomic_u32_t a32u_xchg; -static odpdrv_atomic_u64_t a64u_xchg; - -typedef __volatile uint32_t volatile_u32_t; -typedef __volatile uint64_t volatile_u64_t; - -typedef struct { - /* Global variables */ - uint32_t g_num_threads; - uint32_t g_iterations; - uint32_t g_verbose; - uint32_t g_max_num_cores; - - volatile_u32_t global_lock_owner; -} global_shared_mem_t; - -/* Per-thread memory */ -typedef struct { - global_shared_mem_t *global_mem; - - int thread_id; - int thread_core; - - volatile_u64_t delay_counter; -} per_thread_mem_t; - -static odp_shm_t global_shm; -static global_shared_mem_t *global_mem; - -/* Initialise per-thread memory */ -static per_thread_mem_t *thread_init(void) -{ - global_shared_mem_t *global_mem; - per_thread_mem_t *per_thread_mem; - odp_shm_t global_shm; - uint32_t per_thread_mem_len; - - per_thread_mem_len = sizeof(per_thread_mem_t); - per_thread_mem = malloc(per_thread_mem_len); - memset(per_thread_mem, 0, per_thread_mem_len); - - per_thread_mem->delay_counter = 1; - - per_thread_mem->thread_id = odp_thread_id(); - per_thread_mem->thread_core = odp_cpu_id(); - - global_shm = odp_shm_lookup(GLOBAL_SHM_NAME); - global_mem = odp_shm_addr(global_shm); - CU_ASSERT_PTR_NOT_NULL(global_mem); - - per_thread_mem->global_mem = global_mem; - - return per_thread_mem; -} - -static void thread_finalize(per_thread_mem_t *per_thread_mem) -{ - free(per_thread_mem); -} - -static void test_atomic_inc_32(void) -{ - int i; - - for (i = 0; i < CNT; i++) - odpdrv_atomic_inc_u32(&a32u); -} - -static void test_atomic_inc_64(void) -{ - int i; - - for (i = 0; i < CNT; i++) - odpdrv_atomic_inc_u64(&a64u); -} - -static void test_atomic_dec_32(void) -{ - int i; - - for (i = 0; i < CNT; i++) - odpdrv_atomic_dec_u32(&a32u); -} - -static void test_atomic_dec_64(void) -{ - int i; - - for (i = 0; i < CNT; i++) - odpdrv_atomic_dec_u64(&a64u); -} - -static void test_atomic_fetch_inc_32(void) -{ - int i; - - for (i = 0; i < CNT; i++) - odpdrv_atomic_fetch_inc_u32(&a32u); -} - -static void test_atomic_fetch_inc_64(void) -{ - int i; - - for (i = 0; i < CNT; i++) - odpdrv_atomic_fetch_inc_u64(&a64u); -} - -static void test_atomic_fetch_dec_32(void) -{ - int i; - - for (i = 0; i < CNT; i++) - odpdrv_atomic_fetch_dec_u32(&a32u); -} - -static void test_atomic_fetch_dec_64(void) -{ - int i; - - for (i = 0; i < CNT; i++) - odpdrv_atomic_fetch_dec_u64(&a64u); -} - -static void test_atomic_add_32(void) -{ - int i; - - for (i = 0; i < CNT; i++) - odpdrv_atomic_add_u32(&a32u, ADD_SUB_CNT); -} - -static void test_atomic_add_64(void) -{ - int i; - - for (i = 0; i < CNT; i++) - odpdrv_atomic_add_u64(&a64u, ADD_SUB_CNT); -} - -static void test_atomic_sub_32(void) -{ - int i; - - for (i = 0; i < CNT; i++) - odpdrv_atomic_sub_u32(&a32u, ADD_SUB_CNT); -} - -static void test_atomic_sub_64(void) -{ - int i; - - for (i = 0; i < CNT; i++) - odpdrv_atomic_sub_u64(&a64u, ADD_SUB_CNT); -} - -static void test_atomic_fetch_add_32(void) -{ - int i; - - for (i = 0; i < CNT; i++) - odpdrv_atomic_fetch_add_u32(&a32u, ADD_SUB_CNT); -} - -static void test_atomic_fetch_add_64(void) -{ - int i; - - for (i = 0; i < CNT; i++) - odpdrv_atomic_fetch_add_u64(&a64u, ADD_SUB_CNT); -} - -static void test_atomic_fetch_sub_32(void) -{ - int i; - - for (i = 0; i < CNT; i++) - odpdrv_atomic_fetch_sub_u32(&a32u, ADD_SUB_CNT); -} - -static void test_atomic_fetch_sub_64(void) -{ - int i; - - for (i = 0; i < CNT; i++) - odpdrv_atomic_fetch_sub_u64(&a64u, ADD_SUB_CNT); -} - -static void test_atomic_min_32(void) -{ - int i; - uint32_t tmp; - - for (i = 0; i < CNT; i++) { - tmp = odpdrv_atomic_fetch_dec_u32(&a32u); - odpdrv_atomic_min_u32(&a32u_min, tmp); - } -} - -static void test_atomic_min_64(void) -{ - int i; - uint64_t tmp; - - for (i = 0; i < CNT; i++) { - tmp = odpdrv_atomic_fetch_dec_u64(&a64u); - odpdrv_atomic_min_u64(&a64u_min, tmp); - } -} - -static void test_atomic_max_32(void) -{ - int i; - uint32_t tmp; - - for (i = 0; i < CNT; i++) { - tmp = odpdrv_atomic_fetch_inc_u32(&a32u); - odpdrv_atomic_max_u32(&a32u_max, tmp); - } -} - -static void test_atomic_max_64(void) -{ - int i; - uint64_t tmp; - - for (i = 0; i < CNT; i++) { - tmp = odpdrv_atomic_fetch_inc_u64(&a64u); - odpdrv_atomic_max_u64(&a64u_max, tmp); - } -} - -static void test_atomic_cas_inc_32(void) -{ - int i; - uint32_t old; - - for (i = 0; i < CNT; i++) { - old = odpdrv_atomic_load_u32(&a32u); - - while (odpdrv_atomic_cas_u32(&a32u, &old, old + 1) == 0) - ; - } -} - -static void test_atomic_cas_dec_32(void) -{ - int i; - uint32_t old; - - for (i = 0; i < CNT; i++) { - old = odpdrv_atomic_load_u32(&a32u); - - while (odpdrv_atomic_cas_u32(&a32u, &old, old - 1) == 0) - ; - } -} - -static void test_atomic_cas_inc_64(void) -{ - int i; - uint64_t old; - - for (i = 0; i < CNT; i++) { - old = odpdrv_atomic_load_u64(&a64u); - - while (odpdrv_atomic_cas_u64(&a64u, &old, old + 1) == 0) - ; - } -} - -static void test_atomic_cas_dec_64(void) -{ - int i; - uint64_t old; - - for (i = 0; i < CNT; i++) { - old = odpdrv_atomic_load_u64(&a64u); - - while (odpdrv_atomic_cas_u64(&a64u, &old, old - 1) == 0) - ; - } -} - -static void test_atomic_xchg_32(void) -{ - uint32_t old, new; - int i; - - for (i = 0; i < CNT; i++) { - new = odpdrv_atomic_fetch_inc_u32(&a32u); - old = odpdrv_atomic_xchg_u32(&a32u_xchg, new); - - if (old & 0x1) - odpdrv_atomic_xchg_u32(&a32u_xchg, 0); - else - odpdrv_atomic_xchg_u32(&a32u_xchg, 1); - } - - odpdrv_atomic_sub_u32(&a32u, CNT); - odpdrv_atomic_xchg_u32(&a32u_xchg, U32_MAGIC); -} - -static void test_atomic_xchg_64(void) -{ - uint64_t old, new; - int i; - - for (i = 0; i < CNT; i++) { - new = odpdrv_atomic_fetch_inc_u64(&a64u); - old = odpdrv_atomic_xchg_u64(&a64u_xchg, new); - - if (old & 0x1) - odpdrv_atomic_xchg_u64(&a64u_xchg, 0); - else - odpdrv_atomic_xchg_u64(&a64u_xchg, 1); - } - - odpdrv_atomic_sub_u64(&a64u, CNT); - odpdrv_atomic_xchg_u64(&a64u_xchg, U64_MAGIC); -} - -static void test_atomic_non_relaxed_32(void) -{ - int i; - uint32_t tmp; - - for (i = 0; i < CNT; i++) { - tmp = odpdrv_atomic_load_acq_u32(&a32u); - odpdrv_atomic_store_rel_u32(&a32u, tmp); - - tmp = odpdrv_atomic_load_acq_u32(&a32u_max); - odpdrv_atomic_add_rel_u32(&a32u_max, 1); - - tmp = odpdrv_atomic_load_acq_u32(&a32u_min); - odpdrv_atomic_sub_rel_u32(&a32u_min, 1); - - tmp = odpdrv_atomic_load_u32(&a32u_xchg); - while (odpdrv_atomic_cas_acq_u32(&a32u_xchg, &tmp, tmp + 1) - == 0) - ; - - tmp = odpdrv_atomic_load_u32(&a32u_xchg); - while (odpdrv_atomic_cas_rel_u32(&a32u_xchg, &tmp, tmp + 1) - == 0) - ; - - tmp = odpdrv_atomic_load_u32(&a32u_xchg); - /* finally set value for validation */ - while (odpdrv_atomic_cas_acq_rel_u32(&a32u_xchg, &tmp, - U32_MAGIC) - == 0) - ; - } -} - -static void test_atomic_non_relaxed_64(void) -{ - int i; - uint64_t tmp; - - for (i = 0; i < CNT; i++) { - tmp = odpdrv_atomic_load_acq_u64(&a64u); - odpdrv_atomic_store_rel_u64(&a64u, tmp); - - tmp = odpdrv_atomic_load_acq_u64(&a64u_max); - odpdrv_atomic_add_rel_u64(&a64u_max, 1); - - tmp = odpdrv_atomic_load_acq_u64(&a64u_min); - odpdrv_atomic_sub_rel_u64(&a64u_min, 1); - - tmp = odpdrv_atomic_load_u64(&a64u_xchg); - while (odpdrv_atomic_cas_acq_u64(&a64u_xchg, &tmp, tmp + 1) - == 0) - ; - - tmp = odpdrv_atomic_load_u64(&a64u_xchg); - while (odpdrv_atomic_cas_rel_u64(&a64u_xchg, &tmp, tmp + 1) - == 0) - ; - - tmp = odpdrv_atomic_load_u64(&a64u_xchg); - /* finally set value for validation */ - while (odpdrv_atomic_cas_acq_rel_u64(&a64u_xchg, &tmp, - U64_MAGIC) - == 0) - ; - } -} - -static void test_atomic_inc_dec_32(void) -{ - test_atomic_inc_32(); - test_atomic_dec_32(); -} - -static void test_atomic_inc_dec_64(void) -{ - test_atomic_inc_64(); - test_atomic_dec_64(); -} - -static void test_atomic_fetch_inc_dec_32(void) -{ - test_atomic_fetch_inc_32(); - test_atomic_fetch_dec_32(); -} - -static void test_atomic_fetch_inc_dec_64(void) -{ - test_atomic_fetch_inc_64(); - test_atomic_fetch_dec_64(); -} - -static void test_atomic_add_sub_32(void) -{ - test_atomic_add_32(); - test_atomic_sub_32(); -} - -static void test_atomic_add_sub_64(void) -{ - test_atomic_add_64(); - test_atomic_sub_64(); -} - -static void test_atomic_fetch_add_sub_32(void) -{ - test_atomic_fetch_add_32(); - test_atomic_fetch_sub_32(); -} - -static void test_atomic_fetch_add_sub_64(void) -{ - test_atomic_fetch_add_64(); - test_atomic_fetch_sub_64(); -} - -static void test_atomic_max_min_32(void) -{ - test_atomic_max_32(); - test_atomic_min_32(); -} - -static void test_atomic_max_min_64(void) -{ - test_atomic_max_64(); - test_atomic_min_64(); -} - -static void test_atomic_cas_inc_dec_32(void) -{ - test_atomic_cas_inc_32(); - test_atomic_cas_dec_32(); -} - -static void test_atomic_cas_inc_dec_64(void) -{ - test_atomic_cas_inc_64(); - test_atomic_cas_dec_64(); -} - -static void test_atomic_init(void) -{ - odpdrv_atomic_init_u32(&a32u, 0); - odpdrv_atomic_init_u64(&a64u, 0); - odpdrv_atomic_init_u32(&a32u_min, 0); - odpdrv_atomic_init_u32(&a32u_max, 0); - odpdrv_atomic_init_u64(&a64u_min, 0); - odpdrv_atomic_init_u64(&a64u_max, 0); - odpdrv_atomic_init_u32(&a32u_xchg, 0); - odpdrv_atomic_init_u64(&a64u_xchg, 0); -} - -static void test_atomic_store(void) -{ - odpdrv_atomic_store_u32(&a32u, U32_INIT_VAL); - odpdrv_atomic_store_u64(&a64u, U64_INIT_VAL); - odpdrv_atomic_store_u32(&a32u_min, U32_INIT_VAL); - odpdrv_atomic_store_u32(&a32u_max, U32_INIT_VAL); - odpdrv_atomic_store_u64(&a64u_min, U64_INIT_VAL); - odpdrv_atomic_store_u64(&a64u_max, U64_INIT_VAL); - odpdrv_atomic_store_u32(&a32u_xchg, U32_INIT_VAL); - odpdrv_atomic_store_u64(&a64u_xchg, U64_INIT_VAL); -} - -static void test_atomic_validate(int check) -{ - CU_ASSERT(U32_INIT_VAL == odpdrv_atomic_load_u32(&a32u)); - CU_ASSERT(U64_INIT_VAL == odpdrv_atomic_load_u64(&a64u)); - - if (check & CHECK_MAX_MIN) { - CU_ASSERT(odpdrv_atomic_load_u32(&a32u_max) > - odpdrv_atomic_load_u32(&a32u_min)); - - CU_ASSERT(odpdrv_atomic_load_u64(&a64u_max) > - odpdrv_atomic_load_u64(&a64u_min)); - } - - if (check & CHECK_XCHG) { - CU_ASSERT(odpdrv_atomic_load_u32(&a32u_xchg) == U32_MAGIC); - CU_ASSERT(odpdrv_atomic_load_u64(&a64u_xchg) == U64_MAGIC); - } -} - -int drvatomic_init(odp_instance_t *inst) -{ - uint32_t workers_count, max_threads; - int ret = 0; - odp_cpumask_t mask; - - if (0 != odp_init_global(inst, NULL, NULL)) { - fprintf(stderr, "error: odp_init_global() failed.\n"); - return -1; - } - if (0 != odp_init_local(*inst, ODP_THREAD_CONTROL)) { - fprintf(stderr, "error: odp_init_local() failed.\n"); - return -1; - } - - global_shm = odp_shm_reserve(GLOBAL_SHM_NAME, - sizeof(global_shared_mem_t), 64, - ODP_SHM_SW_ONLY); - if (ODP_SHM_INVALID == global_shm) { - fprintf(stderr, "Unable reserve memory for global_shm\n"); - return -1; - } - - global_mem = odp_shm_addr(global_shm); - memset(global_mem, 0, sizeof(global_shared_mem_t)); - - global_mem->g_num_threads = MAX_WORKERS; - global_mem->g_iterations = MAX_ITERATIONS; - global_mem->g_verbose = VERBOSE; - - workers_count = odp_cpumask_default_worker(&mask, 0); - - max_threads = (workers_count >= MAX_WORKERS) ? - MAX_WORKERS : workers_count; - - if (max_threads < global_mem->g_num_threads) { - printf("Requested num of threads is too large\n"); - printf("reducing from %" PRIu32 " to %" PRIu32 "\n", - global_mem->g_num_threads, - max_threads); - global_mem->g_num_threads = max_threads; - } - - printf("Num of threads used = %" PRIu32 "\n", - global_mem->g_num_threads); - - return ret; -} - -/* Atomic tests */ -static int test_atomic_inc_dec_thread(void *arg UNUSED) -{ - per_thread_mem_t *per_thread_mem; - - per_thread_mem = thread_init(); - test_atomic_inc_dec_32(); - test_atomic_inc_dec_64(); - - thread_finalize(per_thread_mem); - - return CU_get_number_of_failures(); -} - -static int test_atomic_add_sub_thread(void *arg UNUSED) -{ - per_thread_mem_t *per_thread_mem; - - per_thread_mem = thread_init(); - test_atomic_add_sub_32(); - test_atomic_add_sub_64(); - - thread_finalize(per_thread_mem); - - return CU_get_number_of_failures(); -} - -static int test_atomic_fetch_inc_dec_thread(void *arg UNUSED) -{ - per_thread_mem_t *per_thread_mem; - - per_thread_mem = thread_init(); - test_atomic_fetch_inc_dec_32(); - test_atomic_fetch_inc_dec_64(); - - thread_finalize(per_thread_mem); - - return CU_get_number_of_failures(); -} - -static int test_atomic_fetch_add_sub_thread(void *arg UNUSED) -{ - per_thread_mem_t *per_thread_mem; - - per_thread_mem = thread_init(); - test_atomic_fetch_add_sub_32(); - test_atomic_fetch_add_sub_64(); - - thread_finalize(per_thread_mem); - - return CU_get_number_of_failures(); -} - -static int test_atomic_max_min_thread(void *arg UNUSED) -{ - per_thread_mem_t *per_thread_mem; - - per_thread_mem = thread_init(); - test_atomic_max_min_32(); - test_atomic_max_min_64(); - - thread_finalize(per_thread_mem); - - return CU_get_number_of_failures(); -} - -static int test_atomic_cas_inc_dec_thread(void *arg UNUSED) -{ - per_thread_mem_t *per_thread_mem; - - per_thread_mem = thread_init(); - test_atomic_cas_inc_dec_32(); - test_atomic_cas_inc_dec_64(); - - thread_finalize(per_thread_mem); - - return CU_get_number_of_failures(); -} - -static int test_atomic_xchg_thread(void *arg UNUSED) -{ - per_thread_mem_t *per_thread_mem; - - per_thread_mem = thread_init(); - test_atomic_xchg_32(); - test_atomic_xchg_64(); - - thread_finalize(per_thread_mem); - - return CU_get_number_of_failures(); -} - -static int test_atomic_non_relaxed_thread(void *arg UNUSED) -{ - per_thread_mem_t *per_thread_mem; - - per_thread_mem = thread_init(); - test_atomic_non_relaxed_32(); - test_atomic_non_relaxed_64(); - - thread_finalize(per_thread_mem); - - return CU_get_number_of_failures(); -} - -static void test_atomic_functional(int func_ptr(void *), int check) -{ - pthrd_arg arg; - - arg.numthrds = global_mem->g_num_threads; - test_atomic_init(); - test_atomic_store(); - odp_cunit_thread_create(func_ptr, &arg); - odp_cunit_thread_exit(&arg); - test_atomic_validate(check); -} - -void drvatomic_test_atomic_inc_dec(void) -{ - test_atomic_functional(test_atomic_inc_dec_thread, 0); -} - -void drvatomic_test_atomic_add_sub(void) -{ - test_atomic_functional(test_atomic_add_sub_thread, 0); -} - -void drvatomic_test_atomic_fetch_inc_dec(void) -{ - test_atomic_functional(test_atomic_fetch_inc_dec_thread, 0); -} - -void drvatomic_test_atomic_fetch_add_sub(void) -{ - test_atomic_functional(test_atomic_fetch_add_sub_thread, 0); -} - -void drvatomic_test_atomic_max_min(void) -{ - test_atomic_functional(test_atomic_max_min_thread, CHECK_MAX_MIN); -} - -void drvatomic_test_atomic_cas_inc_dec(void) -{ - test_atomic_functional(test_atomic_cas_inc_dec_thread, 0); -} - -void drvatomic_test_atomic_xchg(void) -{ - test_atomic_functional(test_atomic_xchg_thread, CHECK_XCHG); -} - -void drvatomic_test_atomic_non_relaxed(void) -{ - test_atomic_functional(test_atomic_non_relaxed_thread, - CHECK_MAX_MIN | CHECK_XCHG); -} - -void drvatomic_test_atomic_op_lock_free(void) -{ - odpdrv_atomic_op_t atomic_op; - int ret_null, ret; - - memset(&atomic_op, 0xff, sizeof(odpdrv_atomic_op_t)); - atomic_op.all_bits = 0; - - CU_ASSERT(atomic_op.all_bits == 0); - CU_ASSERT(atomic_op.op.init == 0); - CU_ASSERT(atomic_op.op.load == 0); - CU_ASSERT(atomic_op.op.store == 0); - CU_ASSERT(atomic_op.op.fetch_add == 0); - CU_ASSERT(atomic_op.op.add == 0); - CU_ASSERT(atomic_op.op.fetch_sub == 0); - CU_ASSERT(atomic_op.op.sub == 0); - CU_ASSERT(atomic_op.op.fetch_inc == 0); - CU_ASSERT(atomic_op.op.inc == 0); - CU_ASSERT(atomic_op.op.fetch_dec == 0); - CU_ASSERT(atomic_op.op.dec == 0); - CU_ASSERT(atomic_op.op.min == 0); - CU_ASSERT(atomic_op.op.max == 0); - CU_ASSERT(atomic_op.op.cas == 0); - CU_ASSERT(atomic_op.op.xchg == 0); - - /* Test setting first, last and couple of other bits */ - atomic_op.op.init = 1; - CU_ASSERT(atomic_op.op.init == 1); - CU_ASSERT(atomic_op.all_bits != 0); - atomic_op.op.init = 0; - CU_ASSERT(atomic_op.all_bits == 0); - - atomic_op.op.xchg = 1; - CU_ASSERT(atomic_op.op.xchg == 1); - CU_ASSERT(atomic_op.all_bits != 0); - atomic_op.op.xchg = 0; - CU_ASSERT(atomic_op.all_bits == 0); - - atomic_op.op.add = 1; - CU_ASSERT(atomic_op.op.add == 1); - CU_ASSERT(atomic_op.all_bits != 0); - atomic_op.op.add = 0; - CU_ASSERT(atomic_op.all_bits == 0); - - atomic_op.op.dec = 1; - CU_ASSERT(atomic_op.op.dec == 1); - CU_ASSERT(atomic_op.all_bits != 0); - atomic_op.op.dec = 0; - CU_ASSERT(atomic_op.all_bits == 0); - - memset(&atomic_op, 0xff, sizeof(odpdrv_atomic_op_t)); - ret = odpdrv_atomic_lock_free_u64(&atomic_op); - ret_null = odpdrv_atomic_lock_free_u64(NULL); - - CU_ASSERT(ret == ret_null); - - /* Init operation is not atomic by the spec. Call to - * odpdrv_atomic_lock_free_u64() zeros it but never sets it. */ - - if (ret == 0) { - /* none are lock free */ - CU_ASSERT(atomic_op.all_bits == 0); - CU_ASSERT(atomic_op.op.init == 0); - CU_ASSERT(atomic_op.op.load == 0); - CU_ASSERT(atomic_op.op.store == 0); - CU_ASSERT(atomic_op.op.fetch_add == 0); - CU_ASSERT(atomic_op.op.add == 0); - CU_ASSERT(atomic_op.op.fetch_sub == 0); - CU_ASSERT(atomic_op.op.sub == 0); - CU_ASSERT(atomic_op.op.fetch_inc == 0); - CU_ASSERT(atomic_op.op.inc == 0); - CU_ASSERT(atomic_op.op.fetch_dec == 0); - CU_ASSERT(atomic_op.op.dec == 0); - CU_ASSERT(atomic_op.op.min == 0); - CU_ASSERT(atomic_op.op.max == 0); - CU_ASSERT(atomic_op.op.cas == 0); - CU_ASSERT(atomic_op.op.xchg == 0); - } - - if (ret == 1) { - /* some are lock free */ - CU_ASSERT(atomic_op.all_bits != 0); - CU_ASSERT(atomic_op.op.init == 0); - } - - if (ret == 2) { - /* all are lock free */ - CU_ASSERT(atomic_op.all_bits != 0); - CU_ASSERT(atomic_op.op.init == 0); - CU_ASSERT(atomic_op.op.load == 1); - CU_ASSERT(atomic_op.op.store == 1); - CU_ASSERT(atomic_op.op.fetch_add == 1); - CU_ASSERT(atomic_op.op.add == 1); - CU_ASSERT(atomic_op.op.fetch_sub == 1); - CU_ASSERT(atomic_op.op.sub == 1); - CU_ASSERT(atomic_op.op.fetch_inc == 1); - CU_ASSERT(atomic_op.op.inc == 1); - CU_ASSERT(atomic_op.op.fetch_dec == 1); - CU_ASSERT(atomic_op.op.dec == 1); - CU_ASSERT(atomic_op.op.min == 1); - CU_ASSERT(atomic_op.op.max == 1); - CU_ASSERT(atomic_op.op.cas == 1); - CU_ASSERT(atomic_op.op.xchg == 1); - } -} - -odp_testinfo_t drvatomic_suite_atomic[] = { - ODP_TEST_INFO(drvatomic_test_atomic_inc_dec), - ODP_TEST_INFO(drvatomic_test_atomic_add_sub), - ODP_TEST_INFO(drvatomic_test_atomic_fetch_inc_dec), - ODP_TEST_INFO(drvatomic_test_atomic_fetch_add_sub), - ODP_TEST_INFO(drvatomic_test_atomic_max_min), - ODP_TEST_INFO(drvatomic_test_atomic_cas_inc_dec), - ODP_TEST_INFO(drvatomic_test_atomic_xchg), - ODP_TEST_INFO(drvatomic_test_atomic_non_relaxed), - ODP_TEST_INFO(drvatomic_test_atomic_op_lock_free), - ODP_TEST_INFO_NULL, -}; - -odp_suiteinfo_t drvatomic_suites[] = { - {"drvatomic", NULL, NULL, - drvatomic_suite_atomic}, - ODP_SUITE_INFO_NULL -}; - -int drvatomic_main(int argc, char *argv[]) -{ - int ret; - - /* parse common options: */ - if (odp_cunit_parse_options(argc, argv)) - return -1; - - odp_cunit_register_global_init(drvatomic_init); - - ret = odp_cunit_register(drvatomic_suites); - - if (ret == 0) - ret = odp_cunit_run(); - - return ret; -} diff --git a/test/validation/drv/drvatomic/drvatomic.h b/test/validation/drv/drvatomic/drvatomic.h deleted file mode 100644 index 62fb17d9..00000000 --- a/test/validation/drv/drvatomic/drvatomic.h +++ /dev/null @@ -1,35 +0,0 @@ -/* Copyright (c) 2016, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#ifndef _ODP_TEST_DRVATOMIC_H_ -#define _ODP_TEST_DRVATOMIC_H_ - -#include <odp_cunit_common.h> - -/* test functions: */ -void drvatomic_test_atomic_inc_dec(void); -void drvatomic_test_atomic_add_sub(void); -void drvatomic_test_atomic_fetch_inc_dec(void); -void drvatomic_test_atomic_fetch_add_sub(void); -void drvatomic_test_atomic_max_min(void); -void drvatomic_test_atomic_cas_inc_dec(void); -void drvatomic_test_atomic_xchg(void); -void drvatomic_test_atomic_non_relaxed(void); -void drvatomic_test_atomic_op_lock_free(void); - -/* test arrays: */ -extern odp_testinfo_t drvatomic_suite_atomic[]; - -/* test registry: */ -extern odp_suiteinfo_t drvatomic_suites[]; - -/* executable init/term functions: */ -int drvatomic_init(odp_instance_t *inst); - -/* main test program: */ -int drvatomic_main(int argc, char *argv[]); - -#endif diff --git a/test/validation/drv/drvatomic/drvatomic_main.c b/test/validation/drv/drvatomic/drvatomic_main.c deleted file mode 100644 index 390a3e2e..00000000 --- a/test/validation/drv/drvatomic/drvatomic_main.c +++ /dev/null @@ -1,12 +0,0 @@ -/* Copyright (c) 2016, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#include "drvatomic.h" - -int main(int argc, char *argv[]) -{ - return drvatomic_main(argc, argv); -} diff --git a/test/validation/drv/drvshmem/.gitignore b/test/validation/drv/drvshmem/.gitignore deleted file mode 100644 index 726dea34..00000000 --- a/test/validation/drv/drvshmem/.gitignore +++ /dev/null @@ -1 +0,0 @@ -drvshmem_main diff --git a/test/validation/drv/drvshmem/Makefile.am b/test/validation/drv/drvshmem/Makefile.am deleted file mode 100644 index 816a5e67..00000000 --- a/test/validation/drv/drvshmem/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -include ../Makefile.inc - -noinst_LTLIBRARIES = libtestdrvshmem.la -libtestdrvshmem_la_SOURCES = drvshmem.c - -test_PROGRAMS = drvshmem_main$(EXEEXT) -dist_drvshmem_main_SOURCES = drvshmem_main.c -drvshmem_main_LDADD = libtestdrvshmem.la $(LIBCUNIT_COMMON) $(LIBODP) - -EXTRA_DIST = drvshmem.h diff --git a/test/validation/drv/drvshmem/drvshmem.c b/test/validation/drv/drvshmem/drvshmem.c deleted file mode 100644 index 0f882ae4..00000000 --- a/test/validation/drv/drvshmem/drvshmem.c +++ /dev/null @@ -1,1147 +0,0 @@ -/* Copyright (c) 2016, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#include <odp_drv.h> -#include <odp_api.h> -#include <odp_cunit_common.h> -#include "drvshmem.h" -#include <stdlib.h> - -#define ALIGN_SIZE (128) -#define MEM_NAME "test_shmem" -#define TEST_SHARE_FOO (0xf0f0f0f0) -#define TEST_SHARE_BAR (0xf0f0f0f) -#define SMALL_MEM 10 -#define MEDIUM_MEM 4096 -#define BIG_MEM 65536 -#define STRESS_SIZE 32 /* power of 2 and <=256 */ -#define STRESS_RANDOM_SZ 5 -#define STRESS_ITERATION 5000 - -#define POOL_NAME "test_pool" -#define POOL_SZ (1UL << 20) /* 1 MBytes */ -#define TEST_SZ 1000 -#define SZ_1K 1024 -#define BUFF_PATTERN 0xA3 - -typedef enum { - STRESS_FREE, /* entry is free and can be allocated */ - STRESS_BUSY, /* entry is being processed: don't touch */ - STRESS_ALLOC /* entry is allocated and can be freed */ -} stress_state_t; - -typedef struct { - stress_state_t state; - odpdrv_shm_t shm; - void *address; - uint32_t flags; - uint32_t size; - uint64_t align; - uint8_t data_val; -} stress_data_t; - -typedef struct { - odpdrv_barrier_t test_barrier1; - odpdrv_barrier_t test_barrier2; - odpdrv_barrier_t test_barrier3; - odpdrv_barrier_t test_barrier4; - uint32_t foo; - uint32_t bar; - odpdrv_atomic_u32_t index; - uint32_t nb_threads; - odpdrv_shm_t shm[MAX_WORKERS]; - void *address[MAX_WORKERS]; - odp_spinlock_t stress_lock; - stress_data_t stress[STRESS_SIZE]; -} shared_test_data_t; - -/* memory stuff expected to fit in a single page */ -typedef struct { - int data[SMALL_MEM]; -} shared_test_data_small_t; - -/* memory stuff expected to fit in a huge page */ -typedef struct { - int data[MEDIUM_MEM]; -} shared_test_data_medium_t; - -/* memory stuff expected to fit in many huge pages */ -typedef struct { - int data[BIG_MEM]; -} shared_test_data_big_t; - -/* - * thread part for the drvshmem_test_basic test - */ -static int run_test_basic_thread(void *arg ODP_UNUSED) -{ - odpdrv_shm_info_t info; - odpdrv_shm_t shm; - shared_test_data_t *shared_test_data; - int thr; - - thr = odp_thread_id(); - printf("Thread %i starts\n", thr); - - shm = odpdrv_shm_lookup_by_name(MEM_NAME); - CU_ASSERT(ODPDRV_SHM_INVALID != shm); - shared_test_data = odpdrv_shm_addr(shm); - CU_ASSERT(NULL != shared_test_data); - - odpdrv_barrier_wait(&shared_test_data->test_barrier1); - odpdrv_shm_print_all("(from thread) After lookup for the global shmem"); - CU_ASSERT(TEST_SHARE_FOO == shared_test_data->foo); - CU_ASSERT(TEST_SHARE_BAR == shared_test_data->bar); - CU_ASSERT(0 == odpdrv_shm_info(shm, &info)); - CU_ASSERT(0 == strcmp(MEM_NAME, info.name)); - CU_ASSERT(0 == info.flags); - CU_ASSERT(shared_test_data == info.addr); - CU_ASSERT(sizeof(shared_test_data_t) <= info.size); -#ifdef MAP_HUGETLB - CU_ASSERT(odp_sys_huge_page_size() == info.page_size); -#else - CU_ASSERT(odp_sys_page_size() == info.page_size); -#endif - odpdrv_shm_print_all("(from thread) About to end"); - - fflush(stdout); - return CU_get_number_of_failures(); -} - -/* - * test basic things: shmem creation, info, share, and free - */ -void drvshmem_test_basic(void) -{ - int base; /* memory usage when test starts */ - pthrd_arg thrdarg; - odpdrv_shm_t shm; - shared_test_data_t *shared_test_data; - odp_cpumask_t unused; - - base = odpdrv_shm_print_all("Before drvshmem_test_basic"); - shm = odpdrv_shm_reserve(MEM_NAME, - sizeof(shared_test_data_t), ALIGN_SIZE, 0); - CU_ASSERT(ODPDRV_SHM_INVALID != shm); - CU_ASSERT(odpdrv_shm_to_u64(shm) != - odpdrv_shm_to_u64(ODPDRV_SHM_INVALID)); - - CU_ASSERT(0 == odpdrv_shm_free_by_handle(shm)); - CU_ASSERT(ODPDRV_SHM_INVALID == odpdrv_shm_lookup_by_name(MEM_NAME)); - - shm = odpdrv_shm_reserve(MEM_NAME, - sizeof(shared_test_data_t), ALIGN_SIZE, 0); - CU_ASSERT(ODPDRV_SHM_INVALID != shm); - - shared_test_data = odpdrv_shm_addr(shm); - CU_ASSERT_FATAL(NULL != shared_test_data); - shared_test_data->foo = TEST_SHARE_FOO; - shared_test_data->bar = TEST_SHARE_BAR; - - thrdarg.numthrds = odp_cpumask_default_worker(&unused, 0); - - if (thrdarg.numthrds > MAX_WORKERS) - thrdarg.numthrds = MAX_WORKERS; - - odpdrv_barrier_init(&shared_test_data->test_barrier1, thrdarg.numthrds); - odp_cunit_thread_create(run_test_basic_thread, &thrdarg); - CU_ASSERT(odp_cunit_thread_exit(&thrdarg) >= 0); - - CU_ASSERT(0 == odpdrv_shm_free_by_handle(shm)); - CU_ASSERT(odpdrv_shm_print_all("Test completion") == base); -} - -/* - * thread part for the drvshmem_test_reserve_after_fork - */ -static int run_test_reserve_after_fork(void *arg ODP_UNUSED) -{ - odpdrv_shm_t shm; - shared_test_data_t *glob_data; - int thr; - int thr_index; - char *name; - int name_len; - int size; - shared_test_data_small_t *pattern_small; - shared_test_data_medium_t *pattern_medium; - shared_test_data_big_t *pattern_big; - int i; - - thr = odp_thread_id(); - printf("Thread %i starts\n", thr); - - shm = odpdrv_shm_lookup_by_name(MEM_NAME); - glob_data = odpdrv_shm_addr(shm); - - /* - * odp_thread_id are not guaranteed to be consecutive, so we create - * a consecutive ID - */ - thr_index = odpdrv_atomic_fetch_inc_u32(&glob_data->index); - - /* allocate some memory (of different sizes) and fill with pattern */ - name_len = strlen(MEM_NAME) + 20; - name = malloc(name_len); - snprintf(name, name_len, "%s-%09d", MEM_NAME, thr_index); - switch (thr_index % 3) { - case 0: - size = sizeof(shared_test_data_small_t); - shm = odpdrv_shm_reserve(name, size, 0, 0); - CU_ASSERT(ODPDRV_SHM_INVALID != shm); - glob_data->shm[thr_index] = shm; - pattern_small = odpdrv_shm_addr(shm); - CU_ASSERT_PTR_NOT_NULL(pattern_small); - for (i = 0; i < SMALL_MEM; i++) - pattern_small->data[i] = i; - break; - case 1: - size = sizeof(shared_test_data_medium_t); - shm = odpdrv_shm_reserve(name, size, 0, 0); - CU_ASSERT(ODPDRV_SHM_INVALID != shm); - glob_data->shm[thr_index] = shm; - pattern_medium = odpdrv_shm_addr(shm); - CU_ASSERT_PTR_NOT_NULL(pattern_medium); - for (i = 0; i < MEDIUM_MEM; i++) - pattern_medium->data[i] = (i << 2); - break; - case 2: - size = sizeof(shared_test_data_big_t); - shm = odpdrv_shm_reserve(name, size, 0, 0); - CU_ASSERT(ODPDRV_SHM_INVALID != shm); - glob_data->shm[thr_index] = shm; - pattern_big = odpdrv_shm_addr(shm); - CU_ASSERT_PTR_NOT_NULL(pattern_big); - for (i = 0; i < BIG_MEM; i++) - pattern_big->data[i] = (i >> 2); - break; - } - free(name); - - /* print block address */ - printf("In thread: Block index: %d mapped at %lx\n", - thr_index, (long int)odpdrv_shm_addr(shm)); - - odpdrv_barrier_wait(&glob_data->test_barrier1); - odpdrv_barrier_wait(&glob_data->test_barrier2); - - fflush(stdout); - return CU_get_number_of_failures(); -} - -/* - * test sharing memory reserved after odp_thread creation (e.g. fork()): - */ -void drvshmem_test_reserve_after_fork(void) -{ - int base; /* memory usage when test starts */ - pthrd_arg thrdarg; - odpdrv_shm_t shm; - odpdrv_shm_t thr_shm; - shared_test_data_t *glob_data; - odp_cpumask_t unused; - char *name; - int name_len; - int thr_index; - int i; - void *address; - shared_test_data_small_t *pattern_small; - shared_test_data_medium_t *pattern_medium; - shared_test_data_big_t *pattern_big; - - base = odpdrv_shm_print_all("Before drvshmem_test_reserve_after_fork"); - shm = odpdrv_shm_reserve(MEM_NAME, sizeof(shared_test_data_t), 0, 0); - CU_ASSERT(ODPDRV_SHM_INVALID != shm); - glob_data = odpdrv_shm_addr(shm); - CU_ASSERT_PTR_NOT_NULL(glob_data); - - thrdarg.numthrds = odp_cpumask_default_worker(&unused, 0); - if (thrdarg.numthrds > MAX_WORKERS) - thrdarg.numthrds = MAX_WORKERS; - - odpdrv_barrier_init(&glob_data->test_barrier1, thrdarg.numthrds + 1); - odpdrv_barrier_init(&glob_data->test_barrier2, thrdarg.numthrds + 1); - odpdrv_atomic_store_u32(&glob_data->index, 0); - - odp_cunit_thread_create(run_test_reserve_after_fork, &thrdarg); - - /* wait until all threads have made their shm_reserve: */ - odpdrv_barrier_wait(&glob_data->test_barrier1); - CU_ASSERT(odpdrv_shm_print_all("After all thread reserve") - == base + thrdarg.numthrds + 1); - - /* perform a lookup of all memories, by handle or name: */ - name_len = strlen(MEM_NAME) + 20; - name = malloc(name_len); - for (thr_index = 0; thr_index < thrdarg.numthrds; thr_index++) { - if (thr_index % 2) { - snprintf(name, name_len, "%s-%09d", - MEM_NAME, thr_index); - thr_shm = odpdrv_shm_lookup_by_name(name); - CU_ASSERT(thr_shm == glob_data->shm[thr_index]); - } else { - odpdrv_shm_lookup_by_handle(glob_data->shm[thr_index]); - } - } - - /* check that the patterns are correct: */ - for (thr_index = 0; thr_index < thrdarg.numthrds; thr_index++) { - switch (thr_index % 3) { - case 0: - pattern_small = - odpdrv_shm_addr(glob_data->shm[thr_index]); - CU_ASSERT_PTR_NOT_NULL(pattern_small); - for (i = 0; i < SMALL_MEM; i++) - CU_ASSERT(pattern_small->data[i] == i); - break; - case 1: - pattern_medium = - odpdrv_shm_addr(glob_data->shm[thr_index]); - CU_ASSERT_PTR_NOT_NULL(pattern_medium); - for (i = 0; i < MEDIUM_MEM; i++) - CU_ASSERT(pattern_medium->data[i] == (i << 2)); - break; - case 2: - pattern_big = - odpdrv_shm_addr(glob_data->shm[thr_index]); - CU_ASSERT_PTR_NOT_NULL(pattern_big); - for (i = 0; i < BIG_MEM; i++) - CU_ASSERT(pattern_big->data[i] == (i >> 2)); - break; - } - } - - /* - * print the mapping address of the blocks - */ - for (thr_index = 0; thr_index < thrdarg.numthrds; thr_index++) { - address = odpdrv_shm_addr(glob_data->shm[thr_index]); - printf("In main Block index: %d mapped at %lx\n", - thr_index, (long int)address); - } - - CU_ASSERT(odpdrv_shm_print_all("After main lookup of thread shmem") - == base + thrdarg.numthrds + 1); - - /* unblock the threads and let them terminate (no free is done): */ - odpdrv_barrier_wait(&glob_data->test_barrier2); - - /* at the same time, (race),free of all memories, by handle or name: */ - for (thr_index = 0; thr_index < thrdarg.numthrds; thr_index++) { - if (thr_index % 2) { - thr_shm = glob_data->shm[thr_index]; - CU_ASSERT(odpdrv_shm_free_by_handle(thr_shm) == 0); - } else { - snprintf(name, name_len, "%s-%09d", - MEM_NAME, thr_index); - CU_ASSERT(odpdrv_shm_free_by_name(name) == 0); - } - } - free(name); - - /* wait for all thread endings: */ - CU_ASSERT(odp_cunit_thread_exit(&thrdarg) >= 0); - - /* just glob_data should remain: */ - CU_ASSERT(odpdrv_shm_print_all("After all threads end") == base + 1); - - CU_ASSERT(0 == odpdrv_shm_free_by_handle(shm)); - CU_ASSERT(odpdrv_shm_print_all("Test completion") == base); -} - -/* - * thread part for the drvshmem_test_singleva_after_fork - */ -static int run_test_singleva_after_fork(void *arg ODP_UNUSED) -{ - odpdrv_shm_t shm; - shared_test_data_t *glob_data; - int thr; - int thr_index; - char *name; - int name_len; - int size; - shared_test_data_small_t *pattern_small; - shared_test_data_medium_t *pattern_medium; - shared_test_data_big_t *pattern_big; - uint32_t i; - int ret; - - thr = odp_thread_id(); - printf("Thread %i starts\n", thr); - - shm = odpdrv_shm_lookup_by_name(MEM_NAME); - glob_data = odpdrv_shm_addr(shm); - - /* - * odp_thread_id are not guaranteed to be consecutive, so we create - * a consecutive ID - */ - thr_index = odpdrv_atomic_fetch_inc_u32(&glob_data->index); - - /* allocate some memory (of different sizes) and fill with pattern */ - name_len = strlen(MEM_NAME) + 20; - name = malloc(name_len); - snprintf(name, name_len, "%s-%09d", MEM_NAME, thr_index); - switch (thr_index % 3) { - case 0: - size = sizeof(shared_test_data_small_t); - shm = odpdrv_shm_reserve(name, size, 0, ODPDRV_SHM_SINGLE_VA); - CU_ASSERT(ODPDRV_SHM_INVALID != shm); - glob_data->shm[thr_index] = shm; - pattern_small = odpdrv_shm_addr(shm); - CU_ASSERT_PTR_NOT_NULL(pattern_small); - glob_data->address[thr_index] = (void *)pattern_small; - for (i = 0; i < SMALL_MEM; i++) - pattern_small->data[i] = i; - break; - case 1: - size = sizeof(shared_test_data_medium_t); - shm = odpdrv_shm_reserve(name, size, 0, ODPDRV_SHM_SINGLE_VA); - CU_ASSERT(ODPDRV_SHM_INVALID != shm); - glob_data->shm[thr_index] = shm; - pattern_medium = odpdrv_shm_addr(shm); - CU_ASSERT_PTR_NOT_NULL(pattern_medium); - glob_data->address[thr_index] = (void *)pattern_medium; - for (i = 0; i < MEDIUM_MEM; i++) - pattern_medium->data[i] = (i << 2); - break; - case 2: - size = sizeof(shared_test_data_big_t); - shm = odpdrv_shm_reserve(name, size, 0, ODPDRV_SHM_SINGLE_VA); - CU_ASSERT(ODPDRV_SHM_INVALID != shm); - glob_data->shm[thr_index] = shm; - pattern_big = odpdrv_shm_addr(shm); - CU_ASSERT_PTR_NOT_NULL(pattern_big); - glob_data->address[thr_index] = (void *)pattern_big; - for (i = 0; i < BIG_MEM; i++) - pattern_big->data[i] = (i >> 2); - break; - } - free(name); - - /* print block address */ - printf("In thread: Block index: %d mapped at %lx\n", - thr_index, (long int)odpdrv_shm_addr(shm)); - - odpdrv_barrier_wait(&glob_data->test_barrier1); - odpdrv_barrier_wait(&glob_data->test_barrier2); - - /* map each-other block, checking common address: */ - for (i = 0; i < glob_data->nb_threads; i++) { - shm = odpdrv_shm_lookup_by_address(glob_data->address[i]); - CU_ASSERT(shm == glob_data->shm[i]); - CU_ASSERT(odpdrv_shm_addr(shm) == glob_data->address[i]); - } - - /* wait for main control task and free the allocated block */ - odpdrv_barrier_wait(&glob_data->test_barrier3); - odpdrv_barrier_wait(&glob_data->test_barrier4); - ret = odpdrv_shm_free_by_address(glob_data->address[thr_index]); - CU_ASSERT(ret == 0); - - fflush(stdout); - return CU_get_number_of_failures(); -} - -/* - * test sharing memory reserved after odp_thread creation (e.g. fork()): - * with single VA flag. - */ -void drvshmem_test_singleva_after_fork(void) -{ - int base; /* memory usage when test starts */ - pthrd_arg thrdarg; - odpdrv_shm_t shm; - odpdrv_shm_t thr_shm; - shared_test_data_t *glob_data; - odp_cpumask_t unused; - char *name; - int name_len; - int thr_index; - int i; - void *address; - shared_test_data_small_t *pattern_small; - shared_test_data_medium_t *pattern_medium; - shared_test_data_big_t *pattern_big; - - base = odpdrv_shm_print_all("Before drvshmem_test_singleva_after_fork"); - - shm = odpdrv_shm_reserve(MEM_NAME, sizeof(shared_test_data_t), - 0, ODPDRV_SHM_LOCK); - CU_ASSERT(ODPDRV_SHM_INVALID != shm); - glob_data = odpdrv_shm_addr(shm); - CU_ASSERT_PTR_NOT_NULL(glob_data); - - thrdarg.numthrds = odp_cpumask_default_worker(&unused, 0); - if (thrdarg.numthrds > MAX_WORKERS) - thrdarg.numthrds = MAX_WORKERS; - - glob_data->nb_threads = thrdarg.numthrds; - odpdrv_barrier_init(&glob_data->test_barrier1, thrdarg.numthrds + 1); - odpdrv_barrier_init(&glob_data->test_barrier2, thrdarg.numthrds + 1); - odpdrv_barrier_init(&glob_data->test_barrier3, thrdarg.numthrds + 1); - odpdrv_barrier_init(&glob_data->test_barrier4, thrdarg.numthrds + 1); - odpdrv_atomic_store_u32(&glob_data->index, 0); - - odp_cunit_thread_create(run_test_singleva_after_fork, &thrdarg); - - /* wait until all threads have made their shm_reserve: */ - odpdrv_barrier_wait(&glob_data->test_barrier1); - CU_ASSERT(odpdrv_shm_print_all("After thread reserve") - == base + thrdarg.numthrds + 1); - - /* perform a lookup of all memories, by handle or name: */ - name_len = strlen(MEM_NAME) + 20; - name = malloc(name_len); - for (thr_index = 0; thr_index < thrdarg.numthrds; thr_index++) { - if (thr_index % 2) { - snprintf(name, name_len, "%s-%09d", - MEM_NAME, thr_index); - thr_shm = odpdrv_shm_lookup_by_name(name); - CU_ASSERT(thr_shm == glob_data->shm[thr_index]); - } else { - odpdrv_shm_lookup_by_handle(glob_data->shm[thr_index]); - } - } - free(name); - - /* check that the patterns are correct: */ - for (thr_index = 0; thr_index < thrdarg.numthrds; thr_index++) { - switch (thr_index % 3) { - case 0: - pattern_small = - odpdrv_shm_addr(glob_data->shm[thr_index]); - CU_ASSERT_PTR_NOT_NULL(pattern_small); - for (i = 0; i < SMALL_MEM; i++) - CU_ASSERT(pattern_small->data[i] == i); - break; - case 1: - pattern_medium = - odpdrv_shm_addr(glob_data->shm[thr_index]); - CU_ASSERT_PTR_NOT_NULL(pattern_medium); - for (i = 0; i < MEDIUM_MEM; i++) - CU_ASSERT(pattern_medium->data[i] == (i << 2)); - break; - case 2: - pattern_big = - odpdrv_shm_addr(glob_data->shm[thr_index]); - CU_ASSERT_PTR_NOT_NULL(pattern_big); - for (i = 0; i < BIG_MEM; i++) - CU_ASSERT(pattern_big->data[i] == (i >> 2)); - break; - } - } - - /* - * check that the mapping address is common to all (SINGLE_VA): - */ - for (thr_index = 0; thr_index < thrdarg.numthrds; thr_index++) { - address = odpdrv_shm_addr(glob_data->shm[thr_index]); - CU_ASSERT(glob_data->address[thr_index] == address); - } - - CU_ASSERT(odpdrv_shm_print_all("After local lookup") - == base + thrdarg.numthrds + 1); - - /* unblock the threads and let them map each-other blocks: */ - odpdrv_barrier_wait(&glob_data->test_barrier2); - - /* then check mem status */ - odpdrv_barrier_wait(&glob_data->test_barrier3); - CU_ASSERT(odpdrv_shm_print_all("After mutual lookup") - == base + thrdarg.numthrds + 1); - - /* unblock the threads and let them free all thread blocks: */ - odpdrv_barrier_wait(&glob_data->test_barrier4); - - /* wait for all thread endings: */ - CU_ASSERT(odp_cunit_thread_exit(&thrdarg) >= 0); - - /* just glob_data should remain: */ - CU_ASSERT(odpdrv_shm_print_all("After threads free") == base + 1); - - CU_ASSERT(0 == odpdrv_shm_free_by_name(MEM_NAME)); - CU_ASSERT(odpdrv_shm_print_all("Test completion") == base); -} - -/* - * thread part for the drvshmem_test_stress - */ -static int run_test_stress(void *arg ODP_UNUSED) -{ - odpdrv_shm_t shm; - uint8_t *address; - shared_test_data_t *glob_data; - uint8_t random_bytes[STRESS_RANDOM_SZ]; - uint32_t index; - uint32_t size; - uint64_t align; - uint32_t flags; - uint8_t data; - uint32_t iter; - uint32_t i; - - shm = odpdrv_shm_lookup_by_name(MEM_NAME); - glob_data = odpdrv_shm_addr(shm); - CU_ASSERT_PTR_NOT_NULL(glob_data); - - /* wait for general GO! */ - odpdrv_barrier_wait(&glob_data->test_barrier1); - /* - - * at each iteration: pick up a random index for - * glob_data->stress[index]: If the entry is free, allocated mem - * randomly. If it is already allocated, make checks and free it: - * Note that different tread cann allocate or free a given block - */ - for (iter = 0; iter < STRESS_ITERATION; iter++) { - /* get 4 random bytes from which index, size ,align, flags - * and data will be derived: - */ - odp_random_data(random_bytes, STRESS_RANDOM_SZ, 0); - index = random_bytes[0] & (STRESS_SIZE - 1); - - odp_spinlock_lock(&glob_data->stress_lock); - - switch (glob_data->stress[index].state) { - case STRESS_FREE: - /* allocated a new block for this entry */ - - glob_data->stress[index].state = STRESS_BUSY; - odp_spinlock_unlock(&glob_data->stress_lock); - - size = (random_bytes[1] + 1) << 6; /* up to 16Kb */ - /* we just play with the VA flag. randomly setting - * the mlock flag may exceed user ulimit -l - */ - flags = random_bytes[2] & ODPDRV_SHM_SINGLE_VA; - align = (random_bytes[3] + 1) << 6;/* up to 16Kb */ - data = random_bytes[4]; - - shm = odpdrv_shm_reserve(NULL, size, align, flags); - glob_data->stress[index].shm = shm; - if (shm == ODPDRV_SHM_INVALID) { /* out of mem ? */ - odp_spinlock_lock(&glob_data->stress_lock); - glob_data->stress[index].state = STRESS_ALLOC; - odp_spinlock_unlock(&glob_data->stress_lock); - continue; - } - - address = odpdrv_shm_addr(shm); - CU_ASSERT_PTR_NOT_NULL(address); - glob_data->stress[index].address = address; - glob_data->stress[index].flags = flags; - glob_data->stress[index].size = size; - glob_data->stress[index].align = align; - glob_data->stress[index].data_val = data; - - /* write some data: writing each byte would be a - * waste of time: just make sure each page is reached */ - for (i = 0; i < size; i += 256) - address[i] = (data++) & 0xFF; - odp_spinlock_lock(&glob_data->stress_lock); - glob_data->stress[index].state = STRESS_ALLOC; - odp_spinlock_unlock(&glob_data->stress_lock); - - break; - - case STRESS_ALLOC: - /* free the block for this entry */ - - glob_data->stress[index].state = STRESS_BUSY; - odp_spinlock_unlock(&glob_data->stress_lock); - shm = glob_data->stress[index].shm; - - if (shm == ODPDRV_SHM_INVALID) { /* out of mem ? */ - odp_spinlock_lock(&glob_data->stress_lock); - glob_data->stress[index].state = STRESS_FREE; - odp_spinlock_unlock(&glob_data->stress_lock); - continue; - } - - CU_ASSERT(odpdrv_shm_lookup_by_handle(shm) != 0); - - address = odpdrv_shm_addr(shm); - CU_ASSERT_PTR_NOT_NULL(address); - - align = glob_data->stress[index].align; - if (align) { - align = glob_data->stress[index].align; - CU_ASSERT(((uintptr_t)address & (align - 1)) - == 0) - } - - flags = glob_data->stress[index].flags; - if (flags & ODPDRV_SHM_SINGLE_VA) - CU_ASSERT(glob_data->stress[index].address == - address) - - /* check that data is reachable and correct: */ - data = glob_data->stress[index].data_val; - size = glob_data->stress[index].size; - for (i = 0; i < size; i += 256) { - CU_ASSERT(address[i] == (data & 0xFF)); - data++; - } - - if (flags & ODPDRV_SHM_SINGLE_VA) { - CU_ASSERT(!odpdrv_shm_free_by_address(address)); - } else { - CU_ASSERT(!odpdrv_shm_free_by_handle(shm)); - } - - odp_spinlock_lock(&glob_data->stress_lock); - glob_data->stress[index].state = STRESS_FREE; - odp_spinlock_unlock(&glob_data->stress_lock); - - break; - - case STRESS_BUSY: - default: - odp_spinlock_unlock(&glob_data->stress_lock); - break; - } - } - - fflush(stdout); - return CU_get_number_of_failures(); -} - -/* - * stress tests - */ -void drvshmem_test_stress(void) -{ - pthrd_arg thrdarg; - odpdrv_shm_t shm; - shared_test_data_t *glob_data; - odp_cpumask_t unused; - int base; /* number of blocks already allocated at start of test */ - uint32_t i; - - base = odpdrv_shm_print_all("Before thread tests"); - - shm = odpdrv_shm_reserve(MEM_NAME, sizeof(shared_test_data_t), - 0, ODPDRV_SHM_LOCK); - CU_ASSERT(ODPDRV_SHM_INVALID != shm); - glob_data = odpdrv_shm_addr(shm); - CU_ASSERT_PTR_NOT_NULL(glob_data); - - thrdarg.numthrds = odp_cpumask_default_worker(&unused, 0); - if (thrdarg.numthrds > MAX_WORKERS) - thrdarg.numthrds = MAX_WORKERS; - - glob_data->nb_threads = thrdarg.numthrds; - odpdrv_barrier_init(&glob_data->test_barrier1, thrdarg.numthrds); - odp_spinlock_init(&glob_data->stress_lock); - - /* before starting the threads, mark all entries as free: */ - for (i = 0; i < STRESS_SIZE; i++) - glob_data->stress[i].state = STRESS_FREE; - - /* create threads */ - odp_cunit_thread_create(run_test_stress, &thrdarg); - - /* wait for all thread endings: */ - CU_ASSERT(odp_cunit_thread_exit(&thrdarg) >= 0); - - odpdrv_shm_print_all("Middle"); - - /* release left overs: */ - for (i = 0; i < STRESS_SIZE; i++) { - shm = glob_data->stress[i].shm; - if ((glob_data->stress[i].state == STRESS_ALLOC) && - (glob_data->stress[i].shm != ODPDRV_SHM_INVALID)) { - CU_ASSERT(odpdrv_shm_lookup_by_handle(shm) != - NULL); - CU_ASSERT(!odpdrv_shm_free_by_handle(shm)); - } - } - - CU_ASSERT(0 == odpdrv_shm_free_by_name(MEM_NAME)); - - /* check that no memory is left over: */ - CU_ASSERT(odpdrv_shm_print_all("After stress tests") == base); -} - -void drvshmem_test_buddy_basic(void) -{ - odpdrv_shm_pool_param_t pool_params; - odpdrv_shm_pool_t pool, found_pool; - uint8_t *buff; - uint8_t *addrs[TEST_SZ]; - uint8_t length; - int i, j; - - /* create a pool and check that it can be looked up */ - pool_params.pool_size = POOL_SZ; - pool_params.min_alloc = 1; - pool_params.max_alloc = POOL_SZ; - pool = odpdrv_shm_pool_create(POOL_NAME, &pool_params); - found_pool = odpdrv_shm_pool_lookup(POOL_NAME); - CU_ASSERT(found_pool == pool); - - /* alloc a 1k buffer, filling its contents: */ - buff = odpdrv_shm_pool_alloc(pool, SZ_1K); - CU_ASSERT_PTR_NOT_NULL(buff); - for (i = 0; i < SZ_1K; i++) - buff[i] = BUFF_PATTERN; - odpdrv_shm_pool_print("buddy test: 1K reserved", pool); - - /* alloc as many buffer a possible on increseasing sz */ - for (i = 0; i < TEST_SZ; i++) { - length = i * 16; - addrs[i] = odpdrv_shm_pool_alloc(pool, length); - /* if alloc was success, fill buffer for later check */ - if (addrs[i]) { - for (j = 0; j < length; j++) - addrs[i][j] = (uint8_t)(length & 0xFF); - } - } - odpdrv_shm_pool_print("buddy test: after many mallocs", pool); - - /* release every 3rth buffer, checking contents: */ - for (i = 0; i < TEST_SZ; i += 3) { - /* if buffer was allocated, check the pattern in it */ - if (addrs[i]) { - length = i * 16; - for (j = 0; j < length; j++) - CU_ASSERT(addrs[i][j] == - (uint8_t)(length & 0xFF)); - } - odpdrv_shm_pool_free(pool, addrs[i]); - } - odpdrv_shm_pool_print("buddy test: after 1/3 free:", pool); - - /* realloc them:*/ - for (i = 0; i < TEST_SZ; i += 3) { - length = i * 16; - addrs[i] = odpdrv_shm_pool_alloc(pool, length); - /* if alloc was success, fill buffer for later check */ - if (addrs[i]) { - for (j = 0; j < length; j++) - addrs[i][j] = (uint8_t)(length & 0xFF); - } - } - odpdrv_shm_pool_print("buddy test: after realloc:", pool); - - /* free all (except buff), checking contents: */ - for (i = 0; i < TEST_SZ; i++) { - /* if buffer was allocated, check the pattern in it */ - if (addrs[i]) { - length = i * 16; - for (j = 0; j < length; j++) - CU_ASSERT(addrs[i][j] == - (uint8_t)(length & 0xFF)) - } - odpdrv_shm_pool_free(pool, addrs[i]); - } - odpdrv_shm_pool_print("buddy test: after all but 1K free:", pool); - - /* check contents of our initial 1K buffer: */ - for (i = 0; i < SZ_1K; i++) - CU_ASSERT((buff[i] == BUFF_PATTERN)) - odpdrv_shm_pool_free(pool, buff); - - odpdrv_shm_pool_print("buddy test: after all free", pool); - - /* destroy pool: */ - odpdrv_shm_pool_destroy(pool); -} - -void drvshmem_test_slab_basic(void) -{ - odpdrv_shm_pool_param_t pool_params; - odpdrv_shm_pool_t pool, found_pool; - uint8_t *buff; - uint8_t *addrs[TEST_SZ]; - uint16_t length; - int i, j; - - /* create a pool and check that it can be looked up */ - pool_params.pool_size = POOL_SZ; - pool_params.min_alloc = SZ_1K; /* constant size will give slab */ - pool_params.max_alloc = SZ_1K; - pool = odpdrv_shm_pool_create(POOL_NAME, &pool_params); - found_pool = odpdrv_shm_pool_lookup(POOL_NAME); - CU_ASSERT(found_pool == pool); - - /* alloc a 1k buffer, filling its contents: */ - buff = odpdrv_shm_pool_alloc(pool, SZ_1K); - CU_ASSERT_PTR_NOT_NULL(buff); - for (i = 0; i < SZ_1K; i++) - buff[i] = BUFF_PATTERN; - odpdrv_shm_pool_print("buddy test: 1K reserved", pool); - - /* alloc as many 1K buffer a possible */ - for (i = 0; i < TEST_SZ; i++) { - length = SZ_1K; - addrs[i] = odpdrv_shm_pool_alloc(pool, length); - /* if alloc was success, fill buffer for later check */ - if (addrs[i]) { - for (j = 0; j < length; j++) - addrs[i][j] = (uint8_t)(length & 0xFF); - } - } - odpdrv_shm_pool_print("slab test: after many mallocs", pool); - - /* release every 3rth buffer, checking contents: */ - for (i = 0; i < TEST_SZ; i += 3) { - /* if buffer was allocated, check the pattern in it */ - if (addrs[i]) { - length = SZ_1K; - for (j = 0; j < length; j++) - CU_ASSERT(addrs[i][j] == - (uint8_t)(length & 0xFF)); - } - odpdrv_shm_pool_free(pool, addrs[i]); - } - odpdrv_shm_pool_print("slab test: after 1/3 free:", pool); - - /* realloc them:*/ - for (i = 0; i < TEST_SZ; i += 3) { - length = SZ_1K; - addrs[i] = odpdrv_shm_pool_alloc(pool, length); - /* if alloc was success, fill buffer for later check */ - if (addrs[i]) { - for (j = 0; j < length; j++) - addrs[i][j] = (uint8_t)(length & 0xFF); - } - } - odpdrv_shm_pool_print("slab test: after realloc:", pool); - - /* free all (except buff), checking contents: */ - for (i = 0; i < TEST_SZ; i++) { - /* if buffer was allocated, check the pattern in it */ - if (addrs[i]) { - length = SZ_1K; - for (j = 0; j < length; j++) - CU_ASSERT(addrs[i][j] == - (uint8_t)(length & 0xFF)) - } - odpdrv_shm_pool_free(pool, addrs[i]); - } - odpdrv_shm_pool_print("slab test: after all but 1K free:", pool); - - /* check contents of our initial 1K buffer: */ - for (i = 0; i < SZ_1K; i++) - CU_ASSERT((buff[i] == BUFF_PATTERN)) - odpdrv_shm_pool_free(pool, buff); - - odpdrv_shm_pool_print("slab test: after all free", pool); - - /* destroy pool: */ - odpdrv_shm_pool_destroy(pool); -} - -/* - * thread part for the drvshmem_test_buddy_stress - */ -static int run_test_buddy_stress(void *arg ODP_UNUSED) -{ - odpdrv_shm_t shm; - odpdrv_shm_pool_t pool; - uint8_t *address; - shared_test_data_t *glob_data; - uint8_t random_bytes[STRESS_RANDOM_SZ]; - uint32_t index; - uint32_t size; - uint8_t data; - uint32_t iter; - uint32_t i; - - shm = odpdrv_shm_lookup_by_name(MEM_NAME); - glob_data = odpdrv_shm_addr(shm); - CU_ASSERT_PTR_NOT_NULL(glob_data); - - /* get the pool to test */ - pool = odpdrv_shm_pool_lookup(POOL_NAME); - - /* wait for general GO! */ - odpdrv_barrier_wait(&glob_data->test_barrier1); - /* - - * at each iteration: pick up a random index for - * glob_data->stress[index]: If the entry is free, allocated small mem - * randomly. If it is already allocated, make checks and free it: - * Note that different tread can allocate or free a given block - */ - for (iter = 0; iter < STRESS_ITERATION; iter++) { - /* get 4 random bytes from which index, size ,align, flags - * and data will be derived: - */ - odp_random_data(random_bytes, STRESS_RANDOM_SZ, 0); - index = random_bytes[0] & (STRESS_SIZE - 1); - - odp_spinlock_lock(&glob_data->stress_lock); - - switch (glob_data->stress[index].state) { - case STRESS_FREE: - /* allocated a new block for this entry */ - - glob_data->stress[index].state = STRESS_BUSY; - odp_spinlock_unlock(&glob_data->stress_lock); - - size = (random_bytes[1] + 1) << 4; /* up to 4Kb */ - data = random_bytes[2]; - - address = odpdrv_shm_pool_alloc(pool, size); - glob_data->stress[index].address = address; - if (address == NULL) { /* out of mem ? */ - odp_spinlock_lock(&glob_data->stress_lock); - glob_data->stress[index].state = STRESS_ALLOC; - odp_spinlock_unlock(&glob_data->stress_lock); - continue; - } - - glob_data->stress[index].size = size; - glob_data->stress[index].data_val = data; - - /* write some data: */ - for (i = 0; i < size; i++) - address[i] = (data++) & 0xFF; - odp_spinlock_lock(&glob_data->stress_lock); - glob_data->stress[index].state = STRESS_ALLOC; - odp_spinlock_unlock(&glob_data->stress_lock); - - break; - - case STRESS_ALLOC: - /* free the block for this entry */ - - glob_data->stress[index].state = STRESS_BUSY; - odp_spinlock_unlock(&glob_data->stress_lock); - address = glob_data->stress[index].address; - - if (shm == NULL) { /* out of mem ? */ - odp_spinlock_lock(&glob_data->stress_lock); - glob_data->stress[index].state = STRESS_FREE; - odp_spinlock_unlock(&glob_data->stress_lock); - continue; - } - - /* check that data is reachable and correct: */ - data = glob_data->stress[index].data_val; - size = glob_data->stress[index].size; - for (i = 0; i < size; i++) { - CU_ASSERT(address[i] == (data & 0xFF)); - data++; - } - - odpdrv_shm_pool_free(pool, address); - - odp_spinlock_lock(&glob_data->stress_lock); - glob_data->stress[index].state = STRESS_FREE; - odp_spinlock_unlock(&glob_data->stress_lock); - - break; - - case STRESS_BUSY: - default: - odp_spinlock_unlock(&glob_data->stress_lock); - break; - } - } - - fflush(stdout); - return CU_get_number_of_failures(); -} - -/* - * stress tests - */ -void drvshmem_test_buddy_stress(void) -{ - odpdrv_shm_pool_param_t pool_params; - odpdrv_shm_pool_t pool; - pthrd_arg thrdarg; - odpdrv_shm_t shm; - shared_test_data_t *glob_data; - odp_cpumask_t unused; - uint32_t i; - uint8_t *address; - - /* create a pool and check that it can be looked up */ - pool_params.pool_size = POOL_SZ; - pool_params.min_alloc = 0; - pool_params.max_alloc = POOL_SZ; - pool = odpdrv_shm_pool_create(POOL_NAME, &pool_params); - odpdrv_shm_pool_print("Stress test start", pool); - - shm = odpdrv_shm_reserve(MEM_NAME, sizeof(shared_test_data_t), - 0, ODPDRV_SHM_LOCK); - CU_ASSERT(ODPDRV_SHM_INVALID != shm); - glob_data = odpdrv_shm_addr(shm); - CU_ASSERT_PTR_NOT_NULL(glob_data); - - thrdarg.numthrds = odp_cpumask_default_worker(&unused, 0); - if (thrdarg.numthrds > MAX_WORKERS) - thrdarg.numthrds = MAX_WORKERS; - - glob_data->nb_threads = thrdarg.numthrds; - odpdrv_barrier_init(&glob_data->test_barrier1, thrdarg.numthrds); - odp_spinlock_init(&glob_data->stress_lock); - - /* before starting the threads, mark all entries as free: */ - for (i = 0; i < STRESS_SIZE; i++) - glob_data->stress[i].state = STRESS_FREE; - - /* create threads */ - odp_cunit_thread_create(run_test_buddy_stress, &thrdarg); - - /* wait for all thread endings: */ - CU_ASSERT(odp_cunit_thread_exit(&thrdarg) >= 0); - - odpdrv_shm_pool_print("Stress test all thread finished", pool); - - /* release left overs: */ - for (i = 0; i < STRESS_SIZE; i++) { - address = glob_data->stress[i].address; - if (glob_data->stress[i].state == STRESS_ALLOC) - odpdrv_shm_pool_free(pool, address); - } - - CU_ASSERT(0 == odpdrv_shm_free_by_name(MEM_NAME)); - - /* check that no memory is left over: */ - odpdrv_shm_pool_print("Stress test all released", pool); - - /* destroy pool: */ - odpdrv_shm_pool_destroy(pool); -} - -odp_testinfo_t drvshmem_suite[] = { - ODP_TEST_INFO(drvshmem_test_basic), - ODP_TEST_INFO(drvshmem_test_reserve_after_fork), - ODP_TEST_INFO(drvshmem_test_singleva_after_fork), - ODP_TEST_INFO(drvshmem_test_stress), - ODP_TEST_INFO(drvshmem_test_buddy_basic), - ODP_TEST_INFO(drvshmem_test_slab_basic), - ODP_TEST_INFO(drvshmem_test_buddy_stress), - ODP_TEST_INFO_NULL, -}; - -odp_suiteinfo_t drvshmem_suites[] = { - {"Shared Memory", NULL, NULL, drvshmem_suite}, - ODP_SUITE_INFO_NULL, -}; - -int drvshmem_main(int argc, char *argv[]) -{ - int ret; - - /* parse common options: */ - if (odp_cunit_parse_options(argc, argv)) - return -1; - - ret = odp_cunit_register(drvshmem_suites); - - if (ret == 0) - ret = odp_cunit_run(); - - return ret; -} diff --git a/test/validation/drv/drvshmem/drvshmem.h b/test/validation/drv/drvshmem/drvshmem.h deleted file mode 100644 index 817b3d57..00000000 --- a/test/validation/drv/drvshmem/drvshmem.h +++ /dev/null @@ -1,30 +0,0 @@ -/* Copyright (c) 2016, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#ifndef _ODP_TEST_DRVSHMEM_H_ -#define _ODP_TEST_DRVSHMEM_H_ - -#include <odp_cunit_common.h> - -/* test functions: */ -void drvshmem_test_basic(void); -void drvshmem_test_reserve_after_fork(void); -void drvshmem_test_singleva_after_fork(void); -void drvshmem_test_stress(void); -void drvshmem_test_buddy_basic(void); -void drvshmem_test_slab_basic(void); -void drvshmem_test_buddy_stress(void); - -/* test arrays: */ -extern odp_testinfo_t drvshmem_suite[]; - -/* test registry: */ -extern odp_suiteinfo_t drvshmem_suites[]; - -/* main test program: */ -int drvshmem_main(int argc, char *argv[]); - -#endif diff --git a/test/validation/drv/drvshmem/drvshmem_main.c b/test/validation/drv/drvshmem/drvshmem_main.c deleted file mode 100644 index 566ccec6..00000000 --- a/test/validation/drv/drvshmem/drvshmem_main.c +++ /dev/null @@ -1,12 +0,0 @@ -/* Copyright (c) 2016, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#include "drvshmem.h" - -int main(int argc, char *argv[]) -{ - return drvshmem_main(argc, argv); -} commit 43cff7996bcdd6264bf6066a8be9424b2e12ca21 Merge: d22c949c 2dd964e1 Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Fri Nov 3 12:28:16 2017 +0300 Merge branch 'master' into api-next Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --cc doc/application-api-guide/Doxyfile index 2709f6fd,a2168a92..00c18df2 --- a/doc/application-api-guide/Doxyfile +++ b/doc/application-api-guide/Doxyfile @@@ -5,6 -5,7 +5,5 @@@ PROJECT_NUMBER = $(VERSION PROJECT_LOGO = $(SRCDIR)/doc/images/ODP-Logo-HQ.svg INPUT = $(SRCDIR)/doc/application-api-guide \ $(SRCDIR)/include - EXCLUDE_PATTERNS = drv* odp_drv.h EXAMPLE_PATH = $(SRCDIR)/example $(SRCDIR) -PREDEFINED = __GNUC__ \ - "ODP_HANDLE_T(type)=odp_handle_t type" WARNINGS = NO ----------------------------------------------------------------------- Summary of changes: .travis.yml | 24 +- Makefile.am | 8 +- configure.ac | 4 +- doc/Doxyfile_common | 5 +- doc/Makefile.am | 3 +- doc/application-api-guide/Doxyfile | 1 - doc/application-api-guide/Makefile.am | 1 + doc/driver-api-guide/.gitignore | 1 - doc/driver-api-guide/Makefile.am | 5 - doc/driver-api-guide/odp.dox | 20 - doc/implementers-guide/implementers-guide.adoc | 72 +- doc/m4/configure.m4 | 3 +- include/Makefile.am | 16 +- include/odp/drv/spec/README | 4 - include/odp/drv/spec/align.h | 78 -- include/odp/drv/spec/atomic.h | 634 ----------- include/odp/drv/spec/barrier.h | 66 -- include/odp/drv/spec/byteorder.h | 181 --- include/odp/drv/spec/compiler.h | 51 - include/odp/drv/spec/driver.h | 389 ------- include/odp/drv/spec/shm.h | 330 ------ include/odp/drv/spec/spinlock.h | 86 -- include/odp/drv/spec/std_types.h | 40 - include/odp/drv/spec/sync.h | 91 -- include/odp_drv.h | 35 - platform/linux-generic/Makefile.am | 31 +- platform/linux-generic/_ishm.c | 3 +- platform/linux-generic/_ishmpool.c | 1 - platform/linux-generic/drv_atomic.c | 26 - platform/linux-generic/drv_barrier.c | 50 - platform/linux-generic/drv_driver.c | 64 -- platform/linux-generic/drv_shm.c | 146 --- platform/linux-generic/drv_spinlock.c | 39 - platform/linux-generic/include/odp/drv/README | 2 - platform/linux-generic/include/odp/drv/align.h | 58 - platform/linux-generic/include/odp/drv/atomic.h | 430 -------- platform/linux-generic/include/odp/drv/barrier.h | 30 - platform/linux-generic/include/odp/drv/byteorder.h | 146 --- platform/linux-generic/include/odp/drv/compiler.h | 34 - platform/linux-generic/include/odp/drv/driver.h | 37 - .../include/odp/drv/plat/atomic_types.h | 88 -- .../include/odp/drv/plat/barrier_types.h | 38 - .../include/odp/drv/plat/byteorder_types.h | 84 -- .../include/odp/drv/plat/driver_types.h | 52 - .../linux-generic/include/odp/drv/plat/shm_types.h | 49 - .../include/odp/drv/plat/spinlock_types.h | 33 - .../include/odp/drv/plat/strong_types.h | 35 - platform/linux-generic/include/odp/drv/shm.h | 36 - platform/linux-generic/include/odp/drv/spinlock.h | 28 - platform/linux-generic/include/odp/drv/std_types.h | 42 - platform/linux-generic/include/odp/drv/sync.h | 49 - .../linux-generic/include/odp_config_internal.h | 6 - test/m4/configure.m4 | 5 +- test/validation/Makefile.am | 3 +- test/validation/drv/.gitignore | 2 - test/validation/drv/Makefile.am | 4 - test/validation/drv/Makefile.inc | 1 - test/validation/drv/README | 35 - test/validation/drv/drvatomic/.gitignore | 1 - test/validation/drv/drvatomic/Makefile.am | 10 - test/validation/drv/drvatomic/drvatomic.c | 892 --------------- test/validation/drv/drvatomic/drvatomic.h | 35 - test/validation/drv/drvatomic/drvatomic_main.c | 12 - test/validation/drv/drvshmem/.gitignore | 1 - test/validation/drv/drvshmem/Makefile.am | 10 - test/validation/drv/drvshmem/drvshmem.c | 1147 -------------------- test/validation/drv/drvshmem/drvshmem.h | 30 - test/validation/drv/drvshmem/drvshmem_main.c | 12 - 68 files changed, 45 insertions(+), 5940 deletions(-) delete mode 100644 doc/driver-api-guide/.gitignore delete mode 100644 doc/driver-api-guide/Makefile.am delete mode 100644 doc/driver-api-guide/odp.dox delete mode 100644 include/odp/drv/spec/README delete mode 100644 include/odp/drv/spec/align.h delete mode 100644 include/odp/drv/spec/atomic.h delete mode 100644 include/odp/drv/spec/barrier.h delete mode 100644 include/odp/drv/spec/byteorder.h delete mode 100644 include/odp/drv/spec/compiler.h delete mode 100644 include/odp/drv/spec/driver.h delete mode 100644 include/odp/drv/spec/shm.h delete mode 100644 include/odp/drv/spec/spinlock.h delete mode 100644 include/odp/drv/spec/std_types.h delete mode 100644 include/odp/drv/spec/sync.h delete mode 100644 include/odp_drv.h delete mode 100644 platform/linux-generic/drv_atomic.c delete mode 100644 platform/linux-generic/drv_barrier.c delete mode 100644 platform/linux-generic/drv_driver.c delete mode 100644 platform/linux-generic/drv_shm.c delete mode 100644 platform/linux-generic/drv_spinlock.c delete mode 100644 platform/linux-generic/include/odp/drv/README delete mode 100644 platform/linux-generic/include/odp/drv/align.h delete mode 100644 platform/linux-generic/include/odp/drv/atomic.h delete mode 100644 platform/linux-generic/include/odp/drv/barrier.h delete mode 100644 platform/linux-generic/include/odp/drv/byteorder.h delete mode 100644 platform/linux-generic/include/odp/drv/compiler.h delete mode 100644 platform/linux-generic/include/odp/drv/driver.h delete mode 100644 platform/linux-generic/include/odp/drv/plat/atomic_types.h delete mode 100644 platform/linux-generic/include/odp/drv/plat/barrier_types.h delete mode 100644 platform/linux-generic/include/odp/drv/plat/byteorder_types.h delete mode 100644 platform/linux-generic/include/odp/drv/plat/driver_types.h delete mode 100644 platform/linux-generic/include/odp/drv/plat/shm_types.h delete mode 100644 platform/linux-generic/include/odp/drv/plat/spinlock_types.h delete mode 100644 platform/linux-generic/include/odp/drv/plat/strong_types.h delete mode 100644 platform/linux-generic/include/odp/drv/shm.h delete mode 100644 platform/linux-generic/include/odp/drv/spinlock.h delete mode 100644 platform/linux-generic/include/odp/drv/std_types.h delete mode 100644 platform/linux-generic/include/odp/drv/sync.h delete mode 100644 test/validation/drv/.gitignore delete mode 100644 test/validation/drv/Makefile.am delete mode 100644 test/validation/drv/Makefile.inc delete mode 100644 test/validation/drv/README delete mode 100644 test/validation/drv/drvatomic/.gitignore delete mode 100644 test/validation/drv/drvatomic/Makefile.am delete mode 100644 test/validation/drv/drvatomic/drvatomic.c delete mode 100644 test/validation/drv/drvatomic/drvatomic.h delete mode 100644 test/validation/drv/drvatomic/drvatomic_main.c delete mode 100644 test/validation/drv/drvshmem/.gitignore delete mode 100644 test/validation/drv/drvshmem/Makefile.am delete mode 100644 test/validation/drv/drvshmem/drvshmem.c delete mode 100644 test/validation/drv/drvshmem/drvshmem.h delete mode 100644 test/validation/drv/drvshmem/drvshmem_main.c hooks/post-receive --

8 years, 10 months

[COMMIT] annotated tag v1.16.0.0 created. v1.16.0.0

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 annotated tag, v1.16.0.0 has been created at e189b781b10d86d7ea73bc78b00e151286cdf294 (tag) tagging 2cfe11680ecc2186339183e94f291ce586740f8b (commit) replaces v1.15.0.0 tagged by Maxim Uvarov on Fri Nov 10 16:22:29 2017 +0300 - Log ----------------------------------------------------------------- == OpenDataPlane (1.16.0.0) === New Features ODP v1.16.0.0 is the final preview release before the official release of Tiger Moth. It introduces new APIs and extensions, as well as bug fixes and functional improvements. ==== APIs The following new and changed APIs are included in this release: ===== Initialization Changes The new `odp_feature_t` type is introduced that defines various feature bits for ODP components. This is used in an expanded `odp_init_t` argument to `odp_init_global()` to specify which ODP features are unused by the application. For example, if the application knows it will not be making use of crypto features or the classifier, this may permit the ODP implementation to configure itself more efficiently. Results are undefined if an application asserts that it will not be using a feature and it attempts to do so afterwards. Associated with this new support the `odp_init_param_init()` API is added to initialize the `odp_init_t` struct to default values. ===== Packet API Changes * The `odp_packet_unshared_len()` API is removed. Testing showed that this API was non-essential and conflicted with the goal of implementation efficiency. * The `odp_print_packet_data()` API is added. This permits packet data to be logged along with platform-defined metadata for debugging or diagnostic purposes. ===== PktIO API Changes * The `loop_supported` attribute of the `odp_pktio_capability_t` struct is deprecated since this is redundant. The `enable_loop` field of the `odp_pktio_config_t` struct (which is returned as part of the `odp_packet_capability_t` struct) is the proper way to determine whether a PktIO supports loopback mode. ===== System Info API Changes * The documentation for the `odp_sys_huge_page_size()` API is updated to clarify that a 0 return code indicates that huge pages are not supported by this platform. * The `odp_sys_huge_page_size_all()` API is added to return all huge page sizes supported by this platform. ===== Timer API Changes * The documentation for the various parameters contained in the `odp_timer_pool_param_t` struct are expanded and clarified. === Miscellaneous Fixes and Improvements ==== Default Packet Headroom The default packet headroom in `odp-linux` has been increased from 66 to 128 bytes for better compatibility with `odp-dpdk`. ==== Zero-copy Packet References The `odp-linux` reference implementation now fully supports zero-copy packet references. Previously these APIs were implemented via packet copies, which while functionally correct, were not how these APIs are intended to operate. ==== DPDK Zero-copy I/O support The `--enable-dpdk-zero-copy` `configure` option is added to allow DPDK PktIO devices to avoid data copies, leading to improved performance. ==== DPDK Checksum offload support DPDK PktIO now makes use of RX and TX IP/UDP/TCP checksum offload. ==== Shared memory stored in /dev/shm In the `odp-linux` reference implementation, shared memory is now backed to `/dev/shm` rather than `/tmp` for better reliability and robustness. This may be overridden as part of ODP build-time customization if desired. ==== IPC Improvements PktIO IPC support has received improvements in both performance and reliability and is now suitable for development use. ==== Netmap Improvements The thread ID is now used to create unique vdev MAC addresses to avoid conflicts with multiple ODP processes running on the same host system. ==== `drv` directory removed The `include/odp/drv` directory and related files have been removed. Driver support is moved to a follow-on ODP release, so removing these files avoids confusion as they are still incomplete. === Dependency Changes ==== Dependency on autoconf-archive removed Since some build environments do not supply autoconf-archive, this dependency is removed. ==== DPDK support upgraded to 17.08 release The ODP DPDK Packet I/O support has been upgraded to work with the DPDK 17.08 release. ==== Added support for OpenSSL 1.1.x releases ODP use of OpenSSL for crypto processing has been upgraded to allow use of OpenSSL 1.1.x. === Build System Restructure The ODP build system has been overhauled to support more comprehensive and efficient automated testing under Travis CI. Greater use of Autoconf is now made to control ODP configuration and build options, permitting greater environmental flexibility. This includes an expanded range of test coverage, including cross-compilation support for ARMv8, MIPS,and Power architectures, as well as testing under the latest levels of GCC and clang. === Arm Architecture Support Improvements * ARMv8 generic timer support is now included * Improved time efficiency and accuracy by using native ARMv8 time/clock instructions. ==== Test Improvements The `test` directory has been reorganized and streamlined. Platform-specific tests are moved from `test/linux-generic` to `platform/linux-generic/test/`. As a result, the `test/common_plat` directory is deleted so that `test/validation`, `test/performance`, etc. are now used for all platform-independent tests. ==== Examples Improvements ===== IPv4 Fragmentation Reassembly Example The `ipfragreass` example program has been added to demonstrate IPv4 fragment reassembly. ===== ODP Generator Improvements The `odp_generator` example program now uses packet references for improved performance in UDP and ICMP traffic. The program also now makes use of HW checksum offload support, when available. === Documentation Improvements * The ODP Users Guide has clarified usage information about the ODP time APIs for better portability. * A section has been added to the ODP Users Guide on API specification principles. This clarifies expected behavior of ODP applications and implementations and makes explicit what the specification means by "undefined behavior". * All Doxygen used in ODP is upgraded to conform to the stricter documentation requirements introduced by Doxygen 1.8.13. === Bug Fixes ==== https://bugs.linaro.org/show_bug.cgi?id=2254[Bug 2254] check-odp: valgrind generates "No rule to make target" ==== https://bugs.linaro.org/show_bug.cgi?id=2407[Bug 2407] test odp_l2fwd_run.sh contains todo items ==== https://bugs.linaro.org/show_bug.cgi?id=2812[Bug 2812] Helper/test/process fails on a single core system ==== https://bugs.linaro.org/show_bug.cgi?id=2861[Bug 2861] Remove redundant loop_support parameter in pktio capability ==== https://bugs.linaro.org/show_bug.cgi?id=2938[Bug 2938] Make file deps failure ==== https://bugs.linaro.org/show_bug.cgi?id=2976[Bug 2976] IP headers checksum functions are incorrect ==== https://bugs.linaro.org/show_bug.cgi?id=3024[Bug 3024] odp_traffic_mngr example is broken ==== https://bugs.linaro.org/show_bug.cgi?id=3026[Bug 3026] pktio_ipc_run test can fail due to segfault ==== https://bugs.linaro.org/show_bug.cgi?id=3043[Bug 3043] User guide error (packet diagram fix) ==== https://bugs.linaro.org/show_bug.cgi?id=3052[Bug 3052] api-next out of tree build broken ==== https://bugs.linaro.org/show_bug.cgi?id=3066[Bug 3066] Cross compile broken for ARMv8 ==== https://bugs.linaro.org/show_bug.cgi?id=3126[Bug 3126] IPC pktio test fails with taskset -c 1-2 ==== https://bugs.linaro.org/show_bug.cgi?id=3177[Bug 3177] Test case for classification enable ==== https://bugs.linaro.org/show_bug.cgi?id=3182[Bug 3182] Memory allocation checks (in traffic manager) ==== https://bugs.linaro.org/show_bug.cgi?id=3216[Bug 3216] Adding --enable-helper-linux configure flag breaks build ==== https://bugs.linaro.org/show_bug.cgi?id=3238[Bug 3238] Doxygen warnings on helper header files ==== https://bugs.linaro.org/show_bug.cgi?id=3241[Bug 3241] codecov: _odp_packet_cmp_data is not covered ==== https://bugs.linaro.org/show_bug.cgi?id=3242[Bug 3242] setup_pktio_entry missing unlock ==== https://bugs.linaro.org/show_bug.cgi?id=3249[Bug 3249] odp_cpu_hz() does not work on all Linux distros ==== https://bugs.linaro.org/show_bug.cgi?id=3262[Bug 3262] Missing doxygen detected by Travis ==== https://bugs.linaro.org/show_bug.cgi?id=3289[Bug 3289] 'num_queues' isn't ignored when "classifier_enable" is enabled ==== https://bugs.linaro.org/show_bug.cgi?id=3300[Bug 3300] Validation tests cannot be disabled after commit b4d17b1 ==== https://bugs.linaro.org/show_bug.cgi?id=3411[Bug 3411] wrong openssl_lock pointer type === Known Issues ==== https://bugs.linaro.org/show_bug.cgi?id=3245[Bug 3245] Cannot run l2fwd application on Cavium ThunderX platform Balakrishna Garapati (1): example:use dpdk pktio with examples Balasubramanian Manoharan (4): linux-generic: pktio: update classifier enable boolean linux-generic: classification: update classifier enable boolean validation: classification: add test case for classifier enable boolean api: packetio: deprecate redundant loop_supported field in capability Bill Fischofer (31): doc: userguide: add portability and usage info for odp time apis linux-generic: packet: restructure inline routines to use macros linux-generic: packet: add packet fields needed for references linux-generic: packet: add routines for manipulating reference counts linux-generic: packet: add initializations for new hdr fields linux-generic: packet: unshared_len maintenance linux-generic: packet: segment manipulation with references linux-generic: packet: restructure free routines for references linux-generic: packet: add reference support for head/tail manipulation linux-generic: ipc: cannot share references across ipc linux-generic: packet: enable zero-copy reference creation doc: images: correct packet segment diagram travis: add --enable-debug to list of test variants travis: split configure commands into individual options travis: add --enable-helper-linux test variants doc: helper: add missing doxygen to avoid warnings linux-generic: packet: add missing doxygen from inline func test: validation: add missing file to .gitignore linux-generic: test: add missing file to .gitignore doc: userguide: add section on api specification principles linux-gen: packet: add debugging asserts in packet code doc: userguide: add odp_init_global() documentation for unused features test: packet: remove references to odp_packet_unshared_len() linux-generic: packet: remove odp_packet_unshared_len() implementation api: packet: remove odp_packet_unshared_len() doc: userguide: remove references to odp_packet_unshared_len() api: feature: add odp feature bits api: init: add support for unused features linux-generic: init: implement odp_init_param_init() validation: init: use odp_init_param_init() in init tests changelog: updates for odp v1.16.0.0 Bogdan Pricope (6): example: generator : use packet reference API to generate udp and icmp traffic linux-gen: dpdk: retrieve offload capabilities linux-gen: dpdk: enable per pktio RX IP/UDP/TCP checksum offload linux-gen: dpdk: RX - process checksum validation offload flags linux-gen: dpdk: TX - set checksum calculation offload flags examples: generator: update odp_generator to use HW checksum capabilities Brian Brooks (6): arch: arm: add CPU global time build: fix conditional compilation of sources linux-gen: time: use true hz build: fix 64-bit atomics detection linux-gen: barrier: Use correct memory ordering test: odp_pktio_ordered: add queue size Christophe Milard (1): test: preventing odp.conf loading for tests Dmitry Eremin-Solenikov (148): linux-generic: crypto: adapt HMAC code to OpenSSL 1.1.x travis: add cross-compilation checks doc: add IMAGES_DIR instead of specifying full path to images doc: fix documentation building doc: use CLEANFILES instead of handcoding clean rules doc: fix user-guide.doc permissions doc: drop images full paths, we have imagesdir properly set doc: include sources of generated images into distribution build: enable user guides during distcheck travis: pass proper path to make distcheck pkgconfig: provide minimal proper static linking flags linux-gen: stop poisoning CPPFLAGS/LDFLAGS with OpenSSL flags linux-gen: stop poisoning CPPFLAGS/LDFLAGS with DPDK flags linux-gen: stop poisoning CFLAGS/LIBS with libpcap flags linux-gen: stop poisoning CPPFLAGS/LDFLAGS with CUnit flags linux-gen: stop poisoning CFLAGS/LDFLAGS with threading flags linux-gen: move timer_create check to platform directory linux-gen: stop poisoning CPPFLAGS with Netmap flags travis: use pkg-config to discover ODP flags example: ipsec: fix build with OpenSSL located in non-standard path example: ipfragreass: fix compilation with clang travis: simplify cross-compilation setup travis: add clang cross-compilation checks travis: enable ccache and pip cache configure: remove non-standard test usage m4: update valgrind check macro travis: fix DPDK cache linux-gen: crypto: check packet length during operation travis: another attempt to fix cache configuration linux-gen: hide get_qentry linux-gen: pool: drop two unused functions linux-gen: fdserver: mark client_lock as static linux-gen: classification: mark several functions as static linux-gen: scheduler: drop unused callback linux-gen: pktio: drop/staticize leftovers from single queue shim linux-gen: pktio: mark pktio_tbl as static linux-gen: queue: drop two unused functions linux-gen: sched: mark sched_local as static linux-gen: sched iquery: mark thread_local as static configure: move configure header to include dir linux-gen: pktio: ethtool: add void pointer type casts linux-gen: tm: do not redefine _GNU_SOURCE linux-gen: pktio: ethtool: don't include linux/if.h linux-gen: use config.h header helper: use config.h header test: don't redefine _GNU_SOURCE test: use config.h header configure: AC_DEFINE_UNQUOTED(IMPLEMENTATION_NAME) configure: AC_DEFINE_UNQUOTED(ODP_DEBUG_PRINT) configure: AC_DEFINE_UNQUOTED(ODPH_DEBUG_PRINT) configure: AC_DEFINE_UNQUOTED(ODP_DEBUG) configure: AC_DEFINE(HAVE_PCAP) configure: AC_DEFINE(ODP_SCHEDULE_SP) configure: AC_DEFINE(ODP_SCHEDULE_IQUERY) configure: AC_DEFINE(ODP_NETMAP) configure: AC_DEFINE(ODP_PKTIO_DPDK)/AC_DEFINE(ODP_DPDK_ZERO_COPY) automake: move foreign Automake option to configure.ac automake: move nostdinc Automake option to configure.ac linux-gen: drop _ODP_PKTIO_IPC define configure: pass all compiler options through acceptance check configure: drop AC_FUNC_MALLOC test travis: pass cunit path to distcheck options directly configure: reenable compiler fallthrough warning helper: move include files to helper/include helper: chksum: odph_chksum returns value in network byte order helper: ip: correct ipv4 header checksum calculation helper: chksum: verify odph_ipv4_chksum_x() functions configure: enable all tests by default configure: rework with-testdir check configure: enable helper-linux in distcheck options configure: provide a way to enable all debugging options at once travis: drop configure options enabled by default travis: enable full debug option configure, travis: switch to pkg-config to locate CUnit helper: chksum: add few guarding conditions test: fixup CUNIT_CFLAGS variable reference travis: drop ubuntu-toolchain-r-test PPA configure: use ODP_CHECK_FLAG to check for -mcx16 linux-gen: crypto: stop using RAND_pseudo_bytes() build: drop -Wno-deprecated-declaration build: drop platorm/linux-generic/Makefile.inc build: use AM_CPPFLAGS to set include paths, rather than AM_CFLAGS configure: stop setting AM_* variables test: rework build system helper: test: rework build system test: pktio_ipc: switch to test_debug rather than example_debug test: build all tests with -static test: misc rewrites in Makefile.am files travis: don't error out if there are no patches to check travis: skip install stage for doxygen and checkpatch tests DEPENDENCIES: document changes in CUnit localization test: try detecting CUnit location, if it is not found by pkg-config configure: call PKG_PROG_PKG_CONFIG explicitly travis: fix powerpc test name travis: don't override prefix when cross-compiling travis: don't use cross-pkg-config travis: add cross-testing for 32-bit x86 travis: enable cpp test during cross-compilation travis: merge native and cross-compilation scripts travis: move cross-compilation into build matrix configure: "best effort" approach for CUnit and validation tests linux-gen: drop unused _odp_packet_cmp_data() function tests: fix validation tests being skipped by default linux-gen: split arm into arm and aarch64 linux-gen: deduplicate arch-specific files travis: fix netmap module loading tests: fix disabling of validation tests configure: disable all tools except memcheck ax_valgrind_check.m4: update to upstream version ax_valgrind_check: run check-valgrind recursively .gitignore: ignore only libtool m4 files m4: move openssl check to common place m4: move timer_create check to common place m4: move -fvisibility=hidden check to separate file m4: move atomic checks to separate file example: switch odp_l3fwd from test_debug.h to example_debug.h test: move run-test script to test_common dir test: move common validation tests handling to theirs own Makefile.am test: linux-gen: move platform-specific tests to platform directory test: move test_debug.h to test/common_plat/common/ test: drop now-unused common_plat directory linux-gen: move libodp-linux.pc.in to platform directory helper: move libodphelper.pc.in to helper directory build: move handling of include files to include dir include: include all ABI files into distribution linux-gen: drop unnecessary srcdir from Makefile.am linux-gen: stop including autogenerated header into distribution example: simplify Makefile.ams helper: simplify Makefile.ams travis: print failed test logs basing on test result status files configure: use AS_HELP_STRING instead of AC_HELP_STRING configure: use AC_CONFIG_COMMANDS_PRE to set conditionals configure: drop SDK_INSTALL_PATH variable configure: cleanup per-platform if test: drop unused EXEEXT suffix linux-gen: drop unused EXEEXT suffix example: add ${EXEEXT} when calling compiled programs helper: add ${EXEEXT} when calling compiled programs linux-gen: use ${EXEEXT} when calling shmem_linux test linux-gen: use EXEEXT in shmem_linux test .gitinore: ignore moved .pc files drv: doc, linux-gen, include: drop incomplete drv interface configure: don't try building driver api guide doc: include Doxyfile into EXTRA_DIST travis: move Doxygen compilation to before_install build: run doxygen-doc during make distcheck example: fix pointers to odp_l2fwd.c source doc: move PREDEFINED to common place Honnappa Nagarahalli (1): linux-generic: queue: modular queue interface Ilias Apalodimas (6): linux-gen: queue: checks on memory allocations linux-gen: queue: added additional missing free examples: generator: use clock related functions less when printing example: use odp_sys_info_print linux-gen: use /proc/cpuinfo if sysfs is not available to get cpu info linux-gen: x86: fix on odp_cpu_arch_hz_current() declaration for x86 Joe Savage (1): example: add IPv4 fragmentation/reassembly example Joyce Kong (1): linux-gen: improve conversion between buf_hdr_t and packet_t Kelvin Cheung (1): linux-gen: system: correctly set CPU frequency Matias Elo (31): linux-gen: packet: fix odp_packet_reset() implementation linux-gen: socket: fix ring frame size linux-gen: packet: move packet_init() function to header file linux-gen: pktio: add missing global locks to odp_pktio_close() linux-gen: pool: fix segfault condition in buffer_free_to_pool() linux-gen: packet: increase default headroom linux-gen: dpdk: enable zero-copy operation travis: add zero-copy dpdk pktio to CI travis: cache dpdk directory linux-gen: dpdk: make sure mbuf memory is allocated from huge pages test: l2fwd: stop and close pktio devices on exit test: l2fwd: add signal handler for SIGINT helper: test: fix running process/thread tests on single core systems linux-gen: socket: don't use odp_packet_l2_offset() in _tx_pkt_to_iovec() validation: packet: remove old unused define example: classifier: enable classifier in input queue parameters test: pktio_perf: increase maximum number of workers threads linux-gen: pool: avoid allocating packets which cross huge page boundaries linux-gen: pool: combine overlapping struct pool_t members linux-gen: pool: modify packet pool config defines linux-gen: packet: fix build error with single segment packet header linux-gen: pool: select packet pool segment size at runtime validation: packet: adjust segmented test packet length linux-gen: dpdk: create missing dpdk mempools in zero-copy mode linux-gen: dpdk: bump target dpdk version to 17.08 linux-gen: netmap: use thread id to make vdev mac addresses unique linux-gen: netmap: remove minimum frame len check test: l2fwd script: run generator on a single core api: system_info: add function for fetching all supported huge page sizes linux-gen: system_info: implement odp_sys_huge_page_size_all() validation: system_info: add test for odp_sys_huge_page_size_all() Maxim Uvarov (50): travis: back to stable image until issue is resolved configure: remove dependency of autoconf-archive linux-gen: pktio: ipc fix send return code on tx linux-gen: pktio: ipc fix error check linux-gen: pktio: ipc: rx: push back not processed packets linux-gen: ipc remove base_addr_offset linux-gen: shm: use shm in /dev/shm instead of /tmp linux-gen: shm: add uid to shm files linux-gen: shm: user can define place for shm files linux-gen: pktio: ipc fix packets free test: ipc pktio use /dev/shm instead of tmp test: pktio: ipc: increse timeouts for coverage test test: ipc pktio: bind tasks and keep packet order linux-gen: ishm fix defining directory for shm files helper: add missing pool param inits linux-gen: fdserver: fix fdserver work if ODP_SHM_DIR is exported travis: add check for ODP_SHM_DIR test: fix cunit include path travis: cache netmap build tavis: cache cunit travis: make distcheck work with custom cunit test: classifier: fix double free linux-gen: pktio: loop: fix recv if classier bit is enabled linux-gen: move packet_to_buffer to packet_inlines.h travis: doxygen 1.8.13 travis: capture doxygen warnings right travis: cache doxygen travis: correct doxygen warning capture Revert "test: disable packet parsing in odp_pktio_perf" Revert "test: make odp_pktio_perf more scalable" linux-gen: _fdserver return code cleanup travis: typo to call dynamic executable travis: temporary turn off dpdk caching travis: build dpdk for general cpu travis: purge dpdk cache on version change linux-gen: timer: drop odp prefix from odp_timer_pool_new linux-gen: timer: drop odp prefix from odp_timer_pool linux-gen: timer: drop odp prefix from odp_timer_pool_s linux-gen: timer: drop odp prefix from odp_timer_s linux-gen: odp_tm_stats_print should not depend on debug example: traffic_mgmt add clean termination path example: traffic_mgmt: add to make check linux-gen: pktio: add missing unlock linux-gen: pktio test odp_shm_reserve return code linux-gen: pktio: simplify ret code travis: fix doxygen error capture linux-gen: pktio: ignore num_queues parameter if classifier enabled travis: fix script to check patches to not fail on new branch shippable: add libconfig and libnuma configure.ac: update API and .so versions Mykyta Iziumtsev (2): linux-gen: fixing typos api: fixing typos Nikhil Agarwal (1): test:queue:update order queue test for locks. Ola Liljedahl (4): test: make odp_pktio_perf more scalable test: disable packet parsing in odp_pktio_perf test: disable packet parsing in odp_pktio_perf test: make odp_pktio_perf more scalable Petri Savolainen (33): linux-gen: time: fix ARM compile for GCC 4.8 linux-gen: queue: clean up after modular interface linux-gen: sched: remove schedule interface depedency to qentry linux-gen: sched: use config max ordered locks linux-gen: sched: remove most dependecies to qentry linux-gen: sched: remove unused sched interface functions linux-gen: cls: avoid queue conversions linux-gen: pktio: dont use qentry for queue_t linux-gen: pktio: convert queue handle only once linux-gen: pktio: remove unused header file linux-gen: queue: combine queue interface set functions linux-gen: queue: remove type set from interface linux-gen: buffer: change buffer handle to pointer linux-gen: queue: avoid extra conversions linux-gen: pool: avoid extra conversions linux-gen: packet: roll back to copy based references validation: packet: relax small concat test validation: packet: unshared len with static reference validation: packet: check reference packet content linux-gen: packet: re-implement packet segmentation linux-gen: buffer: optimize header layout linux-gen: packet: implement static references linux-gen: packet: enhance segment prints linux-gen: packet: compress packet offset table linux-gen: packet: implement dynamic references linux-gen: packet: optimize header layout linux-gen: crypto: fix openssl_lock pointer type abi: event: add ODP_EVENT_IPSEC_RESULT api: packet: print packet data linux-gen: packet: implement odp_packet_data_print validation: packet: add packet_print_data test api: timer: refine timer pool param documentation api: packet_io: refine packet format on output Tom Trahan (1): add sample shippable.yml and Dockerfile for Aarch64 builds Yi He (4): test: traffic_mngr: fix distcheck failure test: time: fix distcheck failure Makefile.am: update distcheck configuration travis: enable all tests when make distcheck ----------------------------------------------------------------------- hooks/post-receive --

8 years, 10 months

[COMMIT] branch next updated. v1.15.0.0-333-g2cfe1168

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, next has been updated discards 88e124e13900109e0d0aec1981417382f357c98a (commit) discards b61de566190e19cc79531fdca737787cc359584b (commit) discards ae393d6677e242464773aa81a5c18fdfe1ce2c85 (commit) discards 9f02c58d41ec59f443e880766855265885f3a13d (commit) discards 4954fd9289befbdd06d52b4d9b7ed7a83f268b10 (commit) discards fb667f44a397a34bc1c4af41c49a766156740ff3 (commit) discards f318c88f26b15140dda243e6a1d27e3c8f9d275b (commit) discards 8862db747458bf1a52ccd22eaf8b5cb1f8539e95 (commit) discards 7137f734b5421c59cfb03bfc4928a40dbfef9166 (commit) discards 03c84e04003ed74e9cdf3b575dad6e7496bb93b9 (commit) discards 905ce7df9aadb43a004347b674a0f5f40b7e179e (commit) discards 45ae15980256afe38fcb1e67931292fe1941d37a (commit) discards eebc3caa3e1cbb8b3ae75d6aba2912fa399c4c18 (commit) discards f4657562b7c2b23e64aaba234820cbe50c2422ec (commit) discards e0dbfd90a11078bc6b5eb03ce3e48b7b22161470 (commit) discards 58d6f8fe7a2652c20db2b5cd632a7f5d6a560546 (commit) discards 89538dedcb71c8f54987758229f0d5b6f1de3ada (commit) discards 79b1cc361a7e1eb1098d006e0b70c903460d32c7 (commit) discards 4c1190787a1d48147cbfe7e20c8b31b0b05c94f3 (commit) discards 40cd2eb0ddb11d4880bf0cd19a2b661a9b42d398 (commit) discards 2d76e64f9ca79b3efce87bd02d849d139a9f305a (commit) discards 86b8f3d4371b3fd0ec09091b404b829f2e97730d (commit) discards 0841edfc364b39fce8c1ed1cdbddecde1d98b42e (commit) discards c7801718747a7bcaf377fd25cdd97582f8755b05 (commit) discards fa9533ede03e40f0455c6d889997042f32235fc1 (commit) discards 07a5a017f0178e9067aab7aeb9a9fc4152152f5c (commit) via 2cfe11680ecc2186339183e94f291ce586740f8b (commit) via bb6abbb8a5a8f92a7b18c7c2b3336be1ef264e11 (commit) via 45d422099d86461c48871879e0f7abbf37acfd5c (commit) via 614161c1a440d13d866975dc13df13cde2e8b3f3 (commit) via 279621af7fd8bf2b84b16acce85ff5bf040e7771 (commit) via 29195afb96cd539e4d4a94bd3d64336acf34bcaa (commit) via b653ea8ac54aea1a81ce9f49d4ec60f81bec2d2d (commit) via 3c8f24c52d80bd7e032ba3a1788c8dbc4d5ea0ad (commit) via 9b98d35daf7736b34e51400c6a7e32bf81537ce6 (commit) via 774b652640be4ab7147db0a337f84ce8d602b665 (commit) via 8999344484a2c3b4c08b84c5b27e2b355fa312d5 (commit) via e475a06dba8b79eace4131ea7327e87a10546351 (commit) via c5fbca288838d39f3f6434d381acb25f12c1dc9e (commit) via 22921366d8a2f9155d43f7022d645c6d364c8b58 (commit) via 0278905b45145a168f5b63afa0dbf0be30e808be (commit) via da0198f610f10c8af2c19eb4148001d1759eb401 (commit) via 6b24e0905df12ba075d86e471a48035f6c7b91ef (commit) via c8f25051021015221ec8d46cf2e06914eb8ca868 (commit) via 5f095cc66bc3fcafe8f44ed7348ef127f40c9026 (commit) via 3d6cf1de61e0b5c846317b3ffcbd0cfd07531b90 (commit) via 43d7f57b9f9f24526330c51fda8554d52414b82f (commit) via c4a8f43ff08b954d14857c5a59544f8d914205e3 (commit) via f972ef61a9693b7895cb7f85084c1c53c3b13131 (commit) via b6b667b1e95635a6ba77a19078d7d28013bcde1d (commit) via bae53291795e9c19cbfde9c0d0e11a19d9870623 (commit) via dd31792d10772c3e41519fc0b6d68cf13b0fe9d4 (commit) via 0e04be4851ecc94da8b4cac3c576260c0518c936 (commit) via d59c00c5f0255a5f1fc462332eef291bb2993f64 (commit) via 29c7a054f7151d33795a0d8d7df5594bf4fddb55 (commit) via 2dd964e170d71078cfe03d4c9e00c6f592b4326b (commit) via 449c693b2678bc29577b64fb76003bb10b86db6e (commit) via b13eba4e9b9cb814f115627addf763322fe22a76 (commit) via ea9f2aa440a653a77cbcadc2862c5af298205272 (commit) via 5e840b83992bba2f64750bb3a4599478d6ea9260 (commit) via 387b402c4f2fc0694b6e0fe68ee4be8a2bd42442 (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (88e124e13900109e0d0aec1981417382f357c98a) \ N -- N -- N (2cfe11680ecc2186339183e94f291ce586740f8b) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. 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 2cfe11680ecc2186339183e94f291ce586740f8b Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Wed Nov 8 15:50:47 2017 +0300 configure.ac: update API and .so versions Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> diff --git a/configure.ac b/configure.ac index 069fdb4c..459ea231 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ([2.5]) # Set correct API version ########################################################################## m4_define([odpapi_generation_version], [1]) -m4_define([odpapi_major_version], [15]) +m4_define([odpapi_major_version], [16]) m4_define([odpapi_minor_version], [0]) m4_define([odpapi_point_version], [0]) m4_define([odpapi_version], @@ -36,10 +36,10 @@ AM_SILENT_RULES([yes]) # 3. if interfaces were removed, then use C+1:0:0 ########################################################################## -ODP_LIBSO_VERSION=115:0:2 +ODP_LIBSO_VERSION=116:0:0 AC_SUBST(ODP_LIBSO_VERSION) -ODPHELPER_LIBSO_VERSION=112:1:0 +ODPHELPER_LIBSO_VERSION=113:1:1 AC_SUBST(ODPHELPER_LIBSO_VERSION) # Checks for programs. commit bb6abbb8a5a8f92a7b18c7c2b3336be1ef264e11 Author: Bill Fischofer <bill.fischofer(a)linaro.org> Date: Wed Nov 1 13:51:05 2017 -0500 changelog: updates for odp v1.16.0.0 Signed-off-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/CHANGELOG b/CHANGELOG index 866e51e9..af575783 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,225 @@ +== OpenDataPlane (1.16.0.0) +=== New Features +ODP v1.16.0.0 is the final preview release before the official release of +Tiger Moth. It introduces new APIs and extensions, as well as bug fixes and +functional improvements. + +==== APIs +The following new and changed APIs are included in this release: + +===== Initialization Changes +The new `odp_feature_t` type is introduced that defines various feature bits +for ODP components. This is used in an expanded `odp_init_t` argument to +`odp_init_global()` to specify which ODP features are unused by the +application. For example, if the application knows it will not be making use +of crypto features or the classifier, this may permit the ODP implementation +to configure itself more efficiently. Results are undefined if an application +asserts that it will not be using a feature and it attempts to do so +afterwards. + +Associated with this new support the `odp_init_param_init()` API is added +to initialize the `odp_init_t` struct to default values. + +===== Packet API Changes + +* The `odp_packet_unshared_len()` API is removed. Testing showed that this +API was non-essential and conflicted with the goal of implementation +efficiency. +* The `odp_print_packet_data()` API is added. This permits packet data to +be logged along with platform-defined metadata for debugging or diagnostic +purposes. + +===== PktIO API Changes + +* The `loop_supported` attribute of the `odp_pktio_capability_t` struct is +deprecated since this is redundant. The `enable_loop` field of the +`odp_pktio_config_t` struct (which is returned as part of the +`odp_packet_capability_t` struct) is the proper way to determine whether a +PktIO supports loopback mode. + +===== System Info API Changes + +* The documentation for the `odp_sys_huge_page_size()` API is updated to +clarify that a 0 return code indicates that huge pages are not supported by +this platform. +* The `odp_sys_huge_page_size_all()` API is added to return all +huge page sizes supported by this platform. + +===== Timer API Changes + +* The documentation for the various parameters contained in the +`odp_timer_pool_param_t` struct are expanded and clarified. + +=== Miscellaneous Fixes and Improvements + +==== Default Packet Headroom +The default packet headroom in `odp-linux` has been increased from 66 to +128 bytes for better compatibility with `odp-dpdk`. + +==== Zero-copy Packet References +The `odp-linux` reference implementation now fully supports zero-copy +packet references. Previously these APIs were implemented via packet copies, +which while functionally correct, were not how these APIs are intended to +operate. + +==== DPDK Zero-copy I/O support +The `--enable-dpdk-zero-copy` `configure` option is added to allow DPDK PktIO +devices to avoid data copies, leading to improved performance. + +==== DPDK Checksum offload support +DPDK PktIO now makes use of RX and TX IP/UDP/TCP checksum offload. + +==== Shared memory stored in /dev/shm +In the `odp-linux` reference implementation, shared memory is now backed to +`/dev/shm` rather than `/tmp` for better reliability and robustness. This may +be overridden as part of ODP build-time customization if desired. + +==== IPC Improvements +PktIO IPC support has received improvements in both performance and +reliability and is now suitable for development use. + +==== Netmap Improvements +The thread ID is now used to create unique vdev MAC addresses to avoid +conflicts with multiple ODP processes running on the same host system. + +==== `drv` directory removed +The `include/odp/drv` directory and related files have been removed. Driver +support is moved to a follow-on ODP release, so removing these files avoids +confusion as they are still incomplete. + +=== Dependency Changes + +==== Dependency on autoconf-archive removed +Since some build environments do not supply autoconf-archive, this dependency +is removed. + +==== DPDK support upgraded to 17.08 release +The ODP DPDK Packet I/O support has been upgraded to work with the DPDK 17.08 +release. + +==== Added support for OpenSSL 1.1.x releases +ODP use of OpenSSL for crypto processing has been upgraded to allow use of +OpenSSL 1.1.x. + +=== Build System Restructure +The ODP build system has been overhauled to support more comprehensive and +efficient automated testing under Travis CI. Greater use of Autoconf is now +made to control ODP configuration and build options, permitting greater +environmental flexibility. This includes an expanded range of test coverage, +including cross-compilation support for ARMv8, MIPS,and Power architectures, +as well as testing under the latest levels of GCC and clang. + +=== Arm Architecture Support Improvements + +* ARMv8 generic timer support is now included +* Improved time efficiency and accuracy by using native ARMv8 time/clock +instructions. + +==== Test Improvements +The `test` directory has been reorganized and streamlined. Platform-specific +tests are moved from `test/linux-generic` to +`platform/linux-generic/test/`. As a result, the `test/common_plat` +directory is deleted so that `test/validation`, `test/performance`, etc. are +now used for all platform-independent tests. + +==== Examples Improvements + +===== IPv4 Fragmentation Reassembly Example +The `ipfragreass` example program has been added to demonstrate IPv4 fragment +reassembly. + +===== ODP Generator Improvements +The `odp_generator` example program now uses packet references for improved +performance in UDP and ICMP traffic. The program also now makes use of HW +checksum offload support, when available. + +=== Documentation Improvements + +* The ODP Users Guide has clarified usage information about the ODP time +APIs for better portability. +* A section has been added to the ODP Users Guide on API specification +principles. This clarifies expected behavior of ODP applications and +implementations and makes explicit what the specification means by "undefined +behavior". +* All Doxygen used in ODP is upgraded to conform to the stricter documentation +requirements introduced by Doxygen 1.8.13. + +=== Bug Fixes + +==== https://bugs.linaro.org/show_bug.cgi?id=2254[Bug 2254] +check-odp: valgrind generates "No rule to make target" + +==== https://bugs.linaro.org/show_bug.cgi?id=2407[Bug 2407] +test odp_l2fwd_run.sh contains todo items + +==== https://bugs.linaro.org/show_bug.cgi?id=2812[Bug 2812] +Helper/test/process fails on a single core system + +==== https://bugs.linaro.org/show_bug.cgi?id=2861[Bug 2861] +Remove redundant loop_support parameter in pktio capability + +==== https://bugs.linaro.org/show_bug.cgi?id=2938[Bug 2938] +Make file deps failure + +==== https://bugs.linaro.org/show_bug.cgi?id=2976[Bug 2976] +IP headers checksum functions are incorrect + +==== https://bugs.linaro.org/show_bug.cgi?id=3024[Bug 3024] +odp_traffic_mngr example is broken + +==== https://bugs.linaro.org/show_bug.cgi?id=3026[Bug 3026] +pktio_ipc_run test can fail due to segfault + +==== https://bugs.linaro.org/show_bug.cgi?id=3043[Bug 3043] +User guide error (packet diagram fix) + +==== https://bugs.linaro.org/show_bug.cgi?id=3052[Bug 3052] +api-next out of tree build broken + +==== https://bugs.linaro.org/show_bug.cgi?id=3066[Bug 3066] +Cross compile broken for ARMv8 + +==== https://bugs.linaro.org/show_bug.cgi?id=3126[Bug 3126] +IPC pktio test fails with taskset -c 1-2 + +==== https://bugs.linaro.org/show_bug.cgi?id=3177[Bug 3177] +Test case for classification enable + +==== https://bugs.linaro.org/show_bug.cgi?id=3182[Bug 3182] +Memory allocation checks (in traffic manager) + +==== https://bugs.linaro.org/show_bug.cgi?id=3216[Bug 3216] +Adding --enable-helper-linux configure flag breaks build + +==== https://bugs.linaro.org/show_bug.cgi?id=3238[Bug 3238] +Doxygen warnings on helper header files + +==== https://bugs.linaro.org/show_bug.cgi?id=3241[Bug 3241] +codecov: _odp_packet_cmp_data is not covered + +==== https://bugs.linaro.org/show_bug.cgi?id=3242[Bug 3242] +setup_pktio_entry missing unlock + +==== https://bugs.linaro.org/show_bug.cgi?id=3249[Bug 3249] +odp_cpu_hz() does not work on all Linux distros + +==== https://bugs.linaro.org/show_bug.cgi?id=3262[Bug 3262] +Missing doxygen detected by Travis + +==== https://bugs.linaro.org/show_bug.cgi?id=3289[Bug 3289] +'num_queues' isn't ignored when "classifier_enable" is enabled + +==== https://bugs.linaro.org/show_bug.cgi?id=3300[Bug 3300] +Validation tests cannot be disabled after commit b4d17b1 + +==== https://bugs.linaro.org/show_bug.cgi?id=3411[Bug 3411] +wrong openssl_lock pointer type + +=== Known Issues + +==== https://bugs.linaro.org/show_bug.cgi?id=3245[Bug 3245] +Cannot run l2fwd application on Cavium ThunderX platform + == OpenDataPlane (1.15.0.0) === New Features ODP v1.15.0.0 continues the preview of Tiger Moth, introducing new APIs and commit 45d422099d86461c48871879e0f7abbf37acfd5c Author: Bill Fischofer <bill.fischofer(a)linaro.org> Date: Tue Jun 13 07:55:14 2017 -0500 validation: init: use odp_init_param_init() in init tests Provide test coverage for odp_init_param_init() API. Signed-off-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/init/init.c b/test/validation/api/init/init.c index d44ff234..3dc40ea5 100644 --- a/test/validation/api/init/init.c +++ b/test/validation/api/init/init.c @@ -26,10 +26,10 @@ static int odp_init_log(odp_log_level_t level, const char *fmt, ...); void init_test_odp_init_global_replace_abort(void) { int status; - struct odp_init_t init_data; + odp_init_t init_data; odp_instance_t instance; - memset(&init_data, 0, sizeof(init_data)); + odp_init_param_init(&init_data); init_data.abort_fn = &odp_init_abort; status = odp_init_global(&instance, &init_data, NULL); @@ -79,10 +79,10 @@ int init_main_abort(int argc, char *argv[]) void init_test_odp_init_global_replace_log(void) { int status; - struct odp_init_t init_data; + odp_init_t init_data; odp_instance_t instance; - memset(&init_data, 0, sizeof(init_data)); + odp_init_param_init(&init_data); init_data.log_fn = &odp_init_log; replacement_logging_used = 0; commit 614161c1a440d13d866975dc13df13cde2e8b3f3 Author: Bill Fischofer <bill.fischofer(a)linaro.org> Date: Tue Jun 13 07:55:13 2017 -0500 linux-generic: init: implement odp_init_param_init() Signed-off-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/odp_init.c b/platform/linux-generic/odp_init.c index 92a58370..fe03709b 100644 --- a/platform/linux-generic/odp_init.c +++ b/platform/linux-generic/odp_init.c @@ -25,6 +25,11 @@ struct odp_global_data_s odp_global_data; +void odp_init_param_init(odp_init_t *param) +{ + memset(param, 0, sizeof(odp_init_t)); +} + int odp_init_global(odp_instance_t *instance, const odp_init_t *params, const odp_platform_init_t *platform_params ODP_UNUSED) commit 279621af7fd8bf2b84b16acce85ff5bf040e7771 Author: Bill Fischofer <bill.fischofer(a)linaro.org> Date: Tue Jun 13 07:55:12 2017 -0500 api: init: add support for unused features Add the not_used field to odp_init_t to permit applications to specify that they will not use various ODP features. This may allow implementations to provide optimized behavior. Also add the odp_init_param_init() API to initialize odp_init_t to default values. Signed-off-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/include/odp/api/spec/init.h b/include/odp/api/spec/init.h index 154cdf8f..e8ec4113 100644 --- a/include/odp/api/spec/init.h +++ b/include/odp/api/spec/init.h @@ -29,6 +29,7 @@ extern "C" { #include <odp/api/std_types.h> #include <odp/api/hints.h> +#include <odp/api/feature.h> #include <odp/api/thread.h> #include <odp/api/cpumask.h> @@ -153,8 +154,22 @@ typedef struct odp_init_t { odp_log_func_t log_fn; /** Replacement for the default abort fn */ odp_abort_func_t abort_fn; + /** Unused features. These are hints to the ODP implementation that + * the application will not use any APIs associated with these + * features. Implementations may use this information to provide + * optimized behavior. Results are undefined if applications assert + * that a feature will not be used and it is used anyway. + */ + odp_feature_t not_used; } odp_init_t; +/** + * Initialize the odp_init_t to default values for all fields + * + * @param[out] param Address of the odp_init_t to be initialized + */ +void odp_init_param_init(odp_init_t *param); + /** * @typedef odp_platform_init_t * ODP platform initialization data commit 29195afb96cd539e4d4a94bd3d64336acf34bcaa Author: Bill Fischofer <bill.fischofer(a)linaro.org> Date: Tue Jun 13 07:55:11 2017 -0500 api: feature: add odp feature bits Add new odp_feature_t bits that permit other APIs/components to refer to various ODP features. Signed-off-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/include/Makefile.am b/include/Makefile.am index a3a7e165..746b5975 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -17,6 +17,7 @@ odpapispecinclude_HEADERS = \ odp/api/spec/debug.h \ odp/api/spec/errno.h \ odp/api/spec/event.h \ + odp/api/spec/feature.h \ odp/api/spec/hash.h \ odp/api/spec/hints.h \ odp/api/spec/init.h \ diff --git a/include/odp/api/spec/feature.h b/include/odp/api/spec/feature.h new file mode 100644 index 00000000..0cfc141d --- /dev/null +++ b/include/odp/api/spec/feature.h @@ -0,0 +1,69 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +/** + * @file + * + * ODP features. + * Define various ODP feature sets that can be referenced by other + * components. + */ + +#ifndef ODP_API_FEATURE_H_ +#define ODP_API_FEATURE_H_ +#include <odp/visibility_begin.h> + +#ifdef __cplusplus +extern "C" { +#endif + +#include <odp/api/std_types.h> + +/** @defgroup odp_features ODP_FEATURE + * ODP feature definitions + * @{ + */ + +/** Definition of ODP features */ +typedef union odp_feature_t { + /** All features */ + uint32_t all_feat; + + /** Individual feature bits */ + struct { + /** Classifier APIs, e.g., odp_cls_xxx(), odp_cos_xxx() */ + uint32_t cls:1; + + /** Crypto APIs, e.g., odp_crypto_xxx() */ + uint32_t crypto:1; + + /** IPsec APIs, e.g., odp_ipsec_xxx() */ + uint32_t ipsec:1; + + /** Scheduler APIs, e.g., odp_schedule_xxx() */ + uint32_t schedule:1; + + /** Time APIs are, e.g., odp_time_xxx() */ + uint32_t time:1; + + /** Timer APIs, e.g., odp_timer_xxx(), odp_timeout_xxx() */ + uint32_t timer:1; + + /** Traffic Manager APIs, e.g., odp_tm_xxx() */ + uint32_t tm:1; + } feat; +} odp_feature_t; + +/** + * @} + */ + +#ifdef __cplusplus +} +#endif + +#include <odp/visibility_end.h> +#endif diff --git a/include/odp_api.h b/include/odp_api.h index 060ec888..3a03a05b 100644 --- a/include/odp_api.h +++ b/include/odp_api.h @@ -32,6 +32,7 @@ extern "C" { #include <odp/api/barrier.h> #include <odp/api/spinlock.h> #include <odp/api/atomic.h> +#include <odp/api/feature.h> #include <odp/api/init.h> #include <odp/api/system_info.h> #include <odp/api/thread.h> diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index cb13126e..9cb501cf 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -35,6 +35,7 @@ odpapiinclude_HEADERS = \ include/odp/api/deprecated.h \ include/odp/api/errno.h \ include/odp/api/event.h \ + include/odp/api/feature.h \ include/odp/api/hash.h \ include/odp/api/hints.h \ include/odp/api/init.h \ diff --git a/platform/linux-generic/include/odp/api/feature.h b/platform/linux-generic/include/odp/api/feature.h new file mode 100644 index 00000000..55a86a83 --- /dev/null +++ b/platform/linux-generic/include/odp/api/feature.h @@ -0,0 +1,34 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +/** + * @file + * + * ODP features. + */ + +#ifndef ODP_PLAT_FEATURE_H_ +#define ODP_PLAT_FEATURE_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +/** @ingroup odp_feature + * @{ + */ + +/** + * @} + */ + +#include <odp/api/spec/feature.h> + +#ifdef __cplusplus +} +#endif + +#endif commit b653ea8ac54aea1a81ce9f49d4ec60f81bec2d2d Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Wed Jul 12 14:42:06 2017 +0300 doc: move PREDEFINED to common place It is easy to update PREDEFINED definitions in one Doxyfile, while forgetting about the others, as happened e.g. with ODP_DEPRECATE(x) definition. Move PREDEFINED definitions into Doxyfile_common, so that it is included by the rest of Doxyfiles. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/doc/Doxyfile_common b/doc/Doxyfile_common index 59558535..0471dcf3 100644 --- a/doc/Doxyfile_common +++ b/doc/Doxyfile_common @@ -30,3 +30,15 @@ MACRO_EXPANSION = YES EXPAND_ONLY_PREDEF = YES INTERNAL_DOCS = YES DOT_IMAGE_FORMAT = svg +PREDEFINED = __GNUC__ \ + __attribute__(x)= \ + ODP_ALIGNED(x)= \ + ODPDRV_ALIGNED(x)= \ + __BIG_ENDIAN_BITFIELD \ + __LITTLE_ENDIAN_BITFIELD \ + __x86_64__ \ + ODP_PACKED \ + ODPDRV_PACKED \ + ODP_DEPRECATE(x)=x \ + "ODP_HANDLE_T(type)=odp_handle_t type" \ + "ODPDRV_HANDLE_T(type)=odpdrv_handle_t type" diff --git a/doc/application-api-guide/Doxyfile b/doc/application-api-guide/Doxyfile index a2168a92..00c18df2 100644 --- a/doc/application-api-guide/Doxyfile +++ b/doc/application-api-guide/Doxyfile @@ -6,6 +6,4 @@ PROJECT_LOGO = $(SRCDIR)/doc/images/ODP-Logo-HQ.svg INPUT = $(SRCDIR)/doc/application-api-guide \ $(SRCDIR)/include EXAMPLE_PATH = $(SRCDIR)/example $(SRCDIR) -PREDEFINED = __GNUC__ \ - "ODP_HANDLE_T(type)=odp_handle_t type" WARNINGS = NO diff --git a/doc/helper-guide/Doxyfile b/doc/helper-guide/Doxyfile index bcc24539..bb9bd8e6 100644 --- a/doc/helper-guide/Doxyfile +++ b/doc/helper-guide/Doxyfile @@ -33,13 +33,5 @@ LAYOUT_FILE = $(SRCDIR)/doc/doxygenlayout.xml ENABLE_PREPROCESSING = YES MACRO_EXPANSION = YES EXPAND_ONLY_PREDEF = YES -PREDEFINED = __GNUC__ \ - __attribute__(x)= \ - ODP_ALIGNED(x)= \ - __BIG_ENDIAN_BITFIELD \ - __LITTLE_ENDIAN_BITFIELD \ - __x86_64__ \ - ODP_PACKED \ - "ODP_HANDLE_T(type)=odp_handle_t type" INTERNAL_DOCS = YES DOT_IMAGE_FORMAT = svg diff --git a/doc/platform-api-guide/Doxyfile b/doc/platform-api-guide/Doxyfile index 1f2d49a4..d716b4a3 100644 --- a/doc/platform-api-guide/Doxyfile +++ b/doc/platform-api-guide/Doxyfile @@ -10,12 +10,3 @@ INPUT = $(SRCDIR)/doc/application-api-guide \ $(SRCDIR)/platform/$(WITH_PLATFORM)/include/odp/api \ $(SRCDIR)/platform/$(WITH_PLATFORM)/arch/$(WITH_ARCH) EXAMPLE_PATH = $(SRCDIR)/example $(SRCDIR)/platform $(SRCDIR) -PREDEFINED = __GNUC__ \ - __attribute__(x)= \ - ODP_ALIGNED(x)= \ - __BIG_ENDIAN_BITFIELD \ - __LITTLE_ENDIAN_BITFIELD \ - __x86_64__ \ - ODP_PACKED \ - ODP_DEPRECATE(x)=x \ - "ODP_HANDLE_T(type)=odp_handle_t type" commit 3c8f24c52d80bd7e032ba3a1788c8dbc4d5ea0ad Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Tue Sep 5 13:46:58 2017 +0300 api: packet_io: refine packet format on output Define explicitly that (by default) packet output does not need any extra metadata to be set. Also (Ethernet) padding and CRC are added by default. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/include/odp/api/spec/packet_io.h b/include/odp/api/spec/packet_io.h index 76c63e72..efc3aa76 100644 --- a/include/odp/api/spec/packet_io.h +++ b/include/odp/api/spec/packet_io.h @@ -857,6 +857,11 @@ uint64_t odp_pktin_wait_time(uint64_t nsec); * is less than 'num', the remaining packets at the end of packets[] array * are not consumed, and the caller has to take care of them. * + * Entire packet data is sent out (odp_packet_len() bytes of data, starting from + * odp_packet_data()). All other packet metadata is ignored unless otherwise + * specified e.g. for protocol offload purposes. Link protocol specific frame + * checksum and padding are added to frames before transmission. + * * @param queue Packet output queue handle for sending packets * @param packets[] Array of packets to send * @param num Number of packets to send commit 9b98d35daf7736b34e51400c6a7e32bf81537ce6 Author: Bill Fischofer <bill.fischofer(a)linaro.org> Date: Thu Oct 5 15:35:08 2017 -0500 doc: userguide: remove references to odp_packet_unshared_len() Signed-off-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Nikhil Agarwal <nikhil.agarwal(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/doc/images/reflen.svg b/doc/images/reflen.svg deleted file mode 100644 index de232903..00000000 --- a/doc/images/reflen.svg +++ /dev/null @@ -1,45 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.1" viewBox="0 0 915.17047 183.26279" stroke-miterlimit="10" id="svg2" inkscape:version="0.91 r13725" sodipodi:docname="reflen.svg" width="915.17047" height="183.26279" style="fill:none;stroke:none;stroke-linecap:square;stroke-miterlimit:10"> - <metadata id="metadata71"> - <rdf:RDF> - <cc:Work rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> - <dc:title/> - </cc:Work> - </rdf:RDF> - </metadata> - <defs id="defs69"/> - <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" borderopacity="1" objecttolerance="10" gridtolerance="10" guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-width="1628" inkscape:window-height="868" id="namedview67" showgrid="false" fit-margin-top="0" fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0" inkscape:zoom="0.62083333" inkscape:cx="571.31623" inkscape:cy="459.71573" inkscape:window-x="65" inkscape:window-y="24" inkscape:window-maximized="0" inkscape:current-layer="svg2"/> - <clipPath id="g188eb9bc0a_2_33.0"> - <path d="M 0,0 960,0 960,540 0,540 0,0 Z" id="path5" inkscape:connector-curvature="0" style="clip-rule:nonzero"/> - </clipPath> - <path style="fill:#b6d7a8;fill-rule:nonzero" inkscape:connector-curvature="0" id="path11" d="m 463.3302,61.79527 314.36218,0 0,82.55118 -314.36218,0 z"/> - <path style="fill-rule:nonzero;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round" inkscape:connector-curvature="0" id="path13" d="m 463.3302,61.79527 314.36218,0 0,82.55118 -314.36218,0 z"/> - <path style="fill:#b6d7a8;fill-rule:nonzero" inkscape:connector-curvature="0" id="path15" d="m 786.29646,61.79514 127.87402,0 0,82.55118 -127.87402,0 z"/> - <path style="fill-rule:nonzero;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-dasharray:2, 6" inkscape:connector-curvature="0" id="path17" d="m 786.29646,61.79514 127.87402,0 0,82.55118 -127.87402,0 z"/> - <path style="fill:#000000;fill-rule:nonzero" inkscape:connector-curvature="0" id="path19" d="m 821.96286,108.49073 0.23437,1.48437 q -0.70312,0.14063 -1.26562,0.14063 -0.90625,0 -1.40625,-0.28125 -0.5,-0.29688 -0.70313,-0.75 -0.20312,-0.46875 -0.20312,-1.98438 l 0,-5.65625 -1.23438,0 0,-1.3125 1.23438,0 0,-2.4375 1.65625,-1 0,3.4375 1.6875,0 0,1.3125 -1.6875,0 0,5.75 q 0,0.71875 0.0781,0.92188 0.0937,0.20312 0.29688,0.32812 0.20312,0.125 0.57812,0.125 0.26563,0 0.73438,-0.0781 z m 7.9646,0.28125 q -0.9375,0.79687 -1.79688,1.125 -0.85937,0.3125 -1.84375,0.3125 -1.60937,0 -2.48437,-0.78125 -0.875,-0.79688 -0.875,-2.03125 0,-0.73438 0.32812,-1.32813 0.32813,-0.59375 0.85938,-0.95312 0.53125,-0.35938 1.20312,-0.54688 0.5,-0.14062 1.48438,-0.25 2.03125,-0.25 2.98437,-0.57812 0,-0.34375 0,-0.4375 0,-1.01563 -0.46875,-1.4375 -0.64062,-0.5625 -1.90625,-0.5625 -1.17187,0 -1.73437,0.40625 -0.5625,0.40625 -0.82813,1.46875 l -1.64062,-0.23438 q 0.23437,-1.04687 0.73437,-1.6875 0.51563,-0.6406 2 1.46875,-0.98437 0.96875,-0.35938 2.25,-0.35938 1.26563,0 2.04688,0.29688 0.78125,0.29687 1.15625,0.75 0.375,0.45312 0.51562,1.14062 0.0937,0.42188 0.0937,1.53125 l 0,2.23438 q 0,2.32812 0.0937,2.95312 0.10938,0.60938 0.4375,1.17188 l -1.75,0 q -0.26562,-0.51563 -0.32812,-1.21875 z m -0.14063,-3.71875 q -0.90625,0.35937 -2.73437,0.625 -1.03125,0.14062 -1.45313,0.32812 -0.42187,0.1875 -0.65625,0.54688 -0.23437,0.35937 -0.23437,0.79687 0,0.67188 0.5,1.125 0.51562,0.4375 1.48437,0.4375 0.96875,0 1.71875,-0.42187 0.75,-0.4375 1.10938,-1.15625 0.26562,-0.57813 0.26562,-1.67188 l 0,-0.60937 z m 4.09443,-6.75 0,-1.90625 1.67187,0 0,1.90625 -1.67187,0 z m 0,11.6875 0,-9.85938 1.67187,0 0,9.85938 -1.67187,0 z m 4.09796,0 0,-13.59375 1.67187,0 0,13.59375 -1.67187,0 z m 4.16046,0 0,-9.85938 1.5,0 0,1.5 q 0.57812,-1.04687 1.0625,-1.375 0.48437,-0.34375 1.07812,-0.34375 0.84375,0 1.71875,0.54688 l -0.57812,1.54687 q -0.60938,-0.35937 -1.23438,-0.35937 -0.54687,0 -0.98437,0.32812 -0.42188,0.328 13 -0.60938,0.90625 -0.28125,0.89063 -0.28125,1.95313 l 0,5.15625 -1.67187,0 z m 5.60327,-4.92188 q 0,-2.73437 1.53125,-4.0625 1.26563,-1.09375 3.09375,-1.09375 2.03125,0 3.3125,1.34375 1.29688,1.32813 1.29688,3.67188 0,1.90625 -0.57813,3 -0.5625,1.07812 -1.65625,1.6875 -1.07812,0.59375 -2.375,0.59375 -2.0625,0 -3.34375,-1.32813 -1.28125,-1.32812 -1.28125,-3.8125 z m 1.71875,0 q 0,1.89063 0.82813,2.82813 0.82812,0.9375 2.07812,0.9375 1.25,0 2.0625,-0.9375 0.82813,-0.95313 0.82813,-2.89063 0,-1.82812 -0.82813,-2.76562 -0.82812,-0.9375 -2.0625,-0.9375 -1.25,0 -2.07812,0.9375 -0.82813,0.9375 -0.82813,2.82812 z m 8.65698,0 q 0,-2.73437 1.53125,-4.0625 1.26563,-1.09375 3.09375,-1.09375 2.03125,0 3.3125,1.34375 1.29688,1.32813 1.29688,3.67188 0,1.90625 -0.57813,3 -0.5625,1.07812 -1.65625,1.6875 -1.07812,0.59375 -2.375,0.59375 -2.0625,0 -3.34375,-1.32813 -1.28125,-1.32812 -1.28125,-3.8125 z m 1.71875,0 q 0,1.89063 0.82813,2.82813 0.82812,0.9375 2.07812,0.9375 1.25,0 2.0625,-0.9375 0.82813, -0.95313 0.82813,-2.89063 0,-1.82812 -0.82813,-2.76562 -0.82812,-0.9375 -2.0625,-0.9375 -1.25,0 -2.07812,0.9375 -0.82813,0.9375 -0.82813,2.82812 z m 9.28198,4.92188 0,-9.85938 1.5,0 0,1.39063 q 0.45313,-0.71875 1.21875,-1.15625 0.78125,-0.45313 1.76563,-0.45313 1.09375,0 1.79687,0.45313 0.70313,0.45312 0.98438,1.28125 1.17187,-1.73438 3.04687,-1.73438 1.46875,0 2.25,0.8125 0.79688,0.8125 0.79688,2.5 l 0,6.76563 -1.67188,0 0,-6.20313 q 0,-1 -0.15625,-1.4375 -0.15625,-0.45312 -0.59375,-0.71875 -0.42187,-0.26562 -1,-0.26562 -1.03125,0 -1.71875,0.6875 -0.6875,0.6875 -0.6875,2.21875 l 0,5.71875 -1.67187,0 0,-6.40625 q 0,-1.10938 -0.40625,-1.65625 -0.40625,-0.5625 -1.34375,-0.5625 -0.70313,0 -1.3125,0.375 -0.59375,0.35937 -0.85938,1.07812 -0.26562,0.71875 -0.26562,2.0625 l 0,5.10938 -1.67188,0 z"/> - <path style="fill:#d9ead3;fill-rule:nonzero" inkscape:connector-curvature="0" id="path21" d="m 166.25364,61.79527 298.01575,0 0,82.55118 -298.01575,0 z"/> - <path style="fill-rule:nonzero;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round" inkscape:connector-curvature="0" id="path23" d="m 166.25364,61.79527 298.01575,0 0,82.55118 -298.01575,0 z"/> - <path style="fill:#d9ead3;fill-rule:nonzero" inkscape:connector-curvature="0" id="path25" d="m 1,61.79514 156.66142,0 0,82.55118 -156.66142,0 z"/> - <path style="fill-rule:nonzero;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-dasharray:2, 6" inkscape:connector-curvature="0" id="path27" d="m 1,61.79514 156.66142,0 0,82.55118 -156.66142,0 z"/> - <path style="fill:#000000;fill-rule:nonzero" inkscape:connector-curvature="0" id="path29" d="m 38.57682,109.99073 0,-13.59375 1.671875,0 0,4.875 q 1.171875,-1.35938 2.953125,-1.35938 1.09375,0 1.890625,0.4375 0.8125,0.42188 1.15625,1.1875 0.359375,0.76563 0.359375,2.20313 l 0,6.25 -1.671875,0 0,-6.25 q 0,-1.25 -0.546875,-1.8125 -0.546875,-0.57813 -1.53125,-0.57813 -0.75,0 -1.40625,0.39063 -0.640625,0.375 -0.921875,1.04687 -0.28125,0.65625 -0.28125,1.8125 l 0,5.39063 -1.671875,0 z m 17.125717,-3.17188 1.71875,0.21875 q -0.40625,1.5 -1.515625,2.34375 -1.09375,0.82813 -2.8125,0.82813 -2.15625,0 -3.421875,-1.32813 -1.265625,-1.32812 -1.265625,-3.73437 0,-2.48438 1.265625,-3.85938 1.28125,-1.375 3.328125,-1.375 1.984375,0 3.234375,1.34375 1.25,1.34375 1.25,3.79688 0,0.14062 -0.01563,0.4375 l -7.34375,0 q 0.09375,1.625 0.921875,2.48437 0.828125,0.85938 2.0625,0.85938 0.90625,0 1.546875,-0.46875 0.65625,-0.48438 1.046875,-1.54688 z m -5.484375,-2.70312 5.5,0 q -0.109375,-1.23438 -0.625,- 1.85938 -0.796875,-0.96875 -2.078125,-0.96875 -1.140625,0 -1.9375,0.78125 -0.78125,0.76563 -0.859375,2.04688 z m 15.547592,4.65625 q -0.9375,0.79687 -1.796875,1.125 -0.859375,0.3125 -1.84375,0.3125 -1.609375,0 -2.484375,-0.78125 -0.875,-0.79688 -0.875,-2.03125 0,-0.73438 0.328125,-1.32813 0.328125,-0.59375 0.859375,-0.95312 0.53125,-0.35938 1.203125,-0.54688 0.5,-0.14062 1.484375,-0.25 2.03125,-0.25 2.984375,-0.57812 0,-0.34375 0,-0.4375 0,-1.01563 -0.46875,-1.4375 -0.640625,-0.5625 -1.90625,-0.5625 -1.171875,0 -1.734375,0.40625 -0.5625,0.40625 -0.828125,1.46875 l -1.640625,-0.23438 q 0.234375,-1.04687 0.734375,-1.6875 0.515625,-0.64062 1.46875,-0.98437 0.96875,-0.35938 2.25,-0.35938 1.265625,0 2.046875,0.29688 0.78125,0.29687 1.15625,0.75 0.375,0.45312 0.515625,1.14062 0.09375,0.42188 0.09375,1.53125 l 0,2.23438 q 0,2.32812 0.09375,2.95312 0.109375,0.60938 0.4375,1.17188 l -1.75,0 q -0.265625,-0.51563 -0.328125,-1.21875 z m -0.140625,-3.71875 q -0.90625,0.35937 -2.734375,0.625 -1.0 3125,0.14062 -1.453125,0.32812 -0.421875,0.1875 -0.65625,0.54688 -0.234375,0.35937 -0.234375,0.79687 0,0.67188 0.5,1.125 0.515625,0.4375 1.484375,0.4375 0.96875,0 1.71875,-0.42187 0.75,-0.4375 1.109375,-1.15625 0.265625,-0.57813 0.265625,-1.67188 l 0,-0.60937 z m 10.469464,4.9375 0,-1.25 q -0.9375,1.46875 -2.75,1.46875 -1.17187,0 -2.17187,-0.64063 -0.984377,-0.65625 -1.531252,-1.8125 -0.53125,-1.17187 -0.53125,-2.6875 0,-1.46875 0.484375,-2.67187 0.5,-1.20313 1.468747,-1.84375 0.98438,-0.64063 2.20313,-0.64063 0.89062,0 1.57812,0.375 0.70313,0.375 1.14063,0.98438 l 0,-4.875 1.65625,0 0,13.59375 -1.54688,0 z m -5.28125,-4.92188 q 0,1.89063 0.79688,2.82813 0.8125,0.9375 1.89062,0.9375 1.09375,0 1.85938,-0.89063 0.76562,-0.89062 0.76562,-2.73437 0,-2.01563 -0.78125,-2.95313 -0.78125,-0.95312 -1.92187,-0.95312 -1.10938,0 -1.85938,0.90625 -0.75,0.90625 -0.75,2.85937 z m 9.25072,4.92188 0,-9.85938 1.5,0 0,1.5 q 0.57812,-1.04687 1.0625,-1.375 0.48437,-0.34375 1.07812,-0.34375 0.84375,0 1.7 1875,0.54688 l -0.57812,1.54687 q -0.60938,-0.35937 -1.23438,-0.35937 -0.54687,0 -0.98437,0.32812 -0.42188,0.32813 -0.60938,0.90625 -0.28125,0.89063 -0.28125,1.95313 l 0,5.15625 -1.67187,0 z m 5.6033,-4.92188 q 0,-2.73437 1.53125,-4.0625 1.26563,-1.09375 3.09375,-1.09375 2.03125,0 3.3125,1.34375 1.29688,1.32813 1.29688,3.67188 0,1.90625 -0.57813,3 -0.5625,1.07812 -1.65625,1.6875 -1.07812,0.59375 -2.375,0.59375 -2.0625,0 -3.34375,-1.32813 -1.28125,-1.32812 -1.28125,-3.8125 z m 1.71875,0 q 0,1.89063 0.82813,2.82813 0.82812,0.9375 2.07812,0.9375 1.25,0 2.0625,-0.9375 0.82813,-0.95313 0.82813,-2.89063 0,-1.82812 -0.82813,-2.76562 -0.82812,-0.9375 -2.0625,-0.9375 -1.25,0 -2.07812,0.9375 -0.82813,0.9375 -0.82813,2.82812 z m 8.65697,0 q 0,-2.73437 1.53125,-4.0625 1.26562,-1.09375 3.093737,-1.09375 2.03125,0 3.3125,1.34375 1.29688,1.32813 1.29688,3.67188 0,1.90625 -0.57813,3 -0.5625,1.07812 -1.65625,1.6875 -1.07812,0.59375 -2.375,0.59375 -2.062497,0 -3.343737,-1.32813 -1.28125,-1.32812 -1.2 8125,-3.8125 z m 1.71875,0 q 0,1.89063 0.82812,2.82813 0.82812,0.9375 2.078117,0.9375 1.25,0 2.0625,-0.9375 0.82813,-0.95313 0.82813,-2.89063 0,-1.82812 -0.82813,-2.76562 -0.82812,-0.9375 -2.0625,-0.9375 -1.249997,0 -2.078117,0.9375 -0.82812,0.9375 -0.82812,2.82812 z m 9.281957,4.92188 0,-9.85938 1.5,0 0,1.39063 q 0.45312,-0.71875 1.21875,-1.15625 0.78125,-0.45313 1.76562,-0.45313 1.09375,0 1.79688,0.45313 0.70312,0.45312 0.98437,1.28125 1.17188,-1.73438 3.04688,-1.73438 1.46875,0 2.25,0.8125 0.79687,0.8125 0.79687,2.5 l 0,6.76563 -1.67187,0 0,-6.20313 q 0,-1 -0.15625,-1.4375 -0.15625,-0.45312 -0.59375,-0.71875 -0.42188,-0.26562 -1,-0.26562 -1.03125,0 -1.71875,0.6875 -0.6875,0.6875 -0.6875,2.21875 l 0,5.71875 -1.67188,0 0,-6.40625 q 0,-1.10938 -0.40625,-1.65625 -0.40625,-0.5625 -1.34375,-0.5625 -0.70312,0 -1.3125,0.375 -0.59375,0.35937 -0.85937,1.07812 -0.26563,0.71875 -0.26563,2.0625 l 0,5.10938 -1.67187,0 z"/> - <path style="fill:#000000;fill-opacity:0;fill-rule:nonzero" inkscape:connector-curvature="0" id="path31" d="m 322.39276,88.56955 283.0551,0 0,37.98425 -283.0551,0 z"/> - <path style="fill:#000000;fill-rule:nonzero" inkscape:connector-curvature="0" id="path33" d="m 416.94009,107.26291 0,-13.64063 1.53125,0 0,1.28125 q 0.53125,-0.75 1.20313,-1.125 0.6875,-0.375 1.64062,-0.375 1.26563,0 2.23438,0.65625 0.96875,0.64063 1.45312,1.82813 0.5,1.1875 0.5,2.59375 0,1.51562 -0.54687,2.73437 -0.54688,1.20313 -1.57813,1.84375 -1.03125,0.64063 -2.17187,0.64063 -0.84375,0 -1.51563,-0.34375 -0.65625,-0.35938 -1.07812,-0.89063 l 0,4.79688 -1.67188,0 z m 1.51563,-8.65625 q 0,1.90625 0.76562,2.8125 0.78125,0.90625 1.875,0.90625 1.10938,0 1.89063,-0.9375 0.79687,-0.9375 0.79687,-2.92188 0,-1.875 -0.78125,-2.8125 -0.76562,-0.9375 -1.84375,-0.9375 -1.0625,0 -1.89062,1 -0.8125,1 -0.8125,2.89063 z m 15.29757,3.65625 q -0.9375,0.79687 -1.79687,1.125 -0.85938,0.3125 -1.84375,0.3125 -1.60938,0 -2.48438,-0.78125 -0.875,-0.79688 -0.875,-2.03125 0,-0.73438 0.32813,-1.32813 0.32812,-0.59375 0.85937,-0.95312 0.53125,-0.35938 1.20313,-0.54688 0.5,-0.14062 1.48437,-0.25 2.03125,-0 .25 2.98438,-0.57812 0,-0.34375 0,-0.4375 0,-1.01563 -0.46875,-1.4375 -0.64063,-0.5625 -1.90625,-0.5625 -1.17188,0 -1.73438,0.40625 -0.5625,0.40625 -0.82812,1.46875 l -1.64063,-0.23438 q 0.23438,-1.04687 0.73438,-1.6875 0.51562,-0.64062 1.46875,-0.98437 0.96875,-0.35938 2.25,-0.35938 1.26562,0 2.04687,0.29688 0.78125,0.29687 1.15625,0.75 0.375,0.45312 0.51563,1.14062 0.0937,0.42188 0.0937,1.53125 l 0,2.23438 q 0,2.32812 0.0937,2.95312 0.10937,0.60938 0.4375,1.17188 l -1.75,0 q -0.26563,-0.51563 -0.32813,-1.21875 z m -0.14062,-3.71875 q -0.90625,0.35937 -2.73438,0.625 -1.03125,0.14062 -1.45312,0.32812 -0.42188,0.1875 -0.65625,0.54688 -0.23438,0.35937 -0.23438,0.79687 0,0.67188 0.5,1.125 0.51563,0.4375 1.48438,0.4375 0.96875,0 1.71875,-0.42187 0.75,-0.4375 1.10937,-1.15625 0.26563,-0.57813 0.26563,-1.67188 l 0,-0.60937 z m 10.51635,1.32812 1.64063,0.21875 q -0.26563,1.6875 -1.375,2.65625 -1.10938,0.95313 -2.73438,0.95313 -2.01562,0 -3.25,-1.3125 -1.21875,-1.32813 -1.21875,-3.79688 0,- 1.59375 0.51563,-2.78125 0.53125,-1.20312 1.60937,-1.79687 1.09375,-0.60938 2.35938,-0.60938 1.60937,0 2.625,0.8125 1.01562,0.8125 1.3125,2.3125 l -1.625,0.25 q -0.23438,-1 -0.82813,-1.5 -0.59375,-0.5 -1.42187,-0.5 -1.26563,0 -2.0625,0.90625 -0.78125,0.90625 -0.78125,2.85938 0,1.98437 0.76562,2.89062 0.76563,0.89063 1.98438,0.89063 0.98437,0 1.64062,-0.59375 0.65625,-0.60938 0.84375,-1.85938 z m 2.90625,3.60938 0,-13.59375 1.67188,0 0,7.75 3.95312,-4.01563 2.15625,0 -3.76562,3.65625 4.14062,6.20313 -2.0625,0 -3.25,-5.03125 -1.17187,1.125 0,3.90625 -1.67188,0 z m 16.0625,-3.17188 1.71875,0.21875 q -0.40625,1.5 -1.51562,2.34375 -1.09375,0.82813 -2.8125,0.82813 -2.15625,0 -3.42188,-1.32813 -1.26562,-1.32812 -1.26562,-3.73437 0,-2.48438 1.26562,-3.85938 1.28125,-1.375 3.32813,-1.375 1.98437,0 3.23437,1.34375 1.25,1.34375 1.25,3.79688 0,0.14062 -0.0156,0.4375 l -7.34375,0 q 0.0937,1.625 0.92187,2.48437 0.82813,0.85938 2.0625,0.85938 0.90625,0 1.54688,-0.46875 0.65625,-0.48438 1.04687,-1. 54688 z m -5.48437,-2.70312 5.5,0 q -0.10938,-1.23438 -0.625,-1.85938 -0.79688,-0.96875 -2.07813,-0.96875 -1.14062,0 -1.9375,0.78125 -0.78125,0.76563 -0.85937,2.04688 z m 12.76633,4.375 0.23437,1.48437 q -0.70312,0.14063 -1.26562,0.14063 -0.90625,0 -1.40625,-0.28125 -0.5,-0.29688 -0.70313,-0.75 -0.20312,-0.46875 -0.20312,-1.98438 l 0,-5.65625 -1.23438,0 0,-1.3125 1.23438,0 0,-2.4375 1.65625,-1 0,3.4375 1.6875,0 0,1.3125 -1.6875,0 0,5.75 q 0,0.71875 0.0781,0.92188 0.0937,0.20312 0.29688,0.32812 0.20312,0.125 0.57812,0.125 0.26563,0 0.73438,-0.0781 z m 13.10098,1.5 0,-1.25 q -0.9375,1.46875 -2.75,1.46875 -1.17188,0 -2.17188,-0.64063 -0.98437,-0.65625 -1.53125,-1.8125 -0.53125,-1.17187 -0.53125,-2.6875 0,-1.46875 0.48438,-2.67187 0.5,-1.20313 1.46875,-1.84375 0.98437,-0.64063 2.20312,-0.64063 0.89063,0 1.57813,0.375 0.70312,0.375 1.14062,0.98438 l 0,-4.875 1.65625,0 0,13.59375 -1.54687,0 z m -5.28125,-4.92188 q 0,1.89063 0.79687,2.82813 0.8125,0.9375 1.89063,0.9375 1.09375,0 1.85937,-0 .89063 0.76563,-0.89062 0.76563,-2.73437 0,-2.01563 -0.78125,-2.95313 -0.78125,-0.95312 -1.92188,-0.95312 -1.10937,0 -1.85937,0.90625 -0.75,0.90625 -0.75,2.85937 z m 15.70386,3.70313 q -0.9375,0.79687 -1.79688,1.125 -0.85937,0.3125 -1.84375,0.3125 -1.60937,0 -2.48437,-0.78125 -0.875,-0.79688 -0.875,-2.03125 0,-0.73438 0.32812,-1.32813 0.32813,-0.59375 0.85938,-0.95312 0.53125,-0.35938 1.20312,-0.54688 0.5,-0.14062 1.48438,-0.25 2.03125,-0.25 2.98437,-0.57812 0,-0.34375 0,-0.4375 0,-1.01563 -0.46875,-1.4375 -0.64062,-0.5625 -1.90625,-0.5625 -1.17187,0 -1.73437,0.40625 -0.5625,0.40625 -0.82813,1.46875 l -1.64062,-0.23438 q 0.23437,-1.04687 0.73437,-1.6875 0.51563,-0.64062 1.46875,-0.98437 0.96875,-0.35938 2.25,-0.35938 1.26563,0 2.04688,0.29688 0.78125,0.29687 1.15625,0.75 0.375,0.45312 0.51562,1.14062 0.0937,0.42188 0.0937,1.53125 l 0,2.23438 q 0,2.32812 0.0937,2.95312 0.10938,0.60938 0.4375,1.17188 l -1.75,0 q -0.26562,-0.51563 -0.32812,-1.21875 z m -0.14063,-3.71875 q -0.90625,0.35 937 -2.73437,0.625 -1.03125,0.14062 -1.45313,0.32812 -0.42187,0.1875 -0.65625,0.54688 -0.23437,0.35937 -0.23437,0.79687 0,0.67188 0.5,1.125 0.51562,0.4375 1.48437,0.4375 0.96875,0 1.71875,-0.42187 0.75,-0.4375 1.10938,-1.15625 0.26562,-0.57813 0.26562,-1.67188 l 0,-0.60937 z m 7.73505,3.4375 0.23437,1.48437 q -0.70312,0.14063 -1.26562,0.14063 -0.90625,0 -1.40625,-0.28125 -0.5,-0.29688 -0.70313,-0.75 -0.20312,-0.46875 -0.20312,-1.98438 l 0,-5.65625 -1.23438,0 0,-1.3125 1.23438,0 0,-2.4375 1.65625,-1 0,3.4375 1.6875,0 0,1.3125 -1.6875,0 0,5.75 q 0,0.71875 0.0781,0.92188 0.0937,0.20312 0.29688,0.32812 0.20312,0.125 0.57812,0.125 0.26563,0 0.73438,-0.0781 z m 7.9646,0.28125 q -0.9375,0.79687 -1.79688,1.125 -0.85937,0.3125 -1.84375,0.3125 -1.60937,0 -2.48437,-0.78125 -0.875,-0.79688 -0.875,-2.03125 0,-0.73438 0.32812,-1.32813 0.32813,-0.59375 0.85938,-0.95312 0.53125,-0.35938 1.20312,-0.54688 0.5,-0.14062 1.48438,-0.25 2.03125,-0.25 2.98437,-0.57812 0,-0.34375 0,-0.4375 0,-1.01563 -0.468 75,-1.4375 -0.64062,-0.5625 -1.90625,-0.5625 -1.17187,0 -1.73437,0.40625 -0.5625,0.40625 -0.82813,1.46875 l -1.64062,-0.23438 q 0.23437,-1.04687 0.73437,-1.6875 0.51563,-0.64062 1.46875,-0.98437 0.96875,-0.35938 2.25,-0.35938 1.26563,0 2.04688,0.29688 0.78125,0.29687 1.15625,0.75 0.375,0.45312 0.51562,1.14062 0.0937,0.42188 0.0937,1.53125 l 0,2.23438 q 0,2.32812 0.0937,2.95312 0.10938,0.60938 0.4375,1.17188 l -1.75,0 q -0.26562,-0.51563 -0.32812,-1.21875 z m -0.14063,-3.71875 q -0.90625,0.35937 -2.73437,0.625 -1.03125,0.14062 -1.45313,0.32812 -0.42187,0.1875 -0.65625,0.54688 -0.23437,0.35937 -0.23437,0.79687 0,0.67188 0.5,1.125 0.51562,0.4375 1.48437,0.4375 0.96875,0 1.71875,-0.42187 0.75,-0.4375 1.10938,-1.15625 0.26562,-0.57813 0.26562,-1.67188 l 0,-0.60937 z"/> - <path style="fill:#000000;fill-rule:nonzero" inkscape:connector-curvature="0" id="path35" d="m 346.50918,129.48167 q -1.375,-1.75 -2.32813,-4.07813 -0.95312,-2.34375 -0.95312,-4.84375 0,-2.21875 0.70312,-4.23437 0.84375,-2.34375 2.57813,-4.67188 l 1.20312,0 q -1.125,1.92188 -1.48437,2.75 -0.5625,1.28125 -0.89063,2.67188 -0.40625,1.73437 -0.40625,3.48437 0,4.46875 2.78125,8.92188 l -1.20312,0 z m 3.02518,-4 0,-13.59375 1.67187,0 0,4.875 q 1.17188,-1.35938 2.95313,-1.35938 1.09375,0 1.89062,0.4375 0.8125,0.42188 1.15625,1.1875 0.35938,0.76563 0.35938,2.20313 l 0,6.25 -1.67188,0 0,-6.25 q 0,-1.25 -0.54687,-1.8125 -0.54688,-0.57813 -1.53125,-0.57813 -0.75,0 -1.40625,0.39063 -0.64063,0.375 -0.92188,1.04687 -0.28125,0.65625 -0.28125,1.8125 l 0,5.39063 -1.67187,0 z m 17.1257,-3.17188 1.71875,0.21875 q -0.40625,1.5 -1.51563,2.34375 -1.09375,0.82813 -2.8125,0.82813 -2.15625,0 -3.42187,-1.32813 -1.26563,-1.32812 -1.26563,-3.73437 0,-2.48438 1.26563,-3.85938 1.28125,-1.375 3.32812,-1.375 1.9 8438,0 3.23438,1.34375 1.25,1.34375 1.25,3.79688 0,0.14062 -0.0156,0.4375 l -7.34375,0 q 0.0937,1.625 0.92188,2.48437 0.82812,0.85938 2.0625,0.85938 0.90625,0 1.54687,-0.46875 0.65625,-0.48438 1.04688,-1.54688 z m -5.48438,-2.70312 5.5,0 q -0.10937,-1.23438 -0.625,-1.85938 -0.79687,-0.96875 -2.07812,-0.96875 -1.14063,0 -1.9375,0.78125 -0.78125,0.76563 -0.85938,2.04688 z m 15.54761,4.65625 q -0.9375,0.79687 -1.79687,1.125 -0.85938,0.3125 -1.84375,0.3125 -1.60938,0 -2.48438,-0.78125 -0.875,-0.79688 -0.875,-2.03125 0,-0.73438 0.32813,-1.32813 0.32812,-0.59375 0.85937,-0.95312 0.53125,-0.35938 1.20313,-0.54688 0.5,-0.14062 1.48437,-0.25 2.03125,-0.25 2.98438,-0.57812 0,-0.34375 0,-0.4375 0,-1.01563 -0.46875,-1.4375 -0.64063,-0.5625 -1.90625,-0.5625 -1.17188,0 -1.73438,0.40625 -0.5625,0.40625 -0.82812,1.46875 l -1.64063,-0.23438 q 0.23438,-1.04687 0.73438,-1.6875 0.51562,-0.64062 1.46875,-0.98437 0.96875,-0.35938 2.25,-0.35938 1.26562,0 2.04687,0.29688 0.78125,0.29687 1.15625,0.75 0.375, 0.45312 0.51563,1.14062 0.0937,0.42188 0.0937,1.53125 l 0,2.23438 q 0,2.32812 0.0937,2.95312 0.10937,0.60938 0.4375,1.17188 l -1.75,0 q -0.26563,-0.51563 -0.32813,-1.21875 z m -0.14062,-3.71875 q -0.90625,0.35937 -2.73438,0.625 -1.03125,0.14062 -1.45312,0.32812 -0.42188,0.1875 -0.65625,0.54688 -0.23438,0.35937 -0.23438,0.79687 0,0.67188 0.5,1.125 0.51563,0.4375 1.48438,0.4375 0.96875,0 1.71875,-0.42187 0.75,-0.4375 1.10937,-1.15625 0.26563,-0.57813 0.26563,-1.67188 l 0,-0.60937 z m 10.46945,4.9375 0,-1.25 q -0.9375,1.46875 -2.75,1.46875 -1.17188,0 -2.17188,-0.64063 -0.98437,-0.65625 -1.53125,-1.8125 -0.53125,-1.17187 -0.53125,-2.6875 0,-1.46875 0.48438,-2.67187 0.5,-1.20313 1.46875,-1.84375 0.98437,-0.64063 2.20312,-0.64063 0.89063,0 1.57813,0.375 0.70312,0.375 1.14062,0.98438 l 0,-4.875 1.65625,0 0,13.59375 -1.54687,0 z m -5.28125,-4.92188 q 0,1.89063 0.79687,2.82813 0.8125,0.9375 1.89063,0.9375 1.09375,0 1.85937,-0.89063 0.76563,-0.89062 0.76563,-2.73437 0,-2.01563 -0.78125,-2.953 13 -0.78125,-0.95312 -1.92188,-0.95312 -1.10937,0 -1.85937,0.90625 -0.75,0.90625 -0.75,2.85937 z m 16.01635,1.75 1.71875,0.21875 q -0.40625,1.5 -1.51562,2.34375 -1.09375,0.82813 -2.8125,0.82813 -2.15625,0 -3.42188,-1.32813 -1.26562,-1.32812 -1.26562,-3.73437 0,-2.48438 1.26562,-3.85938 1.28125,-1.375 3.32813,-1.375 1.98437,0 3.23437,1.34375 1.25,1.34375 1.25,3.79688 0,0.14062 -0.0156,0.4375 l -7.34375,0 q 0.0937,1.625 0.92187,2.48437 0.82813,0.85938 2.0625,0.85938 0.90625,0 1.54688,-0.46875 0.65625,-0.48438 1.04687,-1.54688 z m -5.48437,-2.70312 5.5,0 q -0.10938,-1.23438 -0.625,-1.85938 -0.79688,-0.96875 -2.07813,-0.96875 -1.14062,0 -1.9375,0.78125 -0.78125,0.76563 -0.85937,2.04688 z m 9.09445,5.875 0,-9.85938 1.5,0 0,1.5 q 0.57813,-1.04687 1.0625,-1.375 0.48438,-0.34375 1.07813,-0.34375 0.84375,0 1.71875,0.54688 l -0.57813,1.54687 q -0.60937,-0.35937 -1.23437,-0.35937 -0.54688,0 -0.98438,0.32812 -0.42187,0.32813 -0.60937,0.90625 -0.28125,0.89063 -0.28125,1.95313 l 0,5.15625 -1.6718 8,0 z m 5.55643,-2.9375 1.65625,-0.26563 q 0.14062,1 0.76562,1.53125 0.64063,0.51563 1.78125,0.51563 1.15625,0 1.70313,-0.46875 0.5625,-0.46875 0.5625,-1.09375 0,-0.5625 -0.48438,-0.89063 -0.34375,-0.21875 -1.70312,-0.5625 -1.84375,-0.46875 -2.5625,-0.79687 -0.70313,-0.34375 -1.07813,-0.9375 -0.35937,-0.60938 -0.35937,-1.32813 0,-0.65625 0.29687,-1.21875 0.3125,-0.5625 0.82813,-0.9375 0.39062,-0.28125 1.0625,-0.48437 0.67187,-0.20313 1.4375,-0.20313 1.17187,0 2.04687,0.34375 0.875,0.32813 1.28125,0.90625 0.42188,0.5625 0.57813,1.51563 l -1.625,0.21875 q -0.10938,-0.75 -0.65625,-1.17188 -0.53125,-0.4375 -1.5,-0.4375 -1.15625,0 -1.64063,0.39063 -0.48437,0.375 -0.48437,0.875 0,0.32812 0.20312,0.59375 0.20313,0.26562 0.64063,0.4375 0.25,0.0937 1.46875,0.4375 1.76562,0.46875 2.46875,0.76562 0.70312,0.29688 1.09375,0.875 0.40625,0.57813 0.40625,1.4375 0,0.82813 -0.48438,1.57813 -0.48437,0.73437 -1.40625,1.14062 -0.92187,0.39063 -2.07812,0.39063 -1.92188,0 -2.9375,-0.79688 -1,-0.79687 -1.2 8125,-2.35937 z m 18.69894,0.73437 0,-3.71875 -3.70312,0 0,-1.5625 3.70312,0 0,-3.70312 1.57813,0 0,3.70312 3.6875,0 0,1.5625 -3.6875,0 0,3.71875 -1.57813,0 z m 12.56262,5.98438 0,-13.64063 1.53125,0 0,1.28125 q 0.53125,-0.75 1.20313,-1.125 0.6875,-0.375 1.64062,-0.375 1.26563,0 2.23438,0.65625 0.96875,0.64063 1.45312,1.82813 0.5,1.1875 0.5,2.59375 0,1.51562 -0.54687,2.73437 -0.54688,1.20313 -1.57813,1.84375 -1.03125,0.64063 -2.17187,0.64063 -0.84375,0 -1.51563,-0.34375 -0.65625,-0.35938 -1.07812,-0.89063 l 0,4.79688 -1.67188,0 z m 1.51563,-8.65625 q 0,1.90625 0.76562,2.8125 0.78125,0.90625 1.875,0.90625 1.10938,0 1.89063,-0.9375 0.79687,-0.9375 0.79687,-2.92188 0,-1.875 -0.78125,-2.8125 -0.76562,-0.9375 -1.84375,-0.9375 -1.0625,0 -1.89062,1 -0.8125,1 -0.8125,2.89063 z m 15.29761,3.65625 q -0.9375,0.79687 -1.79688,1.125 -0.85937,0.3125 -1.84375,0.3125 -1.60937,0 -2.48437,-0.78125 -0.875,-0.79688 -0.875,-2.03125 0,-0.73438 0.32812,-1.32813 0.32813,-0.59375 0.85938,-0.95312 0.53125,-0 .35938 1.20312,-0.54688 0.5,-0.14062 1.48438,-0.25 2.03125,-0.25 2.98437,-0.57812 0,-0.34375 0,-0.4375 0,-1.01563 -0.46875,-1.4375 -0.64062,-0.5625 -1.90625,-0.5625 -1.17187,0 -1.73437,0.40625 -0.5625,0.40625 -0.82813,1.46875 l -1.64062,-0.23438 q 0.23437,-1.04687 0.73437,-1.6875 0.51563,-0.64062 1.46875,-0.98437 0.96875,-0.35938 2.25,-0.35938 1.26563,0 2.04688,0.29688 0.78125,0.29687 1.15625,0.75 0.375,0.45312 0.51562,1.14062 0.0937,0.42188 0.0937,1.53125 l 0,2.23438 q 0,2.32812 0.0937,2.95312 0.10938,0.60938 0.4375,1.17188 l -1.75,0 q -0.26562,-0.51563 -0.32812,-1.21875 z m -0.14063,-3.71875 q -0.90625,0.35937 -2.73437,0.625 -1.03125,0.14062 -1.45313,0.32812 -0.42187,0.1875 -0.65625,0.54688 -0.23437,0.35937 -0.23437,0.79687 0,0.67188 0.5,1.125 0.51562,0.4375 1.48437,0.4375 0.96875,0 1.71875,-0.42187 0.75,-0.4375 1.10938,-1.15625 0.26562,-0.57813 0.26562,-1.67188 l 0,-0.60937 z m 4.0007,8.73437 -0.17187,-1.5625 q 0.54687,0.14063 0.95312,0.14063 0.54688,0 0.875,-0.1875 0.34375,-0.18 75 0.5625,-0.51563 0.15625,-0.25 0.5,-1.25 0.0469,-0.14062 0.15625,-0.40625 l -3.73437,-9.875 1.79687,0 2.04688,5.71875 q 0.40625,1.07813 0.71875,2.28125 0.28125,-1.15625 0.6875,-2.25 l 2.09375,-5.75 1.67187,0 -3.75,10.03125 q -0.59375,1.625 -0.9375,2.23438 -0.4375,0.82812 -1.01562,1.20312 -0.57813,0.39063 -1.375,0.39063 -0.48438,0 -1.07813,-0.20313 z m 9.375,-3.79687 0,-13.59375 1.67188,0 0,13.59375 -1.67188,0 z m 3.55109,-4.92188 q 0,-2.73437 1.53125,-4.0625 1.26563,-1.09375 3.09375,-1.09375 2.03125,0 3.3125,1.34375 1.29688,1.32813 1.29688,3.67188 0,1.90625 -0.57813,3 -0.5625,1.07812 -1.65625,1.6875 -1.07812,0.59375 -2.375,0.59375 -2.0625,0 -3.34375,-1.32813 -1.28125,-1.32812 -1.28125,-3.8125 z m 1.71875,0 q 0,1.89063 0.82813,2.82813 0.82812,0.9375 2.07812,0.9375 1.25,0 2.0625,-0.9375 0.82813,-0.95313 0.82813,-2.89063 0,-1.82812 -0.82813,-2.76562 -0.82812,-0.9375 -2.0625,-0.9375 -1.25,0 -2.07812,0.9375 -0.82813,0.9375 -0.82813,2.82812 z m 15.71948,3.70313 q -0.9375,0.79687 -1.7968 7,1.125 -0.85938,0.3125 -1.84375,0.3125 -1.60938,0 -2.48438,-0.78125 -0.87503,-0.79688 -0.87503,-2.03125 0,-0.73438 0.32816,-1.32813 0.32812,-0.59375 0.85937,-0.95312 0.53125,-0.35938 1.20313,-0.54688 0.5,-0.14062 1.48437,-0.25 2.03125,-0.25 2.98438,-0.57812 0,-0.34375 0,-0.4375 0,-1.01563 -0.46875,-1.4375 -0.64063,-0.5625 -1.90625,-0.5625 -1.17188,0 -1.73438,0.40625 -0.5625,0.40625 -0.82812,1.46875 l -1.64063,-0.23438 q 0.23438,-1.04687 0.73438,-1.6875 0.51562,-0.64062 1.46875,-0.98437 0.96875,-0.35938 2.25,-0.35938 1.26562,0 2.04687,0.29688 0.78125,0.29687 1.15625,0.75 0.375,0.45312 0.51563,1.14062 0.0937,0.42188 0.0937,1.53125 l 0,2.23438 q 0,2.32812 0.0937,2.95312 0.10937,0.60938 0.4375,1.17188 l -1.75,0 q -0.26563,-0.51563 -0.32813,-1.21875 z m -0.14062,-3.71875 q -0.90625,0.35937 -2.73438,0.625 -1.03125,0.14062 -1.45312,0.32812 -0.42188,0.1875 -0.65625,0.54688 -0.23438,0.35937 -0.23438,0.79687 0,0.67188 0.5,1.125 0.51563,0.4375 1.48438,0.4375 0.96875,0 1.71875,-0.42187 0.75,-0 .4375 1.10937,-1.15625 0.26563,-0.57813 0.26563,-1.67188 l 0,-0.60937 z m 10.46942,4.9375 0,-1.25 q -0.9375,1.46875 -2.75,1.46875 -1.17188,0 -2.17188,-0.64063 -0.98437,-0.65625 -1.53125,-1.8125 -0.53125,-1.17187 -0.53125,-2.6875 0,-1.46875 0.48438,-2.67187 0.5,-1.20313 1.46875,-1.84375 0.98437,-0.64063 2.20312,-0.64063 0.89063,0 1.57813,0.375 0.70312,0.375 1.14062,0.98438 l 0,-4.875 1.65625,0 0,13.59375 -1.54687,0 z m -5.28125,-4.92188 q 0,1.89063 0.79687,2.82813 0.8125,0.9375 1.89063,0.9375 1.09375,0 1.85937,-0.89063 0.76563,-0.89062 0.76563,-2.73437 0,-2.01563 -0.78125,-2.95313 -0.78125,-0.95312 -1.92188,-0.95312 -1.10937,0 -1.85937,0.90625 -0.75,0.90625 -0.75,2.85937 z m 17.96527,2.71875 0,-3.71875 -3.70313,0 0,-1.5625 3.70313,0 0,-3.70312 1.57812,0 0,3.70312 3.6875,0 0,1.5625 -3.6875,0 0,3.71875 -1.57812,0 z m 16.21893,0.70313 0.23438,1.48437 q -0.70313,0.14063 -1.26563,0.14063 -0.90625,0 -1.40625,-0.28125 -0.5,-0.29688 -0.70312,-0.75 -0.20313,-0.46875 -0.20313,-1.98438 l 0,-5.6 5625 -1.23437,0 0,-1.3125 1.23437,0 0,-2.4375 1.65625,-1 0,3.4375 1.6875,0 0,1.3125 -1.6875,0 0,5.75 q 0,0.71875 0.0781,0.92188 0.0937,0.20312 0.29687,0.32812 0.20313,0.125 0.57813,0.125 0.26562,0 0.73437,-0.0781 z m 1.51142,1.5 0,-9.85938 1.5,0 0,1.5 q 0.57812,-1.04687 1.0625,-1.375 0.48437,-0.34375 1.07812,-0.34375 0.84375,0 1.71875,0.54688 l -0.57812,1.54687 q -0.60938,-0.35937 -1.23438,-0.35937 -0.54687,0 -0.98437,0.32812 -0.42188,0.32813 -0.60938,0.90625 -0.28125,0.89063 -0.28125,1.95313 l 0,5.15625 -1.67187,0 z m 12.66577,-1.21875 q -0.9375,0.79687 -1.79688,1.125 -0.85937,0.3125 -1.84375,0.3125 -1.60937,0 -2.48437,-0.78125 -0.875,-0.79688 -0.875,-2.03125 0,-0.73438 0.32812,-1.32813 0.32813,-0.59375 0.85938,-0.95312 0.53125,-0.35938 1.20312,-0.54688 0.5,-0.14062 1.48438,-0.25 2.03125,-0.25 2.98437,-0.57812 0,-0.34375 0,-0.4375 0,-1.01563 -0.46875,-1.4375 -0.64062,-0.5625 -1.90625,-0.5625 -1.17187,0 -1.73437,0.40625 -0.5625,0.40625 -0.82813,1.46875 l -1.64062,-0.23438 q 0.23437, -1.04687 0.73437,-1.6875 0.51563,-0.64062 1.46875,-0.98437 0.96875,-0.35938 2.25,-0.35938 1.26563,0 2.04688,0.29688 0.78125,0.29687 1.15625,0.75 0.375,0.45312 0.51562,1.14062 0.0937,0.42188 0.0937,1.53125 l 0,2.23438 q 0,2.32812 0.0937,2.95312 0.10938,0.60938 0.4375,1.17188 l -1.75,0 q -0.26562,-0.51563 -0.32812,-1.21875 z m -0.14063,-3.71875 q -0.90625,0.35937 -2.73437,0.625 -1.03125,0.14062 -1.45313,0.32812 -0.42187,0.1875 -0.65625,0.54688 -0.23437,0.35937 -0.23437,0.79687 0,0.67188 0.5,1.125 0.51562,0.4375 1.48437,0.4375 0.96875,0 1.71875,-0.42187 0.75,-0.4375 1.10938,-1.15625 0.26562,-0.57813 0.26562,-1.67188 l 0,-0.60937 z m 4.09448,-6.75 0,-1.90625 1.67188,0 0,1.90625 -1.67188,0 z m 0,11.6875 0,-9.85938 1.67188,0 0,9.85938 -1.67188,0 z m 4.09797,0 0,-13.59375 1.67187,0 0,13.59375 -1.67187,0 z m 10.92608,-3.17188 1.71875,0.21875 q -0.40625,1.5 -1.51562,2.34375 -1.09375,0.82813 -2.8125,0.82813 -2.15625,0 -3.42188,-1.32813 -1.26562,-1.32812 -1.26562,-3.73437 0,-2.48438 1.26562,-3 .85938 1.28125,-1.375 3.32813,-1.375 1.98437,0 3.23437,1.34375 1.25,1.34375 1.25,3.79688 0,0.14062 -0.0156,0.4375 l -7.34375,0 q 0.0937,1.625 0.92187,2.48437 0.82813,0.85938 2.0625,0.85938 0.90625,0 1.54688,-0.46875 0.65625,-0.48438 1.04687,-1.54688 z m -5.48437,-2.70312 5.5,0 q -0.10938,-1.23438 -0.625,-1.85938 -0.79688,-0.96875 -2.07813,-0.96875 -1.14062,0 -1.9375,0.78125 -0.78125,0.76563 -0.85937,2.04688 z m 9.09442,5.875 0,-9.85938 1.5,0 0,1.5 q 0.57812,-1.04687 1.0625,-1.375 0.48437,-0.34375 1.07812,-0.34375 0.84375,0 1.71875,0.54688 l -0.57812,1.54687 q -0.60938,-0.35937 -1.23438,-0.35937 -0.54687,0 -0.98437,0.32812 -0.42188,0.32813 -0.60938,0.90625 -0.28125,0.89063 -0.28125,1.95313 l 0,5.15625 -1.67187,0 z m 5.55646,-2.9375 1.65625,-0.26563 q 0.14062,1 0.76562,1.53125 0.64063,0.51563 1.78125,0.51563 1.15625,0 1.70313,-0.46875 0.5625,-0.46875 0.5625,-1.09375 0,-0.5625 -0.48438,-0.89063 -0.34375,-0.21875 -1.70312,-0.5625 -1.84375,-0.46875 -2.5625,-0.79687 -0.70313,-0.34375 -1.0 7813,-0.9375 -0.35937,-0.60938 -0.35937,-1.32813 0,-0.65625 0.29687,-1.21875 0.3125,-0.5625 0.82813,-0.9375 0.39062,-0.28125 1.0625,-0.48437 0.67187,-0.20313 1.4375,-0.20313 1.17187,0 2.04687,0.34375 0.875,0.32813 1.28125,0.90625 0.42188,0.5625 0.57813,1.51563 l -1.625,0.21875 q -0.10938,-0.75 -0.65625,-1.17188 -0.53125,-0.4375 -1.5,-0.4375 -1.15625,0 -1.64063,0.39063 -0.48437,0.375 -0.48437,0.875 0,0.32812 0.20312,0.59375 0.20313,0.26562 0.64063,0.4375 0.25,0.0937 1.46875,0.4375 1.76562,0.46875 2.46875,0.76562 0.70312,0.29688 1.09375,0.875 0.40625,0.57813 0.40625,1.4375 0,0.82813 -0.48438,1.57813 -0.48437,0.73437 -1.40625,1.14062 -0.92187,0.39063 -2.07812,0.39063 -1.92188,0 -2.9375,-0.79688 -1,-0.79687 -1.28125,-2.35937 z m 11.09375,6.9375 -1.1875,0 q 2.76562,-4.45313 2.76562,-8.92188 0,-1.73437 -0.39062,-3.45312 -0.32813,-1.39063 -0.89063,-2.67188 -0.35937,-0.84375 -1.48437,-2.78125 l 1.1875,0 q 1.75,2.32813 2.57812,4.67188 0.71875,2.01562 0.71875,4.23437 0,2.5 -0.96875,4.84375 -0 .95312,2.32813 -2.32812,4.07813 z"/> - <path style="fill:#000000;fill-opacity:0;fill-rule:nonzero" inkscape:connector-curvature="0" id="path37" d="m 85.343263,0 172.346467,0 0,28.50394 -172.346467,0 z"/> - <path style="fill:#000000;fill-rule:nonzero" inkscape:connector-curvature="0" id="path39" d="m 95.843263,21.17197 0,-13.59375 6.031247,0 q 1.8125,0 2.75,0.35937 0.95312,0.35938 1.51562,1.29688 0.5625,0.92187 0.5625,2.04687 0,1.45313 -0.9375,2.45313 -0.92187,0.98437 -2.89062,1.25 0.71875,0.34375 1.09375,0.67187 0.78125,0.73438 1.48437,1.8125 l 2.375,3.70313 -2.26562,0 -1.79688,-2.82813 q -0.79687,-1.21875 -1.3125,-1.875 -0.5,-0.65625 -0.90625,-0.90625 -0.40625,-0.26562 -0.8125,-0.35937 -0.3125,-0.0781 -1.015617,-0.0781 l -2.07812,0 0,6.04688 -1.79688,0 z m 1.79688,-7.59375 3.859367,0 q 1.23437,0 1.92187,-0.25 0.70313,-0.26563 1.0625,-0.82813 0.375,-0.5625 0.375,-1.21875 0,-0.96875 -0.70312,-1.57812 -0.70313,-0.625 -2.21875,-0.625 l -4.296867,0 0,4.5 z m 18.176057,4.42187 1.71875,0.21875 q -0.40625,1.5 -1.51562,2.34375 -1.09375,0.82813 -2.8125,0.82813 -2.15625,0 -3.42188,-1.32813 -1.26562,-1.32812 -1.26562,-3.73437 0,-2.48438 1.26562,-3.85938 1.28125,-1.375 3.32813,-1.375 1.98437,0 3.23437,1.34375 1.25,1.34375 1.25,3.79688 0,0.14062 -0.0156,0.4375 l -7.34375,0 q 0.0937,1.625 0.92187,2.48437 0.82813,0.85938 2.0625,0.85938 0.90625,0 1.54688,-0.46875 0.65625,-0.48438 1.04687,-1.54688 z m -5.48437,-2.70312 5.5,0 q -0.10938,-1.23438 -0.625,-1.85938 -0.79688,-0.96875 -2.07813,-0.96875 -1.14062,0 -1.9375,0.78125 -0.78125,0.76563 -0.85937,2.04688 z m 9.51634,5.875 0,-8.54688 -1.48437,0 0,-1.3125 1.48437,0 0,-1.04687 q 0,-0.98438 0.17188,-1.46875 0.23437,-0.65625 0.84375,-1.04688 0.60937,-0.40625 1.70312,-0.40625 0.70313,0 1.5625,0.15625 l -0.25,1.46875 q -0.51562,-0.0937 -0.98437,-0.0937 -0.76563,0 -1.07813,0.32813 -0.3125,0.3125 -0.3125,1.20312 l 0,0.90625 1.92188,0 0,1.3125 -1.92188,0 0,8.54688 -1.65625,0 z m 11.52705,-3.17188 1.71875,0.21875 q -0.40625,1.5 -1.51562,2.34375 -1.09375,0.82813 -2.8125,0.82813 -2.15625,0 -3.42188,-1.32813 -1.26562,-1.32812 -1.26562,-3.73437 0,-2.48438 1.26562,-3.85938 1.28125,-1.375 3.32813,-1.375 1.98437,0 3.23437,1.34375 1.25,1.34375 1.25,3.79688 0,0.14062 -0.0156,0.4375 l -7.34375,0 q 0.0937,1.625 0.92187,2.48437 0.82813,0.85938 2.0625,0.85938 0.90625,0 1.54688,-0.46875 0.65625,-0.48438 1.04687,-1.54688 z m -5.48437,-2.70312 5.5,0 q -0.10938,-1.23438 -0.625,-1.85938 -0.79688,-0.96875 -2.07813,-0.96875 -1.14062,0 -1.9375,0.78125 -0.78125,0.76563 -0.85937,2.04688 z m 9.09447,5.875 0,-9.85938 1.5,0 0,1.5 q 0.57812,-1.04687 1.0625,-1.375 0.48437,-0.34375 1.07812,-0.34375 0.84375,0 1.71875,0.54688 l -0.57812,1.54687 q -0.60938,-0.35937 -1.23438,-0.35937 -0.54687,0 -0.98437,0.32812 -0.42188,0.32813 -0.60938,0.90625 -0.28125,0.89063 -0.28125,1.95313 l 0,5.15625 -1.67187,0 z m 12.9783,-3.17188 1.71875,0.21875 q -0.40625,1.5 -1.51563,2.34375 -1.09375,0.82813 -2.8125,0.82813 -2.15625,0 -3.42187,-1.32813 -1.26563,-1.32812 -1.26563,-3.73437 0,-2.48438 1.26563,-3.85938 1.28125,-1.375 3.32812,-1.375 1.98438,0 3.23438,1.34375 1.25,1.34375 1.25,3.79688 0,0.14062 -0.0156,0.4375 l -7.34375,0 q 0.0937,1.625 0.92188,2.48437 0.8281 2,0.85938 2.0625,0.85938 0.90625,0 1.54687,-0.46875 0.65625,-0.48438 1.04688,-1.54688 z m -5.48438,-2.70312 5.5,0 q -0.10937,-1.23438 -0.625,-1.85938 -0.79687,-0.96875 -2.07812,-0.96875 -1.14063,0 -1.9375,0.78125 -0.78125,0.76563 -0.85938,2.04688 z m 9.1101,5.875 0,-9.85938 1.5,0 0,1.40625 q 1.09375,-1.625 3.14062,-1.625 0.89063,0 1.64063,0.32813 0.75,0.3125 1.10937,0.84375 0.375,0.51562 0.53125,1.21875 0.0937,0.46875 0.0937,1.625 l 0,6.0625 -1.67187,0 0,-6 q 0,-1.01563 -0.20313,-1.51563 -0.1875,-0.51562 -0.6875,-0.8125 -0.5,-0.29687 -1.17187,-0.29687 -1.0625,0 -1.84375,0.67187 -0.76563,0.67188 -0.76563,2.57813 l 0,5.375 -1.67187,0 z m 16.81321,-3.60938 1.64063,0.21875 q -0.26563,1.6875 -1.375,2.65625 -1.10938,0.95313 -2.73438,0.95313 -2.01562,0 -3.25,-1.3125 -1.21875,-1.32813 -1.21875,-3.79688 0,-1.59375 0.51563,-2.78125 0.53125,-1.20312 1.60937,-1.79687 1.09375,-0.60938 2.35938,-0.60938 1.60937,0 2.625,0.8125 1.01562,0.8125 1.3125,2.3125 l -1.625,0.25 q -0.23438,-1 -0.82813,-1.5 - 0.59375,-0.5 -1.42187,-0.5 -1.26563,0 -2.0625,0.90625 -0.78125,0.90625 -0.78125,2.85938 0,1.98437 0.76562,2.89062 0.76563,0.89063 1.98438,0.89063 0.98437,0 1.64062,-0.59375 0.65625,-0.60938 0.84375,-1.85938 z m 9.64063,0.4375 1.71875,0.21875 q -0.40625,1.5 -1.51563,2.34375 -1.09375,0.82813 -2.8125,0.82813 -2.15625,0 -3.42187,-1.32813 -1.26563,-1.32812 -1.26563,-3.73437 0,-2.48438 1.26563,-3.85938 1.28125,-1.375 3.32812,-1.375 1.98438,0 3.23438,1.34375 1.25,1.34375 1.25,3.79688 0,0.14062 -0.0156,0.4375 l -7.34375,0 q 0.0937,1.625 0.92188,2.48437 0.82812,0.85938 2.0625,0.85938 0.90625,0 1.54687,-0.46875 0.65625,-0.48438 1.04688,-1.54688 z m -5.48438,-2.70312 5.5,0 q -0.10937,-1.23438 -0.625,-1.85938 -0.79687,-0.96875 -2.07812,-0.96875 -1.14063,0 -1.9375,0.78125 -0.78125,0.76563 -0.85938,2.04688 z m 14.51215,5.875 0,-13.59375 5.125,0 q 1.35937,0 2.07812,0.125 1,0.17187 1.67188,0.64062 0.67187,0.46875 1.07812,1.3125 0.42188,0.84375 0.42188,1.84375 0,1.73438 -1.10938,2.9375 -1.09375,1.20 313 -3.98437,1.20313 l -3.48438,0 0,5.53125 -1.79687,0 z m 1.79687,-7.14063 3.51563,0 q 1.75,0 2.46875,-0.64062 0.73437,-0.65625 0.73437,-1.82813 0,-0.85937 -0.4375,-1.46875 -0.42187,-0.60937 -1.125,-0.79687 -0.45312,-0.125 -1.67187,-0.125 l -3.48438,0 0,4.85937 z m 16.86545,5.92188 q -0.9375,0.79687 -1.79687,1.125 -0.85938,0.3125 -1.84375,0.3125 -1.60938,0 -2.48438,-0.78125 -0.875,-0.79688 -0.875,-2.03125 0,-0.73438 0.32813,-1.32813 0.32812,-0.59375 0.85937,-0.95312 0.53125,-0.35938 1.20313,-0.54688 0.5,-0.14062 1.48437,-0.25 2.03125,-0.25 2.98438,-0.57812 0,-0.34375 0,-0.4375 0,-1.01563 -0.46875,-1.4375 -0.64063,-0.5625 -1.90625,-0.5625 -1.17188,0 -1.73438,0.40625 -0.5625,0.40625 -0.82812,1.46875 l -1.64063,-0.23438 q 0.23438,-1.04687 0.73438,-1.6875 0.51562,-0.64062 1.46875,-0.98437 0.96875,-0.35938 2.25,-0.35938 1.26562,0 2.04687,0.29688 0.78125,0.29687 1.15625,0.75 0.375,0.45312 0.51563,1.14062 0.0937,0.42188 0.0937,1.53125 l 0,2.23438 q 0,2.32812 0.0937,2.95312 0.10937,0.60938 0.4375,1.17188 l -1.75,0 q -0.26563,-0.51563 -0.32813,-1.21875 z m -0.14062,-3.71875 q -0.90625,0.35937 -2.73438,0.625 -1.03125,0.14062 -1.45312,0.32812 -0.42188,0.1875 -0.65625,0.54688 -0.23438,0.35937 -0.23438,0.79687 0,0.67188 0.5,1.125 0.51563,0.4375 1.48438,0.4375 0.96875,0 1.71875,-0.42187 0.75,-0.4375 1.10937,-1.15625 0.26563,-0.57813 0.26563,-1.67188 l 0,-0.60937 z m 10.51634,1.32812 1.64062,0.21875 q -0.26562,1.6875 -1.375,2.65625 -1.10937,0.95313 -2.73437,0.95313 -2.01563,0 -3.25,-1.3125 -1.21875,-1.32813 -1.21875,-3.79688 0,-1.59375 0.51562,-2.78125 0.53125,-1.20312 1.60938,-1.79687 1.09375,-0.60938 2.35937,-0.60938 1.60938,0 2.625,0.8125 1.01563,0.8125 1.3125,2.3125 l -1.625,0.25 q -0.23437,-1 -0.82812,-1.5 -0.59375,-0.5 -1.42188,-0.5 -1.26562,0 -2.0625,0.90625 -0.78125,0.90625 -0.78125,2.85938 0,1.98437 0.76563,2.89062 0.76562,0.89063 1.98437,0.89063 0.98438,0 1.64063,-0.59375 0.65625,-0.60938 0.84375,-1.85938 z m 2.90625,3.60938 0,-13.59375 1.67187,0 0,7.75 3.95313,-4 .01563 2.15626,0 -3.76564,3.65625 4.14064,6.20313 -2.06251,0 -3.25,-5.03125 -1.17188,1.125 0,3.90625 -1.67187,0 z m 16.06251,-3.17188 1.71875,0.21875 q -0.40625,1.5 -1.51562,2.34375 -1.09375,0.82813 -2.8125,0.82813 -2.15625,0 -3.42188,-1.32813 -1.26562,-1.32812 -1.26562,-3.73437 0,-2.48438 1.26562,-3.85938 1.28125,-1.375 3.32813,-1.375 1.98437,0 3.23437,1.34375 1.25,1.34375 1.25,3.79688 0,0.14062 -0.0156,0.4375 l -7.34375,0 q 0.0937,1.625 0.92187,2.48437 0.82813,0.85938 2.0625,0.85938 0.90625,0 1.54688,-0.46875 0.65625,-0.48438 1.04687,-1.54688 z m -5.48437,-2.70312 5.5,0 q -0.10938,-1.23438 -0.625,-1.85938 -0.79688,-0.96875 -2.07813,-0.96875 -1.14062,0 -1.9375,0.78125 -0.78125,0.76563 -0.85937,2.04688 z m 12.76633,4.375 0.23437,1.48437 q -0.70312,0.14063 -1.26562,0.14063 -0.90625,0 -1.40625,-0.28125 -0.5,-0.29688 -0.70313,-0.75 -0.20312,-0.46875 -0.20312,-1.98438 l 0,-5.65625 -1.23438,0 0,-1.3125 1.23438,0 0,-2.4375 1.65625,-1 0,3.4375 1.6875,0 0,1.3125 -1.6875,0 0,5.75 q 0,0.71875 0.0781,0.92188 0.0937,0.20312 0.29688,0.32812 0.20312,0.125 0.57812,0.125 0.26563,0 0.73438,-0.0781 z"/> - <path style="fill:#000000;fill-opacity:0;fill-rule:nonzero" inkscape:connector-curvature="0" id="path41" d="m 134.49812,27.32282 32.28346,34.17325"/> - <path style="fill-rule:evenodd;stroke:#595959;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round" inkscape:connector-curvature="0" id="path43" d="m 134.49812,27.32282 28.16315,29.81174"/> - <path style="fill:#595959;fill-rule:evenodd;stroke:#595959;stroke-width:1;stroke-linecap:butt" inkscape:connector-curvature="0" id="path45" d="m 161.46058,58.26883 4.31709,2.16455 -1.91574,-4.43314 z"/> - <path style="fill:#000000;fill-opacity:0;fill-rule:nonzero" inkscape:connector-curvature="0" id="path47" d="m 165.9199,145.17847 0,0 c 0,4.72269 0.63806,8.55118 1.42514,8.55118 l 145.48018,0 c 0.78708,0 1.42514,3.82849 1.42514,8.55118 l 0,0 c 0,-4.72269 0.63806,-8.55118 1.42514,-8.55118 l 145.89014,0 c 0.78708,0 1.42514,-3.82849 1.42514,-8.55118 z"/> - <path style="fill:#000000;fill-opacity:0;fill-rule:nonzero" inkscape:connector-curvature="0" id="path49" d="m 165.9199,145.17847 0,0 c 0,4.72269 0.63806,8.55118 1.42514,8.55118 l 145.48018,0 c 0.78708,0 1.42514,3.82849 1.42514,8.55118 l 0,0 c 0,-4.72269 0.63806,-8.55118 1.42514,-8.55118 l 145.89014,0 c 0.78708,0 1.42514,-3.82849 1.42514,-8.55118"/> - <path style="fill-rule:nonzero;stroke:#595959;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round" inkscape:connector-curvature="0" id="path51" d="m 165.9199,145.17847 0,0 c 0,4.72269 0.63806,8.55118 1.42514,8.55118 l 145.48018,0 c 0.78708,0 1.42514,3.82849 1.42514,8.55118 l 0,0 c 0,-4.72269 0.63806,-8.55118 1.42514,-8.55118 l 145.89014,0 c 0.78708,0 1.42514,-3.82849 1.42514,-8.55118"/> - <path style="fill:#000000;fill-opacity:0;fill-rule:nonzero" inkscape:connector-curvature="0" id="path53" d="m 157.93869,157.62497 314.3622,0 0,25.63782 -314.3622,0 z"/> - <path style="fill:#000000;fill-rule:nonzero" inkscape:connector-curvature="0" id="path55" d="m 182.6591,173.3639 q 0,1.78125 -1.28125,3.04687 -1.28125,1.26563 -3.07813,1.26563 -1.8125,0 -3.09375,-1.26563 -1.26562,-1.28125 -1.26562,-3.04687 0,-1.78125 1.26562,-3.04688 1.28125,-1.26562 3.09375,-1.26562 1.79688,0 3.07813,1.26562 1.28125,1.25 1.28125,3.04688 z m -0.79688,0 q 0,-1.46875 -1.04687,-2.5 -1.03125,-1.03125 -2.51563,-1.03125 -1.48437,0 -2.53125,1.04687 -1.04687,1.03125 -1.04687,2.48438 0,1.45312 1.04687,2.5 1.04688,1.03125 2.53125,1.03125 1.48438,0 2.51563,-1.03125 1.04687,-1.04688 1.04687,-2.5 z m 11.65186,-7.64063 0,10.85938 1.04687,0 q 0.28125,0 0.40625,0.10937 0.125,0.10938 0.125,0.28125 0,0.17188 -0.125,0.28125 -0.125,0.10938 -0.40625,0.10938 l -1.82812,0 0,-1.54688 q -1.35938,1.85938 -3.45313,1.85938 -1.04687,0 -2.01562,-0.5625 -0.96875,-0.5625 -1.53125,-1.59375 -0.5625,-1.04688 -0.5625,-2.15625 0,-1.10938 0.5625,-2.14063 0.5625,-1.04687 1.53125,-1.60937 0.96875,-0.562 5 2.03125,-0.5625 2.04687,0 3.4375,1.85937 l 0,-4.40625 -1.04688,0 q -0.28125,0 -0.40625,-0.10937 -0.125,-0.10938 -0.125,-0.28125 0,-0.17188 0.125,-0.28125 0.125,-0.10938 0.40625,-0.10938 l 1.82813,0 z m -0.78125,7.64063 q 0,-1.48438 -1.01563,-2.5 -1,-1.03125 -2.375,-1.03125 -1.39062,0 -2.39062,1.03125 -1,1.01562 -1,2.5 0,1.46875 1,2.5 1,1.03125 2.39062,1.03125 1.375,0 2.375,-1.03125 1.01563,-1.03125 1.01563,-2.5 z m 5.43311,-4.03125 0,1.42187 q 0.6875,-0.84375 1.48437,-1.26562 0.8125,-0.4375 1.89063,-0.4375 1.15625,0 2.125,0.54687 0.96875,0.53125 1.5,1.5 0.54687,0.95313 0.54687,2 0,1.6875 -1.20312,2.89063 -1.20313,1.1875 -2.95313,1.1875 -2.09375,0 -3.39062,-1.70313 l 0,4.6875 1.89062,0 q 0.28125,0 0.39063,0.10938 0.125,0.10937 0.125,0.28125 0,0.17187 -0.125,0.28125 -0.10938,0.10937 -0.39063,0.10937 l -3.71875,0 q -0.28125,0 -0.40625,-0.10937 -0.10937,-0.0937 -0.10937,-0.28125 0,-0.17188 0.10937,-0.28125 0.125,-0.10938 0.40625,-0.10938 l 1.04688,0 0,-10.04687 -1.04688,0 q -0.28125,0 -0.40625,-0.10938 -0.10937,-0.10937 -0.10937,-0.28125 0,-0.17187 0.10937,-0.28125 0.125,-0.10937 0.40625,-0.10937 l 1.82813,0 z m 6.75,3.76562 q 0,-1.34375 -0.98438,-2.29687 -0.96875,-0.96875 -2.375,-0.96875 -1.42187,0 -2.40625,0.96875 -0.98437,0.96875 -0.98437,2.29687 0,1.35938 0.98437,2.32813 0.98438,0.95312 2.40625,0.95312 1.39063,0 2.375,-0.95312 0.98438,-0.96875 0.98438,-2.32813 z m 12.76123,9.46875 -10.35938,0 q -0.28125,0 -0.40625,-0.10937 -0.10937,-0.10938 -0.10937,-0.28125 0,-0.17188 0.10937,-0.28125 0.125,-0.10938 0.40625,-0.10938 l 10.35938,0 q 0.29687,0 0.40625,0.10938 0.125,0.10937 0.125,0.28125 0,0.17187 -0.125,0.28125 -0.10938,0.10937 -0.40625,0.10937 z m 3.29248,-13.23437 0,1.42187 q 0.6875,-0.84375 1.48437,-1.26562 0.8125,-0.4375 1.89063,-0.4375 1.15625,0 2.125,0.54687 0.96873,0.53125 1.49998,1.5 0.54688,0.95313 0.54688,2 0,1.6875 -1.20313,2.89063 -1.20311,1.1875 -2.95311,1.1875 -2.09375,0 -3.39062,-1.70313 l 0,4.6875 1.89062,0 q 0.28125,0 0.39063,0.10938 0.125,0.1 0937 0.125,0.28125 0,0.17187 -0.125,0.28125 -0.10938,0.10937 -0.39063,0.10937 l -3.71875,0 q -0.28125,0 -0.40625,-0.10937 -0.10937,-0.0937 -0.10937,-0.28125 0,-0.17188 0.10937,-0.28125 0.125,-0.10938 0.40625,-0.10938 l 1.04688,0 0,-10.04687 -1.04688,0 q -0.28125,0 -0.40625,-0.10938 -0.10937,-0.10937 -0.10937,-0.28125 0,-0.17187 0.10937,-0.28125 0.125,-0.10937 0.40625,-0.10937 l 1.82813,0 z m 6.74998,3.76562 q 0,-1.34375 -0.98437,-2.29687 -0.96874,-0.96875 -2.37499,-0.96875 -1.42187,0 -2.40625,0.96875 -0.98437,0.96875 -0.98437,2.29687 0,1.35938 0.98437,2.32813 0.98438,0.95312 2.40625,0.95312 1.39063,0 2.37499,-0.95312 0.98437,-0.96875 0.98437,-2.32813 z m 9.82373,4.26563 0,-1.125 q -1.6875,1.4375 -3.625,1.4375 -1.40625,0 -2.1875,-0.70313 -0.78125,-0.71875 -0.78125,-1.75 0,-1.14062 1.03125,-1.98437 1.04688,-0.84375 3.03125,-0.84375 0.54688,0 1.17188,0.0781 0.625,0.0625 1.35937,0.21875 l 0,-1.26562 q 0,-0.64063 -0.59375,-1.10938 -0.59375,-0.48437 -1.78125,-0.48437 -0.90625,0 -2.54687,0 .53125 -0.29688,0.0937 -0.375,0.0937 -0.15625,0 -0.26563,-0.10938 -0.10937,-0.10937 -0.10937,-0.28125 0,-0.15625 0.0937,-0.25 0.14062,-0.14062 1.0625,-0.375 1.4375,-0.39062 2.1875,-0.39062 1.46875,0 2.29687,0.73437 0.82813,0.71875 0.82813,1.64063 l 0,5.15625 1.03125,0 q 0.29687,0 0.40625,0.10937 0.125,0.10938 0.125,0.28125 0,0.17188 -0.125,0.28125 -0.10938,0.10938 -0.40625,0.10938 l -1.82813,0 z m 0,-3.875 q -0.54687,-0.15625 -1.15625,-0.23438 -0.60937,-0.0781 -1.28125,-0.0781 -1.70312,0 -2.65625,0.73437 -0.73437,0.54688 -0.73437,1.3125 0,0.70313 0.54687,1.1875 0.5625,0.48438 1.625,0.48438 1,0 1.85938,-0.40625 0.875,-0.40625 1.79687,-1.28125 l 0,-1.71875 z m 12.41748,-3.375 0,-0.25 q 0,-0.29688 0.10938,-0.40625 0.10937,-0.125 0.28125,-0.125 0.17187,0 0.28125,0.125 0.10937,0.10937 0.10937,0.40625 l 0,1.75 q 0,0.29687 -0.10937,0.42187 -0.10938,0.10938 -0.28125,0.10938 -0.15625,0 -0.26563,-0.0937 -0.10937,-0.10938 -0.125,-0.35938 -0.0625,-0.67187 -0.875,-1.26562 -0.79687,-0.59375 -2.17 187,-0.59375 -1.73438,0 -2.64063,1.09375 -0.90625,1.07812 -0.90625,2.48437 0,1.51563 0.98438,2.5 1,0.98438 2.57812,0.98438 0.92188,0 1.85938,-0.32813 0.9375,-0.34375 1.70312,-1.09375 0.1875,-0.17187 0.34375,-0.17187 0.15625,0 0.26563,0.10937 0.10937,0.0937 0.10937,0.25 0,0.40625 -0.9375,1.01563 -1.51562,1 -3.375,1 -1.875,0 -3.09375,-1.20313 -1.20312,-1.20312 -1.20312,-3.04687 0,-1.89063 1.23437,-3.125 1.23438,-1.25 3.125,-1.25 1.78125,0 3,1.0625 z m 6.57373,3.78125 0,3.46875 -1.82812,0 q -0.28125,0 -0.40625,-0.10938 -0.125,-0.10937 -0.125,-0.28125 0,-0.17187 0.125,-0.28125 0.125,-0.10937 0.40625,-0.10937 l 1.04687,0 0,-10.07813 -1.04687,0 q -0.28125,0 -0.40625,-0.10937 -0.125,-0.10938 -0.125,-0.28125 0,-0.17188 0.125,-0.28125 0.125,-0.10938 0.40625,-0.10938 l 1.82812,0 0,7.17188 3.3125,-2.78125 -0.40625,0 q -0.28125,0 -0.40625,-0.10938 -0.10937,-0.10937 -0.10937,-0.28125 0,-0.17187 0.10937,-0.28125 0.125,-0.10937 0.40625,-0.10937 l 2.5,0 q 0.28125,0 0.40625,0.10937 0.125,0.10938 0.1 25,0.28125 0,0.17188 -0.125,0.28125 -0.125,0.10938 -0.40625,0.10938 l -0.90625,0 -3.04687,2.54687 3.85937,3.92188 0.89063,0 q 0.29687,0 0.40625,0.10937 0.125,0.10938 0.125,0.28125 0,0.17188 -0.125,0.28125 -0.10938,0.10938 -0.40625,0.10938 l -2.51563,0 q -0.28125,0 -0.40625,-0.10938 -0.10937,-0.10937 -0.10937,-0.28125 0,-0.17187 0.10937,-0.28125 0.125,-0.10937 0.40625,-0.10937 l 0.54688,0 -3.34375,-3.4375 -0.89063,0.75 z m 17.19873,-0.35938 -7.95312,0 q 0.21875,1.51563 1.28125,2.4375 1.0625,0.92188 2.625,0.92188 0.875,0 1.82812,-0.28125 0.95313,-0.29688 1.5625,-0.76563 0.17188,-0.14062 0.29688,-0.14062 0.15625,0 0.26562,0.125 0.10938,0.10937 0.10938,0.26562 0,0.15625 -0.15625,0.29688 -0.4375,0.46875 -1.57813,0.875 -1.14062,0.40625 -2.32812,0.40625 -2,0 -3.34375,-1.3125 -1.34375,-1.3125 -1.34375,-3.1875 0,-1.6875 1.25,-2.90625 1.26562,-1.21875 3.125,-1.21875 1.90625,0 3.14062,1.25 1.23438,1.25 1.21875,3.23437 z m -0.79687,-0.79687 q -0.23438,-1.28125 -1.21875,-2.09375 -0.98438,-0.8125 -2.34375,-0.8125 -1.375,0 -2.35938,0.8125 -0.96875,0.79687 -1.21875,2.09375 l 7.14063,0 z m 6.3706,-3.40625 4.23438,0 q 0.28125,0 0.39062,0.10937 0.125,0.10938 0.125,0.28125 0,0.17188 -0.125,0.28125 -0.10937,0.10938 -0.39062,0.10938 l -4.23438,0 0,5.1875 q 0,0.6875 0.54688,1.14062 0.54687,0.45313 1.59375,0.45313 0.78125,0 1.70312,-0.23438 0.92188,-0.25 1.4375,-0.54687 0.1875,-0.10938 0.29688,-0.10938 0.15625,0 0.26562,0.125 0.10938,0.10938 0.10938,0.26563 0,0.14062 -0.125,0.25 -0.29688,0.3125 -1.4375,0.67187 -1.14063,0.35938 -2.1875,0.35938 -1.375,0 -2.1875,-0.64063 -0.79688,-0.64062 -0.79688,-1.73437 l 0,-5.1875 -1.4375,0 q -0.28125,0 -0.40625,-0.10938 -0.10937,-0.10937 -0.10937,-0.28125 0,-0.17187 0.10937,-0.28125 0.125,-0.10937 0.40625,-0.10937 l 1.4375,0 0,-2.29688 q 0,-0.28125 0.10938,-0.40625 0.10937,-0.125 0.28125,-0.125 0.17187,0 0.28125,0.125 0.10937,0.125 0.10937,0.40625 l 0,2.29688 z m 18.18311,13.23437 -10.35938,0 q -0.28125,0 -0.40625,-0.10937 -0.10937,-0.10938 -0.1093 7,-0.28125 0,-0.17188 0.10937,-0.28125 0.125,-0.10938 0.40625,-0.10938 l 10.35938,0 q 0.29687,0 0.40625,0.10938 0.125,0.10937 0.125,0.28125 0,0.17187 -0.125,0.28125 -0.10938,0.10937 -0.40625,0.10937 z m 8.90185,-5.20312 0,-1.14063 q -1.60937,1.45313 -3.45312,1.45313 -1.14063,0 -1.73438,-0.625 -0.78125,-0.8125 -0.78125,-1.90625 l 0,-5.03125 -1.04687,0 q -0.28125,0 -0.40625,-0.10938 -0.10938,-0.10937 -0.10938,-0.28125 0,-0.17187 0.10938,-0.28125 0.125,-0.10937 0.40625,-0.10937 l 1.82812,0 0,5.8125 q 0,0.76562 0.48438,1.26562 0.48437,0.48438 1.20312,0.48438 1.90625,0 3.5,-1.75 l 0,-5.03125 -1.4375,0 q -0.28125,0 -0.40625,-0.10938 -0.125,-0.10937 -0.125,-0.28125 0,-0.17187 0.125,-0.28125 0.125,-0.10937 0.40625,-0.10937 l 2.20313,0 0,7.25 0.67187,0 q 0.26563,0 0.39063,0.10937 0.125,0.10938 0.125,0.28125 0,0.17188 -0.125,0.28125 -0.125,0.10938 -0.39063,0.10938 l -1.4375,0 z m 6.21436,-8.03125 0,1.17187 q 0.8125,-0.82812 1.46875,-1.14062 0.65625,-0.3125 1.48437,-0.3125 0.89063,0 1.625,0.37 5 0.51563,0.28125 0.9375,0.9375 0.42188,0.64062 0.42188,1.3125 l 0,4.90625 0.65625,0 q 0.28125,0 0.40625,0.10937 0.125,0.10938 0.125,0.28125 0,0.17188 -0.125,0.28125 -0.125,0.10938 -0.40625,0.10938 l -2.07813,0 q -0.29687,0 -0.42187,-0.10938 -0.10938,-0.10937 -0.10938,-0.28125 0,-0.17187 0.10938,-0.28125 0.125,-0.10937 0.42187,-0.10937 l 0.64063,0 0,-4.78125 q 0,-0.82813 -0.60938,-1.39063 -0.59375,-0.57812 -1.60937,-0.57812 -0.76563,0 -1.32813,0.3125 -0.5625,0.3125 -1.60937,1.54687 l 0,4.89063 0.875,0 q 0.28125,0 0.39062,0.10937 0.125,0.10938 0.125,0.28125 0,0.17188 -0.125,0.28125 -0.10937,0.10938 -0.39062,0.10938 l -2.54688,0 q -0.26562,0 -0.39062,-0.10938 -0.125,-0.10937 -0.125,-0.28125 0,-0.17187 0.125,-0.28125 0.125,-0.10937 0.39062,-0.10937 l 0.89063,0 0,-6.46875 -0.65625,0 q -0.28125,0 -0.40625,-0.10938 -0.125,-0.10937 -0.125,-0.28125 0,-0.17187 0.125,-0.28125 0.125,-0.10937 0.40625,-0.10937 l 1.4375,0 z m 16.4956,0.5 q 0,-0.26563 0.10938,-0.375 0.10937,-0.125 0.28125,-0.125 0 .17187,0 0.28125,0.125 0.10937,0.10937 0.10937,0.40625 l 0,1.32812 q 0,0.28125 -0.10937,0.40625 -0.10938,0.10938 -0.28125,0.10938 -0.17188,0 -0.28125,-0.0937 -0.0937,-0.10938 -0.10938,-0.34375 -0.0625,-0.54688 -0.57812,-0.90625 -0.76563,-0.53125 -2.01563,-0.53125 -1.3125,0 -2.03125,0.53125 -0.54687,0.40625 -0.54687,0.89062 0,0.5625 0.64062,0.9375 0.45313,0.25 1.70313,0.39063 1.60937,0.17187 2.25,0.40625 0.89062,0.32812 1.32812,0.90625 0.45313,0.5625 0.45313,1.23437 0,0.98438 -0.95313,1.76563 -0.95312,0.78125 -2.8125,0.78125 -1.84375,0 -3.01562,-0.9375 0,0.3125 -0.0469,0.40625 -0.0312,0.0937 -0.125,0.15625 -0.0937,0.0625 -0.21875,0.0625 -0.17187,0 -0.28125,-0.10938 -0.10937,-0.125 -0.10937,-0.40625 l 0,-1.60937 q 0,-0.28125 0.10937,-0.39063 0.10938,-0.125 0.28125,-0.125 0.17188,0 0.28125,0.125 0.10938,0.10938 0.10938,0.29688 0,0.42187 0.21875,0.71875 0.32812,0.4375 1.03125,0.73437 0.71875,0.29688 1.75,0.29688 1.51562,0 2.25,-0.5625 0.75,-0.57813 0.75,-1.20313 0,-0.71875 -0.75,-1.1562 5 -0.76563,-0.4375 -2.21875,-0.57812 -1.45313,-0.15625 -2.07813,-0.39063 -0.625,-0.25 -0.98437,-0.73437 -0.35938,-0.48438 -0.35938,-1.03125 0,-1.01563 0.98438,-1.59375 0.98437,-0.59375 2.35937,-0.59375 1.60938,0 2.625,0.78125 z m 6.26123,-4.10938 0,4.79688 q 0.73438,-0.8125 1.40625,-1.14063 0.6875,-0.32812 1.54688,-0.32812 0.90625,0 1.53125,0.32812 0.64062,0.3125 1.0625,0.98438 0.4375,0.65625 0.4375,1.39062 l 0,4.82813 0.85937,0 q 0.29688,0 0.40625,0.10937 0.125,0.10938 0.125,0.28125 0,0.17188 -0.125,0.28125 -0.10937,0.10938 -0.40625,0.10938 l -2.53125,0 q -0.28125,0 -0.40625,-0.10938 -0.10937,-0.10937 -0.10937,-0.28125 0,-0.17187 0.10937,-0.28125 0.125,-0.10937 0.40625,-0.10937 l 0.875,0 0,-4.78125 q 0,-0.84375 -0.60937,-1.40625 -0.60938,-0.5625 -1.6875,-0.5625 -0.85938,0 -1.45313,0.42187 -0.4375,0.29688 -1.4375,1.39063 l 0,4.9375 0.875,0 q 0.28125,0 0.39063,0.10937 0.125,0.10938 0.125,0.28125 0,0.17188 -0.125,0.28125 -0.10938,0.10938 -0.39063,0.10938 l -2.54687,0 q -0.26563,0 -0.3 9063,-0.10938 -0.125,-0.10937 -0.125,-0.28125 0,-0.17187 0.125,-0.28125 0.125,-0.10937 0.39063,-0.10937 l 0.89062,0 0,-10.07813 -1.04687,0 q -0.28125,0 -0.40625,-0.10937 -0.125,-0.10938 -0.125,-0.28125 0,-0.17188 0.125,-0.28125 0.125,-0.10938 0.40625,-0.10938 l 1.82812,0 z m 16.19873,11.64063 0,-1.125 q -1.6875,1.4375 -3.625,1.4375 -1.40625,0 -2.1875,-0.70313 -0.78125,-0.71875 -0.78125,-1.75 0,-1.14062 1.03125,-1.98437 1.04688,-0.84375 3.03125,-0.84375 0.54688,0 1.17188,0.0781 0.625,0.0625 1.35937,0.21875 l 0,-1.26562 q 0,-0.64063 -0.59375,-1.10938 -0.59375,-0.48437 -1.78125,-0.48437 -0.90625,0 -2.54687,0.53125 -0.29688,0.0937 -0.375,0.0937 -0.15625,0 -0.26563,-0.10938 -0.10937,-0.10937 -0.10937,-0.28125 0,-0.15625 0.0937,-0.25 0.14062,-0.14062 1.0625,-0.375 1.4375,-0.39062 2.1875,-0.39062 1.46875,0 2.29687,0.73437 0.82813,0.71875 0.82813,1.64063 l 0,5.15625 1.03125,0 q 0.29687,0 0.40625,0.10937 0.125,0.10938 0.125,0.28125 0,0.17188 -0.125,0.28125 -0.10938,0.10938 -0.40625,0.10938 l -1.82813,0 z m 0,-3.875 q -0.54687,-0.15625 -1.15625,-0.23438 -0.60937,-0.0781 -1.28125,-0.0781 -1.70312,0 -2.65625,0.73437 -0.73437,0.54688 -0.73437,1.3125 0,0.70313 0.54687,1.1875 0.5625,0.48438 1.625,0.48438 1,0 1.85938,-0.40625 0.875,-0.40625 1.79687,-1.28125 l 0,-1.71875 z m 8.22998,-4.15625 0,1.96875 q 1.53125,-1.375 2.28125,-1.76563 0.75,-0.40625 1.39063,-0.40625 0.70312,0 1.29687,0.46875 0.59375,0.46875 0.59375,0.71875 0,0.17188 -0.10937,0.29688 -0.10938,0.10937 -0.29688,0.10937 -0.0937,0 -0.15625,-0.0312 -0.0625,-0.0312 -0.23437,-0.21875 -0.32813,-0.3125 -0.57813,-0.4375 -0.23437,-0.125 -0.46875,-0.125 -0.5,0 -1.21875,0.40625 -0.71875,0.40625 -2.5,2 l 0,4.26563 3.45313,0 q 0.28125,0 0.40625,0.10937 0.125,0.10938 0.125,0.28125 0,0.17188 -0.125,0.28125 -0.125,0.10938 -0.40625,0.10938 l -6.10938,0 q -0.28125,0 -0.40625,-0.10938 -0.10937,-0.10937 -0.10937,-0.26562 0,-0.15625 0.10937,-0.26563 0.10938,-0.10937 0.40625,-0.10937 l 1.875,0 0,-6.5 -1.4375,0 q -0.28125,0 -0.40625,-0. 10938 -0.10937,-0.10937 -0.10937,-0.28125 0,-0.17187 0.10937,-0.28125 0.125,-0.10937 0.40625,-0.10937 l 2.21875,0 z m 16.55811,4.20312 -7.95313,0 q 0.21875,1.51563 1.28125,2.4375 1.0625,0.92188 2.625,0.92188 0.875,0 1.82813,-0.28125 0.95312,-0.29688 1.5625,-0.76563 0.17187,-0.14062 0.29687,-0.14062 0.15625,0 0.26563,0.125 0.10937,0.10937 0.10937,0.26562 0,0.15625 -0.15625,0.29688 -0.4375,0.46875 -1.57812,0.875 -1.14063,0.40625 -2.32813,0.40625 -2,0 -3.34375,-1.3125 -1.34375,-1.3125 -1.34375,-3.1875 0,-1.6875 1.25,-2.90625 1.26563,-1.21875 3.125,-1.21875 1.90625,0 3.14063,1.25 1.23437,1.25 1.21875,3.23437 z m -0.79688,-0.79687 q -0.23437,-1.28125 -1.21875,-2.09375 -0.98437,-0.8125 -2.34375,-0.8125 -1.375,0 -2.35937,0.8125 -0.96875,0.79687 -1.21875,2.09375 l 7.14062,0 z m 11.79248,-7.01563 0,10.85938 1.04688,0 q 0.28125,0 0.40625,0.10937 0.125,0.10938 0.125,0.28125 0,0.17188 -0.125,0.28125 -0.125,0.10938 -0.40625,0.10938 l -1.82813,0 0,-1.54688 q -1.35937,1.85938 -3.45312,1.85938 -1.0 4688,0 -2.01563,-0.5625 -0.96875,-0.5625 -1.53125,-1.59375 -0.5625,-1.04688 -0.5625,-2.15625 0,-1.10938 0.5625,-2.14063 0.5625,-1.04687 1.53125,-1.60937 0.96875,-0.5625 2.03125,-0.5625 2.04688,0 3.4375,1.85937 l 0,-4.40625 -1.04687,0 q -0.28125,0 -0.40625,-0.10937 -0.125,-0.10938 -0.125,-0.28125 0,-0.17188 0.125,-0.28125 0.125,-0.10938 0.40625,-0.10938 l 1.82812,0 z m -0.78125,7.64063 q 0,-1.48438 -1.01562,-2.5 -1,-1.03125 -2.375,-1.03125 -1.39063,0 -2.39063,1.03125 -1,1.01562 -1,2.5 0,1.46875 1,2.5 1,1.03125 2.39063,1.03125 1.375,0 2.375,-1.03125 1.01562,-1.03125 1.01562,-2.5 z m 13.54248,9.20312 -10.35937,0 q -0.28125,0 -0.40625,-0.10937 -0.10938,-0.10938 -0.10938,-0.28125 0,-0.17188 0.10938,-0.28125 0.125,-0.10938 0.40625,-0.10938 l 10.35937,0 q 0.29688,0 0.40625,0.10938 0.125,0.10937 0.125,0.28125 0,0.17187 -0.125,0.28125 -0.10937,0.10937 -0.40625,0.10937 z m 6.62061,-16.84375 0,10.85938 3.0625,0 q 0.28125,0 0.40625,0.10937 0.125,0.10938 0.125,0.28125 0,0.17188 -0.125,0.28125 -0 .125,0.10938 -0.40625,0.10938 l -6.90625,0 q -0.28125,0 -0.40625,-0.10938 -0.10938,-0.10937 -0.10938,-0.28125 0,-0.17187 0.10938,-0.28125 0.125,-0.10937 0.40625,-0.10937 l 3.0625,0 0,-10.07813 -2.23438,0 q -0.28125,0 -0.40625,-0.10937 -0.125,-0.10938 -0.125,-0.28125 0,-0.17188 0.10938,-0.28125 0.125,-0.10938 0.42187,-0.10938 l 3.01563,0 z m 15.22998,7.8125 -7.95313,0 q 0.21875,1.51563 1.28125,2.4375 1.0625,0.92188 2.625,0.92188 0.875,0 1.82813,-0.28125 0.95312,-0.29688 1.5625,-0.76563 0.17187,-0.14062 0.29687,-0.14062 0.15625,0 0.26563,0.125 0.10937,0.10937 0.10937,0.26562 0,0.15625 -0.15625,0.29688 -0.4375,0.46875 -1.57812,0.875 -1.14063,0.40625 -2.32813,0.40625 -2,0 -3.34375,-1.3125 -1.34375,-1.3125 -1.34375,-3.1875 0,-1.6875 1.25,-2.90625 1.26563,-1.21875 3.125,-1.21875 1.90625,0 3.14063,1.25 1.23437,1.25 1.21875,3.23437 z m -0.79688,-0.79687 q -0.23437,-1.28125 -1.21875,-2.09375 -0.98437,-0.8125 -2.34375,-0.8125 -1.375,0 -2.35937,0.8125 -0.96875,0.79687 -1.21875,2.09375 l 7.1406 2,0 z m 5.46436,-3.40625 0,1.17187 q 0.8125,-0.82812 1.46875,-1.14062 0.65625,-0.3125 1.48437,-0.3125 0.89063,0 1.625,0.375 0.51563,0.28125 0.9375,0.9375 0.42188,0.64062 0.42188,1.3125 l 0,4.90625 0.65625,0 q 0.28125,0 0.40625,0.10937 0.125,0.10938 0.125,0.28125 0,0.17188 -0.125,0.28125 -0.125,0.10938 -0.40625,0.10938 l -2.07813,0 q -0.29687,0 -0.42187,-0.10938 -0.10938,-0.10937 -0.10938,-0.28125 0,-0.17187 0.10938,-0.28125 0.125,-0.10937 0.42187,-0.10937 l 0.64063,0 0,-4.78125 q 0,-0.82813 -0.60938,-1.39063 -0.59375,-0.57812 -1.60937,-0.57812 -0.76563,0 -1.32813,0.3125 -0.5625,0.3125 -1.60937,1.54687 l 0,4.89063 0.875,0 q 0.28125,0 0.39062,0.10937 0.125,0.10938 0.125,0.28125 0,0.17188 -0.125,0.28125 -0.10937,0.10938 -0.39062,0.10938 l -2.54688,0 q -0.26562,0 -0.39062,-0.10938 -0.125,-0.10937 -0.125,-0.28125 0,-0.17187 0.125,-0.28125 0.125,-0.10937 0.39062,-0.10937 l 0.89063,0 0,-6.46875 -0.65625,0 q -0.28125,0 -0.40625,-0.10938 -0.125,-0.10937 -0.125,-0.28125 0,-0.17187 0.125,-0.28 125 0.125,-0.10937 0.40625,-0.10937 l 1.4375,0 z m 13.82373,3.40625 q 0,-1.0625 0.28125,-2.25 0.28125,-1.20313 1.0625,-2.76563 0.79687,-1.57812 1.15625,-1.90625 0.10937,-0.0937 0.23437,-0.0937 0.17188,0 0.28125,0.10938 0.125,0.10937 0.125,0.26562 0,0.0937 -0.0625,0.20313 -1.03125,1.875 -1.46875,3.40625 -0.42187,1.51562 -0.42187,3.03125 0,1.53125 0.42187,3.0625 0.4375,1.51562 1.46875,3.375 0.0625,0.125 0.0625,0.20312 0,0.17188 -0.125,0.28125 -0.10937,0.10938 -0.28125,0.10938 -0.125,0 -0.23437,-0.0937 -0.34375,-0.3125 -1.125,-1.84375 -0.78125,-1.53125 -1.07813,-2.70313 -0.29687,-1.1875 -0.29687,-2.39062 z m 11.71435,0.0156 q 0,1.0625 -0.28125,2.26563 -0.26562,1.1875 -1.0625,2.75 -0.78125,1.57812 -1.14062,1.89062 -0.10938,0.10938 -0.25,0.10938 -0.15625,0 -0.28125,-0.10938 -0.10938,-0.10937 -0.10938,-0.28125 0,-0.0781 0.0625,-0.20312 1.01563,-1.85938 1.45313,-3.375 0.4375,-1.53125 0.4375,-3.04688 0,-1.53125 -0.4375,-3.04687 -0.4375,-1.53125 -1.45313,-3.40625 -0.0625,-0.10938 -0.0625,-0. 20313 0,-0.15625 0.10938,-0.26562 0.125,-0.10938 0.28125,-0.10938 0.14062,0 0.25,0.0937 0.34375,0.32813 1.10937,1.85938 0.78125,1.51562 1.07813,2.70312 0.29687,1.17188 0.29687,2.375 z"/> - <path style="fill:#000000;fill-opacity:0;fill-rule:nonzero" inkscape:connector-curvature="0" id="path57" d="m 169.91769,54.48294 0,0 c 0,-5.24454 0.70856,-9.49606 1.58261,-9.49606 l 300.22058,0 c 0.87406,0 1.58264,-4.25153 1.58264,-9.49607 l 0,0 c 0,5.24454 0.70856,9.49607 1.58261,9.49607 l 300.2206,0 c 0.87403,0 1.58258,4.25152 1.58258,9.49606 z"/> - <path style="fill:#000000;fill-opacity:0;fill-rule:nonzero" inkscape:connector-curvature="0" id="path59" d="m 169.91769,54.48294 0,0 c 0,-5.24454 0.70856,-9.49606 1.58261,-9.49606 l 300.22058,0 c 0.87406,0 1.58264,-4.25153 1.58264,-9.49607 l 0,0 c 0,5.24454 0.70856,9.49607 1.58261,9.49607 l 300.2206,0 c 0.87403,0 1.58258,4.25152 1.58258,9.49606"/> - <path style="fill-rule:nonzero;stroke:#595959;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round" inkscape:connector-curvature="0" id="path61" d="m 169.91769,54.48294 0,0 c 0,-5.24454 0.70856,-9.49606 1.58261,-9.49606 l 300.22058,0 c 0.87406,0 1.58264,-4.25153 1.58264,-9.49607 l 0,0 c 0,5.24454 0.70856,9.49607 1.58261,9.49607 l 300.2206,0 c 0.87403,0 1.58258,4.25152 1.58258,9.49606"/> - <path style="fill:#000000;fill-opacity:0;fill-rule:nonzero" inkscape:connector-curvature="0" id="path63" d="m 374.07254,0 202.26773,0 0,28.50394 -202.26773,0 z"/> - <path style="fill:#000000;fill-rule:nonzero" inkscape:connector-curvature="0" id="path65" d="m 393.13504,17.17197 q 0,1.78125 -1.28125,3.04687 -1.28125,1.26563 -3.07812,1.26563 -1.8125,0 -3.09375,-1.26563 -1.26563,-1.28125 -1.26563,-3.04687 0,-1.78125 1.26563,-3.04688 1.28125,-1.26562 3.09375,-1.26562 1.79687,0 3.07812,1.26562 1.28125,1.25 1.28125,3.04688 z m -0.79687,0 q 0,-1.46875 -1.04688,-2.5 -1.03125,-1.03125 -2.51562,-1.03125 -1.48438,0 -2.53125,1.04687 -1.04688,1.03125 -1.04688,2.48438 0,1.45312 1.04688,2.5 1.04687,1.03125 2.53125,1.03125 1.48437,0 2.51562,-1.03125 1.04688,-1.04688 1.04688,-2.5 z m 11.65185,-7.64063 0,10.85938 1.04688,0 q 0.28125,0 0.40625,0.10937 0.125,0.10938 0.125,0.28125 0,0.17188 -0.125,0.28125 -0.125,0.10938 -0.40625,0.10938 l -1.82813,0 0,-1.54688 q -1.35937,1.85938 -3.45312,1.85938 -1.04688,0 -2.01563,-0.5625 -0.96875,-0.5625 -1.53125,-1.59375 -0.5625,-1.04688 -0.5625,-2.15625 0,-1.10938 0.5625,-2.14063 0.5625,-1.04687 1.53125,-1.60937 0.96875,-0.56 25 2.03125,-0.5625 2.04688,0 3.4375,1.85937 l 0,-4.40625 -1.04687,0 q -0.28125,0 -0.40625,-0.10937 -0.125,-0.10938 -0.125,-0.28125 0,-0.17188 0.125,-0.28125 0.125,-0.10938 0.40625,-0.10938 l 1.82812,0 z m -0.78125,7.64063 q 0,-1.48438 -1.01562,-2.5 -1,-1.03125 -2.375,-1.03125 -1.39063,0 -2.39063,1.03125 -1,1.01562 -1,2.5 0,1.46875 1,2.5 1,1.03125 2.39063,1.03125 1.375,0 2.375,-1.03125 1.01562,-1.03125 1.01562,-2.5 z m 5.43311,-4.03125 0,1.42187 q 0.6875,-0.84375 1.48437,-1.26562 0.8125,-0.4375 1.89063,-0.4375 1.15625,0 2.125,0.54687 0.96875,0.53125 1.5,1.5 0.54687,0.95313 0.54687,2 0,1.6875 -1.20312,2.89063 -1.20313,1.1875 -2.95313,1.1875 -2.09375,0 -3.39062,-1.70313 l 0,4.6875 1.89062,0 q 0.28125,0 0.39063,0.10938 0.125,0.10937 0.125,0.28125 0,0.17187 -0.125,0.28125 -0.10938,0.10937 -0.39063,0.10937 l -3.71875,0 q -0.28125,0 -0.40625,-0.10937 -0.10937,-0.0937 -0.10937,-0.28125 0,-0.17188 0.10937,-0.28125 0.125,-0.10938 0.40625,-0.10938 l 1.04688,0 0,-10.04687 -1.04688,0 q -0.28125, 0 -0.40625,-0.10938 -0.10937,-0.10937 -0.10937,-0.28125 0,-0.17187 0.10937,-0.28125 0.125,-0.10937 0.40625,-0.10937 l 1.82813,0 z m 6.75,3.76562 q 0,-1.34375 -0.98438,-2.29687 -0.96875,-0.96875 -2.375,-0.96875 -1.42187,0 -2.40625,0.96875 -0.98437,0.96875 -0.98437,2.29687 0,1.35938 0.98437,2.32813 0.98438,0.95312 2.40625,0.95312 1.39063,0 2.375,-0.95312 0.98438,-0.96875 0.98438,-2.32813 z m 12.76123,9.46875 -10.35938,0 q -0.28125,0 -0.40625,-0.10937 -0.10937,-0.10938 -0.10937,-0.28125 0,-0.17188 0.10937,-0.28125 0.125,-0.10938 0.40625,-0.10938 l 10.35938,0 q 0.29687,0 0.40625,0.10938 0.125,0.10937 0.125,0.28125 0,0.17187 -0.125,0.28125 -0.10938,0.10937 -0.40625,0.10937 z m 3.29248,-13.23437 0,1.42187 q 0.6875,-0.84375 1.48437,-1.26562 0.8125,-0.4375 1.89063,-0.4375 1.15625,0 2.125,0.54687 0.96875,0.53125 1.5,1.5 0.54687,0.95313 0.54687,2 0,1.6875 -1.20312,2.89063 -1.20313,1.1875 -2.95313,1.1875 -2.09375,0 -3.39062,-1.70313 l 0,4.6875 1.89062,0 q 0.28125,0 0.39063,0.10938 0.125,0.1093 7 0.125,0.28125 0,0.17187 -0.125,0.28125 -0.10938,0.10937 -0.39063,0.10937 l -3.71875,0 q -0.28125,0 -0.40625,-0.10937 -0.10937,-0.0937 -0.10937,-0.28125 0,-0.17188 0.10937,-0.28125 0.125,-0.10938 0.40625,-0.10938 l 1.04688,0 0,-10.04687 -1.04688,0 q -0.28125,0 -0.40625,-0.10938 -0.10937,-0.10937 -0.10937,-0.28125 0,-0.17187 0.10937,-0.28125 0.125,-0.10937 0.40625,-0.10937 l 1.82813,0 z m 6.75,3.76562 q 0,-1.34375 -0.98438,-2.29687 -0.96875,-0.96875 -2.375,-0.96875 -1.42187,0 -2.40625,0.96875 -0.98437,0.96875 -0.98437,2.29687 0,1.35938 0.98437,2.32813 0.98438,0.95312 2.40625,0.95312 1.39063,0 2.375,-0.95312 0.98438,-0.96875 0.98438,-2.32813 z m 9.82373,4.26563 0,-1.125 q -1.6875,1.4375 -3.625,1.4375 -1.40625,0 -2.1875,-0.70313 -0.78125,-0.71875 -0.78125,-1.75 0,-1.14062 1.03125,-1.98437 1.04687,-0.84375 3.03125,-0.84375 0.54687,0 1.17187,0.0781 0.625,0.0625 1.35938,0.21875 l 0,-1.26562 q 0,-0.64063 -0.59375,-1.10938 -0.59375,-0.48437 -1.78125,-0.48437 -0.90625,0 -2.54688,0.53125 -0. 29687,0.0937 -0.375,0.0937 -0.15625,0 -0.26562,-0.10938 -0.10938,-0.10937 -0.10938,-0.28125 0,-0.15625 0.0937,-0.25 0.14063,-0.14062 1.0625,-0.375 1.4375,-0.39062 2.1875,-0.39062 1.46875,0 2.29688,0.73437 0.82812,0.71875 0.82812,1.64063 l 0,5.15625 1.03125,0 q 0.29688,0 0.40625,0.10937 0.125,0.10938 0.125,0.28125 0,0.17188 -0.125,0.28125 -0.10937,0.10938 -0.40625,0.10938 l -1.82812,0 z m 0,-3.875 q -0.54688,-0.15625 -1.15625,-0.23438 -0.60938,-0.0781 -1.28125,-0.0781 -1.70313,0 -2.65625,0.73437 -0.73438,0.54688 -0.73438,1.3125 0,0.70313 0.54688,1.1875 0.5625,0.48438 1.625,0.48438 1,0 1.85937,-0.40625 0.875,-0.40625 1.79688,-1.28125 l 0,-1.71875 z m 12.41748,-3.375 0,-0.25 q 0,-0.29688 0.10937,-0.40625 0.10938,-0.125 0.28125,-0.125 0.17188,0 0.28125,0.125 0.10938,0.10937 0.10938,0.40625 l 0,1.75 q 0,0.29687 -0.10938,0.42187 -0.10937,0.10938 -0.28125,0.10938 -0.15625,0 -0.26562,-0.0937 -0.10938,-0.10938 -0.125,-0.35938 -0.0625,-0.67187 -0.875,-1.26562 -0.79688,-0.59375 -2.17188,-0.593 75 -1.73437,0 -2.64062,1.09375 -0.90625,1.07812 -0.90625,2.48437 0,1.51563 0.98437,2.5 1,0.98438 2.57813,0.98438 0.92187,0 1.85937,-0.32813 0.9375,-0.34375 1.70313,-1.09375 0.1875,-0.17187 0.34375,-0.17187 0.15625,0 0.26562,0.10937 0.10938,0.0937 0.10938,0.25 0,0.40625 -0.9375,1.01563 -1.51563,1 -3.375,1 -1.875,0 -3.09375,-1.20313 -1.20313,-1.20312 -1.20313,-3.04687 0,-1.89063 1.23438,-3.125 1.23437,-1.25 3.125,-1.25 1.78125,0 3,1.0625 z m 6.57373,3.78125 0,3.46875 -1.82813,0 q -0.28125,0 -0.40625,-0.10938 -0.125,-0.10937 -0.125,-0.28125 0,-0.17187 0.125,-0.28125 0.125,-0.10937 0.40625,-0.10937 l 1.04688,0 0,-10.07813 -1.04688,0 q -0.28125,0 -0.40625,-0.10937 -0.125,-0.10938 -0.125,-0.28125 0,-0.17188 0.125,-0.28125 0.125,-0.10938 0.40625,-0.10938 l 1.82813,0 0,7.17188 3.3125,-2.78125 -0.40625,0 q -0.28125,0 -0.40625,-0.10938 -0.10938,-0.10937 -0.10938,-0.28125 0,-0.17187 0.10938,-0.28125 0.125,-0.10937 0.40625,-0.10937 l 2.5,0 q 0.28125,0 0.40625,0.10937 0.125,0.10938 0.125,0.28125 0,0.17188 -0.125,0.28125 -0.125,0.10938 -0.40625,0.10938 l -0.90625,0 -3.04688,2.54687 3.85938,3.92188 0.89062,0 q 0.29688,0 0.40625,0.10937 0.125,0.10938 0.125,0.28125 0,0.17188 -0.125,0.28125 -0.10937,0.10938 -0.40625,0.10938 l -2.51562,0 q -0.28125,0 -0.40625,-0.10938 -0.10938,-0.10937 -0.10938,-0.28125 0,-0.17187 0.10938,-0.28125 0.125,-0.10937 0.40625,-0.10937 l 0.54687,0 -3.34375,-3.4375 -0.89062,0.75 z m 17.19876,-0.35938 -7.95316,0 q 0.21875,1.51563 1.28125,2.4375 1.0625,0.92188 2.625,0.92188 0.875,0 1.82813,-0.28125 0.95315,-0.29688 1.56253,-0.76563 0.17187,-0.14062 0.29687,-0.14062 0.15625,0 0.26563,0.125 0.10937,0.10937 0.10937,0.26562 0,0.15625 -0.15625,0.29688 -0.4375,0.46875 -1.57815,0.875 -1.14063,0.40625 -2.32813,0.40625 -2,0 -3.34375,-1.3125 -1.34375,-1.3125 -1.34375,-3.1875 0,-1.6875 1.25,-2.90625 1.26563,-1.21875 3.125,-1.21875 1.90625,0 3.14066,1.25 1.23437,1.25 1.21875,3.23437 z m -0.79688,-0.79687 q -0.23437,-1.28125 -1.21878,-2.09375 -0.98437,-0.8125 -2.34375 ,-0.8125 -1.375,0 -2.35937,0.8125 -0.96875,0.79687 -1.21875,2.09375 l 7.14065,0 z m 6.37061,-3.40625 4.23437,0 q 0.28125,0 0.39063,0.10937 0.125,0.10938 0.125,0.28125 0,0.17188 -0.125,0.28125 -0.10938,0.10938 -0.39063,0.10938 l -4.23437,0 0,5.1875 q 0,0.6875 0.54687,1.14062 0.54688,0.45313 1.59375,0.45313 0.78125,0 1.70313,-0.23438 0.92187,-0.25 1.4375,-0.54687 0.1875,-0.10938 0.29687,-0.10938 0.15625,0 0.26563,0.125 0.10937,0.10938 0.10937,0.26563 0,0.14062 -0.125,0.25 -0.29687,0.3125 -1.4375,0.67187 -1.14062,0.35938 -2.1875,0.35938 -1.375,0 -2.1875,-0.64063 -0.79687,-0.64062 -0.79687,-1.73437 l 0,-5.1875 -1.4375,0 q -0.28125,0 -0.40625,-0.10938 -0.10938,-0.10937 -0.10938,-0.28125 0,-0.17187 0.10938,-0.28125 0.125,-0.10937 0.40625,-0.10937 l 1.4375,0 0,-2.29688 q 0,-0.28125 0.10937,-0.40625 0.10938,-0.125 0.28125,-0.125 0.17188,0 0.28125,0.125 0.10938,0.125 0.10938,0.40625 l 0,2.29688 z m 18.1831,13.23437 -10.35937,0 q -0.28125,0 -0.40625,-0.10937 -0.10938,-0.10938 -0.10938,-0.2812 5 0,-0.17188 0.10938,-0.28125 0.125,-0.10938 0.40625,-0.10938 l 10.35937,0 q 0.29688,0 0.40625,0.10938 0.125,0.10937 0.125,0.28125 0,0.17187 -0.125,0.28125 -0.10937,0.10937 -0.40625,0.10937 z m 6.62061,-16.84375 0,10.85938 3.0625,0 q 0.28125,0 0.40625,0.10937 0.125,0.10938 0.125,0.28125 0,0.17188 -0.125,0.28125 -0.125,0.10938 -0.40625,0.10938 l -6.90625,0 q -0.28125,0 -0.40625,-0.10938 -0.10938,-0.10937 -0.10938,-0.28125 0,-0.17187 0.10938,-0.28125 0.125,-0.10937 0.40625,-0.10937 l 3.0625,0 0,-10.07813 -2.23438,0 q -0.28125,0 -0.40625,-0.10937 -0.125,-0.10938 -0.125,-0.28125 0,-0.17188 0.10938,-0.28125 0.125,-0.10938 0.42187,-0.10938 l 3.01563,0 z m 15.22998,7.8125 -7.95313,0 q 0.21875,1.51563 1.28125,2.4375 1.0625,0.92188 2.625,0.92188 0.875,0 1.82813,-0.28125 0.95312,-0.29688 1.5625,-0.76563 0.17187,-0.14062 0.29687,-0.14062 0.15625,0 0.26563,0.125 0.10937,0.10937 0.10937,0.26562 0,0.15625 -0.15625,0.29688 -0.4375,0.46875 -1.57812,0.875 -1.14063,0.40625 -2.32813,0.40625 -2,0 -3.34 375,-1.3125 -1.34375,-1.3125 -1.34375,-3.1875 0,-1.6875 1.25,-2.90625 1.26563,-1.21875 3.125,-1.21875 1.90625,0 3.14063,1.25 1.23437,1.25 1.21875,3.23437 z m -0.79688,-0.79687 q -0.23437,-1.28125 -1.21875,-2.09375 -0.98437,-0.8125 -2.34375,-0.8125 -1.375,0 -2.35937,0.8125 -0.96875,0.79687 -1.21875,2.09375 l 7.14062,0 z m 5.46436,-3.40625 0,1.17187 q 0.8125,-0.82812 1.46875,-1.14062 0.65625,-0.3125 1.48437,-0.3125 0.89063,0 1.625,0.375 0.51563,0.28125 0.9375,0.9375 0.42188,0.64062 0.42188,1.3125 l 0,4.90625 0.65625,0 q 0.28125,0 0.40625,0.10937 0.125,0.10938 0.125,0.28125 0,0.17188 -0.125,0.28125 -0.125,0.10938 -0.40625,0.10938 l -2.07813,0 q -0.29687,0 -0.42187,-0.10938 -0.10938,-0.10937 -0.10938,-0.28125 0,-0.17187 0.10938,-0.28125 0.125,-0.10937 0.42187,-0.10937 l 0.64063,0 0,-4.78125 q 0,-0.82813 -0.60938,-1.39063 -0.59375,-0.57812 -1.60937,-0.57812 -0.76563,0 -1.32813,0.3125 -0.5625,0.3125 -1.60937,1.54687 l 0,4.89063 0.875,0 q 0.28125,0 0.39062,0.10937 0.125,0.10938 0.125,0.281 25 0,0.17188 -0.125,0.28125 -0.10937,0.10938 -0.39062,0.10938 l -2.54688,0 q -0.26562,0 -0.39062,-0.10938 -0.125,-0.10937 -0.125,-0.28125 0,-0.17187 0.125,-0.28125 0.125,-0.10937 0.39062,-0.10937 l 0.89063,0 0,-6.46875 -0.65625,0 q -0.28125,0 -0.40625,-0.10938 -0.125,-0.10937 -0.125,-0.28125 0,-0.17187 0.125,-0.28125 0.125,-0.10937 0.40625,-0.10937 l 1.4375,0 z m 13.82373,3.40625 q 0,-1.0625 0.28125,-2.25 0.28125,-1.20313 1.0625,-2.76563 0.79687,-1.57812 1.15625,-1.90625 0.10937,-0.0937 0.23437,-0.0937 0.17188,0 0.28125,0.10938 0.125,0.10937 0.125,0.26562 0,0.0937 -0.0625,0.20313 -1.03125,1.875 -1.46875,3.40625 -0.42187,1.51562 -0.42187,3.03125 0,1.53125 0.42187,3.0625 0.4375,1.51562 1.46875,3.375 0.0625,0.125 0.0625,0.20312 0,0.17188 -0.125,0.28125 -0.10937,0.10938 -0.28125,0.10938 -0.125,0 -0.23437,-0.0937 -0.34375,-0.3125 -1.125,-1.84375 -0.78125,-1.53125 -1.07813,-2.70313 -0.29687,-1.1875 -0.29687,-2.39062 z m 11.71435,0.0156 q 0,1.0625 -0.28125,2.26563 -0.26562,1.1875 -1.0625,2 .75 -0.78125,1.57812 -1.14062,1.89062 -0.10938,0.10938 -0.25,0.10938 -0.15625,0 -0.28125,-0.10938 -0.10938,-0.10937 -0.10938,-0.28125 0,-0.0781 0.0625,-0.20312 1.01563,-1.85938 1.45313,-3.375 0.4375,-1.53125 0.4375,-3.04688 0,-1.53125 -0.4375,-3.04687 -0.4375,-1.53125 -1.45313,-3.40625 -0.0625,-0.10938 -0.0625,-0.20313 0,-0.15625 0.10938,-0.26562 0.125,-0.10938 0.28125,-0.10938 0.14062,0 0.25,0.0937 0.34375,0.32813 1.10937,1.85938 0.78125,1.51562 1.07813,2.70312 0.29687,1.17188 0.29687,2.375 z"/> -</svg> diff --git a/doc/users-guide/users-guide-packet.adoc b/doc/users-guide/users-guide-packet.adoc index d5f2ff19..6d9e98a5 100644 --- a/doc/users-guide/users-guide-packet.adoc +++ b/doc/users-guide/users-guide-packet.adoc @@ -473,32 +473,16 @@ reliability, the shared data contained in any packet referred to by references should be treated as read only once it has been successfully referenced until it is known that all references to it have been freed. -To assist applications in working with references, ODP provides two additional -APIs: +To assist applications in working with references, ODP provides the additional +API: [source,c] ----- int odp_packet_has_ref(odp_packet_t pkt); - -uint32_t odp_packet_unshared_len(odp_packet_t pkt); ----- The `odp_packet_has_ref()` API says whether any other packets exist that share any bytes with this packet. -Because references and referenced packets consist of an unshared -prefix, that is modifiable, followed by a shared body that should not be -modified, the `odp_packet_unshared_len()` API is available that operates as -shown here: - -.Packet Reference Lengths -image::reflen.svg[align="center"] - -`odp_packet_unshared_len()` returns the same value as `odp_packet_len()` when -`odp_packet_has_ref()` returns 0, but for packets for which -`odp_packet_has_ref()` returns 1, only returns the number of unshared bytes -prefixed to them. To ensure portability and reliability, only offsets -0..`odp_packet_unshared_len()`-1 should be modified by the caller. - ===== Compound References Note that architecturally ODP does not limit referencing and so it is possible that a reference may be used as a basis for creating another reference. The @@ -509,11 +493,7 @@ As noted earlier, the intent behind references is that they are lightweight objects that can be implemented without requiring data copies. The existence of compound references may complicate this goal for some implementations. As a result, implementations are always free to perform partial or full copies of -packets as part of any reference creation call. The -`odp_packet_unshared_len()` API will always provide an authoritative answer to -the question of how many bytes of a packet may safely be modified in any -context, so whether or not copies have been performed applications can be -assured of portability across all conforming ODP implementations. +packets as part of any reference creation call. Note also that a packet may not reference itself, nor may circular reference relationships be formed, _e.g.,_ packet A is used as a header for a reference commit 774b652640be4ab7147db0a337f84ce8d602b665 Author: Bill Fischofer <bill.fischofer(a)linaro.org> Date: Thu Oct 5 15:34:45 2017 -0500 api: packet: remove odp_packet_unshared_len() Signed-off-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Nikhil Agarwal <nikhil.agarwal(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/include/odp/api/spec/packet.h b/include/odp/api/spec/packet.h index 7f5eec10..bc7cd0ba 100644 --- a/include/odp/api/spec/packet.h +++ b/include/odp/api/spec/packet.h @@ -955,25 +955,6 @@ odp_packet_t odp_packet_ref(odp_packet_t pkt, uint32_t offset); odp_packet_t odp_packet_ref_pkt(odp_packet_t pkt, uint32_t offset, odp_packet_t hdr); -/** - * Packet unshared data length - * - * When a packet has multiple references, packet data is divided into two - * parts: unshared and shared. The unshared part always precedes the shared - * part. This call returns number of bytes in the unshared part. When a - * packet has only a single reference (see odp_packet_has_ref()), all packet - * data is unshared and unshared length equals the packet length - * (odp_packet_len()). - * - * Application may modify only the unshared part, the rest of the packet data - * must be treated as read only. - * - * @param pkt Packet handle - * - * @return Packet unshared data length - */ -uint32_t odp_packet_unshared_len(odp_packet_t pkt); - /** * Test if packet has multiple references * commit 8999344484a2c3b4c08b84c5b27e2b355fa312d5 Author: Bill Fischofer <bill.fischofer(a)linaro.org> Date: Thu Oct 5 15:34:27 2017 -0500 linux-generic: packet: remove odp_packet_unshared_len() implementation Signed-off-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Nikhil Agarwal <nikhil.agarwal(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/include/odp_packet_internal.h b/platform/linux-generic/include/odp_packet_internal.h index 3b3dec95..89fb34b6 100644 --- a/platform/linux-generic/include/odp_packet_internal.h +++ b/platform/linux-generic/include/odp_packet_internal.h @@ -124,7 +124,6 @@ typedef struct { odp_pktio_t input; uint32_t frame_len; - uint32_t shared_len; uint16_t headroom; uint16_t tailroom; @@ -225,7 +224,6 @@ static inline void packet_init(odp_packet_hdr_t *pkt_hdr, uint32_t len) * segment occupied by the allocated length. */ pkt_hdr->frame_len = len; - pkt_hdr->shared_len = 0; pkt_hdr->headroom = CONFIG_PACKET_HEADROOM; pkt_hdr->tailroom = pool->seg_len - seg_len + CONFIG_PACKET_TAILROOM; diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index 87282639..68a6eef5 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -504,7 +504,6 @@ static inline odp_packet_hdr_t *add_segments(odp_packet_hdr_t *pkt_hdr, new_hdr->frame_len = pkt_hdr->frame_len + len; new_hdr->headroom = pool->headroom + offset; new_hdr->tailroom = pkt_hdr->tailroom; - new_hdr->shared_len = pkt_hdr->shared_len; pkt_hdr = new_hdr; } else { @@ -708,7 +707,6 @@ static inline odp_packet_hdr_t *free_segments(odp_packet_hdr_t *pkt_hdr, new_hdr->headroom = seg_headroom(new_hdr, 0); new_hdr->frame_len = pkt_hdr->frame_len - free_len; - new_hdr->shared_len = pkt_hdr->shared_len; pull_head(new_hdr, pull_len); @@ -2196,7 +2194,6 @@ odp_packet_t odp_packet_ref_static(odp_packet_t pkt) odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); packet_ref_inc(pkt_hdr); - pkt_hdr->shared_len = pkt_hdr->frame_len; return pkt; } @@ -2279,16 +2276,12 @@ odp_packet_t odp_packet_ref(odp_packet_t pkt, uint32_t offset) link_hdr->buf_hdr.segcount = segcount - seg_idx; link_hdr->frame_len = len; link_hdr->tailroom = pkt_hdr->tailroom; - link_hdr->shared_len = len; /* Link header does not have headroom, it just points to other * buffers. Zero length headroom ensures that head of the other buffer * is not pushed through a reference. */ link_hdr->headroom = 0; - if (pkt_hdr->shared_len < len) - pkt_hdr->shared_len = len; - return ref; } @@ -2298,9 +2291,6 @@ odp_packet_t odp_packet_ref_pkt(odp_packet_t pkt, uint32_t offset, { odp_packet_t ref; int ret; - odp_packet_hdr_t *new_hdr; - odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); - uint32_t len = pkt_hdr->frame_len; ref = odp_packet_ref(pkt, offset); @@ -2317,11 +2307,7 @@ odp_packet_t odp_packet_ref_pkt(odp_packet_t pkt, uint32_t offset, return ODP_PACKET_INVALID; } - new_hdr = packet_hdr(hdr); - new_hdr->shared_len = len - offset; - return hdr; - } int odp_packet_has_ref(odp_packet_t pkt) @@ -2347,17 +2333,6 @@ int odp_packet_has_ref(odp_packet_t pkt) return 0; } -uint32_t odp_packet_unshared_len(odp_packet_t pkt) -{ - odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); - uint32_t len = pkt_hdr->frame_len; - - if (odp_packet_has_ref(pkt)) - return len - pkt_hdr->shared_len; - - return len; -} - /* Include non-inlined versions of API functions */ #if ODP_ABI_COMPAT == 1 #include <odp/api/plat/packet_inlines_api.h> commit e475a06dba8b79eace4131ea7327e87a10546351 Author: Bill Fischofer <bill.fischofer(a)linaro.org> Date: Thu Oct 5 15:33:53 2017 -0500 test: packet: remove references to odp_packet_unshared_len() Signed-off-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Nikhil Agarwal <nikhil.agarwal(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/performance/odp_bench_packet.c b/test/performance/odp_bench_packet.c index 622245ff..29539e0e 100644 --- a/test/performance/odp_bench_packet.c +++ b/test/performance/odp_bench_packet.c @@ -1267,17 +1267,6 @@ static int bench_packet_ref_pkt(void) return i; } -static int bench_packet_unshared_len(void) -{ - int i; - uint32_t ret = 0; - - for (i = 0; i < TEST_REPEAT_COUNT; i++) - ret += odp_packet_unshared_len(gbl_args->pkt_tbl[i]); - - return ret; -} - static int bench_packet_has_ref(void) { int i; @@ -1517,8 +1506,6 @@ bench_info_t test_suite[] = { free_packets_twice, NULL), BENCH_INFO(bench_packet_ref_pkt, alloc_packets_twice, free_packets_twice, NULL), - BENCH_INFO(bench_packet_unshared_len, alloc_ref_packets, - free_packets_twice, NULL), BENCH_INFO(bench_packet_has_ref, alloc_ref_packets, free_packets_twice, NULL), }; diff --git a/test/validation/api/packet/packet.c b/test/validation/api/packet/packet.c index 5e5626a3..9318dfc7 100644 --- a/test/validation/api/packet/packet.c +++ b/test/validation/api/packet/packet.c @@ -1496,7 +1496,6 @@ void packet_test_concat_extend_trunc(void) CU_ASSERT(odp_packet_len(pkt) == (cur_len + alloc_len)); cur_len = odp_packet_len(pkt); - CU_ASSERT(cur_len == odp_packet_unshared_len(pkt)); } ret = odp_packet_extend_tail(&pkt, ext_len, NULL, NULL); @@ -1504,14 +1503,12 @@ void packet_test_concat_extend_trunc(void) CU_ASSERT(odp_packet_len(pkt) == (cur_len + ext_len)); cur_len = odp_packet_len(pkt); - CU_ASSERT(cur_len == odp_packet_unshared_len(pkt)); ret = odp_packet_extend_head(&pkt, ext_len, NULL, NULL); CU_ASSERT(ret >= 0); CU_ASSERT(odp_packet_len(pkt) == (cur_len + ext_len)); cur_len = odp_packet_len(pkt); - CU_ASSERT(cur_len == odp_packet_unshared_len(pkt)); pkt2 = odp_packet_alloc(pool, alloc_len); CU_ASSERT_FATAL(pkt2 != ODP_PACKET_INVALID); @@ -1524,21 +1521,18 @@ void packet_test_concat_extend_trunc(void) CU_ASSERT(odp_packet_len(pkt) == (cur_len + alloc_len)); cur_len = odp_packet_len(pkt); - CU_ASSERT(cur_len == odp_packet_unshared_len(pkt)); ret = odp_packet_trunc_head(&pkt, trunc_len, NULL, NULL); CU_ASSERT(ret >= 0); CU_ASSERT(odp_packet_len(pkt) == (cur_len - trunc_len)); cur_len = odp_packet_len(pkt); - CU_ASSERT(cur_len == odp_packet_unshared_len(pkt)); ret = odp_packet_trunc_tail(&pkt, trunc_len, NULL, NULL); CU_ASSERT(ret >= 0); CU_ASSERT(odp_packet_len(pkt) == (cur_len - trunc_len)); cur_len = odp_packet_len(pkt); - CU_ASSERT(cur_len == odp_packet_unshared_len(pkt)); odp_packet_free(pkt); @@ -1606,7 +1600,6 @@ void packet_test_extend_small(void) } CU_ASSERT(odp_packet_len(pkt) == len); - CU_ASSERT(odp_packet_unshared_len(pkt) == len); len = odp_packet_len(pkt); @@ -1902,7 +1895,6 @@ void packet_test_extend_ref(void) NULL, NULL) >= 0); CU_ASSERT(odp_packet_extend_head(&max_pkt, 1, NULL, NULL) >= 0); CU_ASSERT(odp_packet_len(max_pkt) == max_len); - CU_ASSERT(odp_packet_unshared_len(max_pkt) == max_len); /* Now try with a reference in place */ CU_ASSERT(odp_packet_trunc_tail(&max_pkt, 100, NULL, NULL) >= 0); @@ -1912,75 +1904,37 @@ void packet_test_extend_ref(void) CU_ASSERT(ref != ODP_PACKET_INVALID); CU_ASSERT(odp_packet_len(ref) == max_len - 200); if (odp_packet_has_ref(ref) == 1) { - CU_ASSERT(odp_packet_unshared_len(ref) == 0); - /* And ref's affect on max_pkt */ CU_ASSERT(odp_packet_has_ref(max_pkt) == 1); - CU_ASSERT(odp_packet_unshared_len(max_pkt) == 100); - } else { - CU_ASSERT(odp_packet_unshared_len(ref) == odp_packet_len(ref)); - CU_ASSERT(odp_packet_unshared_len(max_pkt) == - odp_packet_len(max_pkt)); } /* Now extend max_pkt and verify effect */ CU_ASSERT(odp_packet_extend_head(&max_pkt, 10, NULL, NULL) >= 0); CU_ASSERT(odp_packet_len(max_pkt) == max_len - 90); - if (odp_packet_has_ref(max_pkt) == 1) { - /* CU_ASSERT needs braces */ - CU_ASSERT(odp_packet_unshared_len(max_pkt) == 110); - } - /* Extend on max_pkt should not affect ref */ CU_ASSERT(odp_packet_len(ref) == max_len - 200); - if (odp_packet_has_ref(ref) == 1) { - /* CU_ASSERT needs braces */ - CU_ASSERT(odp_packet_unshared_len(ref) == 0); - } - /* Now extend ref and verify effect*/ CU_ASSERT(odp_packet_extend_head(&ref, 20, NULL, NULL) >= 0); CU_ASSERT(odp_packet_len(ref) == max_len - 180); - if (odp_packet_has_ref(ref) == 1) { - /* CU_ASSERT needs braces */ - CU_ASSERT(odp_packet_unshared_len(ref) == 20); - } - /* Extend on ref should not affect max_pkt */ CU_ASSERT(odp_packet_len(max_pkt) == max_len - 90); - if (odp_packet_has_ref(max_pkt) == 1) { - /* CU_ASSERT needs braces */ - CU_ASSERT(odp_packet_unshared_len(max_pkt) == 110); - } - /* Trunc max_pkt of all unshared len */ CU_ASSERT(odp_packet_trunc_head(&max_pkt, 110, NULL, NULL) >= 0); /* Verify effect on max_pkt */ CU_ASSERT(odp_packet_len(max_pkt) == max_len - 200); - if (odp_packet_has_ref(max_pkt) == 1) { - /* CU_ASSERT needs braces */ - CU_ASSERT(odp_packet_unshared_len(max_pkt) == 0); - } - /* Verify that ref is unchanged */ CU_ASSERT(odp_packet_len(ref) == max_len - 180); - if (odp_packet_has_ref(ref) == 1) { - /* CU_ASSERT needs braces */ - CU_ASSERT(odp_packet_unshared_len(ref) == 20); - } - /* Free ref and verify that max_pkt is back to being unreferenced */ odp_packet_free(ref); CU_ASSERT(odp_packet_has_ref(max_pkt) == 0); CU_ASSERT(odp_packet_len(max_pkt) == max_len - 200); - CU_ASSERT(odp_packet_unshared_len(max_pkt) == max_len - 200); odp_packet_free(max_pkt); } @@ -2192,7 +2146,7 @@ void packet_test_ref(void) odp_packet_free(pkt); odp_packet_free(pkt3); - /* Test has_ref, unshared_len, lengths, etc */ + /* Test has_ref, lengths, etc */ base_pkt = odp_packet_copy(test_packet, odp_packet_pool(test_packet)); CU_ASSERT_FATAL(base_pkt != ODP_PACKET_INVALID); base_hr = odp_packet_headroom(base_pkt); @@ -2239,8 +2193,6 @@ void packet_test_ref(void) /* Nothing is a ref or has a ref before we start */ for (i = 0; i < 4; i++) { CU_ASSERT(odp_packet_has_ref(hdr_pkt[i]) == 0); - CU_ASSERT(odp_packet_len(hdr_pkt[i]) == - odp_packet_unshared_len(hdr_pkt[i])); } /* Create a couple of refs */ @@ -2255,10 +2207,6 @@ void packet_test_ref(void) if (odp_packet_has_ref(base_pkt) == 1) { CU_ASSERT(odp_packet_has_ref(refhdr_pkt[0]) == 1); CU_ASSERT(odp_packet_has_ref(refhdr_pkt[1]) == 1); - - CU_ASSERT(odp_packet_unshared_len(base_pkt) == 0); - } else { - CU_ASSERT(odp_packet_unshared_len(base_pkt) == pkt_len); } CU_ASSERT(odp_packet_len(refhdr_pkt[0]) == @@ -2266,20 +2214,6 @@ void packet_test_ref(void) CU_ASSERT(odp_packet_len(refhdr_pkt[1]) == hdr_len[1] + pkt_len - offset[1]); - if (odp_packet_has_ref(refhdr_pkt[0]) == 1) { - CU_ASSERT(odp_packet_unshared_len(refhdr_pkt[0]) == hdr_len[0]); - } else { - CU_ASSERT(odp_packet_unshared_len(refhdr_pkt[0]) == - odp_packet_len(refhdr_pkt[0])); - } - - if (odp_packet_has_ref(refhdr_pkt[1]) == 1) { - CU_ASSERT(odp_packet_unshared_len(refhdr_pkt[1]) == hdr_len[1]); - } else { - CU_ASSERT(odp_packet_unshared_len(refhdr_pkt[1]) == - odp_packet_len(refhdr_pkt[1])); - } - packet_compare_offset(refhdr_pkt[0], hdr_len[0], base_pkt, offset[0], pkt_len - offset[0]); @@ -2298,8 +2232,6 @@ void packet_test_ref(void) if (odp_packet_has_ref(refhdr_pkt[2]) == 1) { CU_ASSERT(odp_packet_has_ref(refhdr_pkt[0]) == 1); - CU_ASSERT(odp_packet_unshared_len(refhdr_pkt[2]) == hdr_len[2]); - CU_ASSERT(odp_packet_unshared_len(refhdr_pkt[0]) == 2); } /* Delete the refs */ @@ -2342,13 +2274,6 @@ void packet_test_ref(void) if (odp_packet_has_ref(base_pkt) == 1) { CU_ASSERT(odp_packet_has_ref(ref_pkt[0]) == 1); - CU_ASSERT(odp_packet_unshared_len(base_pkt) == 0); - CU_ASSERT(odp_packet_unshared_len(ref_pkt[0]) == 0); - } else { - CU_ASSERT(odp_packet_unshared_len(base_pkt) == - odp_packet_len(base_pkt)); - CU_ASSERT(odp_packet_unshared_len(ref_pkt[0]) == - odp_packet_len(ref_pkt[0])); } CU_ASSERT(odp_packet_len(ref_pkt[0]) == odp_packet_len(base_pkt)); @@ -2380,16 +2305,6 @@ void packet_test_ref(void) CU_ASSERT(odp_packet_len(ref_pkt[0]) == segmented_pkt_len - offset[0]); CU_ASSERT(odp_packet_len(ref_pkt[1]) == segmented_pkt_len - offset[1]); - if (odp_packet_has_ref(ref_pkt[0]) == 1) { - /* CU_ASSERT needs braces */ - CU_ASSERT(odp_packet_unshared_len(ref_pkt[0]) == 0); - } - - if (odp_packet_has_ref(ref_pkt[1]) == 1) { - /* CU_ASSERT needs braces */ - CU_ASSERT(odp_packet_unshared_len(ref_pkt[1]) == 0); - } - /* Free the base pkts -- references should still be valid */ odp_packet_free(base_pkt); odp_packet_free(segmented_base_pkt); @@ -2407,34 +2322,16 @@ void packet_test_ref(void) CU_ASSERT(odp_packet_push_head(ref_pkt[0], hr[0]) != NULL); - if (odp_packet_has_ref(ref_pkt[0]) == 1) { - /* CU_ASSERT needs braces */ - CU_ASSERT(odp_packet_unshared_len(ref_pkt[0]) == hr[0]); - } - CU_ASSERT(odp_packet_len(ref_pkt[0]) == hr[0] + segmented_pkt_len - offset[0]); CU_ASSERT(odp_packet_pull_head(ref_pkt[0], hr[0] / 2) != NULL); - if (odp_packet_has_ref(ref_pkt[0]) == 1) { - CU_ASSERT(odp_packet_unshared_len(ref_pkt[0]) == - hr[0] - (hr[0] / 2)); - } - if (hr[1] > 0) { CU_ASSERT(odp_packet_push_head(ref_pkt[1], 1) != NULL); - if (odp_packet_has_ref(ref_pkt[1]) == 1) { - /* CU_ASSERT needs braces */ - CU_ASSERT(odp_packet_unshared_len(ref_pkt[1]) == 1); - } CU_ASSERT(odp_packet_len(ref_pkt[1]) == 1 + segmented_pkt_len - offset[1]); CU_ASSERT(odp_packet_pull_head(ref_pkt[1], 1) != NULL); - if (odp_packet_has_ref(ref_pkt[1]) == 1) { - /* CU_ASSERT needs braces */ - CU_ASSERT(odp_packet_unshared_len(ref_pkt[1]) == 0); - } CU_ASSERT(odp_packet_len(ref_pkt[1]) == segmented_pkt_len - offset[1]); } @@ -2450,67 +2347,24 @@ void packet_test_ref(void) ref_len[1] = odp_packet_len(ref_pkt[1]); CU_ASSERT(ref_len[1] == odp_packet_len(base_pkt) - offset[1]); - if (odp_packet_has_ref(ref_pkt[1]) == 1) { - /* CU_ASSERT needs braces */ - CU_ASSERT(odp_packet_unshared_len(ref_pkt[1]) == 0); - } - CU_ASSERT(odp_packet_push_head(base_pkt, base_hr / 2) != NULL); - if (odp_packet_has_ref(base_pkt) == 1) { - CU_ASSERT(odp_packet_unshared_len(base_pkt) == - base_hr / 2 + offset[1]); - } CU_ASSERT(odp_packet_len(ref_pkt[1]) == ref_len[1]); - if (odp_packet_has_ref(ref_pkt[1]) == 1) { - /* CU_ASSERT needs braces */ - CU_ASSERT(odp_packet_unshared_len(ref_pkt[1]) == 0); - } ref_pkt[0] = odp_packet_ref(base_pkt, offset[0]); CU_ASSERT_FATAL(ref_pkt[0] != ODP_PACKET_INVALID); ref_len[0] = odp_packet_len(ref_pkt[0]); CU_ASSERT(ref_len[0] = odp_packet_len(base_pkt) - offset[0]); - if (odp_packet_has_ref(ref_pkt[0]) == 1) { - /* CU_ASSERT needs braces */ - CU_ASSERT(odp_packet_unshared_len(ref_pkt[0]) == 0); - } CU_ASSERT(odp_packet_push_head(base_pkt, base_hr - base_hr / 2) != NULL); - if (odp_packet_has_ref(base_pkt) == 1) { - CU_ASSERT(odp_packet_unshared_len(base_pkt) == - base_hr - base_hr / 2 + offset[0]); - } CU_ASSERT(odp_packet_len(ref_pkt[1]) == ref_len[1]); CU_ASSERT(odp_packet_len(ref_pkt[0]) == ref_len[0]); - if (odp_packet_has_ref(ref_pkt[1]) == 1) { - /* CU_ASSERT needs braces */ - CU_ASSERT(odp_packet_unshared_len(ref_pkt[1]) == 0); - } - if (odp_packet_has_ref(ref_pkt[0]) == 1) { - /* CU_ASSERT needs braces */ - CU_ASSERT(odp_packet_unshared_len(ref_pkt[0]) == 0); - } - hr[0] = odp_packet_headroom(ref_pkt[0]); hr[1] = odp_packet_headroom(ref_pkt[1]); CU_ASSERT(odp_packet_push_head(ref_pkt[0], hr[0]) != NULL); CU_ASSERT(odp_packet_push_head(ref_pkt[1], hr[1]) != NULL); - if (odp_packet_has_ref(ref_pkt[0]) == 1) { - /* CU_ASSERT needs braces */ - CU_ASSERT(odp_packet_unshared_len(ref_pkt[0]) == hr[0]); - } - if (odp_packet_has_ref(ref_pkt[1]) == 1) { - /* CU_ASSERT needs braces */ - CU_ASSERT(odp_packet_unshared_len(ref_pkt[1]) == hr[1]); - } - if (odp_packet_has_ref(base_pkt) == 1) { - /* CU_ASSERT needs braces */ - CU_ASSERT(odp_packet_unshared_len(base_pkt) == - base_hr - base_hr / 2 + offset[0]); - } odp_packet_free(base_pkt); odp_packet_free(ref_pkt[0]); commit c5fbca288838d39f3f6434d381acb25f12c1dc9e Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Thu Sep 14 15:02:51 2017 +0300 api: timer: refine timer pool param documentation Specify explicitly what each timer pool parameter means. This does not change the intended use of the parameters. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/include/odp/api/spec/timer.h b/include/odp/api/spec/timer.h index 75f9db98..d846618f 100644 --- a/include/odp/api/spec/timer.h +++ b/include/odp/api/spec/timer.h @@ -99,12 +99,36 @@ typedef enum { * Timer pool parameters are used when creating and querying timer pools. */ typedef struct { - uint64_t res_ns; /**< Timeout resolution in nanoseconds */ - uint64_t min_tmo; /**< Minimum relative timeout in nanoseconds */ - uint64_t max_tmo; /**< Maximum relative timeout in nanoseconds */ - uint32_t num_timers; /**< (Minimum) number of supported timers */ - int priv; /**< Shared (false) or private (true) timer pool */ - odp_timer_clk_src_t clk_src; /**< Clock source for timers */ + /** Timeout resolution in nanoseconds. Timer pool must serve timeouts + * with this or higher resolution. The minimum valid value (highest + * resolution) is defined by timer capability 'highest_res_ns'. */ + uint64_t res_ns; + + /** Minimum relative timeout in nanoseconds. All requested timeouts + * will be at least this many nanoseconds after the current + * time of the timer pool. Timer set functions return an error, if too + * short timeout was requested. The value may be also less than + * 'res_ns'. */ + uint64_t min_tmo; + + /** Maximum relative timeout in nanoseconds. All requested timeouts + * will be at most this many nanoseconds after the current + * time of the timer pool. Timer set functions return an error, if too + * long timeout was requested. */ + uint64_t max_tmo; + + /** Number of timers needed. Application will create in maximum this + * many concurrent timers from the timer pool. */ + uint32_t num_timers; + + /** Thread private timer pool. When zero, multiple thread may use the + * timer pool concurrently. When non-zero, only single thread uses the + * timer pool (concurrently). */ + int priv; + + /** Clock source for timers */ + odp_timer_clk_src_t clk_src; + } odp_timer_pool_param_t; /** commit 22921366d8a2f9155d43f7022d645c6d364c8b58 Author: Mykyta Iziumtsev <mykyta.iziumtsev(a)linaro.org> Date: Wed Oct 4 12:02:55 2017 +0200 api: fixing typos Signed-off-by: Mykyta Iziumtsev <mykyta.iziumtsev(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/include/odp/api/spec/packet.h b/include/odp/api/spec/packet.h index c7775d02..7f5eec10 100644 --- a/include/odp/api/spec/packet.h +++ b/include/odp/api/spec/packet.h @@ -904,7 +904,7 @@ odp_packet_t odp_packet_ref_static(odp_packet_t pkt); * dynamic references must not be mixed. Results are undefined if these * restrictions are not observed. * - * The packet handle 'pkt' may itself by a (dynamic) reference to a packet. + * The packet handle 'pkt' may itself be a (dynamic) reference to a packet. * * If the caller does not intend to modify either the packet or the new * reference to it, odp_packet_ref_static() may be used to create @@ -931,7 +931,7 @@ odp_packet_t odp_packet_ref(odp_packet_t pkt, uint32_t offset); * packet consists metadata and data of the 'hdr' packet, followed by the * shared part of packet 'pkt'. * - * The packet handle ('pkt') may itself by a (dynamic) reference to a packet, + * The packet handle ('pkt') may itself be a (dynamic) reference to a packet, * but the header packet handle ('hdr') must be unique. Both packets must be * have been allocated from the same pool and the handles must not refer to * the same packet. Results are undefined if these restrictions are not diff --git a/include/odp/api/spec/traffic_mngr.h b/include/odp/api/spec/traffic_mngr.h index 3a748cef..c9134e8e 100644 --- a/include/odp/api/spec/traffic_mngr.h +++ b/include/odp/api/spec/traffic_mngr.h @@ -75,7 +75,7 @@ extern "C" { /** * @def ODP_TM_MAX_TM_QUEUES - * The largest number of tm_queues that can handled by any one TM system. + * The largest number of tm_queues that can be handled by any one TM system. */ /** @@ -97,7 +97,7 @@ extern "C" { /** * @def ODP_TM_MIN_SHAPER_BW - * The largest amount of bandwidth that any shaper's peak or commit rate can + * The lowest amount of bandwidth that any shaper's peak or commit rate can * be set to. It is in units of 1000 bytes/second. */ @@ -143,7 +143,7 @@ extern "C" { /** * @typedef odp_tm_node_t - * Each odp_tm_queue_t value is an opaque ODP handle representing a specific + * Each odp_tm_node_t value is an opaque ODP handle representing a specific * tm node within a specific TM system. */ commit 0278905b45145a168f5b63afa0dbf0be30e808be Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Wed Oct 25 13:35:32 2017 +0300 validation: packet: add packet_print_data test Test the new packet payload print function with couple of lengths and offsets. Added line feeds to separate packet print output from CUnit prints. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Ilias Apalodimas <ilias.apalodimas(a)linaro.org> Reviewed-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/packet/packet.c b/test/validation/api/packet/packet.c index bf8f5f44..5e5626a3 100644 --- a/test/validation/api/packet/packet.c +++ b/test/validation/api/packet/packet.c @@ -535,7 +535,10 @@ void packet_test_prefetch(void) void packet_test_debug(void) { CU_ASSERT(odp_packet_is_valid(test_packet) == 1); + printf("\n\n"); odp_packet_print(test_packet); + odp_packet_print_data(test_packet, 0, 100); + odp_packet_print_data(test_packet, 14, 20); } void packet_test_context(void) @@ -2179,7 +2182,10 @@ void packet_test_ref(void) packet_compare_data(pkt3, ref2); /* Try print function on a reference */ + printf("\n\n"); odp_packet_print(ref2); + odp_packet_print_data(ref2, 0, 100); + odp_packet_print_data(ref2, 14, 20); odp_packet_free(ref); odp_packet_free(ref2); commit da0198f610f10c8af2c19eb4148001d1759eb401 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Wed Oct 25 13:29:55 2017 +0300 linux-gen: packet: implement odp_packet_data_print Implemented the new packet payload print function using ODP_PRINT macro. Removed an extra space from the print macro as well as extra null char and line feed from odp_packet_print. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Ilias Apalodimas <ilias.apalodimas(a)linaro.org> Reviewed-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/include/odp_debug_internal.h b/platform/linux-generic/include/odp_debug_internal.h index 02ae87a9..4c44bebe 100644 --- a/platform/linux-generic/include/odp_debug_internal.h +++ b/platform/linux-generic/include/odp_debug_internal.h @@ -81,7 +81,7 @@ extern "C" { * specifically for dumping internal data. */ #define ODP_PRINT(fmt, ...) \ - odp_global_data.log_fn(ODP_LOG_PRINT, " " fmt, ##__VA_ARGS__) + odp_global_data.log_fn(ODP_LOG_PRINT, fmt, ##__VA_ARGS__) #ifdef __cplusplus } diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index 89bae362..87282639 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -1751,9 +1751,68 @@ void odp_packet_print(odp_packet_t pkt) seg = odp_packet_next_seg(pkt, seg); } - str[len] = '\0'; + ODP_PRINT("%s\n", str); +} + +void odp_packet_print_data(odp_packet_t pkt, uint32_t offset, + uint32_t byte_len) +{ + odp_packet_hdr_t *hdr = packet_hdr(pkt); + uint32_t bytes_per_row = 16; + int num_rows = (byte_len + bytes_per_row - 1) / bytes_per_row; + int max_len = 256 + (3 * byte_len) + (3 * num_rows); + char str[max_len]; + int len = 0; + int n = max_len - 1; + uint32_t data_len = odp_packet_len(pkt); + pool_t *pool = hdr->buf_hdr.pool_ptr; + + len += snprintf(&str[len], n - len, "Packet\n------\n"); + len += snprintf(&str[len], n - len, + " pool index %" PRIu32 "\n", pool->pool_idx); + len += snprintf(&str[len], n - len, + " buf index %" PRIu32 "\n", hdr->buf_hdr.index); + len += snprintf(&str[len], n - len, + " segcount %" PRIu16 "\n", hdr->buf_hdr.segcount); + len += snprintf(&str[len], n - len, + " data len %" PRIu32 "\n", data_len); + len += snprintf(&str[len], n - len, + " data ptr %p\n", odp_packet_data(pkt)); + len += snprintf(&str[len], n - len, + " print offset %" PRIu32 "\n", offset); + len += snprintf(&str[len], n - len, + " print length %" PRIu32 "\n", byte_len); + + if (offset + byte_len > data_len) { + len += snprintf(&str[len], n - len, " BAD OFFSET OR LEN\n"); + ODP_PRINT("%s\n", str); + return; + } + + while (byte_len) { + uint32_t copy_len; + uint8_t data[bytes_per_row]; + uint32_t i; + + if (byte_len > bytes_per_row) + copy_len = bytes_per_row; + else + copy_len = byte_len; + + odp_packet_copy_to_mem(pkt, offset, copy_len, data); + + len += snprintf(&str[len], n - len, " "); + + for (i = 0; i < copy_len; i++) + len += snprintf(&str[len], n - len, " %02x", data[i]); + + len += snprintf(&str[len], n - len, "\n"); + + byte_len -= copy_len; + offset += copy_len; + } - ODP_PRINT("\n%s\n", str); + ODP_PRINT("%s\n", str); } int odp_packet_is_valid(odp_packet_t pkt) commit 6b24e0905df12ba075d86e471a48035f6c7b91ef Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Tue Oct 24 14:32:01 2017 +0300 api: packet: print packet data Added debug print function which includes packet payload bytes. Printing starts from offset, so it's easy to e.g. limit print to IPv4 header bytes only: odp_packet_print_data(pkt, l3_offset(pkt), 20) Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Ilias Apalodimas <ilias.apalodimas(a)linaro.org> Reviewed-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/include/odp/api/spec/packet.h b/include/odp/api/spec/packet.h index 79d8773e..c7775d02 100644 --- a/include/odp/api/spec/packet.h +++ b/include/odp/api/spec/packet.h @@ -1502,14 +1502,27 @@ void odp_packet_shaper_len_adjust_set(odp_packet_t pkt, int8_t adj); */ /** - * Print packet to the console + * Print packet debug information * - * Print all packet debug information to the console. + * Print all packet debug information to the ODP log. * * @param pkt Packet handle */ void odp_packet_print(odp_packet_t pkt); +/** + * Print packet data + * + * Print packet debug information with packet data to the ODP log. Operation + * prints 'len' bytes of packet data starting from 'offset' byte. Offset plus + * length must not exceed packet length (odp_packet_len()). + * + * @param pkt Packet handle + * @param offset Byte offset into the packet + * @param len Number of bytes to print + */ +void odp_packet_print_data(odp_packet_t pkt, uint32_t offset, uint32_t len); + /** * Perform full packet validity check * commit c8f25051021015221ec8d46cf2e06914eb8ca868 Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Thu Oct 26 19:24:21 2017 +0300 shippable: add libconfig and libnuma add libconfig and libnuma for docker image for api-next. Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> diff --git a/scripts/Dockerfile b/scripts/Dockerfile index 995330fa..b15282aa 100644 --- a/scripts/Dockerfile +++ b/scripts/Dockerfile @@ -12,12 +12,14 @@ RUN sudo apt-get update && sudo apt-get install -yy \ gcc-4.8 \ graphviz \ kmod \ - mscgen \ + libconfig-dev \ libcunit1-dev \ + libnuma-dev \ libpcap-dev \ libssl-dev \ libtool \ linux-headers-`uname -r` \ + mscgen \ ruby-dev RUN sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.8 10 commit 5f095cc66bc3fcafe8f44ed7348ef127f40c9026 Author: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Date: Wed Aug 2 08:40:38 2017 -0700 api: packetio: deprecate redundant loop_supported field in capability removes redundant loop_supported boolean in odp_pktio_capability_t Fixes https://bugs.linaro.org/show_bug.cgi?id=2861 Signed-off-by: Balasubramanian Manoharan <bala.manoharan(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/include/odp/api/spec/packet_io.h b/include/odp/api/spec/packet_io.h index cec1f22a..76c63e72 100644 --- a/include/odp/api/spec/packet_io.h +++ b/include/odp/api/spec/packet_io.h @@ -19,6 +19,7 @@ extern "C" { #endif +#include <odp/api/deprecated.h> #include <odp/api/packet_io_stats.h> #include <odp/api/queue.h> #include <odp/api/time.h> @@ -445,11 +446,8 @@ typedef struct odp_pktio_capability_t { * set to zero. */ odp_pktio_set_op_t set_op; - /** Support of Loopback mode - * - * A boolean to denote whether loop back mode is supported on this - * specific interface. */ - odp_bool_t loop_supported; + /** @deprecated Use enable_loop inside odp_pktin_config_t */ + odp_bool_t ODP_DEPRECATE(loop_supported); } odp_pktio_capability_t; /** diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c index 0473483d..5880a2a1 100644 --- a/platform/linux-generic/odp_packet_io.c +++ b/platform/linux-generic/odp_packet_io.c @@ -418,7 +418,7 @@ int odp_pktio_config(odp_pktio_t hdl, const odp_pktio_config_t *config) return -1; } - if (config->enable_loop && !capa.loop_supported) { + if (config->enable_loop && !capa.config.enable_loop) { ODP_ERR("Loopback mode not supported\n"); return -1; } commit 3d6cf1de61e0b5c846317b3ffcbd0cfd07531b90 Author: Matias Elo <matias.elo(a)nokia.com> Date: Wed Jul 5 17:23:19 2017 +0300 validation: system_info: add test for odp_sys_huge_page_size_all() 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/validation/api/system/system.c b/test/validation/api/system/system.c index 6873fcc4..a2749003 100644 --- a/test/validation/api/system/system.c +++ b/test/validation/api/system/system.c @@ -15,6 +15,7 @@ #define DIFF_TRY_NUM 160 #define RES_TRY_NUM 10 +#define PAGESZ_NUM 10 void system_test_odp_version_numbers(void) { @@ -216,6 +217,25 @@ void system_test_odp_sys_huge_page_size(void) CU_ASSERT(0 < page); } +void system_test_odp_sys_huge_page_size_all(void) +{ + uint64_t pagesz_tbs[PAGESZ_NUM]; + uint64_t prev_pagesz = 0; + int num; + int i; + + num = odp_sys_huge_page_size_all(NULL, 0); + CU_ASSERT(num >= 0); + + num = odp_sys_huge_page_size_all(pagesz_tbs, PAGESZ_NUM); + CU_ASSERT(num >= 0); + for (i = 0; i < num && i < PAGESZ_NUM; i++) { + CU_ASSERT(pagesz_tbs[i] > 0); + CU_ASSERT(pagesz_tbs[i] > prev_pagesz); + prev_pagesz = pagesz_tbs[i]; + } +} + int system_check_odp_cpu_hz(void) { if (odp_cpu_hz() == 0) { @@ -318,6 +338,7 @@ odp_testinfo_t system_suite[] = { ODP_TEST_INFO(system_test_odp_cpu_model_str_id), ODP_TEST_INFO(system_test_odp_sys_page_size), ODP_TEST_INFO(system_test_odp_sys_huge_page_size), + ODP_TEST_INFO(system_test_odp_sys_huge_page_size_all), ODP_TEST_INFO_CONDITIONAL(system_test_odp_cpu_hz, system_check_odp_cpu_hz), ODP_TEST_INFO_CONDITIONAL(system_test_odp_cpu_hz_id, diff --git a/test/validation/api/system/system.h b/test/validation/api/system/system.h index c33729b9..0ea72dcd 100644 --- a/test/validation/api/system/system.h +++ b/test/validation/api/system/system.h @@ -20,6 +20,7 @@ void system_test_odp_cpu_model_str(void); void system_test_odp_cpu_model_str_id(void); void system_test_odp_sys_page_size(void); void system_test_odp_sys_huge_page_size(void); +void system_test_odp_sys_huge_page_size_all(void); int system_check_odp_cpu_hz(void); void system_test_odp_cpu_hz(void); int system_check_odp_cpu_hz_id(void); commit 43d7f57b9f9f24526330c51fda8554d52414b82f Author: Matias Elo <matias.elo(a)nokia.com> Date: Wed Jul 5 17:23:18 2017 +0300 linux-gen: system_info: implement odp_sys_huge_page_size_all() Directory /sys/kernel/mm/hugepages contains subdirectories for all huge page sizes supported by the running kernel. Loop through the contents of this directory to find the supported huge page sizes. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-and-tested-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/odp_system_info.c b/platform/linux-generic/odp_system_info.c index 1303d793..3cbe1d3d 100644 --- a/platform/linux-generic/odp_system_info.c +++ b/platform/linux-generic/odp_system_info.c @@ -423,6 +423,42 @@ uint64_t odp_sys_huge_page_size(void) return odp_global_data.hugepage_info.default_huge_page_size; } +static int pagesz_compare(const void *pagesz1, const void *pagesz2) +{ + return (*(const uint64_t *)pagesz1 - *(const uint64_t *)pagesz2); +} + +int odp_sys_huge_page_size_all(uint64_t size[], int num) +{ + DIR *dir; + struct dirent *entry; + int pagesz_num = 0; + int saved = 0; + + /* See: kernel.org: hugetlbpage.txt */ + dir = opendir("/sys/kernel/mm/hugepages"); + if (!dir) { + ODP_ERR("Failed to open huge page directory\n"); + return -1; + } + + while ((entry = readdir(dir)) != NULL) { + unsigned long sz; + + if (sscanf(entry->d_name, "hugepages-%8lukB", &sz) == 1) { + if (size != NULL && saved < num) + size[saved++] = sz * 1024; + pagesz_num++; + } + } + closedir(dir); + + if (size != NULL && saved > 1) + qsort(size, saved, sizeof(uint64_t), pagesz_compare); + + return pagesz_num; +} + uint64_t odp_sys_page_size(void) { return odp_global_data.system_info.page_size; commit c4a8f43ff08b954d14857c5a59544f8d914205e3 Author: Matias Elo <matias.elo(a)nokia.com> Date: Wed Jul 5 17:23:17 2017 +0300 api: system_info: add function for fetching all supported huge page sizes A system may simultaneously support multiple huge page sizes. Add a new API function odp_sys_huge_page_size_all() which returns all supported page sizes. odp_sys_huge_page_size() stays unmodified to maintain backward compatibility. 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/include/odp/api/spec/system_info.h b/include/odp/api/spec/system_info.h index ca4dcdc7..140db7b4 100644 --- a/include/odp/api/spec/system_info.h +++ b/include/odp/api/spec/system_info.h @@ -27,9 +27,28 @@ extern "C" { * Default system huge page size in bytes * * @return Default huge page size in bytes + * @retval 0 on no huge pages */ uint64_t odp_sys_huge_page_size(void); +/** + * System huge page sizes in bytes + * + * Returns the number of huge page sizes supported by the system. Outputs up to + * 'num' sizes when the 'size' array pointer is not NULL. If return value is + * larger than 'num', there are more supported sizes than the function was + * allowed to output. If return value (N) is less than 'num', only sizes + * [0 ... N-1] have been written. Returned values are ordered from smallest to + * largest. + * + * @param[out] size Points to an array of huge page sizes for output + * @param num Maximum number of huge page sizes to output + * + * @return Number of supported huge page sizes + * @retval <0 on failure + */ +int odp_sys_huge_page_size_all(uint64_t size[], int num); + /** * Page size in bytes * commit f972ef61a9693b7895cb7f85084c1c53c3b13131 Author: Brian Brooks <brian.brooks(a)arm.com> Date: Fri Jun 23 16:04:36 2017 -0500 test: odp_pktio_ordered: add queue size Signed-off-by: Brian Brooks <brian.brooks(a)arm.com> 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/performance/odp_pktio_ordered.c b/test/performance/odp_pktio_ordered.c index d7e43c4b..ed4e2e8e 100644 --- a/test/performance/odp_pktio_ordered.c +++ b/test/performance/odp_pktio_ordered.c @@ -93,6 +93,9 @@ /** Maximum number of pktio queues per interface */ #define MAX_QUEUES 32 +/** Seems to need at least 8192 elements per queue */ +#define QUEUE_SIZE 8192 + /** Maximum number of pktio interfaces */ #define MAX_PKTIOS 8 @@ -1222,6 +1225,7 @@ int main(int argc, char *argv[]) qparam.sched.prio = ODP_SCHED_PRIO_DEFAULT; qparam.sched.sync = ODP_SCHED_SYNC_ATOMIC; qparam.sched.group = ODP_SCHED_GROUP_ALL; + qparam.size = QUEUE_SIZE; gbl_args->flow_qcontext[i][j].idx = i; gbl_args->flow_qcontext[i][j].input_queue = 0; commit b6b667b1e95635a6ba77a19078d7d28013bcde1d Author: Bill Fischofer <bill.fischofer(a)linaro.org> Date: Tue Jun 13 07:55:15 2017 -0500 doc: userguide: add odp_init_global() documentation for unused features Update User Guide startup section to include current parameters for odp_init_global() and odp_init_local() as well as optimization hints for unused features. Signed-off-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/doc/users-guide/users-guide.adoc b/doc/users-guide/users-guide.adoc index 0d1e5eb7..0c7d3f77 100644 --- a/doc/users-guide/users-guide.adoc +++ b/doc/users-guide/users-guide.adoc @@ -558,20 +558,44 @@ calling the terminate functions should only be done when the application is sure it has closed the ingress and subsequently drained all queues, etc. === Startup -The first API that must be called by an ODP application is 'odp_init_global()'. +The first API that must be called by an ODP application is `odp_init_global()`: +[source,c] +----- +int odp_init_global(odp_instance_t *instance, + const odp_init_t *param, + const odp_platform_init_t *platform_param); +----- This takes two pointers. The first, `odp_init_t`, contains ODP initialization data that is platform independent and portable, while the second, `odp_platform_init_t`, is passed unparsed to the implementation to be used for platform specific data that is not yet, or may never be -suitable for the ODP API. +suitable for the ODP API. Each of these parameters is optional and may be +specified as NULL to accept the implementation-defined default initialization +values. -Calling odp_init_global() establishes the ODP API framework and MUST be +Calling `odp_init_global()` establishes the ODP API framework and MUST be called before any other ODP API may be called. Note that it is only called -once per application. Following global initialization, each thread in turn +once per application. A successful call to `odp_init_global()` returns rc = 0 +and sets the `instance` variable supplied as input to the call to an handle +representing this unique ODP instance. + +The `odp_init_t` parameter is used to specify various customizations to the +ODP environment being established by this call. For example, the caller can +specify the maximum number of worker threads it will use, the thread masks +associated with these threads, as well as whether the default logging or +abort functions are to be overridden with an application-supplied handler. + +The application may also provide optimization hints to the ODP implementation +if it knows that it will never use specific ODP feature sets, such as the +packet classifier or traffic manager. Implementations may use such hints to +provide optimized behavior to applications that are known not to need these +features. + +Following global initialization, each thread in turn calls 'odp_init_local()'. This establishes the local ODP thread context for that thread and MUST be called before other ODP APIs may be -called by that thread. The sole argument to this call is the _thread type_, -which is either `ODP_THREAD_WORKER` or `ODP_THREAD_CONTROL`. +called by that thread. The sole argument to this call is the `instance` +variable returned by `odp_init_global()`. === Shutdown Shutdown is the logical reverse of the initialization procedure, with commit bae53291795e9c19cbfde9c0d0e11a19d9870623 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Wed Feb 22 17:08:22 2017 +0200 abi: event: add ODP_EVENT_IPSEC_RESULT Update ABI spec with the new IPSEC event type. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/include/odp/arch/default/api/abi/event.h b/include/odp/arch/default/api/abi/event.h index fd86f25c..336938f5 100644 --- a/include/odp/arch/default/api/abi/event.h +++ b/include/odp/arch/default/api/abi/event.h @@ -28,7 +28,8 @@ typedef enum odp_event_type_t { ODP_EVENT_BUFFER = 1, ODP_EVENT_PACKET = 2, ODP_EVENT_TIMEOUT = 3, - ODP_EVENT_CRYPTO_COMPL = 4 + ODP_EVENT_CRYPTO_COMPL = 4, + ODP_EVENT_IPSEC_RESULT = 5 } odp_event_type_t; /** commit dd31792d10772c3e41519fc0b6d68cf13b0fe9d4 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 aa20ba26..f7c0da21 100644 --- a/test/Makefile.inc +++ b/test/Makefile.inc @@ -22,4 +22,6 @@ AM_LDFLAGS = -L$(LIB) -static @VALGRIND_CHECK_RULES@ -TESTS_ENVIRONMENT= ODP_PLATFORM=${with_platform} EXEEXT=${EXEEXT} +TESTS_ENVIRONMENT = ODP_PLATFORM=${with_platform} \ + EXEEXT=${EXEEXT} \ + ODP_SYSCONFIG_FILE=none ----------------------------------------------------------------------- Summary of changes: .travis.yml | 25 ++++---- CHANGELOG | 15 +++++ Makefile.am | 8 ++- configure.ac | 4 +- doc/Makefile.am | 3 +- doc/application-api-guide/Doxyfile | 1 - doc/application-api-guide/Makefile.am | 1 + doc/driver-api-guide/.gitignore | 1 - doc/driver-api-guide/Doxyfile | 9 --- doc/driver-api-guide/Makefile.am | 5 -- doc/driver-api-guide/odp.dox | 20 ------ doc/implementers-guide/implementers-guide.adoc | 72 +++++----------------- doc/m4/configure.m4 | 3 +- example/l2fwd/README | 3 +- example/l2fwd/odp_l2fwd.c | 2 +- include/odp/drv/spec/README | 4 -- include/odp/drv/spec/compiler.h | 51 --------------- include/odp/drv/spec/std_types.h | 40 ------------ include/odp_drv.h | 27 -------- platform/linux-generic/Makefile.am | 4 -- platform/linux-generic/include/odp/drv/README | 2 - platform/linux-generic/include/odp/drv/compiler.h | 34 ---------- platform/linux-generic/include/odp/drv/std_types.h | 42 ------------- platform/linux-generic/odp_crypto.c | 19 ++---- scripts/ci-checkpatches.sh | 22 ++++--- test/performance/odp_l2fwd_run.sh | 6 +- 26 files changed, 78 insertions(+), 345 deletions(-) delete mode 100644 doc/driver-api-guide/.gitignore delete mode 100644 doc/driver-api-guide/Doxyfile delete mode 100644 doc/driver-api-guide/Makefile.am delete mode 100644 doc/driver-api-guide/odp.dox delete mode 100644 include/odp/drv/spec/README delete mode 100644 include/odp/drv/spec/compiler.h delete mode 100644 include/odp/drv/spec/std_types.h delete mode 100644 include/odp_drv.h delete mode 100644 platform/linux-generic/include/odp/drv/README delete mode 100644 platform/linux-generic/include/odp/drv/compiler.h delete mode 100644 platform/linux-generic/include/odp/drv/std_types.h hooks/post-receive --

8 years, 10 months

[COMMIT] branch 2.0 updated. v1.15.0.0-928-g65419c16

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, 2.0 has been updated via 65419c16086369f86dea068e54ce492526fa4f41 (commit) via d22c949cc466bf28de559855a1cb525740578137 (commit) via 637353bbd96770741cbb58711c78c9dc01e4ea34 (commit) via 387b402c4f2fc0694b6e0fe68ee4be8a2bd42442 (commit) via ebdf6e27af66a58fff6a17a1c6c2cd6ae85909f1 (commit) via cc97d3ae6d6d4c07ec77e7b33e2529154fb0ed24 (commit) via 94cb17b703f1efba6a89207b893d9f4ef5297d8d (commit) via c04eff910a7b18f47365f90fadb6133474e9cae5 (commit) via 201a96f9bbcbabd904362ba05a179c72689a578e (commit) via 3edee38da55876e36f654a5d1a4b87c2ea5b8bfe (commit) via 8d22e0e2013596403ae6a35457cdf30b0a0c559b (commit) via d61d32590d1772b70b8dcd0d0ec44d29029d7443 (commit) via 66b363634fe1bba003cdb9e4e49a5980fc8c79f4 (commit) via bd1b1adf37dd8d252f7daf761d4ae9a6d1ef156a (commit) via 4fafec8378b6e7d0b353d851e724ab27eb002b27 (commit) via 63d92eb289261d1534b5b9e1e04291faa5e45d30 (commit) via 82419a31e6d1846e0676edfa7fb511a23098f5a9 (commit) via c0aeacf23dddfb7feae47fef6e4d10d6bdb9c812 (commit) via dd0498bb104c7319e2ec56b61e4d585167ea6c53 (commit) via e826613858543e50a2ec74598f8c2c6fd4bfa064 (commit) via 503722802274ff5de09144613d9262e2cfdb3077 (commit) via 5329228e260d36de62c3edf3c1a3f08ab95fd558 (commit) via 74d880d7e20ab4825868bd2013b164d4bc90eb45 (commit) via 825f75ed8644ef57c5648961e7982daf13cd9375 (commit) via 18977d0684ef7a26ddd6777ca341f7b1ca9e5c3e (commit) via f4d54b8831df52878b66bb145124a9adb4beab28 (commit) via e733d6ba6382ccbf9d6c84a6a10bf720c2e16c0d (commit) via ec6510b33e8b96d6d6670efb9dc3c9101baed6c6 (commit) via af4565caa0f9d171db466554ee631338b9844cbe (commit) via f5120355753ae3d69f81010cb9131abffdfb03fc (commit) via afa7e20ab3b7a6e68a556f00b49aa19ea4a29be6 (commit) via e3108af2f0b58c2ceca422b418439bba5de04b11 (commit) via 54228421977f94d9da752290540c6ec4dc5306a0 (commit) via 605e77187211dbb0716e4124f249c7f0f88567f7 (commit) via 940c54bbd1c0c16ea2b6a6f6737d151deeba1e43 (commit) via 91ceea49a975c6fcd61ab1c992a502350d673eeb (commit) via b46702e5ef368c9aaf9d6cea7d32b07adb881ce3 (commit) via 48dfcade1602e9cc9bb8cd3251037508aef146cd (commit) via 2aa9a05b11bdfac0c0126384d4677b3f9c561a78 (commit) via df978d9b4e766c8e1cb1a88a28d98318840fee22 (commit) via cd196cf12f957456b24c844b2c38be5062130cf1 (commit) via dee4a7512c21a8b7f15a4a05e6736de373df92f0 (commit) via f70ff3bc542961d52f9b0f867298014650c8e49e (commit) via 700c0ac917fedf532e9a7e21c42624faa4b09a5f (commit) via 20aba9a17664fb8d5261bece23a1c20f1a3465f7 (commit) via ce4bd52afcef245b069acfe8dc53bd62aec576fd (commit) via 01b5f7e0c0bcec5beb58c99573906b1a4ee8e5f0 (commit) via 5e8f87ae22ca0c3e6137f91f15c967aec958a67e (commit) via 9e10a562dfb67b7a37c67fecff3de00be798961a (commit) via 86d651b86c10dd77603354110644ad346dfb3e26 (commit) via bc3cad50ec6668064bae1af164875c93832caff8 (commit) via 9c747985d4c448ef737376c5c8180b78ae1e7378 (commit) via 698f370e71db55624e1bd78063569369f86db389 (commit) via 482eeee380d40596131826c1103ed89247bd17e5 (commit) via 254190ffcdb51549ee23846f33fd45513656b78c (commit) via 52877c96e12bf62614df0482175384565a851083 (commit) via 133e7fc06147486fff5ab3393b1a791ab97d19d3 (commit) via 8c9ce8c63eed9d01fec54c09bd17040914abd623 (commit) via 2b57c7d7b96eef16c36b8b0020b3dd78acc82660 (commit) via cbced85824c4c03c0b35396d559ebfb187237569 (commit) via 1217fbaed0aee2ee395c131bb7fd2e201214ed31 (commit) via 927b57f21124f31e23fd7f72dddcc93a5248ed53 (commit) via 1bcf171f00973bcc21baadf9919a61cd6abdf713 (commit) via edca8cd1e55898826f79383b689c2c4bd2c28b3a (commit) via ec0c3145fcafa09ae3a79875e7e07dd4794583cc (commit) via aa64630294bed950641e99fa1c87725f521a0002 (commit) via 53b4c4aed8cc6e9caf379725e9ed1d2d36f04f10 (commit) via 77f9451a2acf4465e6a64f24b1dfdca56787f0ce (commit) via fce14d1496e7da19e2f0eb53339eea5a4204c03d (commit) via cc33578e327d5f6787711a71a60500c4be98bf63 (commit) via 4ab7a7b22b15011eb69c3e473278db13319aba52 (commit) via 53b735f14a9a1df23b054f15ce148e2fa36abe0f (commit) via 4df71d3f5450452a654bb7e94f8b3fed948ed31e (commit) via 326192cd87888abbea6c0dbdd3dc972db41f3325 (commit) via 55e6afa29bdc2ae314bada7ac5648049909e1775 (commit) via ff51f6363c9fad843f7872ad8048740d10368dd1 (commit) via 6a119c79b59de3c8ee9e51f3ceba9d26f24c3ce4 (commit) via 7d162deafa22535f8fab9ea39dcb4e3e0e7850b0 (commit) via adaa3b434086346402999d09c2223681aba4b1a4 (commit) via c657f3f3d9b2c5832b42a4344a526bf7d0c76a5d (commit) via e02f5545f97f90a75f2595bb1e9068f64bff133e (commit) via d0d0bd9787ee43db39ad4e7e9b224e70664d5663 (commit) via 7dc5f21c7ca88e6c19d34dc1933eddef190add7a (commit) via 209c3a2e255de7aa82c4f08f8abb41c04bb3d86d (commit) via ae4f1d82ed704992c1d8284c23795b9e076b33b9 (commit) via d2b3aa9a7ffc3028eedc7dbeb6257d7efd91bc05 (commit) via 66305f01a57741dc5eca061364e65a5f4da8584f (commit) via afeda4d14bb6f449cb269680cdbd56b26726eedf (commit) via 1b259a7a4e573080f4debc542cab7a0b996f4c88 (commit) via 4ce7bdf3d99cc1d7634a80f961fc0e9e7523a0ac (commit) via 55fd230da7d8515452c08256f8fd8471d32d7601 (commit) via b529f843814f70068de2090e02df632113afa800 (commit) via fa78c11ad2de706ce07a7691168bdb5b58d060d4 (commit) via 5a2376365df984e160b92463be37740786a10bd6 (commit) via 3f3d7651c7cd7ba3b941904bbcbdabcac9a7dfd0 (commit) via 72a4e9f9bad9dfeaafba4e29a7450ee7edca5d1c (commit) via 7f3624154ff59ab85352c35e1c6df3c9597f9f51 (commit) via bbefeae66a2a6ac6c9386bb8a083022b7f323fc9 (commit) via a08dba6c24af81142efc6176eae2bdd561b478e3 (commit) via 1c02e217fac2ed2d015205ad36bd86c4924ce6cc (commit) via a3bc051085b95170101a3f81379e78c48e5a636c (commit) via fa281989523b82177f974abe7b4adfec47705dfa (commit) via 3bacbfd55edf76b897a4b2e5c62b59ca6fa95331 (commit) via 37b430cb9e8f6834a3c76ab108489cec719b9e32 (commit) via 4d38a376cd9976dfbeb565e509c028d07dfb1ed8 (commit) via c16af6486eea240609f334b1bdc81a11404275de (commit) from c0f99c441feadd1566b7e92789b11c30c6ee3f64 (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 65419c16086369f86dea068e54ce492526fa4f41 Merge: c0f99c44 d22c949c Author: Yi He <yi.he(a)linaro.org> Date: Fri Nov 3 16:09:27 2017 +0800 Merge branch 'api-next' into 2.0 Reviewed-by: Honnappa Nagarahalli <honnappa.Nagarahalli(a)arm.com> Signed-off-by: Yi He <yi.he(a)linaro.org> diff --cc .travis.yml index 29909a3a,bb5cb4e5..f5a67781 --- a/.travis.yml +++ b/.travis.yml @@@ -59,6 -60,6 +60,7 @@@ cache pip: true directories: #- dpdk ++ - dpdk-17.02 - netmap - $HOME/cunit-install - $HOME/doxygen-install @@@ -161,15 -168,14 +169,30 @@@ install make config T=${TARGET} O=${TARGET} pushd ${TARGET} sed -ri 's,(CONFIG_RTE_LIBRTE_PMD_PCAP=).*,\1y,' .config + sed -ri 's,(CONFIG_RTE_LIBRTE_PMD_OPENSSL=).*,\1y,' .config + cat .config |grep RTE_MACHINE + sed -ri 's,(CONFIG_RTE_MACHINE=).*,\1"snb",' .config + popd + make install T=${TARGET} EXTRA_CFLAGS="-fPIC" + rm -r ./doc ./${TARGET}/app ./${TARGET}/build + popd + fi - ++ - | ++ if [ -z "$CROSS_ARCH" -a ! -f "dpdk-17.02/${TARGET}/lib/libdpdk.a" ]; then ++ git -c advice.detachedHead=false clone -q --depth=1 --single-branch --branch=v17.02 http://dpdk.org/git/dpdk dpdk-17.02 ++ pushd dpdk-17.02 ++ git log --oneline --decorate ++ make config T=${TARGET} O=${TARGET} ++ pushd ${TARGET} ++ sed -ri 's,(CONFIG_RTE_LIBRTE_PMD_PCAP=).*,\1y,' .config ++ sed -ri 's,(CONFIG_RTE_LIBRTE_PMD_OPENSSL=).*,\1y,' .config + cat .config |grep RTE_MACHINE + sed -ri 's,(CONFIG_RTE_MACHINE=).*,\1"snb",' .config + popd + make install T=${TARGET} EXTRA_CFLAGS="-fPIC" + rm -r ./doc ./${TARGET}/app ./${TARGET}/build + popd + fi - # Netmap pktio - | if [ -z "$CROSS_ARCH" ]; then @@@ -275,16 -281,8 +298,15 @@@ jobs script: - echo ${TRAVIS_COMMIT_RANGE}; - ODP_PATCHES=`echo ${TRAVIS_COMMIT_RANGE} | sed 's/\.//'`; - - if [ -z "${ODP_PATCHES}" ]; then env; exit 0; fi; - ./scripts/ci-checkpatches.sh ${ODP_PATCHES}; - + - stage: test + env: TEST=linux-dpdk + compiler: gcc + script: + - ./bootstrap - - ./configure --with-platform=linux-dpdk --enable-test-cpp --enable-test-vald --enable-test-helper --enable-test-perf --enable-user-guides --enable-test-perf-proc --enable-test-example --with-sdk-install-path=`pwd`/dpdk/${TARGET} --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH $CONF ++ - ./configure --with-platform=linux-dpdk --enable-test-cpp --enable-test-vald --enable-test-helper --enable-test-perf --enable-user-guides --enable-test-perf-proc --enable-test-example --with-sdk-install-path=`pwd`/dpdk-17.02/${TARGET} --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH $CONF + - make -j $(nproc) + - sudo LD_LIBRARY_PATH="/usr/local/lib:$LD_LIBRARY_PATH" make check after_failure: - cat config.log - - find . -name 'test-suite.log' -execdir grep -il "FAILED" {} \; -exec echo {} \; -exec cat {} \; + - find . -name "*.trs" | xargs grep -l '^.test-result. FAIL' | while read trs ; do echo FAILURE detected at $trs; cat ${trs%%.trs}.log ; done diff --cc Makefile.am index 6c43679e,c28b0229..0d04f98b --- a/Makefile.am +++ b/Makefile.am @@@ -3,14 -3,21 +3,28 @@@ AM_DISTCHECK_CONFIGURE_FLAGS = --enable --enable-helper-linux \ --with-testdir - #@with_platform@ works alone in subdir but not as part of a path??? - SUBDIRS = @platform_with_platform@ \ + if PLATFORM_IS_LINUX_GENERIC + PLATFORM_DIR = platform/linux-generic + PLATFORM_TEST_DIR = platform/linux-generic/test + endif + ++if PLATFORM_IS_LINUX_DPDK ++PLATFORM_DIR = platform/linux-dpdk ++PLATFORM_TEST_DIR = platform/linux-dpdk/test ++endif ++ + SUBDIRS = \ + include \ + $(PLATFORM_DIR) \ helper \ helper/test \ doc \ example . \ - test + test \ + $(PLATFORM_TEST_DIR) + ++DIST_SUBDIRS = $(SUBDIRS) + @DX_RULES@ EXTRA_DIST = bootstrap $(DX_CONFIG) CHANGELOG config/README diff --cc configure.ac index 9e45d0fe,4bc77500..d774ae86 --- a/configure.ac +++ b/configure.ac @@@ -162,8 -161,17 +162,7 @@@ AC_ARG_WITH([platform] ]) AC_SUBST([with_platform]) - AC_SUBST([platform_with_platform], ["platform/${with_platform}"]) -########################################################################## -# Run platform specific checks and settings -########################################################################## -AS_IF([test "${with_platform}" = "linux-generic"], - [m4_include([./platform/linux-generic/m4/configure.m4])], - [AC_MSG_ERROR([UNSUPPORTED PLATFORM: ${with_platform}])]) - -AC_DEFINE_UNQUOTED([IMPLEMENTATION_NAME], ["$IMPLEMENTATION_NAME"], - [Define to the name of the implementation]) - ########################################################################## # Include m4 files ########################################################################## @@@ -172,37 -180,6 +171,35 @@@ m4_include([./example/m4/configure.m4] m4_include([./helper/m4/configure.m4]) m4_include([./test/m4/configure.m4]) +########################################################################## +# Set SDK install path +########################################################################## +AC_ARG_WITH([sdk-install-path], +AC_HELP_STRING([--with-sdk-install-path=DIR path to external libs and headers], + [(or in the default path if not specified).]), +[SDK_INSTALL_PATH=$withval SDK_INSTALL_PATH_=1],[SDK_INSTALL_PATH_=]) + +AC_SUBST(SDK_INSTALL_PATH) + +########################################################################## +# Run platform specific checks and settings +########################################################################## +IMPLEMENTATION_NAME="" +AS_IF([test "${with_platform}" = "linux-generic"], + [m4_include([./platform/linux-generic/m4/configure.m4])] - [m4_include([./test/linux-generic/m4/configure.m4])] + [IMPLEMENTATION_NAME="linux-generic"] + [ODP_CFLAGS="$ODP_CFLAGS -std=c99"] + [ODP_LIB_STR="odp-linux"], + [test "${with_platform}" = "linux-dpdk"], + [m4_include([./platform/linux-dpdk/m4/configure.m4])] - [m4_include([./test/linux-dpdk/m4/configure.m4])] + [IMPLEMENTATION_NAME="linux-dpdk"] + [ODP_CFLAGS="$ODP_CFLAGS -std=gnu99"] + [ODP_LIB_STR="odp-dpdk"], + [echo "UNSUPPORTED PLATFORM: ${with_platform}"]) + +ODP_CFLAGS="$ODP_CFLAGS -DIMPLEMENTATION_NAME=$IMPLEMENTATION_NAME" +AC_SUBST(ODP_LIB_STR) + ########################################################################## # Set the install directory for test binaries/scripts ########################################################################## @@@ -357,12 -336,12 +357,11 @@@ esa CFLAGS="$CFLAGS $ODP_CFLAGS" CXXFLAGS="$CXXFLAGS $ODP_CXXFLAGS" - AC_CONFIG_FILES([Makefile - pkgconfig/libodp-linux.pc - pkgconfig/libodp-dpdk.pc - pkgconfig/libodphelper.pc - ]) + AC_CONFIG_FILES([Makefile]) + AC_CONFIG_FILES([include/Makefile + include/odp/api/spec/version.h + include/odp/api/spec/deprecated.h]) - ########################################################################## # distribute the changed variables among the Makefiles diff --cc example/Makefile.am index d83edf6c,695e029c..b6e8d81f --- a/example/Makefile.am +++ b/example/Makefile.am @@@ -9,6 -9,6 +9,8 @@@ SUBDIRS = classifier switch \ time \ timer \ - traffic_mgmt + traffic_mgmt \ + ddf_ifs \ + ddf_app + + noinst_HEADERS = example_debug.h diff --cc example/Makefile.inc index 419bebd4,1609066e..31bf7c43 --- a/example/Makefile.inc +++ b/example/Makefile.inc @@@ -1,5 -1,7 +1,7 @@@ + TESTS_ENVIRONMENT = EXEEXT=${EXEEXT} + LIB = $(top_builddir)/lib -LDADD = $(LIB)/libodp-linux.la $(LIB)/libodphelper.la $(DPDK_PMDS) +LDADD = $(LIB)/lib$(ODP_LIB_STR).la $(LIB)/libodphelper.la $(DPDK_PMDS) AM_CFLAGS = \ -I$(srcdir) \ -I$(top_srcdir)/example \ diff --cc example/l2fwd/odp_l2fwd.c index eea3a34c,eea3a34c..fb585f43 --- a/example/l2fwd/odp_l2fwd.c +++ b/example/l2fwd/odp_l2fwd.c @@@ -1,1 -1,1 +1,1 @@@ --../../test/common_plat/performance/odp_l2fwd.c ++../../test/performance/odp_l2fwd.c diff --cc include/Makefile.am index 00000000,d53181ce..37691672 mode 000000,100644..100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@@ -1,0 -1,162 +1,163 @@@ + include_HEADERS = \ + odp.h \ + odp_api.h \ + odp_drv.h + + odpapispecincludedir= $(includedir)/odp/api/spec + odpapispecinclude_HEADERS = \ + odp/api/spec/align.h \ + odp/api/spec/atomic.h \ + odp/api/spec/barrier.h \ + odp/api/spec/buffer.h \ + odp/api/spec/byteorder.h \ + odp/api/spec/chksum.h \ + odp/api/spec/classification.h \ + odp/api/spec/compiler.h \ + odp/api/spec/cpu.h \ + odp/api/spec/cpumask.h \ + odp/api/spec/crypto.h \ + odp/api/spec/debug.h \ + odp/api/spec/errno.h \ + odp/api/spec/event.h \ + odp/api/spec/feature.h \ + odp/api/spec/hash.h \ + odp/api/spec/hints.h \ + odp/api/spec/init.h \ + odp/api/spec/ipsec.h \ + odp/api/spec/packet.h \ + odp/api/spec/packet_flags.h \ + odp/api/spec/packet_io.h \ + odp/api/spec/packet_io_stats.h \ + odp/api/spec/pool.h \ + odp/api/spec/queue.h \ + odp/api/spec/random.h \ + odp/api/spec/rwlock.h \ + odp/api/spec/rwlock_recursive.h \ + odp/api/spec/schedule.h \ + odp/api/spec/schedule_types.h \ + odp/api/spec/shared_memory.h \ + odp/api/spec/spinlock.h \ + odp/api/spec/spinlock_recursive.h \ + odp/api/spec/std_clib.h \ + odp/api/spec/std_types.h \ + odp/api/spec/support.h \ + odp/api/spec/sync.h \ + odp/api/spec/system_info.h \ + odp/api/spec/thread.h \ + odp/api/spec/thrmask.h \ + odp/api/spec/ticketlock.h \ + odp/api/spec/time.h \ + odp/api/spec/timer.h \ + odp/api/spec/traffic_mngr.h + + nodist_odpapispecinclude_HEADERS = \ + odp/api/spec/deprecated.h \ + odp/api/spec/version.h + + odpdrvspecincludedir= $(includedir)/odp/drv/spec + odpdrvspecinclude_HEADERS = \ + odp/drv/spec/align.h \ + odp/drv/spec/atomic.h \ + odp/drv/spec/barrier.h \ + odp/drv/spec/byteorder.h \ + odp/drv/spec/compiler.h \ + odp/drv/spec/driver.h \ ++ odp/drv/spec/hints.h \ + odp/drv/spec/shm.h \ + odp/drv/spec/spinlock.h \ + odp/drv/spec/std_types.h \ + odp/drv/spec/sync.h + + odpapiabidefaultincludedir= $(includedir)/odp/arch/default/api/abi + odpapiabidefaultinclude_HEADERS = \ + odp/arch/default/api/abi/buffer.h \ + odp/arch/default/api/abi/classification.h \ + odp/arch/default/api/abi/crypto.h \ + odp/arch/default/api/abi/event.h \ + odp/arch/default/api/abi/packet.h \ + odp/arch/default/api/abi/pool.h \ + odp/arch/default/api/abi/queue.h \ + odp/arch/default/api/abi/shared_memory.h + + odpapiabiarchincludedir= $(includedir)/odp/arch/@ARCH_ABI@/odp/api/abi + if ARCH_IS_ARM + odpapiabiarchinclude_HEADERS = \ + odp/arch/arm32-linux/odp/api/abi/buffer.h \ + odp/arch/arm32-linux/odp/api/abi/classification.h \ + odp/arch/arm32-linux/odp/api/abi/crypto.h \ + odp/arch/arm32-linux/odp/api/abi/event.h \ + odp/arch/arm32-linux/odp/api/abi/packet.h \ + odp/arch/arm32-linux/odp/api/abi/pool.h \ + odp/arch/arm32-linux/odp/api/abi/queue.h \ + odp/arch/arm32-linux/odp/api/abi/shared_memory.h + endif + if ARCH_IS_AARCH64 + odpapiabiarchinclude_HEADERS = \ + odp/arch/arm64-linux/odp/api/abi/buffer.h \ + odp/arch/arm64-linux/odp/api/abi/classification.h \ + odp/arch/arm64-linux/odp/api/abi/crypto.h \ + odp/arch/arm64-linux/odp/api/abi/event.h \ + odp/arch/arm64-linux/odp/api/abi/packet.h \ + odp/arch/arm64-linux/odp/api/abi/pool.h \ + odp/arch/arm64-linux/odp/api/abi/queue.h \ + odp/arch/arm64-linux/odp/api/abi/shared_memory.h + endif + if ARCH_IS_MIPS64 + odpapiabiarchinclude_HEADERS = \ + odp/arch/mips64-linux/odp/api/abi/buffer.h \ + odp/arch/mips64-linux/odp/api/abi/classification.h \ + odp/arch/mips64-linux/odp/api/abi/crypto.h \ + odp/arch/mips64-linux/odp/api/abi/event.h \ + odp/arch/mips64-linux/odp/api/abi/packet.h \ + odp/arch/mips64-linux/odp/api/abi/pool.h \ + odp/arch/mips64-linux/odp/api/abi/queue.h \ + odp/arch/mips64-linux/odp/api/abi/shared_memory.h + endif + if ARCH_IS_POWERPC + odpapiabiarchinclude_HEADERS = \ + odp/arch/power64-linux/odp/api/abi/buffer.h \ + odp/arch/power64-linux/odp/api/abi/classification.h \ + odp/arch/power64-linux/odp/api/abi/crypto.h \ + odp/arch/power64-linux/odp/api/abi/event.h \ + odp/arch/power64-linux/odp/api/abi/packet.h \ + odp/arch/power64-linux/odp/api/abi/pool.h \ + odp/arch/power64-linux/odp/api/abi/queue.h \ + odp/arch/power64-linux/odp/api/abi/shared_memory.h + endif + if ARCH_IS_X86_32 + odpapiabiarchinclude_HEADERS = \ + odp/arch/x86_32-linux/odp/api/abi/buffer.h \ + odp/arch/x86_32-linux/odp/api/abi/classification.h \ + odp/arch/x86_32-linux/odp/api/abi/crypto.h \ + odp/arch/x86_32-linux/odp/api/abi/event.h \ + odp/arch/x86_32-linux/odp/api/abi/packet.h \ + odp/arch/x86_32-linux/odp/api/abi/pool.h \ + odp/arch/x86_32-linux/odp/api/abi/queue.h \ + odp/arch/x86_32-linux/odp/api/abi/shared_memory.h + endif + if ARCH_IS_X86_64 + odpapiabiarchinclude_HEADERS = \ + odp/arch/x86_64-linux/odp/api/abi/buffer.h \ + odp/arch/x86_64-linux/odp/api/abi/classification.h \ + odp/arch/x86_64-linux/odp/api/abi/crypto.h \ + odp/arch/x86_64-linux/odp/api/abi/event.h \ + odp/arch/x86_64-linux/odp/api/abi/packet.h \ + odp/arch/x86_64-linux/odp/api/abi/pool.h \ + odp/arch/x86_64-linux/odp/api/abi/queue.h \ + odp/arch/x86_64-linux/odp/api/abi/shared_memory.h + endif + + # Create symlink for ABI header files. Application does not need to use the arch + # specific include path for installed files. + install-data-hook: + if [ -h $(DESTDIR)$(prefix)/include/odp/api/abi ]; then \ + : ; \ + else \ + $(LN_S) -rf $(DESTDIR)$(prefix)/include/odp/arch/@ARCH_ABI@/odp/api/abi \ + $(DESTDIR)$(prefix)/include/odp/api/abi; \ + fi + + # Rerefence all nodist_*_HEADERS here + .PHONY: $(nodist_odpapispecinclude_HEADERS) + $(nodist_odpapispecinclude_HEADERS): + $(MAKE) -C $(top_builddir) $(subdir)/$@ diff --cc platform/Makefile.inc index 4d9280b5,0086db77..327a9540 --- a/platform/Makefile.inc +++ b/platform/Makefile.inc @@@ -1,11 -1,10 +1,6 @@@ LIB = $(top_builddir)/lib --pkgconfigdir = $(libdir)/pkgconfig - pkgconfig_DATA = $(top_builddir)/pkgconfig/libodp-linux.pc - - .PHONY: pkgconfig/libodp-linux.pc -pkgconfig_DATA = libodp-linux.pc -- VPATH = $(srcdir) $(builddir) -lib_LTLIBRARIES = $(LIB)/libodp-linux.la AM_LDFLAGS = -version-number '$(ODP_LIBSO_VERSION)' diff --cc platform/linux-dpdk/Makefile.am index 596c7b78,00000000..f27d2b50 mode 100644,000000..100644 --- a/platform/linux-dpdk/Makefile.am +++ b/platform/linux-dpdk/Makefile.am @@@ -1,372 -1,0 +1,378 @@@ +include $(top_srcdir)/platform/Makefile.inc +include $(top_srcdir)/platform/@with_platform@/Makefile.inc + ++pkgconfigdir = $(libdir)/pkgconfig ++pkgconfig_DATA = libodp-dpdk.pc ++ +lib_LTLIBRARIES = $(LIB)/libodp-dpdk.la + +PLAT_CFLAGS = +if ARCH_IS_X86 +PLAT_CFLAGS += -msse4.2 +endif + +if SDK_INSTALL_PATH_ +PLAT_CFLAGS += -include $(SDK_INSTALL_PATH)/include/rte_config.h +else +PLAT_CFLAGS += -include /usr/include/dpdk/rte_config.h +endif + +AM_CPPFLAGS = $(PLAT_CFLAGS) +AM_CPPFLAGS += -I$(top_srcdir)/platform/linux-dpdk/include +AM_CPPFLAGS += -I$(top_srcdir)/platform/linux-generic/include +AM_CPPFLAGS += -I$(srcdir)/include +AM_CPPFLAGS += -I$(top_srcdir)/include +AM_CPPFLAGS += -I$(top_srcdir)/frameworks/modular +AM_CPPFLAGS += -I$(top_srcdir)/include/odp/arch/@ARCH_ABI@ +AM_CPPFLAGS += -I$(top_builddir)/include +AM_CPPFLAGS += -Iinclude +AM_CPPFLAGS += -I$(srcdir) +AM_CPPFLAGS += -I$(top_srcdir)/platform/$(with_platform)/arch/$(ARCH_DIR) +AM_CPPFLAGS += -I$(top_srcdir)/platform/$(with_platform)/arch/default +AM_CPPFLAGS += -DSYSCONFDIR=\"@sysconfdir@\" + +AM_CPPFLAGS += $(DPDK_CPPFLAGS) +AM_CPPFLAGS += $(OPENSSL_CPPFLAGS) +AM_CPPFLAGS += $(LIBCONFIG_CFLAGS) + +include_HEADERS = \ + $(top_srcdir)/include/odp.h \ + $(top_srcdir)/include/odp_api.h \ + $(top_srcdir)/include/odp_drv.h + +odpincludedir= $(includedir)/odp +odpinclude_HEADERS = \ + $(srcdir)/include/odp/visibility_begin.h \ + $(srcdir)/include/odp/visibility_end.h + +odpapiincludedir= $(includedir)/odp/api +odpapiinclude_HEADERS = \ + $(srcdir)/include/odp/api/align.h \ + $(srcdir)/include/odp/api/atomic.h \ + $(srcdir)/include/odp/api/barrier.h \ + $(srcdir)/include/odp/api/buffer.h \ + $(srcdir)/include/odp/api/byteorder.h \ + $(srcdir)/include/odp/api/classification.h \ + $(srcdir)/include/odp/api/compiler.h \ + $(srcdir)/include/odp/api/cpu.h \ + $(srcdir)/include/odp/api/cpumask.h \ + $(srcdir)/include/odp/api/crypto.h \ + $(srcdir)/include/odp/api/debug.h \ + $(srcdir)/include/odp/api/deprecated.h \ + $(srcdir)/include/odp/api/errno.h \ + $(srcdir)/include/odp/api/event.h \ + $(srcdir)/include/odp/api/feature.h \ + $(srcdir)/include/odp/api/hash.h \ + $(srcdir)/include/odp/api/hints.h \ + $(srcdir)/include/odp/api/init.h \ + $(srcdir)/include/odp/api/ipsec.h \ + $(srcdir)/include/odp/api/packet_flags.h \ + $(srcdir)/include/odp/api/packet.h \ + $(srcdir)/include/odp/api/packet_io.h \ + $(srcdir)/include/odp/api/packet_io_stats.h \ + $(srcdir)/include/odp/api/pool.h \ + $(srcdir)/include/odp/api/queue.h \ + $(srcdir)/include/odp/api/random.h \ + $(srcdir)/include/odp/api/rwlock.h \ + $(srcdir)/include/odp/api/rwlock_recursive.h \ + $(srcdir)/include/odp/api/schedule.h \ + $(srcdir)/include/odp/api/schedule_types.h \ + $(srcdir)/include/odp/api/shared_memory.h \ + $(srcdir)/include/odp/api/spinlock.h \ + $(srcdir)/include/odp/api/spinlock_recursive.h \ + $(srcdir)/include/odp/api/std_clib.h \ + $(srcdir)/include/odp/api/std_types.h \ + $(srcdir)/include/odp/api/support.h \ + $(srcdir)/include/odp/api/sync.h \ + $(srcdir)/include/odp/api/system_info.h \ + $(srcdir)/include/odp/api/thread.h \ + $(srcdir)/include/odp/api/thrmask.h \ + $(srcdir)/include/odp/api/ticketlock.h \ + $(srcdir)/include/odp/api/time.h \ + $(srcdir)/include/odp/api/timer.h \ + $(srcdir)/include/odp/api/traffic_mngr.h \ + $(srcdir)/include/odp/api/version.h + +if ARCH_IS_ARM +odpapiinclude_HEADERS += $(srcdir)/arch/arm/odp/api/cpu_arch.h +endif +if ARCH_IS_MIPS64 +odpapiinclude_HEADERS += $(srcdir)/arch/mips64/odp/api/cpu_arch.h +endif +if ARCH_IS_POWERPC +odpapiinclude_HEADERS += $(srcdir)/arch/powerpc/odp/api/cpu_arch.h +endif +if ARCH_IS_X86 +odpapiinclude_HEADERS += $(srcdir)/arch/x86/odp/api/cpu_arch.h +endif + +odpapiplatincludedir= $(includedir)/odp/api/plat +odpapiplatinclude_HEADERS = \ + $(builddir)/include/odp/api/plat/static_inline.h \ + $(srcdir)/include/odp/api/plat/atomic_inlines.h \ + $(srcdir)/include/odp/api/plat/atomic_types.h \ + $(srcdir)/include/odp/api/plat/barrier_types.h \ + $(srcdir)/include/odp/api/plat/buffer_types.h \ + $(srcdir)/include/odp/api/plat/byteorder_inlines.h \ + $(srcdir)/include/odp/api/plat/byteorder_types.h \ + $(srcdir)/include/odp/api/plat/classification_types.h \ + $(srcdir)/include/odp/api/plat/cpumask_types.h \ + $(srcdir)/include/odp/api/plat/crypto_types.h \ + $(srcdir)/include/odp/api/plat/event_types.h \ + $(srcdir)/include/odp/api/plat/init_types.h \ + $(srcdir)/include/odp/api/plat/ipsec_types.h \ + $(srcdir)/include/odp/api/plat/packet_flag_inlines.h \ + $(srcdir)/include/odp/api/plat/packet_flag_inlines_api.h \ + $(srcdir)/include/odp/api/plat/packet_inlines.h \ + $(srcdir)/include/odp/api/plat/packet_inlines_api.h \ + $(srcdir)/include/odp/api/plat/packet_io_types.h \ + $(srcdir)/include/odp/api/plat/packet_types.h \ + $(srcdir)/include/odp/api/plat/pool_types.h \ + $(srcdir)/include/odp/api/plat/queue_types.h \ + $(srcdir)/include/odp/api/plat/rwlock_types.h \ + $(srcdir)/include/odp/api/plat/rwlock_recursive_types.h \ + $(srcdir)/include/odp/api/plat/schedule_types.h \ + $(srcdir)/include/odp/api/plat/shared_memory_types.h \ + $(srcdir)/include/odp/api/plat/spinlock_types.h \ + $(srcdir)/include/odp/api/plat/spinlock_recursive_types.h \ + $(srcdir)/include/odp/api/plat/std_clib_inlines.h \ + $(srcdir)/include/odp/api/plat/strong_types.h \ + $(srcdir)/include/odp/api/plat/sync_inlines.h \ + $(srcdir)/include/odp/api/plat/thread_types.h \ + $(srcdir)/include/odp/api/plat/thrmask_types.h \ + $(srcdir)/include/odp/api/plat/ticketlock_inlines.h \ + $(srcdir)/include/odp/api/plat/ticketlock_inlines_api.h \ + $(srcdir)/include/odp/api/plat/ticketlock_types.h \ + $(srcdir)/include/odp/api/plat/time_types.h \ + $(srcdir)/include/odp/api/plat/timer_types.h \ + $(srcdir)/include/odp/api/plat/traffic_mngr_types.h \ + $(srcdir)/include/odp/api/plat/version_types.h + +odpdrvincludedir = $(includedir)/odp/drv +odpdrvinclude_HEADERS = \ + $(srcdir)/include/odp/drv/align.h \ + $(srcdir)/include/odp/drv/atomic.h \ + $(srcdir)/include/odp/drv/barrier.h \ + $(srcdir)/include/odp/drv/byteorder.h \ + $(srcdir)/include/odp/drv/compiler.h \ + $(srcdir)/include/odp/drv/driver.h \ + $(srcdir)/include/odp/drv/hints.h \ + $(srcdir)/include/odp/drv/shm.h \ + $(srcdir)/include/odp/drv/spinlock.h \ + $(srcdir)/include/odp/drv/std_types.h \ + $(srcdir)/include/odp/drv/sync.h + +odpdrvplatincludedir = $(includedir)/odp/drv/plat +odpdrvplatinclude_HEADERS = \ + $(srcdir)/include/odp/drv/plat/atomic_types.h \ + $(srcdir)/include/odp/drv/plat/barrier_types.h \ + $(srcdir)/include/odp/drv/plat/byteorder_types.h \ + $(srcdir)/include/odp/drv/compiler.h \ + $(srcdir)/include/odp/drv/plat/driver_types.h \ + $(srcdir)/include/odp/drv/plat/shm_types.h \ + $(srcdir)/include/odp/drv/plat/spinlock_types.h \ + $(srcdir)/include/odp/drv/plat/strong_types.h + + +noinst_HEADERS = \ + ${top_srcdir}/platform/linux-generic/include/odp_buffer_subsystem.h \ + ${top_srcdir}/platform/linux-generic/include/_fdserver_internal.h \ + ${top_srcdir}/platform/linux-generic/include/_ishm_internal.h \ + ${top_srcdir}/platform/linux-generic/include/_ishmphy_internal.h \ + ${top_srcdir}/platform/linux-generic/include/_ishmpool_internal.h \ + ${top_srcdir}/platform/linux-generic/include/drv_driver_internal.h\ + ${top_srcdir}/platform/linux-generic/include/odp_align_internal.h \ + ${top_srcdir}/platform/linux-generic/include/odp_atomic_internal.h \ + ${srcdir}/include/odp_buffer_inlines.h \ + ${srcdir}/include/odp_buffer_internal.h \ + ${top_srcdir}/platform/linux-generic/include/odp_bitmap_internal.h \ + ${top_srcdir}/platform/linux-generic/include/odp_classification_internal.h \ + ${srcdir}/include/odp_config_internal.h \ + ${top_srcdir}/platform/linux-generic/include/odp_debug_internal.h \ + ${top_srcdir}/platform/linux-generic/include/odp_classification_datamodel.h \ + ${top_srcdir}/platform/linux-generic/include/odp_classification_inlines.h \ + ${top_srcdir}/platform/linux-generic/include/odp_classification_internal.h \ + ${top_srcdir}/platform/linux-generic/include/odp_crypto_internal.h \ + ${top_srcdir}/platform/linux-generic/include/odp_forward_typedefs_internal.h \ + ${top_srcdir}/platform/linux-generic/include/odp_internal.h \ ++ ${top_srcdir}/platform/linux-generic/include/odp_ipsec_internal.h \ + ${srcdir}/pktio/dpdk.h \ + ${srcdir}/include/odp_packet_internal.h \ + ${top_srcdir}/platform/linux-generic/include/odp_pktio_ops_ipc.h \ + ${top_srcdir}/platform/linux-generic/include/odp_pktio_ops_subsystem.h \ + ${top_srcdir}/platform/linux-generic/include/odp_pktio_ops_socket.h \ + ${top_srcdir}/platform/linux-generic/include/odp_pktio_ops_loopback.h \ + ${top_srcdir}/platform/linux-generic/include/odp_name_table_internal.h \ + ${top_srcdir}/platform/linux-generic/include/odp_packet_io_internal.h \ + ${srcdir}/include/odp_errno_define.h \ + ${top_srcdir}/platform/linux-generic/include/odp_packet_io_ring_internal.h \ + ${top_srcdir}/platform/linux-generic/include/odp_pkt_queue_internal.h \ + ${srcdir}/include/odp_pool_internal.h \ + ${top_srcdir}/platform/linux-generic/include/odp_pool_subsystem.h \ + ${srcdir}/include/odp_posix_extensions.h \ + ${top_srcdir}/platform/linux-generic/include/odp_queue_internal.h \ + ${top_srcdir}/platform/linux-generic/include/odp_queue_if.h \ + ${top_srcdir}/platform/linux-generic/include/odp_queue_subsystem.h \ + ${top_srcdir}/platform/linux-generic/include/odp_ring_internal.h \ + ${top_srcdir}/platform/linux-generic/include/odp_schedule_if.h \ + ${top_srcdir}/platform/linux-generic/include/odp_schedule_subsystem.h \ + ${top_srcdir}/platform/linux-generic/include/odp_sorted_list_internal.h \ + ${top_srcdir}/platform/linux-generic/include/odp_shm_internal.h \ + ${top_srcdir}/platform/linux-generic/include/odp_time_internal.h \ + ${top_srcdir}/platform/linux-generic/include/odp_timer_internal.h \ + ${top_srcdir}/platform/linux-generic/include/odp_timer_wheel_internal.h \ + ${top_srcdir}/platform/linux-generic/include/odp_traffic_mngr_internal.h \ + ${srcdir}/include/protocols/eth.h \ + ${srcdir}/include/protocols/ip.h \ + ${srcdir}/include/protocols/ipsec.h \ + ${srcdir}/include/protocols/tcp.h \ + ${srcdir}/include/protocols/udp.h \ + ${srcdir}/Makefile.inc + +__LIB__libodp_dpdk_la_SOURCES = \ + ../linux-generic/_fdserver.c \ + ../linux-generic/_ishm.c \ + ../linux-generic/_ishmphy.c \ + ../linux-generic/_ishmpool.c \ + ../linux-generic/_modules.c \ + ../linux-generic/odp_atomic.c \ + ../linux-generic/odp_barrier.c \ + ../linux-generic/odp_bitmap.c \ + buffer/dpdk.c \ + ../linux-generic/odp_byteorder.c \ + ../linux-generic/odp_chksum.c \ + ../linux-generic/odp_classification.c \ + ../linux-generic/odp_cpu.c \ + ../linux-generic/odp_cpumask.c \ + ../linux-generic/odp_cpumask_task.c \ + odp_crypto.c \ + odp_errno.c \ + ../linux-generic/odp_event.c \ + ../linux-generic/odp_hash.c \ + odp_init.c \ + ../linux-generic/odp_impl.c \ + ../linux-generic/odp_ipsec.c \ ++ ../linux-generic/odp_ipsec_events.c \ ++ ../linux-generic/odp_ipsec_sad.c \ + ../linux-generic/odp_name_table.c \ + odp_packet.c \ + pktio/dpdk.c \ + ../linux-generic/pktio/subsystem.c \ + odp_packet_flags.c \ + ../linux-generic/odp_packet_io.c \ + ../linux-generic/pktio/loopback.c \ + ../linux-generic/odp_pkt_queue.c \ + pool/dpdk.c \ + ../linux-generic/odp_queue_if.c \ + ../linux-generic/queue/subsystem.c \ + ../linux-generic/queue/generic.c \ + ../linux-generic/queue/scalable.c \ + ../linux-generic/odp_rwlock.c \ + ../linux-generic/odp_rwlock_recursive.c \ + ../linux-generic/pool/subsystem.c \ + ../linux-generic/buffer/subsystem.c \ + ../linux-generic/odp_schedule_if.c \ + ../linux-generic/schedule/generic.c \ + ../linux-generic/schedule/iquery.c \ + ../linux-generic/schedule/scalable.c \ + ../linux-generic/schedule/scalable_ordered.c \ + ../linux-generic/schedule/sp.c \ + ../linux-generic/schedule/subsystem.c \ + ../linux-generic/odp_shared_memory.c \ + ../linux-generic/odp_sorted_list.c \ + ../linux-generic/odp_spinlock.c \ + ../linux-generic/odp_spinlock_recursive.c \ + odp_std_clib.c \ + ../linux-generic/odp_sync.c \ + ../linux-generic/odp_system_info.c \ + odp_thread.c \ + ../linux-generic/odp_thrmask.c \ + ../linux-generic/odp_ticketlock.c \ + odp_time.c \ + ../linux-generic/odp_timer.c \ + ../linux-generic/odp_timer_wheel.c \ + ../linux-generic/odp_traffic_mngr.c \ + ../linux-generic/odp_version.c \ + ../linux-generic/odp_weak.c \ + ../linux-generic/drv_atomic.c \ + ../linux-generic/drv_barrier.c \ + ../linux-generic/drv_driver.c \ + ../linux-generic/drv_shm.c \ + ../linux-generic/drv_spinlock.c + +if ARCH_IS_ARM +__LIB__libodp_dpdk_la_SOURCES += arch/arm/odp_cpu_arch.c \ + arch/arm/odp_cpu_cycles.c \ + arch/arm/odp_global_time.c \ + arch/arm/odp_sysinfo_parse.c +endif +if ARCH_IS_AARCH64 +__LIB__libodp_dpdk_la_SOURCES += arch/default/odp_cpu_arch.c \ + arch/default/odp_cpu_cycles.c \ + arch/aarch64/odp_global_time.c \ + arch/default/odp_sysinfo_parse.c +endif +if ARCH_IS_MIPS64 +__LIB__libodp_dpdk_la_SOURCES += arch/mips64/odp_cpu_arch.c \ + arch/default/odp_cpu_cycles.c \ + arch/default/odp_global_time.c \ + arch/mips64/odp_sysinfo_parse.c +endif +if ARCH_IS_POWERPC +__LIB__libodp_dpdk_la_SOURCES += arch/powerpc/odp_cpu_arch.c \ + arch/default/odp_cpu_cycles.c \ + arch/default/odp_global_time.c \ + arch/powerpc/odp_sysinfo_parse.c +endif +if ARCH_IS_X86 +__LIB__libodp_dpdk_la_SOURCES += arch/x86/cpu_flags.c \ + arch/x86/odp_cpu_arch.c \ + arch/default/odp_cpu_cycles.c \ + arch/x86/odp_global_time.c \ + arch/x86/odp_sysinfo_parse.c +endif + +pool/dpdk.lo: AM_CFLAGS += -DIM_ACTIVE_MODULE +buffer/dpdk.lo: AM_CFLAGS += -DIM_ACTIVE_MODULE +if ODP_SCHEDULE_SCALABLE +../linux-generic/schedule/scalable.lo: AM_CFLAGS += -DIM_ACTIVE_MODULE +else +if ODP_SCHEDULE_SP +../linux-generic/schedule/sp.lo: AM_CFLAGS += -DIM_ACTIVE_MODULE +else +if ODP_SCHEDULE_IQUERY +../linux-generic/schedule/iquery.lo: AM_CFLAGS += -DIM_ACTIVE_MODULE +else +../linux-generic/schedule/generic.lo: AM_CFLAGS += -DIM_ACTIVE_MODULE +endif +endif +endif +if ODP_SCHEDULE_SCALABLE +../linux-generic/queue/scalable.lo: AM_CFLAGS += -DIM_ACTIVE_MODULE +else +../linux-generic/queue/generic.lo: AM_CFLAGS += -DIM_ACTIVE_MODULE +endif + +# Build modular framework into odp-linux library +modularframeworkdir = $(top_srcdir)/frameworks/modular +noinst_HEADERS += $(modularframeworkdir)/list.h \ + $(modularframeworkdir)/odp_module.h + +__LIB__libodp_dpdk_la_SOURCES += ../../frameworks/modular/odp_module.c + +__LIB__libodp_dpdk_la_LIBADD = $(ATOMIC_LIBS) +__LIB__libodp_dpdk_la_LIBADD += $(DPDK_LIBS) +__LIB__libodp_dpdk_la_LIBADD += $(OPENSSL_LIBS) +__LIB__libodp_dpdk_la_LIBADD += $(PTHREAD_LIBS) +__LIB__libodp_dpdk_la_LIBADD += $(TIMER_LIBS) +__LIB__libodp_dpdk_la_LIBADD += $(LIBCONFIG_LIBS) + +# Create symlink for ABI header files. Application does not need to use the arch +# specific include path for installed files. +install-data-hook: + if [ -h $(DESTDIR)$(prefix)/include/odp/api/abi ]; then \ + : ; \ + else \ + $(LN_S) -rf $(DESTDIR)$(prefix)/include/odp/arch/@ARCH_ABI@/odp/api/abi \ + $(DESTDIR)$(prefix)/include/odp/api/abi; \ + fi diff --cc platform/linux-dpdk/include/odp/api/plat/timer_types.h index c81d7be7,00000000..2ae8bfec mode 100644,000000..100644 --- a/platform/linux-dpdk/include/odp/api/plat/timer_types.h +++ b/platform/linux-dpdk/include/odp/api/plat/timer_types.h @@@ -1,50 -1,0 +1,50 @@@ +/* Copyright (c) 2013, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +/** + * @file + * + * ODP timer service + */ + +#ifndef ODP_TIMER_TYPES_H_ +#define ODP_TIMER_TYPES_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#include <odp/api/plat/strong_types.h> + +/** @addtogroup odp_timer + * @{ + **/ + - struct odp_timer_pool_s; /**< Forward declaration */ ++struct timer_pool_s; /**< Forward declaration */ + - typedef struct odp_timer_pool_s *odp_timer_pool_t; ++typedef struct timer_pool_s *odp_timer_pool_t; + +#define ODP_TIMER_POOL_INVALID NULL + +#define ODP_TIMER_POOL_NAME_LEN 32 + +typedef ODP_HANDLE_T(odp_timer_t); + +#define ODP_TIMER_INVALID _odp_cast_scalar(odp_timer_t, 0xffffffff) + +typedef ODP_HANDLE_T(odp_timeout_t); + +#define ODP_TIMEOUT_INVALID _odp_cast_scalar(odp_timeout_t, 0xffffffff) + +/** + * @} + */ + +#ifdef __cplusplus +} +#endif + +#endif diff --cc platform/linux-dpdk/include/odp_packet_internal.h index 66159cae,00000000..16a58334 mode 100644,000000..100644 --- a/platform/linux-dpdk/include/odp_packet_internal.h +++ b/platform/linux-dpdk/include/odp_packet_internal.h @@@ -1,247 -1,0 +1,262 @@@ +/* Copyright (c) 2014, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +/** + * @file + * + * ODP packet descriptor - implementation internal + */ + +#ifndef ODP_PACKET_INTERNAL_H_ +#define ODP_PACKET_INTERNAL_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#include <odp/api/align.h> +#include <odp_debug_internal.h> +#include <odp/api/debug.h> +#include <odp_buffer_internal.h> +#include <odp_buffer_inlines.h> +#include <odp_pool_internal.h> +#include <odp/api/packet.h> +#include <odp/api/packet_io.h> +#include <odp/api/crypto.h> +#include <odp_crypto_internal.h> ++#include <odp_ipsec_internal.h> +#include <protocols/eth.h> +#include <odp/api/plat/packet_types.h> +#include <odp_queue_if.h> + +#include <rte_acl_osdep.h> + +/** Minimum segment length expected by packet_parse_common() */ +#define PACKET_PARSE_SEG_LEN 96 + +ODP_STATIC_ASSERT(sizeof(_odp_packet_input_flags_t) == sizeof(uint64_t), + "INPUT_FLAGS_SIZE_ERROR"); + +/** + * Packet error flags + */ +typedef union { + /* All error flags */ + uint32_t all; + + struct { + /* Bitfield flags for each detected error */ + uint32_t app_error:1; /**< Error bit for application use */ + uint32_t frame_len:1; /**< Frame length error */ + uint32_t snap_len:1; /**< Snap length error */ + uint32_t l2_chksum:1; /**< L2 checksum error, checks TBD */ + uint32_t ip_err:1; /**< IP error, checks TBD */ + uint32_t tcp_err:1; /**< TCP error, checks TBD */ + uint32_t udp_err:1; /**< UDP error, checks TBD */ + }; +} error_flags_t; + +ODP_STATIC_ASSERT(sizeof(error_flags_t) == sizeof(uint32_t), + "ERROR_FLAGS_SIZE_ERROR"); + +/** + * Packet output flags + */ +typedef union { + /* All output flags */ + uint32_t all; + + struct { + /** adjustment for traffic mgr */ + uint32_t shaper_len_adj:8; + + /* Bitfield flags for each output option */ + uint32_t l3_chksum_set:1; /**< L3 chksum bit is valid */ + uint32_t l3_chksum:1; /**< L3 chksum override */ + uint32_t l4_chksum_set:1; /**< L3 chksum bit is valid */ + uint32_t l4_chksum:1; /**< L4 chksum override */ + }; +} output_flags_t; + +ODP_STATIC_ASSERT(sizeof(output_flags_t) == sizeof(uint32_t), + "OUTPUT_FLAGS_SIZE_ERROR"); + +/** + * Packet parser metadata + */ +typedef struct { + _odp_packet_input_flags_t input_flags; + error_flags_t error_flags; + output_flags_t output_flags; + + uint32_t l2_offset; /**< offset to L2 hdr, e.g. Eth */ + uint32_t l3_offset; /**< offset to L3 hdr, e.g. IPv4, IPv6 */ + uint32_t l4_offset; /**< offset to L4 hdr (TCP, UDP, SCTP, also ICMP) */ +} packet_parser_t; + +/** + * Internal Packet header + * + * To optimize fast path performance this struct is not initialized to zero in + * packet_init(). Because of this any new fields added must be reviewed for + * initialization requirements. + */ +typedef struct { + /* common buffer header */ + odp_buffer_hdr_t buf_hdr; + + /* + * Following members are initialized by packet_init() + */ + + packet_parser_t p; + + odp_pktio_t input; + + /* + * Members below are not initialized by packet_init() + */ + + /* Timestamp value */ + odp_time_t timestamp; + + /* Classifier destination queue */ + queue_t dst_queue; + + /* Result for crypto packet op */ + odp_crypto_packet_result_t crypto_op_result; ++ ++ /* Context for IPsec */ ++ odp_ipsec_packet_result_t ipsec_ctx; +} odp_packet_hdr_t __rte_cache_aligned; + +/** + * Return the packet header + */ +static inline odp_packet_hdr_t *odp_packet_hdr(odp_packet_t pkt) +{ + return (odp_packet_hdr_t *)(uintptr_t)pkt; +} + +static inline struct rte_mbuf *pkt_to_mbuf(odp_packet_hdr_t *pkt_hdr) +{ + return &pkt_hdr->buf_hdr.mb; +} + +static inline odp_buffer_hdr_t *packet_to_buf_hdr(odp_packet_t pkt) +{ + return &odp_packet_hdr(pkt)->buf_hdr; +} + +static inline odp_packet_t packet_from_buf_hdr(odp_buffer_hdr_t *buf_hdr) +{ + return (odp_packet_t)(odp_packet_hdr_t *)buf_hdr; +} + +static inline odp_buffer_t packet_to_buffer(odp_packet_t pkt) +{ + return (odp_buffer_t)pkt; +} + +static inline void copy_packet_parser_metadata(odp_packet_hdr_t *src_hdr, + odp_packet_hdr_t *dst_hdr) +{ + dst_hdr->p = src_hdr->p; +} + +static inline void copy_packet_cls_metadata(odp_packet_hdr_t *src_hdr, + odp_packet_hdr_t *dst_hdr) +{ + dst_hdr->p = src_hdr->p; + dst_hdr->dst_queue = src_hdr->dst_queue; + dst_hdr->timestamp = src_hdr->timestamp; +} + +static inline uint32_t packet_len(odp_packet_hdr_t *pkt_hdr) +{ + return rte_pktmbuf_pkt_len(&pkt_hdr->buf_hdr.mb); +} + +static inline void packet_set_len(odp_packet_hdr_t *pkt_hdr, uint32_t len) +{ + rte_pktmbuf_pkt_len(&pkt_hdr->buf_hdr.mb) = len; +} + +/* Forward declarations */ +int _odp_packet_copy_md_to_packet(odp_packet_t srcpkt, odp_packet_t dstpkt); + +/* Perform packet parse up to a given protocol layer */ +int packet_parse_layer(odp_packet_hdr_t *pkt_hdr, + odp_pktio_parser_layer_t layer); + ++/* Perform L3 and L4 parsing up to a given protocol layer */ ++int packet_parse_l3_l4(odp_packet_hdr_t *pkt_hdr, ++ odp_pktio_parser_layer_t layer, ++ uint32_t l3_offset, ++ uint16_t ethtype); ++ +/* Reset parser metadata for a new parse */ +static inline void packet_parse_reset(odp_packet_hdr_t *pkt_hdr) +{ + /* Reset parser metadata before new parse */ + pkt_hdr->p.error_flags.all = 0; + pkt_hdr->p.input_flags.all = 0; + pkt_hdr->p.output_flags.all = 0; + pkt_hdr->p.l2_offset = 0; + pkt_hdr->p.l3_offset = ODP_PACKET_OFFSET_INVALID; + pkt_hdr->p.l4_offset = ODP_PACKET_OFFSET_INVALID; +} + +/* Convert a buffer handle to a packet handle */ +odp_packet_t _odp_packet_from_buf_hdr(odp_buffer_hdr_t *buf_hdr); + +static inline int packet_hdr_has_l2(odp_packet_hdr_t *pkt_hdr) +{ + return pkt_hdr->p.input_flags.l2; +} + +static inline void packet_hdr_has_l2_set(odp_packet_hdr_t *pkt_hdr, int val) +{ + pkt_hdr->p.input_flags.l2 = val; +} + +static inline int packet_hdr_has_eth(odp_packet_hdr_t *pkt_hdr) +{ + return pkt_hdr->p.input_flags.eth; +} + +static inline int packet_hdr_has_ipv6(odp_packet_hdr_t *pkt_hdr) +{ + return pkt_hdr->p.input_flags.ipv6; +} + +static inline void packet_set_ts(odp_packet_hdr_t *pkt_hdr, odp_time_t *ts) +{ + if (ts != NULL) { + pkt_hdr->timestamp = *ts; + pkt_hdr->p.input_flags.timestamp = 1; + } +} + +int packet_parse_common(packet_parser_t *pkt_hdr, const uint8_t *ptr, + uint32_t pkt_len, uint32_t seg_len, + odp_pktio_parser_layer_t layer); + ++int _odp_packet_set_data(odp_packet_t pkt, uint32_t offset, ++ uint8_t c, uint32_t len); ++ ++int _odp_packet_cmp_data(odp_packet_t pkt, uint32_t offset, ++ const void *s, uint32_t len); + +/* We can't enforce tailroom reservation for received packets */ +ODP_STATIC_ASSERT(CONFIG_PACKET_TAILROOM == 0, + "ERROR: Tailroom has to be 0, DPDK doesn't support this"); + +#ifdef __cplusplus +} +#endif + +#endif diff --cc platform/linux-dpdk/libodp-dpdk.pc.in index f22e832c,00000000..f22e832c mode 100644,000000..100644 --- a/platform/linux-dpdk/libodp-dpdk.pc.in +++ b/platform/linux-dpdk/libodp-dpdk.pc.in diff --cc platform/linux-dpdk/m4/configure.m4 index 16fdeade,00000000..9d299bf3 mode 100644,000000..100644 --- a/platform/linux-dpdk/m4/configure.m4 +++ b/platform/linux-dpdk/m4/configure.m4 @@@ -1,166 -1,0 +1,176 @@@ +# Enable -fvisibility=hidden if using a gcc that supports it +OLD_CFLAGS="$CFLAGS" +AC_MSG_CHECKING([whether $CC supports -fvisibility=hidden]) +VISIBILITY_CFLAGS="-fvisibility=hidden" +CFLAGS="$CFLAGS $VISIBILITY_CFLAGS" +AC_LINK_IFELSE([AC_LANG_PROGRAM()], AC_MSG_RESULT([yes]), + [VISIBILITY_CFLAGS=""; AC_MSG_RESULT([no])]); + +AC_SUBST(VISIBILITY_CFLAGS) +# Restore CFLAGS; VISIBILITY_CFLAGS are added to it where needed. +CFLAGS=$OLD_CFLAGS + +AC_MSG_CHECKING(for GCC atomic builtins) +AC_LINK_IFELSE( + [AC_LANG_SOURCE( + [[int main() { + int v = 1; + __atomic_fetch_add(&v, 1, __ATOMIC_RELAXED); + __atomic_fetch_sub(&v, 1, __ATOMIC_RELAXED); + __atomic_store_n(&v, 1, __ATOMIC_RELAXED); + __atomic_load_n(&v, __ATOMIC_RELAXED); + return 0; + } + ]])], + AC_MSG_RESULT(yes), + AC_MSG_RESULT(no) + echo "GCC-style __atomic builtins not supported by the compiler." + echo "Use newer version. For gcc > 4.7.0" + exit -1) + +dnl Check for libconfig (required) +PKG_CHECK_MODULES([LIBCONFIG], [libconfig >= 1.3.2]) + +dnl Check whether -latomic is needed +use_libatomic=no + +AC_MSG_CHECKING(whether -latomic is needed for 64-bit atomic built-ins) +AC_LINK_IFELSE( + [AC_LANG_SOURCE([[ + static int loc; + int main(void) + { + int prev = __atomic_exchange_n(&loc, 7, __ATOMIC_RELAXED); + return 0; + } + ]])], + [AC_MSG_RESULT(no)], + [AC_MSG_RESULT(yes) + AC_CHECK_LIB( + [atomic], [__atomic_exchange_8], + [use_libatomic=yes], + [AC_MSG_CHECKING([__atomic_exchange_8 is not available])]) + ]) + +AC_MSG_CHECKING(whether -latomic is needed for 128-bit atomic built-ins) +AC_LINK_IFELSE( + [AC_LANG_SOURCE([[ + static __int128 loc; + int main(void) + { + __int128 prev; + prev = __atomic_exchange_n(&loc, 7, __ATOMIC_RELAXED); + return 0; + } + ]])], + [AC_MSG_RESULT(no)], + [AC_MSG_RESULT(yes) + AC_CHECK_LIB( + [atomic], [__atomic_exchange_16], + [use_libatomic=yes], + [AC_MSG_CHECKING([cannot detect support for 128-bit atomics])]) + ]) + +if test "x$use_libatomic" = "xyes"; then + ATOMIC_LIBS="-latomic" +fi +AC_SUBST([ATOMIC_LIBS]) + +# linux-generic PCAP support is not relevant as the code doesn't use +# linux-generic pktio at all. And DPDK has its own PCAP support anyway +AM_CONDITIONAL([HAVE_PCAP], [false]) +AM_CONDITIONAL([netmap_support], [false]) +AM_CONDITIONAL([PKTIO_DPDK], [false]) +m4_include([platform/linux-dpdk/m4/odp_pthread.m4]) - m4_include([platform/linux-dpdk/m4/odp_timer.m4]) - m4_include([platform/linux-dpdk/m4/odp_openssl.m4]) ++ODP_TIMER ++ODP_OPENSSL +m4_include([platform/linux-dpdk/m4/odp_modules.m4]) +m4_include([platform/linux-dpdk/m4/odp_schedule.m4]) + ++m4_include([platform/linux-dpdk/m4/performance.m4]) ++ +########################################################################## +# DPDK build variables +########################################################################## +DPDK_DRIVER_DIR=/usr/lib/$(uname -m)-linux-gnu +AS_CASE($host_cpu, [x86_64], [DPDK_CPPFLAGS="$DPDK_CPPFLAGS -msse4.2"]) +if test "x${SDK_INSTALL_PATH}" = "x"; then + DPDK_CPPFLAGS="$DPDK_CPPFLAGS -I/usr/include/dpdk" +else + DPDK_DRIVER_DIR=$SDK_INSTALL_PATH/lib + DPDK_CPPFLAGS="$DPDK_CPPFLAGS -I$SDK_INSTALL_PATH/include" + DPDK_LDFLAGS="$DPDK_CPPFLAGS -L$SDK_INSTALL_PATH/lib" +fi + +# Check if we should link against the static or dynamic DPDK library +AC_ARG_ENABLE([shared-dpdk], + [ --enable-shared-dpdk link against the shared DPDK library], + [if test "x$enableval" = "xyes"; then + shared_dpdk=true + fi]) + +########################################################################## +# Save and set temporary compilation flags +########################################################################## +OLD_LDFLAGS=$LDFLAGS +OLD_CPPFLAGS=$CPPFLAGS +LDFLAGS="$DPDK_LDFLAGS $LDFLAGS" +CPPFLAGS="$DPDK_CPPFLAGS $CPPFLAGS -pthread" + +########################################################################## +# Check for DPDK availability +########################################################################## +AC_CHECK_HEADERS([rte_config.h], [], + [AC_MSG_FAILURE(["can't find DPDK headers"])]) + +########################################################################## +# In case of static linking DPDK pmd drivers are not linked unless the +# --whole-archive option is used. No spaces are allowed between the +# --whole-arhive flags. +########################################################################## +if test "x$shared_dpdk" = "xtrue"; then + DPDK_LIBS="-Wl,--no-as-needed,-ldpdk,-as-needed -ldl -lm -lpcap" +else + + AS_VAR_SET([DPDK_PMDS], [-Wl,--whole-archive,]) + for filename in $DPDK_DRIVER_DIR/librte_pmd_*.a; do + cur_driver=`basename "$filename" .a | sed -e 's/^lib//'` + # rte_pmd_nfp has external dependencies which break linking + if test "$cur_driver" = "rte_pmd_nfp"; then + echo "skip linking rte_pmd_nfp" + else + AS_VAR_APPEND([DPDK_PMDS], [-l$cur_driver,]) + fi + done + AS_VAR_APPEND([DPDK_PMDS], [--no-whole-archive]) + + DPDK_LIBS="-L$DPDK_DRIVER_DIR -ldpdk -lpthread -ldl -lm -lpcap" + AC_SUBST([DPDK_PMDS]) +fi + +########################################################################## +# Restore old saved variables +########################################################################## +LDFLAGS=$OLD_LDFLAGS +CPPFLAGS=$OLD_CPPFLAGS + +AC_SUBST([DPDK_CPPFLAGS]) +AC_SUBST([DPDK_LDFLAGS]) +AC_SUBST([DPDK_LIBS]) + ++AC_CONFIG_COMMANDS_PRE([dnl ++AM_CONDITIONAL([PLATFORM_IS_LINUX_DPDK], ++ [test "${with_platform}" = "linux-dpdk"]) ++]) ++ +AC_CONFIG_FILES([platform/linux-dpdk/Makefile - platform/linux-dpdk/include/odp/api/plat/static_inline.h]) ++ platform/linux-dpdk/libodp-dpdk.pc ++ platform/linux-dpdk/include/odp/api/plat/static_inline.h ++ platform/linux-dpdk/test/Makefile ++ platform/linux-dpdk/test/validation/api/pktio/Makefile]) + +########################################################################## +# Enable dpdk pktio build +########################################################################## +AC_DEFINE([ODP_PKTIO_DPDK], [1], + [Define to 1 to enable DPDK packet I/O support]) diff --cc platform/linux-dpdk/m4/performance.m4 index 00000000,00000000..fcc3d661 new file mode 120000 --- /dev/null +++ b/platform/linux-dpdk/m4/performance.m4 @@@ -1,0 -1,0 +1,1 @@@ ++../../linux-generic/m4/performance.m4 diff --cc platform/linux-dpdk/odp_init.c index 81b60898,1412c03a..b3c5f5c9 --- a/platform/linux-dpdk/odp_init.c +++ b/platform/linux-dpdk/odp_init.c @@@ -402,12 -223,18 +402,24 @@@ int odp_init_global(odp_instance_t *ins } stage = NAME_TABLE_INIT; + if (_odpdrv_driver_init_global()) { + ODP_ERR("ODP drivers init failed\n"); + goto init_failed; + } + stage = DRIVER_INIT; + + if (_odp_ipsec_events_init_global()) { + ODP_ERR("ODP IPsec events init failed.\n"); + goto init_failed; + } + stage = IPSEC_EVENTS_INIT; + + if (_odp_ipsec_sad_init_global()) { + ODP_ERR("ODP IPsec SAD init failed.\n"); + goto init_failed; + } + stage = IPSEC_SAD_INIT; + if (_odp_modules_init_global()) { ODP_ERR("ODP modules init failed\n"); goto init_failed; @@@ -440,13 -265,20 +450,27 @@@ int _odp_term_global(enum init_stage st switch (stage) { case ALL_INIT: case MODULES_INIT: + case IPSEC_SAD_INIT: + if (_odp_ipsec_sad_term_global()) { + ODP_ERR("ODP IPsec SAD term failed.\n"); + rc = -1; + } + /* Fall through */ + + case IPSEC_EVENTS_INIT: + if (_odp_ipsec_events_term_global()) { + ODP_ERR("ODP IPsec events term failed.\n"); + rc = -1; + } + /* Fall through */ + + case DRIVER_INIT: + if (_odpdrv_driver_term_global()) { + ODP_ERR("driver term failed.\n"); + rc = -1; + } + /* Fall through */ + case NAME_TABLE_INIT: if (_odp_int_name_tbl_term_global()) { ODP_ERR("Name table term failed.\n"); @@@ -592,11 -424,17 +616,17 @@@ int odp_init_local(odp_instance_t insta } stage = POOL_INIT; - if (queue_fn->init_local()) { - ODP_ERR("ODP queue local init failed.\n"); + if (odp_schedule_init_local()) { + ODP_ERR("ODP schedule local init failed.\n"); goto init_fail; } - /* stage = SCHED_INIT; */ - stage = QUEUE_INIT; ++ stage = SCHED_INIT; + - if (sched_fn->init_local()) { - ODP_ERR("ODP schedule local init failed.\n"); ++ if (_odpdrv_driver_init_local()) { ++ ODP_ERR("ODP driver local init failed.\n"); + goto init_fail; + } - /* stage = SCHED_INIT; */ ++ /* stage = DRIVER_INIT; */ return 0; diff --cc platform/linux-dpdk/odp_packet.c index 103f6f7a,00000000..2391f13d mode 100644,000000..100644 --- a/platform/linux-dpdk/odp_packet.c +++ b/platform/linux-dpdk/odp_packet.c @@@ -1,1510 -1,0 +1,1667 @@@ +/* Copyright (c) 2013, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <config.h> + +#include <odp/api/plat/packet_inlines.h> +#include <odp/api/packet.h> +#include <odp_packet_internal.h> +#include <odp_debug_internal.h> +#include <odp/api/hints.h> +#include <odp/api/byteorder.h> + +#include <protocols/eth.h> +#include <protocols/ip.h> +#include <protocols/tcp.h> +#include <protocols/udp.h> + +#include <string.h> +#include <stdio.h> +#include <stddef.h> +#include <inttypes.h> + +#include <odp/visibility_begin.h> + +/* Fill in packet header field offsets for inline functions */ + +const _odp_packet_inline_offset_t _odp_packet_inline ODP_ALIGNED_CACHE = { + .mb = offsetof(odp_packet_hdr_t, buf_hdr.mb), + .pool = offsetof(odp_packet_hdr_t, buf_hdr.pool_hdl), + .input = offsetof(odp_packet_hdr_t, input), + .user_ptr = offsetof(odp_packet_hdr_t, buf_hdr.buf_ctx), + .timestamp = offsetof(odp_packet_hdr_t, timestamp), + .input_flags = offsetof(odp_packet_hdr_t, p.input_flags), + .buf_addr = offsetof(odp_packet_hdr_t, buf_hdr.mb) + + offsetof(const struct rte_mbuf, buf_addr), + .data = offsetof(odp_packet_hdr_t, buf_hdr.mb) + + offsetof(struct rte_mbuf, data_off), + .pkt_len = offsetof(odp_packet_hdr_t, buf_hdr.mb) + + (size_t)&rte_pktmbuf_pkt_len((struct rte_mbuf *)0), + .seg_len = offsetof(odp_packet_hdr_t, buf_hdr.mb) + + (size_t)&rte_pktmbuf_data_len((struct rte_mbuf *)0), + .nb_segs = offsetof(odp_packet_hdr_t, buf_hdr.mb) + + offsetof(struct rte_mbuf, nb_segs), + .udata = sizeof(odp_packet_hdr_t), + .rss = offsetof(odp_packet_hdr_t, buf_hdr.mb) + + offsetof(struct rte_mbuf, hash.rss), + .ol_flags = offsetof(odp_packet_hdr_t, buf_hdr.mb) + + offsetof(struct rte_mbuf, ol_flags), + .rss_flag = PKT_RX_RSS_HASH +}; + +#include <odp/visibility_end.h> + +struct rte_mbuf dummy; +ODP_STATIC_ASSERT(sizeof(dummy.data_off) == sizeof(uint16_t), + "data_off should be uint16_t"); +ODP_STATIC_ASSERT(sizeof(dummy.pkt_len) == sizeof(uint32_t), + "pkt_len should be uint32_t"); +ODP_STATIC_ASSERT(sizeof(dummy.data_len) == sizeof(uint16_t), + "data_len should be uint16_t"); +ODP_STATIC_ASSERT(sizeof(dummy.hash.rss) == sizeof(uint32_t), + "hash.rss should be uint32_t"); +ODP_STATIC_ASSERT(sizeof(dummy.ol_flags) == sizeof(uint64_t), + "ol_flags should be uint64_t"); +/* + * + * Alloc and free + * ******************************************************** + * + */ + +static inline odp_buffer_t buffer_handle(odp_packet_hdr_t *pkt_hdr) +{ + return pkt_hdr->buf_hdr.handle.handle; +} + +static inline odp_packet_hdr_t *buf_to_packet_hdr(odp_buffer_t buf) +{ + return (odp_packet_hdr_t *)buf_hdl_to_hdr(buf); +} + +static odp_packet_t packet_alloc(odp_pool_t pool_hdl, uint32_t len) +{ + pool_entry_dp_t *pool_dp; + odp_packet_t pkt; + uintmax_t totsize = RTE_PKTMBUF_HEADROOM + len; + odp_packet_hdr_t *pkt_hdr; + struct rte_mbuf *mbuf; + + ODP_ASSERT(odp_pool_to_entry_cp(pool_hdl)->params.type + == ODP_POOL_PACKET); + + pool_dp = odp_pool_to_entry_dp(pool_hdl); + + mbuf = rte_pktmbuf_alloc(pool_dp->rte_mempool); + if (mbuf == NULL) { + rte_errno = ENOMEM; + return ODP_PACKET_INVALID; + } + pkt_hdr = (odp_packet_hdr_t *)mbuf; + pkt_hdr->buf_hdr.totsize = mbuf->buf_len; + + if (mbuf->buf_len < totsize) { + intmax_t needed = totsize - mbuf->buf_len; + struct rte_mbuf *curseg = mbuf; + + do { + struct rte_mbuf *nextseg = + rte_pktmbuf_alloc(pool_dp->rte_mempool); + + if (nextseg == NULL) { + rte_pktmbuf_free(mbuf); + return ODP_PACKET_INVALID; + } + + curseg->next = nextseg; + curseg = nextseg; + curseg->data_off = 0; + pkt_hdr->buf_hdr.totsize += curseg->buf_len; + needed -= curseg->buf_len; + } while (needed > 0); + } + + pkt = (odp_packet_t)mbuf; + + if (odp_packet_reset(pkt, len) != 0) + return ODP_PACKET_INVALID; + + return pkt; +} + +odp_packet_t odp_packet_alloc(odp_pool_t pool_hdl, uint32_t len) +{ + return packet_alloc(pool_hdl, len); +} + +int odp_packet_alloc_multi(odp_pool_t pool_hdl, uint32_t len, + odp_packet_t pkt[], int num) +{ + int i; + + for (i = 0; i < num; i++) { + pkt[i] = packet_alloc(pool_hdl, len); + if (pkt[i] == ODP_PACKET_INVALID) + return rte_errno == ENOMEM ? i : -EINVAL; + } + return i; +} + +void odp_packet_free(odp_packet_t pkt) +{ + struct rte_mbuf *mbuf = (struct rte_mbuf *)pkt; + rte_pktmbuf_free(mbuf); +} + +void odp_packet_free_multi(const odp_packet_t pkt[], int num) +{ + int i; + + for (i = 0; i < num; i++) { + struct rte_mbuf *mbuf = (struct rte_mbuf *)pkt[i]; + + rte_pktmbuf_free(mbuf); + } +} + +int odp_packet_reset(odp_packet_t pkt, uint32_t len) +{ + odp_packet_hdr_t *const pkt_hdr = odp_packet_hdr(pkt); + struct rte_mbuf *ms, *mb = &pkt_hdr->buf_hdr.mb; + uint8_t nb_segs = 0; + int32_t lenleft = len; + + if (RTE_PKTMBUF_HEADROOM + len > odp_packet_buf_len(pkt)) { + ODP_DBG("Not enought head room for that packet %d/%d\n", + RTE_PKTMBUF_HEADROOM + len, + odp_packet_buf_len(pkt)); + return -1; + } + + pkt_hdr->p.input_flags.all = 0; + pkt_hdr->p.output_flags.all = 0; + pkt_hdr->p.error_flags.all = 0; + + pkt_hdr->p.l2_offset = 0; + pkt_hdr->p.l3_offset = ODP_PACKET_OFFSET_INVALID; + pkt_hdr->p.l4_offset = ODP_PACKET_OFFSET_INVALID; + + pkt_hdr->buf_hdr.next = NULL; + + pkt_hdr->input = ODP_PKTIO_INVALID; + pkt_hdr->buf_hdr.event_subtype = ODP_EVENT_PACKET_BASIC; + + mb->port = 0xff; + mb->pkt_len = len; + mb->data_off = RTE_PKTMBUF_HEADROOM; + mb->vlan_tci = 0; + nb_segs = 1; + + if (RTE_PKTMBUF_HEADROOM + lenleft <= mb->buf_len) { + mb->data_len = lenleft; + } else { + mb->data_len = mb->buf_len - RTE_PKTMBUF_HEADROOM; + lenleft -= mb->data_len; + ms = mb->next; + while (lenleft > 0) { + nb_segs++; + ms->data_len = lenleft <= ms->buf_len ? + lenleft : ms->buf_len; + lenleft -= ms->buf_len; + ms = ms->next; + } + } + + mb->nb_segs = nb_segs; + return 0; +} + +odp_packet_t _odp_packet_from_buf_hdr(odp_buffer_hdr_t *buf_hdr) +{ + return (odp_packet_t)buf_hdr; +} + +odp_packet_t odp_packet_from_event(odp_event_t ev) +{ + if (odp_unlikely(ev == ODP_EVENT_INVALID)) + return ODP_PACKET_INVALID; + + return (odp_packet_t)buf_to_packet_hdr((odp_buffer_t)ev); +} + +odp_event_t odp_packet_to_event(odp_packet_t pkt) +{ + if (odp_unlikely(pkt == ODP_PACKET_INVALID)) + return ODP_EVENT_INVALID; + + return (odp_event_t)buffer_handle(odp_packet_hdr(pkt)); +} + +uint32_t odp_packet_buf_len(odp_packet_t pkt) +{ + return odp_packet_hdr(pkt)->buf_hdr.totsize; +} + +void *odp_packet_tail(odp_packet_t pkt) +{ + struct rte_mbuf *mb = &(odp_packet_hdr(pkt)->buf_hdr.mb); + mb = rte_pktmbuf_lastseg(mb); + return (void *)(rte_pktmbuf_mtod(mb, char *) + mb->data_len); +} + +void *odp_packet_push_head(odp_packet_t pkt, uint32_t len) +{ + struct rte_mbuf *mb = &(odp_packet_hdr(pkt)->buf_hdr.mb); + return (void *)rte_pktmbuf_prepend(mb, len); +} + +static void _copy_head_metadata(struct rte_mbuf *newhead, + struct rte_mbuf *oldhead) +{ + odp_packet_t pkt = (odp_packet_t)newhead; + uint32_t saved_index = odp_packet_hdr(pkt)->buf_hdr.index; + + rte_mbuf_refcnt_set(newhead, rte_mbuf_refcnt_read(oldhead)); + newhead->port = oldhead->port; + newhead->ol_flags = oldhead->ol_flags; + newhead->packet_type = oldhead->packet_type; + newhead->vlan_tci = oldhead->vlan_tci; + newhead->hash.rss = 0; + newhead->seqn = oldhead->seqn; + newhead->vlan_tci_outer = oldhead->vlan_tci_outer; + newhead->udata64 = oldhead->udata64; + memcpy(&newhead->tx_offload, &oldhead->tx_offload, + sizeof(odp_packet_hdr_t) - + offsetof(struct rte_mbuf, tx_offload)); + odp_packet_hdr(pkt)->buf_hdr.handle.handle = + (odp_buffer_t)newhead; + odp_packet_hdr(pkt)->buf_hdr.index = saved_index; +} + +int odp_packet_extend_head(odp_packet_t *pkt, uint32_t len, void **data_ptr, + uint32_t *seg_len) +{ + struct rte_mbuf *mb = &(odp_packet_hdr(*pkt)->buf_hdr.mb); + int addheadsize = len - rte_pktmbuf_headroom(mb); + + if (addheadsize > 0) { + struct rte_mbuf *newhead, *t; + uint32_t totsize_change; + int i; + + newhead = rte_pktmbuf_alloc(mb->pool); + if (newhead == NULL) + return -1; + + newhead->data_len = addheadsize % newhead->buf_len; + newhead->pkt_len = addheadsize; + newhead->data_off = newhead->buf_len - newhead->data_len; + newhead->nb_segs = addheadsize / newhead->buf_len + 1; + t = newhead; + + for (i = 0; i < newhead->nb_segs - 1; --i) { + t->next = rte_pktmbuf_alloc(mb->pool); + + if (t->next == NULL) { + rte_pktmbuf_free(newhead); + return -1; + } + /* The intermediate segments are fully used */ + t->data_len = t->buf_len; + t->data_off = 0; + } + totsize_change = newhead->nb_segs * newhead->buf_len; + if (rte_pktmbuf_chain(newhead, mb)) { + rte_pktmbuf_free(newhead); + return -1; + } + /* Expand the original head segment*/ + newhead->pkt_len += rte_pktmbuf_headroom(mb); + mb->data_off = 0; + mb->data_len = mb->buf_len; + _copy_head_metadata(newhead, mb); + mb = newhead; + *pkt = (odp_packet_t)newhead; + odp_packet_hdr(*pkt)->buf_hdr.totsize += totsize_change; + } else { + rte_pktmbuf_prepend(mb, len); + } + + if (data_ptr) + *data_ptr = odp_packet_data(*pkt); + if (seg_len) + *seg_len = mb->data_len; + + return 0; +} + +void *odp_packet_pull_head(odp_packet_t pkt, uint32_t len) +{ + struct rte_mbuf *mb = &(odp_packet_hdr(pkt)->buf_hdr.mb); + return (void *)rte_pktmbuf_adj(mb, len); +} + +int odp_packet_trunc_head(odp_packet_t *pkt, uint32_t len, void **data_ptr, + uint32_t *seg_len) +{ + struct rte_mbuf *mb = &(odp_packet_hdr(*pkt)->buf_hdr.mb); + + if (odp_packet_len(*pkt) < len) + return -1; + + if (len > mb->data_len) { + struct rte_mbuf *newhead = mb, *prev = NULL; + uint32_t left = len; + uint32_t totsize_change = 0; + + while (newhead->next != NULL) { + if (newhead->data_len > left) + break; + left -= newhead->data_len; + totsize_change += newhead->buf_len; + prev = newhead; + newhead = newhead->next; + --mb->nb_segs; + } + newhead->data_off += left; + newhead->nb_segs = mb->nb_segs; + newhead->pkt_len = mb->pkt_len - len; + newhead->data_len -= left; + _copy_head_metadata(newhead, mb); + prev->next = NULL; + rte_pktmbuf_free(mb); + *pkt = (odp_packet_t)newhead; + odp_packet_hdr(*pkt)->buf_hdr.totsize -= totsize_change; + } else { + rte_pktmbuf_adj(mb, len); + } + + if (data_ptr) + *data_ptr = odp_packet_data(*pkt); + if (seg_len) + *seg_len = mb->data_len; + + return 0; +} + +void *odp_packet_push_tail(odp_packet_t pkt, uint32_t len) +{ + struct rte_mbuf *mb = &(odp_packet_hdr(pkt)->buf_hdr.mb); + + return (void *)rte_pktmbuf_append(mb, len); +} + +int odp_packet_extend_tail(odp_packet_t *pkt, uint32_t len, void **data_ptr, + uint32_t *seg_len) +{ + struct rte_mbuf *mb = &(odp_packet_hdr(*pkt)->buf_hdr.mb); + int newtailsize = len - odp_packet_tailroom(*pkt); + uint32_t old_pkt_len = odp_packet_len(*pkt); + + if (data_ptr) + *data_ptr = odp_packet_tail(*pkt); + + if (newtailsize > 0) { + struct rte_mbuf *newtail = rte_pktmbuf_alloc(mb->pool); + struct rte_mbuf *t; + struct rte_mbuf *m_last = rte_pktmbuf_lastseg(mb); + int i; + + if (newtail == NULL) + return -1; + newtail->data_off = 0; + newtail->pkt_len = newtailsize; + if (newtailsize > newtail->buf_len) + newtail->data_len = newtail->buf_len; + else + newtail->data_len = newtailsize; + newtail->nb_segs = newtailsize / newtail->buf_len + 1; + t = newtail; + + for (i = 0; i < newtail->nb_segs - 1; ++i) { + t->next = rte_pktmbuf_alloc(mb->pool); + + if (t->next == NULL) { + rte_pktmbuf_free(newtail); + return -1; + } + t = t->next; + t->data_off = 0; + /* The last segment's size is not trivial*/ + t->data_len = i == newtail->nb_segs - 2 ? + newtailsize % newtail->buf_len : + t->buf_len; + } + if (rte_pktmbuf_chain(mb, newtail)) { + rte_pktmbuf_free(newtail); + return -1; + } + /* Expand the original tail */ + m_last->data_len = m_last->buf_len - m_last->data_off; + mb->pkt_len += len - newtailsize; + odp_packet_hdr(*pkt)->buf_hdr.totsize += + newtail->nb_segs * newtail->buf_len; + } else { + rte_pktmbuf_append(mb, len); + } + + if (seg_len) + odp_packet_offset(*pkt, old_pkt_len, seg_len, NULL); + + return 0; +} + +void *odp_packet_pull_tail(odp_packet_t pkt, uint32_t len) +{ + struct rte_mbuf *mb = &(odp_packet_hdr(pkt)->buf_hdr.mb); + + if (rte_pktmbuf_trim(mb, len)) + return NULL; + else + return odp_packet_tail(pkt); +} + +int odp_packet_trunc_tail(odp_packet_t *pkt, uint32_t len, void **tail_ptr, + uint32_t *tailroom) +{ + struct rte_mbuf *mb = &(odp_packet_hdr(*pkt)->buf_hdr.mb); + + if (odp_packet_len(*pkt) < len) + return -1; + + if (rte_pktmbuf_trim(mb, len)) { + struct rte_mbuf *reverse[mb->nb_segs]; + struct rte_mbuf *t = mb; + int i; + + for (i = 0; i < mb->nb_segs; ++i) { + reverse[i] = t; + t = t->next; + } + for (i = mb->nb_segs - 1; i >= 0 && len > 0; --i) { + t = reverse[i]; + if (len >= t->data_len) { + len -= t->data_len; + mb->pkt_len -= t->data_len; + t->data_len = 0; + if (i > 0) { + rte_pktmbuf_free_seg(t); + --mb->nb_segs; + reverse[i - 1]->next = NULL; + } + } else { + t->data_len -= len; + mb->pkt_len -= len; + len = 0; + } + } + } + + if (tail_ptr) + *tail_ptr = odp_packet_tail(*pkt); + if (tailroom) + *tailroom = odp_packet_tailroom(*pkt); + + return 0; +} + +void *odp_packet_offset(odp_packet_t pkt, uint32_t offset, uint32_t *len, + odp_packet_seg_t *seg) +{ + struct rte_mbuf *mb = &(odp_packet_hdr(pkt)->buf_hdr.mb); + + do { + if (mb->data_len > offset) { + break; + } else { + offset -= mb->data_len; + mb = mb->next; + } + } while (mb); + + if (mb) { + if (len) + *len = mb->data_len - offset; + if (seg) + *seg = (odp_packet_seg_t)(uintptr_t)mb; + return (void *)(rte_pktmbuf_mtod(mb, char *) + offset); + } else { + return NULL; + } +} + +/* + * + * Meta-data + * ******************************************************** + * + */ +uint32_t odp_packet_user_area_size(odp_packet_t pkt) +{ + pool_entry_cp_t *pool_cp = odp_pool_to_entry_cp(odp_packet_pool(pkt)); + + return pool_cp->params.pkt.uarea_size; +} + +int odp_packet_input_index(odp_packet_t pkt) +{ + return odp_pktio_index(odp_packet_hdr(pkt)->input); +} + +void odp_packet_user_ptr_set(odp_packet_t pkt, const void *ctx) +{ + odp_packet_hdr(pkt)->buf_hdr.buf_cctx = ctx; +} + +static inline void *packet_offset_to_ptr(odp_packet_t pkt, uint32_t *len, + const size_t offset) +{ + if (odp_unlikely(offset == ODP_PACKET_OFFSET_INVALID)) + return NULL; + + if (len) + return odp_packet_offset(pkt, offset, len, NULL); + else + return odp_packet_offset(pkt, offset, NULL, NULL); +} + +void *odp_packet_l2_ptr(odp_packet_t pkt, uint32_t *len) +{ + odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt); + + if (!packet_hdr_has_l2(pkt_hdr)) + return NULL; + return packet_offset_to_ptr(pkt, len, pkt_hdr->p.l2_offset); +} + +uint32_t odp_packet_l2_offset(odp_packet_t pkt) +{ + odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt); + + if (!packet_hdr_has_l2(pkt_hdr)) + return ODP_PACKET_OFFSET_INVALID; + return pkt_hdr->p.l2_offset; +} + +int odp_packet_l2_offset_set(odp_packet_t pkt, uint32_t offset) +{ + odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt); + + if (odp_unlikely(offset >= (odp_packet_len(pkt) - 1))) + return -1; + + packet_hdr_has_l2_set(pkt_hdr, 1); + pkt_hdr->p.l2_offset = offset; + return 0; +} + +void *odp_packet_l3_ptr(odp_packet_t pkt, uint32_t *len) +{ + odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt); + + return packet_offset_to_ptr(pkt, len, pkt_hdr->p.l3_offset); +} + +uint32_t odp_packet_l3_offset(odp_packet_t pkt) +{ + odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt); + + return pkt_hdr->p.l3_offset; +} + +int odp_packet_l3_offset_set(odp_packet_t pkt, uint32_t offset) +{ + odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt); + + if (odp_unlikely(offset >= (odp_packet_len(pkt) - 1))) + return -1; + + pkt_hdr->p.l3_offset = offset; + return 0; +} + +void *odp_packet_l4_ptr(odp_packet_t pkt, uint32_t *len) +{ + odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt); + + return packet_offset_to_ptr(pkt, len, pkt_hdr->p.l4_offset); +} + +uint32_t odp_packet_l4_offset(odp_packet_t pkt) +{ + odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt); + + return pkt_hdr->p.l4_offset; +} + +int odp_packet_l4_offset_set(odp_packet_t pkt, uint32_t offset) +{ + odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt); + + if (odp_unlikely(offset >= (odp_packet_len(pkt) - 1))) + return -1; + + pkt_hdr->p.l4_offset = offset; + return 0; +} + +void odp_packet_ts_set(odp_packet_t pkt, odp_time_t timestamp) +{ + odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt); + + pkt_hdr->timestamp = timestamp; + pkt_hdr->p.input_flags.timestamp = 1; +} + +/* + * + * Segment level + * ******************************************************** + * + */ + +void *odp_packet_seg_data(odp_packet_t pkt ODP_UNUSED, odp_packet_seg_t seg) +{ + return odp_packet_data((odp_packet_t)(uintptr_t)seg); +} + +uint32_t odp_packet_seg_data_len(odp_packet_t pkt ODP_UNUSED, + odp_packet_seg_t seg) +{ + return odp_packet_seg_len((odp_packet_t)(uintptr_t)seg); +} + +/* + * + * Manipulation + * ******************************************************** + * + */ + +int odp_packet_add_data(odp_packet_t *pkt_ptr, uint32_t offset, uint32_t len) +{ + odp_packet_t pkt = *pkt_ptr; + odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt); + uint32_t pktlen = odp_packet_len(pkt); + odp_packet_t newpkt; + + if (offset > pktlen) + return -1; + + newpkt = odp_packet_alloc(pkt_hdr->buf_hdr.pool_hdl, pktlen + len); + + if (newpkt == ODP_PACKET_INVALID) + return -1; + + if (odp_packet_copy_from_pkt(newpkt, 0, pkt, 0, offset) != 0 || + odp_packet_copy_from_pkt(newpkt, offset + len, pkt, offset, + pktlen - offset) != 0) { + odp_packet_free(newpkt); + return -1; + } + + _odp_packet_copy_md_to_packet(pkt, newpkt); + odp_packet_free(pkt); + *pkt_ptr = newpkt; + + return 1; +} + +int odp_packet_rem_data(odp_packet_t *pkt_ptr, uint32_t offset, uint32_t len) +{ + odp_packet_t pkt = *pkt_ptr; + odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt); + uint32_t pktlen = odp_packet_len(pkt); + odp_packet_t newpkt; + + if (offset > pktlen || offset + len > pktlen) + return -1; + + newpkt = odp_packet_alloc(pkt_hdr->buf_hdr.pool_hdl, pktlen - len); + + if (newpkt == ODP_PACKET_INVALID) + return -1; + + if (odp_packet_copy_from_pkt(newpkt, 0, pkt, 0, offset) != 0 || + odp_packet_copy_from_pkt(newpkt, offset, pkt, offset + len, + pktlen - offset - len) != 0) { + odp_packet_free(newpkt); + return -1; + } + + _odp_packet_copy_md_to_packet(pkt, newpkt); + odp_packet_free(pkt); + *pkt_ptr = newpkt; + + return 1; +} + +int odp_packet_align(odp_packet_t *pkt, uint32_t offset, uint32_t len, + uint32_t align) +{ + int rc; + uint32_t shift; + uint32_t seglen = 0; /* GCC */ + void *addr = odp_packet_offset(*pkt, offset, &seglen, NULL); + uint64_t uaddr = (uint64_t)(uintptr_t)addr; + uint64_t misalign; + + if (align > ODP_CACHE_LINE_SIZE) + return -1; + + if (seglen >= len) { + misalign = align <= 1 ? 0 : + ROUNDUP_ALIGN(uaddr, align) - uaddr; + if (misalign == 0) + return 0; + shift = align - misalign; + } else { + if (len > odp_packet_seg_len(*pkt)) + return -1; + shift = len - seglen; + uaddr -= shift; + misalign = align <= 1 ? 0 : + ROUNDUP_ALIGN(uaddr, align) - uaddr; + if (misalign) + shift += align - misalign; + } + + rc = odp_packet_extend_head(pkt, shift, NULL, NULL); + if (rc < 0) + return rc; + + (void)odp_packet_move_data(*pkt, 0, shift, + odp_packet_len(*pkt) - shift); + + (void)odp_packet_trunc_tail(pkt, shift, NULL, NULL); + return 1; +} + +int odp_packet_concat(odp_packet_t *dst, odp_packet_t src) +{ + odp_packet_hdr_t *dst_hdr = odp_packet_hdr(*dst); + odp_packet_hdr_t *src_hdr = odp_packet_hdr(src); + struct rte_mbuf *mb_dst = pkt_to_mbuf(dst_hdr); + struct rte_mbuf *mb_src = pkt_to_mbuf(src_hdr); + odp_packet_t new_dst; + odp_pool_t pool; + uint32_t dst_len; + uint32_t src_len; + + if (odp_likely(!rte_pktmbuf_chain(mb_dst, mb_src))) { + dst_hdr->buf_hdr.totsize += src_hdr->buf_hdr.totsize; + return 0; + } + + /* Fall back to using standard copy operations after maximum number of + * segments has been reached. */ + dst_len = odp_packet_len(*dst); + src_len = odp_packet_len(src); + pool = odp_packet_pool(*dst); + + new_dst = odp_packet_copy(*dst, pool); + if (odp_unlikely(new_dst == ODP_PACKET_INVALID)) + return -1; + + if (odp_packet_extend_tail(&new_dst, src_len, NULL, NULL) >= 0) { + (void)odp_packet_copy_from_pkt(new_dst, dst_len, + src, 0, src_len); + odp_packet_free(*dst); + odp_packet_free(src); + *dst = new_dst; + return 1; + } + + odp_packet_free(new_dst); + return -1; +} + +int odp_packet_split(odp_packet_t *pkt, uint32_t len, odp_packet_t *tail) +{ + uint32_t pktlen = odp_packet_len(*pkt); + + if (len >= pktlen || tail == NULL) + return -1; + + *tail = odp_packet_copy_part(*pkt, len, pktlen - len, + odp_packet_pool(*pkt)); + + if (*tail == ODP_PACKET_INVALID) + return -1; + + return odp_packet_trunc_tail(pkt, pktlen - len, NULL, NULL); +} + +/* + * + * Copy + * ******************************************************** + * + */ + +odp_packet_t odp_packet_copy(odp_packet_t pkt, odp_pool_t pool) +{ + uint32_t pktlen = odp_packet_len(pkt); + odp_packet_t newpkt = odp_packet_alloc(pool, pktlen); + + if (newpkt != ODP_PACKET_INVALID) { + if (_odp_packet_copy_md_to_packet(pkt, newpkt) || + odp_packet_copy_from_pkt(newpkt, 0, pkt, 0, pktlen)) { + odp_packet_free(newpkt); + newpkt = ODP_PACKET_INVALID; + } + } + + return newpkt; +} + +odp_packet_t odp_packet_copy_part(odp_packet_t pkt, uint32_t offset, + uint32_t len, odp_pool_t pool) +{ + uint32_t pktlen = odp_packet_len(pkt); + odp_packet_t newpkt; + + if (offset >= pktlen || offset + len > pktlen) + return ODP_PACKET_INVALID; + + newpkt = odp_packet_alloc(pool, len); + if (newpkt != ODP_PACKET_INVALID) + odp_packet_copy_from_pkt(newpkt, 0, pkt, offset, len); + + return newpkt; +} + +int odp_packet_copy_to_mem(odp_packet_t pkt, uint32_t offset, + uint32_t len, void *dst) +{ + void *mapaddr; + uint32_t seglen = 0; /* GCC */ + uint32_t cpylen; + uint8_t *dstaddr = (uint8_t *)dst; + + if (offset + len > odp_packet_len(pkt)) + return -1; + + while (len > 0) { + mapaddr = odp_packet_offset(pkt, offset, &seglen, NULL); + cpylen = len > seglen ? seglen : len; + memcpy(dstaddr, mapaddr, cpylen); + offset += cpylen; + dstaddr += cpylen; + len -= cpylen; + } + + return 0; +} + +int odp_packet_copy_from_mem(odp_packet_t pkt, uint32_t offset, + uint32_t len, const void *src) +{ + void *mapaddr; + uint32_t seglen = 0; /* GCC */ + uint32_t cpylen; + const uint8_t *srcaddr = (const uint8_t *)src; + + if (offset + len > odp_packet_len(pkt)) + return -1; + + while (len > 0) { + mapaddr = odp_packet_offset(pkt, offset, &seglen, NULL); + cpylen = len > seglen ? seglen : len; + memcpy(mapaddr, srcaddr, cpylen); + offset += cpylen; + srcaddr += cpylen; + len -= cpylen; + } + + return 0; +} + +int odp_packet_copy_from_pkt(odp_packet_t dst, uint32_t dst_offset, + odp_packet_t src, uint32_t src_offset, + uint32_t len) +{ + odp_packet_hdr_t *dst_hdr = odp_packet_hdr(dst); + odp_packet_hdr_t *src_hdr = odp_packet_hdr(src); + void *dst_map; + void *src_map; + uint32_t cpylen, minseg; + uint32_t dst_seglen = 0; /* GCC */ + uint32_t src_seglen = 0; /* GCC */ + int overlap; + + if (dst_offset + len > odp_packet_len(dst) || + src_offset + len > odp_packet_len(src)) + return -1; + + overlap = (dst_hdr == src_hdr && + ((dst_offset <= src_offset && + dst_offset + len >= src_offset) || + (src_offset <= dst_offset && + src_offset + len >= dst_offset))); + + if (overlap && src_offset < dst_offset) { + odp_packet_t temp = + odp_packet_copy_part(src, src_offset, len, + odp_packet_pool(src)); + if (temp == ODP_PACKET_INVALID) + return -1; + odp_packet_copy_from_pkt(dst, dst_offset, temp, 0, len); + odp_packet_free(temp); + return 0; + } + + while (len > 0) { + dst_map = odp_packet_offset(dst, dst_offset, &dst_seglen, NULL); + src_map = odp_packet_offset(src, src_offset, &src_seglen, NULL); + + minseg = dst_seglen > src_seglen ? src_seglen : dst_seglen; + cpylen = len > minseg ? minseg : len; + + if (overlap) + memmove(dst_map, src_map, cpylen); + else + memcpy(dst_map, src_map, cpylen); + + dst_offset += cpylen; + src_offset += cpylen; + len -= cpylen; + } + + return 0; +} + +int odp_packet_copy_data(odp_packet_t pkt, uint32_t dst_offset, + uint32_t src_offset, uint32_t len) +{ + return odp_packet_copy_from_pkt(pkt, dst_offset, + pkt, src_offset, len); +} + +int odp_packet_move_data(odp_packet_t pkt, uint32_t dst_offset, + uint32_t src_offset, uint32_t len) +{ + return odp_packet_copy_from_pkt(pkt, dst_offset, + pkt, src_offset, len); +} + ++int _odp_packet_set_data(odp_packet_t pkt, uint32_t offset, ++ uint8_t c, uint32_t len) ++{ ++ void *mapaddr; ++ uint32_t seglen = 0; /* GCC */ ++ uint32_t setlen; ++ odp_packet_hdr_t *hdr = odp_packet_hdr(pkt); ++ ++ if (offset + len > hdr->buf_hdr.mb.pkt_len) ++ return -1; ++ ++ while (len > 0) { ++ mapaddr = odp_packet_offset(pkt, offset, &seglen, NULL); ++ setlen = len > seglen ? seglen : len; ++ memset(mapaddr, c, setlen); ++ offset += setlen; ++ len -= setlen; ++ } ++ ++ return 0; ++} ++ ++int _odp_packet_cmp_data(odp_packet_t pkt, uint32_t offset, ++ const void *s, uint32_t len) ++{ ++ const uint8_t *ptr = s; ++ void *mapaddr; ++ uint32_t seglen = 0; /* GCC */ ++ uint32_t cmplen; ++ int ret; ++ odp_packet_hdr_t *hdr = odp_packet_hdr(pkt); ++ ++ ODP_ASSERT(offset + len <= hdr->buf_hdr.mb.pkt_len); ++ ++ while (len > 0) { ++ mapaddr = odp_packet_offset(pkt, offset, &seglen, NULL); ++ cmplen = len > seglen ? seglen : len; ++ ret = memcmp(mapaddr, ptr, cmplen); ++ if (ret != 0) ++ return ret; ++ offset += cmplen; ++ len -= cmplen; ++ ptr += cmplen; ++ } ++ ++ return 0; ++} ++ +/* + * + * Debugging + * ******************************************************** + * + */ + +void odp_packet_print(odp_packet_t pkt) +{ + odp_packet_seg_t seg; + int max_len = 512; + char str[max_len]; + uint8_t *p; + int len = 0; + int n = max_len - 1; + odp_packet_hdr_t *hdr = odp_packet_hdr(pkt); + odp_buffer_t buf = packet_to_buffer(pkt); + + len += snprintf(&str[len], n - len, "Packet "); + len += odp_buffer_snprint(&str[len], n - len, buf); + len += snprintf(&str[len], n - len, " input_flags 0x%" PRIx64 "\n", + hdr->p.input_flags.all); + len += snprintf(&str[len], n - len, " error_flags 0x%" PRIx32 "\n", + hdr->p.error_flags.all); + len += snprintf(&str[len], n - len, " output_flags 0x%" PRIx32 "\n", + hdr->p.output_flags.all); + len += snprintf(&str[len], n - len, + " l2_offset %" PRIu32 "\n", hdr->p.l2_offset); + len += snprintf(&str[len], n - len, + " l3_offset %" PRIu32 "\n", hdr->p.l3_offset); + len += snprintf(&str[len], n - len, + " l4_offset %" PRIu32 "\n", hdr->p.l4_offset); + len += snprintf(&str[len], n - len, + " frame_len %" PRIu32 "\n", + hdr->buf_hdr.mb.pkt_len); + len += snprintf(&str[len], n - len, + " input %" PRIu64 "\n", + odp_pktio_to_u64(hdr->input)); + len += snprintf(&str[len], n - len, + " headroom %" PRIu32 "\n", + odp_packet_headroom(pkt)); + len += snprintf(&str[len], n - len, + " tailroom %" PRIu32 "\n", + odp_packet_tailroom(pkt)); + len += snprintf(&str[len], n - len, + " num_segs %i\n", odp_packet_num_segs(pkt)); + + seg = odp_packet_first_seg(pkt); + + while (seg != ODP_PACKET_SEG_INVALID) { + len += snprintf(&str[len], n - len, + " seg_len %" PRIu32 "\n", + odp_packet_seg_data_len(pkt, seg)); + + seg = odp_packet_next_seg(pkt, seg); + } + + str[len] = '\0'; + + ODP_PRINT("\n%s\n", str); + rte_pktmbuf_dump(stdout, &hdr->buf_hdr.mb, 32); + + p = odp_packet_data(pkt); + ODP_ERR("00000000: %02X %02X %02X %02X %02X %02X %02X %02X\n", + p[0], p[1], p[2], p[3], p[4], p[5], p[6], p[7]); + ODP_ERR("00000008: %02X %02X %02X %02X %02X %02X %02X %02X\n", + p[8], p[9], p[10], p[11], p[12], p[13], p[14], p[15]); +} + ++void odp_packet_print_data(odp_packet_t pkt, uint32_t offset, ++ uint32_t byte_len) ++{ ++ odp_packet_hdr_t *hdr = odp_packet_hdr(pkt); ++ uint32_t bytes_per_row = 16; ++ int num_rows = (byte_len + bytes_per_row - 1) / bytes_per_row; ++ int max_len = 256 + (3 * byte_len) + (3 * num_rows); ++ char str[max_len]; ++ int len = 0; ++ int n = max_len - 1; ++ uint32_t data_len = odp_packet_len(pkt); ++ odp_pool_t pool = hdr->buf_hdr.pool_hdl; ++ ++ len += snprintf(&str[len], n - len, "Packet\n------\n"); ++ len += snprintf(&str[len], n - len, ++ " pool index %" PRIu32 "\n", pool_handle_to_index(pool)); ++ len += snprintf(&str[len], n - len, ++ " buf index %" PRIu32 "\n", hdr->buf_hdr.index); ++ len += snprintf(&str[len], n - len, ++ " data len %" PRIu32 "\n", data_len); ++ len += snprintf(&str[len], n - len, ++ " data ptr %p\n", odp_packet_data(pkt)); ++ len += snprintf(&str[len], n - len, ++ " print offset %" PRIu32 "\n", offset); ++ len += snprintf(&str[len], n - len, ++ " print length %" PRIu32 "\n", byte_len); ++ ++ if (offset + byte_len > data_len) { ++ len += snprintf(&str[len], n - len, " BAD OFFSET OR LEN\n"); ++ ODP_PRINT("%s\n", str); ++ return; ++ } ++ ++ while (byte_len) { ++ uint32_t copy_len; ++ uint8_t data[bytes_per_row]; ++ uint32_t i; ++ ++ if (byte_len > bytes_per_row) ++ copy_len = bytes_per_row; ++ else ++ copy_len = byte_len; ++ ++ odp_packet_copy_to_mem(pkt, offset, copy_len, data); ++ ++ len += snprintf(&str[len], n - len, " "); ++ ++ for (i = 0; i < copy_len; i++) ++ len += snprintf(&str[len], n - len, " %02x", data[i]); ++ ++ len += snprintf(&str[len], n - len, "\n"); ++ ++ byte_len -= copy_len; ++ offset += copy_len; ++ } ++ ++ ODP_PRINT("%s\n", str); ++} ++ +int odp_packet_is_valid(odp_packet_t pkt) +{ + odp_buffer_t buf = packet_to_buffer(pkt); + + return odp_buffer_is_valid(buf); +} + +/* + * + * Internal Use Routines + * ******************************************************** + * + */ + +int _odp_packet_copy_md_to_packet(odp_packet_t srcpkt, odp_packet_t dstpkt) +{ + odp_packet_hdr_t *srchdr = odp_packet_hdr(srcpkt); + odp_packet_hdr_t *dsthdr = odp_packet_hdr(dstpkt); + uint32_t src_size = odp_packet_user_area_size(srcpkt); + uint32_t dst_size = odp_packet_user_area_size(dstpkt); + + dsthdr->input = srchdr->input; + dsthdr->dst_queue = srchdr->dst_queue; + dsthdr->buf_hdr.buf_u64 = srchdr->buf_hdr.buf_u64; + + dsthdr->buf_hdr.mb.port = srchdr->buf_hdr.mb.port; + dsthdr->buf_hdr.mb.ol_flags = srchdr->buf_hdr.mb.ol_flags; + dsthdr->buf_hdr.mb.packet_type = srchdr->buf_hdr.mb.packet_type; + dsthdr->buf_hdr.mb.vlan_tci = srchdr->buf_hdr.mb.vlan_tci; + dsthdr->buf_hdr.mb.hash = srchdr->buf_hdr.mb.hash; + dsthdr->buf_hdr.mb.vlan_tci_outer = srchdr->buf_hdr.mb.vlan_tci_outer; + dsthdr->buf_hdr.mb.tx_offload = srchdr->buf_hdr.mb.tx_offload; + + if (dst_size != 0) + memcpy(odp_packet_user_area(dstpkt), + odp_packet_user_area(srcpkt), + dst_size <= src_size ? dst_size : src_size); + + copy_packet_parser_metadata(srchdr, dsthdr); + + /* Metadata copied, but return indication of whether the packet + * user area was truncated in the process. Note this can only + * happen when copying between different pools. + */ + return dst_size < src_size; +} + ++/** Parser helper function for Ethernet packets */ ++static inline uint16_t parse_eth(packet_parser_t *prs, const uint8_t **parseptr, ++ uint32_t *offset, uint32_t frame_len) ++{ ++ uint16_t ethtype; ++ const _odp_ethhdr_t *eth; ++ uint16_t macaddr0, macaddr2, macaddr4; ++ const _odp_vlanhdr_t *vlan; ++ ++ /* Detect jumbo frames */ ++ if (frame_len > _ODP_ETH_LEN_MAX) ++ prs->input_flags.jumbo = 1; ++ ++ eth = (const _odp_ethhdr_t *)*parseptr; ++ ++ /* Handle Ethernet broadcast/multicast addresses */ ++ macaddr0 = odp_be_to_cpu_16(*((const uint16_t *)(const void *)eth)); ++ prs->input_flags.eth_mcast = (macaddr0 & 0x0100) == 0x0100; ++ ++ if (macaddr0 == 0xffff) { ++ macaddr2 = ++ odp_be_to_cpu_16(*((const uint16_t *) ++ (const void *)eth + 1)); ++ macaddr4 = ++ odp_be_to_cpu_16(*((const uint16_t *) ++ (const void *)eth + 2)); ++ prs->input_flags.eth_bcast = ++ (macaddr2 == 0xffff) && (macaddr4 == 0xffff); ++ } else { ++ prs->input_flags.eth_bcast = 0; ++ } ++ ++ /* Get Ethertype */ ++ ethtype = odp_be_to_cpu_16(eth->type); ++ *offset += sizeof(*eth); ++ *parseptr += sizeof(*eth); ++ ++ /* Check for SNAP vs. DIX */ ++ if (ethtype < _ODP_ETH_LEN_MAX) { ++ prs->input_flags.snap = 1; ++ if (ethtype > frame_len - *offset) { ++ prs->error_flags.snap_len = 1; ++ return 0; ++ } ++ ethtype = odp_be_to_cpu_16(*((const uint16_t *)(uintptr_t) ++ (parseptr + 6))); ++ *offset += 8; ++ *parseptr += 8; ++ } ++ ++ /* Parse the VLAN header(s), if present */ ++ if (ethtype == _ODP_ETHTYPE_VLAN_OUTER) { ++ prs->input_flags.vlan_qinq = 1; ++ prs->input_flags.vlan = 1; ++ ++ vlan = (const _odp_vlanhdr_t *)*parseptr; ++ ethtype = odp_be_to_cpu_16(vlan->type); ++ *offset += sizeof(_odp_vlanhdr_t); ++ *parseptr += sizeof(_odp_vlanhdr_t); ++ } ++ ++ if (ethtype == _ODP_ETHTYPE_VLAN) { ++ prs->input_flags.vlan = 1; ++ vlan = (const _odp_vlanhdr_t *)*parseptr; ++ ethtype = odp_be_to_cpu_16(vlan->type); ++ *offset += sizeof(_odp_vlanhdr_t); ++ *parseptr += sizeof(_odp_vlanhdr_t); ++ } ++ ++ return ethtype; ++} ++ +/** + * Parser helper function for IPv4 + */ +static inline uint8_t parse_ipv4(packet_parser_t *prs, const uint8_t **parseptr, + uint32_t *offset, uint32_t frame_len) +{ + const _odp_ipv4hdr_t *ipv4 = (const _odp_ipv4hdr_t *)*parseptr; + uint8_t ver = _ODP_IPV4HDR_VER(ipv4->ver_ihl); + uint8_t ihl = _ODP_IPV4HDR_IHL(ipv4->ver_ihl); + uint16_t frag_offset; + uint32_t dstaddr = odp_be_to_cpu_32(ipv4->dst_addr); + uint32_t l3_len = odp_be_to_cpu_16(ipv4->tot_len); + + if (odp_unlikely(ihl < _ODP_IPV4HDR_IHL_MIN) || + odp_unlikely(ver != 4) || + (l3_len > frame_len - *offset)) { + prs->error_flags.ip_err = 1; + return 0; + } + + *offset += ihl * 4; + *parseptr += ihl * 4; + + if (odp_unlikely(ihl > _ODP_IPV4HDR_IHL_MIN)) + prs->input_flags.ipopt = 1; + + /* A packet is a fragment if: + * "more fragments" flag is set (all fragments except the last) + * OR + * "fragment offset" field is nonzero (all fragments except the first) + */ + frag_offset = odp_be_to_cpu_16(ipv4->frag_offset); + if (odp_unlikely(_ODP_IPV4HDR_IS_FRAGMENT(frag_offset))) + prs->input_flags.ipfrag = 1; + + /* Handle IPv4 broadcast / multicast */ + prs->input_flags.ip_bcast = (dstaddr == 0xffffffff); + prs->input_flags.ip_mcast = (dstaddr >> 28) == 0xd; + + return ipv4->proto; +} + +/** + * Parser helper function for IPv6 + */ +static inline uint8_t parse_ipv6(packet_parser_t *prs, const uint8_t **parseptr, + uint32_t *offset, uint32_t frame_len, + uint32_t seg_len) +{ + const _odp_ipv6hdr_t *ipv6 = (const _odp_ipv6hdr_t *)*parseptr; + const _odp_ipv6hdr_ext_t *ipv6ext; + uint32_t dstaddr0 = odp_be_to_cpu_32(ipv6->dst_addr.u8[0]); + uint32_t l3_len = odp_be_to_cpu_16(ipv6->payload_len) + + _ODP_IPV6HDR_LEN; + + /* Basic sanity checks on IPv6 header */ + if ((odp_be_to_cpu_32(ipv6->ver_tc_flow) >> 28) != 6 || + l3_len > frame_len - *offset) { + prs->error_flags.ip_err = 1; + return 0; + } + + /* IPv6 broadcast / multicast flags */ + prs->input_flags.ip_mcast = (dstaddr0 & 0xff000000) == 0xff000000; + prs->input_flags.ip_bcast = 0; + + /* Skip past IPv6 header */ + *offset += sizeof(_odp_ipv6hdr_t); + *parseptr += sizeof(_odp_ipv6hdr_t); + + /* Skip past any IPv6 extension headers */ + if (ipv6->next_hdr == _ODP_IPPROTO_HOPOPTS || + ipv6->next_hdr == _ODP_IPPROTO_ROUTE) { + prs->input_flags.ipopt = 1; + + do { + ipv6ext = (const _odp_ipv6hdr_ext_t *)*parseptr; + uint16_t extlen = 8 + ipv6ext->ext_len * 8; + + *offset += extlen; + *parseptr += extlen; + } while ((ipv6ext->next_hdr == _ODP_IPPROTO_HOPOPTS || + ipv6ext->next_hdr == _ODP_IPPROTO_ROUTE) && + *offset < seg_len); + + if (*offset >= prs->l3_offset + + odp_be_to_cpu_16(ipv6->payload_len)) { + prs->error_flags.ip_err = 1; + return 0; + } + + if (ipv6ext->next_hdr == _ODP_IPPROTO_FRAG) + prs->input_flags.ipfrag = 1; + + return ipv6ext->next_hdr; + } + + if (odp_unlikely(ipv6->next_hdr == _ODP_IPPROTO_FRAG)) { + prs->input_flags.ipopt = 1; + prs->input_flags.ipfrag = 1; + } + + return ipv6->next_hdr; +} + +/** + * Parser helper function for TCP + */ +static inline void parse_tcp(packet_parser_t *prs, + const uint8_t **parseptr, uint32_t *offset) +{ + const _odp_tcphdr_t *tcp = (const _odp_tcphdr_t *)*parseptr; + + if (tcp->hl < sizeof(_odp_tcphdr_t) / sizeof(uint32_t)) + prs->error_flags.tcp_err = 1; + else if ((uint32_t)tcp->hl * 4 > sizeof(_odp_tcphdr_t)) + prs->input_flags.tcpopt = 1; + + if (offset) + *offset += (uint32_t)tcp->hl * 4; + *parseptr += (uint32_t)tcp->hl * 4; +} + +/** + * Parser helper function for UDP + */ +static inline void parse_udp(packet_parser_t *prs, + const uint8_t **parseptr, uint32_t *offset) +{ + const _odp_udphdr_t *udp = (const _odp_udphdr_t *)*parseptr; + uint32_t udplen = odp_be_to_cpu_16(udp->length); + + if (odp_unlikely(udplen < sizeof(_odp_udphdr_t))) + prs->error_flags.udp_err = 1; + + if (offset) + *offset += sizeof(_odp_udphdr_t); + *parseptr += sizeof(_odp_udphdr_t); +} + - /** - * Parse common packet headers up to given layer - * - * The function expects at least PACKET_PARSE_SEG_LEN bytes of data to be - * available from the ptr. - */ - int packet_parse_common(packet_parser_t *prs, const uint8_t *ptr, - uint32_t frame_len, uint32_t seg_len, - odp_pktio_parser_layer_t layer) ++static inline ++int packet_parse_common_l3_l4(packet_parser_t *prs, const uint8_t *parseptr, ++ uint32_t offset, ++ uint32_t frame_len, uint32_t seg_len, ++ odp_pktio_parser_layer_t layer, ++ uint16_t ethtype) +{ - uint32_t offset; - uint16_t ethtype; - const uint8_t *parseptr; + uint8_t ip_proto; - const _odp_ethhdr_t *eth; - uint16_t macaddr0, macaddr2, macaddr4; - const _odp_vlanhdr_t *vlan; - - if (layer == ODP_PKTIO_PARSER_LAYER_NONE) - return 0; - - /* We only support Ethernet for now */ - prs->input_flags.eth = 1; - /* Assume valid L2 header, no CRC/FCS check in SW */ - prs->input_flags.l2 = 1; - /* Detect jumbo frames */ - if (frame_len > _ODP_ETH_LEN_MAX) - prs->input_flags.jumbo = 1; - - offset = sizeof(_odp_ethhdr_t); - eth = (const _odp_ethhdr_t *)ptr; - - /* Handle Ethernet broadcast/multicast addresses */ - macaddr0 = odp_be_to_cpu_16(*((const uint16_t *)(const void *)eth)); - prs->input_flags.eth_mcast = (macaddr0 & 0x0100) == 0x0100; - - if (macaddr0 == 0xffff) { - macaddr2 = - odp_be_to_cpu_16(*((const uint16_t *) - (const void *)eth + 1)); - macaddr4 = - odp_be_to_cpu_16(*((const uint16_t *) - (const void *)eth + 2)); - prs->input_flags.eth_bcast = - (macaddr2 == 0xffff) && (macaddr4 == 0xffff); - } else { - prs->input_flags.eth_bcast = 0; - } - - /* Get Ethertype */ - ethtype = odp_be_to_cpu_16(eth->type); - parseptr = (const uint8_t *)(eth + 1); - - /* Check for SNAP vs. DIX */ - if (ethtype < _ODP_ETH_LEN_MAX) { - prs->input_flags.snap = 1; - if (ethtype > frame_len - offset) { - prs->error_flags.snap_len = 1; - goto parse_exit; - } - ethtype = odp_be_to_cpu_16(*((const uint16_t *)(uintptr_t) - (parseptr + 6))); - offset += 8; - parseptr += 8; - } - - /* Parse the VLAN header(s), if present */ - if (ethtype == _ODP_ETHTYPE_VLAN_OUTER) { - prs->input_flags.vlan_qinq = 1; - prs->input_flags.vlan = 1; + - vlan = (const _odp_vlanhdr_t *)parseptr; - ethtype = odp_be_to_cpu_16(vlan->type); - offset += sizeof(_odp_vlanhdr_t); - parseptr += sizeof(_odp_vlanhdr_t); - } - - if (ethtype == _ODP_ETHTYPE_VLAN) { - prs->input_flags.vlan = 1; - vlan = (const _odp_vlanhdr_t *)parseptr; - ethtype = odp_be_to_cpu_16(vlan->type); - offset += sizeof(_odp_vlanhdr_t); - parseptr += sizeof(_odp_vlanhdr_t); - } - - if (layer == ODP_PKTIO_PARSER_LAYER_L2) ++ if (layer <= ODP_PKTIO_PARSER_LAYER_L2) + return prs->error_flags.all != 0; + + /* Set l3_offset+flag only for known ethtypes */ + prs->l3_offset = offset; + prs->input_flags.l3 = 1; + + /* Parse Layer 3 headers */ + switch (ethtype) { + case _ODP_ETHTYPE_IPV4: + prs->input_flags.ipv4 = 1; + ip_proto = parse_ipv4(prs, &parseptr, &offset, frame_len); + break; + + case _ODP_ETHTYPE_IPV6: + prs->input_flags.ipv6 = 1; + ip_proto = parse_ipv6(prs, &parseptr, &offset, frame_len, + seg_len); + break; + + case _ODP_ETHTYPE_ARP: + prs->input_flags.arp = 1; + ip_proto = 255; /* Reserved invalid by IANA */ + break; + + default: + prs->input_flags.l3 = 0; + prs->l3_offset = ODP_PACKET_OFFSET_INVALID; + ip_proto = 255; /* Reserved invalid by IANA */ + } + + if (layer == ODP_PKTIO_PARSER_LAYER_L3) + return prs->error_flags.all != 0; + + /* Set l4_offset+flag only for known ip_proto */ + prs->l4_offset = offset; + prs->input_flags.l4 = 1; + + /* Parse Layer 4 headers */ + switch (ip_proto) { + case _ODP_IPPROTO_ICMPv4: + /* Fall through */ + + case _ODP_IPPROTO_ICMPv6: + prs->input_flags.icmp = 1; + break; + ++ case _ODP_IPPROTO_IPIP: ++ /* Do nothing */ ++ break; ++ + case _ODP_IPPROTO_TCP: + if (odp_unlikely(offset + _ODP_TCPHDR_LEN > seg_len)) + return -1; + prs->input_flags.tcp = 1; + parse_tcp(prs, &parseptr, NULL); + break; + + case _ODP_IPPROTO_UDP: + if (odp_unlikely(offset + _ODP_UDPHDR_LEN > seg_len)) + return -1; + prs->input_flags.udp = 1; + parse_udp(prs, &parseptr, NULL); + break; + + case _ODP_IPPROTO_AH: + prs->input_flags.ipsec = 1; + prs->input_flags.ipsec_ah = 1; + break; + + case _ODP_IPPROTO_ESP: + prs->input_flags.ipsec = 1; + prs->input_flags.ipsec_esp = 1; + break; + + case _ODP_IPPROTO_SCTP: + prs->input_flags.sctp = 1; + break; + + default: + prs->input_flags.l4 = 0; + prs->l4_offset = ODP_PACKET_OFFSET_INVALID; + break; + } - parse_exit: ++ + return prs->error_flags.all != 0; +} ++ ++/** ++ * Parse common packet headers up to given layer ++ * ++ * The function expects at least PACKET_PARSE_SEG_LEN bytes of data to be ++ * available from the ptr. ++ */ ++int packet_parse_common(packet_parser_t *prs, const uint8_t *ptr, ++ uint32_t frame_len, uint32_t seg_len, ++ odp_pktio_parser_layer_t layer) ++{ ++ uint32_t offset; ++ uint16_t ethtype; ++ const uint8_t *parseptr; ++ ++ parseptr = ptr; ++ offset = 0; ++ ++ if (layer == ODP_PKTIO_PARSER_LAYER_NONE) ++ return 0; ++ ++ /* Assume valid L2 header, no CRC/FCS check in SW */ ++ prs->l2_offset = offset; ++ prs->input_flags.l2 = 1; ++ /* We only support Ethernet for now */ ++ prs->input_flags.eth = 1; ++ ++ ethtype = parse_eth(prs, &parseptr, &offset, frame_len); ++ ++ return packet_parse_common_l3_l4(prs, parseptr, offset, frame_len, ++ seg_len, layer, ethtype); ++} ++ +/** + * Simple packet parser + */ +int packet_parse_layer(odp_packet_hdr_t *pkt_hdr, + odp_pktio_parser_layer_t layer) +{ + uint32_t seg_len = odp_packet_seg_len((odp_packet_t)pkt_hdr); + uint32_t len = packet_len(pkt_hdr); + void *base = odp_packet_data((odp_packet_t)pkt_hdr); + + return packet_parse_common(&pkt_hdr->p, base, len, seg_len, layer); +} + ++int packet_parse_l3_l4(odp_packet_hdr_t *pkt_hdr, ++ odp_pktio_parser_layer_t layer, ++ uint32_t l3_offset, ++ uint16_t ethtype) ++{ ++ uint32_t seg_len = 0; ++ void *base = odp_packet_offset((odp_packet_t)pkt_hdr, ++ l3_offset, &seg_len, NULL); ++ ++ if (seg_len == 0) ++ return -1; ++ ++ return packet_parse_common_l3_l4(&pkt_hdr->p, base, l3_offset, ++ pkt_hdr->buf_hdr.mb.pkt_len, seg_len, ++ layer, ethtype); ++} ++ +uint64_t odp_packet_to_u64(odp_packet_t hdl) +{ + return _odp_pri(hdl); +} + +uint64_t odp_packet_seg_to_u64(odp_packet_seg_t hdl) +{ + return _odp_pri(hdl); +} + +odp_packet_t odp_packet_ref_static(odp_packet_t pkt) +{ + return odp_packet_copy(pkt, odp_packet_pool(pkt)); +} + +odp_packet_t odp_packet_ref(odp_packet_t pkt, uint32_t offset) +{ + odp_packet_t new; + int ret; + + new = odp_packet_copy(pkt, odp_packet_pool(pkt)); + + if (new == ODP_PACKET_INVALID) { + ODP_ERR("copy failed\n"); + return ODP_PACKET_INVALID; + } + + ret = odp_packet_trunc_head(&new, offset, NULL, NULL); + + if (ret < 0) { + ODP_ERR("trunk_head failed\n"); + odp_packet_free(new); + return ODP_PACKET_INVALID; + } + + return new; +} + +odp_packet_t odp_packet_ref_pkt(odp_packet_t pkt, uint32_t offset, + odp_packet_t hdr) +{ + odp_packet_t new; + int ret; + + new = odp_packet_copy(pkt, odp_packet_pool(pkt)); + + if (new == ODP_PACKET_INVALID) { + ODP_ERR("copy failed\n"); + return ODP_PACKET_INVALID; + } + + if (offset) { + ret = odp_packet_trunc_head(&new, offset, NULL, NULL); + + if (ret < 0) { + ODP_ERR("trunk_head failed\n"); + odp_packet_free(new); + return ODP_PACKET_INVALID; + } + } + + ret = odp_packet_concat(&hdr, new); + + if (ret < 0) { + ODP_ERR("concat failed\n"); + odp_packet_free(new); + return ODP_PACKET_INVALID; + } + + return hdr; +} + +int odp_packet_has_ref(odp_packet_t pkt) +{ + (void)pkt; + + return 0; +} + +/* Include non-inlined versions of API functions */ +#if ODP_ABI_COMPAT == 1 +#include <odp/api/plat/packet_inlines_api.h> +#endif diff --cc platform/linux-dpdk/test/.gitignore index 5dabf91c,00000000..5dabf91c mode 100644,000000..100644 --- a/platform/linux-dpdk/test/.gitignore +++ b/platform/linux-dpdk/test/.gitignore diff --cc platform/linux-dpdk/test/Makefile.am index 00000000,00000000..a872400e new file mode 100644 --- /dev/null +++ b/platform/linux-dpdk/test/Makefile.am @@@ -1,0 -1,0 +1,35 @@@ ++include $(top_srcdir)/test/Makefile.inc ++TESTS_ENVIRONMENT += TEST_DIR=${top_builddir}/test/validation ++ ++SUBDIRS = ++ ++if test_vald ++TESTS = validation/api/pktio/pktio_run.sh ++ ++SUBDIRS += validation/api/pktio ++else ++#performance tests refer to pktio_env ++if test_perf ++SUBDIRS += validation/api/pktio ++endif ++endif ++ ++TEST_EXTENSIONS = .sh ++ ++TESTNAME = linux-dpdk ++ ++TESTENV = tests-$(TESTNAME).env ++ ++test_DATA = $(TESTENV) ++ ++DISTCLEANFILES = $(TESTENV) ++.PHONY: $(TESTENV) ++$(TESTENV): ++ echo "TESTS=\"$(TESTS)\"" > $@ ++ echo "$(TESTS_ENVIRONMENT)" >> $@ ++ echo "$(LOG_COMPILER)" >> $@ ++ ++if test_installdir ++installcheck-local: ++ $(DESTDIR)/$(testdir)/run-test.sh $(TESTNAME) ++endif diff --cc platform/linux-dpdk/test/Makefile.inc index 25493d86,00000000..7b81c9a6 mode 100644,000000..100644 --- a/platform/linux-dpdk/test/Makefile.inc +++ b/platform/linux-dpdk/test/Makefile.inc @@@ -1,21 -1,0 +1,22 @@@ +# The following definitions may be used by platform tests that wish to +# build specific ODP applications, (i.e those whose do more than validation +# test wrapping) + - AM_LDFLAGS += -static ++AM_LDFLAGS = -static + - AM_CPPFLAGS += $(CUNIT_CPPFLAGS) ++AM_CFLAGS = $(CUNIT_CFLAGS) + - LIBCUNIT_COMMON = $(top_builddir)/test/common_plat/common/libcunit_common.la ++LIBCUNIT_COMMON = $(top_builddir)/test/common/libcunit_common.la +LIB = $(top_builddir)/lib +LIBODP = $(LIB)/libodphelper.la $(LIB)/libodp-dpdk.la + - INCCUNIT_COMMON = -I$(top_srcdir)/test/common_plat/common - INCODP = -I$(top_builddir)/platform/@with_platform@/include \ ++INCCUNIT_COMMON = -I$(top_srcdir)/test/common ++INCODP = \ + -I$(top_builddir)/include \ ++ -I$(top_builddir)/platform/@with_platform@/include \ + -I$(top_srcdir)/helper/include \ + -I$(top_srcdir)/include \ - -I$(top_srcdir)/include/odp/arch/@ARCH_ABI@ \ ++ -I$(top_srcdir)/include/odp/arch/@ARCH_ABI@ \ + -I$(top_srcdir)/platform/@with_platform@/arch/$(ARCH_DIR) \ + -I$(top_srcdir)/platform/@with_platform@/include \ + -I$(top_srcdir)/test diff --cc platform/linux-dpdk/test/validation/api/pktio/.gitignore index 00000000,00000000..42a9f364 new file mode 120000 --- /dev/null +++ b/platform/linux-dpdk/test/validation/api/pktio/.gitignore @@@ -1,0 -1,0 +1,1 @@@ ++../../../../../linux-generic/test/validation/api/pktio/.gitignore diff --cc platform/linux-dpdk/test/validation/api/pktio/Makefile.am index e401a29a,00000000..e401a29a mode 100644,000000..100644 --- a/platform/linux-dpdk/test/validation/api/pktio/Makefile.am +++ b/platform/linux-dpdk/test/validation/api/pktio/Makefile.am diff --cc platform/linux-dpdk/test/validation/api/pktio/pktio_env index 00000000,00000000..161505ff new file mode 120000 --- /dev/null +++ b/platform/linux-dpdk/test/validation/api/pktio/pktio_env @@@ -1,0 -1,0 +1,1 @@@ ++../../../../../linux-generic/test/validation/api/pktio/pktio_env diff --cc platform/linux-dpdk/test/validation/api/pktio/pktio_run.sh index 538c87d0,00000000..538c87d0 mode 100755,000000..100755 --- a/platform/linux-dpdk/test/validation/api/pktio/pktio_run.sh +++ b/platform/linux-dpdk/test/validation/api/pktio/pktio_run.sh diff --cc platform/linux-dpdk/test/wrapper-script.sh index 1fbb16f7,00000000..1fbb16f7 mode 100755,000000..100755 --- a/platform/linux-dpdk/test/wrapper-script.sh +++ b/platform/linux-dpdk/test/wrapper-script.sh diff --cc platform/linux-generic/Makefile.am index db466dd2,c5406760..3c505495 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@@ -3,11 -3,8 +3,14 @@@ include $(top_srcdir)/platform/Makefile.inc ++pkgconfigdir = $(libdir)/pkgconfig ++pkgconfig_DATA = libodp-linux.pc ++ +lib_LTLIBRARIES = $(LIB)/libodp-linux.la + AM_CPPFLAGS = -I$(srcdir)/include AM_CPPFLAGS += -I$(top_srcdir)/include +AM_CPPFLAGS += -I$(top_srcdir)/frameworks/modular AM_CPPFLAGS += -I$(top_srcdir)/include/odp/arch/@ARCH_ABI@ AM_CPPFLAGS += -I$(top_builddir)/include AM_CPPFLAGS += -Iinclude @@@ -125,93 -118,82 +125,94 @@@ nodist_odpapiplatinclude_HEADERS = odpdrvincludedir = $(includedir)/odp/drv odpdrvinclude_HEADERS = \ - $(srcdir)/include/odp/drv/align.h \ - $(srcdir)/include/odp/drv/atomic.h \ - $(srcdir)/include/odp/drv/barrier.h \ - $(srcdir)/include/odp/drv/byteorder.h \ - $(srcdir)/include/odp/drv/compiler.h \ - $(srcdir)/include/odp/drv/driver.h \ - $(srcdir)/include/odp/drv/hints.h \ - $(srcdir)/include/odp/drv/shm.h \ - $(srcdir)/include/odp/drv/spinlock.h \ - $(srcdir)/include/odp/drv/std_types.h \ - $(srcdir)/include/odp/drv/sync.h + include/odp/drv/align.h \ + include/odp/drv/atomic.h \ + include/odp/drv/barrier.h \ + include/odp/drv/byteorder.h \ + include/odp/drv/compiler.h \ + include/odp/drv/driver.h \ ++ include/odp/drv/hints.h \ + include/odp/drv/shm.h \ + include/odp/drv/spinlock.h \ + include/odp/drv/std_types.h \ + include/odp/drv/sync.h odpdrvplatincludedir = $(includedir)/odp/drv/plat odpdrvplatinclude_HEADERS = \ - $(srcdir)/include/odp/drv/plat/atomic_types.h \ - $(srcdir)/include/odp/drv/plat/barrier_types.h \ - $(srcdir)/include/odp/drv/plat/byteorder_types.h \ - $(srcdir)/include/odp/drv/compiler.h \ - $(srcdir)/include/odp/drv/plat/driver_types.h \ - $(srcdir)/include/odp/drv/plat/shm_types.h \ - $(srcdir)/include/odp/drv/plat/spinlock_types.h \ - $(srcdir)/include/odp/drv/plat/strong_types.h + include/odp/drv/plat/atomic_types.h \ + include/odp/drv/plat/barrier_types.h \ + include/odp/drv/plat/byteorder_types.h \ + include/odp/drv/compiler.h \ + include/odp/drv/plat/driver_types.h \ + include/odp/drv/plat/shm_types.h \ + include/odp/drv/plat/spinlock_types.h \ + include/odp/drv/plat/strong_types.h noinst_HEADERS = \ - ${srcdir}/include/_fdserver_internal.h \ - ${srcdir}/include/_ishm_internal.h \ - ${srcdir}/include/_ishmphy_internal.h \ - ${srcdir}/include/_ishmpool_internal.h \ - ${srcdir}/include/drv_driver_internal.h\ - ${srcdir}/include/odp_align_internal.h \ - ${srcdir}/include/odp_atomic_internal.h \ - ${srcdir}/include/odp_buffer_inlines.h \ - ${srcdir}/include/odp_bitmap_internal.h \ - ${srcdir}/include/odp_bitset.h \ - ${srcdir}/include/odp_buffer_internal.h \ - ${srcdir}/include/odp_buffer_subsystem.h \ - ${srcdir}/include/odp_classification_datamodel.h \ - ${srcdir}/include/odp_classification_inlines.h \ - ${srcdir}/include/odp_classification_internal.h \ - ${srcdir}/include/odp_config_internal.h \ - ${srcdir}/include/odp_crypto_internal.h \ - ${srcdir}/include/odp_debug_internal.h \ - ${srcdir}/include/odp_errno_define.h \ - ${srcdir}/include/odp_forward_typedefs_internal.h \ - ${srcdir}/include/odp_internal.h \ - ${srcdir}/include/odp_llqueue.h \ - ${srcdir}/include/odp_name_table_internal.h \ - ${srcdir}/include/odp_packet_internal.h \ - ${srcdir}/include/odp_packet_io_internal.h \ - ${srcdir}/include/odp_packet_io_ring_internal.h \ - ${srcdir}/pktio/ethtool.h \ - ${srcdir}/pktio/common.h \ - ${srcdir}/pktio/sysfs.h \ - ${srcdir}/pktio/dpdk.h \ - ${srcdir}/include/odp_pktio_ops_ipc.h \ - ${srcdir}/include/odp_pktio_ops_loopback.h \ - ${srcdir}/include/odp_pktio_ops_netmap.h \ - ${srcdir}/include/odp_pktio_ops_pcap.h \ - ${srcdir}/include/odp_pktio_ops_socket.h \ - ${srcdir}/include/odp_pktio_ops_tap.h \ - ${srcdir}/include/odp_pktio_ops_subsystem.h \ - ${srcdir}/include/odp_pkt_queue_internal.h \ - ${srcdir}/include/odp_queue_subsystem.h \ - ${srcdir}/include/odp_pool_internal.h \ - ${srcdir}/include/odp_pool_subsystem.h \ - ${srcdir}/include/odp_posix_extensions.h \ - ${srcdir}/include/odp_queue_internal.h \ - ${srcdir}/include/odp_queue_scalable_internal.h \ - ${srcdir}/include/odp_ring_internal.h \ - ${srcdir}/include/odp_queue_if.h \ - ${srcdir}/include/odp_schedule_if.h \ - ${srcdir}/include/odp_schedule_scalable.h \ - ${srcdir}/include/odp_schedule_scalable_config.h \ - ${srcdir}/include/odp_schedule_scalable_ordered.h \ - ${srcdir}/include/odp_schedule_subsystem.h \ - ${srcdir}/include/odp_sorted_list_internal.h \ - ${srcdir}/include/odp_shm_internal.h \ - ${srcdir}/include/odp_time_internal.h \ - ${srcdir}/include/odp_timer_internal.h \ - ${srcdir}/include/odp_timer_wheel_internal.h \ - ${srcdir}/include/odp_traffic_mngr_internal.h \ - ${srcdir}/include/protocols/eth.h \ - ${srcdir}/include/protocols/ip.h \ - ${srcdir}/include/protocols/ipsec.h \ - ${srcdir}/include/protocols/tcp.h \ - ${srcdir}/include/protocols/thash.h \ - ${srcdir}/include/protocols/udp.h + include/_fdserver_internal.h \ + include/_ishm_internal.h \ + include/_ishmphy_internal.h \ + include/_ishmpool_internal.h \ ++ include/drv_driver_internal.h \ + include/odp_align_internal.h \ + include/odp_atomic_internal.h \ + include/odp_buffer_inlines.h \ + include/odp_bitmap_internal.h \ + include/odp_bitset.h \ + include/odp_buffer_internal.h \ ++ include/odp_buffer_subsystem.h \ + include/odp_classification_datamodel.h \ + include/odp_classification_inlines.h \ + include/odp_classification_internal.h \ + include/odp_config_internal.h \ + include/odp_crypto_internal.h \ + include/odp_debug_internal.h \ + include/odp_errno_define.h \ + include/odp_forward_typedefs_internal.h \ + include/odp_internal.h \ + include/odp_ipsec_internal.h \ + include/odp_llqueue.h \ + include/odp_name_table_internal.h \ + include/odp_packet_internal.h \ + include/odp_packet_io_internal.h \ - include/odp_packet_io_ipc_internal.h \ + include/odp_packet_io_ring_internal.h \ - include/odp_packet_netmap.h \ - include/odp_packet_dpdk.h \ - include/odp_packet_socket.h \ - include/odp_packet_tap.h \ ++ pktio/ethtool.h \ ++ pktio/common.h \ ++ pktio/sysfs.h \ ++ pktio/dpdk.h \ ++ include/odp_pktio_ops_ipc.h \ ++ include/odp_pktio_ops_loopback.h \ ++ include/odp_pktio_ops_netmap.h \ ++ include/odp_pktio_ops_pcap.h \ ++ include/odp_pktio_ops_socket.h \ ++ include/odp_pktio_ops_tap.h \ ++ include/odp_pktio_ops_subsystem.h \ + include/odp_pkt_queue_internal.h \ ++ include/odp_queue_subsystem.h \ + include/odp_pool_internal.h \ ++ include/odp_pool_subsystem.h \ + include/odp_posix_extensions.h \ + include/odp_queue_internal.h \ + include/odp_queue_scalable_internal.h \ + include/odp_ring_internal.h \ + include/odp_queue_if.h \ + include/odp_schedule_if.h \ + include/odp_schedule_scalable.h \ + include/odp_schedule_scalable_config.h \ + include/odp_schedule_scalable_ordered.h \ ++ include/odp_schedule_subsystem.h \ + include/odp_sorted_list_internal.h \ + include/odp_shm_internal.h \ + include/odp_time_internal.h \ + include/odp_timer_internal.h \ + include/odp_timer_wheel_internal.h \ + include/odp_traffic_mngr_internal.h \ + include/protocols/eth.h \ + include/protocols/ip.h \ + include/protocols/ipsec.h \ + include/protocols/tcp.h \ + include/protocols/thash.h \ + include/protocols/udp.h __LIB__libodp_linux_la_SOURCES = \ _fdserver.c \ diff --cc platform/linux-generic/include/odp_internal.h index f81644b1,d01b4f15..6811d8d0 --- a/platform/linux-generic/include/odp_internal.h +++ b/platform/linux-generic/include/odp_internal.h @@@ -74,7 -74,8 +74,9 @@@ enum init_stage CLASSIFICATION_INIT, TRAFFIC_MNGR_INIT, NAME_TABLE_INIT, + DRIVER_INIT, + IPSEC_EVENTS_INIT, + IPSEC_SAD_INIT, MODULES_INIT, ALL_INIT /* All init stages completed */ }; @@@ -141,10 -135,12 +143,16 @@@ int _odp_ishm_init_local(void) int _odp_ishm_term_global(void); int _odp_ishm_term_local(void); +int _odpdrv_driver_init_global(void); +int _odpdrv_driver_init_local(void); +int _odpdrv_driver_term_global(void); + + int _odp_ipsec_sad_init_global(void); + int _odp_ipsec_sad_term_global(void); + + int _odp_ipsec_events_init_global(void); + int _odp_ipsec_events_term_global(void); + int _odp_modules_init_global(void); int cpuinfo_parser(FILE *file, system_info_t *sysinfo); diff --cc platform/linux-generic/m4/configure.m4 index c1d3509d,f4504bf9..fc29f9cb --- a/platform/linux-generic/m4/configure.m4 +++ b/platform/linux-generic/m4/configure.m4 @@@ -86,20 -15,19 +15,35 @@@ m4_include([platform/linux-generic/m4/o m4_include([platform/linux-generic/m4/odp_dpdk.m4]) m4_include([platform/linux-generic/m4/odp_schedule.m4]) + m4_include([platform/linux-generic/m4/performance.m4]) + + AC_CONFIG_COMMANDS_PRE([dnl + AM_CONDITIONAL([PLATFORM_IS_LINUX_GENERIC], + [test "${with_platform}" = "linux-generic"]) ++]) ++ AC_CONFIG_FILES([platform/linux-generic/Makefile - platform/linux-generic/include/odp/api/plat/static_inline.h]) + platform/linux-generic/libodp-linux.pc + platform/linux-generic/include/odp/api/plat/static_inline.h + platform/linux-generic/test/Makefile + platform/linux-generic/test/validation/api/shmem/Makefile + platform/linux-generic/test/validation/api/pktio/Makefile + platform/linux-generic/test/mmap_vlan_ins/Makefile + platform/linux-generic/test/pktio_ipc/Makefile + platform/linux-generic/test/ring/Makefile + platform/linux-generic/test/performance/Makefile]) -]) + +########################################################################## +# Enable default pktios build +########################################################################## +AC_DEFINE([ODP_PKTIO_IPC], [1], + [Define to 1 to enable IPC packet I/O support]) + +AC_DEFINE([ODP_PKTIO_TAP], [1], + [Define to 1 to enable TAP packet I/O support]) + +AC_DEFINE([ODP_PKTIO_SOCKET], [1], + [Define to 1 to enable SOCKET packet I/O support]) + +AC_DEFINE([ODP_PKTIO_SOCKET_MMAP], [1], + [Define to 1 to enable SOCKET_MMAP packet I/O support]) diff --cc platform/linux-generic/odp_init.c index d267cc82,1412c03a..0268a3bd --- a/platform/linux-generic/odp_init.c +++ b/platform/linux-generic/odp_init.c @@@ -223,12 -223,18 +223,24 @@@ int odp_init_global(odp_instance_t *ins } stage = NAME_TABLE_INIT; + if (_odpdrv_driver_init_global()) { + ODP_ERR("ODP drivers init failed\n"); + goto init_failed; + } + stage = DRIVER_INIT; + + if (_odp_ipsec_events_init_global()) { + ODP_ERR("ODP IPsec events init failed.\n"); + goto init_failed; + } + stage = IPSEC_EVENTS_INIT; + + if (_odp_ipsec_sad_init_global()) { + ODP_ERR("ODP IPsec SAD init failed.\n"); + goto init_failed; + } + stage = IPSEC_SAD_INIT; + if (_odp_modules_init_global()) { ODP_ERR("ODP modules init failed\n"); goto init_failed; @@@ -259,13 -265,20 +271,27 @@@ int _odp_term_global(enum init_stage st switch (stage) { case ALL_INIT: case MODULES_INIT: + case IPSEC_SAD_INIT: + if (_odp_ipsec_sad_term_global()) { + ODP_ERR("ODP IPsec SAD term failed.\n"); + rc = -1; + } + /* Fall through */ + + case IPSEC_EVENTS_INIT: + if (_odp_ipsec_events_term_global()) { + ODP_ERR("ODP IPsec events term failed.\n"); + rc = -1; + } + /* Fall through */ + + case DRIVER_INIT: + if (_odpdrv_driver_term_global()) { + ODP_ERR("driver term failed.\n"); + rc = -1; + } + /* Fall through */ + case NAME_TABLE_INIT: if (_odp_int_name_tbl_term_global()) { ODP_ERR("Name table term failed.\n"); diff --cc platform/linux-generic/odp_packet.c index 3011183d,3b2fac21..c65d7011 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@@ -1766,9 -1879,81 +1882,81 @@@ int _odp_packet_copy_md_to_packet(odp_p * user area was truncated in the process. Note this can only * happen when copying between different pools. */ - return dsthdr->buf_hdr.uarea_size < srchdr->buf_hdr.uarea_size; + return dst_size < src_size; } + /** Parser helper function for Ethernet packets */ + static inline uint16_t parse_eth(packet_parser_t *prs, const uint8_t **parseptr, + uint32_t *offset, uint32_t frame_len) + { + uint16_t ethtype; + const _odp_ethhdr_t *eth; + uint16_t macaddr0, macaddr2, macaddr4; + const _odp_vlanhdr_t *vlan; + + /* Detect jumbo frames */ + if (frame_len > _ODP_ETH_LEN_MAX) + prs->input_flags.jumbo = 1; + + eth = (const _odp_ethhdr_t *)*parseptr; + + /* Handle Ethernet broadcast/multicast addresses */ + macaddr0 = odp_be_to_cpu_16(*((const uint16_t *)(const void *)eth)); + prs->input_flags.eth_mcast = (macaddr0 & 0x0100) == 0x0100; + + if (macaddr0 == 0xffff) { + macaddr2 = + odp_be_to_cpu_16(*((const uint16_t *) + (const void *)eth + 1)); + macaddr4 = + odp_be_to_cpu_16(*((const uint16_t *) + (const void *)eth + 2)); + prs->input_flags.eth_bcast = + (macaddr2 == 0xffff) && (macaddr4 == 0xffff); + } else { + prs->input_flags.eth_bcast = 0; + } + + /* Get Ethertype */ + ethtype = odp_be_to_cpu_16(eth->type); + *offset += sizeof(*eth); + *parseptr += sizeof(*eth); + + /* Check for SNAP vs. DIX */ + if (ethtype < _ODP_ETH_LEN_MAX) { + prs->input_flags.snap = 1; + if (ethtype > frame_len - *offset) { + prs->error_flags.snap_len = 1; + return 0; + } + ethtype = odp_be_to_cpu_16(*((const uint16_t *)(uintptr_t) + (parseptr + 6))); + *offset += 8; + *parseptr += 8; + } + + /* Parse the VLAN header(s), if present */ + if (ethtype == _ODP_ETHTYPE_VLAN_OUTER) { + prs->input_flags.vlan_qinq = 1; + prs->input_flags.vlan = 1; + + vlan = (const _odp_vlanhdr_t *)*parseptr; + ethtype = odp_be_to_cpu_16(vlan->type); + *offset += sizeof(_odp_vlanhdr_t); + *parseptr += sizeof(_odp_vlanhdr_t); + } + + if (ethtype == _ODP_ETHTYPE_VLAN) { + prs->input_flags.vlan = 1; + vlan = (const _odp_vlanhdr_t *)*parseptr; + ethtype = odp_be_to_cpu_16(vlan->type); + *offset += sizeof(_odp_vlanhdr_t); + *parseptr += sizeof(_odp_vlanhdr_t); + } + + return ethtype; + } + /** * Parser helper function for IPv4 */ diff --cc platform/linux-generic/odp_packet_io.c index d5f8d5de,5f7da263..a1c70861 --- a/platform/linux-generic/odp_packet_io.c +++ b/platform/linux-generic/odp_packet_io.c @@@ -179,10 -201,11 +178,12 @@@ static odp_pktio_t setup_pktio_entry(co /* if successful, alloc_pktio_entry() returns with the entry locked */ pktio_entry = get_pktio_entry(hdl); - if (!pktio_entry) + if (!pktio_entry) { + unlock_entry(pktio_entry); return ODP_PKTIO_INVALID; + } + pktio_entry->s.ops = NULL; /* Reset stale ops */ pktio_entry->s.pool = pool; memcpy(&pktio_entry->s.param, param, sizeof(odp_pktio_param_t)); pktio_entry->s.handle = hdl; @@@ -190,28 -212,28 +191,28 @@@ odp_pktio_config_init(&pktio_entry->s.config); - for (pktio_if = 0; pktio_if_ops[pktio_if]; ++pktio_if) { - ret = pktio_if_ops[pktio_if]->open(hdl, pktio_entry, name, - pool); - if (!ret) + odp_subsystem_lock(read, pktio_ops); + odp_subsystem_foreach_module(pktio_ops, mod) { + if (0 == mod->open(hdl, pktio_entry, name, pool)) { + pktio_entry->s.ops = mod; + ODP_DBG("%s uses %s\n", name, mod->base.name); break; + } } + odp_subsystem_unlock(read, pktio_ops); - if (ret != 0) { + if (pktio_entry->s.ops == NULL) { pktio_entry->s.state = PKTIO_STATE_FREE; - hdl = ODP_PKTIO_INVALID; + unlock_entry(pktio_entry); ODP_ERR("Unable to init any I/O type.\n"); - } else { - snprintf(pktio_entry->s.name, - sizeof(pktio_entry->s.name), "%s", name); - pktio_entry->s.state = PKTIO_STATE_OPENED; + return ODP_PKTIO_INVALID; } + snprintf(pktio_entry->s.name, + sizeof(pktio_entry->s.name), "%s", name); + pktio_entry->s.state = PKTIO_STATE_OPENED; - pktio_entry->s.ops = pktio_if_ops[pktio_if]; unlock_entry(pktio_entry); - ODP_DBG("%s uses %s\n", name, pktio_if_ops[pktio_if]->name); - return hdl; } diff --cc platform/linux-generic/pktio/dpdk.c index 563d70a3,9782d60c..4ef111c3 --- a/platform/linux-generic/pktio/dpdk.c +++ b/platform/linux-generic/pktio/dpdk.c @@@ -1567,14 -1575,11 +1618,14 @@@ static int dpdk_stats_reset(pktio_entry return 0; } -const pktio_if_ops_t dpdk_pktio_ops = { - .name = "dpdk", - .init_global = dpdk_pktio_init_global, - .init_local = dpdk_pktio_init_local, - .term = dpdk_pktio_term, +static pktio_ops_module_t dpdk_pktio_ops = { + .base = { + .name = "dpdk", + .init_local = dpdk_pktio_init_local, + .init_global = dpdk_pktio_init_global, + .term_local = NULL, - .term_global = NULL, ++ .term_global = dpdk_pktio_term, + }, .open = dpdk_open, .close = dpdk_close, .start = dpdk_start, diff --cc platform/linux-generic/pktio/loopback.c index 01bbc8bc,8bb4b4f1..60bee591 --- a/platform/linux-generic/pktio/loopback.c +++ b/platform/linux-generic/pktio/loopback.c @@@ -175,9 -170,25 +181,25 @@@ static int loopback_send(pktio_entry_t bytes += odp_packet_len(pkt_tbl[i]); } + if (pktio_entry->s.config.outbound_ipsec) + for (i = 0; i < len; ++i) { + odp_buffer_t buf = buf_from_buf_hdr(hdr_tbl[i]); + odp_ipsec_packet_result_t result; + + if (_odp_buffer_event_subtype(buf) != + ODP_EVENT_PACKET_IPSEC) + continue; + + /* Possibly postprocessing packet */ + odp_ipsec_result(&result, pkt_tbl[i]); + + _odp_buffer_event_subtype_set(buf, + ODP_EVENT_PACKET_BASIC); + } + odp_ticketlock_lock(&pktio_entry->s.txl); - queue = queue_fn->from_ext(pktio_entry->s.pkt_loop.loopq); + queue = queue_fn->from_ext(pkt_lbk->loopq); ret = queue_fn->enq_multi(queue, hdr_tbl, len); if (ret > 0) { diff --cc platform/linux-generic/pktio/tap.c index fffc4c82,d8b78f3f..5bc7481d --- a/platform/linux-generic/pktio/tap.c +++ b/platform/linux-generic/pktio/tap.c @@@ -137,8 -157,30 +160,30 @@@ static int tap_pktio_open(odp_pktio_t i goto sock_err; } - /* Up interface by default. */ - if (ioctl(skfd, SIOCGIFFLAGS, &ifr) < 0) { + tap->fd = fd; + tap->skfd = skfd; + tap->mtu = mtu; + tap->pool = pool; + return 0; + sock_err: + close(skfd); + tap_err: + close(fd); + ODP_ERR("Tap device alloc failed.\n"); + return -1; + } + + static int tap_pktio_start(pktio_entry_t *pktio_entry) + { + struct ifreq ifr; - pkt_tap_t *tap = &pktio_entry->s.pkt_tap; ++ pktio_ops_tap_data_t *tap = odp_ops_data(pktio_entry, tap); + + odp_memset(&ifr, 0, sizeof(ifr)); + snprintf(ifr.ifr_name, IF_NAMESIZE, "%s", + (char *)pktio_entry->s.name + 4); + + /* Up interface by default. */ + if (ioctl(tap->skfd, SIOCGIFFLAGS, &ifr) < 0) { __odp_errno = errno; ODP_ERR("ioctl(SIOCGIFFLAGS) failed: %s\n", strerror(errno)); goto sock_err; @@@ -153,16 -195,40 +198,40 @@@ goto sock_err; } - tap->fd = fd; - tap->skfd = skfd; - tap->mtu = mtu; - tap->pool = pool; return 0; sock_err: - close(skfd); - tap_err: - close(fd); - ODP_ERR("Tap device alloc failed.\n"); + ODP_ERR("Tap device open failed.\n"); + return -1; + } + + static int tap_pktio_stop(pktio_entry_t *pktio_entry) + { + struct ifreq ifr; - pkt_tap_t *tap = &pktio_entry->s.pkt_tap; ++ pktio_ops_tap_data_t *tap = odp_ops_data(pktio_entry, tap); + + odp_memset(&ifr, 0, sizeof(ifr)); + snprintf(ifr.ifr_name, IF_NAMESIZE, "%s", + (char *)pktio_entry->s.name + 4); + + /* Up interface by default. */ + if (ioctl(tap->skfd, SIOCGIFFLAGS, &ifr) < 0) { + __odp_errno = errno; + ODP_ERR("ioctl(SIOCGIFFLAGS) failed: %s\n", strerror(errno)); + goto sock_err; + } + + ifr.ifr_flags &= ~IFF_UP; + ifr.ifr_flags &= ~IFF_RUNNING; + + if (ioctl(tap->skfd, SIOCSIFFLAGS, &ifr) < 0) { + __odp_errno = errno; + ODP_ERR("failed to come up: %s\n", strerror(errno)); + goto sock_err; + } + + return 0; + sock_err: + ODP_ERR("Tap device open failed.\n"); return -1; } @@@ -368,6 -429,22 +437,23 @@@ static int tap_mac_addr_get(pktio_entry return ETH_ALEN; } + static int tap_mac_addr_set(pktio_entry_t *pktio_entry, const void *mac_addr) + { - pkt_tap_t *tap = &pktio_entry->s.pkt_tap; ++ pktio_ops_tap_data_t *tap = odp_ops_data(pktio_entry, tap); + + memcpy(tap->if_mac, mac_addr, ETH_ALEN); + + return mac_addr_set_fd(tap->fd, (char *)pktio_entry->s.name + 4, - tap->if_mac); ++ tap->if_mac); + } + + static int tap_link_status(pktio_entry_t *pktio_entry) + { - return link_status_fd(pktio_entry->s.pkt_tap.skfd, - pktio_entry->s.name + 4); ++ pktio_ops_tap_data_t *tap = odp_ops_data(pktio_entry, tap); ++ ++ return link_status_fd(tap->skfd, pktio_entry->s.name + 4); + } + static int tap_capability(pktio_entry_t *pktio_entry ODP_UNUSED, odp_pktio_capability_t *capa) { @@@ -383,47 -461,26 +470,47 @@@ return 0; } -const pktio_if_ops_t tap_pktio_ops = { - .name = "tap", - .print = NULL, - .init_global = NULL, - .init_local = NULL, - .term = NULL, +static pktio_ops_module_t tap_pktio_ops = { + .base = { + .name = "tap", + .init_local = NULL, + .term_local = NULL, + .init_global = NULL, + .term_global = NULL, + }, .open = tap_pktio_open, .close = tap_pktio_close, - .start = NULL, - .stop = NULL, + .start = tap_pktio_start, + .stop = tap_pktio_stop, + .stats = NULL, + .stats_reset = NULL, + .pktin_ts_res = NULL, + .pktin_ts_from_ns = NULL, .recv = tap_pktio_recv, .send = tap_pktio_send, .mtu_get = tap_mtu_get, .promisc_mode_set = tap_promisc_mode_set, .promisc_mode_get = tap_promisc_mode_get, .mac_get = tap_mac_addr_get, - .mac_set = NULL, - .link_status = NULL, + .mac_set = tap_mac_addr_set, + .link_status = tap_link_status, .capability = tap_capability, - .pktin_ts_res = NULL, - .pktin_ts_from_ns = NULL, - .config = NULL + .config = NULL, + .input_queues_config = NULL, + .output_queues_config = NULL, + .print = NULL, }; + +ODP_MODULE_CONSTRUCTOR(tap_pktio_ops) +{ + odp_module_constructor(&tap_pktio_ops); + + odp_subsystem_register_module(pktio_ops, &tap_pktio_ops); +} + +/* Temporary variable to enable link this module, + * will remove in Makefile scheme changes. + */ +int enable_link_tap_pktio_ops = 0; + +#endif /* ODP_PKTIO_TAP */ diff --cc platform/linux-generic/pool/generic.c index 37628b13,40114093..c55f6757 --- a/platform/linux-generic/pool/generic.c +++ b/platform/linux-generic/pool/generic.c @@@ -29,8 -29,13 +29,12 @@@ #define UNLOCK(a) _odp_ticketlock_unlock(a) #define LOCK_INIT(a) odp_ticketlock_init(a) -#define CACHE_BURST 32 #define RING_SIZE_MIN (2 * CACHE_BURST) + /* Make sure packet buffers don't cross huge page boundaries starting from this + * page size. 2MB is typically the smallest used huge page size. */ + #define FIRST_HP_SIZE (2 * 1024 * 1024) + /* Define a practical limit for contiguous memory allocations */ #define MAX_SIZE (10 * 1024 * 1024) diff --cc test/m4/configure.m4 index 460e8449,92bb53ad..a9e345bf --- a/test/m4/configure.m4 +++ b/test/m4/configure.m4 @@@ -1,3 -1,38 +1,39 @@@ - m4_include([test/common_plat/m4/configure.m4]) + m4_include([test/m4/miscellaneous.m4]) + m4_include([test/m4/performance.m4]) + m4_include([test/m4/validation.m4]) - AC_CONFIG_FILES([test/Makefile]) + AC_CONFIG_FILES([test/Makefile + test/common/Makefile + test/miscellaneous/Makefile + test/performance/Makefile + test/validation/Makefile + test/validation/api/atomic/Makefile + test/validation/api/barrier/Makefile + test/validation/api/buffer/Makefile + test/validation/api/chksum/Makefile + test/validation/api/classification/Makefile + test/validation/api/cpumask/Makefile + test/validation/api/crypto/Makefile + test/validation/api/errno/Makefile + test/validation/api/hash/Makefile + test/validation/api/init/Makefile + test/validation/api/ipsec/Makefile + test/validation/api/lock/Makefile + test/validation/api/Makefile + test/validation/api/packet/Makefile + test/validation/api/pktio/Makefile + test/validation/api/pool/Makefile + test/validation/api/queue/Makefile + test/validation/api/random/Makefile + test/validation/api/scheduler/Makefile + test/validation/api/shmem/Makefile + test/validation/api/std_clib/Makefile + test/validation/api/system/Makefile + test/validation/api/thread/Makefile + test/validation/api/time/Makefile + test/validation/api/timer/Makefile + test/validation/api/traffic_mngr/Makefile + test/validation/drv/Makefile + test/validation/drv/drvatomic/Makefile ++ test/validation/drv/drvdriver/Makefile + test/validation/drv/drvshmem/Makefile]) diff --cc test/validation/Makefile.inc index 5512cc0e,4f946b8a..c597d65f --- a/test/validation/Makefile.inc +++ b/test/validation/Makefile.inc @@@ -1,14 -1,8 +1,14 @@@ include $(top_srcdir)/test/Makefile.inc - COMMON_DIR = $(top_builddir)/test/common_plat/common + COMMON_DIR = $(top_builddir)/test/common +#the following option ensure that option '-I.' is not passed to gcc, +#therefore distinguishing between '#include "X"' and '#include <X>'. +#It allows common filenames (such as 'errno.h') to be used locally. +AUTOMAKE_OPTIONS = nostdinc + - AM_CFLAGS += -I$(top_srcdir)/test/common_plat/common + AM_CFLAGS += -I$(top_srcdir)/test/common +AM_LDFLAGS += -static LIBCUNIT_COMMON = $(COMMON_DIR)/libcunit_common.la LIBCPUMASK_COMMON = $(COMMON_DIR)/libcpumask_common.la diff --cc test/validation/drv/drvdriver/.gitignore index 76bb6baf,00000000..76bb6baf mode 100644,000000..100644 --- a/test/validation/drv/drvdriver/.gitignore +++ b/test/validation/drv/drvdriver/.gitignore diff --cc test/validation/drv/drvdriver/Makefile.am index 88bd828a,00000000..88bd828a mode 100644,000000..100644 --- a/test/validation/drv/drvdriver/Makefile.am +++ b/test/validation/drv/drvdriver/Makefile.am diff --cc test/validation/drv/drvdriver/drvdriver_device.c index d010026f,00000000..d010026f mode 100644,000000..100644 --- a/test/validation/drv/drvdriver/drvdriver_device.c +++ b/test/validation/drv/drvdriver/drvdriver_device.c diff --cc test/validation/drv/drvdriver/drvdriver_device.h index afc04c59,00000000..afc04c59 mode 100644,000000..100644 --- a/test/validation/drv/drvdriver/drvdriver_device.h +++ b/test/validation/drv/drvdriver/drvdriver_device.h diff --cc test/validation/drv/drvdriver/drvdriver_device_main.c index 27de9c5b,00000000..27de9c5b mode 100644,000000..100644 --- a/test/validation/drv/drvdriver/drvdriver_device_main.c +++ b/test/validation/drv/drvdriver/drvdriver_device_main.c diff --cc test/validation/drv/drvdriver/drvdriver_devio.c index cf7c7c93,00000000..cf7c7c93 mode 100644,000000..100644 --- a/test/validation/drv/drvdriver/drvdriver_devio.c +++ b/test/validation/drv/drvdriver/drvdriver_devio.c diff --cc test/validation/drv/drvdriver/drvdriver_devio.h index eea9623f,00000000..eea9623f mode 100644,000000..100644 --- a/test/validation/drv/drvdriver/drvdriver_devio.h +++ b/test/validation/drv/drvdriver/drvdriver_devio.h diff --cc test/validation/drv/drvdriver/drvdriver_devio_main.c index 10733adf,00000000..10733adf mode 100644,000000..100644 --- a/test/validation/drv/drvdriver/drvdriver_devio_main.c +++ b/test/validation/drv/drvdriver/drvdriver_devio_main.c diff --cc test/validation/drv/drvdriver/drvdriver_driver.c index edcb0f43,00000000..edcb0f43 mode 100644,000000..100644 --- a/test/validation/drv/drvdriver/drvdriver_driver.c +++ b/test/validation/drv/drvdriver/drvdriver_driver.c diff --cc test/validation/drv/drvdriver/drvdriver_driver.h index d80c6890,00000000..d80c6890 mode 100644,000000..100644 --- a/test/validation/drv/drvdriver/drvdriver_driver.h +++ b/test/validation/drv/drvdriver/drvdriver_driver.h diff --cc test/validation/drv/drvdriver/drvdriver_driver_main.c index 671689c7,00000000..671689c7 mode 100644,000000..100644 --- a/test/validation/drv/drvdriver/drvdriver_driver_main.c +++ b/test/validation/drv/drvdriver/drvdriver_driver_main.c diff --cc test/validation/drv/drvdriver/drvdriver_enumr.c index 38aac3d0,00000000..38aac3d0 mode 100644,000000..100644 --- a/test/validation/drv/drvdriver/drvdriver_enumr.c +++ b/test/validation/drv/drvdriver/drvdriver_enumr.c diff --cc test/validation/drv/drvdriver/drvdriver_enumr.h index afe814ac,00000000..afe814ac mode 100644,000000..100644 --- a/test/validation/drv/drvdriver/drvdriver_enumr.h +++ b/test/validation/drv/drvdriver/drvdriver_enumr.h diff --cc test/validation/drv/drvdriver/drvdriver_enumr_class.c index f7dd42cf,00000000..f7dd42cf mode 100644,000000..100644 --- a/test/validation/drv/drvdriver/drvdriver_enumr_class.c +++ b/test/validation/drv/drvdriver/drvdriver_enumr_class.c diff --cc test/validation/drv/drvdriver/drvdriver_enumr_class.h index a4f6cdc7,00000000..a4f6cdc7 mode 100644,000000..100644 --- a/test/validation/drv/drvdriver/drvdriver_enumr_class.h +++ b/test/validation/drv/drvdriver/drvdriver_enumr_class.h diff --cc test/validation/drv/drvdriver/drvdriver_enumr_class_main.c index 45a4c1a1,00000000..45a4c1a1 mode 100644,000000..100644 --- a/test/validation/drv/drvdriver/drvdriver_enumr_class_main.c +++ b/test/validation/drv/drvdriver/drvdriver_enumr_class_main.c diff --cc test/validation/drv/drvdriver/drvdriver_enumr_main.c index 53bc192e,00000000..53bc192e mode 100644,000000..100644 --- a/test/validation/drv/drvdriver/drvdriver_enumr_main.c +++ b/test/validation/drv/drvdriver/drvdriver_enumr_main.c ----------------------------------------------------------------------- Summary of changes: .gitignore | 4 +- .shippable.yml | 45 + .travis.yml | 36 +- DEPENDENCIES | 6 +- Makefile.am | 20 +- configure.ac | 23 +- doc/users-guide/users-guide.adoc | 18 + example/Makefile.am | 2 + example/Makefile.inc | 4 +- example/classifier/Makefile.am | 9 +- example/classifier/odp_classifier.c | 14 +- example/generator/Makefile.am | 9 +- example/generator/odp_generator.c | 12 +- example/hello/Makefile.am | 6 +- example/ipfragreass/Makefile.am | 27 +- example/ipsec/Makefile.am | 53 +- example/ipsec/odp_ipsec.c | 12 +- example/l2fwd/odp_l2fwd.c | 2 +- example/l2fwd_simple/Makefile.am | 9 +- example/l2fwd_simple/l2fwd_simple_run.sh | 3 +- example/l3fwd/Makefile.am | 15 +- example/l3fwd/odp_l3fwd.c | 63 +- example/l3fwd/odp_l3fwd_run.sh | 2 +- example/packet/Makefile.am | 9 +- example/packet/odp_pktio.c | 12 +- example/packet/pktio_run.sh | 8 +- example/switch/Makefile.am | 9 +- example/switch/odp_switch.c | 14 +- example/switch/switch_run.sh | 2 +- example/time/Makefile.am | 9 +- example/timer/Makefile.am | 15 +- example/timer/odp_timer_test.c | 10 +- example/traffic_mgmt/Makefile.am | 10 +- example/traffic_mgmt/odp_traffic_mgmt.c | 30 +- helper/.gitignore | 1 + helper/Makefile.am | 57 +- {pkgconfig => helper}/libodphelper.pc.in | 0 helper/m4/configure.m4 | 3 +- helper/test/Makefile.am | 18 +- helper/test/linux/Makefile.am | 5 - helper/test/odpthreads_as_processes | 2 +- helper/test/odpthreads_as_pthreads | 2 +- include/Makefile.am | 163 +++ include/odp/api/spec/ipsec.h | 20 +- include/odp/api/spec/packet.h | 25 +- include/odp/api/spec/pool.h | 16 + include/odp/api/spec/shared_memory.h | 74 +- m4/ax_valgrind_check.m4 | 23 +- m4/odp_atomic.m4 | 95 ++ m4/odp_openssl.m4 | 60 + {platform/linux-generic/m4 => m4}/odp_timer.m4 | 7 +- m4/odp_visibility.m4 | 21 + platform/Makefile.inc | 90 -- platform/linux-dpdk/Makefile.am | 6 + .../linux-dpdk/include/odp/api/plat/timer_types.h | 4 +- platform/linux-dpdk/include/odp_packet_internal.h | 15 + .../linux-dpdk}/libodp-dpdk.pc.in | 0 platform/linux-dpdk/m4/configure.m4 | 16 +- platform/linux-dpdk/m4/odp_openssl.m4 | 1 - platform/linux-dpdk/m4/odp_timer.m4 | 1 - platform/linux-dpdk/m4/performance.m4 | 1 + platform/linux-dpdk/odp_init.c | 36 +- platform/linux-dpdk/odp_packet.c | 325 +++-- .../linux-dpdk/test}/.gitignore | 0 platform/linux-dpdk/test/Makefile.am | 35 + .../linux-dpdk/test}/Makefile.inc | 13 +- .../test/validation/api/pktio/.gitignore | 1 + .../test}/validation/api/pktio/Makefile.am | 0 .../linux-dpdk/test/validation/api/pktio/pktio_env | 1 + .../test}/validation/api/pktio/pktio_run.sh | 0 .../linux-dpdk/test}/wrapper-script.sh | 0 platform/linux-generic/.gitignore | 1 + platform/linux-generic/Makefile.am | 407 ++++--- platform/linux-generic/_ishm.c | 118 +- .../linux-generic/arch/default/odp_sysinfo_parse.c | 5 + .../linux-generic/arch/mips64/odp_sysinfo_parse.c | 5 + .../linux-generic/arch/powerpc/odp_sysinfo_parse.c | 5 + .../linux-generic/arch/x86/odp_sysinfo_parse.c | 36 + platform/linux-generic/include/_ishm_internal.h | 1 + .../include/odp/api/plat/timer_types.h | 4 +- .../linux-generic/include/odp_buffer_internal.h | 6 +- .../linux-generic/include/odp_config_internal.h | 17 +- .../linux-generic/include/odp_debug_internal.h | 2 +- platform/linux-generic/include/odp_internal.h | 9 + .../linux-generic/include/odp_ipsec_internal.h | 201 ++++ .../linux-generic/include/odp_packet_internal.h | 21 +- platform/linux-generic/include/odp_pool_internal.h | 3 +- platform/linux-generic/include/protocols/ip.h | 1 + .../linux-generic}/libodp-linux.pc.in | 0 platform/linux-generic/m4/configure.m4 | 98 +- platform/linux-generic/m4/odp_dpdk.m4 | 4 +- platform/linux-generic/m4/odp_netmap.m4 | 4 +- platform/linux-generic/m4/odp_openssl.m4 | 37 - platform/linux-generic/m4/odp_pcap.m4 | 4 +- {test => platform}/linux-generic/m4/performance.m4 | 2 + platform/linux-generic/odp_event.c | 4 + platform/linux-generic/odp_init.c | 26 + platform/linux-generic/odp_ipsec.c | 1251 ++++++++++++++++++-- platform/linux-generic/odp_ipsec_events.c | 156 +++ platform/linux-generic/odp_ipsec_sad.c | 500 ++++++++ platform/linux-generic/odp_packet.c | 413 +++++-- platform/linux-generic/odp_packet_io.c | 34 +- platform/linux-generic/odp_pkt_queue.c | 22 +- platform/linux-generic/odp_shared_memory.c | 5 + platform/linux-generic/odp_sorted_list.c | 12 +- platform/linux-generic/odp_system_info.c | 7 +- platform/linux-generic/odp_timer.c | 110 +- platform/linux-generic/odp_timer_wheel.c | 44 +- platform/linux-generic/odp_traffic_mngr.c | 42 +- platform/linux-generic/pktio/dpdk.c | 105 +- platform/linux-generic/pktio/loopback.c | 25 + platform/linux-generic/pktio/netmap.c | 17 +- platform/linux-generic/pktio/socket_mmap.c | 2 +- platform/linux-generic/pktio/tap.c | 117 +- platform/linux-generic/pool/generic.c | 103 +- .../linux-generic/test}/.gitignore | 1 + platform/linux-generic/test/Makefile.am | 57 + .../linux-generic/test}/Makefile.inc | 4 +- .../linux-generic/test}/mmap_vlan_ins/.gitignore | 0 .../linux-generic/test}/mmap_vlan_ins/Makefile.am | 2 +- .../test}/mmap_vlan_ins/mmap_vlan_ins.c | 0 .../test}/mmap_vlan_ins/mmap_vlan_ins.sh | 0 .../linux-generic/test/mmap_vlan_ins}/pktio_env | 0 .../linux-generic/test}/mmap_vlan_ins/vlan.pcap | Bin .../linux-generic/test/performance}/.gitignore | 0 .../linux-generic/test}/performance/Makefile.am | 0 .../test}/performance/odp_scheduling_run_proc.sh | 2 +- .../linux-generic/test}/pktio_ipc/.gitignore | 0 .../linux-generic/test}/pktio_ipc/Makefile.am | 0 .../linux-generic/test}/pktio_ipc/ipc_common.c | 8 +- .../linux-generic/test}/pktio_ipc/ipc_common.h | 0 .../linux-generic/test}/pktio_ipc/pktio_ipc1.c | 0 .../linux-generic/test}/pktio_ipc/pktio_ipc2.c | 0 .../linux-generic/test}/pktio_ipc/pktio_ipc_run.sh | 0 .../linux-generic/test}/ring/.gitignore | 0 .../linux-generic/test}/ring/Makefile.am | 2 +- .../linux-generic/test}/ring/ring_basic.c | 0 .../linux-generic/test}/ring/ring_main.c | 0 .../linux-generic/test}/ring/ring_stress.c | 0 .../linux-generic/test}/ring/ring_suites.c | 0 .../linux-generic/test}/ring/ring_suites.h | 0 .../linux-generic/test/validation/Makefile.inc | 1 + .../linux-generic/test/validation/api/Makefile.inc | 1 + .../test/validation/api/pktio}/.gitignore | 0 .../test}/validation/api/pktio/Makefile.am | 0 .../test/validation/api/pktio}/pktio_env | 0 .../test}/validation/api/pktio/pktio_run.sh | 2 +- .../test}/validation/api/pktio/pktio_run_dpdk.sh | 4 +- .../test}/validation/api/pktio/pktio_run_netmap.sh | 2 +- .../test}/validation/api/pktio/pktio_run_pcap.sh | 2 +- .../test}/validation/api/pktio/pktio_run_tap.sh | 2 +- .../test}/validation/api/shmem/.gitignore | 0 .../test}/validation/api/shmem/Makefile.am | 2 +- .../test}/validation/api/shmem/shmem_common.h | 0 .../test}/validation/api/shmem/shmem_linux.c | 8 +- .../test}/validation/api/shmem/shmem_linux.h | 0 .../test}/validation/api/shmem/shmem_odp1.c | 0 .../test}/validation/api/shmem/shmem_odp1.h | 0 .../test}/validation/api/shmem/shmem_odp2.c | 0 .../test}/validation/api/shmem/shmem_odp2.h | 0 scripts/Dockerfile | 26 + scripts/build-pktio-dpdk | 8 +- scripts/ci-checkpatches.sh | 22 +- test/Makefile.am | 2 +- test/Makefile.inc | 3 +- test/README | 2 +- test/{common_plat => }/common/Makefile.am | 7 + test/{common_plat => }/common/mask_common.c | 0 test/{common_plat => }/common/mask_common.h | 0 test/{common_plat => }/common/odp_cunit_common.c | 0 test/{common_plat => }/common/odp_cunit_common.h | 0 .../{linux-generic/run-test => common/run-test.sh} | 0 test/{ => common}/test_debug.h | 0 test/common_plat/Makefile.am | 7 - test/common_plat/m4/configure.m4 | 39 - test/common_plat/validation/api/Makefile.am | 27 - test/common_plat/validation/api/Makefile.inc | 13 - test/common_plat/validation/api/ipsec/.gitignore | 1 - test/common_plat/validation/api/ipsec/Makefile.am | 10 - test/common_plat/validation/api/ipsec/ipsec.c | 44 - test/common_plat/validation/api/ipsec/ipsec.h | 24 - test/common_plat/validation/api/ipsec/ipsec_main.c | 12 - test/common_plat/validation/drv/Makefile.inc | 1 - test/linux-dpdk/Makefile.am | 56 - test/linux-dpdk/m4/configure.m4 | 4 - test/linux-dpdk/run-test | 1 - test/linux-dpdk/validation/api/pktio/.gitignore | 1 - test/linux-dpdk/validation/api/pktio/pktio_env | 1 - test/linux-generic/Makefile.am | 90 -- test/linux-generic/m4/configure.m4 | 9 - test/linux-generic/validation/Makefile.inc | 1 - test/linux-generic/validation/api/Makefile.inc | 1 - test/linux-generic/validation/api/pktio/.gitignore | 2 - test/m4/configure.m4 | 40 +- test/{common_plat => }/m4/miscellaneous.m4 | 0 test/{common_plat => }/m4/performance.m4 | 0 test/{common_plat => }/m4/validation.m4 | 2 +- test/{common_plat => }/miscellaneous/.gitignore | 0 test/{common_plat => }/miscellaneous/Makefile.am | 4 +- .../miscellaneous/odp_api_from_cpp.cpp | 0 test/{common_plat => }/performance/.gitignore | 0 test/{common_plat => }/performance/Makefile.am | 17 +- test/{common_plat => }/performance/dummy_crc.h | 0 .../performance/odp_bench_packet.c | 14 +- test/{common_plat => }/performance/odp_crypto.c | 0 test/{common_plat => }/performance/odp_l2fwd.c | 14 +- .../{common_plat => }/performance/odp_l2fwd_run.sh | 5 +- .../performance/odp_pktio_ordered.c | 14 +- .../performance/odp_pktio_ordered_run.sh | 0 .../{common_plat => }/performance/odp_pktio_perf.c | 42 +- .../performance/odp_sched_latency.c | 0 .../performance/odp_sched_latency_run.sh | 0 .../{common_plat => }/performance/odp_scheduling.c | 12 +- .../performance/odp_scheduling_run.sh | 0 test/{common_plat => }/performance/udp64.pcap | Bin test/{common_plat => }/validation/Makefile.am | 0 test/{common_plat => }/validation/Makefile.inc | 4 +- test/{linux-generic => validation/api}/.gitignore | 0 test/validation/api/Makefile.am | 79 ++ test/validation/api/Makefile.inc | 6 + test/{common_plat => }/validation/api/README | 0 .../validation/api/atomic/.gitignore | 0 .../validation/api/atomic/Makefile.am | 2 +- .../validation/api/atomic/atomic.c | 0 .../validation/api/atomic/atomic.h | 0 .../validation/api/atomic/atomic_main.c | 0 .../validation/api/barrier/.gitignore | 0 .../validation/api/barrier/Makefile.am | 2 +- .../validation/api/barrier/barrier.c | 0 .../validation/api/barrier/barrier.h | 0 .../validation/api/barrier/barrier_main.c | 0 .../validation/api/buffer/.gitignore | 0 .../validation/api/buffer/Makefile.am | 2 +- .../validation/api/buffer/buffer.c | 0 .../validation/api/buffer/buffer.h | 0 .../validation/api/buffer/buffer_main.c | 0 .../validation/api/chksum/.gitignore | 0 .../validation/api/chksum/Makefile.am | 0 .../validation/api/chksum/chksum.c | 0 .../validation/api/chksum/chksum.h | 0 .../validation/api/chksum/chksum_main.c | 0 .../validation/api/classification/.gitignore | 0 .../validation/api/classification/Makefile.am | 2 +- .../validation/api/classification/classification.c | 0 .../validation/api/classification/classification.h | 0 .../api/classification/classification_main.c | 0 .../api/classification/odp_classification_basic.c | 0 .../api/classification/odp_classification_common.c | 0 .../classification/odp_classification_test_pmr.c | 0 .../api/classification/odp_classification_tests.c | 0 .../classification/odp_classification_testsuites.h | 0 .../validation/api/cpumask/.gitignore | 0 .../validation/api/cpumask/Makefile.am | 2 +- .../validation/api/cpumask/cpumask.c | 0 .../validation/api/cpumask/cpumask.h | 0 .../validation/api/cpumask/cpumask_main.c | 0 .../validation/api/crypto/.gitignore | 0 .../validation/api/crypto/Makefile.am | 2 +- .../validation/api/crypto/crypto.c | 0 .../validation/api/crypto/crypto.h | 0 .../validation/api/crypto/crypto_main.c | 0 .../validation/api/crypto/odp_crypto_test_inp.c | 0 .../validation/api/crypto/odp_crypto_test_inp.h | 0 .../validation/api/crypto/test_vectors.h | 0 .../validation/api/crypto/test_vectors_len.h | 0 .../validation/api/errno/.gitignore | 0 .../validation/api/errno/Makefile.am | 2 +- .../{common_plat => }/validation/api/errno/errno.c | 0 .../{common_plat => }/validation/api/errno/errno.h | 0 .../validation/api/errno/errno_main.c | 0 .../validation/api/hash/.gitignore | 0 .../validation/api/hash/Makefile.am | 2 +- test/{common_plat => }/validation/api/hash/hash.c | 0 test/{common_plat => }/validation/api/hash/hash.h | 0 .../validation/api/hash/hash_main.c | 0 .../validation/api/init/.gitignore | 0 .../validation/api/init/Makefile.am | 2 +- test/{common_plat => }/validation/api/init/init.c | 0 test/{common_plat => }/validation/api/init/init.h | 0 .../validation/api/init/init_main_abort.c | 0 .../validation/api/init/init_main_log.c | 0 .../validation/api/init/init_main_ok.c | 0 test/validation/api/ipsec/.gitignore | 4 + test/validation/api/ipsec/Makefile.am | 27 + test/validation/api/ipsec/ipsec.c | 887 ++++++++++++++ test/validation/api/ipsec/ipsec.h | 89 ++ test/validation/api/ipsec/ipsec_async.c | 55 + test/validation/api/ipsec/ipsec_inline_in.c | 56 + test/validation/api/ipsec/ipsec_inline_out.c | 56 + test/validation/api/ipsec/ipsec_sync.c | 53 + test/validation/api/ipsec/ipsec_sync_in.c | 27 + test/validation/api/ipsec/ipsec_test_in.c | 815 +++++++++++++ test/validation/api/ipsec/ipsec_test_out.c | 348 ++++++ test/validation/api/ipsec/test_vectors.h | 965 +++++++++++++++ .../validation/api/lock/.gitignore | 0 .../validation/api/lock/Makefile.am | 2 +- test/{common_plat => }/validation/api/lock/lock.c | 0 test/{common_plat => }/validation/api/lock/lock.h | 0 .../validation/api/lock/lock_main.c | 0 .../validation/api/packet/.gitignore | 0 .../validation/api/packet/Makefile.am | 2 +- .../validation/api/packet/packet.c | 36 +- .../validation/api/packet/packet.h | 0 .../validation/api/packet/packet_main.c | 0 .../validation/api/pktio/.gitignore | 0 .../validation/api/pktio/Makefile.am | 2 +- .../validation/api/pktio/parser.c | 0 .../validation/api/pktio/parser.h | 0 .../{common_plat => }/validation/api/pktio/pktio.c | 0 .../{common_plat => }/validation/api/pktio/pktio.h | 0 .../validation/api/pktio/pktio_main.c | 0 .../validation/api/pool/.gitignore | 0 .../validation/api/pool/Makefile.am | 2 +- test/{common_plat => }/validation/api/pool/pool.c | 0 test/{common_plat => }/validation/api/pool/pool.h | 0 .../validation/api/pool/pool_main.c | 0 .../validation/api/queue/.gitignore | 0 .../validation/api/queue/Makefile.am | 2 +- .../{common_plat => }/validation/api/queue/queue.c | 0 .../{common_plat => }/validation/api/queue/queue.h | 0 .../validation/api/queue/queue_main.c | 0 .../validation/api/random/.gitignore | 0 .../validation/api/random/Makefile.am | 2 +- .../validation/api/random/random.c | 0 .../validation/api/random/random.h | 0 .../validation/api/random/random_main.c | 0 .../validation/api/scheduler/.gitignore | 0 .../validation/api/scheduler/Makefile.am | 2 +- .../validation/api/scheduler/scheduler.c | 0 .../validation/api/scheduler/scheduler.h | 0 .../validation/api/scheduler/scheduler_main.c | 0 .../validation/api/shmem/.gitignore | 0 .../validation/api/shmem/Makefile.am | 2 +- .../{common_plat => }/validation/api/shmem/shmem.c | 26 +- .../{common_plat => }/validation/api/shmem/shmem.h | 0 .../validation/api/shmem/shmem_main.c | 0 .../validation/api/std_clib/.gitignore | 0 .../validation/api/std_clib/Makefile.am | 2 +- .../validation/api/std_clib/std_clib.c | 0 .../validation/api/std_clib/std_clib.h | 0 .../validation/api/std_clib/std_clib_main.c | 0 .../validation/api/system/.gitignore | 0 .../validation/api/system/Makefile.am | 2 +- .../validation/api/system/system.c | 0 .../validation/api/system/system.h | 0 .../validation/api/system/system_main.c | 0 .../validation/api/thread/.gitignore | 0 .../validation/api/thread/Makefile.am | 2 +- .../validation/api/thread/thread.c | 0 .../validation/api/thread/thread.h | 0 .../validation/api/thread/thread_main.c | 0 .../validation/api/time/.gitignore | 0 .../validation/api/time/Makefile.am | 2 +- test/{common_plat => }/validation/api/time/time.c | 0 test/{common_plat => }/validation/api/time/time.sh | 2 +- .../validation/api/time/time_main.c | 0 .../validation/api/time/time_test.h | 0 .../validation/api/timer/.gitignore | 0 .../validation/api/timer/Makefile.am | 2 +- .../{common_plat => }/validation/api/timer/timer.c | 0 .../{common_plat => }/validation/api/timer/timer.h | 0 .../validation/api/timer/timer_main.c | 0 .../validation/api/traffic_mngr/.gitignore | 0 .../validation/api/traffic_mngr/Makefile.am | 2 +- .../validation/api/traffic_mngr/traffic_mngr.c | 0 .../validation/api/traffic_mngr/traffic_mngr.h | 0 .../validation/api/traffic_mngr/traffic_mngr.sh | 2 +- .../api/traffic_mngr/traffic_mngr_main.c | 0 .../performance => validation/drv}/.gitignore | 0 test/{common_plat => }/validation/drv/Makefile.am | 0 test/validation/drv/Makefile.inc | 1 + test/{common_plat => }/validation/drv/README | 0 .../validation/drv/drvatomic/.gitignore | 0 .../validation/drv/drvatomic/Makefile.am | 0 .../validation/drv/drvatomic/drvatomic.c | 0 .../validation/drv/drvatomic/drvatomic.h | 0 .../validation/drv/drvatomic/drvatomic_main.c | 0 .../validation/drv/drvdriver/.gitignore | 0 .../validation/drv/drvdriver/Makefile.am | 0 .../validation/drv/drvdriver/drvdriver_device.c | 0 .../validation/drv/drvdriver/drvdriver_device.h | 0 .../drv/drvdriver/drvdriver_device_main.c | 0 .../validation/drv/drvdriver/drvdriver_devio.c | 0 .../validation/drv/drvdriver/drvdriver_devio.h | 0 .../drv/drvdriver/drvdriver_devio_main.c | 0 .../validation/drv/drvdriver/drvdriver_driver.c | 0 .../validation/drv/drvdriver/drvdriver_driver.h | 0 .../drv/drvdriver/drvdriver_driver_main.c | 0 .../validation/drv/drvdriver/drvdriver_enumr.c | 0 .../validation/drv/drvdriver/drvdriver_enumr.h | 0 .../drv/drvdriver/drvdriver_enumr_class.c | 0 .../drv/drvdriver/drvdriver_enumr_class.h | 0 .../drv/drvdriver/drvdriver_enumr_class_main.c | 0 .../drv/drvdriver/drvdriver_enumr_main.c | 0 .../validation/drv/drvshmem/.gitignore | 0 .../validation/drv/drvshmem/Makefile.am | 0 .../validation/drv/drvshmem/drvshmem.c | 0 .../validation/drv/drvshmem/drvshmem.h | 0 .../validation/drv/drvshmem/drvshmem_main.c | 0 399 files changed, 8101 insertions(+), 1806 deletions(-) create mode 100644 .shippable.yml create mode 100644 helper/.gitignore rename {pkgconfig => helper}/libodphelper.pc.in (100%) delete mode 100644 helper/test/linux/Makefile.am create mode 100644 include/Makefile.am create mode 100644 m4/odp_atomic.m4 create mode 100644 m4/odp_openssl.m4 rename {platform/linux-generic/m4 => m4}/odp_timer.m4 (63%) create mode 100644 m4/odp_visibility.m4 rename {pkgconfig => platform/linux-dpdk}/libodp-dpdk.pc.in (100%) delete mode 120000 platform/linux-dpdk/m4/odp_openssl.m4 delete mode 120000 platform/linux-dpdk/m4/odp_timer.m4 create mode 120000 platform/linux-dpdk/m4/performance.m4 copy {test/linux-dpdk => platform/linux-dpdk/test}/.gitignore (100%) create mode 100644 platform/linux-dpdk/test/Makefile.am rename {test/linux-dpdk => platform/linux-dpdk/test}/Makefile.inc (61%) create mode 120000 platform/linux-dpdk/test/validation/api/pktio/.gitignore rename {test/linux-dpdk => platform/linux-dpdk/test}/validation/api/pktio/Makefile.am (100%) create mode 120000 platform/linux-dpdk/test/validation/api/pktio/pktio_env rename {test/linux-dpdk => platform/linux-dpdk/test}/validation/api/pktio/pktio_run.sh (100%) rename {test/linux-dpdk => platform/linux-dpdk/test}/wrapper-script.sh (100%) create mode 100644 platform/linux-generic/include/odp_ipsec_internal.h rename {pkgconfig => platform/linux-generic}/libodp-linux.pc.in (100%) delete mode 100644 platform/linux-generic/m4/odp_openssl.m4 rename {test => platform}/linux-generic/m4/performance.m4 (93%) create mode 100644 platform/linux-generic/odp_ipsec_events.c create mode 100644 platform/linux-generic/odp_ipsec_sad.c rename {test/linux-dpdk => platform/linux-generic/test}/.gitignore (57%) create mode 100644 platform/linux-generic/test/Makefile.am rename {test/linux-generic => platform/linux-generic/test}/Makefile.inc (82%) rename {test/linux-generic => platform/linux-generic/test}/mmap_vlan_ins/.gitignore (100%) rename {test/linux-generic => platform/linux-generic/test}/mmap_vlan_ins/Makefile.am (88%) rename {test/linux-generic => platform/linux-generic/test}/mmap_vlan_ins/mmap_vlan_ins.c (100%) rename {test/linux-generic => platform/linux-generic/test}/mmap_vlan_ins/mmap_vlan_ins.sh (100%) rename {test/linux-generic/validation/api/pktio => platform/linux-generic/test/mmap_vlan_ins}/pktio_env (100%) rename {test/linux-generic => platform/linux-generic/test}/mmap_vlan_ins/vlan.pcap (100%) rename {test/common_plat/validation/api => platform/linux-generic/test/performance}/.gitignore (100%) rename {test/linux-generic => platform/linux-generic/test}/performance/Makefile.am (100%) rename {test/linux-generic => platform/linux-generic/test}/performance/odp_scheduling_run_proc.sh (90%) rename {test/linux-generic => platform/linux-generic/test}/pktio_ipc/.gitignore (100%) rename {test/linux-generic => platform/linux-generic/test}/pktio_ipc/Makefile.am (100%) rename {test/linux-generic => platform/linux-generic/test}/pktio_ipc/ipc_common.c (94%) rename {test/linux-generic => platform/linux-generic/test}/pktio_ipc/ipc_common.h (100%) rename {test/linux-generic => platform/linux-generic/test}/pktio_ipc/pktio_ipc1.c (100%) rename {test/linux-generic => platform/linux-generic/test}/pktio_ipc/pktio_ipc2.c (100%) rename {test/linux-generic => platform/linux-generic/test}/pktio_ipc/pktio_ipc_run.sh (100%) rename {test/linux-generic => platform/linux-generic/test}/ring/.gitignore (100%) rename {test/linux-generic => platform/linux-generic/test}/ring/Makefile.am (89%) rename {test/linux-generic => platform/linux-generic/test}/ring/ring_basic.c (100%) rename {test/linux-generic => platform/linux-generic/test}/ring/ring_main.c (100%) rename {test/linux-generic => platform/linux-generic/test}/ring/ring_stress.c (100%) rename {test/linux-generic => platform/linux-generic/test}/ring/ring_suites.c (100%) rename {test/linux-generic => platform/linux-generic/test}/ring/ring_suites.h (100%) create mode 100644 platform/linux-generic/test/validation/Makefile.inc create mode 100644 platform/linux-generic/test/validation/api/Makefile.inc rename {test/common_plat/validation/drv => platform/linux-generic/test/validation/api/pktio}/.gitignore (100%) rename {test/linux-generic => platform/linux-generic/test}/validation/api/pktio/Makefile.am (100%) rename {test/linux-generic/mmap_vlan_ins => platform/linux-generic/test/validation/api/pktio}/pktio_env (100%) rename {test/linux-generic => platform/linux-generic/test}/validation/api/pktio/pktio_run.sh (97%) rename {test/linux-generic => platform/linux-generic/test}/validation/api/pktio/pktio_run_dpdk.sh (92%) rename {test/linux-generic => platform/linux-generic/test}/validation/api/pktio/pktio_run_netmap.sh (97%) rename {test/linux-generic => platform/linux-generic/test}/validation/api/pktio/pktio_run_pcap.sh (93%) rename {test/linux-generic => platform/linux-generic/test}/validation/api/pktio/pktio_run_tap.sh (97%) rename {test/linux-generic => platform/linux-generic/test}/validation/api/shmem/.gitignore (100%) rename {test/linux-generic => platform/linux-generic/test}/validation/api/shmem/Makefile.am (90%) rename {test/linux-generic => platform/linux-generic/test}/validation/api/shmem/shmem_common.h (100%) rename {test/linux-generic => platform/linux-generic/test}/validation/api/shmem/shmem_linux.c (97%) rename {test/linux-generic => platform/linux-generic/test}/validation/api/shmem/shmem_linux.h (100%) rename {test/linux-generic => platform/linux-generic/test}/validation/api/shmem/shmem_odp1.c (100%) rename {test/linux-generic => platform/linux-generic/test}/validation/api/shmem/shmem_odp1.h (100%) rename {test/linux-generic => platform/linux-generic/test}/validation/api/shmem/shmem_odp2.c (100%) rename {test/linux-generic => platform/linux-generic/test}/validation/api/shmem/shmem_odp2.h (100%) create mode 100644 scripts/Dockerfile rename test/{common_plat => }/common/Makefile.am (82%) rename test/{common_plat => }/common/mask_common.c (100%) rename test/{common_plat => }/common/mask_common.h (100%) rename test/{common_plat => }/common/odp_cunit_common.c (100%) rename test/{common_plat => }/common/odp_cunit_common.h (100%) rename test/{linux-generic/run-test => common/run-test.sh} (100%) rename test/{ => common}/test_debug.h (100%) delete mode 100644 test/common_plat/Makefile.am delete mode 100644 test/common_plat/m4/configure.m4 delete mode 100644 test/common_plat/validation/api/Makefile.am delete mode 100644 test/common_plat/validation/api/Makefile.inc delete mode 100644 test/common_plat/validation/api/ipsec/.gitignore delete mode 100644 test/common_plat/validation/api/ipsec/Makefile.am delete mode 100644 test/common_plat/validation/api/ipsec/ipsec.c delete mode 100644 test/common_plat/validation/api/ipsec/ipsec.h delete mode 100644 test/common_plat/validation/api/ipsec/ipsec_main.c delete mode 100644 test/common_plat/validation/drv/Makefile.inc delete mode 100644 test/linux-dpdk/Makefile.am delete mode 100644 test/linux-dpdk/m4/configure.m4 delete mode 120000 test/linux-dpdk/run-test delete mode 120000 test/linux-dpdk/validation/api/pktio/.gitignore delete mode 120000 test/linux-dpdk/validation/api/pktio/pktio_env delete mode 100644 test/linux-generic/Makefile.am delete mode 100644 test/linux-generic/m4/configure.m4 delete mode 100644 test/linux-generic/validation/Makefile.inc delete mode 100644 test/linux-generic/validation/api/Makefile.inc delete mode 100644 test/linux-generic/validation/api/pktio/.gitignore rename test/{common_plat => }/m4/miscellaneous.m4 (100%) rename test/{common_plat => }/m4/performance.m4 (100%) rename test/{common_plat => }/m4/validation.m4 (96%) rename test/{common_plat => }/miscellaneous/.gitignore (100%) rename test/{common_plat => }/miscellaneous/Makefile.am (58%) rename test/{common_plat => }/miscellaneous/odp_api_from_cpp.cpp (100%) rename test/{common_plat => }/performance/.gitignore (100%) rename test/{common_plat => }/performance/Makefile.am (69%) rename test/{common_plat => }/performance/dummy_crc.h (100%) rename test/{common_plat => }/performance/odp_bench_packet.c (98%) rename test/{common_plat => }/performance/odp_crypto.c (100%) rename test/{common_plat => }/performance/odp_l2fwd.c (98%) rename test/{common_plat => }/performance/odp_l2fwd_run.sh (94%) rename test/{common_plat => }/performance/odp_pktio_ordered.c (98%) rename test/{common_plat => }/performance/odp_pktio_ordered_run.sh (100%) rename test/{common_plat => }/performance/odp_pktio_perf.c (97%) rename test/{common_plat => }/performance/odp_sched_latency.c (100%) rename test/{common_plat => }/performance/odp_sched_latency_run.sh (100%) rename test/{common_plat => }/performance/odp_scheduling.c (97%) rename test/{common_plat => }/performance/odp_scheduling_run.sh (100%) rename test/{common_plat => }/performance/udp64.pcap (100%) rename test/{common_plat => }/validation/Makefile.am (100%) rename test/{common_plat => }/validation/Makefile.inc (83%) rename test/{linux-generic => validation/api}/.gitignore (100%) create mode 100644 test/validation/api/Makefile.am create mode 100644 test/validation/api/Makefile.inc rename test/{common_plat => }/validation/api/README (100%) rename test/{common_plat => }/validation/api/atomic/.gitignore (100%) rename test/{common_plat => }/validation/api/atomic/Makefile.am (77%) rename test/{common_plat => }/validation/api/atomic/atomic.c (100%) rename test/{common_plat => }/validation/api/atomic/atomic.h (100%) rename test/{common_plat => }/validation/api/atomic/atomic_main.c (100%) rename test/{common_plat => }/validation/api/barrier/.gitignore (100%) rename test/{common_plat => }/validation/api/barrier/Makefile.am (77%) rename test/{common_plat => }/validation/api/barrier/barrier.c (100%) rename test/{common_plat => }/validation/api/barrier/barrier.h (100%) rename test/{common_plat => }/validation/api/barrier/barrier_main.c (100%) rename test/{common_plat => }/validation/api/buffer/.gitignore (100%) rename test/{common_plat => }/validation/api/buffer/Makefile.am (77%) rename test/{common_plat => }/validation/api/buffer/buffer.c (100%) rename test/{common_plat => }/validation/api/buffer/buffer.h (100%) rename test/{common_plat => }/validation/api/buffer/buffer_main.c (100%) rename test/{common_plat => }/validation/api/chksum/.gitignore (100%) rename test/{common_plat => }/validation/api/chksum/Makefile.am (100%) rename test/{common_plat => }/validation/api/chksum/chksum.c (100%) rename test/{common_plat => }/validation/api/chksum/chksum.h (100%) rename test/{common_plat => }/validation/api/chksum/chksum_main.c (100%) rename test/{common_plat => }/validation/api/classification/.gitignore (100%) rename test/{common_plat => }/validation/api/classification/Makefile.am (89%) rename test/{common_plat => }/validation/api/classification/classification.c (100%) rename test/{common_plat => }/validation/api/classification/classification.h (100%) rename test/{common_plat => }/validation/api/classification/classification_main.c (100%) rename test/{common_plat => }/validation/api/classification/odp_classification_basic.c (100%) rename test/{common_plat => }/validation/api/classification/odp_classification_common.c (100%) rename test/{common_plat => }/validation/api/classification/odp_classification_test_pmr.c (100%) rename test/{common_plat => }/validation/api/classification/odp_classification_tests.c (100%) rename test/{common_plat => }/validation/api/classification/odp_classification_testsuites.h (100%) rename test/{common_plat => }/validation/api/cpumask/.gitignore (100%) rename test/{common_plat => }/validation/api/cpumask/Makefile.am (80%) rename test/{common_plat => }/validation/api/cpumask/cpumask.c (100%) rename test/{common_plat => }/validation/api/cpumask/cpumask.h (100%) rename test/{common_plat => }/validation/api/cpumask/cpumask_main.c (100%) rename test/{common_plat => }/validation/api/crypto/.gitignore (100%) rename test/{common_plat => }/validation/api/crypto/Makefile.am (87%) rename test/{common_plat => }/validation/api/crypto/crypto.c (100%) rename test/{common_plat => }/validation/api/crypto/crypto.h (100%) rename test/{common_plat => }/validation/api/crypto/crypto_main.c (100%) rename test/{common_plat => }/validation/api/crypto/odp_crypto_test_inp.c (100%) rename test/{common_plat => }/validation/api/crypto/odp_crypto_test_inp.h (100%) rename test/{common_plat => }/validation/api/crypto/test_vectors.h (100%) rename test/{common_plat => }/validation/api/crypto/test_vectors_len.h (100%) rename test/{common_plat => }/validation/api/errno/.gitignore (100%) rename test/{common_plat => }/validation/api/errno/Makefile.am (77%) rename test/{common_plat => }/validation/api/errno/errno.c (100%) rename test/{common_plat => }/validation/api/errno/errno.h (100%) rename test/{common_plat => }/validation/api/errno/errno_main.c (100%) rename test/{common_plat => }/validation/api/hash/.gitignore (100%) rename test/{common_plat => }/validation/api/hash/Makefile.am (77%) rename test/{common_plat => }/validation/api/hash/hash.c (100%) rename test/{common_plat => }/validation/api/hash/hash.h (100%) rename test/{common_plat => }/validation/api/hash/hash_main.c (100%) rename test/{common_plat => }/validation/api/init/.gitignore (100%) rename test/{common_plat => }/validation/api/init/Makefile.am (85%) rename test/{common_plat => }/validation/api/init/init.c (100%) rename test/{common_plat => }/validation/api/init/init.h (100%) rename test/{common_plat => }/validation/api/init/init_main_abort.c (100%) rename test/{common_plat => }/validation/api/init/init_main_log.c (100%) rename test/{common_plat => }/validation/api/init/init_main_ok.c (100%) create mode 100644 test/validation/api/ipsec/.gitignore create mode 100644 test/validation/api/ipsec/Makefile.am create mode 100644 test/validation/api/ipsec/ipsec.c create mode 100644 test/validation/api/ipsec/ipsec.h create mode 100644 test/validation/api/ipsec/ipsec_async.c create mode 100644 test/validation/api/ipsec/ipsec_inline_in.c create mode 100644 test/validation/api/ipsec/ipsec_inline_out.c create mode 100644 test/validation/api/ipsec/ipsec_sync.c create mode 100644 test/validation/api/ipsec/ipsec_sync_in.c create mode 100644 test/validation/api/ipsec/ipsec_test_in.c create mode 100644 test/validation/api/ipsec/ipsec_test_out.c create mode 100644 test/validation/api/ipsec/test_vectors.h rename test/{common_plat => }/validation/api/lock/.gitignore (100%) rename test/{common_plat => }/validation/api/lock/Makefile.am (77%) rename test/{common_plat => }/validation/api/lock/lock.c (100%) rename test/{common_plat => }/validation/api/lock/lock.h (100%) rename test/{common_plat => }/validation/api/lock/lock_main.c (100%) rename test/{common_plat => }/validation/api/packet/.gitignore (100%) rename test/{common_plat => }/validation/api/packet/Makefile.am (77%) rename test/{common_plat => }/validation/api/packet/packet.c (98%) rename test/{common_plat => }/validation/api/packet/packet.h (100%) rename test/{common_plat => }/validation/api/packet/packet_main.c (100%) rename test/{common_plat => }/validation/api/pktio/.gitignore (100%) rename test/{common_plat => }/validation/api/pktio/Makefile.am (79%) rename test/{common_plat => }/validation/api/pktio/parser.c (100%) rename test/{common_plat => }/validation/api/pktio/parser.h (100%) rename test/{common_plat => }/validation/api/pktio/pktio.c (100%) rename test/{common_plat => }/validation/api/pktio/pktio.h (100%) rename test/{common_plat => }/validation/api/pktio/pktio_main.c (100%) rename test/{common_plat => }/validation/api/pool/.gitignore (100%) rename test/{common_plat => }/validation/api/pool/Makefile.am (77%) rename test/{common_plat => }/validation/api/pool/pool.c (100%) rename test/{common_plat => }/validation/api/pool/pool.h (100%) rename test/{common_plat => }/validation/api/pool/pool_main.c (100%) rename test/{common_plat => }/validation/api/queue/.gitignore (100%) rename test/{common_plat => }/validation/api/queue/Makefile.am (77%) rename test/{common_plat => }/validation/api/queue/queue.c (100%) rename test/{common_plat => }/validation/api/queue/queue.h (100%) rename test/{common_plat => }/validation/api/queue/queue_main.c (100%) rename test/{common_plat => }/validation/api/random/.gitignore (100%) rename test/{common_plat => }/validation/api/random/Makefile.am (77%) rename test/{common_plat => }/validation/api/random/random.c (100%) rename test/{common_plat => }/validation/api/random/random.h (100%) rename test/{common_plat => }/validation/api/random/random_main.c (100%) rename test/{common_plat => }/validation/api/scheduler/.gitignore (100%) rename test/{common_plat => }/validation/api/scheduler/Makefile.am (78%) rename test/{common_plat => }/validation/api/scheduler/scheduler.c (100%) rename test/{common_plat => }/validation/api/scheduler/scheduler.h (100%) rename test/{common_plat => }/validation/api/scheduler/scheduler_main.c (100%) rename test/{common_plat => }/validation/api/shmem/.gitignore (100%) rename test/{common_plat => }/validation/api/shmem/Makefile.am (77%) rename test/{common_plat => }/validation/api/shmem/shmem.c (97%) rename test/{common_plat => }/validation/api/shmem/shmem.h (100%) rename test/{common_plat => }/validation/api/shmem/shmem_main.c (100%) rename test/{common_plat => }/validation/api/std_clib/.gitignore (100%) rename test/{common_plat => }/validation/api/std_clib/Makefile.am (77%) rename test/{common_plat => }/validation/api/std_clib/std_clib.c (100%) rename test/{common_plat => }/validation/api/std_clib/std_clib.h (100%) rename test/{common_plat => }/validation/api/std_clib/std_clib_main.c (100%) rename test/{common_plat => }/validation/api/system/.gitignore (100%) rename test/{common_plat => }/validation/api/system/Makefile.am (77%) rename test/{common_plat => }/validation/api/system/system.c (100%) rename test/{common_plat => }/validation/api/system/system.h (100%) rename test/{common_plat => }/validation/api/system/system_main.c (100%) rename test/{common_plat => }/validation/api/thread/.gitignore (100%) rename test/{common_plat => }/validation/api/thread/Makefile.am (84%) rename test/{common_plat => }/validation/api/thread/thread.c (100%) rename test/{common_plat => }/validation/api/thread/thread.h (100%) rename test/{common_plat => }/validation/api/thread/thread_main.c (100%) rename test/{common_plat => }/validation/api/time/.gitignore (100%) rename test/{common_plat => }/validation/api/time/Makefile.am (89%) rename test/{common_plat => }/validation/api/time/time.c (100%) rename test/{common_plat => }/validation/api/time/time.sh (93%) rename test/{common_plat => }/validation/api/time/time_main.c (100%) rename test/{common_plat => }/validation/api/time/time_test.h (100%) rename test/{common_plat => }/validation/api/timer/.gitignore (100%) rename test/{common_plat => }/validation/api/timer/Makefile.am (77%) rename test/{common_plat => }/validation/api/timer/timer.c (100%) rename test/{common_plat => }/validation/api/timer/timer.h (100%) rename test/{common_plat => }/validation/api/timer/timer_main.c (100%) rename test/{common_plat => }/validation/api/traffic_mngr/.gitignore (100%) rename test/{common_plat => }/validation/api/traffic_mngr/Makefile.am (89%) rename test/{common_plat => }/validation/api/traffic_mngr/traffic_mngr.c (100%) rename test/{common_plat => }/validation/api/traffic_mngr/traffic_mngr.h (100%) rename test/{common_plat => }/validation/api/traffic_mngr/traffic_mngr.sh (93%) rename test/{common_plat => }/validation/api/traffic_mngr/traffic_mngr_main.c (100%) rename test/{linux-generic/performance => validation/drv}/.gitignore (100%) rename test/{common_plat => }/validation/drv/Makefile.am (100%) create mode 100644 test/validation/drv/Makefile.inc rename test/{common_plat => }/validation/drv/README (100%) rename test/{common_plat => }/validation/drv/drvatomic/.gitignore (100%) rename test/{common_plat => }/validation/drv/drvatomic/Makefile.am (100%) rename test/{common_plat => }/validation/drv/drvatomic/drvatomic.c (100%) rename test/{common_plat => }/validation/drv/drvatomic/drvatomic.h (100%) rename test/{common_plat => }/validation/drv/drvatomic/drvatomic_main.c (100%) rename test/{common_plat => }/validation/drv/drvdriver/.gitignore (100%) rename test/{common_plat => }/validation/drv/drvdriver/Makefile.am (100%) rename test/{common_plat => }/validation/drv/drvdriver/drvdriver_device.c (100%) rename test/{common_plat => }/validation/drv/drvdriver/drvdriver_device.h (100%) rename test/{common_plat => }/validation/drv/drvdriver/drvdriver_device_main.c (100%) rename test/{common_plat => }/validation/drv/drvdriver/drvdriver_devio.c (100%) rename test/{common_plat => }/validation/drv/drvdriver/drvdriver_devio.h (100%) rename test/{common_plat => }/validation/drv/drvdriver/drvdriver_devio_main.c (100%) rename test/{common_plat => }/validation/drv/drvdriver/drvdriver_driver.c (100%) rename test/{common_plat => }/validation/drv/drvdriver/drvdriver_driver.h (100%) rename test/{common_plat => }/validation/drv/drvdriver/drvdriver_driver_main.c (100%) rename test/{common_plat => }/validation/drv/drvdriver/drvdriver_enumr.c (100%) rename test/{common_plat => }/validation/drv/drvdriver/drvdriver_enumr.h (100%) rename test/{common_plat => }/validation/drv/drvdriver/drvdriver_enumr_class.c (100%) rename test/{common_plat => }/validation/drv/drvdriver/drvdriver_enumr_class.h (100%) rename test/{common_plat => }/validation/drv/drvdriver/drvdriver_enumr_class_main.c (100%) rename test/{common_plat => }/validation/drv/drvdriver/drvdriver_enumr_main.c (100%) rename test/{common_plat => }/validation/drv/drvshmem/.gitignore (100%) rename test/{common_plat => }/validation/drv/drvshmem/Makefile.am (100%) rename test/{common_plat => }/validation/drv/drvshmem/drvshmem.c (100%) rename test/{common_plat => }/validation/drv/drvshmem/drvshmem.h (100%) rename test/{common_plat => }/validation/drv/drvshmem/drvshmem_main.c (100%) hooks/post-receive --

8 years, 10 months

[COMMIT] branch next updated. v1.15.0.0-324-g88e124e1

by git＠git-us.linaro.org

8 years, 10 months

[COMMIT] branch master updated. v1.15.0.0-307-g0e04be48

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 0e04be4851ecc94da8b4cac3c576260c0518c936 (commit) from d59c00c5f0255a5f1fc462332eef291bb2993f64 (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 0e04be4851ecc94da8b4cac3c576260c0518c936 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Fri Nov 3 15:38:37 2017 +0200 linux-gen: crypto: fix openssl_lock pointer type Wrong pointer type (pointer to pointer) to openssl_lock array caused data overlapping when running on other than 64-bit machines. Fixed pointer type and simplified global data structure to contain only one dynamically sized array (openssl locks). Session array was already fixed size but was not defined as such. Fixes bug: https://bugs.linaro.org/show_bug.cgi?id=3411 Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Viktor Tikkanen <viktor.tikkanen(a)nokia.com> Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/odp_crypto.c b/platform/linux-generic/odp_crypto.c index 40b6d74b..9cf903d0 100644 --- a/platform/linux-generic/odp_crypto.c +++ b/platform/linux-generic/odp_crypto.c @@ -83,9 +83,9 @@ typedef struct odp_crypto_global_s odp_crypto_global_t; struct odp_crypto_global_s { odp_spinlock_t lock; - odp_ticketlock_t **openssl_lock; odp_crypto_generic_session_t *free; - odp_crypto_generic_session_t sessions[0]; + odp_crypto_generic_session_t sessions[MAX_SESSIONS]; + odp_ticketlock_t openssl_lock[0]; }; static odp_crypto_global_t *global; @@ -961,11 +961,9 @@ static void ODP_UNUSED openssl_lock(int mode, int n, int line ODP_UNUSED) { if (mode & CRYPTO_LOCK) - odp_ticketlock_lock((odp_ticketlock_t *) - &global->openssl_lock[n]); + odp_ticketlock_lock(&global->openssl_lock[n]); else - odp_ticketlock_unlock((odp_ticketlock_t *) - &global->openssl_lock[n]); + odp_ticketlock_unlock(&global->openssl_lock[n]); } int @@ -977,8 +975,7 @@ odp_crypto_init_global(void) int nlocks = CRYPTO_num_locks(); /* Calculate the memory size we need */ - mem_size = sizeof(*global); - mem_size += (MAX_SESSIONS * sizeof(odp_crypto_generic_session_t)); + mem_size = sizeof(odp_crypto_global_t); mem_size += nlocks * sizeof(odp_ticketlock_t); /* Allocate our globally shared memory */ @@ -998,12 +995,8 @@ odp_crypto_init_global(void) odp_spinlock_init(&global->lock); if (nlocks > 0) { - global->openssl_lock = - (odp_ticketlock_t **)&global->sessions[MAX_SESSIONS]; - for (idx = 0; idx < nlocks; idx++) - odp_ticketlock_init((odp_ticketlock_t *) - &global->openssl_lock[idx]); + odp_ticketlock_init(&global->openssl_lock[idx]); CRYPTO_THREADID_set_callback(openssl_thread_id); CRYPTO_set_locking_callback(openssl_lock); ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/odp_crypto.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) hooks/post-receive --

8 years, 10 months

[COMMIT] branch master updated. v1.15.0.0-306-gd59c00c5

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 d59c00c5f0255a5f1fc462332eef291bb2993f64 (commit) from 29c7a054f7151d33795a0d8d7df5594bf4fddb55 (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 d59c00c5f0255a5f1fc462332eef291bb2993f64 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Wed Nov 8 16:58:14 2017 +0300 example: fix pointers to odp_l2fwd.c source During mass-move of tests I forgot to update odp_l2fwd example to point to new locattion. Fix that now. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/example/l2fwd/README b/example/l2fwd/README index 891620bd..f6fdc01c 100644 --- a/example/l2fwd/README +++ b/example/l2fwd/README @@ -1,7 +1,6 @@ ODP L2FWD application -Source code and Makefiles placed under test/common_plat/performance/ -directory. +Source code and Makefiles placed under test/performance/ directory. This L2 forwarding application can be used as example reference as well as performance test for different odp modes (direct, queue or scheduler diff --git a/example/l2fwd/odp_l2fwd.c b/example/l2fwd/odp_l2fwd.c index eea3a34c..fb585f43 120000 --- a/example/l2fwd/odp_l2fwd.c +++ b/example/l2fwd/odp_l2fwd.c @@ -1 +1 @@ -../../test/common_plat/performance/odp_l2fwd.c \ No newline at end of file +../../test/performance/odp_l2fwd.c \ No newline at end of file ----------------------------------------------------------------------- Summary of changes: example/l2fwd/README | 3 +-- example/l2fwd/odp_l2fwd.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) hooks/post-receive --

8 years, 10 months

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

git-lng-odp