git-lng-odp

git-lng-odp@lists.linaro.org

1 participants
1239 discussions

[COMMIT] branch master updated. v1.19.0.1_tigermoth-17-g40699694

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 40699694b24cceb86ed441308309393de84c3478 (commit) from 215069d156f3612ff9e140a7e47232047c6870e6 (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 40699694b24cceb86ed441308309393de84c3478 Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Fri May 18 13:43:12 2018 +0300 codecov: disable check by patch Inside PRs there is check for code coverage for patch lines. There is no big reason for that check due to patch also can only remove lines. Only complete project has to be checked for code coverage. Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> diff --git a/.codecov.yml b/.codecov.yml index 327f6549..1e50776b 100644 --- a/.codecov.yml +++ b/.codecov.yml @@ -14,9 +14,7 @@ coverage: threshold: 5% patch: default: - enabled: yes - target: 70% - threshold: 5% + enabled: no changes: no parsers: ----------------------------------------------------------------------- Summary of changes: .codecov.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) hooks/post-receive --

8 years, 3 months

[COMMIT] branch master updated. v1.19.0.1_tigermoth-16-g215069d1

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 215069d156f3612ff9e140a7e47232047c6870e6 (commit) via a459233d0ac535d67e3141e21dee3e805c4e906f (commit) via 0e81876e6119fd76282f3de4bb50dad9e67ec6f2 (commit) from 713f9d5dee94b6eb81cdbbb929bf875f414d339c (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 215069d156f3612ff9e140a7e47232047c6870e6 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Thu May 17 16:14:03 2018 +0300 test: sched_pktio: add timeout statistics Record number of timeouts received. Timers are mostly reset when packets are received. So, timeout rate is low when packets are flowing. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/performance/odp_sched_pktio.c b/test/performance/odp_sched_pktio.c index 18fcc20a..d81994cd 100644 --- a/test/performance/odp_sched_pktio.c +++ b/test/performance/odp_sched_pktio.c @@ -45,6 +45,7 @@ typedef struct { typedef struct ODP_ALIGNED_CACHE { uint64_t rx_pkt; uint64_t tx_pkt; + uint64_t tmo; } worker_stat_t; typedef struct queue_context_t { @@ -289,6 +290,9 @@ static int worker_thread_timers(void *arg) queue_context->dst_pktio, queue_context->dst_queue, num_pkt, tmos); + if (odp_unlikely(test_global->opt.collect_stat && tmos)) + test_global->worker_stat[worker_id].tmo += tmos; + if (odp_unlikely(num_pkt == 0)) continue; @@ -527,37 +531,41 @@ static void print_config(test_global_t *test_global) static void print_stat(test_global_t *test_global, uint64_t nsec) { int i; - uint64_t rx, tx, drop; + uint64_t rx, tx, drop, tmo; uint64_t rx_sum = 0; uint64_t tx_sum = 0; + uint64_t tmo_sum = 0; double sec = 0.0; printf("\nTest statistics\n"); - printf(" worker rx_pkt tx_pkt dropped\n"); + printf(" worker rx_pkt tx_pkt dropped tmo\n"); for (i = 0; i < test_global->opt.num_worker; i++) { rx = test_global->worker_stat[i].rx_pkt; tx = test_global->worker_stat[i].tx_pkt; + tmo = test_global->worker_stat[i].tmo; rx_sum += rx; tx_sum += tx; + tmo_sum += tmo; - printf(" %6i %16" PRIu64 " %16" PRIu64 " %16" PRIu64 "\n", - i, rx, tx, rx - tx); + printf(" %6i %16" PRIu64 " %16" PRIu64 " %16" PRIu64 " %16" + PRIu64 "\n", i, rx, tx, rx - tx, tmo); } test_global->rx_pkt_sum = rx_sum; test_global->tx_pkt_sum = tx_sum; drop = rx_sum - tx_sum; - printf(" --------------------------------------------------\n"); - printf(" total %16" PRIu64 " %16" PRIu64 " %16" PRIu64 "\n\n", - rx_sum, tx_sum, drop); + printf(" -------------------------------------------------------------------\n"); + printf(" total %16" PRIu64 " %16" PRIu64 " %16" PRIu64 " %16" + PRIu64 "\n\n", rx_sum, tx_sum, drop, tmo_sum); sec = nsec / 1000000000.0; printf(" Total test time: %.2f sec\n", sec); printf(" Rx packet rate: %.2f pps\n", rx_sum / sec); printf(" Tx packet rate: %.2f pps\n", tx_sum / sec); - printf(" Drop rate: %.2f pps\n\n", drop / sec); + printf(" Drop rate: %.2f pps\n", drop / sec); + printf(" Timeout rate: %.2f per sec\n\n", tmo_sum / sec); } static int open_pktios(test_global_t *test_global) commit a459233d0ac535d67e3141e21dee3e805c4e906f Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Thu May 17 11:38:36 2018 +0300 test: sched_pktio: timer reset return codes Timer reset may fail since timer has been expired or it's about to expire. Return code ODP_TIMER_NOEVENT indicates this. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/performance/odp_sched_pktio.c b/test/performance/odp_sched_pktio.c index 8fa4cbb2..18fcc20a 100644 --- a/test/performance/odp_sched_pktio.c +++ b/test/performance/odp_sched_pktio.c @@ -246,8 +246,11 @@ static int worker_thread_timers(void *arg) ret = odp_timer_set_rel(timer, tick, &ev[i]); if (odp_unlikely(ret != ODP_TIMER_SUCCESS)) { - /* Should never happen */ - printf("Expired timer reset failed\n"); + /* Should never happen. Timeout event + * has been received, timer should be + * ready to be set again. */ + printf("Expired timer reset failed " + "%i\n", ret); odp_event_free(ev[i]); } @@ -265,11 +268,12 @@ static int worker_thread_timers(void *arg) ret = odp_timer_set_rel(timer, tick, NULL); if (odp_unlikely(ret != ODP_TIMER_SUCCESS && - ret != ODP_TIMER_TOOEARLY)) { - /* Should never happen. Reset should either - * succeed or be too close to timer expiration - * in which case timeout event will be received - * soon. */ + ret != ODP_TIMER_NOEVENT)) { + /* Tick period is too short or long. Normally, + * reset either succeeds or fails due to timer + * expiration, in which case timeout event will + * be received soon and reset will be done + * then. */ printf("Timer reset failed %i\n", ret); } } commit 0e81876e6119fd76282f3de4bb50dad9e67ec6f2 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Wed May 16 13:58:20 2018 +0300 test: sched_pktio: don't call pktout_send with 0 packets When only timouts are received from the scheduler, avoid odp_pktout_send() call with 0 packets. Rename variable to num_pkt to highlight difference between event count and packet count. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/performance/odp_sched_pktio.c b/test/performance/odp_sched_pktio.c index 109ae87e..8fa4cbb2 100644 --- a/test/performance/odp_sched_pktio.c +++ b/test/performance/odp_sched_pktio.c @@ -127,7 +127,7 @@ static inline void fill_eth_addr(odp_packet_t pkt[], int num, static int worker_thread(void *arg) { odp_event_t ev[BURST_SIZE]; - int num, sent, drop, out; + int num_pkt, sent, drop, out; odp_pktout_queue_t pktout; odp_queue_t queue; queue_context_t *queue_context; @@ -144,8 +144,8 @@ static int worker_thread(void *arg) while (1) { odp_packet_t pkt[BURST_SIZE]; - num = odp_schedule_multi(&queue, ODP_SCHED_NO_WAIT, - ev, BURST_SIZE); + num_pkt = odp_schedule_multi(&queue, ODP_SCHED_NO_WAIT, + ev, BURST_SIZE); polls++; @@ -155,7 +155,7 @@ static int worker_thread(void *arg) break; } - if (num <= 0) + if (num_pkt <= 0) continue; queue_context = odp_queue_context(queue); @@ -166,27 +166,27 @@ static int worker_thread(void *arg) queue_context->src_pktio, queue_context->src_queue, queue_context->dst_pktio, - queue_context->dst_queue, num); + queue_context->dst_queue, num_pkt); - odp_packet_from_event_multi(pkt, ev, num); + odp_packet_from_event_multi(pkt, ev, num_pkt); pktout = queue_context->dst_pktout; out = queue_context->dst_pktio; - fill_eth_addr(pkt, num, test_global, out); + fill_eth_addr(pkt, num_pkt, test_global, out); - sent = odp_pktout_send(pktout, pkt, num); + sent = odp_pktout_send(pktout, pkt, num_pkt); if (odp_unlikely(sent < 0)) sent = 0; - drop = num - sent; + drop = num_pkt - sent; if (odp_unlikely(drop)) odp_packet_free_multi(&pkt[sent], drop); if (odp_unlikely(test_global->opt.collect_stat)) { - test_global->worker_stat[worker_id].rx_pkt += num; + test_global->worker_stat[worker_id].rx_pkt += num_pkt; test_global->worker_stat[worker_id].tx_pkt += sent; } } @@ -199,7 +199,7 @@ static int worker_thread(void *arg) static int worker_thread_timers(void *arg) { odp_event_t ev[BURST_SIZE]; - int num, sent, drop, out, tmos, i, src_pktio, src_queue; + int num, num_pkt, sent, drop, out, tmos, i, src_pktio, src_queue; odp_pktout_queue_t pktout; odp_queue_t queue; queue_context_t *queue_context; @@ -274,7 +274,7 @@ static int worker_thread_timers(void *arg) } } - num = num - tmos; + num_pkt = num - tmos; if (DEBUG_PRINT) printf("worker %i: [%i/%i] -> [%i/%i], %i packets " @@ -283,25 +283,28 @@ static int worker_thread_timers(void *arg) queue_context->src_pktio, queue_context->src_queue, queue_context->dst_pktio, - queue_context->dst_queue, num, tmos); + queue_context->dst_queue, num_pkt, tmos); + + if (odp_unlikely(num_pkt == 0)) + continue; pktout = queue_context->dst_pktout; out = queue_context->dst_pktio; - fill_eth_addr(pkt, num, test_global, out); + fill_eth_addr(pkt, num_pkt, test_global, out); - sent = odp_pktout_send(pktout, pkt, num); + sent = odp_pktout_send(pktout, pkt, num_pkt); if (odp_unlikely(sent < 0)) sent = 0; - drop = num - sent; + drop = num_pkt - sent; if (odp_unlikely(drop)) odp_packet_free_multi(&pkt[sent], drop); if (odp_unlikely(test_global->opt.collect_stat)) { - test_global->worker_stat[worker_id].rx_pkt += num; + test_global->worker_stat[worker_id].rx_pkt += num_pkt; test_global->worker_stat[worker_id].tx_pkt += sent; } } ----------------------------------------------------------------------- Summary of changes: test/performance/odp_sched_pktio.c | 79 +++++++++++++++++++++++--------------- 1 file changed, 47 insertions(+), 32 deletions(-) hooks/post-receive --

8 years, 3 months

[COMMIT] branch master updated. v1.19.0.1_tigermoth-13-g713f9d5d

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 713f9d5dee94b6eb81cdbbb929bf875f414d339c (commit) via 0034b0c0c63194bd7aa227364b381d6b049631dc (commit) via 933a59910b2b95f579dbb11729192ccfcc26bcd7 (commit) via 894b80ee113440037b7899459eeb1c0f5c14b124 (commit) from 0ee8255c2555ed68721ea5e7679f26a2e53bd8b8 (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 713f9d5dee94b6eb81cdbbb929bf875f414d339c Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Sat Jan 13 05:37:11 2018 +0300 linux-gen: pktio: loop: support checksum parsing Add capability bits referencing support for IPv4 and UDP checksum validation for loop pktio device. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(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/loop.c b/platform/linux-generic/pktio/loop.c index d75102dc..f9faba5c 100644 --- a/platform/linux-generic/pktio/loop.c +++ b/platform/linux-generic/pktio/loop.c @@ -357,6 +357,9 @@ static int loopback_init_capability(pktio_entry_t *pktio_entry) odp_pktio_config_init(&capa->config); capa->config.pktin.bit.ts_all = 1; capa->config.pktin.bit.ts_ptp = 1; + capa->config.pktin.bit.ipv4_chksum = 1; + capa->config.pktin.bit.tcp_chksum = 1; + capa->config.pktin.bit.udp_chksum = 1; capa->config.pktout.bit.ipv4_chksum = 1; capa->config.pktout.bit.tcp_chksum = 1; capa->config.pktout.bit.udp_chksum = 1; commit 0034b0c0c63194bd7aa227364b381d6b049631dc Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Sat Jan 13 05:36:28 2018 +0300 linux-gen: packet: check TCP/UDP checksums Add code to enable checking of TCP and UDP checksums. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(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/api/plat/packet_inline_types.h b/platform/linux-generic/include/odp/api/plat/packet_inline_types.h index 4b88d351..9a285fe4 100644 --- a/platform/linux-generic/include/odp/api/plat/packet_inline_types.h +++ b/platform/linux-generic/include/odp/api/plat/packet_inline_types.h @@ -98,6 +98,7 @@ typedef union { uint64_t l3_chksum_done:1; /* L3 checksum validation done */ uint64_t l4_chksum_done:1; /* L4 checksum validation done */ uint64_t ipsec_udp:1; /* UDP-encapsulated IPsec packet */ + uint64_t udp_chksum_zero:1; /* UDP header had 0 as chksum */ }; } _odp_packet_input_flags_t; diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index 77e00fce..50dbdc45 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -1999,6 +1999,22 @@ static uint32_t packet_sum16_32(odp_packet_hdr_t *pkt_hdr, return sum; } +static uint16_t packet_sum_ones_comp16(odp_packet_hdr_t *pkt_hdr, + uint32_t offset, + uint32_t len, + uint32_t l4_part_sum) +{ + uint32_t sum = l4_part_sum; + + sum += packet_sum16_32(pkt_hdr, offset, len); + + /* Not more than two additions */ + sum = (sum & 0xffff) + (sum >> 16); + sum = (sum & 0xffff) + (sum >> 16); + + return sum; +} + /** Parser helper function for Ethernet packets */ static inline uint16_t parse_eth(packet_parser_t *prs, const uint8_t **parseptr, uint32_t *offset, uint32_t frame_len) @@ -2085,7 +2101,8 @@ error: */ static inline uint8_t parse_ipv4(packet_parser_t *prs, const uint8_t **parseptr, uint32_t *offset, uint32_t frame_len, - odp_proto_chksums_t chksums) + odp_proto_chksums_t chksums, + uint32_t *l4_part_sum) { const _odp_ipv4hdr_t *ipv4 = (const _odp_ipv4hdr_t *)*parseptr; uint32_t dstaddr = _odp_be_to_cpu_32(ipv4->dst_addr); @@ -2113,6 +2130,10 @@ static inline uint8_t parse_ipv4(packet_parser_t *prs, const uint8_t **parseptr, *offset += ihl * 4; *parseptr += ihl * 4; + if (chksums.chksum.udp || chksums.chksum.tcp) + *l4_part_sum = segment_sum16_32((const uint8_t *)&ipv4->src_addr, + 2 * _ODP_IPV4ADDR_LEN, 0); + if (odp_unlikely(ihl > _ODP_IPV4HDR_IHL_MIN)) prs->input_flags.ipopt = 1; @@ -2139,7 +2160,9 @@ static inline uint8_t parse_ipv4(packet_parser_t *prs, const uint8_t **parseptr, */ static inline uint8_t parse_ipv6(packet_parser_t *prs, const uint8_t **parseptr, uint32_t *offset, uint32_t frame_len, - uint32_t seg_len) + uint32_t seg_len, + odp_proto_chksums_t chksums, + uint32_t *l4_part_sum) { const _odp_ipv6hdr_t *ipv6 = (const _odp_ipv6hdr_t *)*parseptr; const _odp_ipv6hdr_ext_t *ipv6ext; @@ -2162,6 +2185,10 @@ static inline uint8_t parse_ipv6(packet_parser_t *prs, const uint8_t **parseptr, *offset += sizeof(_odp_ipv6hdr_t); *parseptr += sizeof(_odp_ipv6hdr_t); + if (chksums.chksum.udp || chksums.chksum.tcp) + *l4_part_sum = segment_sum16_32((const uint8_t *)&ipv6->src_addr, + 2 * _ODP_IPV6ADDR_LEN, 0); + /* Skip past any IPv6 extension headers */ if (ipv6->next_hdr == _ODP_IPPROTO_HOPOPTS || ipv6->next_hdr == _ODP_IPPROTO_ROUTE) { @@ -2200,7 +2227,10 @@ static inline uint8_t parse_ipv6(packet_parser_t *prs, const uint8_t **parseptr, /** * Parser helper function for TCP */ -static inline void parse_tcp(packet_parser_t *prs, const uint8_t **parseptr) +static inline void parse_tcp(packet_parser_t *prs, const uint8_t **parseptr, + uint16_t tcp_len, + odp_proto_chksums_t chksums, + uint32_t *l4_part_sum) { const _odp_tcphdr_t *tcp = (const _odp_tcphdr_t *)*parseptr; uint32_t len = tcp->hl * 4; @@ -2208,20 +2238,51 @@ static inline void parse_tcp(packet_parser_t *prs, const uint8_t **parseptr) if (odp_unlikely(tcp->hl < sizeof(_odp_tcphdr_t) / sizeof(uint32_t))) prs->flags.tcp_err = 1; + if (chksums.chksum.tcp && + !prs->input_flags.ipfrag) { + *l4_part_sum += odp_cpu_to_be_16(tcp_len); +#if ODP_BYTE_ORDER == ODP_BIG_ENDIAN + *l4_part_sum += _ODP_IPPROTO_TCP; +#else + *l4_part_sum += _ODP_IPPROTO_TCP << 8; +#endif + } + *parseptr += len; } /** * Parser helper function for UDP */ -static inline void parse_udp(packet_parser_t *prs, const uint8_t **parseptr) +static inline void parse_udp(packet_parser_t *prs, const uint8_t **parseptr, + odp_proto_chksums_t chksums, + uint32_t *l4_part_sum) { const _odp_udphdr_t *udp = (const _odp_udphdr_t *)*parseptr; uint32_t udplen = _odp_be_to_cpu_16(udp->length); uint16_t ipsec_port = _odp_cpu_to_be_16(_ODP_UDP_IPSEC_PORT); - if (odp_unlikely(udplen < sizeof(_odp_udphdr_t))) + if (odp_unlikely(udplen < sizeof(_odp_udphdr_t))) { prs->flags.udp_err = 1; + return; + } + + if (chksums.chksum.udp && + !prs->input_flags.ipfrag) { + if (udp->chksum == 0) { + prs->input_flags.l4_chksum_done = 1; + prs->flags.l4_chksum_err = + (prs->input_flags.ipv4 != 1); + } else { + *l4_part_sum += udp->length; +#if ODP_BYTE_ORDER == ODP_BIG_ENDIAN + *l4_part_sum += _ODP_IPPROTO_UDP; +#else + *l4_part_sum += _ODP_IPPROTO_UDP << 8; +#endif + } + prs->input_flags.udp_chksum_zero = (udp->chksum == 0); + } if (odp_unlikely(ipsec_port == udp->dst_port && udplen > 4)) { uint32_t val; @@ -2241,7 +2302,8 @@ int packet_parse_common_l3_l4(packet_parser_t *prs, const uint8_t *parseptr, uint32_t offset, uint32_t frame_len, uint32_t seg_len, int layer, uint16_t ethtype, - odp_proto_chksums_t chksums) + odp_proto_chksums_t chksums, + uint32_t *l4_part_sum) { uint8_t ip_proto; @@ -2258,14 +2320,14 @@ int packet_parse_common_l3_l4(packet_parser_t *prs, const uint8_t *parseptr, case _ODP_ETHTYPE_IPV4: prs->input_flags.ipv4 = 1; ip_proto = parse_ipv4(prs, &parseptr, &offset, frame_len, - chksums); + chksums, l4_part_sum); prs->l4_offset = offset; break; case _ODP_ETHTYPE_IPV6: prs->input_flags.ipv6 = 1; ip_proto = parse_ipv6(prs, &parseptr, &offset, frame_len, - seg_len); + seg_len, chksums, l4_part_sum); prs->l4_offset = offset; break; @@ -2302,14 +2364,15 @@ int packet_parse_common_l3_l4(packet_parser_t *prs, const uint8_t *parseptr, if (odp_unlikely(offset + _ODP_TCPHDR_LEN > seg_len)) return -1; prs->input_flags.tcp = 1; - parse_tcp(prs, &parseptr); + parse_tcp(prs, &parseptr, frame_len - prs->l4_offset, chksums, + l4_part_sum); break; case _ODP_IPPROTO_UDP: if (odp_unlikely(offset + _ODP_UDPHDR_LEN > seg_len)) return -1; prs->input_flags.udp = 1; - parse_udp(prs, &parseptr); + parse_udp(prs, &parseptr, chksums, l4_part_sum); break; case _ODP_IPPROTO_AH: @@ -2351,6 +2414,7 @@ int packet_parse_common(packet_parser_t *prs, const uint8_t *ptr, uint32_t offset; uint16_t ethtype; const uint8_t *parseptr; + uint32_t l4_part_sum; parseptr = ptr; offset = 0; @@ -2364,7 +2428,8 @@ int packet_parse_common(packet_parser_t *prs, const uint8_t *ptr, ethtype = parse_eth(prs, &parseptr, &offset, frame_len); return packet_parse_common_l3_l4(prs, parseptr, offset, frame_len, - seg_len, layer, ethtype, chksums); + seg_len, layer, ethtype, chksums, + &l4_part_sum); } static inline int packet_ipv4_chksum(odp_packet_t pkt, @@ -2520,6 +2585,49 @@ int _odp_packet_udp_chksum_insert(odp_packet_t pkt) return _odp_packet_tcp_udp_chksum_insert(pkt, _ODP_IPPROTO_UDP); } +static int packet_l4_chksum(odp_packet_hdr_t *pkt_hdr, + odp_proto_chksums_t chksums, + uint32_t l4_part_sum) +{ + /* UDP chksum == 0 case is covered in parse_udp() */ + if (chksums.chksum.udp && + pkt_hdr->p.input_flags.udp && + !pkt_hdr->p.input_flags.ipfrag && + !pkt_hdr->p.input_flags.udp_chksum_zero) { + uint16_t sum = ~packet_sum_ones_comp16(pkt_hdr, + pkt_hdr->p.l4_offset, + pkt_hdr->frame_len - + pkt_hdr->p.l4_offset, + l4_part_sum); + + pkt_hdr->p.input_flags.l4_chksum_done = 1; + if (sum != 0) { + pkt_hdr->p.flags.l4_chksum_err = 1; + pkt_hdr->p.flags.udp_err = 1; + ODP_DBG("UDP chksum fail (%x)!\n", sum); + } + } + + if (chksums.chksum.tcp && + pkt_hdr->p.input_flags.tcp && + !pkt_hdr->p.input_flags.ipfrag) { + uint16_t sum = ~packet_sum_ones_comp16(pkt_hdr, + pkt_hdr->p.l4_offset, + pkt_hdr->frame_len - + pkt_hdr->p.l4_offset, + l4_part_sum); + + pkt_hdr->p.input_flags.l4_chksum_done = 1; + if (sum != 0) { + pkt_hdr->p.flags.l4_chksum_err = 1; + pkt_hdr->p.flags.tcp_err = 1; + ODP_DBG("TCP chksum fail (%x)!\n", sum); + } + } + + return pkt_hdr->p.flags.all_flags != 0; +} + /** * Simple packet parser */ @@ -2528,23 +2636,46 @@ int packet_parse_layer(odp_packet_hdr_t *pkt_hdr, odp_proto_chksums_t chksums) { uint32_t seg_len = packet_first_seg_len(pkt_hdr); - void *base = packet_data(pkt_hdr); + const uint8_t *base = packet_data(pkt_hdr); + uint32_t offset = 0; + uint16_t ethtype; + uint32_t l4_part_sum = 0; + int rc; - return packet_parse_common(&pkt_hdr->p, base, pkt_hdr->frame_len, - seg_len, layer, chksums); + if (odp_unlikely(layer == ODP_PROTO_LAYER_NONE)) + return 0; + + /* Assume valid L2 header, no CRC/FCS check in SW */ + pkt_hdr->p.l2_offset = offset; + + ethtype = parse_eth(&pkt_hdr->p, &base, &offset, pkt_hdr->frame_len); + + rc = packet_parse_common_l3_l4(&pkt_hdr->p, base, offset, + pkt_hdr->frame_len, + seg_len, layer, ethtype, chksums, + &l4_part_sum); + + if (rc != 0) + return rc; + + if (layer >= ODP_PKTIO_PARSER_LAYER_L4) + return packet_l4_chksum(pkt_hdr, chksums, l4_part_sum); + else + return 0; } int odp_packet_parse(odp_packet_t pkt, uint32_t offset, const odp_packet_parse_param_t *param) { odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); - void *data; + const uint8_t *data; uint32_t seg_len; uint32_t packet_len = pkt_hdr->frame_len; odp_proto_t proto = param->proto; odp_proto_layer_t layer = param->last_layer; int ret; uint16_t ethtype; + uint32_t l4_part_sum = 0; if (proto == ODP_PROTO_NONE || layer == ODP_PROTO_LAYER_NONE) return -1; @@ -2557,24 +2688,29 @@ int odp_packet_parse(odp_packet_t pkt, uint32_t offset, packet_parse_reset(pkt_hdr); if (proto == ODP_PROTO_ETH) { - ret = packet_parse_common(&pkt_hdr->p, data, packet_len, - seg_len, layer, - param->chksums); - - if (ret) - return -1; + /* Assume valid L2 header, no CRC/FCS check in SW */ + pkt_hdr->p.l2_offset = offset; + + ethtype = parse_eth(&pkt_hdr->p, &data, &offset, packet_len); + } else if (proto == ODP_PROTO_IPV4) { + ethtype = _ODP_ETHTYPE_IPV4; + } else if (proto == ODP_PROTO_IPV6) { + ethtype = _ODP_ETHTYPE_IPV6; } else { - if (proto == ODP_PROTO_IPV4) - ethtype = _ODP_ETHTYPE_IPV4; - else - ethtype = _ODP_ETHTYPE_IPV6; + ethtype = 0; /* Invalid */ + } - ret = packet_parse_common_l3_l4(&pkt_hdr->p, data, offset, - packet_len, seg_len, - layer, ethtype, - param->chksums); + ret = packet_parse_common_l3_l4(&pkt_hdr->p, data, offset, + packet_len, seg_len, + layer, ethtype, + param->chksums, + &l4_part_sum); + if (ret) + return -1; + if (layer >= ODP_PROTO_LAYER_L4) { + ret = packet_l4_chksum(pkt_hdr, param->chksums, l4_part_sum); if (ret) return -1; } commit 933a59910b2b95f579dbb11729192ccfcc26bcd7 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Sat Jan 13 05:23:55 2018 +0300 linux-gen: packet: add IPv4 checksum validation If configured, check IPv4 header checksum. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(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_internal.h b/platform/linux-generic/include/odp_packet_internal.h index 933dd4be..951903dd 100644 --- a/platform/linux-generic/include/odp_packet_internal.h +++ b/platform/linux-generic/include/odp_packet_internal.h @@ -252,7 +252,8 @@ int packet_alloc_multi(odp_pool_t pool_hdl, uint32_t len, /* Perform packet parse up to a given protocol layer */ int packet_parse_layer(odp_packet_hdr_t *pkt_hdr, - odp_proto_layer_t layer); + odp_proto_layer_t layer, + odp_proto_chksums_t chksums); /* Reset parser metadata for a new parse */ void packet_parse_reset(odp_packet_hdr_t *pkt_hdr); @@ -293,7 +294,8 @@ static inline void packet_set_ts(odp_packet_hdr_t *pkt_hdr, odp_time_t *ts) } int packet_parse_common(packet_parser_t *pkt_hdr, const uint8_t *ptr, - uint32_t pkt_len, uint32_t seg_len, int layer); + uint32_t pkt_len, uint32_t seg_len, int layer, + odp_proto_chksums_t chksums); int _odp_cls_parse(odp_packet_hdr_t *pkt_hdr, const uint8_t *parseptr); diff --git a/platform/linux-generic/odp_classification.c b/platform/linux-generic/odp_classification.c index 46fcf67e..ae4eb585 100644 --- a/platform/linux-generic/odp_classification.c +++ b/platform/linux-generic/odp_classification.c @@ -998,7 +998,8 @@ int cls_classify_packet(pktio_entry_t *entry, const uint8_t *base, packet_set_len(pkt_hdr, pkt_len); packet_parse_common(&pkt_hdr->p, base, pkt_len, seg_len, - ODP_PROTO_LAYER_ALL); + ODP_PROTO_LAYER_ALL, + entry->s.in_chksums); } cos = cls_select_cos(entry, base, pkt_hdr); diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index e0635444..77e00fce 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -2084,7 +2084,8 @@ error: * Parser helper function for IPv4 */ static inline uint8_t parse_ipv4(packet_parser_t *prs, const uint8_t **parseptr, - uint32_t *offset, uint32_t frame_len) + uint32_t *offset, uint32_t frame_len, + odp_proto_chksums_t chksums) { const _odp_ipv4hdr_t *ipv4 = (const _odp_ipv4hdr_t *)*parseptr; uint32_t dstaddr = _odp_be_to_cpu_32(ipv4->dst_addr); @@ -2100,6 +2101,15 @@ static inline uint8_t parse_ipv4(packet_parser_t *prs, const uint8_t **parseptr, return 0; } + if (chksums.chksum.ipv4) { + prs->input_flags.l3_chksum_done = 1; + if (odp_chksum_ones_comp16(ipv4, ihl * 4) != 0xffff) { + prs->flags.ip_err = 1; + prs->flags.l3_chksum_err = 1; + return 0; + } + } + *offset += ihl * 4; *parseptr += ihl * 4; @@ -2230,7 +2240,8 @@ static inline int packet_parse_common_l3_l4(packet_parser_t *prs, const uint8_t *parseptr, uint32_t offset, uint32_t frame_len, uint32_t seg_len, - int layer, uint16_t ethtype) + int layer, uint16_t ethtype, + odp_proto_chksums_t chksums) { uint8_t ip_proto; @@ -2246,7 +2257,8 @@ int packet_parse_common_l3_l4(packet_parser_t *prs, const uint8_t *parseptr, switch (ethtype) { case _ODP_ETHTYPE_IPV4: prs->input_flags.ipv4 = 1; - ip_proto = parse_ipv4(prs, &parseptr, &offset, frame_len); + ip_proto = parse_ipv4(prs, &parseptr, &offset, frame_len, + chksums); prs->l4_offset = offset; break; @@ -2334,7 +2346,7 @@ int packet_parse_common_l3_l4(packet_parser_t *prs, const uint8_t *parseptr, */ int packet_parse_common(packet_parser_t *prs, const uint8_t *ptr, uint32_t frame_len, uint32_t seg_len, - int layer) + int layer, odp_proto_chksums_t chksums) { uint32_t offset; uint16_t ethtype; @@ -2352,7 +2364,7 @@ int packet_parse_common(packet_parser_t *prs, const uint8_t *ptr, ethtype = parse_eth(prs, &parseptr, &offset, frame_len); return packet_parse_common_l3_l4(prs, parseptr, offset, frame_len, - seg_len, layer, ethtype); + seg_len, layer, ethtype, chksums); } static inline int packet_ipv4_chksum(odp_packet_t pkt, @@ -2512,13 +2524,14 @@ int _odp_packet_udp_chksum_insert(odp_packet_t pkt) * Simple packet parser */ int packet_parse_layer(odp_packet_hdr_t *pkt_hdr, - odp_proto_layer_t layer) + odp_proto_layer_t layer, + odp_proto_chksums_t chksums) { uint32_t seg_len = packet_first_seg_len(pkt_hdr); void *base = packet_data(pkt_hdr); return packet_parse_common(&pkt_hdr->p, base, pkt_hdr->frame_len, - seg_len, layer); + seg_len, layer, chksums); } int odp_packet_parse(odp_packet_t pkt, uint32_t offset, @@ -2545,7 +2558,8 @@ int odp_packet_parse(odp_packet_t pkt, uint32_t offset, if (proto == ODP_PROTO_ETH) { ret = packet_parse_common(&pkt_hdr->p, data, packet_len, - seg_len, layer); + seg_len, layer, + param->chksums); if (ret) return -1; @@ -2557,7 +2571,9 @@ int odp_packet_parse(odp_packet_t pkt, uint32_t offset, ret = packet_parse_common_l3_l4(&pkt_hdr->p, data, offset, packet_len, seg_len, - layer, ethtype); + layer, ethtype, + param->chksums); + if (ret) return -1; diff --git a/platform/linux-generic/pktio/loop.c b/platform/linux-generic/pktio/loop.c index 779e4c62..d75102dc 100644 --- a/platform/linux-generic/pktio/loop.c +++ b/platform/linux-generic/pktio/loop.c @@ -151,7 +151,8 @@ static int loopback_recv(pktio_entry_t *pktio_entry, int index ODP_UNUSED, } } else { packet_parse_layer(pkt_hdr, - pktio_entry->s.config.parser.layer); + pktio_entry->s.config.parser.layer, + pktio_entry->s.in_chksums); } packet_set_ts(pkt_hdr, ts); diff --git a/platform/linux-generic/pktio/netmap.c b/platform/linux-generic/pktio/netmap.c index 567bc9f9..1fb76d2a 100644 --- a/platform/linux-generic/pktio/netmap.c +++ b/platform/linux-generic/pktio/netmap.c @@ -724,7 +724,8 @@ static inline int netmap_pkt_to_odp(pktio_entry_t *pktio_entry, copy_packet_cls_metadata(&parsed_hdr, pkt_hdr); else packet_parse_layer(pkt_hdr, - pktio_entry->s.config.parser.layer); + pktio_entry->s.config.parser.layer, + pktio_entry->s.in_chksums); packet_set_ts(pkt_hdr, ts); } diff --git a/platform/linux-generic/pktio/pcap.c b/platform/linux-generic/pktio/pcap.c index 3df7f960..530a1600 100644 --- a/platform/linux-generic/pktio/pcap.c +++ b/platform/linux-generic/pktio/pcap.c @@ -256,7 +256,8 @@ static int pcapif_recv_pkt(pktio_entry_t *pktio_entry, int index ODP_UNUSED, } packet_parse_layer(pkt_hdr, - pktio_entry->s.config.parser.layer); + pktio_entry->s.config.parser.layer, + pktio_entry->s.in_chksums); pktio_entry->s.stats.in_octets += pkt_hdr->frame_len; packet_set_ts(pkt_hdr, ts); diff --git a/platform/linux-generic/pktio/socket.c b/platform/linux-generic/pktio/socket.c index 8b7200e6..d7753850 100644 --- a/platform/linux-generic/pktio/socket.c +++ b/platform/linux-generic/pktio/socket.c @@ -682,7 +682,8 @@ static int sock_mmsg_recv(pktio_entry_t *pktio_entry, int index ODP_UNUSED, if (!pktio_cls_enabled(pktio_entry)) packet_parse_layer(pkt_hdr, - pktio_entry->s.config.parser.layer); + pktio_entry->s.config.parser.layer, + pktio_entry->s.in_chksums); pkt_hdr->input = pktio_entry->s.handle; packet_set_ts(pkt_hdr, ts); diff --git a/platform/linux-generic/pktio/socket_mmap.c b/platform/linux-generic/pktio/socket_mmap.c index 847eb71a..1731e60d 100644 --- a/platform/linux-generic/pktio/socket_mmap.c +++ b/platform/linux-generic/pktio/socket_mmap.c @@ -259,7 +259,8 @@ static inline unsigned pkt_mmap_v2_rx(pktio_entry_t *pktio_entry, copy_packet_cls_metadata(&parsed_hdr, hdr); else packet_parse_layer(hdr, - pktio_entry->s.config.parser.layer); + pktio_entry->s.config.parser.layer, + pktio_entry->s.in_chksums); packet_set_ts(hdr, ts); diff --git a/platform/linux-generic/pktio/tap.c b/platform/linux-generic/pktio/tap.c index af766e0d..d2f5cea1 100644 --- a/platform/linux-generic/pktio/tap.c +++ b/platform/linux-generic/pktio/tap.c @@ -286,7 +286,8 @@ static odp_packet_t pack_odp_pkt(pktio_entry_t *pktio_entry, const void *data, copy_packet_cls_metadata(&parsed_hdr, pkt_hdr); else packet_parse_layer(pkt_hdr, - pktio_entry->s.config.parser.layer); + pktio_entry->s.config.parser.layer, + pktio_entry->s.in_chksums); packet_set_ts(pkt_hdr, ts); pkt_hdr->input = pktio_entry->s.handle; commit 894b80ee113440037b7899459eeb1c0f5c14b124 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Sat Jan 13 05:18:31 2018 +0300 linux-gen: pktio: introduce checksum settings Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(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 4be4b151..cf02476d 100644 --- a/platform/linux-generic/include/odp_packet_io_internal.h +++ b/platform/linux-generic/include/odp_packet_io_internal.h @@ -155,6 +155,7 @@ struct pktio_entry { odp_pktio_config_t config; /**< Device configuration */ classifier_t cls; /**< classifier linked with this pktio*/ odp_pktio_stats_t stats; /**< statistic counters for pktio */ + odp_proto_chksums_t in_chksums; /**< Checksums validation settings */ enum { STATS_SYSFS = 0, STATS_ETHTOOL, diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c index 7b211c45..1721cdec 100644 --- a/platform/linux-generic/odp_packet_io.c +++ b/platform/linux-generic/odp_packet_io.c @@ -456,6 +456,12 @@ int odp_pktio_config(odp_pktio_t hdl, const odp_pktio_config_t *config) entry->s.config = *config; + entry->s.in_chksums.all_chksum = 0; + entry->s.in_chksums.chksum.ipv4 = config->pktin.bit.ipv4_chksum; + entry->s.in_chksums.chksum.tcp = config->pktin.bit.tcp_chksum; + entry->s.in_chksums.chksum.udp = config->pktin.bit.udp_chksum; + entry->s.in_chksums.chksum.sctp = config->pktin.bit.sctp_chksum; + if (entry->s.ops->config) res = entry->s.ops->config(entry, config); ----------------------------------------------------------------------- Summary of changes: .../include/odp/api/plat/packet_inline_types.h | 1 + .../linux-generic/include/odp_packet_internal.h | 6 +- .../linux-generic/include/odp_packet_io_internal.h | 1 + platform/linux-generic/odp_classification.c | 3 +- platform/linux-generic/odp_packet.c | 210 ++++++++++++++++++--- platform/linux-generic/odp_packet_io.c | 6 + platform/linux-generic/pktio/loop.c | 6 +- platform/linux-generic/pktio/netmap.c | 3 +- platform/linux-generic/pktio/pcap.c | 3 +- platform/linux-generic/pktio/socket.c | 3 +- platform/linux-generic/pktio/socket_mmap.c | 3 +- platform/linux-generic/pktio/tap.c | 3 +- 12 files changed, 210 insertions(+), 38 deletions(-) hooks/post-receive --

8 years, 3 months

[COMMIT] branch master updated. v1.19.0.1_tigermoth-9-g0ee8255c

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 0ee8255c2555ed68721ea5e7679f26a2e53bd8b8 (commit) from ad3417a6fd2ba93616b937f9a2d8642eceeb0bf8 (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 0ee8255c2555ed68721ea5e7679f26a2e53bd8b8 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Mon May 14 13:10:01 2018 +0300 helper: thread: don't use getopt library Don't use getopt library calls for helper options. Getopt library reset is not portable in practice. Library interface includes global variables and different internal state variables depending on POSIX version. There's no need for helper to use getopt calls or set getopt global variables at all. It's much more simple (and portable) to remove helper options from argv[] and return new value for argc. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/example/classifier/odp_classifier.c b/example/classifier/odp_classifier.c index ddb934be..3afe7645 100644 --- a/example/classifier/odp_classifier.c +++ b/example/classifier/odp_classifier.c @@ -805,9 +805,7 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args) static const char *shortopts = "+c:t:i:p:m:t:h"; /* let helper collect its own arguments (e.g. --odph_proc) */ - odph_parse_options(argc, argv, shortopts, longopts); - - opterr = 0; /* do not issue errors on helper options */ + argc = odph_parse_options(argc, argv); while (1) { opt = getopt_long(argc, argv, shortopts, diff --git a/example/generator/odp_generator.c b/example/generator/odp_generator.c index 9b62d145..4392fe5e 100644 --- a/example/generator/odp_generator.c +++ b/example/generator/odp_generator.c @@ -1492,7 +1492,7 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args) static const char *shortopts = "+I:a:b:s:d:p:i:m:n:t:w:c:x:he:f:yr:z"; /* let helper collect its own arguments (e.g. --odph_proc) */ - odph_parse_options(argc, argv, shortopts, longopts); + argc = odph_parse_options(argc, argv); appl_args->mode = -1; /* Invalid, must be changed by parsing */ appl_args->number = -1; @@ -1506,8 +1506,6 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args) appl_args->csum = 0; appl_args->sched = 0; - opterr = 0; /* do not issue errors on helper options */ - while (1) { opt = getopt_long(argc, argv, shortopts, longopts, &long_index); if (opt == -1) diff --git a/example/ipsec/odp_ipsec.c b/example/ipsec/odp_ipsec.c index 9f7efcaa..05001a5e 100644 --- a/example/ipsec/odp_ipsec.c +++ b/example/ipsec/odp_ipsec.c @@ -1366,14 +1366,12 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args) static const char *shortopts = "+c:i:m:h:r:p:a:e:t:s:"; /* let helper collect its own arguments (e.g. --odph_proc) */ - odph_parse_options(argc, argv, shortopts, longopts); + argc = odph_parse_options(argc, argv); printf("\nParsing command line options\n"); appl_args->mode = 0; /* turn off async crypto API by default */ - opterr = 0; /* do not issue errors on helper options */ - while (!rc) { opt = getopt_long(argc, argv, shortopts, longopts, &long_index); diff --git a/example/ipsec_api/odp_ipsec.c b/example/ipsec_api/odp_ipsec.c index c428927d..8cd4caa9 100644 --- a/example/ipsec_api/odp_ipsec.c +++ b/example/ipsec_api/odp_ipsec.c @@ -1059,12 +1059,10 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args) static const char *shortopts = "+c:i:h:lm:r:p:a:e:t:s:"; /* let helper collect its own arguments (e.g. --odph_proc) */ - odph_parse_options(argc, argv, shortopts, longopts); + argc = odph_parse_options(argc, argv); printf("\nParsing command line options\n"); - opterr = 0; /* do not issue errors on helper options */ - while (!rc) { opt = getopt_long(argc, argv, shortopts, longopts, &long_index); diff --git a/example/l2fwd_simple/odp_l2fwd_simple.c b/example/l2fwd_simple/odp_l2fwd_simple.c index 36b76ee1..8fca7307 100644 --- a/example/l2fwd_simple/odp_l2fwd_simple.c +++ b/example/l2fwd_simple/odp_l2fwd_simple.c @@ -143,31 +143,15 @@ int main(int argc, char **argv) odph_odpthread_t thd[MAX_WORKERS]; odp_instance_t instance; odph_odpthread_params_t thr_params; - int opt; - int long_index; odph_ethaddr_t correct_src; uint32_t mtu1, mtu2; - static const struct option longopts[] = { {NULL, 0, NULL, 0} }; - static const char *shortopts = ""; - /* let helper collect its own arguments (e.g. --odph_proc) */ - odph_parse_options(argc, argv, shortopts, longopts); - - /* - * parse own options: currentely none, but this will move optind - * to the first non-option argument. (in case there where helprt args) - */ - opterr = 0; /* do not issue errors on helper options */ - while (1) { - opt = getopt_long(argc, argv, shortopts, longopts, &long_index); - if (-1 == opt) - break; /* No more options */ - } + argc = odph_parse_options(argc, argv); - if (argc != optind + 4 || - odph_eth_addr_parse(&global.dst, argv[optind + 2]) != 0 || - odph_eth_addr_parse(&global.src, argv[optind + 3]) != 0) { + if (argc != 5 || + odph_eth_addr_parse(&global.dst, argv[3]) != 0 || + odph_eth_addr_parse(&global.src, argv[4]) != 0) { printf("Usage: odp_l2fwd_simple eth0 eth1 01:02:03:04:05:06" " 07:08:09:0a:0b:0c\n"); printf("Where eth0 and eth1 are the used interfaces" @@ -201,10 +185,8 @@ int main(int argc, char **argv) exit(1); } - global.if0 = create_pktio(argv[optind], pool, &global.if0in, - &global.if0out); - global.if1 = create_pktio(argv[optind + 1], pool, &global.if1in, - &global.if1out); + global.if0 = create_pktio(argv[1], pool, &global.if0in, &global.if0out); + global.if1 = create_pktio(argv[2], pool, &global.if1in, &global.if1out); /* Do some operations to increase code coverage in tests */ if (odp_pktio_mac_addr(global.if0, &correct_src, sizeof(correct_src)) diff --git a/example/packet/odp_pktio.c b/example/packet/odp_pktio.c index caf82b7b..fcce92b1 100644 --- a/example/packet/odp_pktio.c +++ b/example/packet/odp_pktio.c @@ -570,13 +570,11 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args) static const char *shortopts = "+c:i:+m:t:h"; /* let helper collect its own arguments (e.g. --odph_proc) */ - odph_parse_options(argc, argv, shortopts, longopts); + argc = odph_parse_options(argc, argv); appl_args->mode = APPL_MODE_PKT_SCHED; appl_args->time = 0; /**< loop forever */ - opterr = 0; /* do not issue errors on helper options */ - while (1) { opt = getopt_long(argc, argv, shortopts, longopts, &long_index); diff --git a/example/switch/odp_switch.c b/example/switch/odp_switch.c index cc28eb6c..26fcbbcc 100644 --- a/example/switch/odp_switch.c +++ b/example/switch/odp_switch.c @@ -760,13 +760,11 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args) static const char *shortopts = "+c:+t:+a:i:h"; /* let helper collect its own arguments (e.g. --odph_proc) */ - odph_parse_options(argc, argv, shortopts, longopts); + argc = odph_parse_options(argc, argv); appl_args->time = 0; /* loop forever if time to run is 0 */ appl_args->accuracy = 10; /* get and print pps stats second */ - opterr = 0; /* do not issue errors on helper options */ - while (1) { opt = getopt_long(argc, argv, shortopts, longopts, &long_index); diff --git a/example/time/time_global_test.c b/example/time/time_global_test.c index a879745d..317f9a27 100644 --- a/example/time/time_global_test.c +++ b/example/time/time_global_test.c @@ -259,7 +259,7 @@ int main(int argc, char *argv[]) odph_odpthread_params_t thr_params; /* let helper collect its own arguments (e.g. --odph_proc) */ - odph_parse_options(argc, argv, NULL, NULL); + argc = odph_parse_options(argc, argv); printf("\nODP global time test starts\n"); diff --git a/example/timer/odp_timer_test.c b/example/timer/odp_timer_test.c index 1b0645a8..45eea792 100644 --- a/example/timer/odp_timer_test.c +++ b/example/timer/odp_timer_test.c @@ -275,7 +275,7 @@ static void parse_args(int argc, char *argv[], test_args_t *args) static const char *shortopts = "+c:r:m:x:p:t:h"; /* let helper collect its own arguments (e.g. --odph_proc) */ - odph_parse_options(argc, argv, shortopts, longopts); + argc = odph_parse_options(argc, argv); /* defaults */ odp_timer_capability(ODP_CLOCK_CPU, &timer_capa); @@ -289,8 +289,6 @@ static void parse_args(int argc, char *argv[], test_args_t *args) args->period_us = 1000000; args->tmo_count = 30; - opterr = 0; /* do not issue errors on helper options */ - while (1) { opt = getopt_long(argc, argv, shortopts, longopts, &long_index); diff --git a/helper/include/odp/helper/threads.h b/helper/include/odp/helper/threads.h index ed7d7f39..9d03c719 100644 --- a/helper/include/odp/helper/threads.h +++ b/helper/include/odp/helper/threads.h @@ -145,75 +145,20 @@ int odph_odpthread_setaffinity(const int cpu); */ int odph_odpthread_getaffinity(void); -/** - * Merge getopt options - * - * Given two sets of getopt options (each containing possibly both short - * options -a string- and long options -a option array-) this function - * return a single set (i.e. a string for short and an array for long) - * being the concatenation of the two given sets. - * Due to the fact that the size of these arrays is unknown at compilation - * time, this function actually mallocs the the resulting arrays. - * The fourth and fith parameters are actually pointers where these malloc'ed - * areas are returned. - * This means that the caller of this function has to free the two returned - * areas! - * - * @param shortopts1 first set of short options (a string) - * @param shortopts2 second set of short options (a string) - * @param longopts1 first set of long options (a getopt option array) - * @param longopts2 second set of long options (a getopt option array) - * @param shortopts a pointer where the address of the short options list - * (a string) is returned. It contains the concatenation of - * the two given short option strings. - * @param longopts a pointer where the address of the long options list - * (a getopt option array) is returned. - * It contains the concatenation of the two given long - * option arrays. - * if any of shortopts1, shortopts2, longopts1, longopts2 is NULL, the - * corresponding list as assumed to be empty. - * if any of shortopts, longopts is NULL, the corresponding malloc is not - * performed. - * - * @return On success: 0 : both shortopts and longopts are returned (assuming - * the given pointer where not null), possibly - * pointing to an empty string or an empty option array. - * On success, the caller is due to free these areas. - * On failure: -1: Nothing is malloc'ed. - */ -int odph_merge_getopt_options(const char *shortopts1, - const char *shortopts2, - const struct option *longopts1, - const struct option *longopts2, - char **shortopts, - struct option **longopts); - /** * Parse linux helper options * - * Parse the command line options. Pick up options meant for the helper itself. - * If the caller is also having a set of option to parse, it should include - * their description here (shortopts desribes the short options and longopts - * describes the long options, as for getopt_long()). - * This function will issue errors on unknown arguments, so callers failing - * to pass their own command line options description here will see their - * options rejected. - * (the caller wants to set opterr to zero when parsing its own stuff - * with getopts to avoid reacting on helper's options). - * - * @param argc argument count - * @param argv argument values - * @param caller_shortopts caller's set of short options (string). or NULL. - * @param caller_longopts caller's set of long options (getopt option array). - * or NULL. - * - * @return On success: 0 - * On failure: -1 failure occurs if a value passed for a helper - * option is invalid, or on meeting unknown options. + * Parse the command line options. Pick up (--odph_ prefixed) options meant for + * the helper itself. When helper options are found, those are removed from + * argv[] and remaining options are packed to the beginning of the array. + * + * @param argc Argument count + * @param argv Argument vector + * + * @return New argument count. Original argument count decremented by + * the number of removed helper options. */ -int odph_parse_options(int argc, char *argv[], - const char *caller_shortopts, - const struct option *caller_longopts); +int odph_parse_options(int argc, char *argv[]); /** * @} diff --git a/helper/test/odpthreads.c b/helper/test/odpthreads.c index aa61e635..ad48ec2d 100644 --- a/helper/test/odpthreads.c +++ b/helper/test/odpthreads.c @@ -73,7 +73,7 @@ int main(int argc, char *argv[]) char cpumaskstr[ODP_CPUMASK_STR_SIZE]; /* let helper collect its own arguments (e.g. --odph_proc) */ - odph_parse_options(argc, argv, NULL, NULL); + argc = odph_parse_options(argc, argv); if (odp_init_global(&odp_instance, NULL, NULL)) { ODPH_ERR("Error: ODP global init failed.\n"); diff --git a/helper/threads.c b/helper/threads.c index f9216c7e..86d6bf7b 100644 --- a/helper/threads.c +++ b/helper/threads.c @@ -330,129 +330,26 @@ int odph_odpthread_getaffinity(void) return -1; } -/* - * return the number of elements in an array of getopt options, excluding the - * terminating {0,0,0,0} - */ -static int get_getopt_options_length(const struct option *longopts) +int odph_parse_options(int argc, char *argv[]) { - int l = 0; - - if (!longopts) - return 0; - - while (longopts[l].name) - l++; - - return l; -} - -/* Merge getopt options */ -int odph_merge_getopt_options(const char *shortopts1, - const char *shortopts2, - const struct option *longopts1, - const struct option *longopts2, - char **shortopts, - struct option **longopts) -{ - int shortopts1_len; - int shortopts2_len; - int longopts1_len; - int longopts2_len; - int index; - int res_index = 0; - struct option termination = {0, 0, 0, 0}; - - /* merge short options: */ - if (shortopts) { - shortopts1_len = (shortopts1) ? strlen(shortopts1) : 0; - shortopts2_len = (shortopts2) ? strlen(shortopts2) : 0; - *shortopts = malloc(shortopts1_len + shortopts2_len + 1); - if (!*shortopts) - return -1; - - (*shortopts)[0] = 0; - - if (shortopts1) - strcpy((*shortopts), shortopts1); - if (shortopts2) - strcat((*shortopts), shortopts2); - } - - /* merge long options */ - if (!longopts) - return 0; - - longopts1_len = get_getopt_options_length(longopts1); - longopts2_len = get_getopt_options_length(longopts2); - *longopts = malloc(sizeof(struct option) * - (longopts1_len + longopts2_len + 1)); - if (!*longopts) { - if (shortopts) - free(*shortopts); - return -1; - } + int i, j; - for (index = 0; (longopts1) && (longopts1[index].name); index++) - (*longopts)[res_index++] = longopts1[index]; + helper_options.proc = 0; - for (index = 0; (longopts2) && (longopts2[index].name); index++) - (*longopts)[res_index++] = longopts2[index]; + /* Find and remove option */ + for (i = 0; i < argc;) { + if (strcmp(argv[i], "--odph_proc") == 0) { + helper_options.proc = 1; - (*longopts)[res_index] = termination; + for (j = i; j < argc - 1; j++) + argv[j] = argv[j + 1]; - return 0; -} - -/* - * Parse command line options to extract options affecting helpers. - */ -int odph_parse_options(int argc, char *argv[], - const char *caller_shortopts, - const struct option *caller_longopts) -{ - int c; - char *shortopts; - struct option *longopts; - int res = 0; - - static struct option helper_long_options[] = { - /* These options set a flag. */ - {"odph_proc", no_argument, &helper_options.proc, 1}, - {0, 0, 0, 0} - }; - - static const char *helper_short_options = ""; - - /* defaults: */ - helper_options.proc = false; - - /* merge caller's command line options descriptions with helper's: */ - if (odph_merge_getopt_options(caller_shortopts, helper_short_options, - caller_longopts, helper_long_options, - &shortopts, &longopts) < 0) - return -1; - - while (1) { - /* getopt_long stores the option index here. */ - int option_index = 0; - - c = getopt_long (argc, argv, - shortopts, longopts, &option_index); - - /* Detect the end of the options. */ - if (c == -1) - break; + argc--; + continue; + } - /* check for unknown options or missing arguments */ - if (c == '?' || c == ':') - res = -1; + i++; } - optind = 0; /* caller expects this to be zero if it parses too*/ - - free(shortopts); - free(longopts); - - return res; + return argc; } diff --git a/platform/linux-generic/test/mmap_vlan_ins/mmap_vlan_ins.c b/platform/linux-generic/test/mmap_vlan_ins/mmap_vlan_ins.c index 678978be..cf3d6d93 100644 --- a/platform/linux-generic/test/mmap_vlan_ins/mmap_vlan_ins.c +++ b/platform/linux-generic/test/mmap_vlan_ins/mmap_vlan_ins.c @@ -137,36 +137,14 @@ int main(int argc, char **argv) odph_odpthread_t thd[MAX_WORKERS]; odp_instance_t instance; odph_odpthread_params_t thr_params; - int opt; - int long_index; - - static const struct option longopts[] = { {NULL, 0, NULL, 0} }; - static const char *shortopts = ""; /* let helper collect its own arguments (e.g. --odph_proc) */ - odph_parse_options(argc, argv, shortopts, longopts); + argc = odph_parse_options(argc, argv); - /* - * parse own options: currentely none, but this will move optind - * to the first non-option argument. (in case there where helprt args) - */ - opterr = 0; /* do not issue errors on helper options */ - while (1) { - opt = getopt_long(argc, argv, shortopts, longopts, &long_index); - if (-1 == opt) - break; /* No more options */ - } - - if (argc != optind + 4 || - odph_eth_addr_parse(&global.dst, argv[optind + 2]) != 0 || - odph_eth_addr_parse(&global.src, argv[optind + 3]) != 0) { - printf("Usage: odp_l2fwd_simple eth0 eth1 01:02:03:04:05:06" - " 07:08:09:0a:0b:0c\n"); - printf("Where eth0 and eth1 are the used interfaces" - " (must have 2 of them)\n"); - printf("And the hexadecimal numbers are destination MAC address" - " and source MAC address\n"); - exit(1); + if (argc < 3) { + printf("Too few arguments (%i).\n" + "Two interface names needed as arguments.\n", argc); + exit(0); } if (odp_init_global(&instance, NULL, NULL)) { @@ -193,10 +171,8 @@ int main(int argc, char **argv) exit(1); } - global.if0 = create_pktio(argv[optind], pool, &global.if0in, - &global.if0out); - global.if1 = create_pktio(argv[optind + 1], pool, &global.if1in, - &global.if1out); + global.if0 = create_pktio(argv[1], pool, &global.if0in, &global.if0out); + global.if1 = create_pktio(argv[2], pool, &global.if1in, &global.if1out); odp_cpumask_default_worker(&cpumask, MAX_WORKERS); diff --git a/test/common/odp_cunit_common.c b/test/common/odp_cunit_common.c index 79c3df1e..f7c9af43 100644 --- a/test/common/odp_cunit_common.c +++ b/test/common/odp_cunit_common.c @@ -394,5 +394,6 @@ int odp_cunit_register(odp_suiteinfo_t testsuites[]) int odp_cunit_parse_options(int argc, char *argv[]) { progname = argv[0]; - return odph_parse_options(argc, argv, NULL, NULL); + odph_parse_options(argc, argv); + return 0; } diff --git a/test/performance/odp_bench_packet.c b/test/performance/odp_bench_packet.c index df41b41f..b4f1905a 100644 --- a/test/performance/odp_bench_packet.c +++ b/test/performance/odp_bench_packet.c @@ -1318,9 +1318,7 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args) static const char *shortopts = "b:i:h"; /* Let helper collect its own arguments (e.g. --odph_proc) */ - odph_parse_options(argc, argv, shortopts, longopts); - - opterr = 0; /* Do not issue errors on helper options */ + argc = odph_parse_options(argc, argv); appl_args->bench_idx = 0; /* Run all benchmarks */ appl_args->burst_size = TEST_DEF_BURST; diff --git a/test/performance/odp_crypto.c b/test/performance/odp_crypto.c index 0404aca2..61da80e8 100644 --- a/test/performance/odp_crypto.c +++ b/test/performance/odp_crypto.c @@ -1197,7 +1197,7 @@ static void parse_args(int argc, char *argv[], crypto_args_t *cargs) static const char *shortopts = "+a:c:df:hi:m:nl:spr"; /* let helper collect its own arguments (e.g. --odph_proc) */ - odph_parse_options(argc, argv, shortopts, longopts); + argc = odph_parse_options(argc, argv); cargs->in_place = 0; cargs->in_flight = 1; @@ -1208,8 +1208,6 @@ static void parse_args(int argc, char *argv[], crypto_args_t *cargs) cargs->reuse_packet = 0; cargs->schedule = 0; - opterr = 0; /* do not issue errors on helper options */ - while (1) { opt = getopt_long(argc, argv, shortopts, longopts, &long_index); diff --git a/test/performance/odp_ipsec.c b/test/performance/odp_ipsec.c index 587293db..551c021a 100644 --- a/test/performance/odp_ipsec.c +++ b/test/performance/odp_ipsec.c @@ -929,7 +929,7 @@ static void parse_args(int argc, char *argv[], ipsec_args_t *cargs) static const char *shortopts = "+a:c:df:hi:m:nl:sptu"; /* let helper collect its own arguments (e.g. --odph_proc) */ - odph_parse_options(argc, argv, shortopts, longopts); + argc = odph_parse_options(argc, argv); cargs->in_place = 0; cargs->in_flight = 1; @@ -940,8 +940,6 @@ static void parse_args(int argc, char *argv[], ipsec_args_t *cargs) cargs->schedule = 0; cargs->ah = 0; - opterr = 0; /* do not issue errors on helper options */ - while (1) { opt = getopt_long(argc, argv, shortopts, longopts, &long_index); diff --git a/test/performance/odp_l2fwd.c b/test/performance/odp_l2fwd.c index 2859000d..ff14ab2f 100644 --- a/test/performance/odp_l2fwd.c +++ b/test/performance/odp_l2fwd.c @@ -1184,7 +1184,7 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args) 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); + argc = odph_parse_options(argc, argv); appl_args->time = 0; /* loop forever if time to run is 0 */ appl_args->accuracy = 1; /* get and print pps stats second */ @@ -1195,8 +1195,6 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args) appl_args->verbose = 0; appl_args->chksum = 0; /* don't use checksum offload by default */ - opterr = 0; /* do not issue errors on helper options */ - while (1) { opt = getopt_long(argc, argv, shortopts, longopts, &long_index); diff --git a/test/performance/odp_pktio_ordered.c b/test/performance/odp_pktio_ordered.c index 5647b1eb..ec6c4faa 100644 --- a/test/performance/odp_pktio_ordered.c +++ b/test/performance/odp_pktio_ordered.c @@ -868,7 +868,7 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args) static const char *shortopts = "+c:+t:+a:i:m:d:r:f:e:h"; /* let helper collect its own arguments (e.g. --odph_proc) */ - odph_parse_options(argc, argv, shortopts, longopts); + argc = odph_parse_options(argc, argv); appl_args->time = 0; /* loop forever if time to run is 0 */ appl_args->accuracy = DEF_STATS_INT; @@ -876,8 +876,6 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args) appl_args->num_flows = DEF_NUM_FLOWS; appl_args->extra_rounds = DEF_EXTRA_ROUNDS; - opterr = 0; /* do not issue errors on helper options */ - while (1) { opt = getopt_long(argc, argv, shortopts, longopts, &long_index); diff --git a/test/performance/odp_pktio_perf.c b/test/performance/odp_pktio_perf.c index 75f4abf2..2791856a 100644 --- a/test/performance/odp_pktio_perf.c +++ b/test/performance/odp_pktio_perf.c @@ -961,7 +961,7 @@ static void parse_args(int argc, char *argv[], test_args_t *args) static const char *shortopts = "+c:t:b:pR:l:r:i:d:vh"; /* let helper collect its own arguments (e.g. --odph_proc) */ - odph_parse_options(argc, argv, shortopts, longopts); + argc = odph_parse_options(argc, argv); args->cpu_count = 0; /* all CPUs */ args->num_tx_workers = 0; /* defaults to cpu_count+1/2 */ @@ -973,8 +973,6 @@ static void parse_args(int argc, char *argv[], test_args_t *args) args->schedule = 1; args->verbose = 0; - opterr = 0; /* do not issue errors on helper options */ - while (1) { opt = getopt_long(argc, argv, shortopts, longopts, &long_index); diff --git a/test/performance/odp_sched_latency.c b/test/performance/odp_sched_latency.c index ca720119..7e98db18 100644 --- a/test/performance/odp_sched_latency.c +++ b/test/performance/odp_sched_latency.c @@ -550,7 +550,7 @@ static void parse_args(int argc, char *argv[], test_args_t *args) static const char *shortopts = "+c:s:l:t:m:n:o:p:rh"; /* Let helper collect its own arguments (e.g. --odph_proc) */ - odph_parse_options(argc, argv, shortopts, longopts); + argc = odph_parse_options(argc, argv); args->sync_type = ODP_SCHED_SYNC_PARALLEL; args->sample_per_prio = SAMPLE_EVENT_PER_PRIO; @@ -561,7 +561,6 @@ static void parse_args(int argc, char *argv[], test_args_t *args) args->prio[LO_PRIO].events_per_queue = EVENTS_PER_LO_PRIO_QUEUE; args->prio[HI_PRIO].events_per_queue = EVENTS_PER_HI_PRIO_QUEUE; - opterr = 0; /* Do not issue errors on helper options */ while (1) { opt = getopt_long(argc, argv, shortopts, longopts, &long_index); diff --git a/test/performance/odp_sched_pktio.c b/test/performance/odp_sched_pktio.c index 46a08c92..109ae87e 100644 --- a/test/performance/odp_sched_pktio.c +++ b/test/performance/odp_sched_pktio.c @@ -364,7 +364,7 @@ static int parse_options(int argc, char *argv[], test_options_t *test_options) test_options->num_pktio_queue = 0; /* let helper collect its own arguments (e.g. --odph_proc) */ - odph_parse_options(argc, argv, shortopts, longopts); + argc = odph_parse_options(argc, argv); while (1) { opt = getopt_long(argc, argv, shortopts, longopts, &long_index); diff --git a/test/performance/odp_scheduling.c b/test/performance/odp_scheduling.c index 6b7cff77..8dd86c3c 100644 --- a/test/performance/odp_scheduling.c +++ b/test/performance/odp_scheduling.c @@ -761,9 +761,8 @@ static void parse_args(int argc, char *argv[], test_args_t *args) static const char *shortopts = "+c:fh"; /* let helper collect its own arguments (e.g. --odph_proc) */ - odph_parse_options(argc, argv, shortopts, longopts); + argc = odph_parse_options(argc, argv); - opterr = 0; /* do not issue errors on helper options */ while (1) { opt = getopt_long(argc, argv, shortopts, longopts, &long_index); ----------------------------------------------------------------------- Summary of changes: example/classifier/odp_classifier.c | 4 +- example/generator/odp_generator.c | 4 +- example/ipsec/odp_ipsec.c | 4 +- example/ipsec_api/odp_ipsec.c | 4 +- example/l2fwd_simple/odp_l2fwd_simple.c | 30 +---- example/packet/odp_pktio.c | 4 +- example/switch/odp_switch.c | 4 +- example/time/time_global_test.c | 2 +- example/timer/odp_timer_test.c | 4 +- helper/include/odp/helper/threads.h | 75 ++---------- helper/test/odpthreads.c | 2 +- helper/threads.c | 131 +++------------------ .../test/mmap_vlan_ins/mmap_vlan_ins.c | 38 ++---- test/common/odp_cunit_common.c | 3 +- test/performance/odp_bench_packet.c | 4 +- test/performance/odp_crypto.c | 4 +- test/performance/odp_ipsec.c | 4 +- test/performance/odp_l2fwd.c | 4 +- test/performance/odp_pktio_ordered.c | 4 +- test/performance/odp_pktio_perf.c | 4 +- test/performance/odp_sched_latency.c | 3 +- test/performance/odp_sched_pktio.c | 2 +- test/performance/odp_scheduling.c | 3 +- 23 files changed, 57 insertions(+), 284 deletions(-) hooks/post-receive --

8 years, 3 months

[COMMIT] branch master updated. v1.19.0.1_tigermoth-8-gad3417a6

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 ad3417a6fd2ba93616b937f9a2d8642eceeb0bf8 (commit) via db62337f2c0a3add91bbdbaa096f2a3c04162c60 (commit) via df1c292ed40d4c2c480917f1eab06a046c93c3b1 (commit) from 49c671e80fd2c88b6f36337ebd1cd4748eb8bae1 (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 ad3417a6fd2ba93616b937f9a2d8642eceeb0bf8 Author: Bogdan Pricope <bogdan.pricope(a)linaro.org> Date: Thu May 10 13:52:43 2018 +0300 linux-gen: pktio: dpdk: integrate csum with packet parser Merge csum validation and packet parser to reduce branching. Signed-off-by: Bogdan Pricope <bogdan.pricope(a)linaro.org> Reviewed-and-tested-by: Matias Elo <matias.elo(a)nokia.com> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/include/odp_packet_dpdk.h b/platform/linux-generic/include/odp_packet_dpdk.h index 31d4557e..020c2b97 100644 --- a/platform/linux-generic/include/odp_packet_dpdk.h +++ b/platform/linux-generic/include/odp_packet_dpdk.h @@ -78,16 +78,18 @@ int dpdk_packet_parse_common(packet_parser_t *pkt_hdr, uint32_t pkt_len, uint32_t seg_len, struct rte_mbuf *mbuf, - int layer); + int layer, + odp_pktin_config_opt_t pktin_cfg); static inline int dpdk_packet_parse_layer(odp_packet_hdr_t *pkt_hdr, struct rte_mbuf *mbuf, - odp_pktio_parser_layer_t layer) + odp_pktio_parser_layer_t layer, + odp_pktin_config_opt_t pktin_cfg) { uint32_t seg_len = pkt_hdr->buf_hdr.seg[0].len; void *base = pkt_hdr->buf_hdr.seg[0].data; return dpdk_packet_parse_common(&pkt_hdr->p, base, pkt_hdr->frame_len, - seg_len, mbuf, layer); + seg_len, mbuf, layer, pktin_cfg); } #endif diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c index 6d045ebd..206a6a45 100644 --- a/platform/linux-generic/pktio/dpdk.c +++ b/platform/linux-generic/pktio/dpdk.c @@ -418,73 +418,6 @@ static struct rte_mempool_ops ops_stack = { MEMPOOL_REGISTER_OPS(ops_stack); -#define IP4_CSUM_RESULT(m) (m->ol_flags & PKT_RX_IP_CKSUM_MASK) -#define L4_CSUM_RESULT(m) (m->ol_flags & PKT_RX_L4_CKSUM_MASK) -#define UDP4_CSUM(_p) (((_odp_udphdr_t *)_odp_packet_l4_ptr(_p, NULL))->chksum) - -#define PKTIN_CSUM_BITS 0x1C - -static inline int pkt_set_ol_rx(odp_pktin_config_opt_t *pktin_cfg, - odp_packet_hdr_t *pkt_hdr, - struct rte_mbuf *mbuf) -{ - uint64_t packet_csum_result; - - if (pktin_cfg->bit.ipv4_chksum && - pkt_hdr->p.input_flags.ipv4) { - packet_csum_result = IP4_CSUM_RESULT(mbuf); - - if (packet_csum_result == PKT_RX_IP_CKSUM_GOOD) { - pkt_hdr->p.input_flags.l3_chksum_done = 1; - } else if (packet_csum_result != PKT_RX_IP_CKSUM_UNKNOWN) { - if (pktin_cfg->bit.drop_ipv4_err) - return -1; - - pkt_hdr->p.input_flags.l3_chksum_done = 1; - pkt_hdr->p.flags.ip_err = 1; - pkt_hdr->p.flags.l3_chksum_err = 1; - } - } - - if (pktin_cfg->bit.udp_chksum && - pkt_hdr->p.input_flags.udp) { - packet_csum_result = L4_CSUM_RESULT(mbuf); - - if (packet_csum_result == PKT_RX_L4_CKSUM_GOOD) { - pkt_hdr->p.input_flags.l4_chksum_done = 1; - } else if (packet_csum_result != PKT_RX_L4_CKSUM_UNKNOWN) { - if (pkt_hdr->p.input_flags.ipv4 && - pkt_hdr->p.input_flags.udp && - !UDP4_CSUM(packet_handle(pkt_hdr))) { - pkt_hdr->p.input_flags.l4_chksum_done = 1; - return 0; - } - if (pktin_cfg->bit.drop_udp_err) - return -1; - - pkt_hdr->p.input_flags.l4_chksum_done = 1; - pkt_hdr->p.flags.udp_err = 1; - pkt_hdr->p.flags.l4_chksum_err = 1; - } - } else if (pktin_cfg->bit.tcp_chksum && - pkt_hdr->p.input_flags.tcp) { - packet_csum_result = L4_CSUM_RESULT(mbuf); - - if (packet_csum_result == PKT_RX_L4_CKSUM_GOOD) { - pkt_hdr->p.input_flags.l4_chksum_done = 1; - } else if (packet_csum_result != PKT_RX_L4_CKSUM_UNKNOWN) { - if (pktin_cfg->bit.drop_tcp_err) - return -1; - - pkt_hdr->p.input_flags.l4_chksum_done = 1; - pkt_hdr->p.flags.tcp_err = 1; - pkt_hdr->p.flags.l4_chksum_err = 1; - } - } - - return 0; -} - static inline int mbuf_to_pkt(pktio_entry_t *pktio_entry, odp_packet_t pkt_table[], struct rte_mbuf *mbuf_table[], @@ -499,7 +432,7 @@ static inline int mbuf_to_pkt(pktio_entry_t *pktio_entry, int nb_pkts = 0; int alloc_len, num; odp_pool_t pool = pktio_entry->s.pkt_dpdk.pool; - odp_pktin_config_opt_t *pktin_cfg = &pktio_entry->s.config.pktin; + odp_pktin_config_opt_t pktin_cfg = pktio_entry->s.config.pktin; odp_proto_layer_t parse_layer = pktio_entry->s.config.parser.layer; odp_pktio_t input = pktio_entry->s.handle; @@ -531,9 +464,14 @@ static inline int mbuf_to_pkt(pktio_entry_t *pktio_entry, if (pktio_cls_enabled(pktio_entry)) { packet_parse_reset(&parsed_hdr); packet_set_len(&parsed_hdr, pkt_len); - dpdk_packet_parse_common(&parsed_hdr.p, data, - pkt_len, pkt_len, mbuf, - ODP_PROTO_LAYER_ALL); + if (dpdk_packet_parse_common(&parsed_hdr.p, data, + pkt_len, pkt_len, mbuf, + ODP_PROTO_LAYER_ALL, + pktin_cfg)) { + odp_packet_free(pkt_table[i]); + rte_pktmbuf_free(mbuf); + continue; + } if (cls_classify_packet(pktio_entry, (const uint8_t *)data, pkt_len, pkt_len, &pool, @@ -553,21 +491,18 @@ static inline int mbuf_to_pkt(pktio_entry_t *pktio_entry, if (pktio_cls_enabled(pktio_entry)) copy_packet_cls_metadata(&parsed_hdr, pkt_hdr); else if (parse_layer != ODP_PROTO_LAYER_NONE) - dpdk_packet_parse_layer(pkt_hdr, mbuf, parse_layer); + if (dpdk_packet_parse_layer(pkt_hdr, mbuf, parse_layer, + pktin_cfg)) { + odp_packet_free(pkt); + rte_pktmbuf_free(mbuf); + continue; + } if (mbuf->ol_flags & PKT_RX_RSS_HASH) packet_set_flow_hash(pkt_hdr, mbuf->hash.rss); packet_set_ts(pkt_hdr, ts); - if (pktin_cfg->all_bits & PKTIN_CSUM_BITS) { - if (pkt_set_ol_rx(pktin_cfg, pkt_hdr, mbuf)) { - odp_packet_free(pkt); - rte_pktmbuf_free(mbuf); - continue; - } - } - pkt_table[nb_pkts++] = pkt; rte_pktmbuf_free(mbuf); @@ -756,7 +691,7 @@ static inline int mbuf_to_pkt_zero(pktio_entry_t *pktio_entry, int i; int nb_pkts = 0; odp_pool_t pool = pktio_entry->s.pkt_dpdk.pool; - odp_pktin_config_opt_t *pktin_cfg = &pktio_entry->s.config.pktin; + odp_pktin_config_opt_t pktin_cfg = pktio_entry->s.config.pktin; odp_proto_layer_t parse_layer = pktio_entry->s.config.parser.layer; odp_pktio_t input = pktio_entry->s.handle; @@ -781,9 +716,13 @@ static inline int mbuf_to_pkt_zero(pktio_entry_t *pktio_entry, if (pktio_cls_enabled(pktio_entry)) { packet_parse_reset(&parsed_hdr); packet_set_len(&parsed_hdr, pkt_len); - dpdk_packet_parse_common(&parsed_hdr.p, data, - pkt_len, pkt_len, mbuf, - ODP_PROTO_LAYER_ALL); + if (dpdk_packet_parse_common(&parsed_hdr.p, data, + pkt_len, pkt_len, mbuf, + ODP_PROTO_LAYER_ALL, + pktin_cfg)) { + rte_pktmbuf_free(mbuf); + continue; + } if (cls_classify_packet(pktio_entry, (const uint8_t *)data, pkt_len, pkt_len, &pool, @@ -804,20 +743,17 @@ static inline int mbuf_to_pkt_zero(pktio_entry_t *pktio_entry, if (pktio_cls_enabled(pktio_entry)) copy_packet_cls_metadata(&parsed_hdr, pkt_hdr); else if (parse_layer != ODP_PROTO_LAYER_NONE) - dpdk_packet_parse_layer(pkt_hdr, mbuf, parse_layer); + if (dpdk_packet_parse_layer(pkt_hdr, mbuf, parse_layer, + pktin_cfg)) { + rte_pktmbuf_free(mbuf); + continue; + } if (mbuf->ol_flags & PKT_RX_RSS_HASH) packet_set_flow_hash(pkt_hdr, mbuf->hash.rss); packet_set_ts(pkt_hdr, ts); - if (pktin_cfg->all_bits & PKTIN_CSUM_BITS) { - if (pkt_set_ol_rx(pktin_cfg, pkt_hdr, mbuf)) { - rte_pktmbuf_free(mbuf); - continue; - } - } - pkt_table[nb_pkts++] = pkt; } diff --git a/platform/linux-generic/pktio/dpdk_parse.c b/platform/linux-generic/pktio/dpdk_parse.c index 1a388b10..155c6832 100644 --- a/platform/linux-generic/pktio/dpdk_parse.c +++ b/platform/linux-generic/pktio/dpdk_parse.c @@ -20,6 +20,9 @@ #include <rte_config.h> #include <rte_mbuf.h> +#define IP4_CSUM_RESULT(ol_flags) (ol_flags & PKT_RX_IP_CKSUM_MASK) +#define L4_CSUM_RESULT(ol_flags) (ol_flags & PKT_RX_L4_CKSUM_MASK) + /** Parser helper function for Ethernet packets */ static inline uint16_t dpdk_parse_eth(packet_parser_t *prs, const uint8_t **parseptr, @@ -126,7 +129,9 @@ error: static inline uint8_t dpdk_parse_ipv4(packet_parser_t *prs, const uint8_t **parseptr, uint32_t *offset, uint32_t frame_len, - uint32_t mbuf_packet_type) + uint32_t mbuf_packet_type, + uint64_t mbuf_ol, + uint32_t do_csum) { const _odp_ipv4hdr_t *ipv4 = (const _odp_ipv4hdr_t *)*parseptr; uint32_t dstaddr = _odp_be_to_cpu_32(ipv4->dst_addr); @@ -147,6 +152,18 @@ static inline uint8_t dpdk_parse_ipv4(packet_parser_t *prs, *offset += ihl * 4; *parseptr += ihl * 4; + if (do_csum) { + uint64_t packet_csum_result = IP4_CSUM_RESULT(mbuf_ol); + + if (packet_csum_result == PKT_RX_IP_CKSUM_GOOD) { + prs->input_flags.l3_chksum_done = 1; + } else if (packet_csum_result != PKT_RX_IP_CKSUM_UNKNOWN) { + prs->input_flags.l3_chksum_done = 1; + prs->flags.ip_err = 1; + prs->flags.l3_chksum_err = 1; + } + } + if (odp_unlikely(ihl > _ODP_IPV4HDR_IHL_MIN)) prs->input_flags.ipopt = 1; @@ -252,7 +269,9 @@ static inline uint8_t dpdk_parse_ipv6(packet_parser_t *prs, * Parser helper function for TCP */ static inline void dpdk_parse_tcp(packet_parser_t *prs, - const uint8_t **parseptr) + const uint8_t **parseptr, + uint64_t mbuf_ol, + uint32_t do_csum) { const _odp_tcphdr_t *tcp = (const _odp_tcphdr_t *)*parseptr; uint32_t len = tcp->hl * 4; @@ -260,6 +279,18 @@ static inline void dpdk_parse_tcp(packet_parser_t *prs, if (odp_unlikely(tcp->hl < sizeof(_odp_tcphdr_t) / sizeof(uint32_t))) prs->flags.tcp_err = 1; + if (do_csum) { + uint64_t packet_csum_result = L4_CSUM_RESULT(mbuf_ol); + + if (packet_csum_result == PKT_RX_L4_CKSUM_GOOD) { + prs->input_flags.l4_chksum_done = 1; + } else if (packet_csum_result != PKT_RX_L4_CKSUM_UNKNOWN) { + prs->input_flags.l4_chksum_done = 1; + prs->flags.tcp_err = 1; + prs->flags.l4_chksum_err = 1; + } + } + *parseptr += len; } @@ -267,7 +298,9 @@ static inline void dpdk_parse_tcp(packet_parser_t *prs, * Parser helper function for UDP */ static inline void dpdk_parse_udp(packet_parser_t *prs, - const uint8_t **parseptr) + const uint8_t **parseptr, + uint64_t mbuf_ol, + uint32_t do_csum) { const _odp_udphdr_t *udp = (const _odp_udphdr_t *)*parseptr; uint32_t udplen = _odp_be_to_cpu_16(udp->length); @@ -276,6 +309,22 @@ static inline void dpdk_parse_udp(packet_parser_t *prs, if (odp_unlikely(udplen < sizeof(_odp_udphdr_t))) prs->flags.udp_err = 1; + if (do_csum) { + uint64_t packet_csum_result = L4_CSUM_RESULT(mbuf_ol); + + if (packet_csum_result == PKT_RX_L4_CKSUM_GOOD) { + prs->input_flags.l4_chksum_done = 1; + } else if (packet_csum_result != PKT_RX_L4_CKSUM_UNKNOWN) { + if (prs->input_flags.ipv4 && !udp->chksum) { + prs->input_flags.l4_chksum_done = 1; + } else { + prs->input_flags.l4_chksum_done = 1; + prs->flags.udp_err = 1; + prs->flags.l4_chksum_err = 1; + } + } + } + if (odp_unlikely(ipsec_port == udp->dst_port && udplen > 4)) { uint32_t val; @@ -295,14 +344,16 @@ int dpdk_packet_parse_common_l3_l4(packet_parser_t *prs, uint32_t offset, uint32_t frame_len, uint32_t seg_len, int layer, uint16_t ethtype, - uint32_t mbuf_packet_type) + uint32_t mbuf_packet_type, + uint64_t mbuf_ol, + odp_pktin_config_opt_t pktin_cfg) { uint8_t ip_proto; prs->l3_offset = offset; if (odp_unlikely(layer <= ODP_PROTO_LAYER_L2)) - return prs->flags.all.error != 0; + return 0; /* Set l3 flag only for known ethtypes */ prs->input_flags.l3 = 1; @@ -312,8 +363,11 @@ int dpdk_packet_parse_common_l3_l4(packet_parser_t *prs, case _ODP_ETHTYPE_IPV4: prs->input_flags.ipv4 = 1; ip_proto = dpdk_parse_ipv4(prs, &parseptr, &offset, frame_len, - mbuf_packet_type); + mbuf_packet_type, mbuf_ol, + pktin_cfg.bit.ipv4_chksum); prs->l4_offset = offset; + if (prs->flags.ip_err && pktin_cfg.bit.drop_ipv4_err) + return -1; /* drop */ break; case _ODP_ETHTYPE_IPV6: @@ -321,6 +375,8 @@ int dpdk_packet_parse_common_l3_l4(packet_parser_t *prs, ip_proto = dpdk_parse_ipv6(prs, &parseptr, &offset, frame_len, seg_len, mbuf_packet_type); prs->l4_offset = offset; + if (prs->flags.ip_err && pktin_cfg.bit.drop_ipv6_err) + return -1; /* drop */ break; case _ODP_ETHTYPE_ARP: @@ -334,7 +390,7 @@ int dpdk_packet_parse_common_l3_l4(packet_parser_t *prs, } if (layer == ODP_PROTO_LAYER_L3) - return prs->flags.all.error != 0; + return 0; /* Set l4 flag only for known ip_proto */ prs->input_flags.l4 = 1; @@ -354,16 +410,22 @@ int dpdk_packet_parse_common_l3_l4(packet_parser_t *prs, case _ODP_IPPROTO_TCP: if (odp_unlikely(offset + _ODP_TCPHDR_LEN > seg_len)) - return -1; + return -1; /* drop */ prs->input_flags.tcp = 1; - dpdk_parse_tcp(prs, &parseptr); + dpdk_parse_tcp(prs, &parseptr, mbuf_ol, + pktin_cfg.bit.tcp_chksum); + if (prs->flags.tcp_err && pktin_cfg.bit.drop_tcp_err) + return -1; /* drop */ break; case _ODP_IPPROTO_UDP: if (odp_unlikely(offset + _ODP_UDPHDR_LEN > seg_len)) - return -1; + return -1; /* drop */ prs->input_flags.udp = 1; - dpdk_parse_udp(prs, &parseptr); + dpdk_parse_udp(prs, &parseptr, mbuf_ol, + pktin_cfg.bit.udp_chksum); + if (prs->flags.udp_err && pktin_cfg.bit.drop_udp_err) + return -1; /* drop */ break; case _ODP_IPPROTO_AH: @@ -389,7 +451,7 @@ int dpdk_packet_parse_common_l3_l4(packet_parser_t *prs, break; } - return prs->flags.all.error != 0; + return 0; } /** @@ -397,12 +459,14 @@ int dpdk_packet_parse_common_l3_l4(packet_parser_t *prs, */ int dpdk_packet_parse_common(packet_parser_t *prs, const uint8_t *ptr, uint32_t frame_len, uint32_t seg_len, - struct rte_mbuf *mbuf, int layer) + struct rte_mbuf *mbuf, int layer, + odp_pktin_config_opt_t pktin_cfg) { uint32_t offset; uint16_t ethtype; const uint8_t *parseptr; uint32_t mbuf_packet_type; + uint64_t mbuf_ol; parseptr = ptr; offset = 0; @@ -411,6 +475,7 @@ int dpdk_packet_parse_common(packet_parser_t *prs, const uint8_t *ptr, return 0; mbuf_packet_type = mbuf->packet_type; + mbuf_ol = mbuf->ol_flags; /* Assume valid L2 header, no CRC/FCS check in SW */ prs->l2_offset = offset; @@ -420,7 +485,8 @@ int dpdk_packet_parse_common(packet_parser_t *prs, const uint8_t *ptr, return dpdk_packet_parse_common_l3_l4(prs, parseptr, offset, frame_len, seg_len, layer, ethtype, - mbuf_packet_type); + mbuf_packet_type, mbuf_ol, + pktin_cfg); } #endif /* ODP_PKTIO_DPDK */ commit db62337f2c0a3add91bbdbaa096f2a3c04162c60 Author: Bogdan Pricope <bogdan.pricope(a)linaro.org> Date: Wed May 2 12:56:07 2018 +0300 linux-gen: pktio: dpdk: add specific packet parser Increase packet parsing performance by using dpdk provided information. Signed-off-by: Bogdan Pricope <bogdan.pricope(a)linaro.org> Reviewed-and-tested-by: Matias Elo <matias.elo(a)nokia.com> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index f9e99afd..b904877c 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -201,6 +201,7 @@ __LIB__libodp_linux_la_SOURCES = \ odp_version.c \ odp_weak.c \ pktio/dpdk.c \ + pktio/dpdk_parse.c \ pktio/ethtool.c \ pktio/io_ops.c \ pktio/ipc.c \ diff --git a/platform/linux-generic/include/odp_packet_dpdk.h b/platform/linux-generic/include/odp_packet_dpdk.h index 7600b57e..31d4557e 100644 --- a/platform/linux-generic/include/odp_packet_dpdk.h +++ b/platform/linux-generic/include/odp_packet_dpdk.h @@ -72,4 +72,22 @@ typedef struct ODP_ALIGNED_CACHE { dpdk_opt_t opt; } pkt_dpdk_t; +/** Packet parser using DPDK interface */ +int dpdk_packet_parse_common(packet_parser_t *pkt_hdr, + const uint8_t *ptr, + uint32_t pkt_len, + uint32_t seg_len, + struct rte_mbuf *mbuf, + int layer); + +static inline int dpdk_packet_parse_layer(odp_packet_hdr_t *pkt_hdr, + struct rte_mbuf *mbuf, + odp_pktio_parser_layer_t layer) +{ + uint32_t seg_len = pkt_hdr->buf_hdr.seg[0].len; + void *base = pkt_hdr->buf_hdr.seg[0].data; + + return dpdk_packet_parse_common(&pkt_hdr->p, base, pkt_hdr->frame_len, + seg_len, mbuf, layer); +} #endif diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c index c8d7d0d4..6d045ebd 100644 --- a/platform/linux-generic/pktio/dpdk.c +++ b/platform/linux-generic/pktio/dpdk.c @@ -420,7 +420,6 @@ MEMPOOL_REGISTER_OPS(ops_stack); #define IP4_CSUM_RESULT(m) (m->ol_flags & PKT_RX_IP_CKSUM_MASK) #define L4_CSUM_RESULT(m) (m->ol_flags & PKT_RX_L4_CKSUM_MASK) -#define HAS_L4_PROTO(m, proto) ((m->packet_type & RTE_PTYPE_L4_MASK) == proto) #define UDP4_CSUM(_p) (((_odp_udphdr_t *)_odp_packet_l4_ptr(_p, NULL))->chksum) #define PKTIN_CSUM_BITS 0x1C @@ -432,7 +431,7 @@ static inline int pkt_set_ol_rx(odp_pktin_config_opt_t *pktin_cfg, uint64_t packet_csum_result; if (pktin_cfg->bit.ipv4_chksum && - RTE_ETH_IS_IPV4_HDR(mbuf->packet_type)) { + pkt_hdr->p.input_flags.ipv4) { packet_csum_result = IP4_CSUM_RESULT(mbuf); if (packet_csum_result == PKT_RX_IP_CKSUM_GOOD) { @@ -448,7 +447,7 @@ static inline int pkt_set_ol_rx(odp_pktin_config_opt_t *pktin_cfg, } if (pktin_cfg->bit.udp_chksum && - HAS_L4_PROTO(mbuf, RTE_PTYPE_L4_UDP)) { + pkt_hdr->p.input_flags.udp) { packet_csum_result = L4_CSUM_RESULT(mbuf); if (packet_csum_result == PKT_RX_L4_CKSUM_GOOD) { @@ -468,7 +467,7 @@ static inline int pkt_set_ol_rx(odp_pktin_config_opt_t *pktin_cfg, pkt_hdr->p.flags.l4_chksum_err = 1; } } else if (pktin_cfg->bit.tcp_chksum && - HAS_L4_PROTO(mbuf, RTE_PTYPE_L4_TCP)) { + pkt_hdr->p.input_flags.tcp) { packet_csum_result = L4_CSUM_RESULT(mbuf); if (packet_csum_result == PKT_RX_L4_CKSUM_GOOD) { @@ -530,10 +529,15 @@ static inline int mbuf_to_pkt(pktio_entry_t *pktio_entry, pkt_len = rte_pktmbuf_pkt_len(mbuf); if (pktio_cls_enabled(pktio_entry)) { + packet_parse_reset(&parsed_hdr); + packet_set_len(&parsed_hdr, pkt_len); + dpdk_packet_parse_common(&parsed_hdr.p, data, + pkt_len, pkt_len, mbuf, + ODP_PROTO_LAYER_ALL); if (cls_classify_packet(pktio_entry, (const uint8_t *)data, pkt_len, pkt_len, &pool, - &parsed_hdr, true)) + &parsed_hdr, false)) goto fail; } @@ -549,7 +553,7 @@ static inline int mbuf_to_pkt(pktio_entry_t *pktio_entry, if (pktio_cls_enabled(pktio_entry)) copy_packet_cls_metadata(&parsed_hdr, pkt_hdr); else if (parse_layer != ODP_PROTO_LAYER_NONE) - packet_parse_layer(pkt_hdr, parse_layer); + dpdk_packet_parse_layer(pkt_hdr, mbuf, parse_layer); if (mbuf->ol_flags & PKT_RX_RSS_HASH) packet_set_flow_hash(pkt_hdr, mbuf->hash.rss); @@ -775,13 +779,19 @@ static inline int mbuf_to_pkt_zero(pktio_entry_t *pktio_entry, pkt_hdr = packet_hdr(pkt); if (pktio_cls_enabled(pktio_entry)) { + packet_parse_reset(&parsed_hdr); + packet_set_len(&parsed_hdr, pkt_len); + dpdk_packet_parse_common(&parsed_hdr.p, data, + pkt_len, pkt_len, mbuf, + ODP_PROTO_LAYER_ALL); if (cls_classify_packet(pktio_entry, (const uint8_t *)data, pkt_len, pkt_len, &pool, - &parsed_hdr, true)) + &parsed_hdr, false)) { ODP_ERR("Unable to classify packet\n"); rte_pktmbuf_free(mbuf); continue; + } } /* Init buffer segments. Currently, only single segment packets @@ -794,7 +804,7 @@ static inline int mbuf_to_pkt_zero(pktio_entry_t *pktio_entry, if (pktio_cls_enabled(pktio_entry)) copy_packet_cls_metadata(&parsed_hdr, pkt_hdr); else if (parse_layer != ODP_PROTO_LAYER_NONE) - packet_parse_layer(pkt_hdr, parse_layer); + dpdk_packet_parse_layer(pkt_hdr, mbuf, parse_layer); if (mbuf->ol_flags & PKT_RX_RSS_HASH) packet_set_flow_hash(pkt_hdr, mbuf->hash.rss); diff --git a/platform/linux-generic/pktio/dpdk_parse.c b/platform/linux-generic/pktio/dpdk_parse.c new file mode 100644 index 00000000..1a388b10 --- /dev/null +++ b/platform/linux-generic/pktio/dpdk_parse.c @@ -0,0 +1,426 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include "config.h" + +#ifdef ODP_PKTIO_DPDK + +#include <odp_packet_io_internal.h> +#include <odp_packet_dpdk.h> +#include <odp/api/byteorder.h> +#include <odp/api/plat/byteorder_inlines.h> + +#include <protocols/eth.h> +#include <protocols/udp.h> +#include <protocols/tcp.h> + +#include <rte_config.h> +#include <rte_mbuf.h> + +/** Parser helper function for Ethernet packets */ +static inline uint16_t dpdk_parse_eth(packet_parser_t *prs, + const uint8_t **parseptr, + uint32_t *offset, uint32_t frame_len, + uint32_t mbuf_packet_type) +{ + uint16_t ethtype; + const _odp_ethhdr_t *eth; + uint16_t macaddr0, macaddr2, macaddr4; + const _odp_vlanhdr_t *vlan; + _odp_packet_input_flags_t input_flags; + uint32_t l2_packet_type; + + input_flags.all = 0; + input_flags.l2 = 1; + input_flags.eth = 1; + + eth = (const _odp_ethhdr_t *)*parseptr; + + /* Detect jumbo frames */ + if (odp_unlikely(frame_len > _ODP_ETH_LEN_MAX)) + input_flags.jumbo = 1; + + /* Handle Ethernet broadcast/multicast addresses */ + macaddr0 = _odp_be_to_cpu_16(*((const uint16_t *)(const void *)eth)); + if (odp_unlikely((macaddr0 & 0x0100) == 0x0100)) + input_flags.eth_mcast = 1; + + if (odp_unlikely(macaddr0 == 0xffff)) { + macaddr2 = + _odp_be_to_cpu_16(*((const uint16_t *) + (const void *)eth + 1)); + macaddr4 = + _odp_be_to_cpu_16(*((const uint16_t *) + (const void *)eth + 2)); + + if ((macaddr2 == 0xffff) && (macaddr4 == 0xffff)) + input_flags.eth_bcast = 1; + } + + /* Get Ethertype */ + l2_packet_type = mbuf_packet_type & RTE_PTYPE_L2_MASK; + switch (l2_packet_type) { + case RTE_PTYPE_L2_ETHER: + if (RTE_ETH_IS_IPV4_HDR(mbuf_packet_type)) + ethtype = _ODP_ETHTYPE_IPV4; + else if (RTE_ETH_IS_IPV6_HDR(mbuf_packet_type)) + ethtype = _ODP_ETHTYPE_IPV6; + else + ethtype = _odp_be_to_cpu_16(eth->type); + break; + case RTE_PTYPE_L2_ETHER_VLAN: + ethtype = _ODP_ETHTYPE_VLAN; + break; + default: + ethtype = _odp_be_to_cpu_16(eth->type); + } + + *offset += sizeof(*eth); + *parseptr += sizeof(*eth); + + /* Check for SNAP vs. DIX */ + if (odp_unlikely(ethtype < _ODP_ETH_LEN_MAX)) { + input_flags.snap = 1; + if (ethtype > frame_len - *offset) { + prs->flags.snap_len_err = 1; + ethtype = 0; + goto error; + } + ethtype = _odp_be_to_cpu_16(*((const uint16_t *)(uintptr_t) + (parseptr + 6))); + *offset += 8; + *parseptr += 8; + } + + /* Parse the VLAN header(s), if present */ + if (odp_unlikely(ethtype == _ODP_ETHTYPE_VLAN_OUTER)) { + input_flags.vlan_qinq = 1; + input_flags.vlan = 1; + + vlan = (const _odp_vlanhdr_t *)*parseptr; + ethtype = _odp_be_to_cpu_16(vlan->type); + *offset += sizeof(_odp_vlanhdr_t); + *parseptr += sizeof(_odp_vlanhdr_t); + } + + if (ethtype == _ODP_ETHTYPE_VLAN) { + input_flags.vlan = 1; + vlan = (const _odp_vlanhdr_t *)*parseptr; + ethtype = _odp_be_to_cpu_16(vlan->type); + *offset += sizeof(_odp_vlanhdr_t); + *parseptr += sizeof(_odp_vlanhdr_t); + } + +error: + prs->input_flags.all |= input_flags.all; + + return ethtype; +} + +/** + * Parser helper function for IPv4 + */ +static inline uint8_t dpdk_parse_ipv4(packet_parser_t *prs, + const uint8_t **parseptr, + uint32_t *offset, uint32_t frame_len, + uint32_t mbuf_packet_type) +{ + const _odp_ipv4hdr_t *ipv4 = (const _odp_ipv4hdr_t *)*parseptr; + uint32_t dstaddr = _odp_be_to_cpu_32(ipv4->dst_addr); + uint32_t l3_len = _odp_be_to_cpu_16(ipv4->tot_len); + uint8_t ver = _ODP_IPV4HDR_VER(ipv4->ver_ihl); + uint8_t ihl = _ODP_IPV4HDR_IHL(ipv4->ver_ihl); + uint32_t l4_packet_type = mbuf_packet_type & RTE_PTYPE_L4_MASK; + uint16_t frag_offset; + uint8_t proto; + + if (odp_unlikely(ihl < _ODP_IPV4HDR_IHL_MIN || + ver != 4 || + (l3_len > frame_len - *offset))) { + prs->flags.ip_err = 1; + return 0; + } + + *offset += ihl * 4; + *parseptr += ihl * 4; + + if (odp_unlikely(ihl > _ODP_IPV4HDR_IHL_MIN)) + prs->input_flags.ipopt = 1; + + if (l4_packet_type == RTE_PTYPE_L4_UDP) { + proto = _ODP_IPPROTO_UDP; + } else if (l4_packet_type == RTE_PTYPE_L4_TCP) { + proto = _ODP_IPPROTO_TCP; + } else { + proto = ipv4->proto; + frag_offset = _odp_be_to_cpu_16(ipv4->frag_offset); + + /* A packet is a fragment if: + * "more fragments" flag is set (all fragments except the last) + * OR + * "fragment offset" field is nonzero (all fragments except + * the first) + */ + if (odp_unlikely(l4_packet_type == RTE_PTYPE_L4_FRAG || + _ODP_IPV4HDR_IS_FRAGMENT(frag_offset))) + prs->input_flags.ipfrag = 1; + } + + /**/ + /* Handle IPv4 broadcast / multicast */ + if (odp_unlikely(dstaddr == 0xffffffff)) + prs->input_flags.ip_bcast = 1; + + if (odp_unlikely((dstaddr >> 28) == 0xe)) + prs->input_flags.ip_mcast = 1; + + return proto; +} + +static inline uint8_t dpdk_parse_ipv6(packet_parser_t *prs, + const uint8_t **parseptr, + uint32_t *offset, uint32_t frame_len, + uint32_t seg_len, + uint32_t mbuf_packet_type) +{ + const _odp_ipv6hdr_t *ipv6 = (const _odp_ipv6hdr_t *)*parseptr; + const _odp_ipv6hdr_ext_t *ipv6ext; + uint32_t dstaddr0 = _odp_be_to_cpu_32(ipv6->dst_addr.u8[0]); + uint32_t l3_len = _odp_be_to_cpu_16(ipv6->payload_len) + + _ODP_IPV6HDR_LEN; + uint32_t l4_packet_type = mbuf_packet_type & RTE_PTYPE_L4_MASK; + + /* Basic sanity checks on IPv6 header */ + if ((_odp_be_to_cpu_32(ipv6->ver_tc_flow) >> 28) != 6 || + l3_len > frame_len - *offset) { + prs->flags.ip_err = 1; + return 0; + } + + /* IPv6 broadcast / multicast flags */ + prs->input_flags.ip_mcast = (dstaddr0 & 0xff000000) == 0xff000000; + prs->input_flags.ip_bcast = 0; + + /* Skip past IPv6 header */ + *offset += sizeof(_odp_ipv6hdr_t); + *parseptr += sizeof(_odp_ipv6hdr_t); + + if (l4_packet_type == RTE_PTYPE_L4_UDP) + return _ODP_IPPROTO_UDP; + else if (l4_packet_type == RTE_PTYPE_L4_TCP) + return _ODP_IPPROTO_TCP; + + /* Skip past any IPv6 extension headers */ + if (ipv6->next_hdr == _ODP_IPPROTO_HOPOPTS || + ipv6->next_hdr == _ODP_IPPROTO_ROUTE) { + prs->input_flags.ipopt = 1; + + do { + ipv6ext = (const _odp_ipv6hdr_ext_t *)*parseptr; + uint16_t extlen = 8 + ipv6ext->ext_len * 8; + + *offset += extlen; + *parseptr += extlen; + } while ((ipv6ext->next_hdr == _ODP_IPPROTO_HOPOPTS || + ipv6ext->next_hdr == _ODP_IPPROTO_ROUTE) && + *offset < seg_len); + + if (*offset >= prs->l3_offset + + _odp_be_to_cpu_16(ipv6->payload_len)) { + prs->flags.ip_err = 1; + return 0; + } + + if (ipv6ext->next_hdr == _ODP_IPPROTO_FRAG) + prs->input_flags.ipfrag = 1; + + return ipv6ext->next_hdr; + } + + if (odp_unlikely(ipv6->next_hdr == _ODP_IPPROTO_FRAG)) { + prs->input_flags.ipopt = 1; + prs->input_flags.ipfrag = 1; + } + + return ipv6->next_hdr; +} + +/** + * Parser helper function for TCP + */ +static inline void dpdk_parse_tcp(packet_parser_t *prs, + const uint8_t **parseptr) +{ + const _odp_tcphdr_t *tcp = (const _odp_tcphdr_t *)*parseptr; + uint32_t len = tcp->hl * 4; + + if (odp_unlikely(tcp->hl < sizeof(_odp_tcphdr_t) / sizeof(uint32_t))) + prs->flags.tcp_err = 1; + + *parseptr += len; +} + +/** + * Parser helper function for UDP + */ +static inline void dpdk_parse_udp(packet_parser_t *prs, + const uint8_t **parseptr) +{ + const _odp_udphdr_t *udp = (const _odp_udphdr_t *)*parseptr; + uint32_t udplen = _odp_be_to_cpu_16(udp->length); + uint16_t ipsec_port = _odp_cpu_to_be_16(_ODP_UDP_IPSEC_PORT); + + if (odp_unlikely(udplen < sizeof(_odp_udphdr_t))) + prs->flags.udp_err = 1; + + if (odp_unlikely(ipsec_port == udp->dst_port && udplen > 4)) { + uint32_t val; + + memcpy(&val, udp + 1, 4); + if (val != 0) { + prs->input_flags.ipsec = 1; + prs->input_flags.ipsec_udp = 1; + } + } + + *parseptr += sizeof(_odp_udphdr_t); +} + +static inline +int dpdk_packet_parse_common_l3_l4(packet_parser_t *prs, + const uint8_t *parseptr, + uint32_t offset, + uint32_t frame_len, uint32_t seg_len, + int layer, uint16_t ethtype, + uint32_t mbuf_packet_type) +{ + uint8_t ip_proto; + + prs->l3_offset = offset; + + if (odp_unlikely(layer <= ODP_PROTO_LAYER_L2)) + return prs->flags.all.error != 0; + + /* Set l3 flag only for known ethtypes */ + prs->input_flags.l3 = 1; + + /* Parse Layer 3 headers */ + switch (ethtype) { + case _ODP_ETHTYPE_IPV4: + prs->input_flags.ipv4 = 1; + ip_proto = dpdk_parse_ipv4(prs, &parseptr, &offset, frame_len, + mbuf_packet_type); + prs->l4_offset = offset; + break; + + case _ODP_ETHTYPE_IPV6: + prs->input_flags.ipv6 = 1; + ip_proto = dpdk_parse_ipv6(prs, &parseptr, &offset, frame_len, + seg_len, mbuf_packet_type); + prs->l4_offset = offset; + break; + + case _ODP_ETHTYPE_ARP: + prs->input_flags.arp = 1; + ip_proto = 255; /* Reserved invalid by IANA */ + break; + + default: + prs->input_flags.l3 = 0; + ip_proto = 255; /* Reserved invalid by IANA */ + } + + if (layer == ODP_PROTO_LAYER_L3) + return prs->flags.all.error != 0; + + /* Set l4 flag only for known ip_proto */ + prs->input_flags.l4 = 1; + + /* Parse Layer 4 headers */ + switch (ip_proto) { + case _ODP_IPPROTO_ICMPV4: + /* Fall through */ + + case _ODP_IPPROTO_ICMPV6: + prs->input_flags.icmp = 1; + break; + + case _ODP_IPPROTO_IPIP: + /* Do nothing */ + break; + + case _ODP_IPPROTO_TCP: + if (odp_unlikely(offset + _ODP_TCPHDR_LEN > seg_len)) + return -1; + prs->input_flags.tcp = 1; + dpdk_parse_tcp(prs, &parseptr); + break; + + case _ODP_IPPROTO_UDP: + if (odp_unlikely(offset + _ODP_UDPHDR_LEN > seg_len)) + return -1; + prs->input_flags.udp = 1; + dpdk_parse_udp(prs, &parseptr); + break; + + case _ODP_IPPROTO_AH: + prs->input_flags.ipsec = 1; + prs->input_flags.ipsec_ah = 1; + break; + + case _ODP_IPPROTO_ESP: + prs->input_flags.ipsec = 1; + prs->input_flags.ipsec_esp = 1; + break; + + case _ODP_IPPROTO_SCTP: + prs->input_flags.sctp = 1; + break; + + case _ODP_IPPROTO_NO_NEXT: + prs->input_flags.no_next_hdr = 1; + break; + + default: + prs->input_flags.l4 = 0; + break; + } + + return prs->flags.all.error != 0; +} + +/** + * DPDK packet parser + */ +int dpdk_packet_parse_common(packet_parser_t *prs, const uint8_t *ptr, + uint32_t frame_len, uint32_t seg_len, + struct rte_mbuf *mbuf, int layer) +{ + uint32_t offset; + uint16_t ethtype; + const uint8_t *parseptr; + uint32_t mbuf_packet_type; + + parseptr = ptr; + offset = 0; + + if (odp_unlikely(layer == ODP_PROTO_LAYER_NONE)) + return 0; + + mbuf_packet_type = mbuf->packet_type; + + /* Assume valid L2 header, no CRC/FCS check in SW */ + prs->l2_offset = offset; + + ethtype = dpdk_parse_eth(prs, &parseptr, &offset, frame_len, + mbuf_packet_type); + + return dpdk_packet_parse_common_l3_l4(prs, parseptr, offset, frame_len, + seg_len, layer, ethtype, + mbuf_packet_type); +} + +#endif /* ODP_PKTIO_DPDK */ commit df1c292ed40d4c2c480917f1eab06a046c93c3b1 Author: Bogdan Pricope <bogdan.pricope(a)linaro.org> Date: Wed May 2 11:29:48 2018 +0300 linux-gen: classification: permit packet parsing at pktio level This change is needed to support pktio specific parsers. Signed-off-by: Bogdan Pricope <bogdan.pricope(a)linaro.org> Reviewed-and-tested-by: Matias Elo <matias.elo(a)nokia.com> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/include/odp_classification_internal.h b/platform/linux-generic/include/odp_classification_internal.h index 47f80dc2..84d605e6 100644 --- a/platform/linux-generic/include/odp_classification_internal.h +++ b/platform/linux-generic/include/odp_classification_internal.h @@ -39,7 +39,7 @@ selects destination queue and packet pool based on selected PMR and CoS. **/ int cls_classify_packet(pktio_entry_t *entry, const uint8_t *base, uint16_t pkt_len, uint32_t seg_len, odp_pool_t *pool, - odp_packet_hdr_t *pkt_hdr); + odp_packet_hdr_t *pkt_hdr, odp_bool_t parse); /** Packet IO classifier init diff --git a/platform/linux-generic/odp_classification.c b/platform/linux-generic/odp_classification.c index 14720924..46fcf67e 100644 --- a/platform/linux-generic/odp_classification.c +++ b/platform/linux-generic/odp_classification.c @@ -987,17 +987,19 @@ static uint32_t packet_rss_hash(odp_packet_hdr_t *pkt_hdr, */ int cls_classify_packet(pktio_entry_t *entry, const uint8_t *base, uint16_t pkt_len, uint32_t seg_len, odp_pool_t *pool, - odp_packet_hdr_t *pkt_hdr) + odp_packet_hdr_t *pkt_hdr, odp_bool_t parse) { cos_t *cos; uint32_t tbl_index; uint32_t hash; - packet_parse_reset(pkt_hdr); - packet_set_len(pkt_hdr, pkt_len); + if (parse) { + packet_parse_reset(pkt_hdr); + packet_set_len(pkt_hdr, pkt_len); - packet_parse_common(&pkt_hdr->p, base, pkt_len, seg_len, - ODP_PROTO_LAYER_ALL); + packet_parse_common(&pkt_hdr->p, base, pkt_len, seg_len, + ODP_PROTO_LAYER_ALL); + } cos = cls_select_cos(entry, base, pkt_hdr); if (cos == NULL) diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c index 14d59d8e..c8d7d0d4 100644 --- a/platform/linux-generic/pktio/dpdk.c +++ b/platform/linux-generic/pktio/dpdk.c @@ -533,7 +533,7 @@ static inline int mbuf_to_pkt(pktio_entry_t *pktio_entry, if (cls_classify_packet(pktio_entry, (const uint8_t *)data, pkt_len, pkt_len, &pool, - &parsed_hdr)) + &parsed_hdr, true)) goto fail; } @@ -778,7 +778,7 @@ static inline int mbuf_to_pkt_zero(pktio_entry_t *pktio_entry, if (cls_classify_packet(pktio_entry, (const uint8_t *)data, pkt_len, pkt_len, &pool, - &parsed_hdr)) + &parsed_hdr, true)) ODP_ERR("Unable to classify packet\n"); rte_pktmbuf_free(mbuf); continue; diff --git a/platform/linux-generic/pktio/loop.c b/platform/linux-generic/pktio/loop.c index fc80e801..779e4c62 100644 --- a/platform/linux-generic/pktio/loop.c +++ b/platform/linux-generic/pktio/loop.c @@ -131,7 +131,7 @@ static int loopback_recv(pktio_entry_t *pktio_entry, int index ODP_UNUSED, ret = cls_classify_packet(pktio_entry, pkt_addr, pkt_len, seg_len, - &new_pool, pkt_hdr); + &new_pool, pkt_hdr, true); if (ret) { failed++; odp_packet_free(pkt); diff --git a/platform/linux-generic/pktio/netmap.c b/platform/linux-generic/pktio/netmap.c index 835d81eb..567bc9f9 100644 --- a/platform/linux-generic/pktio/netmap.c +++ b/platform/linux-generic/pktio/netmap.c @@ -705,7 +705,7 @@ static inline int netmap_pkt_to_odp(pktio_entry_t *pktio_entry, if (pktio_cls_enabled(pktio_entry)) { if (cls_classify_packet(pktio_entry, (const uint8_t *)slot.buf, len, - len, &pool, &parsed_hdr)) + len, &pool, &parsed_hdr, true)) goto fail; } diff --git a/platform/linux-generic/pktio/socket.c b/platform/linux-generic/pktio/socket.c index f6f3288c..8b7200e6 100644 --- a/platform/linux-generic/pktio/socket.c +++ b/platform/linux-generic/pktio/socket.c @@ -655,7 +655,8 @@ static int sock_mmsg_recv(pktio_entry_t *pktio_entry, int index ODP_UNUSED, seg_len = msgvec[i].msg_hdr.msg_iov->iov_len; if (cls_classify_packet(pktio_entry, base, pkt_len, - seg_len, &pool, pkt_hdr)) { + seg_len, &pool, pkt_hdr, + true)) { ODP_ERR("cls_classify_packet failed"); odp_packet_free(pkt); continue; diff --git a/platform/linux-generic/pktio/socket_mmap.c b/platform/linux-generic/pktio/socket_mmap.c index deaa6da1..847eb71a 100644 --- a/platform/linux-generic/pktio/socket_mmap.c +++ b/platform/linux-generic/pktio/socket_mmap.c @@ -228,7 +228,8 @@ static inline unsigned pkt_mmap_v2_rx(pktio_entry_t *pktio_entry, if (pktio_cls_enabled(pktio_entry)) { if (cls_classify_packet(pktio_entry, pkt_buf, pkt_len, - pkt_len, &pool, &parsed_hdr)) { + pkt_len, &pool, &parsed_hdr, + true)) { mmap_rx_user_ready(ppd.raw); /* drop */ frame_num = next_frame_num; continue; diff --git a/platform/linux-generic/pktio/tap.c b/platform/linux-generic/pktio/tap.c index 56f90b31..af766e0d 100644 --- a/platform/linux-generic/pktio/tap.c +++ b/platform/linux-generic/pktio/tap.c @@ -264,7 +264,7 @@ static odp_packet_t pack_odp_pkt(pktio_entry_t *pktio_entry, const void *data, if (pktio_cls_enabled(pktio_entry)) { if (cls_classify_packet(pktio_entry, data, len, len, &pktio_entry->s.pkt_tap.pool, - &parsed_hdr)) { + &parsed_hdr, true)) { return ODP_PACKET_INVALID; } } ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/Makefile.am | 1 + .../include/odp_classification_internal.h | 2 +- platform/linux-generic/include/odp_packet_dpdk.h | 20 + platform/linux-generic/odp_classification.c | 12 +- platform/linux-generic/pktio/dpdk.c | 124 ++---- platform/linux-generic/pktio/dpdk_parse.c | 492 +++++++++++++++++++++ platform/linux-generic/pktio/loop.c | 2 +- platform/linux-generic/pktio/netmap.c | 2 +- platform/linux-generic/pktio/socket.c | 3 +- platform/linux-generic/pktio/socket_mmap.c | 3 +- platform/linux-generic/pktio/tap.c | 2 +- 11 files changed, 563 insertions(+), 100 deletions(-) create mode 100644 platform/linux-generic/pktio/dpdk_parse.c hooks/post-receive --

8 years, 3 months

[COMMIT] annotated tag v1.19.0.1_tigermoth created. v1.19.0.1_tigermoth

by git＠git-us.linaro.org

8 years, 3 months

[COMMIT] branch master updated. v1.19.0.1_tigermoth-5-g49c671e8

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 49c671e80fd2c88b6f36337ebd1cd4748eb8bae1 (commit) from 11207ff1e211658bfb44c635423ae818a0654239 (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 49c671e80fd2c88b6f36337ebd1cd4748eb8bae1 Author: Ilias Apalodimas <ilias.apalodimas(a)linaro.org> Date: Fri Feb 16 12:12:26 2018 +0200 odp: pktio: add pcapng capture capabilities Introduce new fast pcap capture interface to odp. How to test: sudo mkdir /var/run/odp/ start the ODP application sudo dd if=/var/run/odp/"pid"-ethX-flow-"queue" of=~/t.pcap Signed-off-by: Ilias Apalodimas <ilias.apalodimas(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/.travis.yml b/.travis.yml index cb05b839..886e40f0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -58,6 +58,7 @@ env: - CONF="--disable-static-applications" - CONF="--disable-host-optimization" - CONF="--disable-host-optimization --disable-abi-compat" + - CONF="--enable-pcapng-support" - DPDK_SHARED="y" CONF="--disable-static-applications" compiler: diff --git a/configure.ac b/configure.ac index 11a89b58..f13525de 100644 --- a/configure.ac +++ b/configure.ac @@ -418,4 +418,5 @@ AC_MSG_RESULT([ test_helper: ${test_helper} test_example: ${test_example} user_guides: ${user_guides} + pcapng: ${have_pcapng} ]) diff --git a/doc/users-guide/Makefile.am b/doc/users-guide/Makefile.am index 7be32ddc..6b2e818d 100644 --- a/doc/users-guide/Makefile.am +++ b/doc/users-guide/Makefile.am @@ -7,7 +7,8 @@ SRC = users-guide.adoc \ users-guide-packet.adoc \ users-guide-pktio.adoc \ users-guide-timer.adoc \ - users-guide-tm.adoc + users-guide-tm.adoc \ + users-guide-utilities-examples.adoc TARGET = users-guide.html IMAGES = $(IMAGES_DIR)/overview.svg \ $(IMAGES_DIR)/atomic_queue.svg \ diff --git a/doc/users-guide/users-guide-utilities-examples.adoc b/doc/users-guide/users-guide-utilities-examples.adoc new file mode 100644 index 00000000..e51bbef8 --- /dev/null +++ b/doc/users-guide/users-guide-utilities-examples.adoc @@ -0,0 +1,19 @@ +== Utilities and examples + +=== PcapNg capture +If compiled using `--enable-pcapng-support` ODP will offer packet capturing +functionality in PcapNg format. If the /var/run/odp directory exists prior to +launching the application ODP will create a fifo for each NIC queue. +Queue naming will be of the following format: *<odp global pid>-<NIC +name>-flow-<queue number>*. Linux dd application can be used for capturing a +sample of the live stream from the fifo. Killing ether the application or dd +will stop the capturing process. + +. `./configure --enable-pcapng-support` +. `sudo mkdir /var/run/odp` +. `sudo ./example/generator/odp_generator -I enp2s0 -mu --dstmac +A0:F6:FD:AE:62:6C --dstip 192.168.49.20 --srcmac 2c:56:dc:9a:8f:06 --srcip +192.168.49.4 -i0 -w1` +. `sudo dd if=/var/run/odp/26737-enp2s0-flow-0 of=~/test.pcap` +. `ctrl^c` +. `wireshark ~/test.pcap` diff --git a/doc/users-guide/users-guide.adoc b/doc/users-guide/users-guide.adoc index 7914459e..8ed581f5 100644 --- a/doc/users-guide/users-guide.adoc +++ b/doc/users-guide/users-guide.adoc @@ -1204,4 +1204,6 @@ include::users-guide-tm.adoc[] include::users-guide-cls.adoc[] +include::users-guide-utilities-examples.adoc[] + include::../glossary.adoc[] diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index a73dc61d..f9e99afd 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -115,6 +115,7 @@ noinst_HEADERS = \ include/odp_packet_null.h \ include/odp_packet_socket.h \ include/odp_packet_tap.h \ + include/odp_pcapng.h \ include/odp_pkt_queue_internal.h \ include/odp_pool_internal.h \ include/odp_posix_extensions.h \ @@ -190,6 +191,7 @@ __LIB__libodp_linux_la_SOURCES = \ odp_spinlock.c \ odp_spinlock_recursive.c \ odp_system_info.c \ + odp_pcapng.c \ odp_thread.c \ odp_thrmask.c \ odp_time.c \ diff --git a/platform/linux-generic/include/odp_internal.h b/platform/linux-generic/include/odp_internal.h index 153c787e..f39b6152 100644 --- a/platform/linux-generic/include/odp_internal.h +++ b/platform/linux-generic/include/odp_internal.h @@ -24,6 +24,7 @@ extern "C" { #include <stdio.h> #include <sys/types.h> #include <libconfig.h> +#include <pthread.h> #define MAX_CPU_NUMBER 128 #define UID_MAXLEN 30 @@ -58,7 +59,10 @@ struct odp_global_data_s { int num_cpus_installed; config_t libconfig_default; config_t libconfig_runtime; - + int inotify_pcapng_fd; + int inotify_watch_fd; + pthread_t inotify_thread; + int inotify_pcapng_is_running; }; enum init_stage { diff --git a/platform/linux-generic/include/odp_packet_io_internal.h b/platform/linux-generic/include/odp_packet_io_internal.h index e4852cc9..4be4b151 100644 --- a/platform/linux-generic/include/odp_packet_io_internal.h +++ b/platform/linux-generic/include/odp_packet_io_internal.h @@ -182,6 +182,15 @@ struct pktio_entry { odp_queue_t queue; odp_pktout_queue_t pktout; } out_queue[PKTIO_MAX_QUEUES]; + + /**< inotify instance for pcapng fifos */ + struct { + enum { + PCAPNG_WR_STOP = 0, + PCAPNG_WR_PKT, + } state[PKTIO_MAX_QUEUES]; + int fd[PKTIO_MAX_QUEUES]; + } pcapng; }; typedef union { diff --git a/platform/linux-generic/include/odp_pcapng.h b/platform/linux-generic/include/odp_pcapng.h new file mode 100644 index 00000000..8e0e624e --- /dev/null +++ b/platform/linux-generic/include/odp_pcapng.h @@ -0,0 +1,56 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <sys/types.h> + +#include <odp_packet_io_internal.h> + +#define PCAPNG_BLOCK_TYPE_EPB 0x00000006UL +#define PCAPNG_BLOCK_TYPE_SHB 0x0A0D0D0AUL +#define PCAPNG_BLOCK_TYPE_IDB 0x00000001UL +#define PCAPNG_ENDIAN_MAGIC 0x1A2B3C4DUL +#define PCAPNG_DATA_ALIGN 4 +#define PCAPNG_LINKTYPE_ETHERNET 0x1 + +/* inotify */ +#define INOTIFY_BUF_LEN (16 * (sizeof(struct inotify_event))) +#define PCAPNG_WATCH_DIR "/var/run/odp/" + +/* pcapng: enhanced packet block file encoding */ +typedef struct ODP_PACKED pcapng_section_hdr_block_s { + uint32_t block_type; + uint32_t block_total_length; + uint32_t magic; + uint16_t version_major; + uint16_t version_minor; + int64_t section_len; + uint32_t block_total_length2; +} pcapng_section_hdr_block_t; + +typedef struct pcapng_interface_description_block { + uint32_t block_type; + uint32_t block_total_length; + uint16_t linktype; + uint16_t reserved; + uint32_t snaplen; + uint32_t block_total_length2; +} pcapng_interface_description_block_t; + +typedef struct pcapng_enhanced_packet_block_s { + uint32_t block_type; + uint32_t block_total_length; + uint32_t interface_idx; + uint32_t timestamp_high; + uint32_t timestamp_low; + uint32_t captured_len; + uint32_t packet_len; +} pcapng_enhanced_packet_block_t; + +int pcapng_prepare(pktio_entry_t *entry); +void pcapng_destroy(pktio_entry_t *entry); +int write_pcapng_hdr(pktio_entry_t *entry, int qidx); +int write_pcapng_pkts(pktio_entry_t *entry, int qidx, + const odp_packet_t packets[], int num); diff --git a/platform/linux-generic/m4/configure.m4 b/platform/linux-generic/m4/configure.m4 index 7cf0a9b6..951704ed 100644 --- a/platform/linux-generic/m4/configure.m4 +++ b/platform/linux-generic/m4/configure.m4 @@ -8,6 +8,7 @@ ODP_TIMER ODP_OPENSSL ODP_LIBCONFIG([linux-generic]) m4_include([platform/linux-generic/m4/odp_pcap.m4]) +m4_include([platform/linux-generic/m4/odp_pcapng.m4]) m4_include([platform/linux-generic/m4/odp_netmap.m4]) m4_include([platform/linux-generic/m4/odp_dpdk.m4]) ODP_SCHEDULER diff --git a/platform/linux-generic/m4/odp_pcapng.m4 b/platform/linux-generic/m4/odp_pcapng.m4 new file mode 100644 index 00000000..44274c26 --- /dev/null +++ b/platform/linux-generic/m4/odp_pcapng.m4 @@ -0,0 +1,18 @@ +########################################################################## +# Enable PCAPNG support +########################################################################## +have_pcapng=no +pcapng_support=0 + +AC_ARG_ENABLE([pcapng-support], + [AS_HELP_STRING([--enable-pcapng-support], + [enable experimental tcpdump for pktios])], + have_pcapng=$enableval + [if test x$enableval = xyes; then + pcapng_support=1 + fi]) + +AC_DEFINE_UNQUOTED([_ODP_PCAPNG], [$pcapng_support], + [Define to 1 to enable pcapng support]) + +AM_CONDITIONAL([have_pcapng], [test x$have_pcapng = xyes]) diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c index bf7aef14..7b211c45 100644 --- a/platform/linux-generic/odp_packet_io.c +++ b/platform/linux-generic/odp_packet_io.c @@ -25,6 +25,7 @@ #include <odp_debug_internal.h> #include <odp_packet_io_ipc_internal.h> #include <odp/api/time.h> +#include <odp_pcapng.h> #include <string.h> #include <inttypes.h> @@ -512,6 +513,11 @@ int odp_pktio_start(odp_pktio_t hdl) ODP_DBG("interface: %s, input queues: %u, output queues: %u\n", entry->s.name, entry->s.num_in_queue, entry->s.num_out_queue); + if (_ODP_PCAPNG) { + if (pcapng_prepare(entry)) + ODP_ERR("pcap init failed, won't capture\n"); + } + return res; } @@ -536,6 +542,9 @@ static int _pktio_stop(pktio_entry_t *entry) else entry->s.state = PKTIO_STATE_STOPPED; + if (_ODP_PCAPNG) + pcapng_destroy(entry); + return res; } @@ -1746,10 +1755,18 @@ int odp_pktout_queue(odp_pktio_t pktio, odp_pktout_queue_t queues[], int num) return num_queues; } +static inline void _odp_dump_pcapng_pkts(pktio_entry_t *entry, int qidx, + const odp_packet_t packets[], int num) +{ + if (odp_unlikely(entry->s.pcapng.state[qidx] == PCAPNG_WR_PKT)) + write_pcapng_pkts(entry, qidx, packets, num); +} + int odp_pktin_recv(odp_pktin_queue_t queue, odp_packet_t packets[], int num) { pktio_entry_t *entry; odp_pktio_t pktio = queue.pktio; + int ret; entry = get_pktio_entry(pktio); if (entry == NULL) { @@ -1757,7 +1774,11 @@ int odp_pktin_recv(odp_pktin_queue_t queue, odp_packet_t packets[], int num) return -1; } - return entry->s.ops->recv(entry, queue.index, packets, num); + ret = entry->s.ops->recv(entry, queue.index, packets, num); + if (_ODP_PCAPNG) + _odp_dump_pcapng_pkts(entry, queue.index, packets, ret); + + return ret; } int odp_pktin_recv_tmo(odp_pktin_queue_t queue, odp_packet_t packets[], int num, @@ -1779,12 +1800,19 @@ int odp_pktin_recv_tmo(odp_pktin_queue_t queue, odp_packet_t packets[], int num, return -1; } - if (entry->s.ops->recv_tmo && wait != ODP_PKTIN_NO_WAIT) - return entry->s.ops->recv_tmo(entry, queue.index, packets, num, + if (entry->s.ops->recv_tmo && wait != ODP_PKTIN_NO_WAIT) { + ret = entry->s.ops->recv_tmo(entry, queue.index, packets, num, wait); + if (_ODP_PCAPNG) + _odp_dump_pcapng_pkts(entry, queue.index, packets, ret); + + return ret; + } while (1) { ret = entry->s.ops->recv(entry, queue.index, packets, num); + if (_ODP_PCAPNG) + _odp_dump_pcapng_pkts(entry, queue.index, packets, ret); if (ret != 0 || wait == 0) return ret; @@ -1827,6 +1855,7 @@ int odp_pktin_recv_mq_tmo(const odp_pktin_queue_t queues[], unsigned num_q, int started = 0; uint64_t sleep_round = 0; int trial_successful = 0; + unsigned int lfrom = 0; for (i = 0; i < num_q; i++) { ret = odp_pktin_recv(queues[i], packets, num); @@ -1841,11 +1870,23 @@ int odp_pktin_recv_mq_tmo(const odp_pktin_queue_t queues[], unsigned num_q, if (wait == 0) return 0; - ret = sock_recv_mq_tmo_try_int_driven(queues, num_q, from, + ret = sock_recv_mq_tmo_try_int_driven(queues, num_q, &lfrom, packets, num, wait, &trial_successful); - if (trial_successful) + if (ret > 0 && from) + *from = lfrom; + if (trial_successful) { + if (_ODP_PCAPNG) { + pktio_entry_t *entry; + + entry = get_pktio_entry(queues[lfrom].pktio); + if (entry) + _odp_dump_pcapng_pkts(entry, lfrom, packets, + ret); + } + return ret; + } ts.tv_sec = 0; ts.tv_nsec = 1000 * SLEEP_USEC; @@ -1911,6 +1952,9 @@ int odp_pktout_send(odp_pktout_queue_t queue, const odp_packet_t packets[], return -1; } + if (_ODP_PCAPNG) + _odp_dump_pcapng_pkts(entry, queue.index, packets, num); + return entry->s.ops->send(entry, queue.index, packets, num); } diff --git a/platform/linux-generic/odp_pcapng.c b/platform/linux-generic/odp_pcapng.c new file mode 100644 index 00000000..b8d29e5a --- /dev/null +++ b/platform/linux-generic/odp_pcapng.c @@ -0,0 +1,434 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include "config.h" + +#if defined(_ODP_PCAPNG) && _ODP_PCAPNG == 1 + +#include <odp_macros_internal.h> +#include <odp_packet_io_internal.h> +#include <odp/api/plat/packet_inlines.h> +#include <odp_posix_extensions.h> +#include <odp_pcapng.h> + +#include <errno.h> +#include <fcntl.h> +#include <limits.h> +#include <pthread.h> +#include <unistd.h> +#include <sys/stat.h> +#include <sys/uio.h> +#include <sys/inotify.h> +#include <sys/select.h> + +static void pcapng_drain_fifo(int fd) +{ + char buffer[4096]; + ssize_t len; + + do { + len = read(fd, buffer, sizeof(buffer)); + } while (len > 0); +} + +static void inotify_event_handle(pktio_entry_t *entry, int qidx, + struct inotify_event *event) +{ + int mtu = MAX(odp_pktin_maxlen(entry->s.handle), + odp_pktout_maxlen(entry->s.handle)); + + if (event->mask & IN_OPEN) { + int ret; + + if (PIPE_BUF < mtu + sizeof(pcapng_enhanced_packet_block_t) + + sizeof(uint32_t)) { + ODP_ERR("PIPE_BUF:%d too small. Disabling pcap\n", + PIPE_BUF); + entry->s.pcapng.state[qidx] = PCAPNG_WR_STOP; + + return; + } + + ret = write_pcapng_hdr(entry, qidx); + if (ret) { + entry->s.pcapng.state[qidx] = PCAPNG_WR_STOP; + } else { + entry->s.pcapng.state[qidx] = PCAPNG_WR_PKT; + ODP_DBG("Open %s for pcap tracing\n", event->name); + } + } else if (event->mask & IN_CLOSE) { + int fd = entry->s.pcapng.fd[qidx]; + + pcapng_drain_fifo(fd); + entry->s.pcapng.state[qidx] = PCAPNG_WR_STOP; + ODP_DBG("Close %s for pcap tracing\n", event->name); + } else { + ODP_ERR("Unknown inotify event 0x%08x\n", event->mask); + } +} + +static void get_pcapng_fifo_name(char *pcapng_entry, size_t len, + char *pktio_name, int qidx) +{ + snprintf(pcapng_entry, len, "%d-%s-flow-%d", + odp_global_data.main_pid, pktio_name, qidx); + pcapng_entry[len - 1] = 0; +} + +static int get_qidx_from_fifo(pktio_entry_t *entry, char *name) +{ + unsigned int max_queue = + MAX(entry->s.num_in_queue, entry->s.num_out_queue); + unsigned int i; + + for (i = 0; i < max_queue; i++) { + char pcapng_entry[256]; + + get_pcapng_fifo_name(pcapng_entry, sizeof(pcapng_entry), + entry->s.name, i); + /* + * verify we still talk to a fifo before returning a valid + * queue number + */ + if (strcmp(name, pcapng_entry) == 0) { + struct stat fstat; + char pcapng_path[256]; + + snprintf(pcapng_path, sizeof(pcapng_path), "%s/%s", + PCAPNG_WATCH_DIR, name); + stat(pcapng_path, &fstat); + + return S_ISFIFO(fstat.st_mode) ? (int)i : -1; + } + } + + return -1; +} + +static void *inotify_update(void *arg) +{ + pktio_entry_t *entry = (pktio_entry_t *)arg; + struct timeval time; + ssize_t rdlen; + int offset; + char buffer[INOTIFY_BUF_LEN]; + fd_set rfds; + + while (1) { + offset = 0; + FD_ZERO(&rfds); + FD_SET(odp_global_data.inotify_pcapng_fd, &rfds); + time.tv_sec = 2; + time.tv_usec = 0; + select(odp_global_data.inotify_pcapng_fd + 1, &rfds, NULL, + NULL, &time); + if (FD_ISSET(odp_global_data.inotify_pcapng_fd, &rfds)) { + rdlen = read(odp_global_data.inotify_pcapng_fd, + buffer, INOTIFY_BUF_LEN); + while (offset < rdlen) { + int qidx; + struct inotify_event *event = + (struct inotify_event *)(void *) + &buffer[offset]; + + qidx = get_qidx_from_fifo(entry, event->name); + if (qidx == -1) { + offset += sizeof(struct inotify_event) + + event->len; + continue; + } + + inotify_event_handle(entry, qidx, event); + offset += sizeof(struct inotify_event) + + event->len; + } + } + } + + return NULL; +} + +static int get_fifo_max_size(void) +{ + FILE *file; + char buf[128]; + int ret = -1; + + file = fopen("/proc/sys/fs/pipe-max-size", "r"); + if (file == NULL) + return ret; + + if (fgets(buf, sizeof(buf), file)) + ret = atoi(buf); + + fclose(file); + + return ret; +} + +int pcapng_prepare(pktio_entry_t *entry) +{ + int ret = -1, fd; + pthread_attr_t attr; + unsigned int i; + unsigned int max_queue = + MAX(entry->s.num_in_queue, entry->s.num_out_queue); + int fifo_sz; + + fifo_sz = get_fifo_max_size(); + if (fifo_sz < 0) + ODP_DBG("failed to read max fifo size\n"); + + for (i = 0; i < max_queue; i++) { + char pcapng_name[128]; + char pcapng_path[256]; + + entry->s.pcapng.fd[i] = -1; + entry->s.pcapng.state[i] = PCAPNG_WR_STOP; + + get_pcapng_fifo_name(pcapng_name, sizeof(pcapng_name), + entry->s.name, i); + snprintf(pcapng_path, sizeof(pcapng_path), "%s/%s", + PCAPNG_WATCH_DIR, pcapng_name); + if (mkfifo(pcapng_path, O_RDWR)) { + ODP_ERR("pcap not available for %s %s\n", + pcapng_path, strerror(errno)); + continue; + } + + fd = open(pcapng_path, O_RDWR | O_NONBLOCK); + if (fd == -1) { + ODP_ERR("Fail to open fifo\n"); + entry->s.pcapng.state[i] = PCAPNG_WR_STOP; + if (remove(pcapng_path) == -1) + ODP_ERR("Can't remove fifo %s\n", pcapng_path); + continue; + } + + if (fifo_sz > 0) { + if (fcntl(fd, F_SETPIPE_SZ, fifo_sz) != fifo_sz) + ODP_DBG("Failed to set max fifo size\n"); + else + ODP_DBG("set pcap fifo size %i\n", fifo_sz); + } + + entry->s.pcapng.fd[i] = fd; + } + + /* already running from a previous pktio */ + if (odp_global_data.inotify_pcapng_is_running == 1) + return 0; + + odp_global_data.inotify_pcapng_fd = -1; + odp_global_data.inotify_watch_fd = -1; + + odp_global_data.inotify_pcapng_fd = inotify_init(); + if (odp_global_data.inotify_pcapng_fd == -1) { + ODP_ERR("can't init inotify. pcap disabled\n"); + goto out_destroy; + } + + odp_global_data.inotify_watch_fd = + inotify_add_watch(odp_global_data.inotify_pcapng_fd, + PCAPNG_WATCH_DIR, IN_CLOSE | IN_OPEN); + + if (odp_global_data.inotify_watch_fd == -1) { + ODP_ERR("can't register inotify for %s. pcap disabled\n", + strerror(errno)); + goto out_destroy; + } + + /* create a thread to poll inotify triggers */ + pthread_attr_init(&attr); + ret = pthread_create(&odp_global_data.inotify_thread, &attr, + inotify_update, entry); + if (ret) + ODP_ERR("can't start inotify thread. pcap disabled\n"); + else + odp_global_data.inotify_pcapng_is_running = 1; + + return ret; + +out_destroy: + pcapng_destroy(entry); + + return ret; +} + +void pcapng_destroy(pktio_entry_t *entry) +{ + int ret; + unsigned int i; + unsigned int max_queue = + MAX(entry->s.num_in_queue, entry->s.num_out_queue); + + if (odp_global_data.inotify_pcapng_is_running == 1) { + ret = pthread_cancel(odp_global_data.inotify_thread); + if (ret) + ODP_ERR("can't cancel inotify thread %s\n", + strerror(errno)); + } + + /* fd's will be -1 in case of any failure */ + ret = inotify_rm_watch(odp_global_data.inotify_pcapng_fd, + odp_global_data.inotify_watch_fd); + if (ret) + ODP_ERR("can't deregister inotify %s\n", strerror(errno)); + + if (odp_global_data.inotify_pcapng_fd != -1) + close(odp_global_data.inotify_pcapng_fd); + + if (odp_global_data.inotify_watch_fd != -1) + close(odp_global_data.inotify_watch_fd); + + for (i = 0; i < max_queue; i++) { + char pcapng_name[128]; + char pcapng_path[256]; + + entry->s.pcapng.state[i] = PCAPNG_WR_STOP; + close(entry->s.pcapng.fd[i]); + + get_pcapng_fifo_name(pcapng_name, sizeof(pcapng_name), + entry->s.name, i); + snprintf(pcapng_path, sizeof(pcapng_path), "%s/%s", + PCAPNG_WATCH_DIR, pcapng_name); + + if (remove(pcapng_path)) + ODP_ERR("can't delete fifo %s\n", pcapng_path); + } +} + +int write_pcapng_hdr(pktio_entry_t *entry, int qidx) +{ + size_t len; + pcapng_section_hdr_block_t shb; + pcapng_interface_description_block_t idb; + int fd = entry->s.pcapng.fd[qidx]; + + memset(&shb, 0, sizeof(shb)); + memset(&idb, 0, sizeof(idb)); + + shb.block_type = PCAPNG_BLOCK_TYPE_SHB; + shb.block_total_length = sizeof(shb); + shb.block_total_length2 = sizeof(shb); + shb.magic = PCAPNG_ENDIAN_MAGIC; + shb.version_major = 0x1; + shb.version_minor = 0x0; + shb.section_len = -1; + + len = write(fd, &shb, sizeof(shb)); + /* fail to write shb/idb means the pcapng is unreadable */ + if (len != sizeof(shb)) { + ODP_ERR("Failed to write pcapng section hdr\n"); + return -1; + } + fsync(fd); + + idb.block_type = PCAPNG_BLOCK_TYPE_IDB; + idb.block_total_length = sizeof(idb); + idb.block_total_length2 = sizeof(idb); + idb.linktype = PCAPNG_LINKTYPE_ETHERNET; + idb.snaplen = 0x0; /* unlimited */ + len = write(fd, &idb, sizeof(idb)); + if (len != sizeof(idb)) { + ODP_ERR("Failed to write pcapng interface description\n"); + return -1; + } + fsync(fd); + + return 0; +} + +/* + * make sure that each fifo write is less than PIPE_BUF + * this will make sure writes are atomic (on non blocking mode). + * writev() transfers all the data and returns the number of bytes requested or + * -EAGAIN + */ +static ssize_t write_fifo(int fd, struct iovec *iov, int iovcnt) +{ + ssize_t len = 0; + + len = writev(fd, iov, iovcnt); + /* + * we don't care if a writev fails, we asynchronously read the fifo + * so the next block of packets might be successful. This error only + * means that some packets failed to append on the pcap file + */ + if (len > 0) + fsync(fd); + + return len; +} + +int write_pcapng_pkts(pktio_entry_t *entry, int qidx, + const odp_packet_t packets[], int num) +{ + int i = 0; + struct iovec packet_iov[3 * num]; + pcapng_enhanced_packet_block_t epb[num]; + int iovcnt = 0; + ssize_t block_len = 0; + int fd = entry->s.pcapng.fd[qidx]; + ssize_t len = 0, wlen; + + for (i = 0; i < num; i++) { + odp_packet_hdr_t *pkt_hdr = packet_hdr(packets[i]); + uint32_t seg_len; + char *buf = (char *)odp_packet_offset(packets[i], 0, &seg_len, + NULL); + + if (block_len + sizeof(epb[i]) + + ROUNDUP_ALIGN(seg_len, PCAPNG_DATA_ALIGN) + + sizeof(uint32_t) > PIPE_BUF) { + wlen = write_fifo(fd, packet_iov, iovcnt); + if (wlen > 0) { + len += wlen; + block_len = 0; + iovcnt = 0; + } + } + epb[i].block_type = PCAPNG_BLOCK_TYPE_EPB; + epb[i].block_total_length = sizeof(epb[i]) + + ROUNDUP_ALIGN(seg_len, PCAPNG_DATA_ALIGN) + + PCAPNG_DATA_ALIGN; + epb[i].interface_idx = 0; + epb[i].timestamp_high = + (uint32_t)(pkt_hdr->timestamp.u64 >> 32); + epb[i].timestamp_low = (uint32_t)(pkt_hdr->timestamp.u64); + epb[i].captured_len = seg_len; + epb[i].packet_len = seg_len; + + /* epb */ + packet_iov[iovcnt].iov_base = &epb[i]; + packet_iov[iovcnt].iov_len = sizeof(epb[i]); + block_len += packet_iov[iovcnt].iov_len; + iovcnt++; + + /* data */ + packet_iov[iovcnt].iov_base = buf; + packet_iov[iovcnt].iov_len = + ROUNDUP_ALIGN(seg_len, PCAPNG_DATA_ALIGN); + block_len += packet_iov[iovcnt].iov_len; + iovcnt++; + + /* trailing */ + packet_iov[iovcnt].iov_base = &epb[i].block_total_length; + packet_iov[iovcnt].iov_len = sizeof(uint32_t); + block_len += packet_iov[iovcnt].iov_len; + iovcnt++; + } + + if (iovcnt) { + wlen = write_fifo(fd, packet_iov, iovcnt); + if (wlen > 0) + len += wlen; + } + + return len; +} + +#endif /* _ODP_PCAPNG */ ----------------------------------------------------------------------- Summary of changes: .travis.yml | 1 + configure.ac | 1 + doc/users-guide/Makefile.am | 3 +- .../users-guide-utilities-examples.adoc | 19 + doc/users-guide/users-guide.adoc | 2 + platform/linux-generic/Makefile.am | 2 + platform/linux-generic/include/odp_internal.h | 6 +- .../linux-generic/include/odp_packet_io_internal.h | 9 + platform/linux-generic/include/odp_pcapng.h | 56 +++ platform/linux-generic/m4/configure.m4 | 1 + platform/linux-generic/m4/odp_pcapng.m4 | 18 + platform/linux-generic/odp_packet_io.c | 54 ++- platform/linux-generic/odp_pcapng.c | 434 +++++++++++++++++++++ 13 files changed, 599 insertions(+), 7 deletions(-) create mode 100644 doc/users-guide/users-guide-utilities-examples.adoc create mode 100644 platform/linux-generic/include/odp_pcapng.h create mode 100644 platform/linux-generic/m4/odp_pcapng.m4 create mode 100644 platform/linux-generic/odp_pcapng.c hooks/post-receive --

8 years, 3 months

[COMMIT] annotated tag v1.19.0.1 created. v1.19.0.1_tigermoth

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The annotated tag, v1.19.0.1 has been created at 0cba45678a388360b3b7bfd75a6a29f21ffca4aa (tag) tagging 332877d51e773a584d272a03f08446d18cbe1634 (commit) replaces v1.19.0.0_tigermoth tagged by Maxim Uvarov on Thu May 10 22:12:31 2018 +0300 - Log ----------------------------------------------------------------- == OpenDataPlane (1.19.0.1) === Summary of Changes ODP v1.19.0.1 is the first service update for the Tiger Moth release. It incorporates a number of corrections and enhancements that improve the quality and testability of ODP. ==== APIs There are no API changes in this release. ==== DPDK Service Release Sync ODP is now paired with DPDK 17.11.2 for it's DPDK-related support. This is the current service level for the DPDK 17.11 LTS package used by ODP Tiger Moth and incorporates a number of important bug fixes. === Implementation Improvements The ODP reference implementation has been improved in a number of areas. ==== GCC 8 Support The GCC 8 series of compilers provides additional warnings about possible string truncation. A few ODP modules were changed to avoid misleading warnings when compiling with this level of GCC. ==== Linking with `libnuma` The `libnuma` library is used for DPDK pktios to provide proper memory allocation on NUMA-aware systems. Linking with this library is improved to avoid extraneous error messages at build time. ==== Packet metadata reorganization Packet metadata is reorganized to reduce the cache footprint used by the ODP reference implementation, resulting in performance improvements. ==== Random split from crypto module The `odp_random_xxx()` family of APIs was moved to a separate module (`odp_random.c`) for modularity and better isolation from planned crypto enhancements. ==== Shmem improvements Unnecessary locking is removed from the `odp_fdserver` module, streamlining operations on shared memory. ==== Timer pools The default number of timer pools supported by the ODP reference implementation has been reduced from 255 to 32. This lower number remains generously adequate for most applications and meaningfully reduces memory footprint, giving better performance. ==== Timer resolution During initialization ODP normally measures timer resolution to set the reported `highest_res_ns`. When such measurement is not able to be performed, this is not limited to 500ns to avoid bounds errors with overly precise resolutions. === Validation Improvements The ODP validation test suite has been improved in a number of areas. ==== Crypto validation test The validation test now correctly handles corner cases when the implementation under test fails to process any test packets. It also includes the previously missing `ODP_CIPHER_ALG_AES_CTR` name. Additionally, since individual implementations indicate which crypto/hash algorithms are supported via the `odp_crypto_capability()` API, the crypto validation test now properly uses this information and only tests those algorithms that the implementation reports as supported. The list of unsupported algorithms is also reported as part of the test results. ==== `odp_sched_pktio` test improvements The number of input/output queues used by this test can now be specified, providing additional controls for test flexibility. In addition, pktout queues are now selected based on input queue rather than worker id, thus ensuring packet order flow is maintained. Finally, an inactivity timer is added that allows the test to report when packets were handled due to timeout rather than I/O activity. ==== Timer validation test The validation test for the ODP timer APIs has been reorganized to better characterize an implementation's conformance to the ODP Timer API specification. Since implementations can have widely differing timer accuracy levels, particularly when running in virtualized environments, the test also relaxes its bounds checking and enforcement somewhat to better avoid false negative test results. Additionally, a timer pool create/destroy test was added as this area was not adequately covered previously. === Documentation Improvements The `EXTRA_ASCIIDOC_FLAGS` environment variable may now be used to supply additional build flags for Asciidoctor, which can be used to override icons and/or fonts for distribution or other needs. === Bug Fixes ==== https://bugs.linaro.org/show_bug.cgi?id=3657[Bug 3657] PktIO does not work with Mellanox Interfaces ==== https://bugs.linaro.org/show_bug.cgi?id=3685[Bug 3685] RX UDP checksum offload drops valid UDP packets with Niantic ==== https://bugs.linaro.org/show_bug.cgi?id=3686[Bug 3686] IP header checksum not inserted if L4 offset not set ==== https://bugs.linaro.org/show_bug.cgi?id=3690[Bug 3690] fdserver process interferes with signal handling ==== https://bugs.linaro.org/show_bug.cgi?id=3763[Bug 3763] tests should fail if odp_crypto_op/op_enq process 0 packets ==== https://bugs.linaro.org/show_bug.cgi?id=3764[Bug 3764] IPsec code can occasionally damage packets ==== https://bugs.linaro.org/show_bug.cgi?id=3772[Bug 3772] Timer segfaults when creating and destroying multiple timer pools ==== https://bugs.linaro.org/show_bug.cgi?id=3788[Bug 3788] linux-gen: ipc test fails to reserve memory === Known Issues ==== https://bugs.linaro.org/show_bug.cgi?id=3774[Bug 3774] Shmem validation test runs indefinitely with 1GB huge pages ==== https://bugs.linaro.org/show_bug.cgi?id=3787[Bug 3787] Timeout accuracy breaks down with odd resolution requests Bill Fischofer (1): changelog: updates for odp v1.19.0.1 Dmitry Eremin-Solenikov (10): linux-generic: random: split from crypto module validation: crypto: zero return code of odp_crypto_op/odp_crypto_op_enq linux-gen: ipsec: parse IPv6 next header in tunnel case travis: fetch explicitly specified DPDK version travis: bump DPDK version to 17.11.2 - latest LTS release validation: crypto: add missing ODP_CIPHER_ALG_AES_CTR name linux-gen: dpdk: fix linking to libnuma travis: do not run gcov before executing codecov script doc: allow user to provide exta asciidoctor flags build: odp_dpdk: add dependencies for crypto PMDs Josep Puigdemont (2): linux-gen: fdserver: remove unnecessary locking linux-gen: fix compilation warnings Matias Elo (1): linux-gen: packet: rearrange odp_packet_hdr_t members Maxim Uvarov (2): linux-gen: pktio: ipc free ring memory on error configure.ac: update version to v1.19.0.1 Petri Savolainen (20): validation: timer: remove doxygen tags validation: timer: check user pointer once validation: timer: tick conversion may lose precision validation: timer: don't assume low timer tick frequency validation: timer: add plain and sched queue tests validation: timer: fix timer_all test sync issue validation: timer: honor min timeout param value test: crypto perf: check algorithm capabilities test: mmap_vlan_ins: wait for background process validation: timer: loosen period accuracy requirement test: crypto perf: add missing breaks to switch case linux-gen: timer: fix timer pool index allocation linux-gen: timer: reduce number of timer pools validation: timer: add timer pool create-destroy test linux-gen: timer: set and check highest resolution test: sched_pktio: add pktio queue count option test: sched_pktio: ensure packet order per flow test: sched_pktio: parse options before odp global init test: sched_pktio: add inactivity timer example: timer_accuracy: simple timer accuracy measurement app ----------------------------------------------------------------------- hooks/post-receive --

8 years, 3 months

[COMMIT] branch tigermoth_lts updated. v1.19.0.1_tigermoth

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, tigermoth_lts has been updated via 332877d51e773a584d272a03f08446d18cbe1634 (commit) via bed462d28fa081a0d66dd29a8034f188256c7d04 (commit) via 2b27f75b587cf23d2687dd37897cbb26ed915890 (commit) via 79781031e28dee010425f575d1bf5de5b18af0d6 (commit) via 7d91fbd6c1a40e378b06f9be6dd3ef260c66dba9 (commit) via d189d704a29f490583057ccb5c762432a4e4b7a7 (commit) via 122b74c0074329f1758b2ed5d241e0e9a790087b (commit) via bd37df82b49faefef078558cdb2a54477bec6c5a (commit) via dea03d0a24117764ea9b8763e640a4836031e82b (commit) via 5c745f55a160b0a72d8e493604917a0d63dd71a5 (commit) via 15a30694560ba62160fa3a8ffddeb51b800e351a (commit) via 27a84cdfc0dfb82e3b86067e473658c091377892 (commit) via 3600304c30c4a345538f6c06ca50183b14cd12b1 (commit) via 4ec4a756c7607e3a78878e6699a82ccf6d0a1461 (commit) via 0f700e1a4b8e66c269081eba64eb5be8c37de868 (commit) via f0d0fd91978a8127ed270b03853ac0e04492a333 (commit) via 2ee48570ed824d5caff4f8cb121b7c293a481820 (commit) via 82499a9a4c80670de20825992478ccd4d764e28c (commit) via c164ad605422f90f3566e4c4ebed0ea3c2adb3a8 (commit) via 53dca8426775ed5bf40f2c2708915f02b2dccc74 (commit) via f69f033da3b6900acdd170668cae07ac6cd959f3 (commit) via 8d957f16105fa44d483478b2c05bae735680c007 (commit) via 5028177e4e795305b514d7164ff882dcf1d3622b (commit) via 24262a9aae62290dfd1a041d0bd5c6943270251d (commit) via 7e355890905a9195ff1027377991b4134e285a03 (commit) via 6947621e1b3a3c73c3ee351325f505e5e191474f (commit) via 29cb860583cb906bc16eddf9a4c98d6bb37333e5 (commit) via acc05760d5060d1782aa597e44c72ccb9a71b63b (commit) via c440dfceff97526d2763383afd8da064faef3d0d (commit) via 93591a6134fbc5655c0cf6a25e0b4e0668357971 (commit) via fec701841dbe2e963cf3adc7c74c98b41e059b9d (commit) via 0e24607e3075a573ebe4ac408703c76daac7236c (commit) via 5d4be5077adeec54d1956c86dcb87b186c39a7cb (commit) via 3aa3f4352083d159260cebc23b87607e73aa6f2b (commit) via 0d4271e31fe685a8a82381d21d5166f0398080c1 (commit) via d324b9de12c510ccf9fa1c1b6ece327c578ee53d (commit) from e828b4d6f503ff94c40e30b1d8babf0dcbecde91 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: .travis.yml | 22 +- CHANGELOG | 124 +++++ configure.ac | 2 +- doc/Makefile.inc | 3 +- example/timer/.gitignore | 1 + example/timer/Makefile.am | 13 +- example/timer/odp_timer_accuracy.c | 461 +++++++++++++++++++ m4/odp_dpdk.m4 | 6 + platform/linux-generic/Makefile.am | 1 + .../linux-generic/include/odp_packet_internal.h | 15 +- platform/linux-generic/m4/odp_dpdk.m4 | 8 + platform/linux-generic/odp_crypto.c | 42 -- platform/linux-generic/odp_fdserver.c | 49 +- platform/linux-generic/odp_ipsec.c | 1 + platform/linux-generic/odp_ishm.c | 3 +- platform/linux-generic/odp_random.c | 54 +++ platform/linux-generic/odp_timer.c | 98 ++-- platform/linux-generic/pktio/dpdk.c | 2 +- platform/linux-generic/pktio/ipc.c | 8 +- .../test/mmap_vlan_ins/mmap_vlan_ins.sh | 4 +- test/performance/odp_crypto.c | 162 ++++++- test/performance/odp_sched_pktio.c | 510 ++++++++++++++++++--- test/validation/api/crypto/odp_crypto_test_inp.c | 6 +- test/validation/api/timer/timer.c | 414 ++++++++++++++--- 24 files changed, 1698 insertions(+), 311 deletions(-) create mode 100644 example/timer/odp_timer_accuracy.c create mode 100644 platform/linux-generic/odp_random.c hooks/post-receive --

8 years, 3 months

[COMMIT] branch master updated. v1.19.0.0_tigermoth-40-g11207ff1

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 11207ff1e211658bfb44c635423ae818a0654239 (commit) via 3abbe8b729310d29b9a2c84a7d7a11771513908d (commit) via f49289a7f621ffe5c981caa8531623d9e0a4abd9 (commit) via cc6d68e1dcf0f4f9b8b7442a4739288892fcb345 (commit) via 332877d51e773a584d272a03f08446d18cbe1634 (commit) from bed462d28fa081a0d66dd29a8034f188256c7d04 (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 11207ff1e211658bfb44c635423ae818a0654239 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Mon May 7 12:41:54 2018 +0300 linux-gen: use inlined event type function Implementation uses internally inlined version of event functions. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/odp_crypto.c b/platform/linux-generic/odp_crypto.c index aca822d8..0fce762a 100644 --- a/platform/linux-generic/odp_crypto.c +++ b/platform/linux-generic/odp_crypto.c @@ -20,6 +20,9 @@ #include <odp/api/plat/packet_inlines.h> #include <odp_packet_internal.h> +/* Inlined API functions */ +#include <odp/api/plat/event_inlines.h> + #include <string.h> #include <stdlib.h> diff --git a/platform/linux-generic/odp_ipsec_events.c b/platform/linux-generic/odp_ipsec_events.c index 7fcebeb8..247e9f8b 100644 --- a/platform/linux-generic/odp_ipsec_events.c +++ b/platform/linux-generic/odp_ipsec_events.c @@ -14,6 +14,9 @@ #include <odp_ipsec_internal.h> #include <odp_pool_internal.h> +/* Inlined API functions */ +#include <odp/api/plat/event_inlines.h> + typedef struct { /* common buffer header */ odp_buffer_hdr_t buf_hdr; diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index d4b19fee..e0635444 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -16,6 +16,9 @@ #include <odp/api/packet_io.h> #include <odp/api/plat/pktio_inlines.h> +/* Inlined API functions */ +#include <odp/api/plat/event_inlines.h> + #include <protocols/eth.h> #include <protocols/ip.h> #include <protocols/tcp.h> diff --git a/platform/linux-generic/odp_timer.c b/platform/linux-generic/odp_timer.c index 3fc8f380..9085f1bb 100644 --- a/platform/linux-generic/odp_timer.c +++ b/platform/linux-generic/odp_timer.c @@ -56,6 +56,9 @@ #include <odp_arch_time_internal.h> #include <odp_timer_internal.h> +/* Inlined API functions */ +#include <odp/api/plat/event_inlines.h> + #define TMO_UNUSED ((uint64_t)0xFFFFFFFFFFFFFFFF) /* TMO_INACTIVE is or-ed with the expiration tick to indicate an expired timer. * The original expiration tick (63 bits) is still available so it can be used commit 3abbe8b729310d29b9a2c84a7d7a11771513908d Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Fri May 4 15:20:33 2018 +0300 linux-gen: event: inline event_type function Inline odp_event_type() as an example how current inline mechanism can be simplified. Only one file is needed for inline function definitions (xxx_inlines.h) and _ODP_NO_INLINE macro selects when non-inlined implementation is needed (only by xxx_api.c files). Implementation uses internally always inlined functions. Inlined function name is changed with macro from odp_foo() to __odp_foo(). Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index de2ada50..a73dc61d 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -24,8 +24,10 @@ if !ODP_ABI_COMPAT odpapiplatincludedir= $(includedir)/odp/api/plat odpapiplatinclude_HEADERS = \ include/odp/api/plat/atomic_inlines.h \ + include/odp/api/plat/buffer_inline_types.h \ include/odp/api/plat/byteorder_inlines.h \ include/odp/api/plat/byteorder_inlines_api.h \ + include/odp/api/plat/event_inlines.h \ include/odp/api/plat/packet_flag_inlines.h \ include/odp/api/plat/packet_flag_inlines_api.h \ include/odp/api/plat/packet_inline_types.h \ @@ -213,6 +215,7 @@ if ODP_ABI_COMPAT __LIB__libodp_linux_la_SOURCES += \ odp_atomic_api.c \ odp_byteorder.c \ + odp_event_api.c \ odp_packet_api.c \ odp_packet_flags_api.c \ odp_pktio_api.c \ diff --git a/platform/linux-generic/include-abi/odp/api/abi/event.h b/platform/linux-generic/include-abi/odp/api/abi/event.h index 7ba426a6..d7bd57c0 100644 --- a/platform/linux-generic/include-abi/odp/api/abi/event.h +++ b/platform/linux-generic/include-abi/odp/api/abi/event.h @@ -43,6 +43,9 @@ typedef enum odp_event_subtype_t { ODP_EVENT_PACKET_IPSEC = 3 } odp_event_subtype_t; +/* Inlined functions for non-ABI compat mode */ +#include <odp/api/plat/event_inlines.h> + /** * @} */ diff --git a/platform/linux-generic/include/odp/api/plat/buffer_inline_types.h b/platform/linux-generic/include/odp/api/plat/buffer_inline_types.h new file mode 100644 index 00000000..29f49f8d --- /dev/null +++ b/platform/linux-generic/include/odp/api/plat/buffer_inline_types.h @@ -0,0 +1,35 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#ifndef ODP_PLAT_BUFFER_INLINE_TYPES_H_ +#define ODP_PLAT_BUFFER_INLINE_TYPES_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#include <stdint.h> + +/** @cond _ODP_HIDE_FROM_DOXYGEN_ */ + +/* Buffer header field accessor */ +#define _odp_buf_hdr_field(buf_hdr, cast, field) \ + (*(cast *)(uintptr_t)((uint8_t *)buf_hdr + \ + _odp_buffer_inline_offset.field)) + +/* Buffer header field offsets for inline functions */ +typedef struct _odp_buffer_inline_offset_t { + uint16_t event_type; + +} _odp_buffer_inline_offset_t; + +/** @endcond */ + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/platform/linux-generic/include/odp/api/plat/event_inlines.h b/platform/linux-generic/include/odp/api/plat/event_inlines.h new file mode 100644 index 00000000..fbecd2c1 --- /dev/null +++ b/platform/linux-generic/include/odp/api/plat/event_inlines.h @@ -0,0 +1,37 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#ifndef ODP_PLAT_EVENT_INLINES_H_ +#define ODP_PLAT_EVENT_INLINES_H_ + +#include <odp/api/abi/buffer.h> +#include <odp/api/plat/buffer_inline_types.h> + +/** @cond _ODP_HIDE_FROM_DOXYGEN_ */ + +extern const _odp_buffer_inline_offset_t _odp_buffer_inline_offset; + +#ifndef _ODP_NO_INLINE + /* Inline functions by default */ + #define _ODP_INLINE static inline + #define odp_event_type __odp_event_type +#else + #define _ODP_INLINE +#endif + +_ODP_INLINE odp_event_type_t odp_event_type(odp_event_t event) +{ + int8_t type; + odp_buffer_t buf = (odp_buffer_t)event; + + type = _odp_buf_hdr_field(buf, int8_t, event_type); + + return (odp_event_type_t)type; +} + +/** @endcond */ + +#endif diff --git a/platform/linux-generic/odp_buffer.c b/platform/linux-generic/odp_buffer.c index 8c9d921c..ac0b9f9c 100644 --- a/platform/linux-generic/odp_buffer.c +++ b/platform/linux-generic/odp_buffer.c @@ -10,11 +10,22 @@ #include <odp_pool_internal.h> #include <odp_buffer_internal.h> #include <odp_debug_internal.h> +#include <odp/api/plat/buffer_inline_types.h> #include <string.h> #include <stdio.h> #include <inttypes.h> +#include <odp/visibility_begin.h> + +/* Fill in buffer header field offsets for inline functions */ +const _odp_buffer_inline_offset_t ODP_ALIGNED_CACHE +_odp_buffer_inline_offset = { + .event_type = offsetof(odp_buffer_hdr_t, event_type) +}; + +#include <odp/visibility_end.h> + odp_buffer_t odp_buffer_from_event(odp_event_t ev) { return (odp_buffer_t)ev; diff --git a/platform/linux-generic/odp_event.c b/platform/linux-generic/odp_event.c index f8ed478c..fa20af5f 100644 --- a/platform/linux-generic/odp_event.c +++ b/platform/linux-generic/odp_event.c @@ -17,10 +17,8 @@ #include <odp_debug_internal.h> #include <odp_packet_internal.h> -odp_event_type_t odp_event_type(odp_event_t event) -{ - return _odp_buffer_event_type(odp_buffer_from_event(event)); -} +/* Inlined API functions */ +#include <odp/api/plat/event_inlines.h> odp_event_subtype_t odp_event_subtype(odp_event_t event) { diff --git a/platform/linux-generic/odp_event_api.c b/platform/linux-generic/odp_event_api.c new file mode 100644 index 00000000..ea9e6110 --- /dev/null +++ b/platform/linux-generic/odp_event_api.c @@ -0,0 +1,13 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include "config.h" + +#include <odp/api/event.h> + +/* Non-inlined functions for ABI compat mode */ +#define _ODP_NO_INLINE +#include <odp/api/plat/event_inlines.h> commit f49289a7f621ffe5c981caa8531623d9e0a4abd9 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Fri May 4 14:58:47 2018 +0300 linux-gen: buffer: remove buffer_inlines header file Moved odp_buffer_inlines.h content to odp_buffer_internal.h and removed the file. Other xxx_inlines.h headers do not contain internal functions but only code for API function inlining. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 7d1d5554..de2ada50 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -86,7 +86,6 @@ noinst_HEADERS = \ include/odp_atomic_internal.h \ include/odp_bitmap_internal.h \ include/odp_bitset.h \ - include/odp_buffer_inlines.h \ include/odp_buffer_internal.h \ include/odp_classification_datamodel.h \ include/odp_classification_inlines.h \ diff --git a/platform/linux-generic/include/odp_buffer_inlines.h b/platform/linux-generic/include/odp_buffer_inlines.h deleted file mode 100644 index 9e3b6ef7..00000000 --- a/platform/linux-generic/include/odp_buffer_inlines.h +++ /dev/null @@ -1,40 +0,0 @@ -/* Copyright (c) 2014-2018, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -/** - * @file - * - * Inline functions for ODP buffer mgmt routines - implementation internal - */ - -#ifndef ODP_BUFFER_INLINES_H_ -#define ODP_BUFFER_INLINES_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -#include <odp_buffer_internal.h> - -odp_event_type_t _odp_buffer_event_type(odp_buffer_t buf); -void _odp_buffer_event_type_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) -{ - return (odp_buffer_t)hdr; -} - -static inline odp_event_t event_from_buf_hdr(odp_buffer_hdr_t *hdr) -{ - return (odp_event_t)hdr; -} - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/platform/linux-generic/include/odp_buffer_internal.h b/platform/linux-generic/include/odp_buffer_internal.h index e50dd604..48e74dd2 100644 --- a/platform/linux-generic/include/odp_buffer_internal.h +++ b/platform/linux-generic/include/odp_buffer_internal.h @@ -111,6 +111,20 @@ struct ODP_ALIGNED_CACHE odp_buffer_hdr_t { ODP_STATIC_ASSERT(CONFIG_PACKET_SEGS_PER_HDR < 256, "CONFIG_PACKET_SEGS_PER_HDR_TOO_LARGE"); +odp_event_type_t _odp_buffer_event_type(odp_buffer_t buf); +void _odp_buffer_event_type_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) +{ + return (odp_buffer_t)hdr; +} + +static inline odp_event_t event_from_buf_hdr(odp_buffer_hdr_t *hdr) +{ + return (odp_event_t)hdr; +} + #ifdef __cplusplus } #endif diff --git a/platform/linux-generic/include/odp_packet_internal.h b/platform/linux-generic/include/odp_packet_internal.h index 04112662..933dd4be 100644 --- a/platform/linux-generic/include/odp_packet_internal.h +++ b/platform/linux-generic/include/odp_packet_internal.h @@ -21,7 +21,6 @@ extern "C" { #include <odp/api/debug.h> #include <odp_buffer_internal.h> #include <odp_pool_internal.h> -#include <odp_buffer_inlines.h> #include <odp/api/packet.h> #include <odp/api/plat/packet_inline_types.h> #include <odp/api/packet_io.h> diff --git a/platform/linux-generic/odp_buffer.c b/platform/linux-generic/odp_buffer.c index fcab5e81..8c9d921c 100644 --- a/platform/linux-generic/odp_buffer.c +++ b/platform/linux-generic/odp_buffer.c @@ -9,7 +9,6 @@ #include <odp/api/buffer.h> #include <odp_pool_internal.h> #include <odp_buffer_internal.h> -#include <odp_buffer_inlines.h> #include <odp_debug_internal.h> #include <string.h> diff --git a/platform/linux-generic/odp_event.c b/platform/linux-generic/odp_event.c index 986b7317..f8ed478c 100644 --- a/platform/linux-generic/odp_event.c +++ b/platform/linux-generic/odp_event.c @@ -14,7 +14,6 @@ #include <odp/api/pool.h> #include <odp_buffer_internal.h> #include <odp_ipsec_internal.h> -#include <odp_buffer_inlines.h> #include <odp_debug_internal.h> #include <odp_packet_internal.h> diff --git a/platform/linux-generic/odp_ipsec_events.c b/platform/linux-generic/odp_ipsec_events.c index 93f838a5..7fcebeb8 100644 --- a/platform/linux-generic/odp_ipsec_events.c +++ b/platform/linux-generic/odp_ipsec_events.c @@ -10,7 +10,6 @@ #include <odp/api/shared_memory.h> #include <odp_buffer_internal.h> -#include <odp_buffer_inlines.h> #include <odp_debug_internal.h> #include <odp_ipsec_internal.h> #include <odp_pool_internal.h> diff --git a/platform/linux-generic/odp_pool.c b/platform/linux-generic/odp_pool.c index 955e14f9..0df8aa3f 100644 --- a/platform/linux-generic/odp_pool.c +++ b/platform/linux-generic/odp_pool.c @@ -14,7 +14,6 @@ #include <odp_pool_internal.h> #include <odp_internal.h> -#include <odp_buffer_inlines.h> #include <odp_packet_internal.h> #include <odp_config_internal.h> #include <odp_debug_internal.h> diff --git a/platform/linux-generic/odp_queue_basic.c b/platform/linux-generic/odp_queue_basic.c index 89a0cd90..764f39e8 100644 --- a/platform/linux-generic/odp_queue_basic.c +++ b/platform/linux-generic/odp_queue_basic.c @@ -14,7 +14,6 @@ #include <odp/api/buffer.h> #include <odp_buffer_internal.h> #include <odp_pool_internal.h> -#include <odp_buffer_inlines.h> #include <odp_internal.h> #include <odp/api/shared_memory.h> #include <odp/api/schedule.h> diff --git a/platform/linux-generic/odp_queue_scalable.c b/platform/linux-generic/odp_queue_scalable.c index 2a5e01d4..05246410 100644 --- a/platform/linux-generic/odp_queue_scalable.c +++ b/platform/linux-generic/odp_queue_scalable.c @@ -20,7 +20,6 @@ #include <odp_config_internal.h> #include <odp_debug_internal.h> -#include <odp_buffer_inlines.h> #include <odp_packet_io_internal.h> #include <odp_pool_internal.h> #include <odp_queue_scalable_internal.h> diff --git a/platform/linux-generic/odp_schedule_basic.c b/platform/linux-generic/odp_schedule_basic.c index b50462a5..540dc6a4 100644 --- a/platform/linux-generic/odp_schedule_basic.c +++ b/platform/linux-generic/odp_schedule_basic.c @@ -26,7 +26,6 @@ #include <odp_ring_internal.h> #include <odp_timer_internal.h> #include <odp_queue_internal.h> -#include <odp_buffer_inlines.h> #include <odp_libconfig_internal.h> /* Number of priority levels */ diff --git a/platform/linux-generic/odp_schedule_scalable.c b/platform/linux-generic/odp_schedule_scalable.c index 023ab1ed..58d5190c 100644 --- a/platform/linux-generic/odp_schedule_scalable.c +++ b/platform/linux-generic/odp_schedule_scalable.c @@ -25,7 +25,6 @@ #include <odp_ishmpool_internal.h> #include <odp_align_internal.h> -#include <odp_buffer_inlines.h> #include <odp_llqueue.h> #include <odp_queue_scalable_internal.h> #include <odp_schedule_if.h> diff --git a/platform/linux-generic/odp_timer.c b/platform/linux-generic/odp_timer.c index 37d0304c..3fc8f380 100644 --- a/platform/linux-generic/odp_timer.c +++ b/platform/linux-generic/odp_timer.c @@ -38,7 +38,6 @@ #include <odp/api/atomic.h> #include <odp_atomic_internal.h> #include <odp/api/buffer.h> -#include <odp_buffer_inlines.h> #include <odp/api/cpu.h> #include <odp/api/pool.h> #include <odp_pool_internal.h> commit cc6d68e1dcf0f4f9b8b7442a4739288892fcb345 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Mon May 7 11:10:32 2018 +0300 test: ipsec: fix link order In LDADD a library using another library, must become before that library. An application library uses ODP, so it must become before ODP library. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/ipsec/Makefile.am b/test/validation/api/ipsec/Makefile.am index 32882699..a9caba17 100644 --- a/test/validation/api/ipsec/Makefile.am +++ b/test/validation/api/ipsec/Makefile.am @@ -21,4 +21,4 @@ ipsec_async_SOURCES = ipsec_async.c ipsec_inline_in_SOURCES = ipsec_inline_in.c ipsec_inline_out_SOURCES = ipsec_inline_out.c -LDADD += libtestipsec.la +PRELDADD += libtestipsec.la commit 332877d51e773a584d272a03f08446d18cbe1634 Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Tue May 8 18:01:15 2018 +0300 configure.ac: update version to v1.19.0.1 Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> diff --git a/configure.ac b/configure.ac index d3f02665..11a89b58 100644 --- a/configure.ac +++ b/configure.ac @@ -5,7 +5,7 @@ AC_PREREQ([2.5]) m4_define([odpapi_generation_version], [1]) m4_define([odpapi_major_version], [19]) m4_define([odpapi_minor_version], [0]) -m4_define([odpapi_point_version], [0]) +m4_define([odpapi_point_version], [1]) m4_define([odpapi_version], [odpapi_generation_version.odpapi_major_version.odpapi_minor_version.odpapi_point_version]) AC_INIT([OpenDataPlane],[odpapi_version],[lng-odp(a)lists.linaro.org]) ----------------------------------------------------------------------- Summary of changes: configure.ac | 2 +- platform/linux-generic/Makefile.am | 4 ++- .../linux-generic/include-abi/odp/api/abi/event.h | 3 ++ .../include/odp/api/plat/buffer_inline_types.h | 35 +++++++++++++++++++ .../include/odp/api/plat/event_inlines.h | 37 ++++++++++++++++++++ .../linux-generic/include/odp_buffer_inlines.h | 40 ---------------------- .../linux-generic/include/odp_buffer_internal.h | 14 ++++++++ .../linux-generic/include/odp_packet_internal.h | 1 - platform/linux-generic/odp_buffer.c | 12 ++++++- platform/linux-generic/odp_crypto.c | 3 ++ platform/linux-generic/odp_event.c | 7 ++-- platform/linux-generic/odp_event_api.c | 13 +++++++ platform/linux-generic/odp_ipsec_events.c | 4 ++- platform/linux-generic/odp_packet.c | 3 ++ platform/linux-generic/odp_pool.c | 1 - platform/linux-generic/odp_queue_basic.c | 1 - platform/linux-generic/odp_queue_scalable.c | 1 - platform/linux-generic/odp_schedule_basic.c | 1 - platform/linux-generic/odp_schedule_scalable.c | 1 - platform/linux-generic/odp_timer.c | 4 ++- test/validation/api/ipsec/Makefile.am | 2 +- 21 files changed, 132 insertions(+), 57 deletions(-) create mode 100644 platform/linux-generic/include/odp/api/plat/buffer_inline_types.h create mode 100644 platform/linux-generic/include/odp/api/plat/event_inlines.h delete mode 100644 platform/linux-generic/include/odp_buffer_inlines.h create mode 100644 platform/linux-generic/odp_event_api.c hooks/post-receive --

8 years, 4 months

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

git-lng-odp