git-lng-odp

git-lng-odp@lists.linaro.org

1 participants
1207 discussions

[COMMIT] branch api-next updated. v1.16.0.0-670-g0c7769e1

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 0c7769e1e8e7893f3631d7c8b8297f87b718d27d (commit) via 87ec9465899591ddc2125740d19a395d4b8b9608 (commit) from 411629a3e9efb8e44f5d0c6337c565720418d653 (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 0c7769e1e8e7893f3631d7c8b8297f87b718d27d Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Thu Nov 30 00:32:16 2017 +0300 api: ipsec: reuse checksum checking flags from packet API Reuse odp_packet_parse_chksum_t from packet API to ease passing checksum flags to packet parsing functions. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-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/ipsec.h b/include/odp/api/spec/ipsec.h index d57815ed..6f00a2c9 100644 --- a/include/odp/api/spec/ipsec.h +++ b/include/odp/api/spec/ipsec.h @@ -158,33 +158,9 @@ typedef struct odp_ipsec_inbound_config_t { /** Flags to control IPSEC payload data checks up to the selected parse * level. Checksum checking status can be queried for each packet with * odp_packet_l3_chksum_status() and odp_packet_l4_chksum_status(). + * Default value for all bits is 0 (skip all checksum checks). */ - union { - /** Mapping for individual bits */ - struct { - /** Check IPv4 header checksum in IPSEC payload. - * Default value is 0. */ - uint32_t ipv4_chksum : 1; - - /** Check UDP checksum in IPSEC payload. - * Default value is 0. */ - uint32_t udp_chksum : 1; - - /** Check TCP checksum in IPSEC payload. - * Default value is 0. */ - uint32_t tcp_chksum : 1; - - /** Check SCTP checksum in IPSEC payload. - * Default value is 0. */ - uint32_t sctp_chksum : 1; - } check; - - /** All bits of the bit field structure - * - * This field can be used to set/clear all flags, or bitwise - * operations over the entire structure. */ - uint32_t all_check; - }; + odp_proto_chksums_t chksums; } odp_ipsec_inbound_config_t; commit 87ec9465899591ddc2125740d19a395d4b8b9608 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Thu Nov 30 00:31:17 2017 +0300 api: packet: separate checksum check flags Separate union controlling different checksum checks. It will be used by IPsec API. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-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 1dbbfafe..19572034 100644 --- a/include/odp/api/spec/packet.h +++ b/include/odp/api/spec/packet.h @@ -1178,6 +1178,31 @@ int odp_packet_move_data(odp_packet_t pkt, uint32_t dst_offset, * */ +/** + * Flags to control packet data checksum checking + */ +typedef union odp_proto_chksums_t { + /** Individual checksum bits. */ + struct { + /** IPv4 header checksum */ + uint32_t ipv4 : 1; + + /** UDP checksum */ + uint32_t udp : 1; + + /** TCP checksum */ + uint32_t tcp : 1; + + /** SCTP checksum */ + uint32_t sctp : 1; + + } chksum; + + /** All checksum bits. This can be used to set/clear all flags. */ + uint32_t all_chksum; + +} odp_proto_chksums_t; + /** * Packet parse parameters */ @@ -1190,30 +1215,12 @@ typedef struct odp_packet_parse_param_t { * 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(). + /** Flags to control payload data checksums 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_proto_chksums_t chksums; } odp_packet_parse_param_t; diff --git a/test/validation/api/packet/packet.c b/test/validation/api/packet/packet.c index ce4d66c0..703dfb56 100644 --- a/test/validation/api/packet/packet.c +++ b/test/validation/api/packet/packet.c @@ -2451,7 +2451,7 @@ void packet_test_parse(void) parse.proto = ODP_PROTO_ETH; parse.layer = ODP_PROTO_LAYER_ALL; - parse.all_check = 0; + parse.chksums.all_chksum = 0; CU_ASSERT(odp_packet_parse(pkt[0], offset[0], &parse) == 0); CU_ASSERT(odp_packet_parse_multi(&pkt[1], &offset[1], @@ -2482,7 +2482,7 @@ void packet_test_parse(void) parse.proto = ODP_PROTO_IPV4; parse.layer = ODP_PROTO_LAYER_L4; - parse.all_check = 0; + parse.chksums.all_chksum = 0; CU_ASSERT(odp_packet_parse(pkt[0], offset[0], &parse) == 0); CU_ASSERT(odp_packet_parse_multi(&pkt[1], &offset[1], @@ -2512,7 +2512,7 @@ void packet_test_parse(void) parse.proto = ODP_PROTO_ETH; parse.layer = ODP_PROTO_LAYER_L4; - parse.all_check = 0; + parse.chksums.all_chksum = 0; CU_ASSERT(odp_packet_parse(pkt[0], offset[0], &parse) == 0); CU_ASSERT(odp_packet_parse_multi(&pkt[1], &offset[1], @@ -2542,7 +2542,7 @@ void packet_test_parse(void) parse.proto = ODP_PROTO_ETH; parse.layer = ODP_PROTO_LAYER_L4; - parse.all_check = 0; + parse.chksums.all_chksum = 0; CU_ASSERT(odp_packet_parse(pkt[0], offset[0], &parse) == 0); CU_ASSERT(odp_packet_parse_multi(&pkt[1], &offset[1], @@ -2573,7 +2573,7 @@ void packet_test_parse(void) parse.proto = ODP_PROTO_ETH; parse.layer = ODP_PROTO_LAYER_ALL; - parse.all_check = 0; + parse.chksums.all_chksum = 0; CU_ASSERT(odp_packet_parse(pkt[0], offset[0], &parse) == 0); CU_ASSERT(odp_packet_parse_multi(&pkt[1], &offset[1], ----------------------------------------------------------------------- Summary of changes: include/odp/api/spec/ipsec.h | 28 ++------------------ include/odp/api/spec/packet.h | 53 +++++++++++++++++++++---------------- test/validation/api/packet/packet.c | 10 +++---- 3 files changed, 37 insertions(+), 54 deletions(-) hooks/post-receive --

8 years, 2 months

[COMMIT] branch api-next updated. v1.16.0.0-668-g411629a3

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 411629a3e9efb8e44f5d0c6337c565720418d653 (commit) via 072b0d72318cfb5b847300404a2bd2130e5130c1 (commit) from ced550922123b8fd8151d98490a78766a0bcf847 (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 411629a3e9efb8e44f5d0c6337c565720418d653 Author: Matias Elo <matias.elo(a)nokia.com> Date: Thu Nov 30 12:36:23 2017 +0200 linux-gen: event: move event subtype to packet header Event subtype is only used by packets, so move subtype to packet header to optimize cache usage. This change fixes the ~30% performance penalty in l2fwd (zero-copy dpdk pktio) caused by the initialization of event subtype. Signed-off-by: Matias Elo <matias.elo(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/include/odp_buffer_inlines.h b/platform/linux-generic/include/odp_buffer_inlines.h index e095aec5..a5658e81 100644 --- a/platform/linux-generic/include/odp_buffer_inlines.h +++ b/platform/linux-generic/include/odp_buffer_inlines.h @@ -21,8 +21,6 @@ extern "C" { odp_event_type_t _odp_buffer_event_type(odp_buffer_t buf); void _odp_buffer_event_type_set(odp_buffer_t buf, int ev); -odp_event_subtype_t _odp_buffer_event_subtype(odp_buffer_t buf); -void _odp_buffer_event_subtype_set(odp_buffer_t buf, int ev); int odp_buffer_snprint(char *str, uint32_t n, odp_buffer_t buf); static inline odp_buffer_t buf_from_buf_hdr(odp_buffer_hdr_t *hdr) diff --git a/platform/linux-generic/include/odp_buffer_internal.h b/platform/linux-generic/include/odp_buffer_internal.h index 64887d75..c56c5b01 100644 --- a/platform/linux-generic/include/odp_buffer_internal.h +++ b/platform/linux-generic/include/odp_buffer_internal.h @@ -104,9 +104,6 @@ struct odp_buffer_hdr_t { /* User area pointer */ void *uarea_addr; - /* Event subtype. Should be ODP_EVENT_NO_SUBTYPE except packets. */ - int8_t event_subtype; - /* ipc mapped process can not walk over pointers, * offset has to be used */ uint64_t ipc_data_offset; diff --git a/platform/linux-generic/include/odp_packet_internal.h b/platform/linux-generic/include/odp_packet_internal.h index ab31d070..a16ec316 100644 --- a/platform/linux-generic/include/odp_packet_internal.h +++ b/platform/linux-generic/include/odp_packet_internal.h @@ -132,6 +132,9 @@ typedef struct { uint16_t headroom; uint16_t tailroom; + /* Event subtype */ + int8_t subtype; + /* * Members below are not initialized by packet_init() */ @@ -195,6 +198,16 @@ static inline seg_entry_t *seg_entry_last(odp_packet_hdr_t *hdr) return &last->buf_hdr.seg[last_seg]; } +static inline odp_event_subtype_t packet_subtype(odp_packet_t pkt) +{ + return odp_packet_hdr(pkt)->subtype; +} + +static inline void packet_subtype_set(odp_packet_t pkt, int ev) +{ + odp_packet_hdr(pkt)->subtype = ev; +} + /** * Initialize packet */ @@ -234,9 +247,10 @@ static inline void packet_init(odp_packet_hdr_t *pkt_hdr, uint32_t len) pkt_hdr->headroom = CONFIG_PACKET_HEADROOM; pkt_hdr->tailroom = pool->seg_len - seg_len + CONFIG_PACKET_TAILROOM; - pkt_hdr->input = ODP_PKTIO_INVALID; - pkt_hdr->buf_hdr.event_subtype = ODP_EVENT_PACKET_BASIC; + if (odp_unlikely(pkt_hdr->subtype != ODP_EVENT_PACKET_BASIC)) + pkt_hdr->subtype = ODP_EVENT_PACKET_BASIC; + pkt_hdr->input = ODP_PKTIO_INVALID; } static inline void copy_packet_parser_metadata(odp_packet_hdr_t *src_hdr, diff --git a/platform/linux-generic/odp_crypto.c b/platform/linux-generic/odp_crypto.c index b5f538dd..b9cc21a1 100644 --- a/platform/linux-generic/odp_crypto.c +++ b/platform/linux-generic/odp_crypto.c @@ -1072,8 +1072,7 @@ odp_crypto_operation(odp_crypto_op_param_t *param, /* Indicate to caller operation was sync */ *posted = 0; - _odp_buffer_event_subtype_set(packet_to_buffer(out_pkt), - ODP_EVENT_PACKET_BASIC); + packet_subtype_set(out_pkt, ODP_EVENT_PACKET_BASIC); /* Fill in result */ local_result.ctx = param->ctx; @@ -1351,8 +1350,7 @@ int odp_crypto_int(odp_packet_t pkt_in, } /* Fill in result */ - _odp_buffer_event_subtype_set(packet_to_buffer(out_pkt), - ODP_EVENT_PACKET_CRYPTO); + packet_subtype_set(out_pkt, ODP_EVENT_PACKET_CRYPTO); op_result = get_op_result_from_packet(out_pkt); op_result->cipher_status.alg_err = rc_cipher; op_result->cipher_status.hw_err = ODP_CRYPTO_HW_ERR_NONE; diff --git a/platform/linux-generic/odp_event.c b/platform/linux-generic/odp_event.c index 66bc11fe..4a37b5e4 100644 --- a/platform/linux-generic/odp_event.c +++ b/platform/linux-generic/odp_event.c @@ -16,6 +16,7 @@ #include <odp_ipsec_internal.h> #include <odp_buffer_inlines.h> #include <odp_debug_internal.h> +#include <odp_packet_internal.h> odp_event_type_t odp_event_type(odp_event_t event) { @@ -24,17 +25,24 @@ odp_event_type_t odp_event_type(odp_event_t event) odp_event_subtype_t odp_event_subtype(odp_event_t event) { - return _odp_buffer_event_subtype(odp_buffer_from_event(event)); + if (_odp_buffer_event_type(odp_buffer_from_event(event)) != + ODP_EVENT_PACKET) + return ODP_EVENT_NO_SUBTYPE; + + return packet_subtype(odp_packet_from_event(event)); } odp_event_type_t odp_event_types(odp_event_t event, odp_event_subtype_t *subtype) { odp_buffer_t buf = odp_buffer_from_event(event); + odp_event_type_t event_type = _odp_buffer_event_type(buf); - *subtype = _odp_buffer_event_subtype(buf); + *subtype = event_type == ODP_EVENT_PACKET ? + packet_subtype(odp_packet_from_event(event)) : + ODP_EVENT_NO_SUBTYPE; - return _odp_buffer_event_type(buf); + return event_type; } void odp_event_free(odp_event_t event) diff --git a/platform/linux-generic/odp_ipsec.c b/platform/linux-generic/odp_ipsec.c index 18ae8ece..8735e605 100644 --- a/platform/linux-generic/odp_ipsec.c +++ b/platform/linux-generic/odp_ipsec.c @@ -973,8 +973,7 @@ int odp_ipsec_in(const odp_packet_t pkt_in[], int num_in, ipsec_sa = ipsec_in_single(pkt, sa, &pkt, &status); - _odp_buffer_event_subtype_set(packet_to_buffer(pkt), - ODP_EVENT_PACKET_IPSEC); + packet_subtype_set(pkt, ODP_EVENT_PACKET_IPSEC); result = ipsec_pkt_result(pkt); memset(result, 0, sizeof(*result)); result->status = status; @@ -1037,8 +1036,7 @@ int odp_ipsec_out(const odp_packet_t pkt_in[], int num_in, ipsec_sa = ipsec_out_single(pkt, sa, &pkt, opt, &status); ODP_ASSERT(NULL != ipsec_sa); - _odp_buffer_event_subtype_set(packet_to_buffer(pkt), - ODP_EVENT_PACKET_IPSEC); + packet_subtype_set(pkt, ODP_EVENT_PACKET_IPSEC); result = ipsec_pkt_result(pkt); memset(result, 0, sizeof(*result)); result->status = status; @@ -1085,8 +1083,7 @@ int odp_ipsec_in_enq(const odp_packet_t pkt_in[], int num_in, ipsec_sa = ipsec_in_single(pkt, sa, &pkt, &status); - _odp_buffer_event_subtype_set(packet_to_buffer(pkt), - ODP_EVENT_PACKET_IPSEC); + packet_subtype_set(pkt, ODP_EVENT_PACKET_IPSEC); result = ipsec_pkt_result(pkt); memset(result, 0, sizeof(*result)); result->status = status; @@ -1146,8 +1143,7 @@ int odp_ipsec_out_enq(const odp_packet_t pkt_in[], int num_in, ipsec_sa = ipsec_out_single(pkt, sa, &pkt, opt, &status); ODP_ASSERT(NULL != ipsec_sa); - _odp_buffer_event_subtype_set(packet_to_buffer(pkt), - ODP_EVENT_PACKET_IPSEC); + packet_subtype_set(pkt, ODP_EVENT_PACKET_IPSEC); result = ipsec_pkt_result(pkt); memset(result, 0, sizeof(*result)); result->status = status; @@ -1186,8 +1182,7 @@ int _odp_ipsec_try_inline(odp_packet_t pkt) if (NULL == ipsec_sa) return -1; - _odp_buffer_event_subtype_set(packet_to_buffer(pkt), - ODP_EVENT_PACKET_IPSEC); + packet_subtype_set(pkt, ODP_EVENT_PACKET_IPSEC); result = ipsec_pkt_result(pkt); memset(result, 0, sizeof(*result)); result->status = status; @@ -1264,8 +1259,7 @@ int odp_ipsec_out_inline(const odp_packet_t pkt_in[], int num_in, ipsec_sa = ipsec_out_single(pkt, sa, &pkt, opt, &status); ODP_ASSERT(NULL != ipsec_sa); - _odp_buffer_event_subtype_set(packet_to_buffer(pkt), - ODP_EVENT_PACKET_IPSEC); + packet_subtype_set(pkt, ODP_EVENT_PACKET_IPSEC); result = ipsec_pkt_result(pkt); memset(result, 0, sizeof(*result)); result->sa = ipsec_sa->ipsec_sa_hdl; @@ -1286,11 +1280,8 @@ int odp_ipsec_out_inline(const odp_packet_t pkt_in[], int num_in, } } else { odp_queue_t queue; - odp_buffer_t buf; err: - buf = packet_to_buffer(pkt); - _odp_buffer_event_subtype_set(buf, - ODP_EVENT_PACKET_IPSEC); + packet_subtype_set(pkt, ODP_EVENT_PACKET_IPSEC); result = ipsec_pkt_result(pkt); memset(result, 0, sizeof(*result)); result->sa = ipsec_sa->ipsec_sa_hdl; diff --git a/platform/linux-generic/odp_pool.c b/platform/linux-generic/odp_pool.c index 25f0ed3b..f1e7d028 100644 --- a/platform/linux-generic/odp_pool.c +++ b/platform/linux-generic/odp_pool.c @@ -298,7 +298,6 @@ static void init_buffers(pool_t *pool) buf_hdr->index = i; buf_hdr->type = type; buf_hdr->event_type = type; - buf_hdr->event_subtype = ODP_EVENT_NO_SUBTYPE; buf_hdr->pool_ptr = pool; buf_hdr->uarea_addr = uarea; buf_hdr->segcount = 1; @@ -665,16 +664,6 @@ void _odp_buffer_event_type_set(odp_buffer_t buf, int ev) buf_hdl_to_hdr(buf)->event_type = ev; } -odp_event_subtype_t _odp_buffer_event_subtype(odp_buffer_t buf) -{ - return buf_hdl_to_hdr(buf)->event_subtype; -} - -void _odp_buffer_event_subtype_set(odp_buffer_t buf, int ev) -{ - buf_hdl_to_hdr(buf)->event_subtype = ev; -} - odp_pool_t odp_pool_lookup(const char *name) { uint32_t i; diff --git a/platform/linux-generic/pktio/loop.c b/platform/linux-generic/pktio/loop.c index 8bb4b4f1..96df7272 100644 --- a/platform/linux-generic/pktio/loop.c +++ b/platform/linux-generic/pktio/loop.c @@ -172,18 +172,16 @@ static int loopback_send(pktio_entry_t *pktio_entry, int index ODP_UNUSED, 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) != + if (packet_subtype(pkt_tbl[i]) != 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); + packet_subtype_set(pkt_tbl[i], ODP_EVENT_PACKET_BASIC); } odp_ticketlock_lock(&pktio_entry->s.txl); commit 072b0d72318cfb5b847300404a2bd2130e5130c1 Author: Matias Elo <matias.elo(a)nokia.com> Date: Thu Nov 30 09:42:58 2017 +0200 linux-gen: buffer: remove unused members from odp_buffer_hdr_t Remove unused odp_buffer_hdr_t members (caused by a merge error). Signed-off-by: Matias Elo <matias.elo(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/include/odp_buffer_internal.h b/platform/linux-generic/include/odp_buffer_internal.h index d9e55e03..64887d75 100644 --- a/platform/linux-generic/include/odp_buffer_internal.h +++ b/platform/linux-generic/include/odp_buffer_internal.h @@ -104,12 +104,6 @@ struct odp_buffer_hdr_t { /* User area pointer */ void *uarea_addr; - /* User area size */ - uint32_t uarea_size; - - /* Max data size */ - uint32_t size; - /* Event subtype. Should be ODP_EVENT_NO_SUBTYPE except packets. */ int8_t event_subtype; ----------------------------------------------------------------------- Summary of changes: .../linux-generic/include/odp_buffer_inlines.h | 2 -- .../linux-generic/include/odp_buffer_internal.h | 9 --------- .../linux-generic/include/odp_packet_internal.h | 18 +++++++++++++++-- platform/linux-generic/odp_crypto.c | 6 ++---- platform/linux-generic/odp_event.c | 14 ++++++++++--- platform/linux-generic/odp_ipsec.c | 23 +++++++--------------- platform/linux-generic/odp_pool.c | 11 ----------- platform/linux-generic/pktio/loop.c | 6 ++---- 8 files changed, 38 insertions(+), 51 deletions(-) hooks/post-receive --

8 years, 2 months

[COMMIT] branch api-next updated. v1.16.0.0-666-gced55092

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 ced550922123b8fd8151d98490a78766a0bcf847 (commit) via 6881620135a179911a5839d4be97423a8d80e5ab (commit) via e118bc6c2084c306968cb5d947649eca4a8029ba (commit) via f55bd7c695d142cfb2306b5f156bc401ba11473b (commit) via 6e09adf147ad3ccb4df1cc988d20d31c3246d2aa (commit) via 1b285bbdd1abbec9853e1bc51bdb6ee02643b1a7 (commit) via 37b4da286aeff3321084e62045d0b3ab10c07399 (commit) via e02d9f43ea8675db5ad5202ef605e6dd8014abb5 (commit) via 442638dd1514f8dda882d48fbb1ebc88ef9af430 (commit) via c6573eb58dcf0d0316ada1e91ae1993100c4d559 (commit) via aab8ff7237c117e9ed63a8b7d595aca7f5665ff9 (commit) via c15a810b7a47f2e07200f83aa534163ca06e2b16 (commit) via aef79483e3d3e517b4cf2d71b3c22985326532c0 (commit) via f49d7bad7316ed0be807f37984908fc37da68004 (commit) via 811281a22b6274b7f41b926a9cfbe09e48a366bd (commit) from 630d8422564ebf4991b468cb38a29e9483fc2ec2 (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 ced550922123b8fd8151d98490a78766a0bcf847 Merge: 630d8422 68816201 Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Mon Dec 11 18:30:10 2017 +0300 Merge branch 'master' into api-next Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --cc .travis.yml index e0eaf5de,25c2d0a5..564f7b74 --- a/.travis.yml +++ b/.travis.yml @@@ -70,9 -69,9 +70,10 @@@ cache env: - CONF="" - CONF="--disable-abi-compat" + - CONF="--enable-deprecated" - CONF="--enable-schedule-sp" - CONF="--enable-schedule-iquery" + - CONF="--enable-schedule-scalable" - CONF="--enable-dpdk-zero-copy" - CROSS_ARCH="arm64" - CROSS_ARCH="armhf" CFLAGS="-march=armv7-a" diff --cc example/generator/odp_generator.c index 81d95466,861e9836..b1827e9c --- a/example/generator/odp_generator.c +++ b/example/generator/odp_generator.c @@@ -32,8 -33,10 +33,11 @@@ #define APPL_MODE_UDP 0 /**< UDP mode */ #define APPL_MODE_PING 1 /**< ping mode */ #define APPL_MODE_RCV 2 /**< receive mode */ +#define MAX(a, b) (((a) > (b)) ? (a) : (b)) + #define PING_THR_TX 0 + #define PING_THR_RX 1 + /** print appl mode */ #define PRINT_APPL_MODE(x) printf("%s(%i)\n", #x, (x)) @@@ -517,18 -532,26 +534,32 @@@ static int create_pktio(const char *dev return -1; } odp_pktio_config_init(&itf->config); - itf->config.pktin.bit.ipv4_chksum = capa.config.pktin.bit.ipv4_chksum; - itf->config.pktin.bit.udp_chksum = capa.config.pktin.bit.udp_chksum; - itf->config.pktin.bit.drop_ipv4_err = - capa.config.pktin.bit.drop_ipv4_err; - itf->config.pktin.bit.drop_udp_err = capa.config.pktin.bit.drop_udp_err; - - itf->config.pktout.bit.ipv4_chksum_ena = - capa.config.pktout.bit.ipv4_chksum_ena; - itf->config.pktout.bit.udp_chksum_ena = - capa.config.pktout.bit.udp_chksum_ena; - itf->config.pktout.bit.ipv4_chksum = capa.config.pktout.bit.ipv4_chksum; - itf->config.pktout.bit.udp_chksum = capa.config.pktout.bit.udp_chksum; + if (args->appl.csum) { + itf->config.pktin.bit.ipv4_chksum = + capa.config.pktin.bit.ipv4_chksum; + itf->config.pktin.bit.udp_chksum = + capa.config.pktin.bit.udp_chksum; + itf->config.pktin.bit.drop_ipv4_err = + capa.config.pktin.bit.drop_ipv4_err; + itf->config.pktin.bit.drop_udp_err = + capa.config.pktin.bit.drop_udp_err; + ++ itf->config.pktout.bit.ipv4_chksum_ena = ++ capa.config.pktout.bit.ipv4_chksum_ena; ++ itf->config.pktout.bit.udp_chksum_ena = ++ capa.config.pktout.bit.udp_chksum_ena; + itf->config.pktout.bit.ipv4_chksum = + capa.config.pktout.bit.ipv4_chksum; + itf->config.pktout.bit.udp_chksum = + capa.config.pktout.bit.udp_chksum; + } else { /* explicit disable */ + itf->config.pktin.bit.ipv4_chksum = 0; + itf->config.pktin.bit.udp_chksum = 0; ++ itf->config.pktout.bit.ipv4_chksum_ena = 0; ++ itf->config.pktout.bit.udp_chksum_ena = 0; + itf->config.pktout.bit.ipv4_chksum = 0; + itf->config.pktout.bit.udp_chksum = 0; + } if (odp_pktio_config(itf->pktio, &itf->config)) { EXAMPLE_ERR("Error: Failed to set interface configuration %s\n", @@@ -792,10 -819,11 +827,11 @@@ static int gen_recv_thread(void *arg odp_packet_t pkts[MAX_RX_BURST], pkt; odp_event_t events[MAX_RX_BURST]; int pkt_cnt, ev_cnt, i; - interface_t *itfs, *itf; + odp_packet_chksum_status_t csum_status; + (void)arg; thr = odp_thread_id(); + thr_args = (thread_args_t *)arg; - itfs = thr_args->rx.ifs; printf(" [%02i] created mode: RECEIVE\n", thr); odp_barrier_wait(&barrier); diff --cc platform/linux-generic/Makefile.am index 8f783463,bbe6a21c..4371e7a9 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@@ -16,8 -13,13 +16,14 @@@ AM_CPPFLAGS += -DSYSCONFDIR=\"@sysconf AM_CPPFLAGS += $(OPENSSL_CPPFLAGS) AM_CPPFLAGS += $(DPDK_CPPFLAGS) AM_CPPFLAGS += $(NETMAP_CPPFLAGS) +AM_CPPFLAGS += $(LIBCONFIG_CFLAGS) + if PKTIO_DPDK + if ARCH_IS_X86 + AM_CFLAGS += -msse4.2 + endif + endif + odpincludedir= $(includedir)/odp odpinclude_HEADERS = \ include/odp/visibility_begin.h \ ----------------------------------------------------------------------- Summary of changes: .gitignore | 1 + .travis.yml | 60 +++++-- example/generator/odp_generator.c | 322 ++++++++++++++++++++++------------ m4/odp_dpdk.m4 | 76 ++++++++ platform/linux-generic/Makefile.am | 6 + platform/linux-generic/m4/odp_dpdk.m4 | 57 +++--- platform/linux-generic/pktio/dpdk.c | 30 +++- 7 files changed, 388 insertions(+), 164 deletions(-) create mode 100644 m4/odp_dpdk.m4 hooks/post-receive --

8 years, 2 months

[COMMIT] branch api-next updated. v1.16.0.0-651-g630d8422

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 630d8422564ebf4991b468cb38a29e9483fc2ec2 (commit) from ec42b01dc4f9992d0efef95d7f55399bba115f90 (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 630d8422564ebf4991b468cb38a29e9483fc2ec2 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Sat Dec 2 04:51:24 2017 +0300 linux-gen: arm/aarch64 rename dmb to _odp_dmb Rename dmb() to _odp_dmb() to remove clash with DPDK-defined dmb(). Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/arch/aarch64/odp_cpu.h b/platform/linux-generic/arch/aarch64/odp_cpu.h index fc35a462..170f23d8 100644 --- a/platform/linux-generic/arch/aarch64/odp_cpu.h +++ b/platform/linux-generic/arch/aarch64/odp_cpu.h @@ -40,7 +40,7 @@ */ #define CONFIG_WFE -static inline void dmb(void) +static inline void _odp_dmb(void) { __asm__ volatile("dmb" : : : "memory"); } diff --git a/platform/linux-generic/arch/arm/odp_cpu.h b/platform/linux-generic/arch/arm/odp_cpu.h index d77c8521..4e8acc7f 100644 --- a/platform/linux-generic/arch/arm/odp_cpu.h +++ b/platform/linux-generic/arch/arm/odp_cpu.h @@ -40,7 +40,7 @@ */ /* #define CONFIG_WFE */ -static inline void dmb(void) +static inline void _odp_dmb(void) { __asm__ volatile("dmb" : : : "memory"); } diff --git a/platform/linux-generic/arch/arm/odp_llsc.h b/platform/linux-generic/arch/arm/odp_llsc.h index b53cedc2..fd12c63c 100644 --- a/platform/linux-generic/arch/arm/odp_llsc.h +++ b/platform/linux-generic/arch/arm/odp_llsc.h @@ -23,7 +23,7 @@ static inline uint32_t ll8(uint8_t *var, int mm) : ); /* Barrier after an acquiring load */ if (mm == __ATOMIC_ACQUIRE) - dmb(); + _odp_dmb(); return old; } @@ -37,7 +37,7 @@ static inline uint32_t ll(uint32_t *var, int mm) : ); /* Barrier after an acquiring load */ if (mm == __ATOMIC_ACQUIRE) - dmb(); + _odp_dmb(); return old; } @@ -50,7 +50,7 @@ static inline uint32_t sc(uint32_t *var, uint32_t neu, int mm) /* Barrier before a releasing store */ if (mm == __ATOMIC_RELEASE) - dmb(); + _odp_dmb(); __asm__ volatile("strex %0, %1, [%2]" : "=&r" (ret) : "r" (neu), "r" (var) @@ -70,7 +70,7 @@ static inline uint64_t lld(uint64_t *var, int mm) : ); /* Barrier after an acquiring load */ if (mm == __ATOMIC_ACQUIRE) - dmb(); + _odp_dmb(); return old; } @@ -83,7 +83,7 @@ static inline uint32_t scd(uint64_t *var, uint64_t neu, int mm) /* Barrier before a releasing store */ if (mm == __ATOMIC_RELEASE) - dmb(); + _odp_dmb(); __asm__ volatile("strexd %0, %1, %H1, [%2]" : "=&r" (ret) : "r" (neu), "r" (var) ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/arch/aarch64/odp_cpu.h | 2 +- platform/linux-generic/arch/arm/odp_cpu.h | 2 +- platform/linux-generic/arch/arm/odp_llsc.h | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) hooks/post-receive --

8 years, 2 months

[COMMIT] branch master updated. v1.16.0.0-26-g68816201

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 6881620135a179911a5839d4be97423a8d80e5ab (commit) via e118bc6c2084c306968cb5d947649eca4a8029ba (commit) via f55bd7c695d142cfb2306b5f156bc401ba11473b (commit) via 6e09adf147ad3ccb4df1cc988d20d31c3246d2aa (commit) from 1b285bbdd1abbec9853e1bc51bdb6ee02643b1a7 (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 6881620135a179911a5839d4be97423a8d80e5ab Author: Bogdan Pricope <bogdan.pricope(a)linaro.org> Date: Wed Dec 6 17:15:14 2017 +0200 example: generator: replace atomic counter with per worker counters Use of atomic counters reduces total packet throughput. Signed-off-by: Bogdan Pricope <bogdan.pricope(a)linaro.org> Reviewed-by: Ilias Apalodimas <ilias.apalodimas(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/example/generator/odp_generator.c b/example/generator/odp_generator.c index 0a81cdeb..861e9836 100644 --- a/example/generator/odp_generator.c +++ b/example/generator/odp_generator.c @@ -34,6 +34,9 @@ #define APPL_MODE_PING 1 /**< ping mode */ #define APPL_MODE_RCV 2 /**< receive mode */ +#define PING_THR_TX 0 +#define PING_THR_RX 1 + /** print appl mode */ #define PRINT_APPL_MODE(x) printf("%s(%i)\n", #x, (x)) @@ -82,18 +85,21 @@ typedef struct { /** * counters */ -static struct { - odp_atomic_u64_t seq; /**< ip seq to be send */ - odp_atomic_u64_t ip; /**< ip packets */ - odp_atomic_u64_t udp; /**< udp packets */ - odp_atomic_u64_t icmp; /**< icmp packets */ - odp_atomic_u64_t cnt; /**< sent packets*/ - odp_atomic_u64_t tx_drops; /**< packets dropped in transmit */ -} counters; +typedef struct { + uint64_t ctr_pkt_snd; /**< sent packets*/ + uint64_t ctr_pkt_snd_drop; /**< packets dropped in transmit */ + + uint64_t ctr_pkt_rcv; /**< recv packets */ + uint64_t ctr_seq; /**< ip seq to be send */ + uint64_t ctr_udp_rcv; /**< udp packets */ + uint64_t ctr_icmp_reply_rcv; /**< icmp reply packets */ +} counters_t; /** * Thread specific arguments */ typedef struct { + counters_t counters; /**< Packet conters */ + odp_bool_t stop; /**< Stop packet processing */ union { struct { odp_pktout_queue_t pktout; /**< Packet output queue */ @@ -120,6 +126,9 @@ typedef struct { appl_args_t appl; /** Thread specific arguments */ thread_args_t thread[MAX_WORKERS]; + /** Global arguments */ + int thread_cnt; + int tx_burst_size; } args_t; /** Global pointer to args */ @@ -131,7 +140,8 @@ static odp_barrier_t barrier; /** Packet processing function types */ typedef odp_packet_t (*setup_pkt_ref_fn_t)(odp_pool_t, odp_pktout_config_opt_t *); -typedef int (*setup_pkt_fn_t)(odp_packet_t, odp_pktout_config_opt_t *); +typedef int (*setup_pkt_fn_t)(odp_packet_t, odp_pktout_config_opt_t *, + counters_t *); /* helper funcs */ static void parse_args(int argc, char *argv[], appl_args_t *appl_args); @@ -245,6 +255,7 @@ static int setup_pkt_ref_array(odp_pool_t pool, * @return 0 success, -1 failed */ static int setup_pkt_array(odp_pktout_config_opt_t *pktout_cfg, + counters_t *counters, odp_packet_t *pkt_ref_array, odp_packet_t *pkt_array, int pkt_array_size, @@ -253,7 +264,7 @@ static int setup_pkt_array(odp_pktout_config_opt_t *pktout_cfg, int i; for (i = 0; i < pkt_array_size; i++) { - if ((*setup_pkt)(pkt_ref_array[i], pktout_cfg)) + if ((*setup_pkt)(pkt_ref_array[i], pktout_cfg, counters)) break; pkt_array[i] = odp_packet_ref_static(pkt_ref_array[i]); @@ -342,7 +353,8 @@ static odp_packet_t setup_udp_pkt_ref(odp_pool_t pool, * @return Success/Failed * @retval 0 on success, -1 on fail */ -static int setup_udp_pkt(odp_packet_t pkt, odp_pktout_config_opt_t *pktout_cfg) +static int setup_udp_pkt(odp_packet_t pkt, odp_pktout_config_opt_t *pktout_cfg, + counters_t *counters) { char *buf; odph_ipv4hdr_t *ip; @@ -352,7 +364,8 @@ static int setup_udp_pkt(odp_packet_t pkt, odp_pktout_config_opt_t *pktout_cfg) /*Update IP ID and checksum*/ ip = (odph_ipv4hdr_t *)(buf + ODPH_ETHHDR_LEN); - seq = odp_atomic_fetch_add_u64(&counters.seq, 1) % 0xFFFF; + seq = counters->ctr_seq % 0xFFFF; + counters->ctr_seq++; ip->id = odp_cpu_to_be_16(seq); if (!pktout_cfg->bit.ipv4_chksum) { ip->chksum = 0; @@ -437,7 +450,8 @@ static odp_packet_t setup_icmp_pkt_ref(odp_pool_t pool, * @retval 0 on success, -1 on fail */ static int setup_icmp_pkt(odp_packet_t pkt, - odp_pktout_config_opt_t *pktout_cfg) + odp_pktout_config_opt_t *pktout_cfg, + counters_t *counters) { char *buf; odph_ipv4hdr_t *ip; @@ -450,7 +464,8 @@ static int setup_icmp_pkt(odp_packet_t pkt, /* ip */ ip = (odph_ipv4hdr_t *)(buf + ODPH_ETHHDR_LEN); - seq = odp_atomic_fetch_add_u64(&counters.seq, 1) % 0xffff; + seq = counters->ctr_seq % 0xffff; + counters->ctr_seq++; ip->id = odp_cpu_to_be_16(seq); if (!pktout_cfg->bit.ipv4_chksum) { ip->chksum = 0; @@ -607,30 +622,39 @@ static int gen_send_thread(void *arg) odp_pktout_config_opt_t *pktout_cfg; odp_packet_t pkt_ref_array[MAX_UDP_TX_BURST]; odp_packet_t pkt_array[MAX_UDP_TX_BURST]; - int pkt_array_size; + int pkt_array_size, seq_step; int burst_start, burst_size; setup_pkt_ref_fn_t setup_pkt_ref = NULL; setup_pkt_fn_t setup_pkt = NULL; + counters_t *counters; + uint64_t pkt_count_max = 0; thr = odp_thread_id(); thr_args = arg; pktout = thr_args->tx.pktout; pktout_cfg = thr_args->tx.pktout_cfg; + counters = &thr_args->counters; /* Create reference packets*/ if (args->appl.mode == APPL_MODE_UDP) { - pkt_array_size = args->appl.udp_tx_burst; setup_pkt_ref = setup_udp_pkt_ref; setup_pkt = setup_udp_pkt; + seq_step = args->tx_burst_size * (args->thread_cnt - 1); + if (args->appl.number != -1) + pkt_count_max = args->appl.number / args->thread_cnt + + (args->appl.number % args->thread_cnt ? 1 : 0); } else if (args->appl.mode == APPL_MODE_PING) { - pkt_array_size = 1; setup_pkt_ref = setup_icmp_pkt_ref; setup_pkt = setup_icmp_pkt; + seq_step = 0; + if (args->appl.number != -1) + pkt_count_max = args->appl.number; } else { EXAMPLE_ERR(" [%02i] Error: invalid processing mode %d\n", thr, args->appl.mode); return -1; } + pkt_array_size = args->tx_burst_size; if (setup_pkt_ref_array(thr_args->pool, pktout_cfg, pkt_ref_array, pkt_array_size, @@ -645,13 +669,17 @@ static int gen_send_thread(void *arg) odp_barrier_wait(&barrier); for (;;) { - if (args->appl.number != -1 && - odp_atomic_fetch_add_u64(&counters.cnt, pkt_array_size) >= - (unsigned int)args->appl.number) + if (thr_args->stop) break; + if (pkt_count_max && counters->ctr_pkt_snd > pkt_count_max) { + sleep(1); /* wait for stop command */ + continue; + } + /* Setup TX burst*/ - if (setup_pkt_array(pktout_cfg, pkt_ref_array, pkt_array, + if (setup_pkt_array(pktout_cfg, counters, + pkt_ref_array, pkt_array, pkt_array_size, setup_pkt)) { EXAMPLE_ERR("[%02i] Error: failed to setup packets\n", thr); @@ -663,10 +691,12 @@ static int gen_send_thread(void *arg) ret = odp_pktout_send(pktout, &pkt_array[burst_start], burst_size); if (ret == burst_size) { + burst_size = 0; break; } else if (ret >= 0 && ret < burst_size) { - odp_atomic_add_u64(&counters.tx_drops, - burst_size - ret); + thr_args->counters.ctr_pkt_snd_drop += + burst_size - ret; + burst_start += ret; burst_size -= ret; continue; @@ -677,32 +707,20 @@ static int gen_send_thread(void *arg) break; } + counters->ctr_pkt_snd += pkt_array_size - burst_size; + if (args->appl.interval != 0) { printf(" [%02i] send pkt no:%ju seq %ju\n", thr, - odp_atomic_load_u64(&counters.seq), - odp_atomic_load_u64(&counters.seq)%0xffff); + counters->ctr_seq, + counters->ctr_seq % 0xffff); millisleep(args->appl.interval, thr_args->tp, thr_args->tim, thr_args->tq, thr_args->tmo_ev); } - } - - /* receive number of reply pks until timeout */ - if (args->appl.mode == APPL_MODE_PING && args->appl.number > 0) { - while (args->appl.timeout >= 0) { - if (odp_atomic_load_u64(&counters.icmp) >= - (unsigned int)args->appl.number) - break; - millisleep(DEFAULT_PKT_INTERVAL, - thr_args->tp, - thr_args->tim, - thr_args->tq, - thr_args->tmo_ev); - args->appl.timeout--; - } + counters->ctr_seq += seq_step; } odp_packet_free_multi(pkt_ref_array, pkt_array_size); @@ -717,7 +735,8 @@ static int gen_send_thread(void *arg) * @param msg output buffer */ -static void process_icmp_pkt(odph_icmphdr_t *icmp, char *msg) +static void process_icmp_pkt(thread_args_t *thr_args, + odph_icmphdr_t *icmp, char *msg) { uint64_t trecv; uint64_t tsend; @@ -726,7 +745,7 @@ static void process_icmp_pkt(odph_icmphdr_t *icmp, char *msg) msg[0] = 0; if (icmp->type == ICMP_ECHOREPLY) { - odp_atomic_inc_u64(&counters.icmp); + thr_args->counters.ctr_icmp_reply_rcv++; memcpy(&tsend, (uint8_t *)icmp + ODPH_ICMPHDR_LEN, sizeof(uint64_t)); @@ -751,7 +770,8 @@ static void process_icmp_pkt(odph_icmphdr_t *icmp, char *msg) * @param pkt_tbl packets to be print * @param len packet number */ -static void print_pkts(int thr, odp_packet_t pkt_tbl[], unsigned len) +static void print_pkts(int thr, thread_args_t *thr_args, + odp_packet_t pkt_tbl[], unsigned len) { odp_packet_t pkt; char *buf; @@ -768,21 +788,20 @@ static void print_pkts(int thr, odp_packet_t pkt_tbl[], unsigned len) if (!odp_packet_has_ipv4(pkt)) continue; - odp_atomic_inc_u64(&counters.ip); + thr_args->counters.ctr_pkt_rcv++; buf = odp_packet_data(pkt); ip = (odph_ipv4hdr_t *)(buf + odp_packet_l3_offset(pkt)); offset = odp_packet_l4_offset(pkt); /* udp */ - if (ip->proto == ODPH_IPPROTO_UDP) { - odp_atomic_inc_u64(&counters.udp); - } + if (ip->proto == ODPH_IPPROTO_UDP) + thr_args->counters.ctr_udp_rcv++; /* icmp */ if (ip->proto == ODPH_IPPROTO_ICMPv4) { icmp = (odph_icmphdr_t *)(buf + offset); - process_icmp_pkt(icmp, msg); + process_icmp_pkt(thr_args, icmp, msg); printf(" [%02i] %s\n", thr, msg); } } @@ -810,14 +829,11 @@ static int gen_recv_thread(void *arg) odp_barrier_wait(&barrier); for (;;) { - if (args->appl.number != -1 && - odp_atomic_load_u64(&counters.icmp) >= - (unsigned int)args->appl.number) { + if (thr_args->stop) break; - } /* Use schedule to get buf from any input queue */ - ev_cnt = odp_schedule_multi(NULL, ODP_SCHED_WAIT, + ev_cnt = odp_schedule_multi(NULL, ODP_SCHED_NO_WAIT, events, MAX_RX_BURST); if (ev_cnt == 0) continue; @@ -848,7 +864,7 @@ static int gen_recv_thread(void *arg) } if (pkt_cnt) { - print_pkts(thr, pkts, pkt_cnt); + print_pkts(thr, thr_args, pkts, pkt_cnt); odp_packet_free_multi(pkts, pkt_cnt); } @@ -857,6 +873,35 @@ static int gen_recv_thread(void *arg) return 0; } +#define COUNTER_SUM(_c, _nw) \ +({ \ + int _itr; \ + uint64_t _result = 0; \ + \ + for (_itr = 0; _itr < _nw; _itr++) \ + _result += args->thread[_itr].counters.ctr_ ## _c; \ + \ + _result; \ +}) + +static void garceful_stop_ping(void) +{ + uint64_t snd, rcv; + + if (args->appl.mode != APPL_MODE_PING) + return; + + while (args->appl.timeout >= 0) { + snd = COUNTER_SUM(pkt_snd, 2); + rcv = COUNTER_SUM(icmp_reply_rcv, 2); + if (rcv >= snd) + break; + + sleep(1); + args->appl.timeout--; + } +} + /** * printing verbose statistics * @@ -868,8 +913,8 @@ static void print_global_stats(int num_workers) uint64_t pps_snd = 0, maximum_pps_snd = 0; uint64_t pkts_rcv = 0, pkts_rcv_prev = 0; uint64_t pps_rcv = 0, maximum_pps_rcv = 0; - uint64_t stall; - int verbose_interval = 20; + uint64_t stall, pkts_snd_drop; + int verbose_interval = 20, i; odp_thrmask_t thrd_mask; odp_barrier_wait(&barrier); @@ -878,12 +923,15 @@ static void print_global_stats(int num_workers) next = odp_time_sum(odp_time_local(), wait); while (odp_thrmask_worker(&thrd_mask) == num_workers) { - if (args->appl.number != -1 && - odp_atomic_load_u64(&counters.cnt) >= - (unsigned int)args->appl.number) { - break; - } + if (args->appl.mode != APPL_MODE_RCV && + args->appl.number != -1) { + uint64_t cnt = COUNTER_SUM(pkt_snd, num_workers); + if (cnt >= (unsigned int)args->appl.number) { + garceful_stop_ping(); + break; + } + } cur = odp_time_local(); if (odp_time_cmp(next, cur) > 0) { left = odp_time_diff(next, cur); @@ -894,18 +942,22 @@ static void print_global_stats(int num_workers) usleep(stall / ODP_TIME_USEC_IN_NS); continue; } - next = odp_time_sum(cur, wait); + switch (args->appl.mode) { case APPL_MODE_RCV: - pkts_rcv = odp_atomic_load_u64(&counters.ip); + pkts_rcv = COUNTER_SUM(pkt_rcv, num_workers); + pkts_snd = 0; + pkts_snd_drop = 0; break; case APPL_MODE_PING: - pkts_snd = odp_atomic_load_u64(&counters.seq); - pkts_rcv = odp_atomic_load_u64(&counters.icmp); + pkts_snd = COUNTER_SUM(pkt_snd, num_workers); + pkts_snd_drop = COUNTER_SUM(pkt_snd_drop, num_workers); + pkts_rcv = COUNTER_SUM(icmp_reply_rcv, num_workers); break; case APPL_MODE_UDP: - pkts_snd = odp_atomic_load_u64(&counters.seq); + pkts_snd = COUNTER_SUM(pkt_snd, num_workers); + pkts_snd_drop = COUNTER_SUM(pkt_snd_drop, num_workers); break; default: continue; @@ -927,11 +979,14 @@ static void print_global_stats(int num_workers) "rcv: %" PRIu64 ", " "recv rate: %" PRIu64 " pps, " "max recv rate: %" PRIu64 " pps\n", - pkts_snd, odp_atomic_load_u64(&counters.tx_drops), + pkts_snd, pkts_snd_drop, pps_snd, maximum_pps_snd, pkts_rcv, pps_rcv, maximum_pps_rcv); fflush(NULL); } + + for (i = 0; i < num_workers; i++) + args->thread[i].stop = 1; } /** @@ -968,14 +1023,6 @@ int main(int argc, char *argv[]) exit(EXIT_FAILURE); } - /* init counters */ - odp_atomic_init_u64(&counters.seq, 0); - odp_atomic_init_u64(&counters.ip, 0); - odp_atomic_init_u64(&counters.udp, 0); - odp_atomic_init_u64(&counters.icmp, 0); - odp_atomic_init_u64(&counters.cnt, 0); - odp_atomic_init_u64(&counters.tx_drops, 0); - /* Reserve memory for args from shared mem */ shm = odp_shm_reserve("shm_args", sizeof(args_t), ODP_CACHE_LINE_SIZE, 0); @@ -1024,6 +1071,15 @@ int main(int argc, char *argv[]) num_workers = 2; } } + args->thread_cnt = num_workers; + + /* Burst size */ + if (args->appl.mode == APPL_MODE_PING) + args->tx_burst_size = 1; + else if (args->appl.mode == APPL_MODE_UDP) + args->tx_burst_size = args->appl.udp_tx_burst; + else + args->tx_burst_size = 0; /* Create packet pool */ odp_pool_param_init(&params); @@ -1104,6 +1160,7 @@ int main(int argc, char *argv[]) if (args->appl.mode == APPL_MODE_PING) { odp_cpumask_t cpu_mask; int cpu_first, cpu_next; + thread_args_t *thr_args; odp_cpumask_zero(&cpu_mask); cpu_first = odp_cpumask_first(&cpumask); @@ -1114,60 +1171,64 @@ int main(int argc, char *argv[]) EXAMPLE_ERR("queue_create failed\n"); abort(); } - args->thread[1].rx.ifs = ifs; - args->thread[1].rx.ifs_count = args->appl.if_count; - args->thread[1].pool = pool; - args->thread[1].tp = tp; - args->thread[1].tq = tq; - args->thread[1].tim = odp_timer_alloc(tp, tq, NULL); - if (args->thread[1].tim == ODP_TIMER_INVALID) { + thr_args = &args->thread[PING_THR_RX]; + thr_args->rx.ifs = ifs; + thr_args->rx.ifs_count = args->appl.if_count; + thr_args->pool = pool; + thr_args->tp = tp; + thr_args->tq = tq; + thr_args->tim = odp_timer_alloc(tp, tq, NULL); + if (thr_args->tim == ODP_TIMER_INVALID) { EXAMPLE_ERR("timer_alloc failed\n"); abort(); } - args->thread[1].tmo_ev = odp_timeout_alloc(tmop); - if (args->thread[1].tmo_ev == ODP_TIMEOUT_INVALID) { + thr_args->tmo_ev = odp_timeout_alloc(tmop); + if (thr_args->tmo_ev == ODP_TIMEOUT_INVALID) { EXAMPLE_ERR("timeout_alloc failed\n"); abort(); } - args->thread[1].mode = args->appl.mode; + thr_args->mode = args->appl.mode; memset(&thr_params, 0, sizeof(thr_params)); thr_params.start = gen_recv_thread; - thr_params.arg = &args->thread[1]; + thr_params.arg = thr_args; thr_params.thr_type = ODP_THREAD_WORKER; thr_params.instance = instance; - odph_odpthreads_create(&thread_tbl[1], &cpu_mask, &thr_params); + odph_odpthreads_create(&thread_tbl[PING_THR_RX], + &cpu_mask, &thr_params); tq = odp_queue_create("", NULL); if (tq == ODP_QUEUE_INVALID) { EXAMPLE_ERR("queue_create failed\n"); abort(); } - args->thread[0].tx.pktout = ifs[0].pktout[0]; - args->thread[0].tx.pktout_cfg = &ifs[0].config.pktout; - args->thread[0].pool = pool; - args->thread[0].tp = tp; - args->thread[0].tq = tq; - args->thread[0].tim = odp_timer_alloc(tp, tq, NULL); - if (args->thread[0].tim == ODP_TIMER_INVALID) { + thr_args = &args->thread[PING_THR_TX]; + thr_args->tx.pktout = ifs[0].pktout[0]; + thr_args->tx.pktout_cfg = &ifs[0].config.pktout; + thr_args->pool = pool; + thr_args->tp = tp; + thr_args->tq = tq; + thr_args->tim = odp_timer_alloc(tp, tq, NULL); + if (thr_args->tim == ODP_TIMER_INVALID) { EXAMPLE_ERR("timer_alloc failed\n"); abort(); } - args->thread[0].tmo_ev = odp_timeout_alloc(tmop); - if (args->thread[0].tmo_ev == ODP_TIMEOUT_INVALID) { + thr_args->tmo_ev = odp_timeout_alloc(tmop); + if (thr_args->tmo_ev == ODP_TIMEOUT_INVALID) { EXAMPLE_ERR("timeout_alloc failed\n"); abort(); } - args->thread[0].mode = args->appl.mode; + thr_args->mode = args->appl.mode; cpu_next = odp_cpumask_next(&cpumask, cpu_first); odp_cpumask_zero(&cpu_mask); odp_cpumask_set(&cpu_mask, cpu_next); thr_params.start = gen_send_thread; - thr_params.arg = &args->thread[0]; + thr_params.arg = thr_args; - odph_odpthreads_create(&thread_tbl[0], &cpu_mask, &thr_params); + odph_odpthreads_create(&thread_tbl[PING_THR_TX], + &cpu_mask, &thr_params); } else { int cpu = odp_cpumask_first(&cpumask); @@ -1176,6 +1237,7 @@ int main(int argc, char *argv[]) odp_cpumask_t thd_mask; int (*thr_run_func)(void *); int if_idx, pktout_idx; + uint64_t start_seq; if (args->appl.mode == APPL_MODE_RCV) { args->thread[i].rx.ifs = ifs; @@ -1185,11 +1247,13 @@ int main(int argc, char *argv[]) if_idx = i % args->appl.if_count; pktout_idx = (i / args->appl.if_count) % ifs[if_idx].pktout_count; + start_seq = i * args->tx_burst_size; args->thread[i].tx.pktout = ifs[if_idx].pktout[pktout_idx]; args->thread[i].tx.pktout_cfg = &ifs[if_idx].config.pktout; + args->thread[i].counters.ctr_seq = start_seq; } tq = odp_queue_create("", NULL); if (tq == ODP_QUEUE_INVALID) { @@ -1531,9 +1595,9 @@ static void usage(char *progname) "OpenDataPlane example application.\n" "\n" " Work mode:\n" - " 1.send udp packets\n" + " 1.send ipv4 udp packets\n" " odp_generator -I eth0 --srcmac fe:0f:97:c9:e0:44 --dstmac 32:cb:9b:27:2f:1a --srcip 192.168.0.1 --dstip 192.168.0.2 -m u\n" - " 2.receive udp packets\n" + " 2.receive ipv4 packets\n" " odp_generator -I eth0 -m r\n" " 3.work likes ping\n" " odp_generator -I eth0 --srcmac fe:0f:97:c9:e0:44 --dstmac 32:cb:9b:27:2f:1a --srcip 192.168.0.1 --dstip 192.168.0.2 --cpumask 0xc -m p\n" commit e118bc6c2084c306968cb5d947649eca4a8029ba Author: Bogdan Pricope <bogdan.pricope(a)linaro.org> Date: Thu Dec 7 10:59:27 2017 +0200 example: generator: add configuration option for csum support Add configuration option to enable platform checksum support (if available) for calculation and validation. By default, checksum calculation is performed in software and validation is disabled. Signed-off-by: Bogdan Pricope <bogdan.pricope(a)linaro.org> Reviewed-by: Ilias Apalodimas <ilias.apalodimas(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/example/generator/odp_generator.c b/example/generator/odp_generator.c index 47b91d6e..0a81cdeb 100644 --- a/example/generator/odp_generator.c +++ b/example/generator/odp_generator.c @@ -76,6 +76,7 @@ typedef struct { each packet */ int udp_tx_burst; /**< number of udp packets to send with one API call */ + odp_bool_t csum; /**< use platform csum support if available */ } appl_args_t; /** @@ -516,14 +517,26 @@ static int create_pktio(const char *dev, odp_pool_t pool, return -1; } odp_pktio_config_init(&itf->config); - itf->config.pktin.bit.ipv4_chksum = capa.config.pktin.bit.ipv4_chksum; - itf->config.pktin.bit.udp_chksum = capa.config.pktin.bit.udp_chksum; - itf->config.pktin.bit.drop_ipv4_err = - capa.config.pktin.bit.drop_ipv4_err; - itf->config.pktin.bit.drop_udp_err = capa.config.pktin.bit.drop_udp_err; - - itf->config.pktout.bit.ipv4_chksum = capa.config.pktout.bit.ipv4_chksum; - itf->config.pktout.bit.udp_chksum = capa.config.pktout.bit.udp_chksum; + if (args->appl.csum) { + itf->config.pktin.bit.ipv4_chksum = + capa.config.pktin.bit.ipv4_chksum; + itf->config.pktin.bit.udp_chksum = + capa.config.pktin.bit.udp_chksum; + itf->config.pktin.bit.drop_ipv4_err = + capa.config.pktin.bit.drop_ipv4_err; + itf->config.pktin.bit.drop_udp_err = + capa.config.pktin.bit.drop_udp_err; + + itf->config.pktout.bit.ipv4_chksum = + capa.config.pktout.bit.ipv4_chksum; + itf->config.pktout.bit.udp_chksum = + capa.config.pktout.bit.udp_chksum; + } else { /* explicit disable */ + itf->config.pktin.bit.ipv4_chksum = 0; + itf->config.pktin.bit.udp_chksum = 0; + itf->config.pktout.bit.ipv4_chksum = 0; + itf->config.pktout.bit.udp_chksum = 0; + } if (odp_pktio_config(itf->pktio, &itf->config)) { EXAMPLE_ERR("Error: Failed to set interface configuration %s\n", @@ -1299,10 +1312,11 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args) {"interval", required_argument, NULL, 'i'}, {"help", no_argument, NULL, 'h'}, {"udp_tx_burst", required_argument, NULL, 'x'}, + {"csum", no_argument, NULL, 'y'}, {NULL, 0, NULL, 0} }; - static const char *shortopts = "+I:a:b:s:d:p:i:m:n:t:w:c:x:he:f:"; + static const char *shortopts = "+I:a:b:s:d:p:i:m:n:t:w:c:x:he:f:y"; /* let helper collect its own arguments (e.g. --odph_proc) */ odph_parse_options(argc, argv, shortopts, longopts); @@ -1315,6 +1329,7 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args) appl_args->udp_tx_burst = DEFAULT_UDP_TX_BURST; appl_args->srcport = 0; appl_args->dstport = 0; + appl_args->csum = 0; opterr = 0; /* do not issue errors on helper options */ @@ -1455,6 +1470,9 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args) } break; + case 'y': + appl_args->csum = 1; + break; case 'h': usage(argv[0]); exit(EXIT_SUCCESS); @@ -1541,6 +1559,8 @@ static void usage(char *progname) " -n, --count the number of packets to be send\n" " -c, --cpumask to set on cores\n" " -x, --udp_tx_burst size of UDP TX burst\n" + " -y, --csum use platform checksum support if available\n" + " default is disabled\n" "\n", NO_PATH(progname), NO_PATH(progname) ); } commit f55bd7c695d142cfb2306b5f156bc401ba11473b Author: Bogdan Pricope <bogdan.pricope(a)linaro.org> Date: Wed Dec 6 17:27:55 2017 +0200 example: generator: increase maximum TX burst size to 512 Bigger TX bursts may increase packet throughput. Signed-off-by: Bogdan Pricope <bogdan.pricope(a)linaro.org> Reviewed-by: Ilias Apalodimas <ilias.apalodimas(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/example/generator/odp_generator.c b/example/generator/odp_generator.c index 6ee4f638..47b91d6e 100644 --- a/example/generator/odp_generator.c +++ b/example/generator/odp_generator.c @@ -26,7 +26,8 @@ #define POOL_NUM_PKT 2048 /* Number of packets in packet pool */ #define POOL_PKT_LEN 1856 /* Max packet length */ #define DEFAULT_PKT_INTERVAL 1000 /* Interval between each packet */ -#define MAX_UDP_TX_BURST 32 +#define DEFAULT_UDP_TX_BURST 16 +#define MAX_UDP_TX_BURST 512 #define MAX_RX_BURST 32 #define APPL_MODE_UDP 0 /**< UDP mode */ @@ -1311,7 +1312,7 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args) appl_args->payload = 56; appl_args->timeout = -1; appl_args->interval = DEFAULT_PKT_INTERVAL; - appl_args->udp_tx_burst = 16; + appl_args->udp_tx_burst = DEFAULT_UDP_TX_BURST; appl_args->srcport = 0; appl_args->dstport = 0; commit 6e09adf147ad3ccb4df1cc988d20d31c3246d2aa Author: Bogdan Pricope <bogdan.pricope(a)linaro.org> Date: Tue Dec 5 11:05:27 2017 +0200 example: generator: remove 1 ms sleep on send loop The 1 ms sleep is reducing total packet throughput. Signed-off-by: Bogdan Pricope <bogdan.pricope(a)linaro.org> Reviewed-by: Ilias Apalodimas <ilias.apalodimas(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/example/generator/odp_generator.c b/example/generator/odp_generator.c index 53b397b3..6ee4f638 100644 --- a/example/generator/odp_generator.c +++ b/example/generator/odp_generator.c @@ -655,7 +655,6 @@ static int gen_send_thread(void *arg) burst_size - ret); burst_start += ret; burst_size -= ret; - odp_time_wait_ns(ODP_TIME_MSEC_IN_NS); continue; } EXAMPLE_ERR(" [%02i] packet send failed\n", thr); ----------------------------------------------------------------------- Summary of changes: example/generator/odp_generator.c | 310 ++++++++++++++++++++++++-------------- 1 file changed, 197 insertions(+), 113 deletions(-) hooks/post-receive --

8 years, 2 months

[COMMIT] branch api-next updated. v1.16.0.0-650-gec42b01d

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 ec42b01dc4f9992d0efef95d7f55399bba115f90 (commit) via 1b9cf6bc48e3ce6ef889e84cff400974a6ec2ed2 (commit) via bf6d0c8164f4f53192405a238262f1135b637679 (commit) via 5158e0deb21aa90d1e032f75e703c9fa8e0b95c0 (commit) via ab18a721760b8a4b61c0feec8fa6724ef2990a86 (commit) from 0980001e33b4190133d478a0aa2e718fd1e3c164 (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 ec42b01dc4f9992d0efef95d7f55399bba115f90 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Wed Nov 29 15:03:11 2017 +0200 linux-gen: dpdk: checksum insert enabled flag Added interface level flag to optimize checksum insertion checks. If checksum insertion has not been enabled, further configuration or packet level checks are not performed. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bogdan Pricope <bogdan.pricope(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/include/odp_packet_io_internal.h b/platform/linux-generic/include/odp_packet_io_internal.h index f323d5c3..598b1ad5 100644 --- a/platform/linux-generic/include/odp_packet_io_internal.h +++ b/platform/linux-generic/include/odp_packet_io_internal.h @@ -113,7 +113,8 @@ struct pktio_entry { /* These two locks together lock the whole pktio device */ odp_ticketlock_t rxl; /**< RX ticketlock */ odp_ticketlock_t txl; /**< TX ticketlock */ - int cls_enabled; /**< is classifier enabled */ + uint8_t cls_enabled; /**< classifier enabled */ + uint8_t chksum_insert_ena; /**< pktout checksum offload enabled */ odp_pktio_t handle; /**< pktio handle */ union { pkt_loop_t pkt_loop; /**< Using loopback for IO */ diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c index 4a37fe6e..48c2d0b0 100644 --- a/platform/linux-generic/pktio/dpdk.c +++ b/platform/linux-generic/pktio/dpdk.c @@ -546,6 +546,9 @@ static inline void pkt_set_ol_tx(odp_pktout_config_opt_t *pktout_cfg, odp_bool_t ipv4_chksum_pkt, udp_chksum_pkt, tcp_chksum_pkt; packet_parser_t *pkt_p = &pkt_hdr->p; + if (pkt_p->l3_offset == ODP_PACKET_OFFSET_INVALID) + return; + l3_hdr = (void *)(mbuf_data + pkt_p->l3_offset); if (check_proto(l3_hdr, &l3_proto_v4, &l4_proto)) @@ -633,7 +636,7 @@ static inline int pkt_to_mbuf(pktio_entry_t *pktio_entry, odp_packet_copy_to_mem(pkt_table[i], 0, pkt_len, data); - if (pkt_hdr->p.l3_offset != ODP_PACKET_OFFSET_INVALID) { + if (odp_unlikely(pktio_entry->s.chksum_insert_ena)) { odp_pktout_config_opt_t *pktout_capa = &pktio_entry->s.capa.config.pktout; @@ -748,7 +751,7 @@ static inline int pkt_to_mbuf_zero(pktio_entry_t *pktio_entry, pkt_hdr->extra_type == PKT_EXTRA_TYPE_DPDK)) { mbuf_update(mbuf, pkt_hdr, pkt_len); - if (pkt_hdr->p.l3_offset != ODP_PACKET_OFFSET_INVALID) + if (odp_unlikely(pktio_entry->s.chksum_insert_ena)) pkt_set_ol_tx(pktout_cfg, pktout_capa, pkt_hdr, mbuf, _odp_packet_data(pkt)); } else { @@ -771,8 +774,7 @@ static inline int pkt_to_mbuf_zero(pktio_entry_t *pktio_entry, mbuf_init((struct rte_mempool *) pool_entry->ext_desc, mbuf, pkt_hdr); mbuf_update(mbuf, pkt_hdr, pkt_len); - if (pkt_hdr->p.l3_offset != - ODP_PACKET_OFFSET_INVALID) + if (pktio_entry->s.chksum_insert_ena) pkt_set_ol_tx(pktout_cfg, pktout_capa, pkt_hdr, mbuf, _odp_packet_data(pkt)); @@ -1432,6 +1434,7 @@ static int dpdk_start(pktio_entry_t *pktio_entry) rte_eth_dev_info_get(port_id, &dev_info); dev_info.default_txconf.txq_flags = txq_flags; txconf = &dev_info.default_txconf; + pktio_entry->s.chksum_insert_ena = 1; } ret = rte_eth_tx_queue_setup(port_id, i, DPDK_NM_TX_DESC, commit 1b9cf6bc48e3ce6ef889e84cff400974a6ec2ed2 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Wed Nov 29 14:09:45 2017 +0200 test: l2fwd: add checksum offload option Added option to enable checksum insertion at packet output. This can be used to test checksum offload in various packet IO combinations. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bogdan Pricope <bogdan.pricope(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/performance/odp_l2fwd.c b/test/performance/odp_l2fwd.c index 2daf0e2d..0ebb0dd1 100644 --- a/test/performance/odp_l2fwd.c +++ b/test/performance/odp_l2fwd.c @@ -92,6 +92,7 @@ static inline int sched_mode(pktin_mode_t in_mode) * Parsed command line application arguments */ typedef struct { + int extra_check; /**< Some extra checks have been enabled */ int cpu_count; int if_count; /**< Number of interfaces to be used */ int addr_count; /**< Number of dst addresses to be used */ @@ -106,6 +107,7 @@ typedef struct { int dst_change; /**< Change destination eth addresses */ int src_change; /**< Change source eth addresses */ int error_check; /**< Check packet errors */ + int chksum; /**< Checksum offload */ int sched_mode; /**< Scheduler mode */ int num_groups; /**< Number of scheduling groups */ int verbose; /**< Verbose output */ @@ -293,6 +295,18 @@ static inline int event_queue_send(odp_queue_t queue, odp_packet_t *pkt_tbl, return sent; } +static inline void chksum_insert(odp_packet_t *pkt_tbl, int pkts) +{ + odp_packet_t pkt; + int i; + + for (i = 0; i < pkts; i++) { + pkt = pkt_tbl[i]; + odp_packet_l3_chksum_insert(pkt, 1); + odp_packet_l4_chksum_insert(pkt, 1); + } +} + /** * Packet IO worker thread using scheduled queues * @@ -366,18 +380,23 @@ static int run_worker_sched_mode(void *arg) for (i = 0; i < pkts; i++) pkt_tbl[i] = odp_packet_from_event(ev_tbl[i]); - if (gbl_args->appl.error_check) { - int rx_drops; + if (odp_unlikely(gbl_args->appl.extra_check)) { + if (gbl_args->appl.chksum) + chksum_insert(pkt_tbl, pkts); - /* Drop packets with errors */ - rx_drops = drop_err_pkts(pkt_tbl, pkts); + if (gbl_args->appl.error_check) { + int rx_drops; - if (odp_unlikely(rx_drops)) { - stats->s.rx_drops += rx_drops; - if (pkts == rx_drops) - continue; + /* Drop packets with errors */ + rx_drops = drop_err_pkts(pkt_tbl, pkts); - pkts -= rx_drops; + if (odp_unlikely(rx_drops)) { + stats->s.rx_drops += rx_drops; + if (pkts == rx_drops) + continue; + + pkts -= rx_drops; + } } } @@ -487,18 +506,23 @@ static int run_worker_plain_queue_mode(void *arg) for (i = 0; i < pkts; i++) pkt_tbl[i] = odp_packet_from_event(event[i]); - if (gbl_args->appl.error_check) { - int rx_drops; + if (odp_unlikely(gbl_args->appl.extra_check)) { + if (gbl_args->appl.chksum) + chksum_insert(pkt_tbl, pkts); - /* Drop packets with errors */ - rx_drops = drop_err_pkts(pkt_tbl, pkts); + if (gbl_args->appl.error_check) { + int rx_drops; - if (odp_unlikely(rx_drops)) { - stats->s.rx_drops += rx_drops; - if (pkts == rx_drops) - continue; + /* Drop packets with errors */ + rx_drops = drop_err_pkts(pkt_tbl, pkts); - pkts -= rx_drops; + if (odp_unlikely(rx_drops)) { + stats->s.rx_drops += rx_drops; + if (pkts == rx_drops) + continue; + + pkts -= rx_drops; + } } } @@ -605,18 +629,23 @@ static int run_worker_direct_mode(void *arg) if (odp_unlikely(pkts <= 0)) continue; - if (gbl_args->appl.error_check) { - int rx_drops; + if (odp_unlikely(gbl_args->appl.extra_check)) { + if (gbl_args->appl.chksum) + chksum_insert(pkt_tbl, pkts); + + if (gbl_args->appl.error_check) { + int rx_drops; - /* Drop packets with errors */ - rx_drops = drop_err_pkts(pkt_tbl, pkts); + /* Drop packets with errors */ + rx_drops = drop_err_pkts(pkt_tbl, pkts); - if (odp_unlikely(rx_drops)) { - stats->s.rx_drops += rx_drops; - if (pkts == rx_drops) - continue; + if (odp_unlikely(rx_drops)) { + stats->s.rx_drops += rx_drops; + if (pkts == rx_drops) + continue; - pkts -= rx_drops; + pkts -= rx_drops; + } } } @@ -707,9 +736,17 @@ static int create_pktio(const char *dev, int idx, int num_rx, int num_tx, } odp_pktio_config_init(&config); - config.parser.layer = gbl_args->appl.error_check ? + config.parser.layer = gbl_args->appl.extra_check ? ODP_PKTIO_PARSER_LAYER_ALL : ODP_PKTIO_PARSER_LAYER_NONE; + + if (gbl_args->appl.chksum) { + printf("Checksum offload enabled\n"); + config.pktout.bit.ipv4_chksum_ena = 1; + config.pktout.bit.udp_chksum_ena = 1; + config.pktout.bit.tcp_chksum_ena = 1; + } + odp_pktio_config(pktio, &config); odp_pktin_queue_param_init(&pktin_param); @@ -1132,9 +1169,12 @@ static void usage(char *progname) " Requires also the -d flag to be set\n" " -e, --error_check <arg> 0: Don't check packet errors (default)\n" " 1: Check packet errors\n" + " -k, --chksum <arg> 0: Don't use checksum offload (default)\n" + " 1: Use checksum offload\n" " -g, --groups <num> Number of groups to use: 0 ... num\n" " 0: SCHED_GROUP_ALL (default)\n" " num: must not exceed number of interfaces or workers\n" + " -v, --verbose Verbose output.\n" " -h, --help Display help and exit.\n\n" "\n", NO_PATH(progname), NO_PATH(progname), MAX_PKTIOS ); @@ -1166,13 +1206,14 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args) {"dst_change", required_argument, NULL, 'd'}, {"src_change", required_argument, NULL, 's'}, {"error_check", required_argument, NULL, 'e'}, + {"chksum", required_argument, NULL, 'k'}, {"groups", required_argument, NULL, 'g'}, {"verbose", no_argument, NULL, 'v'}, {"help", no_argument, NULL, 'h'}, {NULL, 0, NULL, 0} }; - static const char *shortopts = "+c:+t:+a:i:m:o:r:d:s:e:g:vh"; + static const char *shortopts = "+c:+t:+a:i:m:o:r:d:s:e:k:g:vh"; /* let helper collect its own arguments (e.g. --odph_proc) */ odph_parse_options(argc, argv, shortopts, longopts); @@ -1184,6 +1225,7 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args) appl_args->num_groups = 0; /* use default group */ appl_args->error_check = 0; /* don't check packet errors by default */ appl_args->verbose = 0; + appl_args->chksum = 0; /* don't use checksum offload by default */ opterr = 0; /* do not issue errors on helper options */ @@ -1308,6 +1350,9 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args) case 'e': appl_args->error_check = atoi(optarg); break; + case 'k': + appl_args->chksum = atoi(optarg); + break; case 'g': appl_args->num_groups = atoi(optarg); break; @@ -1335,6 +1380,8 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args) exit(EXIT_FAILURE); } + appl_args->extra_check = appl_args->error_check || appl_args->chksum; + optind = 1; /* reset 'extern optind' from the getopt lib */ } commit bf6d0c8164f4f53192405a238262f1135b637679 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Wed Nov 29 12:51:50 2017 +0200 linux-gen: dpdk: use checksum insert enable config Enable checksum insertion only when requested. DPDK uses less optimized driver code (on Intel NICs at least) when any of the L4 checksum offloads is enabled. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bogdan Pricope <bogdan.pricope(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c index d0a238aa..4a37fe6e 100644 --- a/platform/linux-generic/pktio/dpdk.c +++ b/platform/linux-generic/pktio/dpdk.c @@ -123,6 +123,7 @@ static inline void mbuf_update(struct rte_mbuf *mbuf, odp_packet_hdr_t *pkt_hdr, mbuf->data_len = pkt_len; mbuf->pkt_len = pkt_len; mbuf->refcnt = 1; + mbuf->ol_flags = 0; if (odp_unlikely(pkt_hdr->buf_hdr.base_data != pkt_hdr->buf_hdr.seg[0].data)) @@ -1253,6 +1254,13 @@ static void dpdk_init_capability(pktio_entry_t *pktio_entry, (dev_info->tx_offload_capa & DEV_TX_OFFLOAD_UDP_CKSUM) ? 1 : 0; capa->config.pktout.bit.tcp_chksum = (dev_info->tx_offload_capa & DEV_TX_OFFLOAD_TCP_CKSUM) ? 1 : 0; + + capa->config.pktout.bit.ipv4_chksum_ena = + capa->config.pktout.bit.ipv4_chksum; + capa->config.pktout.bit.udp_chksum_ena = + capa->config.pktout.bit.udp_chksum; + capa->config.pktout.bit.tcp_chksum_ena = + capa->config.pktout.bit.tcp_chksum; } static int dpdk_open(odp_pktio_t id ODP_UNUSED, @@ -1388,9 +1396,47 @@ static int dpdk_start(pktio_entry_t *pktio_entry) } /* Init TX queues */ for (i = 0; i < pktio_entry->s.num_out_queue; i++) { + struct rte_eth_dev_info dev_info; + const struct rte_eth_txconf *txconf = NULL; + int ip_ena = pktio_entry->s.config.pktout.bit.ipv4_chksum_ena; + int udp_ena = pktio_entry->s.config.pktout.bit.udp_chksum_ena; + int tcp_ena = pktio_entry->s.config.pktout.bit.tcp_chksum_ena; + int sctp_ena = pktio_entry->s.config.pktout.bit.sctp_chksum_ena; + int chksum_ena = ip_ena | udp_ena | tcp_ena | sctp_ena; + + if (chksum_ena) { + /* Enable UDP, TCP, STCP checksum offload */ + uint32_t txq_flags = 0; + + if (udp_ena == 0) + txq_flags |= ETH_TXQ_FLAGS_NOXSUMUDP; + + if (tcp_ena == 0) + txq_flags |= ETH_TXQ_FLAGS_NOXSUMTCP; + + if (sctp_ena == 0) + txq_flags |= ETH_TXQ_FLAGS_NOXSUMSCTP; + + /* When IP checksum is requested alone, enable UDP + * offload. DPDK IP checksum offload is enabled only + * when one of the L4 checksum offloads is requested.*/ + if ((udp_ena == 0) && (tcp_ena == 0) && (sctp_ena == 0)) + txq_flags = ETH_TXQ_FLAGS_NOXSUMTCP | + ETH_TXQ_FLAGS_NOXSUMSCTP; + + txq_flags |= ETH_TXQ_FLAGS_NOMULTSEGS | + ETH_TXQ_FLAGS_NOREFCOUNT | + ETH_TXQ_FLAGS_NOMULTMEMP | + ETH_TXQ_FLAGS_NOVLANOFFL; + + rte_eth_dev_info_get(port_id, &dev_info); + dev_info.default_txconf.txq_flags = txq_flags; + txconf = &dev_info.default_txconf; + } + ret = rte_eth_tx_queue_setup(port_id, i, DPDK_NM_TX_DESC, rte_eth_dev_socket_id(port_id), - NULL); + txconf); if (ret < 0) { ODP_ERR("Queue setup failed: err=%d, port=%" PRIu8 "\n", ret, port_id); commit 5158e0deb21aa90d1e032f75e703c9fa8e0b95c0 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Tue Nov 28 14:44:47 2017 +0200 example: generator use checksum enable Use new checksum insert enable bits. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bogdan Pricope <bogdan.pricope(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/example/generator/odp_generator.c b/example/generator/odp_generator.c index e1d98539..81d95466 100644 --- a/example/generator/odp_generator.c +++ b/example/generator/odp_generator.c @@ -523,6 +523,10 @@ static int create_pktio(const char *dev, odp_pool_t pool, capa.config.pktin.bit.drop_ipv4_err; itf->config.pktin.bit.drop_udp_err = capa.config.pktin.bit.drop_udp_err; + itf->config.pktout.bit.ipv4_chksum_ena = + capa.config.pktout.bit.ipv4_chksum_ena; + itf->config.pktout.bit.udp_chksum_ena = + capa.config.pktout.bit.udp_chksum_ena; itf->config.pktout.bit.ipv4_chksum = capa.config.pktout.bit.ipv4_chksum; itf->config.pktout.bit.udp_chksum = capa.config.pktout.bit.udp_chksum; commit ab18a721760b8a4b61c0feec8fa6724ef2990a86 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Tue Nov 28 14:04:48 2017 +0200 api: pktio: add checksum insert enable bits Added bits to control if checksum insertion is enabled / disabled at packet output. Current configuration options control if checksum is inserted / not inserted by default, but leaves it open for application to request checksum always with override functions. Explicit disable allows implementation to optimize performance (e.g. DPDK does this). Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bogdan Pricope <bogdan.pricope(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 b897c9d3..1dbbfafe 100644 --- a/include/odp/api/spec/packet.h +++ b/include/odp/api/spec/packet.h @@ -1531,7 +1531,7 @@ odp_packet_chksum_status_t odp_packet_l4_chksum_status(odp_packet_t pkt); * * Calling this function is always allowed but the checksum will not be * inserted if the packet is output through a pktio that does not have - * the relevant pktout chksum bit set in the pktio capability. + * the relevant checksum insertion enabled. * * @param pkt Packet handle * @param insert 0: do not insert L3 checksum @@ -1548,7 +1548,7 @@ void odp_packet_l3_chksum_insert(odp_packet_t pkt, int insert); * * Calling this function is always allowed but the checksum will not be * inserted if the packet is output through a pktio that does not have - * the relevant pktout chksum bit set in the pktio capability. + * the relevant checksum insertion enabled. * * @param pkt Packet handle * @param insert 0: do not insert L4 checksum diff --git a/include/odp/api/spec/packet_io.h b/include/odp/api/spec/packet_io.h index 60d13043..d25afa3e 100644 --- a/include/odp/api/spec/packet_io.h +++ b/include/odp/api/spec/packet_io.h @@ -329,15 +329,29 @@ typedef union odp_pktin_config_opt_t { * Packet output configuration options bit field * * Packet output configuration options listed in a bit field structure. Packet - * output checksum insertion may be enabled or disabled. When it is enabled, - * implementation will calculate and insert checksum into every outgoing packet - * by default. Application may disable checksum insertion (e.g. - * odp_packet_l4_chksum_insert()) on per packet basis. For correct operation, - * packet metadata must provide valid offsets for the appropriate protocols. - * For example, UDP checksum calculation needs both L3 and L4 offsets (to access - * IP and UDP headers). When application (e.g. a switch) does not modify L3/L4 - * data and thus checksum does not need to be updated, output checksum insertion - * should be disabled for optimal performance. + * output checksum insertion may be enabled or disabled (e.g. ipv4_chksum_ena): + * + * 0: Disable checksum insertion. Application will not request checksum + * insertion for any packet. This is the default value for xxx_chksum_ena + * bits. + * 1: Enable checksum insertion. Application will request checksum insertion + * for some packets. + * + * When checksum insertion is enabled, application may use configuration options + * to set the default behaviour on packet output (e.g. ipv4_chksum): + * + * 0: Do not insert checksum by default. This is the default value for + * xxx_chksum bits. + * 1: Calculate and insert checksum by default. + * + * These defaults may be overridden on per packet basis using e.g. + * odp_packet_l4_chksum_insert(). + * + * For correct operation, packet metadata must provide valid offsets for the + * appropriate protocols. For example, UDP checksum calculation needs both L3 + * and L4 offsets (to access IP and UDP headers). When application + * (e.g. a switch) does not modify L3/L4 data and thus checksum does not need + * to be updated, checksum insertion should be disabled for optimal performance. * * Packet flags (odp_packet_has_*()) are ignored for the purpose of checksum * insertion in packet output. @@ -354,19 +368,31 @@ typedef union odp_pktin_config_opt_t { * insertion. */ typedef union odp_pktout_config_opt_t { - /** Option flags */ + /** Option flags for packet output */ struct { - /** Insert IPv4 header checksum on packet output */ - uint64_t ipv4_chksum : 1; + /** Enable IPv4 header checksum insertion. */ + uint64_t ipv4_chksum_ena : 1; + + /** Enable UDP checksum insertion */ + uint64_t udp_chksum_ena : 1; + + /** Enable TCP checksum insertion */ + uint64_t tcp_chksum_ena : 1; + + /** Enable SCTP checksum insertion */ + uint64_t sctp_chksum_ena : 1; + + /** Insert IPv4 header checksum by default */ + uint64_t ipv4_chksum : 1; - /** Insert UDP checksum on packet output */ - uint64_t udp_chksum : 1; + /** Insert UDP checksum on packet by default */ + uint64_t udp_chksum : 1; - /** Insert TCP checksum on packet output */ - uint64_t tcp_chksum : 1; + /** Insert TCP checksum on packet by default */ + uint64_t tcp_chksum : 1; - /** Insert SCTP checksum on packet output */ - uint64_t sctp_chksum : 1; + /** Insert SCTP checksum on packet by default */ + uint64_t sctp_chksum : 1; } bit; ----------------------------------------------------------------------- Summary of changes: example/generator/odp_generator.c | 4 + include/odp/api/spec/packet.h | 4 +- include/odp/api/spec/packet_io.h | 62 ++++++++---- .../linux-generic/include/odp_packet_io_internal.h | 3 +- platform/linux-generic/pktio/dpdk.c | 59 +++++++++++- test/performance/odp_l2fwd.c | 105 +++++++++++++++------ 6 files changed, 182 insertions(+), 55 deletions(-) hooks/post-receive --

8 years, 2 months

[COMMIT] branch devel/native-drivers updated. v1.15.0.0-952-g6336beb2

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, devel/native-drivers has been updated via 6336beb21e88eef30fbfcd415e6d038c96f4343d (commit) via dd3f47a788e3de0f320b3a8b45ba83bdaa64f933 (commit) via 5096aebd6cc4f84eda65683f799f6a1c269433c1 (commit) from 4645f4b19eb5cb596fc503559f755c034f601792 (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 6336beb21e88eef30fbfcd415e6d038c96f4343d Author: Josep Puigdemont <josep.puigdemont(a)linaro.org> Date: Mon Dec 11 13:02:45 2017 +0100 Introduce physmem for contiguous physical memory This prototype provides functions to allocate blocks of contiguous physical memory backed by hugepages. It can only serve chunks of memory multiple of the hugepage size (which defaults to 2 MB), making it rather inefficient. Signed-off-by: Josep Puigdemont <josep.puigdemont(a)linaro.org> diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 7c463184..64d401fe 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -184,6 +184,7 @@ noinst_HEADERS = \ pktio/common.h \ pktio/sysfs.h \ pktio/dpdk.h \ + pktio/physmem/physmem.h \ include/odp_pktio_ops_ipc.h \ include/odp_pktio_ops_loopback.h \ include/odp_pktio_ops_netmap.h \ @@ -250,6 +251,7 @@ __LIB__libodp_linux_la_SOURCES = \ odp_packet_flags.c \ odp_packet_io.c \ odp_packet_io_pool.c \ + pktio/physmem/physmem.c \ pktio/ethtool.c \ pktio/subsystem.c \ pktio/ipc.c \ diff --git a/platform/linux-generic/pktio/physmem/physmem.c b/platform/linux-generic/pktio/physmem/physmem.c new file mode 100644 index 00000000..54b62d2d --- /dev/null +++ b/platform/linux-generic/pktio/physmem/physmem.c @@ -0,0 +1,688 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#define _GNU_SOURCE +#include <stdio.h> +#include <stdlib.h> +#include <unistd.h> +#include <errno.h> +#include <string.h> +#include <stdint.h> +#include <sys/mman.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <sys/queue.h> +#include <fcntl.h> +#include <inttypes.h> +#include <limits.h> + +#include <config.h> +#include <odp_align_internal.h> +#include <odp_debug_internal.h> +#include <_ishmphy_internal.h> +#include <pktio/physmem/physmem.h> + +#define KB * 1024ULL +#define MB * 1024ULL KB + +#define lock_list() +#define unlock_list() + +#define HUGEPAGES_PATH "/dev/hugepages/" + +#define MAX_HUGEPAGES 128 + +/* make hugepage_info 128 bytes long */ +#define FILENAME_PATH_MAX 96 + +struct hugepage_info { + struct physmem_block *block; /* the block this hugepage belongs to */ + void *va; /* virtual address this hugepage is mapped to */ + uint64_t pa; /* the physical address of this hugepage */ + uint32_t size; /* size of hugepage */ + int fd; /* the fd returned by open, for the hugepages file */ + char filename[FILENAME_PATH_MAX]; +}; + +typedef LIST_HEAD(block_list, physmem_block) block_list_t; + +struct physmem_block_data { + struct physmem_block block[MAX_HUGEPAGES]; + block_list_t avail; /* blocks of huge pages ready to use */ + block_list_t used; /* blocks allocated and being in use */ + block_list_t empty; /* blocks without any hugepages, size 0 */ + uint32_t hp_size; + uint32_t count; +}; + +static struct hugepage_info pages[MAX_HUGEPAGES]; +static struct physmem_block_data block_data; + +static int alloc_hugepage(struct hugepage_info *hp) +{ + static int file_id = 0; + int len; + + if (hp == NULL) + return -1; + + len = snprintf(hp->filename, sizeof(hp->filename), + HUGEPAGES_PATH "odp-%d", file_id); + if (len >= FILENAME_PATH_MAX) { + ODP_ERR("Filename too large (%d)\n", len); + return -1; + } + + hp->fd = open(hp->filename, O_CREAT | O_RDWR, 0755); + if (hp->fd == -1) { + perror("open"); + return -1; + } + + hp->va = mmap(NULL, 2 MB, PROT_READ | PROT_WRITE, MAP_SHARED, hp->fd, + 0); + if (hp->va == MAP_FAILED) { + perror("mmap"); + close(hp->fd); + unlink(hp->filename); + return -1; + } + + /* Force memory commitment */ + *((int *)(hp->va)) = hp->fd; + + hp->size = 2 MB; /* FIXME: defaulting to 2MB huge pages */ + hp->pa = _odp_ishmphy_getphy(hp->va); + if (hp->pa == PHYS_ADDR_INVALID) + ODP_ERR("Could not discover PA\n"); /* FIXME */ + + hp->block = NULL; + + file_id++; + + return 0; +} + +static int comp_hp(const void *_a, const void *_b) +{ + const struct hugepage_info *a = _a; + const struct hugepage_info *b = _b; + + if (a->pa > b->pa) + return 1; + else if (a->pa < b->pa) + return -1; + else + return 0; +} + +static int init_hugepages(void) +{ + memset(pages, 0, sizeof(pages)); + + for (int i = 0; i < MAX_HUGEPAGES; ++i) { + if (alloc_hugepage(&pages[i]) != 0) { + ODP_ERR("Could not allocate hugepages\n"); + return -1; + } + } + + qsort(pages, MAX_HUGEPAGES, sizeof(pages[0]), comp_hp); + + return 0; +} + +static int comp_block(const void *_a, const void *_b) +{ + const struct physmem_block *a = _a; + const struct physmem_block *b = _b; + + if (a->count > b->count) + return 1; + else if (a->count < b->count) + return -1; + else + return 0; +} + +/* + * hp is a SORTED array of count elements of struct hugepage_info, + * it is sorted per physical address in ascending order. + * This returns a linked list of struct physmem_block, each block containing + * a reference to physically contiguous huge pages. + */ +static int sort_in_blocks(struct hugepage_info *hp_array, int count) +{ + uint32_t block_id; + int hp_id; + struct physmem_block *block; + struct hugepage_info *hp; + + if (hp_array == NULL || count == 0) + return -EINVAL; + + block_id = 0; + hp_id = 0; + hp = &hp_array[0]; + do { + uint64_t pa_expected; + + block = &block_data.block[block_id]; + block->first = hp_id; + block->size = hp->size; + block->pa = hp->pa; + block->va = NULL; + block->count = 1; + block->id = block_id++; + block->hp_size = hp->size; + block->type = BLOCK_AVAIL; + + block_data.count++; + + ODP_DBG("New block %d\n", block->id); + ODP_DBG("\t%03d: VA: %016" PRIx64 ", PA: %016" PRIx64 "\n", + hp->fd, hp->va, hp->pa); + + pa_expected = block->pa + hp->size; + + /* keep adding huge pages to this block as long as their + * physical address coincides with the expected one */ + while (++hp_id < count) { + hp++; + + if (hp->pa != pa_expected) + break; + + ODP_DBG("\t%03d: VA: %016" PRIx64 ", PA: %016" PRIx64 + "\n", hp->fd, hp->va, hp->pa); + + block->count++; + block->size += hp->size; + + pa_expected += hp->size; + } + + ODP_DBG("\tSize: %" PRIu64 " MB\n", (block->size / (1 MB))); + } while (hp_id < count); + + qsort(block_data.block, block_data.count, sizeof(block_data.block[0]), + comp_block); + + /* link sorted blocks together */ + struct physmem_block *last = &block_data.block[0]; + pages[last->first].block = last; + pages[last->first + last->count - 1].block = last; + LIST_INSERT_HEAD(&block_data.avail, last, next); + for (block_id = 1; block_id < block_data.count; ++block_id) { + block = &block_data.block[block_id]; + pages[block->first].block = block; + pages[block->first + block->count - 1].block = block; + LIST_INSERT_AFTER(last, block, next); + last = block; + } + + /* insert rest of blocks into the empty list */ + for (block_id = block_data.count; block_id < MAX_HUGEPAGES; ++block_id){ + block = &block_data.block[block_id]; + block->id = block_id; + block->type = BLOCK_EMPTY; + LIST_INSERT_HEAD(&block_data.empty, block, next); + } + + block_data.hp_size = block_data.block[0].hp_size; + + return 0; +} + +static struct physmem_block *block_get(void) +{ + struct physmem_block *block; + + if (LIST_EMPTY(&block_data.empty)) + return NULL; + + block = LIST_FIRST(&block_data.empty); + LIST_REMOVE(block, next); + + return block; +} + +struct physmem_block *physmem_block_alloc(uint64_t size) +{ + struct physmem_block *block; + struct physmem_block *ret = NULL; + uint32_t num_hp; + + size = ROUNDUP_ALIGN(size, block_data.hp_size); + num_hp = size / block_data.hp_size; + + lock_list(); + + LIST_FOREACH(block, &block_data.avail, next) { + if (block->count < num_hp) + continue; + else if (block->count == num_hp) { + LIST_REMOVE(block, next); + ret = block; + break; + } else { + struct hugepage_info *hp; + + ret = block_get(); + if (ret == NULL) + break; + + /* slice num_hp pages from this block */ + block->count -= num_hp; + block->size = block->count * block->hp_size; + + ret->first = block->first + block->count; + ret->count = num_hp; + ret->hp_size = block->hp_size; + ret->size = ret->hp_size * num_hp; + ret->va = NULL; + + /* reassign pages to their corresponding block + * only the borders need to be updated */ + hp = &pages[ret->first]; + hp->block = ret; + ret->pa = hp->pa; + hp--; /* last page of the block we just sliced */ + hp->block = block; + hp += num_hp; /* last page of the block we just allocated */ + hp->block = ret; + + /* place the sliced block back into the list at correct position */ + LIST_REMOVE(block, next); + + if (LIST_EMPTY(&block_data.avail)) { + LIST_INSERT_HEAD(&block_data.avail, block, next); + } else { + struct physmem_block *last = NULL; + struct physmem_block *tmp; + + LIST_FOREACH(tmp, &block_data.avail, next) { + if (tmp->count >= block->count) { + LIST_INSERT_BEFORE(tmp, block, next); + last = NULL; + break; + } + last = tmp; + } + if (last) + LIST_INSERT_AFTER(last, block, next); + } + + break; + } + } + + if (ret != NULL) { + ret->type = BLOCK_USED; + LIST_INSERT_HEAD(&block_data.used, ret, next); + } + + unlock_list(); + + return ret; +} + +void physmem_block_free(struct physmem_block *block) +{ + if (block == NULL) + return; + + lock_list(); + + LIST_REMOVE(block, next); + + /* append this block to left block if available */ + if (block->first != 0) { + struct hugepage_info *left_hp, *first_hp; + struct physmem_block *left_block; + uint64_t expected_pa; + + first_hp = &pages[block->first]; + left_hp = first_hp - 1; + left_block = left_hp->block; + expected_pa = left_hp->pa + left_hp->size; + + if (left_block->type == BLOCK_AVAIL && block->pa == expected_pa) { + /* put the pages belonging to this block in to the left one */ + left_block->count += block->count; + left_block->size = left_block->count * left_block->hp_size; + + pages[left_block->first + left_block->count - 1].block = left_block; + + block->size = 0; + block->pa = 0; + block->va = 0; + block->first = 0; + block->count = 0; + block->type = BLOCK_EMPTY; + LIST_INSERT_HEAD(&block_data.empty, block, next); + + block = left_block; + LIST_REMOVE(block, next); + } + } + + /* join with right block if available */ + uint32_t right_idx = block->first + block->count; + if (right_idx < MAX_HUGEPAGES) { + struct hugepage_info *last_hp; + struct hugepage_info *right_hp; + struct physmem_block *right_block; + uint64_t expected_pa; + + right_hp = &pages[right_idx]; + last_hp = right_hp - 1; + right_block = right_hp->block; + expected_pa = last_hp->pa + last_hp->size; + + if (right_block->type == BLOCK_AVAIL + && expected_pa == right_block->pa) { + block->count += right_block->count; + block->size = block->count * block->hp_size; + + pages[block->first + block->count - 1].block = block; + + LIST_REMOVE(right_block, next); + right_block->size = 0; + right_block->pa = 0; + right_block->va = 0; + right_block->first = 0; + right_block->count = 0; + right_block->type = BLOCK_EMPTY; + LIST_INSERT_HEAD(&block_data.empty, right_block, next); + } + } + + block->type = BLOCK_AVAIL; + if (LIST_EMPTY(&block_data.avail)) { + LIST_INSERT_HEAD(&block_data.avail, block, next); + } else { + struct physmem_block *tmp, *last = NULL; + + LIST_FOREACH(tmp, &block_data.avail, next) { + if (tmp->count >= block->count) { + LIST_INSERT_BEFORE(tmp, block, next); + last = NULL; + break; + } + last = tmp; + } + if (last != NULL) + LIST_INSERT_AFTER(last, block, next); + } + + unlock_list(); +} + +int physmem_block_map(struct physmem_block *block, void *anchor_addr) +{ + void *addr; + int retval; + int mapped_cnt; + struct hugepage_info *hp; + + if (block == NULL || anchor_addr == NULL) + return -EINVAL; + + /* make sure we can actually map this memory region */ + addr = mmap(anchor_addr, block->size, + PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_ANONYMOUS | MAP_NORESERVE | MAP_FIXED, + -1, 0); + + if (addr == MAP_FAILED) + return errno; + + block->va = addr; + mapped_cnt = 0; + + ODP_DBG("Mapping block %d at %p\n", block->id, block->va); + + for (uint32_t i = 0; i < block->count; ++i) { + void *tmp; + + hp = &pages[block->first + i]; + + if ((hp->va != NULL) && (munmap(hp->va, hp->size) != 0)) { + ODP_DBG("Error unmapping old va: %p\n", hp->va); + retval = -EINVAL; + goto exit_failure; + } + + if (munmap(addr, hp->size) != 0) { + retval = errno; + goto exit_failure; + } + + tmp = mmap(addr, hp->size, + PROT_READ | PROT_WRITE, + MAP_SHARED | MAP_FIXED, + hp->fd, 0); + if (tmp == MAP_FAILED) { + retval = errno; + perror("mmap"); + ODP_DBG("Error remapping PA:0x%" PRIu64 " to %p\n", + hp->pa, tmp); + goto exit_failure; + } + + mapped_cnt++; + +#ifdef ENABLE_MAP_CHECKS + /* check: we poison the page with the file descriptor number */ + int fd = *((int *)tmp); + if (fd != hp->fd) { + ODP_DBG("Checking expected resulted in mismatch!\n"); + goto exit_failure; + } + + uint64_t pa = _odp_ishmphy_getphy(tmp); + if (pa != hp->pa) { + retval = -EFAULT; + ODP_DBG("Physical address error, PA orig: " + "0x%016" PRIx64 "\nPA new: 0x%016" PRIx64 "\n", + hp->pa, pa); + goto exit_failure; + } +#endif + + ODP_DBG("\t%03d: VA: 0x%016" PRIx64 " -> 0x%016" PRIx64 + ", PA: 0x%016" PRIx64 "\n", + hp->fd, hp->va, tmp, hp->pa); + + hp->va = addr; + + addr = (void *)((char *)addr + hp->size); + } + + return 0; + +exit_failure: + + while (mapped_cnt--) { + hp = &pages[block->first + mapped_cnt]; + munmap(hp->va, hp->size); + hp->va = NULL; + } + block->va = NULL; + + return retval; +} + +int physmem_block_unmap(struct physmem_block *block) +{ + struct hugepage_info *hp; + int ret = 0; + + if (block == NULL || block->va == NULL) + return -EINVAL; + + hp = &pages[block->first]; + for (uint32_t i = 0; i < block->count; ++i, ++hp) { + *((int *)hp->va) = hp->fd; + if (munmap(hp->va, hp->size)) + ret = errno; + } + + return ret; +} + +static void init_blocks(void) +{ + memset(&block_data, 0, sizeof(block_data)); + + LIST_INIT(&block_data.avail); + LIST_INIT(&block_data.used); + LIST_INIT(&block_data.empty); +} + +int physmem_block_global_init(void) +{ + init_blocks(); + + if (init_hugepages()) + return -1; + + if (sort_in_blocks(pages, MAX_HUGEPAGES) != 0) + return -1; + + return 0; +} + +int physmem_block_global_term(void) +{ + for (int i = 0; i < MAX_HUGEPAGES; ++i) { + if (pages[i].fd == 0) + continue; + close(pages[i].fd); + unlink(pages[i].filename); + } + + return 0; +} + +#if 0 +static void zero_block(struct physmem_block *block) +{ + if (block == NULL || block->va == NULL) + return; + + memset(block->va, 0, block->size); +} + +/* this makes sure the VA area is also physically contiguous */ +static int check_va_area(const void *va, uint64_t size, uint64_t page_size) +{ + uint64_t pa; + uint64_t expected_pa; + uint64_t offset; + + pa = _odp_ishmphy_getphy(va); + if (pa == PHYS_ADDR_INVALID) + return -1; + ODP_PRINT("VA: %p -> PA: %016" PRIx64 "\n", va, pa); + + expected_pa = pa + page_size; + offset = page_size; + while (offset < size) { + va = (const void *)((const char *)va + offset); + pa = _odp_ishmphy_getphy(va); + + if (pa == PHYS_ADDR_INVALID) + return -1; + + ODP_PRINT("VA: %p -> PA: %016" PRIx64 "\n", va, pa); + + if (pa != expected_pa) { + ODP_ERR("ERRROR: not expected PA %016" PRIx64 "...\n", + expected_pa); + return -1; + } + + expected_pa += page_size; + } + + return 0; +} +#endif + +int physmem_block_check(const struct physmem_block *block) +{ + struct hugepage_info *first, *last; + int ret = 0; + + first = &pages[block->first]; + last = &pages[block->first + block->count - 1]; + if (first->block != block) { + ret = 1; + ODP_ERR("\tfirst block does not match, got %u\n", + first->block->id); + } + if (last->block != block) { + ret = 1; + ODP_ERR("\tlast block does not match, got %u\n", + last->block->id); + } + return ret; +} + +static void print_pages(struct physmem_block *block) +{ + for (uint32_t i = 0; i < block->count; ++i) { + struct hugepage_info *hp = &pages[block->first + i]; + ODP_PRINT("\t%03d: VA: 0x%p PA: 0x%016" PRIx64 "\n", + hp->fd, hp->va, hp->pa); + } +} + +static void print_block_list(block_list_t *list, int pages) +{ + struct physmem_block *block; + + LIST_FOREACH(block, list, next) { + ODP_PRINT("Block %" PRIu32 "\n", block->id); + ODP_PRINT("\tSize: %" PRIu64 " MB\n", block->size / (1 MB)); + ODP_PRINT("\tVA start: 0x%016" PRIx64 "\n", block->va); + ODP_PRINT("\tPA start: 0x%016" PRIx64 "\n", block->pa); + ODP_PRINT("\tHP start: %u-%u\n", + block->first, block->first + block->count - 1); + ODP_PRINT("\tcount: %u hugepages\n", block->count); + if (pages) + print_pages(block); + } +} + +void physmem_block_dump(physmem_block_type_t type, int pages) +{ + const char *type_str; + block_list_t *list; + + switch (type) { + case BLOCK_EMPTY: + type_str = "EMPTY\n"; + list = &block_data.empty; + break; + case BLOCK_AVAIL: + type_str = "AVAIL\n"; + list = &block_data.avail; + break; + case BLOCK_USED: + type_str = "USED\n"; + list = &block_data.used; + break; + default: + return; + } + + ODP_PRINT(type_str); + + print_block_list(list, pages); +} diff --git a/platform/linux-generic/pktio/physmem/physmem.h b/platform/linux-generic/pktio/physmem/physmem.h new file mode 100644 index 00000000..0ebc2ba6 --- /dev/null +++ b/platform/linux-generic/pktio/physmem/physmem.h @@ -0,0 +1,47 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#ifndef PHYSMEM_BLOCK_H +#define PHYSMEM_BLOCK_H + +#include <sys/queue.h> +#include <stdint.h> + +typedef enum { + BLOCK_EMPTY = 0, + BLOCK_AVAIL, + BLOCK_USED +} physmem_block_type_t; + +/* a block is a chunk of physically contiguous memory that can be + * made of one or more huge pages + */ +struct physmem_block { + LIST_ENTRY(physmem_block) next; + void *va; /* virtual address where the block is mapped */ + uint64_t pa; /* physical address where it starts */ + uint64_t size; /* the size of this memory block */ + uint32_t first; /* index of first hugepage belonging to this block + * in pages[] */ + uint32_t count; /* number of hugepages in this block */ + uint32_t hp_size; /* the size of the hugepages */ + uint32_t id; /* internal ID of this block, debug purposes */ + physmem_block_type_t type; +}; + +int physmem_block_global_init(void); +int physmem_block_global_term(void); + +struct physmem_block *physmem_block_alloc(uint64_t); +void physmem_block_free(struct physmem_block *); +int physmem_block_map(struct physmem_block *block, void *addr); +int physmem_block_unmap(struct physmem_block *block); + +/* if pages is not 0, it will print the pages associated to each block */ +void physmem_block_dump(physmem_block_type_t, int pages); +int physmem_block_check(const struct physmem_block *); + +#endif commit dd3f47a788e3de0f320b3a8b45ba83bdaa64f933 Author: Josep Puigdemont <josep.puigdemont(a)linaro.org> Date: Mon Nov 27 16:19:57 2017 +0100 virtio: keep pktio data structure private Signed-off-by: Josep Puigdemont <josep.puigdemont(a)linaro.org> diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 239f1e14..7c463184 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -190,7 +190,6 @@ noinst_HEADERS = \ include/odp_pktio_ops_pcap.h \ include/odp_pktio_ops_socket.h \ include/odp_pktio_ops_tap.h \ - include/odp_pktio_ops_virtio.h \ include/odp_pktio_ops_subsystem.h \ include/odp_pkt_queue_internal.h \ include/odp_queue_subsystem.h \ diff --git a/platform/linux-generic/include/odp_pktio_ops_virtio.h b/platform/linux-generic/include/odp_pktio_ops_virtio.h deleted file mode 100644 index 93e7f000..00000000 --- a/platform/linux-generic/include/odp_pktio_ops_virtio.h +++ /dev/null @@ -1,18 +0,0 @@ -/* Copyright (c) 2017, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#ifndef ODP_PACKET_VIRTIO_H -#define ODP_PACKET_VIRTIO_H - -#include <drv_pci_internal.h> - -typedef struct { - struct pci_dev_t *pci_dev; - int dev_id; - char name[32]; /**< Unique identifier name */ -} pktio_ops_virtio_data_t; - -#endif diff --git a/platform/linux-generic/pktio/virtio/virtio.c b/platform/linux-generic/pktio/virtio/virtio.c index bb2b814c..94b3c950 100644 --- a/platform/linux-generic/pktio/virtio/virtio.c +++ b/platform/linux-generic/pktio/virtio/virtio.c @@ -23,10 +23,15 @@ #include <odp/api/hints.h> #include <drv_pci_internal.h> -#include <odp_pktio_ops_virtio.h> #include "virtio_pci.h" +typedef struct { + struct pci_dev_t *pci_dev; + int dev_id; + char name[32]; /**< Unique identifier name */ +} pktio_ops_virtio_data_t; + #define PCI_PKTIO_PREFIX "pci:" #define PCI_PKTIO_PREFIX_LEN (sizeof(PCI_PKTIO_PREFIX) - 1) commit 5096aebd6cc4f84eda65683f799f6a1c269433c1 Author: Josep Puigdemont <josep.puigdemont(a)linaro.org> Date: Mon Nov 27 15:43:44 2017 +0100 virtio: move to own directory Signed-off-by: Josep Puigdemont <josep.puigdemont(a)linaro.org> diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 76c072ad..239f1e14 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -262,8 +262,8 @@ __LIB__libodp_linux_la_SOURCES = \ pktio/socket_mmap.c \ pktio/sysfs.c \ pktio/tap.c \ - pktio/virtio.c \ - pktio/virtio_pci.c \ + pktio/virtio/virtio.c \ + pktio/virtio/virtio_pci.c \ pktio/ring.c \ pool/generic.c \ pool/subsystem.c \ diff --git a/platform/linux-generic/pktio/virtio.c b/platform/linux-generic/pktio/virtio/virtio.c similarity index 100% rename from platform/linux-generic/pktio/virtio.c rename to platform/linux-generic/pktio/virtio/virtio.c diff --git a/platform/linux-generic/pktio/virtio_pci.c b/platform/linux-generic/pktio/virtio/virtio_pci.c similarity index 100% rename from platform/linux-generic/pktio/virtio_pci.c rename to platform/linux-generic/pktio/virtio/virtio_pci.c diff --git a/platform/linux-generic/pktio/virtio_pci.h b/platform/linux-generic/pktio/virtio/virtio_pci.h similarity index 100% rename from platform/linux-generic/pktio/virtio_pci.h rename to platform/linux-generic/pktio/virtio/virtio_pci.h ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/Makefile.am | 7 +- .../linux-generic/include/odp_pktio_ops_virtio.h | 18 - platform/linux-generic/pktio/physmem/physmem.c | 688 +++++++++++++++++++++ platform/linux-generic/pktio/physmem/physmem.h | 47 ++ platform/linux-generic/pktio/{ => virtio}/virtio.c | 7 +- .../linux-generic/pktio/{ => virtio}/virtio_pci.c | 0 .../linux-generic/pktio/{ => virtio}/virtio_pci.h | 0 7 files changed, 745 insertions(+), 22 deletions(-) delete mode 100644 platform/linux-generic/include/odp_pktio_ops_virtio.h create mode 100644 platform/linux-generic/pktio/physmem/physmem.c create mode 100644 platform/linux-generic/pktio/physmem/physmem.h rename platform/linux-generic/pktio/{ => virtio}/virtio.c (96%) rename platform/linux-generic/pktio/{ => virtio}/virtio_pci.c (100%) rename platform/linux-generic/pktio/{ => virtio}/virtio_pci.h (100%) hooks/post-receive --

8 years, 2 months

[COMMIT] branch 2.0 updated. v1.15.0.0-948-g63fd8863

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 63fd88635cc10caaa02fdccd3f52c9494487bdd2 (commit) from 75f3d60e6b31544bb9b273364b2cce502262c1f8 (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 63fd88635cc10caaa02fdccd3f52c9494487bdd2 Author: Kevin Wang <kevin.wang(a)arm.com> Date: Wed Dec 6 15:25:04 2017 +0800 linux-gen: pool: modify CONFIG_POOL_CACHE_SIZE from 256 to 255 CONFIG_POOL_CACHE_SIZE is used in pool_cache_t. In pool_cache_t, there is another variable "num" which type is uint32_t. So if set CONFIG_POOL_CACHE_SIZE to 256 here, the capacity of pool_cache_t is 1028B which will waste 60B in one cache line. So reduce it to 255. Signed-off-by: Kevin Wang <kevin.wang(a)arm.com> Reviewed-by: Honnappa Nagarahalli <honnappa.nagarahalli(a)arm.com> Reviewed-by: Ola Liljedahl <ola.Liljedahl(a)arm.com> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Yi He <yi.he(a)linaro.org> diff --git a/platform/linux-generic/include/odp_config_internal.h b/platform/linux-generic/include/odp_config_internal.h index 9720581a..3519cfc7 100644 --- a/platform/linux-generic/include/odp_config_internal.h +++ b/platform/linux-generic/include/odp_config_internal.h @@ -150,6 +150,6 @@ /* * Maximum number of events in a thread local pool cache */ -#define CONFIG_POOL_CACHE_SIZE 256 +#define CONFIG_POOL_CACHE_SIZE 255 #endif ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/include/odp_config_internal.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive --

8 years, 2 months

[COMMIT] branch master updated. v1.16.0.0-22-g1b285bbd

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 1b285bbdd1abbec9853e1bc51bdb6ee02643b1a7 (commit) via 37b4da286aeff3321084e62045d0b3ab10c07399 (commit) via e02d9f43ea8675db5ad5202ef605e6dd8014abb5 (commit) via 442638dd1514f8dda882d48fbb1ebc88ef9af430 (commit) via c6573eb58dcf0d0316ada1e91ae1993100c4d559 (commit) via aab8ff7237c117e9ed63a8b7d595aca7f5665ff9 (commit) from c15a810b7a47f2e07200f83aa534163ca06e2b16 (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 1b285bbdd1abbec9853e1bc51bdb6ee02643b1a7 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Fri Dec 1 20:23:33 2017 +0300 travis: also use DPDK when doing cross-compile tests Compile and use DPDK when doing cross-compilation tests. This enables us to test that pktio/dpdk.c works on non-x86 targets. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-and-tested-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/.travis.yml b/.travis.yml index a3032672..25c2d0a5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -99,7 +99,8 @@ before_install: else sudo -E apt-get -y --no-install-suggests --no-install-recommends --force-yes install g++-"$CROSS_GNU_TYPE" ; fi ; - sudo -E apt-get -y --no-install-suggests --no-install-recommends --force-yes install libc6-dev:"$CROSS_ARCH" libssl-dev:"$CROSS_ARCH" zlib1g-dev:"$CROSS_ARCH" libconfig-dev:"$CROSS_ARCH" libstdc++-4.8-dev:"$CROSS_ARCH"; + sudo -E apt-get -y --no-install-suggests --no-install-recommends --force-yes install libc6-dev:"$CROSS_ARCH" libssl-dev:"$CROSS_ARCH" zlib1g-dev:"$CROSS_ARCH" libconfig-dev:"$CROSS_ARCH" libstdc++-4.8-dev:"$CROSS_ARCH" libpcap0.8-dev:"$CROSS_ARCH" ; + [ "$CROSS_ARCH" = "armhf" ] || sudo -E apt-get -y --no-install-suggests --no-install-recommends --force-yes install libnuma-dev:"$CROSS_ARCH"; export PKG_CONFIG_PATH=/usr/lib/${CROSS_MULTIARCH}/pkgconfig:/usr/${CROSS_MULTIARCH}/lib/pkgconfig ; fi - if [ "${CC#clang}" != "${CC}" ] ; @@ -107,16 +108,24 @@ before_install: if [ -n "$CROSS_ARCH" ] ; then export CC="${CC} --target=$CROSS_GNU_TYPE" ; + if [ "$CROSS_ARCH" = "i386" ] ; + then + DPDK_CFLAGS="-m32" ; + else + DPDK_CROSS="$CROSS_GNU_TYPE-" ; + fi fi ; export CXX="${CC/clang/clang++}"; elif [ "$CROSS_ARCH" = "i386" ] ; then export CC="gcc -m32" ; export CXX="g++ -m32" ; + DPDK_CFLAGS="-m32" ; elif [ -n "$CROSS_ARCH" ] ; then export CC="$CROSS_GNU_TYPE"-gcc ; export CXX="$CROSS_GNU_TYPE"-g++ ; + DPDK_CROSS="$CROSS_GNU_TYPE-" ; fi - if test ! -L /usr/lib/ccache/${CC%% *} ; then sudo ln -s -t /usr/lib/ccache/ `which ${CC%% *}` ; fi - ccache -s @@ -174,21 +183,48 @@ install: if [ "${CACHED_DPDK_VERS}" != "${DPDK_VERS}" ]; then rm -rf dpdk fi - - TARGET=${TARGET:-"x86_64-native-linuxapp-gcc"} - | - if [ -z "$CROSS_ARCH" -a ! -f "dpdk/${TARGET}/lib/libdpdk.a" ]; then + case "$CROSS_ARCH" in + "arm64") + TARGET="arm64-armv8a-linuxapp-gcc" + ;; + "armhf") + TARGET="arm-armv7a-linuxapp-gcc" + ;; + "i386") + TARGET="i686-native-linuxapp-gcc" + ;; + "") + TARGET="x86_64-native-linuxapp-gcc" + DPDK_MACHINE=snb + ;; + esac + - | + if [ -n "$TARGET" -a ! -f "dpdk/${TARGET}/lib/libdpdk.a" ]; then git -c advice.detachedHead=false clone -q --depth=1 --single-branch --branch=v${DPDK_VERS} http://dpdk.org/git/dpdk dpdk pushd dpdk git log --oneline --decorate + echo $CC + # AArch64 && ARMv7 fixup + sed -i -e 's/40900/40800/g' lib/librte_eal/common/include/arch/arm/rte_vect.h + sed -i -e 's/!(/!(defined(__arm__) \&\& defined(__clang__) || /g' lib/librte_eal/common/include/arch/arm/rte_byteorder.h + sed -i -e 's/__GNUC__/defined(__arm__) \&\& defined(__clang__) || __GNUC__/' lib/librte_eal/common/include/generic/rte_byteorder.h make config T=${TARGET} O=${TARGET} pushd ${TARGET} sed -ri 's,(CONFIG_RTE_LIBRTE_PMD_PCAP=).*,\1y,' .config cat .config |grep RTE_MACHINE - sed -ri 's,(CONFIG_RTE_MACHINE=).*,\1"snb",' .config + if test -n "${DPDK_MACHINE}" ; then + sed -ri 's,(CONFIG_RTE_MACHINE=).*,\1"'${DPDK_MACHINE}'",' .config + fi + if test -n "$CROSS_ARCH" ; then + sed -ri -e 's,(CONFIG_RTE_EAL_IGB_UIO=).*,\1n,' .config + sed -ri -e 's,(CONFIG_RTE_KNI_KMOD=).*,\1n,' .config + fi popd - make install T=${TARGET} EXTRA_CFLAGS="-fPIC" + make install T=${TARGET} EXTRA_CFLAGS="-fPIC $DPDK_CFLAGS" CROSS="$DPDK_CROSS" rm -r ./doc ./${TARGET}/app ./${TARGET}/build popd + EXTRA_CONF="$EXTRA_CONF --with-dpdk-path=`pwd`/dpdk/${TARGET}" fi # Netmap pktio @@ -202,12 +238,10 @@ install: popd fi sudo insmod ./netmap/LINUX/netmap.ko + EXTRA_CONF="$EXTRA_CONF --with-netmap-path=`pwd`/netmap" fi script: - - if [ -z "$CROSS_ARCH" ] ; then - EXTRA_CONF="--with-dpdk-path=`pwd`/dpdk/${TARGET} --with-netmap-path=`pwd`/netmap" ; - fi - ./bootstrap - ./configure --prefix=$HOME/odp-install --enable-user-guides commit 37b4da286aeff3321084e62045d0b3ab10c07399 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Sat Dec 2 04:53:40 2017 +0300 linux-gen: dpdk: cast addresses to uintptr_t rather than uint64_t This is to remove the following error: pktio/dpdk.c: In function ‘mbuf_data_off’: pktio/dpdk.c:126:9: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast] return (uint64_t)pkt_hdr->buf_hdr.seg[0].data - ^ pktio/dpdk.c:127:4: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast] (uint64_t)mbuf->buf_addr; Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-and-tested-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c index db2a8b0f..585ff462 100644 --- a/platform/linux-generic/pktio/dpdk.c +++ b/platform/linux-generic/pktio/dpdk.c @@ -123,8 +123,8 @@ static unsigned cache_size(uint32_t num) static inline uint16_t mbuf_data_off(struct rte_mbuf *mbuf, odp_packet_hdr_t *pkt_hdr) { - return (uint64_t)pkt_hdr->buf_hdr.seg[0].data - - (uint64_t)mbuf->buf_addr; + return (uintptr_t)pkt_hdr->buf_hdr.seg[0].data - + (uintptr_t)mbuf->buf_addr; } /** commit e02d9f43ea8675db5ad5202ef605e6dd8014abb5 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Fri Dec 1 20:11:02 2017 +0300 linux-gen: pktio: support using DPDK lt 17.08 Debian unstable ships with DPDK 16.11. Add support for building with this version. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-and-tested-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c index 07671e62..db2a8b0f 100644 --- a/platform/linux-generic/pktio/dpdk.c +++ b/platform/linux-generic/pktio/dpdk.c @@ -29,14 +29,27 @@ #include <rte_config.h> #include <rte_malloc.h> +#if __GNUC__ >= 7 +#pragma GCC diagnostic push +#pragma GCC diagnostic warning "-Wimplicit-fallthrough=0" +#endif #include <rte_mbuf.h> +#if __GNUC__ >= 7 +#pragma GCC diagnostic pop +#endif #include <rte_mempool.h> #include <rte_ethdev.h> #include <rte_ip.h> #include <rte_ip_frag.h> +#include <rte_log.h> #include <rte_udp.h> #include <rte_tcp.h> #include <rte_string_fns.h> +#include <rte_version.h> + +#if RTE_VERSION < RTE_VERSION_NUM(17, 5, 0, 0) +#define rte_log_set_global_level rte_set_log_level +#endif #if ODP_DPDK_ZERO_COPY ODP_STATIC_ASSERT(CONFIG_PACKET_HEADROOM == RTE_PKTMBUF_HEADROOM, @@ -54,6 +67,7 @@ static int disable_pktio; /** !0 this pktio disabled, 0 enabled */ /* Has dpdk_pktio_init() been called */ static odp_bool_t dpdk_initialized; +#ifndef RTE_BUILD_SHARED_LIB #define MEMPOOL_OPS(hdl) \ extern void mp_hdlr_init_##hdl(void) @@ -77,6 +91,7 @@ void refer_constructors(void) mp_hdlr_init_ops_sp_mc(); mp_hdlr_init_ops_stack(); } +#endif /** * Calculate valid cache size for DPDK packet pool @@ -928,6 +943,11 @@ static int dpdk_close(pktio_entry_t *pktio_entry) rte_pktmbuf_free(pkt_dpdk->rx_cache[i].s.pkt[idx++]); } +#if RTE_VERSION < RTE_VERSION_NUM(17, 8, 0, 0) + if (pktio_entry->s.state != PKTIO_STATE_OPENED) + rte_eth_dev_close(pkt_dpdk->port_id); +#endif + return 0; } @@ -1064,14 +1084,16 @@ static void dpdk_mempool_free(struct rte_mempool *mp, void *arg ODP_UNUSED) static int dpdk_pktio_term(void) { - uint8_t port_id; - if (!dpdk_initialized) return 0; +#if RTE_VERSION >= RTE_VERSION_NUM(17, 8, 0, 0) + uint8_t port_id; + RTE_ETH_FOREACH_DEV(port_id) { rte_eth_dev_close(port_id); } +#endif if (!ODP_DPDK_ZERO_COPY) rte_mempool_walk(dpdk_mempool_free, NULL); commit 442638dd1514f8dda882d48fbb1ebc88ef9af430 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Fri Dec 1 20:10:31 2017 +0300 linux-gen: add support for using system-wide DPDK Support using distro-installed DPDK for Pkt I/O. Distributions (like Ubuntu, Debian, etc) start providing DPDK packages. It is wise to enable users to use distro-provided DPDK version rather than requiring to always compile it from sources. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-and-tested-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/m4/odp_dpdk.m4 b/m4/odp_dpdk.m4 index 636170a7..05e60cc0 100644 --- a/m4/odp_dpdk.m4 +++ b/m4/odp_dpdk.m4 @@ -16,6 +16,31 @@ AS_VAR_APPEND([DPDK_PMDS], [--no-whole-archive]) AC_SUBST([DPDK_PMDS]) ]) +# _ODP_DPDK_CHECK_LIB(LDFLAGS, [LIBS], [EXTRA_LIBS]) +# ---------------------------------- +# Check if one can use -ldpdk with provided set of libs +AC_DEFUN([_ODP_DPDK_CHECK_LIB], [dnl +########################################################################## +# Save and set temporary compilation flags +########################################################################## +OLD_LDFLAGS=$LDFLAGS +OLD_LIBS=$LIBS +LDFLAGS="$1 $LDFLAGS" +LIBS="$LIBS -ldpdk $2" + +AC_MSG_CHECKING([for rte_eal_init in -ldpdk $2]) +AC_LINK_IFELSE([AC_LANG_CALL([], [rte_eal_init])], + [AC_MSG_RESULT([yes]) + DPDK_LIBS="$1 -ldpdk $3 $2"], + [AC_MSG_RESULT([no])]) + +########################################################################## +# Restore old saved variables +########################################################################## +LDFLAGS=$OLD_LDFLAGS +LIBS=$OLD_LIBS +]) + # ODP_DPDK_CHECK(CPPFLAGS, LDFLAGS, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND) # ----------------------------------------------------------------------- # Check for DPDK availability @@ -23,10 +48,7 @@ AC_DEFUN([ODP_DPDK_CHECK], [dnl ########################################################################## # Save and set temporary compilation flags ########################################################################## -OLD_LDFLAGS=$LDFLAGS -OLD_LIBS=$LIBS OLD_CPPFLAGS=$CPPFLAGS -LDFLAGS="$2 $LDFLAGS" CPPFLAGS="$1 $CPPFLAGS" dpdk_check_ok=yes @@ -34,16 +56,21 @@ dpdk_check_ok=yes AC_CHECK_HEADERS([rte_config.h], [], [dpdk_check_ok=no]) -AC_CHECK_LIB([dpdk], [rte_eal_init], [], - [dpdk_check_ok=no], [-ldl -lpthread -lnuma]) +DPDK_LIBS="" +_ODP_DPDK_CHECK_LIB([$2]) +AS_IF([test "x$DPDK_LIBS" = "x"], + [_ODP_DPDK_CHECK_LIB([$2], [-ldl -lpthread], [-lm])]) +AS_IF([test "x$DPDK_LIBS" = "x"], + [_ODP_DPDK_CHECK_LIB([$2], [-ldl -lpthread -lnuma], [-lm])]) +AS_IF([test "x$DPDK_LIBS" = "x"], + [dpdk_check_ok=no]) AS_IF([test "x$dpdk_check_ok" != "xno"], - [m4_default([$3], [:])], + [AC_SUBST([DPDK_LIBS]) + m4_default([$3], [:])], [m4_default([$4], [:])]) ########################################################################## # Restore old saved variables ########################################################################## -LDFLAGS=$OLD_LDFLAGS -LIBS=$OLD_LIBS CPPFLAGS=$OLD_CPPFLAGS ]) diff --git a/platform/linux-generic/m4/odp_dpdk.m4 b/platform/linux-generic/m4/odp_dpdk.m4 index 91f76e2d..471bbcd5 100644 --- a/platform/linux-generic/m4/odp_dpdk.m4 +++ b/platform/linux-generic/m4/odp_dpdk.m4 @@ -2,12 +2,27 @@ # Enable DPDK support ########################################################################## pktio_dpdk_support=no + +AC_ARG_ENABLE([dpdk], + [AS_HELP_STRING([--enable-dpdk], [enable DPDK support for Packet I/O])], + [pktio_dpdk_support=$enableval + DPDK_PATH=system]) + AC_ARG_WITH([dpdk-path], [AS_HELP_STRING([--with-dpdk-path=DIR], [path to dpdk build directory])], [DPDK_PATH="$withval" - DPDK_CPPFLAGS="-isystem $DPDK_PATH/include" - DPDK_LDFLAGS="-L$DPDK_PATH/lib" - pktio_dpdk_support=yes],[]) + pktio_dpdk_support=yes],[]) + +AS_IF([test "x$DPDK_PATH" = "xsystem"], + [DPDK_CPPFLAGS="-isystem/usr/include/dpdk" + DPDK_LDFLAGS="" + DPDK_PMD_PATH="`$CC --print-file-name=librte_pmd_null.a`" + DPDK_PMD_PATH="`dirname "$DPDK_PMD_PATH"`" + AS_IF([test "x$DPDK_PMD_PATH" = "x"], + [AC_MSG_FAILURE([Could not locate system DPDK PMD directory])])], + [DPDK_CPPFLAGS="-isystem $DPDK_PATH/include" + DPDK_LDFLAGS="-L$DPDK_PATH/lib" + DPDK_PMD_PATH="$DPDK_PATH/lib"]) ########################################################################## # Enable zero-copy DPDK pktio @@ -30,14 +45,17 @@ then ODP_DPDK_CHECK([$DPDK_CPPFLAGS], [$DPDK_LDFLAGS], [], [AC_MSG_FAILURE([can't find DPDK])]) - ODP_DPDK_PMDS([$DPDK_PATH/lib]) + ODP_DPDK_PMDS([$DPDK_PMD_PATH]) AC_DEFINE([ODP_PKTIO_DPDK], [1], [Define to 1 to enable DPDK packet I/O support]) AC_DEFINE_UNQUOTED([ODP_DPDK_ZERO_COPY], [$zero_copy], [Define to 1 to enable DPDK zero copy support]) - DPDK_LIBS="$DPDK_LDFLAGS -ldpdk -lpthread -ldl -lpcap -lm -lnuma" + if test -r "$DPDK_PMD_PATH/librte_pmd_pcap.a" && + ! test -r "$DPDK_PMD_PATH/librte_pmd_pcap.so" ; then + DPDK_LIBS="$DPDK_LIBS -lpcap" + fi AC_SUBST([DPDK_CPPFLAGS]) AC_SUBST([DPDK_LIBS]) else commit c6573eb58dcf0d0316ada1e91ae1993100c4d559 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Fri Dec 1 22:41:54 2017 +0300 linux-gen: apply -msse4.2 only in x86 case Flag -msse4.2 should be used only for i?86/x86_64 targets, it does not make sense for any other target. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-and-tested-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 9cb501cf..bbe6a21c 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -14,6 +14,12 @@ AM_CPPFLAGS += $(OPENSSL_CPPFLAGS) AM_CPPFLAGS += $(DPDK_CPPFLAGS) AM_CPPFLAGS += $(NETMAP_CPPFLAGS) +if PKTIO_DPDK +if ARCH_IS_X86 +AM_CFLAGS += -msse4.2 +endif +endif + odpincludedir= $(includedir)/odp odpinclude_HEADERS = \ include/odp/visibility_begin.h \ diff --git a/platform/linux-generic/m4/odp_dpdk.m4 b/platform/linux-generic/m4/odp_dpdk.m4 index ba0fdc93..91f76e2d 100644 --- a/platform/linux-generic/m4/odp_dpdk.m4 +++ b/platform/linux-generic/m4/odp_dpdk.m4 @@ -5,7 +5,7 @@ pktio_dpdk_support=no AC_ARG_WITH([dpdk-path], [AS_HELP_STRING([--with-dpdk-path=DIR], [path to dpdk build directory])], [DPDK_PATH="$withval" - DPDK_CPPFLAGS="-msse4.2 -isystem $DPDK_PATH/include" + DPDK_CPPFLAGS="-isystem $DPDK_PATH/include" DPDK_LDFLAGS="-L$DPDK_PATH/lib" pktio_dpdk_support=yes],[]) commit aab8ff7237c117e9ed63a8b7d595aca7f5665ff9 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue Oct 17 12:37:25 2017 +0300 configure: separate common DPDK check to odp_dpdk.m4 Separate DPDK macros to top-level file so that they can be reused by other implementations (like ODP-DPDK). Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-and-tested-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/m4/odp_dpdk.m4 b/m4/odp_dpdk.m4 new file mode 100644 index 00000000..636170a7 --- /dev/null +++ b/m4/odp_dpdk.m4 @@ -0,0 +1,49 @@ +# ODP_DPDK_PMDS(DPDK_DRIVER_PATH) +# ------------------------------- +# Build a list of DPDK PMD drivers in DPDK_PMDS variable +AC_DEFUN([ODP_DPDK_PMDS], [dnl +AS_VAR_SET([DPDK_PMDS], [-Wl,--whole-archive,]) +for filename in "$1"/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]) +AC_SUBST([DPDK_PMDS]) +]) + +# ODP_DPDK_CHECK(CPPFLAGS, LDFLAGS, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND) +# ----------------------------------------------------------------------- +# Check for DPDK availability +AC_DEFUN([ODP_DPDK_CHECK], [dnl +########################################################################## +# Save and set temporary compilation flags +########################################################################## +OLD_LDFLAGS=$LDFLAGS +OLD_LIBS=$LIBS +OLD_CPPFLAGS=$CPPFLAGS +LDFLAGS="$2 $LDFLAGS" +CPPFLAGS="$1 $CPPFLAGS" + +dpdk_check_ok=yes + +AC_CHECK_HEADERS([rte_config.h], [], + [dpdk_check_ok=no]) + +AC_CHECK_LIB([dpdk], [rte_eal_init], [], + [dpdk_check_ok=no], [-ldl -lpthread -lnuma]) +AS_IF([test "x$dpdk_check_ok" != "xno"], + [m4_default([$3], [:])], + [m4_default([$4], [:])]) + +########################################################################## +# Restore old saved variables +########################################################################## +LDFLAGS=$OLD_LDFLAGS +LIBS=$OLD_LIBS +CPPFLAGS=$OLD_CPPFLAGS +]) diff --git a/platform/linux-generic/m4/odp_dpdk.m4 b/platform/linux-generic/m4/odp_dpdk.m4 index 1e8fa2de..ba0fdc93 100644 --- a/platform/linux-generic/m4/odp_dpdk.m4 +++ b/platform/linux-generic/m4/odp_dpdk.m4 @@ -3,9 +3,10 @@ ########################################################################## pktio_dpdk_support=no AC_ARG_WITH([dpdk-path], -AS_HELP_STRING([--with-dpdk-path=DIR path to dpdk build directory]), +[AS_HELP_STRING([--with-dpdk-path=DIR], [path to dpdk build directory])], [DPDK_PATH="$withval" DPDK_CPPFLAGS="-msse4.2 -isystem $DPDK_PATH/include" + DPDK_LDFLAGS="-L$DPDK_PATH/lib" pktio_dpdk_support=yes],[]) ########################################################################## @@ -13,17 +14,11 @@ AS_HELP_STRING([--with-dpdk-path=DIR path to dpdk build directory]), ########################################################################## zero_copy=0 AC_ARG_ENABLE([dpdk-zero-copy], - [ --enable-dpdk-zero-copy enable experimental zero-copy DPDK pktio mode], + [AS_HELP_STRING([--enable-dpdk-zero-copy], [enable experimental zero-copy DPDK pktio mode])], [if test x$enableval = xyes; then zero_copy=1 fi]) -########################################################################## -# Save and set temporary compilation flags -########################################################################## -OLD_CPPFLAGS="$CPPFLAGS" -CPPFLAGS="$DPDK_CPPFLAGS $CPPFLAGS" - ########################################################################## # Check for DPDK availability # @@ -32,37 +27,21 @@ CPPFLAGS="$DPDK_CPPFLAGS $CPPFLAGS" ########################################################################## if test x$pktio_dpdk_support = xyes then - AC_CHECK_HEADERS([rte_config.h], [], - [AC_MSG_FAILURE(["can't find DPDK header"])]) + ODP_DPDK_CHECK([$DPDK_CPPFLAGS], [$DPDK_LDFLAGS], [], + [AC_MSG_FAILURE([can't find DPDK])]) - AS_VAR_SET([DPDK_PMDS], [-Wl,--whole-archive,]) - for filename in "$DPDK_PATH"/lib/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]) + ODP_DPDK_PMDS([$DPDK_PATH/lib]) AC_DEFINE([ODP_PKTIO_DPDK], [1], [Define to 1 to enable DPDK packet I/O support]) AC_DEFINE_UNQUOTED([ODP_DPDK_ZERO_COPY], [$zero_copy], [Define to 1 to enable DPDK zero copy support]) - DPDK_LIBS="-L$DPDK_PATH/lib -ldpdk -lpthread -ldl -lpcap -lm -lnuma" + DPDK_LIBS="$DPDK_LDFLAGS -ldpdk -lpthread -ldl -lpcap -lm -lnuma" AC_SUBST([DPDK_CPPFLAGS]) AC_SUBST([DPDK_LIBS]) - AC_SUBST([DPDK_PMDS]) else pktio_dpdk_support=no fi -########################################################################## -# Restore old saved variables -########################################################################## -CPPFLAGS=$OLD_CPPFLAGS - AM_CONDITIONAL([PKTIO_DPDK], [test x$pktio_dpdk_support = xyes ]) ----------------------------------------------------------------------- Summary of changes: .travis.yml | 50 +++++++++++++++++++---- m4/odp_dpdk.m4 | 76 +++++++++++++++++++++++++++++++++++ platform/linux-generic/Makefile.am | 6 +++ platform/linux-generic/m4/odp_dpdk.m4 | 57 +++++++++++++------------- platform/linux-generic/pktio/dpdk.c | 30 ++++++++++++-- 5 files changed, 177 insertions(+), 42 deletions(-) create mode 100644 m4/odp_dpdk.m4 hooks/post-receive --

8 years, 3 months

[COMMIT] branch 2.0 updated. v1.15.0.0-947-g75f3d60e

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 75f3d60e6b31544bb9b273364b2cce502262c1f8 (commit) via 61d636209fe064bca7e645af3938739290020875 (commit) via 29e1c5d318822f1ab14e9d82b75f66159f42efcc (commit) via 2d187fd4a4039778ca8ed78dc23ea1da436d427b (commit) via b920c02af3e0c179435db03c71694ace2a62c4f1 (commit) via 59877869efeb29038ba82a4b4771f5864438f8a8 (commit) via 19fe9172ee1fd069a2db86c554db41cbfc69c42d (commit) via 80b0d616f750e824a4bf0b0f3406ea3a3173ae0e (commit) from 00c7441fae53949dd87855d48102f932f8f64537 (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 75f3d60e6b31544bb9b273364b2cce502262c1f8 Author: Yi He <yi.he(a)linaro.org> Date: Mon Dec 4 15:36:08 2017 +0800 linux-dpdk: fix inconsistent *_INVALID defines Fixed inconsistent defines of ODP_BUFFER_INVALID, ODP_EVENT_INVALID and ODP_TIMEOUT_INVALID as NULL instead of 0xffffffff for linux-dpdk platform, to align with linux-generic as well as abi compatible headers. Signed-off-by: Yi He <yi.he(a)linaro.org> Reviewed-by: Honnappa Nagarahalli <honnappa.nagarahalli(a)arm.com> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> diff --git a/platform/linux-dpdk/include/odp/api/plat/buffer_types.h b/platform/linux-dpdk/include/odp/api/plat/buffer_types.h index 809768f3..0f5f7baa 100644 --- a/platform/linux-dpdk/include/odp/api/plat/buffer_types.h +++ b/platform/linux-dpdk/include/odp/api/plat/buffer_types.h @@ -31,7 +31,7 @@ extern "C" { typedef ODP_HANDLE_T(odp_buffer_t); -#define ODP_BUFFER_INVALID _odp_cast_scalar(odp_buffer_t, 0xffffffff) +#define ODP_BUFFER_INVALID _odp_cast_scalar(odp_buffer_t, NULL) typedef ODP_HANDLE_T(odp_buffer_seg_t); diff --git a/platform/linux-dpdk/include/odp/api/plat/event_types.h b/platform/linux-dpdk/include/odp/api/plat/event_types.h index e0f68e34..ecda702c 100644 --- a/platform/linux-dpdk/include/odp/api/plat/event_types.h +++ b/platform/linux-dpdk/include/odp/api/plat/event_types.h @@ -32,7 +32,7 @@ extern "C" { typedef ODP_HANDLE_T(odp_event_t); -#define ODP_EVENT_INVALID _odp_cast_scalar(odp_event_t, 0xffffffff) +#define ODP_EVENT_INVALID _odp_cast_scalar(odp_event_t, NULL) /** * Event types diff --git a/platform/linux-dpdk/include/odp/api/plat/timer_types.h b/platform/linux-dpdk/include/odp/api/plat/timer_types.h index 2ae8bfec..3d97993b 100644 --- a/platform/linux-dpdk/include/odp/api/plat/timer_types.h +++ b/platform/linux-dpdk/include/odp/api/plat/timer_types.h @@ -37,7 +37,7 @@ typedef ODP_HANDLE_T(odp_timer_t); typedef ODP_HANDLE_T(odp_timeout_t); -#define ODP_TIMEOUT_INVALID _odp_cast_scalar(odp_timeout_t, 0xffffffff) +#define ODP_TIMEOUT_INVALID _odp_cast_scalar(odp_timeout_t, NULL) /** * @} commit 61d636209fe064bca7e645af3938739290020875 Author: Yi He <yi.he(a)linaro.org> Date: Fri Dec 1 16:31:40 2017 +0800 linux-dpdk: fix platform tests Fixed search path in pktio_run.sh for pktio_main executable, and Makefile.am to run platform tests with wrapper script. Signed-off-by: Yi He <yi.he(a)linaro.org> Reviewed-by: Honnappa Nagarahalli <honnappa.nagarahalli(a)arm.com> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> diff --git a/platform/linux-dpdk/test/Makefile.am b/platform/linux-dpdk/test/Makefile.am index a872400e..8cb27b14 100644 --- a/platform/linux-dpdk/test/Makefile.am +++ b/platform/linux-dpdk/test/Makefile.am @@ -14,8 +14,6 @@ SUBDIRS += validation/api/pktio endif endif -TEST_EXTENSIONS = .sh - TESTNAME = linux-dpdk TESTENV = tests-$(TESTNAME).env diff --git a/platform/linux-dpdk/test/validation/api/pktio/pktio_run.sh b/platform/linux-dpdk/test/validation/api/pktio/pktio_run.sh index 538c87d0..a08256a6 100755 --- a/platform/linux-dpdk/test/validation/api/pktio/pktio_run.sh +++ b/platform/linux-dpdk/test/validation/api/pktio/pktio_run.sh @@ -23,7 +23,7 @@ # running stand alone out of tree requires setting PATH PATH=${TEST_DIR}/api/pktio:$PATH PATH=$(dirname $0):$PATH -PATH=$(dirname $0)/../../../../common_plat/validation/api/pktio:$PATH +PATH=$(dirname $0)/../../../../../../test/validation/api/pktio:$PATH PATH=.:$PATH pktio_main_path=$(which pktio_main${EXEEXT}) commit 29e1c5d318822f1ab14e9d82b75f66159f42efcc Author: Balakrishna Garapati <balakrishna.garapati(a)linaro.org> Date: Thu Nov 30 22:50:48 2017 +0100 linux-dpdk: crypto bug fixes Signed-off-by: Balakrishna Garapati <balakrishna.garapati(a)linaro.org> Reviewed-by: Yi He <yi.he(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> diff --git a/platform/linux-dpdk/odp_crypto.c b/platform/linux-dpdk/odp_crypto.c index 9844f2dd..ea014c8e 100644 --- a/platform/linux-dpdk/odp_crypto.c +++ b/platform/linux-dpdk/odp_crypto.c @@ -808,40 +808,53 @@ int odp_crypto_session_create(odp_crypto_session_param_t *param, /* Default to successful result */ *status = ODP_CRYPTO_SES_CREATE_ERR_NONE; - /* Cipher Data */ - cipher_xform.cipher.key.data = rte_malloc("crypto key", - param->cipher_key.length, 0); - if (cipher_xform.cipher.key.data == NULL) { - ODP_ERR("Failed to allocate memory for cipher key\n"); - /* remove the crypto_session_entry_t */ - memset(entry, 0, sizeof(*entry)); - free_session(entry); - return -1; - } - cipher_xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER; cipher_xform.next = NULL; - cipher_xform.cipher.key.length = param->cipher_key.length; - memcpy(cipher_xform.cipher.key.data, - param->cipher_key.data, - param->cipher_key.length); - - /* Authentication Data */ - auth_xform.auth.key.data = rte_malloc("auth key", - param->auth_key.length, 0); - if (auth_xform.auth.key.data == NULL) { - ODP_ERR("Failed to allocate memory for auth key\n"); - /* remove the crypto_session_entry_t */ - memset(entry, 0, sizeof(*entry)); - free_session(entry); - return -1; + + if (param->cipher_key.length) { + /* Cipher Data */ + cipher_xform.cipher.key.data = rte_malloc("crypto key", + param->cipher_key.length, 0); + if (cipher_xform.cipher.key.data == NULL) { + ODP_ERR("Failed to allocate memory for cipher key\n"); + /* remove the crypto_session_entry_t */ + memset(entry, 0, sizeof(*entry)); + free_session(entry); + return -1; + } + + cipher_xform.cipher.key.length = param->cipher_key.length; + memcpy(cipher_xform.cipher.key.data, + param->cipher_key.data, + param->cipher_key.length); + } else { + cipher_xform.cipher.key.data = 0; + cipher_xform.cipher.key.length = 0; } + auth_xform.type = RTE_CRYPTO_SYM_XFORM_AUTH; auth_xform.next = NULL; - auth_xform.auth.key.length = param->auth_key.length; - memcpy(auth_xform.auth.key.data, - param->auth_key.data, - param->auth_key.length); + + if (param->auth_key.length) { + /* Authentication Data */ + auth_xform.auth.key.data = rte_malloc("auth key", + param->auth_key.length, 0); + if (auth_xform.auth.key.data == NULL) { + ODP_ERR("Failed to allocate memory for auth key\n"); + /* remove the crypto_session_entry_t */ + memset(entry, 0, sizeof(*entry)); + free_session(entry); + return -1; + } + auth_xform.auth.key.length = param->auth_key.length; + memcpy(auth_xform.auth.key.data, + param->auth_key.data, + param->auth_key.length); + } else { + auth_xform.auth.key.data = 0; + auth_xform.auth.key.length = 0; + } + /* Derive order */ if (ODP_CRYPTO_OP_ENCODE == param->op) @@ -1271,11 +1284,13 @@ int odp_crypto_int(odp_packet_t pkt_in, memcpy(op->sym->cipher.iv.data, param->override_iv_ptr, entry->iv.length); + op->sym->cipher.iv.phys_addr = + rte_malloc_virt2phy(op->sym->cipher.iv.data); + op->sym->cipher.iv.length = entry->iv.length; } else if (entry->iv.data) { memcpy(op->sym->cipher.iv.data, entry->iv.data, entry->iv.length); - op->sym->cipher.iv.phys_addr = rte_malloc_virt2phy(op->sym->cipher.iv.data); op->sym->cipher.iv.length = entry->iv.length; @@ -1326,7 +1341,7 @@ int odp_crypto_int(odp_packet_t pkt_in, (rc_auth == ODP_CRYPTO_ALG_ERR_NONE); _odp_buffer_event_subtype_set(packet_to_buffer(out_pkt), - ODP_EVENT_PACKET_BASIC); + ODP_EVENT_PACKET_CRYPTO); op_result = get_op_result_from_packet(out_pkt); *op_result = local_result; commit 2d187fd4a4039778ca8ed78dc23ea1da436d427b Author: Balakrishna Garapati <balakrishna.garapati(a)linaro.org> Date: Thu Nov 30 14:57:27 2017 +0100 linux-dpdk: changes which are needed for odp_crypto to work All the changes are within the linux-dpdk/odp_crypto.c file: 1) Added missing brackets which made it impossible to create a crypto session 2) Increased the number of queues created, from nb_queue_pairs - 1 to nb_queue_pairs, what seems to work better 3) Removed a memory leak - the memory allocated for iv and aad were not freed Signed-off-by: Szymon Sliwa <szs(a)semihalf.com> Signed-off-by: Balakrishna Garapati <balakrishna.garapati(a)linaro.org> Reviewed-by: Yi He <yi.he(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> diff --git a/platform/linux-dpdk/odp_crypto.c b/platform/linux-dpdk/odp_crypto.c index 8e0f8a9d..9844f2dd 100644 --- a/platform/linux-dpdk/odp_crypto.c +++ b/platform/linux-dpdk/odp_crypto.c @@ -271,7 +271,7 @@ int odp_crypto_init_global(void) qp_conf.nb_descriptors = NB_MBUF; - for (queue_pair = 0; queue_pair < nb_queue_pairs - 1; + for (queue_pair = 0; queue_pair < nb_queue_pairs; queue_pair++) { rc = rte_cryptodev_queue_pair_setup(cdev_id, queue_pair, @@ -898,11 +898,12 @@ int odp_crypto_session_create(odp_crypto_session_param_t *param, /* Setup session */ session = rte_cryptodev_sym_session_create(cdev_id, first_xform); - if (session == NULL) + if (session == NULL) { /* remove the crypto_session_entry_t */ memset(entry, 0, sizeof(*entry)); free_session(entry); return -1; + } entry->rte_session = (intptr_t)session; entry->cipher_xform = cipher_xform; @@ -1216,6 +1217,9 @@ int odp_crypto_int(odp_packet_t pkt_in, goto err; } + op->sym->auth.aad.data = NULL; + op->sym->cipher.iv.data = NULL; + odp_spinlock_unlock(&global->lock); /* Set crypto operation data parameters */ @@ -1242,9 +1246,8 @@ int odp_crypto_int(odp_packet_t pkt_in, if (aad_len > 0) { op->sym->auth.aad.data = rte_malloc("aad", aad_len, 0); if (op->sym->auth.aad.data == NULL) { - rte_crypto_op_free(op); ODP_ERR("Failed to allocate memory for AAD"); - goto err; + goto err_op_free; } memcpy(op->sym->auth.aad.data, aad_head, aad_len); @@ -1254,16 +1257,14 @@ int odp_crypto_int(odp_packet_t pkt_in, } if (entry->iv.length == 0) { - rte_crypto_op_free(op); ODP_ERR("Wrong IV length"); - goto err; + goto err_op_free; } op->sym->cipher.iv.data = rte_malloc("iv", entry->iv.length, 0); if (op->sym->cipher.iv.data == NULL) { - rte_crypto_op_free(op); ODP_ERR("Failed to allocate memory for IV"); - goto err; + goto err_op_free; } if (param->override_iv_ptr) { @@ -1300,18 +1301,16 @@ int odp_crypto_int(odp_packet_t pkt_in, rc = rte_cryptodev_enqueue_burst(rte_session->dev_id, queue_pair, &op, 1); if (rc == 0) { - rte_crypto_op_free(op); ODP_ERR("Failed to enqueue packet"); - goto err; + goto err_op_free; } rc = rte_cryptodev_dequeue_burst(rte_session->dev_id, queue_pair, &op, 1); if (rc == 0) { - rte_crypto_op_free(op); ODP_ERR("Failed to dequeue packet"); - goto err; + goto err_op_free; } out_pkt = (odp_packet_t)op->sym->m_src; @@ -1331,6 +1330,8 @@ int odp_crypto_int(odp_packet_t pkt_in, op_result = get_op_result_from_packet(out_pkt); *op_result = local_result; + rte_free(op->sym->cipher.iv.data); + rte_free(op->sym->auth.aad.data); rte_crypto_op_free(op); /* Synchronous, simply return results */ @@ -1338,6 +1339,11 @@ int odp_crypto_int(odp_packet_t pkt_in, return 0; +err_op_free: + rte_free(op->sym->cipher.iv.data); + rte_free(op->sym->auth.aad.data); + rte_crypto_op_free(op); + err: if (allocated) { odp_packet_free(out_pkt); commit b920c02af3e0c179435db03c71694ace2a62c4f1 Author: Balakrishna Garapati <balakrishna.garapati(a)linaro.org> Date: Tue Nov 14 17:32:03 2017 +0100 test: enable dpdk initialization before running validation on linux-dpdk Signed-off-by: Balakrishna Garapati <balakrishna.garapati(a)linaro.org> Reviewed-by: Yi He <yi.he(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> diff --git a/platform/linux-generic/test/wrapper-script.sh b/platform/linux-generic/test/wrapper-script.sh new file mode 100755 index 00000000..977a032a --- /dev/null +++ b/platform/linux-generic/test/wrapper-script.sh @@ -0,0 +1,3 @@ +#wrapper script for pre setting environment for validation suit. +#currently this is empty but needs to be created to make it align with +#linux-dpdk. diff --git a/test/Makefile.inc b/test/Makefile.inc index eaf791e0..3e7dfe57 100644 --- a/test/Makefile.inc +++ b/test/Makefile.inc @@ -20,6 +20,8 @@ AM_CFLAGS = $(CUNIT_CFLAGS) AM_LDFLAGS = -L$(LIB) -static +LOG_COMPILER = $(top_srcdir)/platform/@with_platform@/test/wrapper-script.sh + @VALGRIND_CHECK_RULES@ TESTS_ENVIRONMENT = ODP_PLATFORM=${with_platform} \ diff --git a/test/performance/Makefile.am b/test/performance/Makefile.am index 1dccd82e..4417c484 100644 --- a/test/performance/Makefile.am +++ b/test/performance/Makefile.am @@ -31,6 +31,6 @@ odp_sched_latency_SOURCES = odp_sched_latency.c odp_scheduling_SOURCES = odp_scheduling.c odp_pktio_perf_SOURCES = odp_pktio_perf.c -dist_check_SCRIPTS = $(TESTSCRIPTS) +dist_check_SCRIPTS = $(TESTSCRIPTS) $(LOG_COMPILER) dist_check_DATA = udp64.pcap commit 59877869efeb29038ba82a4b4771f5864438f8a8 Author: Honnappa Nagarahalli <honnappa.nagarahalli(a)arm.com> Date: Tue Nov 21 15:23:50 2017 -0600 linux-dpdk: pktio: Do not reset parse fields when parsing not enabled When parsing of the packet is not enabled, application will not look at parse meta data fields. Signed-off-by: Honnappa Nagarahalli <honnappa.nagarahalli(a)arm.com> Reviewed-by: Ola Liljedahl <ola.Liljedahl(a)arm.com> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Yi He <yi.he(a)linaro.org> diff --git a/platform/linux-dpdk/pktio/dpdk.c b/platform/linux-dpdk/pktio/dpdk.c index 832ac7ac..2d95e902 100644 --- a/platform/linux-dpdk/pktio/dpdk.c +++ b/platform/linux-dpdk/pktio/dpdk.c @@ -403,13 +403,14 @@ static int recv_pkt_dpdk(pktio_entry_t *pktio_entry, int index, for (i = 0; i < nb_rx; ++i) { odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt_table[i]); - packet_parse_reset(pkt_hdr); pkt_hdr->input = pktio_entry->s.handle; if (!pktio_cls_enabled(pktio_entry) && - pktio_entry->s.config.parser.layer) + pktio_entry->s.config.parser.layer) { + packet_parse_reset(pkt_hdr); packet_parse_layer(pkt_hdr, pktio_entry->s.config.parser.layer); + } packet_set_ts(pkt_hdr, ts); } commit 19fe9172ee1fd069a2db86c554db41cbfc69c42d Author: Honnappa Nagarahalli <honnappa.nagarahalli(a)arm.com> Date: Tue Nov 21 14:26:00 2017 -0600 linux-dpdk: pool: Remove unused CONFIG_POOL_MAX_NUM CONFIG_POOL_MAX_NUM is not used in linux-dpdk. Signed-off-by: Honnappa Nagarahalli <honnappa.nagarahalli(a)arm.com> Reviewed-by: Ola Liljedahl <ola.Liljedahl(a)arm.com> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Yi He <yi.he(a)linaro.org> diff --git a/platform/linux-dpdk/include/odp_config_internal.h b/platform/linux-dpdk/include/odp_config_internal.h index 6aadc93f..f36fcb92 100644 --- a/platform/linux-dpdk/include/odp_config_internal.h +++ b/platform/linux-dpdk/include/odp_config_internal.h @@ -119,11 +119,6 @@ extern "C" { */ #define CONFIG_BURST_SIZE 16 -/* - * Maximum number of events in a pool - */ -#define CONFIG_POOL_MAX_NUM (1 * 1024 * 1024) - /* * Maximum number of events in a thread local pool cache */ diff --git a/platform/linux-dpdk/pool/dpdk.c b/platform/linux-dpdk/pool/dpdk.c index 90d2d7c6..94143dfe 100644 --- a/platform/linux-dpdk/pool/dpdk.c +++ b/platform/linux-dpdk/pool/dpdk.c @@ -137,12 +137,12 @@ static int dpdk_pool_capability(odp_pool_capability_t *capa) capa->buf.max_pools = ODP_CONFIG_POOLS; capa->buf.max_align = ODP_CONFIG_BUFFER_ALIGN_MAX; capa->buf.max_size = MAX_SIZE; - capa->buf.max_num = CONFIG_POOL_MAX_NUM; + capa->buf.max_num = 0; /* Packet pools */ capa->pkt.max_pools = ODP_CONFIG_POOLS; capa->pkt.max_len = 0; - capa->pkt.max_num = CONFIG_POOL_MAX_NUM; + capa->pkt.max_num = 0; capa->pkt.min_headroom = CONFIG_PACKET_HEADROOM; capa->pkt.min_tailroom = CONFIG_PACKET_TAILROOM; capa->pkt.max_segs_per_pkt = CONFIG_PACKET_MAX_SEGS; @@ -152,7 +152,7 @@ static int dpdk_pool_capability(odp_pool_capability_t *capa) /* Timeout pools */ capa->tmo.max_pools = ODP_CONFIG_POOLS; - capa->tmo.max_num = CONFIG_POOL_MAX_NUM; + capa->tmo.max_num = 0; return 0; } @@ -258,11 +258,6 @@ static int check_params(odp_pool_param_t *params) switch (params->type) { case ODP_POOL_BUFFER: - if (params->buf.num > capa.buf.max_num) { - printf("buf.num too large %u\n", params->buf.num); - return -1; - } - if (params->buf.size > capa.buf.max_size) { printf("buf.size too large %u\n", params->buf.size); return -1; @@ -276,12 +271,6 @@ static int check_params(odp_pool_param_t *params) break; case ODP_POOL_PACKET: - if (params->pkt.num > capa.pkt.max_num) { - printf("pkt.num too large %u\n", params->pkt.num); - - return -1; - } - if (params->pkt.seg_len > capa.pkt.max_seg_len) { printf("pkt.seg_len too large %u\n", params->pkt.seg_len); @@ -297,10 +286,6 @@ static int check_params(odp_pool_param_t *params) break; case ODP_POOL_TIMEOUT: - if (params->tmo.num > capa.tmo.max_num) { - printf("tmo.num too large %u\n", params->tmo.num); - return -1; - } break; default: commit 80b0d616f750e824a4bf0b0f3406ea3a3173ae0e Author: Honnappa Nagarahalli <honnappa.nagarahalli(a)arm.com> Date: Tue Nov 21 14:21:18 2017 -0600 linux-generic: pool: allocate ring memory based on pool size Adjust the size of ring based on configured number of buffers in the pool. Signed-off-by: Honnappa Nagarahalli <honnappa.nagarahalli(a)arm.com> Reviewed-by: Ola Liljedahl <ola.Liljedahl(a)arm.com> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Yi He <yi.he(a)linaro.org> diff --git a/platform/linux-generic/include/odp_config_internal.h b/platform/linux-generic/include/odp_config_internal.h index 9b334df4..9720581a 100644 --- a/platform/linux-generic/include/odp_config_internal.h +++ b/platform/linux-generic/include/odp_config_internal.h @@ -147,11 +147,6 @@ */ #define CONFIG_BURST_SIZE 16 -/* - * Maximum number of events in a pool - */ -#define CONFIG_POOL_MAX_NUM (1 * 1024 * 1024) - /* * Maximum number of events in a thread local pool cache */ diff --git a/platform/linux-generic/include/odp_pool_internal.h b/platform/linux-generic/include/odp_pool_internal.h index 60687b3d..a124697e 100644 --- a/platform/linux-generic/include/odp_pool_internal.h +++ b/platform/linux-generic/include/odp_pool_internal.h @@ -41,7 +41,7 @@ typedef struct { ring_t hdr; /* Ring data: buffer handles */ - uint32_t buf[CONFIG_POOL_MAX_NUM]; + uint32_t buf[]; } pool_ring_t ODP_ALIGNED_CACHE; diff --git a/platform/linux-generic/pool/generic.c b/platform/linux-generic/pool/generic.c index c55f6757..7a068472 100644 --- a/platform/linux-generic/pool/generic.c +++ b/platform/linux-generic/pool/generic.c @@ -156,11 +156,12 @@ static int generic_pool_term_local(void) return 0; } -static pool_t *reserve_pool(void) +static pool_t *reserve_pool(uint32_t ring_size) { int i; pool_t *pool; char ring_name[ODP_POOL_NAME_LEN]; + uint32_t ring_shm_size; for (i = 0; i < ODP_CONFIG_POOLS; i++) { pool = pool_entry(i); @@ -169,10 +170,13 @@ static pool_t *reserve_pool(void) if (pool->reserved == 0) { pool->reserved = 1; UNLOCK(&pool->lock); - sprintf(ring_name, "pool_ring_%d", i); + snprintf(ring_name, ODP_POOL_NAME_LEN, + "pool_ring_%d", i); + ring_shm_size = sizeof(pool_ring_t) + + sizeof(pool->ring->buf[0]) * ring_size; pool->ring_shm = odp_shm_reserve(ring_name, - sizeof(pool_ring_t), + ring_shm_size, ODP_CACHE_LINE_SIZE, 0); if (odp_unlikely(pool->ring_shm == ODP_SHM_INVALID)) { ODP_ERR("Unable to alloc pool ring %d\n", i); @@ -395,7 +399,12 @@ static odp_pool_t pool_create(const char *name, odp_pool_param_t *params, if (uarea_size) uarea_size = ROUNDUP_CACHE_LINE(uarea_size); - pool = reserve_pool(); + if (num <= RING_SIZE_MIN) + ring_size = RING_SIZE_MIN; + else + ring_size = ROUNDUP_POWER2_U32(num); + + pool = reserve_pool(ring_size); if (pool == NULL) { ODP_ERR("No more free pools"); @@ -431,11 +440,6 @@ static odp_pool_t pool_create(const char *name, odp_pool_param_t *params, FIRST_HP_SIZE - 1) / FIRST_HP_SIZE); } - if (num <= RING_SIZE_MIN) - ring_size = RING_SIZE_MIN; - else - ring_size = ROUNDUP_POWER2_U32(num); - pool->ring_mask = ring_size - 1; pool->num = num; pool->align = align; @@ -506,11 +510,6 @@ static int check_params(odp_pool_param_t *params) switch (params->type) { case ODP_POOL_BUFFER: - if (params->buf.num > capa.buf.max_num) { - printf("buf.num too large %u\n", params->buf.num); - return -1; - } - if (params->buf.size > capa.buf.max_size) { printf("buf.size too large %u\n", params->buf.size); return -1; @@ -550,10 +549,6 @@ static int check_params(odp_pool_param_t *params) break; case ODP_POOL_TIMEOUT: - if (params->tmo.num > capa.tmo.max_num) { - printf("tmo.num too large %u\n", params->tmo.num); - return -1; - } break; default: @@ -663,12 +658,12 @@ static int generic_pool_capability(odp_pool_capability_t *capa) capa->buf.max_pools = ODP_CONFIG_POOLS; capa->buf.max_align = ODP_CONFIG_BUFFER_ALIGN_MAX; capa->buf.max_size = MAX_SIZE; - capa->buf.max_num = CONFIG_POOL_MAX_NUM; + capa->buf.max_num = 0; /* Packet pools */ capa->pkt.max_pools = ODP_CONFIG_POOLS; capa->pkt.max_len = CONFIG_PACKET_MAX_LEN; - capa->pkt.max_num = CONFIG_POOL_MAX_NUM; + capa->pkt.max_num = 0; capa->pkt.min_headroom = CONFIG_PACKET_HEADROOM; capa->pkt.max_headroom = CONFIG_PACKET_HEADROOM; capa->pkt.min_tailroom = CONFIG_PACKET_TAILROOM; @@ -679,7 +674,7 @@ static int generic_pool_capability(odp_pool_capability_t *capa) /* Timeout pools */ capa->tmo.max_pools = ODP_CONFIG_POOLS; - capa->tmo.max_num = CONFIG_POOL_MAX_NUM; + capa->tmo.max_num = 0; return 0; } ----------------------------------------------------------------------- Summary of changes: .../linux-dpdk/include/odp/api/plat/buffer_types.h | 2 +- .../linux-dpdk/include/odp/api/plat/event_types.h | 2 +- .../linux-dpdk/include/odp/api/plat/timer_types.h | 2 +- platform/linux-dpdk/include/odp_config_internal.h | 5 - platform/linux-dpdk/odp_crypto.c | 107 ++++++++++++--------- platform/linux-dpdk/pktio/dpdk.c | 5 +- platform/linux-dpdk/pool/dpdk.c | 21 +--- platform/linux-dpdk/test/Makefile.am | 2 - .../test/validation/api/pktio/pktio_run.sh | 2 +- .../linux-generic/include/odp_config_internal.h | 5 - platform/linux-generic/include/odp_pool_internal.h | 2 +- platform/linux-generic/pool/generic.c | 37 +++---- platform/linux-generic/test/wrapper-script.sh | 3 + test/Makefile.inc | 2 + test/performance/Makefile.am | 2 +- 15 files changed, 97 insertions(+), 102 deletions(-) create mode 100755 platform/linux-generic/test/wrapper-script.sh hooks/post-receive --

8 years, 3 months

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

git-lng-odp