git-lng-odp

git-lng-odp@lists.linaro.org

1203 discussions

[COMMIT] branch master updated. v1.19.0.1_tigermoth-34-g744d466a

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 744d466a0fe5530bb6c036664413d799a3aeb871 (commit) from 4eb5acde3012effceaaf9af4318d95b02551fffa (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 744d466a0fe5530bb6c036664413d799a3aeb871 Author: Brian Brooks <brian.brooks(a)linaro.org> Date: Thu May 24 15:39:03 2018 -0500 linux-generic: schedule: call timer_run() in scalable scheduler Signed-off-by: Brian Brooks <brian.brooks(a)linaro.org> Reported-by: David Nyström <david.c.nystrom(a)gmail.com> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/odp_schedule_scalable.c b/platform/linux-generic/odp_schedule_scalable.c index f26a7e59..1dbcb529 100644 --- a/platform/linux-generic/odp_schedule_scalable.c +++ b/platform/linux-generic/odp_schedule_scalable.c @@ -31,6 +31,7 @@ #include <odp_schedule_if.h> #include <odp_bitset.h> #include <odp_packet_io_internal.h> +#include <odp_timer_internal.h> #include <limits.h> #include <stdbool.h> @@ -889,6 +890,8 @@ static int _schedule(odp_queue_t *from, odp_event_t ev[], int num_evts) ts = sched_ts; atomq = ts->atomq; + timer_run(); + /* Once an atomic queue has been scheduled to a thread, it will stay * on that thread until empty or 'rotated' by WRR */ ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/odp_schedule_scalable.c | 3 +++ 1 file changed, 3 insertions(+) hooks/post-receive --

7 years

[COMMIT] branch master updated. v1.19.0.1_tigermoth-33-g4eb5acde

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 4eb5acde3012effceaaf9af4318d95b02551fffa (commit) from 2315e146e19c937ff407f0a5aa0be1f8de655abf (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 4eb5acde3012effceaaf9af4318d95b02551fffa Author: Bogdan Pricope <bogdan.pricope(a)linaro.org> Date: Mon May 21 12:10:32 2018 +0300 example: generator: add UDP port range support Add options to generate UDP packets with source and destination ports in a range of values. This will simulate multiple packet flows. Signed-off-by: Bogdan Pricope <bogdan.pricope(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/generator/odp_generator.c b/example/generator/odp_generator.c index 4392fe5e..1a6bb911 100644 --- a/example/generator/odp_generator.c +++ b/example/generator/odp_generator.c @@ -74,7 +74,9 @@ typedef struct { unsigned int srcip; /**< src ip addr */ unsigned int dstip; /**< dest ip addr */ uint16_t srcport; /**< src udp port */ + uint16_t srcport_end; /**< src udp end port */ uint16_t dstport; /**< dest udp port */ + uint16_t dstport_end; /**< dest udp end port */ int mode; /**< work mode */ int number; /**< packets number to be sent */ int payload; /**< data len */ @@ -102,6 +104,17 @@ typedef struct { uint64_t ctr_icmp_reply_rcv; /**< icmp reply packets */ } counters_t; +/** UDP Packet processing function argument */ +typedef struct { + odp_bool_t multi_flow; + uint16_t srcport_crt; + uint16_t srcport_start; + uint16_t srcport_end; + uint16_t dstport_crt; + uint16_t dstport_start; + uint16_t dstport_end; +} udp_args_t; + /** * Thread specific arguments */ typedef struct { @@ -111,6 +124,7 @@ typedef struct { struct { odp_pktout_queue_t pktout; /**< Packet output queue */ odp_pktout_config_opt_t *pktout_cfg; /**< Packet output config*/ + udp_args_t udp_param; /**< UDP configuration */ } tx; struct { odp_pktin_queue_t pktin; /**< Packet input queue */ @@ -148,7 +162,7 @@ static odp_barrier_t barrier; typedef odp_packet_t (*setup_pkt_ref_fn_t)(odp_pool_t, odp_pktout_config_opt_t *); typedef int (*setup_pkt_fn_t)(odp_packet_t, odp_pktout_config_opt_t *, - counters_t *); + counters_t *, void *); /* helper funcs */ static void parse_args(int argc, char *argv[], appl_args_t *appl_args); @@ -266,12 +280,14 @@ static int setup_pkt_array(odp_pktout_config_opt_t *pktout_cfg, odp_packet_t *pkt_ref_array, odp_packet_t *pkt_array, int pkt_array_size, - setup_pkt_fn_t setup_pkt) + setup_pkt_fn_t setup_pkt, + void *setup_pkt_arg) { int i; for (i = 0; i < pkt_array_size; i++) { - if ((*setup_pkt)(pkt_ref_array[i], pktout_cfg, counters)) + if ((*setup_pkt)(pkt_ref_array[i], pktout_cfg, counters, + setup_pkt_arg)) break; pkt_array[i] = odp_packet_ref_static(pkt_ref_array[i]); @@ -361,11 +377,12 @@ static odp_packet_t setup_udp_pkt_ref(odp_pool_t pool, * @retval 0 on success, -1 on fail */ static int setup_udp_pkt(odp_packet_t pkt, odp_pktout_config_opt_t *pktout_cfg, - counters_t *counters) + counters_t *counters, void *arg) { char *buf; odph_ipv4hdr_t *ip; unsigned short seq; + udp_args_t *udp_arg = (udp_args_t *)arg; buf = (char *)odp_packet_data(pkt); @@ -379,6 +396,28 @@ static int setup_udp_pkt(odp_packet_t pkt, odp_pktout_config_opt_t *pktout_cfg, ip->chksum = ~odp_chksum_ones_comp16(ip, ODPH_IPV4HDR_LEN); } + if (udp_arg->multi_flow) { + odph_udphdr_t *udp = (odph_udphdr_t *)(buf + ODPH_ETHHDR_LEN + + ODPH_IPV4HDR_LEN); + + if (udp_arg->srcport_start != udp_arg->srcport_end) { + udp->src_port = odp_cpu_to_be_16(udp_arg->srcport_crt); + if (udp_arg->srcport_crt >= udp_arg->srcport_end) + udp_arg->srcport_crt = udp_arg->srcport_start; + else + udp_arg->srcport_crt++; + } + if (udp_arg->dstport_start != udp_arg->dstport_end) { + udp->dst_port = odp_cpu_to_be_16(udp_arg->dstport_crt); + if (udp_arg->dstport_crt >= udp_arg->dstport_end) + udp_arg->dstport_crt = udp_arg->dstport_start; + else + udp_arg->dstport_crt++; + } + + udp->chksum = 0; + } + if (pktout_cfg->bit.ipv4_chksum || pktout_cfg->bit.udp_chksum) { odp_packet_l2_offset_set(pkt, 0); odp_packet_l3_offset_set(pkt, ODPH_ETHHDR_LEN); @@ -458,7 +497,7 @@ static odp_packet_t setup_icmp_pkt_ref(odp_pool_t pool, */ static int setup_icmp_pkt(odp_packet_t pkt, odp_pktout_config_opt_t *pktout_cfg, - counters_t *counters) + counters_t *counters, void *arg ODP_UNUSED) { char *buf; odph_ipv4hdr_t *ip; @@ -676,6 +715,7 @@ static int gen_send_thread(void *arg) int burst_start, burst_size; setup_pkt_ref_fn_t setup_pkt_ref = NULL; setup_pkt_fn_t setup_pkt = NULL; + void *setup_pkt_arg = NULL; counters_t *counters; uint64_t pkt_count_max = 0; @@ -693,6 +733,7 @@ static int gen_send_thread(void *arg) if (args->appl.number != -1) pkt_count_max = args->appl.number / args->thread_cnt + (args->appl.number % args->thread_cnt ? 1 : 0); + setup_pkt_arg = &thr_args->tx.udp_param; } else if (args->appl.mode == APPL_MODE_PING) { setup_pkt_ref = setup_icmp_pkt_ref; setup_pkt = setup_icmp_pkt; @@ -730,7 +771,7 @@ static int gen_send_thread(void *arg) /* Setup TX burst*/ if (setup_pkt_array(pktout_cfg, counters, pkt_ref_array, pkt_array, - pkt_array_size, setup_pkt)) { + pkt_array_size, setup_pkt, setup_pkt_arg)) { EXAMPLE_ERR("[%02i] Error: failed to setup packets\n", thr); break; @@ -1333,6 +1374,17 @@ int main(int argc, char *argv[]) } else { int cpu = odp_cpumask_first(&cpumask); + udp_args_t *udp_param = NULL; + uint16_t sport_range = args->appl.srcport_end - + args->appl.srcport + 1; + uint16_t dport_range = args->appl.dstport_end - + args->appl.dstport + 1; + float sport_step = (float)(sport_range) / num_workers; + float dport_step = (float)(dport_range) / num_workers; + odp_bool_t multi_flow = false; + + if (sport_range > 1 || dport_range > 1) + multi_flow = true; for (i = 0; i < num_workers; ++i) { odp_cpumask_t thd_mask; @@ -1349,6 +1401,8 @@ int main(int argc, char *argv[]) args->thread[i].rx.pktin = ifs[if_idx].pktin[pktq_idx]; } else { + udp_param = &args->thread[i].tx.udp_param; + pktq_idx = (i / args->appl.if_count) % ifs[if_idx].pktout_count; start_seq = i * args->tx_burst_size; @@ -1357,6 +1411,22 @@ int main(int argc, char *argv[]) ifs[if_idx].pktout[pktq_idx]; args->thread[i].tx.pktout_cfg = &ifs[if_idx].config.pktout; + + udp_param->multi_flow = multi_flow; + udp_param->srcport_start = args->appl.srcport; + udp_param->srcport_end = args->appl.srcport_end; + udp_param->srcport_crt = args->appl.srcport; + if (sport_range > 1) + udp_param->srcport_crt += + (uint16_t)(i * sport_step); + + udp_param->dstport_start = args->appl.dstport; + udp_param->dstport_end = args->appl.dstport_end; + udp_param->dstport_crt = args->appl.dstport; + if (dport_range > 1) + udp_param->dstport_crt += + (uint16_t)(i * dport_step); + args->thread[i].counters.ctr_seq = start_seq; } tq = odp_queue_create("", NULL); @@ -1475,7 +1545,9 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args) {"srcip", required_argument, NULL, 's'}, {"dstip", required_argument, NULL, 'd'}, {"srcport", required_argument, NULL, 'e'}, + {"srcport_end", required_argument, NULL, 'j'}, {"dstport", required_argument, NULL, 'f'}, + {"dstport_end", required_argument, NULL, 'k'}, {"packetsize", required_argument, NULL, 'p'}, {"mode", required_argument, NULL, 'm'}, {"count", required_argument, NULL, 'n'}, @@ -1489,7 +1561,8 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args) {NULL, 0, NULL, 0} }; - static const char *shortopts = "+I:a:b:s:d:p:i:m:n:t:w:c:x:he:f:yr:z"; + static const char *shortopts = "+I:a:b:s:d:p:i:m:n:t:w:c:x:he:j:f:k" + ":yr:z"; /* let helper collect its own arguments (e.g. --odph_proc) */ argc = odph_parse_options(argc, argv); @@ -1502,7 +1575,9 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args) appl_args->udp_tx_burst = DEFAULT_UDP_TX_BURST; appl_args->rx_burst = DEFAULT_RX_BURST; appl_args->srcport = 0; + appl_args->srcport_end = 0; appl_args->dstport = 0; + appl_args->dstport_end = 0; appl_args->csum = 0; appl_args->sched = 0; @@ -1612,9 +1687,15 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args) case 'e': appl_args->srcport = (unsigned short)atoi(optarg); break; + case 'j': + appl_args->srcport_end = (unsigned short)atoi(optarg); + break; case 'f': appl_args->dstport = (unsigned short)atoi(optarg); break; + case 'k': + appl_args->dstport_end = (unsigned short)atoi(optarg); + break; case 'p': appl_args->payload = atoi(optarg); break; @@ -1672,6 +1753,14 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args) exit(EXIT_FAILURE); } + if ((appl_args->srcport != 0 && appl_args->srcport_end == 0) || + (appl_args->srcport_end < appl_args->srcport)) + appl_args->srcport_end = appl_args->srcport; + + if ((appl_args->dstport != 0 && appl_args->dstport_end == 0) || + (appl_args->dstport_end < appl_args->dstport)) + appl_args->dstport_end = appl_args->dstport; + optind = 1; /* reset 'extern optind' from the getopt lib */ } @@ -1732,8 +1821,14 @@ static void usage(char *progname) "\n" "Optional OPTIONS\n" " -h, --help Display help and exit.\n" - " -e, --srcport src udp port\n" - " -f, --dstport dst udp port\n" + " -e, --srcport udp source port start value\n" + " default is 0\n" + " -j, --srcport_end udp source port end value\n" + " default is udp source port start value\n" + " -f, --dstport udp destination port start value\n" + " default is 0\n" + " -k, --dstport_end udp destination port end value\n" + " default is udp destination port start value\n" " -p, --packetsize payload length of the packets\n" " -t, --timeout only for ping mode, wait ICMP reply timeout seconds\n" " -i, --interval wait interval ms between sending each packet\n" ----------------------------------------------------------------------- Summary of changes: example/generator/odp_generator.c | 113 +++++++++++++++++++++++++++++++++++--- 1 file changed, 104 insertions(+), 9 deletions(-) hooks/post-receive --

7 years

[COMMIT] branch master updated. v1.19.0.1_tigermoth-32-g2315e146

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 2315e146e19c937ff407f0a5aa0be1f8de655abf (commit) via 46064619d9bd9d2733089dcff044a9a86277dbdd (commit) via ec41adeed9884621f242c8153612a3f2eaa5bcee (commit) via 758fdf094deae51597b5e9f5f70584c3dba92ff1 (commit) via c5b855df5b9e4388efd387810959b0f81f072fc9 (commit) via 7299adcc939a3d55b2c694744037ea9ea1dd7835 (commit) via 455230a4331e25a1bb68e6fe1c0058bd790c9d9b (commit) via a4d31373e5a0f72d028ff73ca9eae0fd6671f350 (commit) from 37390a88fd35d972a8e399fc934c612c1043ad77 (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 2315e146e19c937ff407f0a5aa0be1f8de655abf Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue May 15 10:58:31 2018 +0300 linux-gen: use inlined sync functions everywhere Make linux-gen platform code use inlined sync functions instead of doing proper functions calls. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/odp_barrier.c b/platform/linux-generic/odp_barrier.c index ebae98ec..ec35d0ff 100644 --- a/platform/linux-generic/odp_barrier.c +++ b/platform/linux-generic/odp_barrier.c @@ -11,6 +11,7 @@ #include <odp/api/cpu.h> #include <odp/api/atomic.h> #include <odp/api/plat/atomic_inlines.h> +#include <odp/api/plat/sync_inlines.h> void odp_barrier_init(odp_barrier_t *barrier, int count) { diff --git a/platform/linux-generic/odp_queue_basic.c b/platform/linux-generic/odp_queue_basic.c index 69fad639..4b4434c2 100644 --- a/platform/linux-generic/odp_queue_basic.c +++ b/platform/linux-generic/odp_queue_basic.c @@ -23,6 +23,7 @@ #include <odp_debug_internal.h> #include <odp/api/hints.h> #include <odp/api/sync.h> +#include <odp/api/plat/sync_inlines.h> #include <odp/api/traffic_mngr.h> #include <odp_libconfig_internal.h> diff --git a/platform/linux-generic/odp_queue_scalable.c b/platform/linux-generic/odp_queue_scalable.c index 8f956911..56ea98bc 100644 --- a/platform/linux-generic/odp_queue_scalable.c +++ b/platform/linux-generic/odp_queue_scalable.c @@ -14,6 +14,7 @@ #include <odp/api/schedule.h> #include <odp/api/shared_memory.h> #include <odp/api/sync.h> +#include <odp/api/plat/sync_inlines.h> #include <odp/api/traffic_mngr.h> #include <odp_internal.h> commit 46064619d9bd9d2733089dcff044a9a86277dbdd Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue May 15 10:58:31 2018 +0300 linux-gen: use inlined thread functions everywhere Make linux-gen platform code use inlined thread functions instead of doing proper functions calls. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/odp_crypto.c b/platform/linux-generic/odp_crypto.c index 0fce762a..967b0bfd 100644 --- a/platform/linux-generic/odp_crypto.c +++ b/platform/linux-generic/odp_crypto.c @@ -18,6 +18,7 @@ #include <odp/api/hints.h> #include <odp/api/random.h> #include <odp/api/plat/packet_inlines.h> +#include <odp/api/plat/thread_inlines.h> #include <odp_packet_internal.h> /* Inlined API functions */ diff --git a/platform/linux-generic/odp_pool.c b/platform/linux-generic/odp_pool.c index f030ff04..32c41427 100644 --- a/platform/linux-generic/odp_pool.c +++ b/platform/linux-generic/odp_pool.c @@ -11,6 +11,7 @@ #include <odp/api/align.h> #include <odp/api/ticketlock.h> #include <odp/api/system_info.h> +#include <odp/api/plat/thread_inlines.h> #include <odp_pool_internal.h> #include <odp_internal.h> diff --git a/platform/linux-generic/odp_schedule_basic.c b/platform/linux-generic/odp_schedule_basic.c index 540dc6a4..f35c7b02 100644 --- a/platform/linux-generic/odp_schedule_basic.c +++ b/platform/linux-generic/odp_schedule_basic.c @@ -14,6 +14,7 @@ #include <odp_internal.h> #include <odp_debug_internal.h> #include <odp/api/thread.h> +#include <odp/api/plat/thread_inlines.h> #include <odp/api/time.h> #include <odp/api/spinlock.h> #include <odp/api/hints.h> diff --git a/platform/linux-generic/odp_schedule_iquery.c b/platform/linux-generic/odp_schedule_iquery.c index 40f2e9fc..a019157e 100644 --- a/platform/linux-generic/odp_schedule_iquery.c +++ b/platform/linux-generic/odp_schedule_iquery.c @@ -17,6 +17,7 @@ #include <odp_buffer_internal.h> #include <odp_bitmap_internal.h> #include <odp/api/thread.h> +#include <odp/api/plat/thread_inlines.h> #include <odp/api/time.h> #include <odp/api/rwlock.h> #include <odp/api/hints.h> diff --git a/platform/linux-generic/odp_schedule_scalable.c b/platform/linux-generic/odp_schedule_scalable.c index 44629378..f26a7e59 100644 --- a/platform/linux-generic/odp_schedule_scalable.c +++ b/platform/linux-generic/odp_schedule_scalable.c @@ -15,6 +15,7 @@ #include <odp/api/shared_memory.h> #include <odp/api/sync.h> #include <odp/api/thread.h> +#include <odp/api/plat/thread_inlines.h> #include <odp/api/thrmask.h> #include <odp/api/time.h> diff --git a/platform/linux-generic/odp_schedule_sp.c b/platform/linux-generic/odp_schedule_sp.c index 84d16d3c..2cef0e82 100644 --- a/platform/linux-generic/odp_schedule_sp.c +++ b/platform/linux-generic/odp_schedule_sp.c @@ -9,6 +9,7 @@ #include <string.h> #include <odp/api/ticketlock.h> #include <odp/api/thread.h> +#include <odp/api/plat/thread_inlines.h> #include <odp/api/time.h> #include <odp/api/schedule.h> #include <odp/api/shared_memory.h> commit ec41adeed9884621f242c8153612a3f2eaa5bcee Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue May 15 10:58:31 2018 +0300 linux-gen: use inlined atomic functions everywhere Make linux-gen platform code use inlined atomic functions instead of doing proper functions calls. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/include/odp/api/plat/packet_flag_inlines.h b/platform/linux-generic/include/odp/api/plat/packet_flag_inlines.h index cbb79758..6f32b46c 100644 --- a/platform/linux-generic/include/odp/api/plat/packet_flag_inlines.h +++ b/platform/linux-generic/include/odp/api/plat/packet_flag_inlines.h @@ -36,6 +36,7 @@ static inline uint64_t _odp_packet_input_flags(odp_packet_t pkt) #define odp_packet_has_ts __odp_packet_has_ts #define odp_packet_has_ipsec __odp_packet_has_ipsec #else + #undef _ODP_INLINE #define _ODP_INLINE #endif diff --git a/platform/linux-generic/include/odp/api/plat/ticketlock_inlines.h b/platform/linux-generic/include/odp/api/plat/ticketlock_inlines.h index eabf1f82..e84ed88e 100644 --- a/platform/linux-generic/include/odp/api/plat/ticketlock_inlines.h +++ b/platform/linux-generic/include/odp/api/plat/ticketlock_inlines.h @@ -19,7 +19,10 @@ #define odp_ticketlock_trylock __odp_ticketlock_trylock #define odp_ticketlock_unlock __odp_ticketlock_unlock #define odp_ticketlock_is_locked __odp_ticketlock_is_locked + /* Inline atomic functions */ + #include <odp/api/plat/atomic_inlines.h> #else + #undef _ODP_INLINE #define _ODP_INLINE #endif diff --git a/platform/linux-generic/include/odp_ring_internal.h b/platform/linux-generic/include/odp_ring_internal.h index 2db07548..b47c41e5 100644 --- a/platform/linux-generic/include/odp_ring_internal.h +++ b/platform/linux-generic/include/odp_ring_internal.h @@ -14,6 +14,7 @@ extern "C" { #include <odp/api/atomic.h> #include <odp/api/hints.h> #include <odp_align_internal.h> +#include <odp/api/plat/atomic_inlines.h> /* Ring empty, not a valid data value. */ #define RING_EMPTY ((uint32_t)-1) diff --git a/platform/linux-generic/odp_barrier.c b/platform/linux-generic/odp_barrier.c index 6006add5..ebae98ec 100644 --- a/platform/linux-generic/odp_barrier.c +++ b/platform/linux-generic/odp_barrier.c @@ -10,6 +10,7 @@ #include <odp/api/sync.h> #include <odp/api/cpu.h> #include <odp/api/atomic.h> +#include <odp/api/plat/atomic_inlines.h> void odp_barrier_init(odp_barrier_t *barrier, int count) { diff --git a/platform/linux-generic/odp_ipsec_sad.c b/platform/linux-generic/odp_ipsec_sad.c index c2126969..eea4ceb2 100644 --- a/platform/linux-generic/odp_ipsec_sad.c +++ b/platform/linux-generic/odp_ipsec_sad.c @@ -7,6 +7,7 @@ #include "config.h" #include <odp/api/atomic.h> +#include <odp/api/plat/atomic_inlines.h> #include <odp/api/ipsec.h> #include <odp/api/random.h> #include <odp/api/shared_memory.h> diff --git a/platform/linux-generic/odp_queue_lf.c b/platform/linux-generic/odp_queue_lf.c index 066e6a67..afe629d1 100644 --- a/platform/linux-generic/odp_queue_lf.c +++ b/platform/linux-generic/odp_queue_lf.c @@ -6,6 +6,7 @@ #include <odp/api/queue.h> #include <odp/api/atomic.h> +#include <odp/api/plat/atomic_inlines.h> #include <odp/api/shared_memory.h> #include <odp_queue_internal.h> #include <string.h> diff --git a/platform/linux-generic/odp_rwlock.c b/platform/linux-generic/odp_rwlock.c index 119ead89..3a1086d2 100644 --- a/platform/linux-generic/odp_rwlock.c +++ b/platform/linux-generic/odp_rwlock.c @@ -8,6 +8,7 @@ #include <stdbool.h> #include <odp/api/atomic.h> +#include <odp/api/plat/atomic_inlines.h> #include <odp/api/rwlock.h> #include <odp/api/cpu.h> diff --git a/platform/linux-generic/odp_ticketlock_api.c b/platform/linux-generic/odp_ticketlock_api.c index 1de55d90..ebbb8657 100644 --- a/platform/linux-generic/odp_ticketlock_api.c +++ b/platform/linux-generic/odp_ticketlock_api.c @@ -7,6 +7,7 @@ #include "config.h" #include <odp/api/ticketlock.h> +#include <odp/api/plat/atomic_inlines.h> #define _ODP_NO_INLINE #include <odp/api/plat/ticketlock_inlines.h> commit 758fdf094deae51597b5e9f5f70584c3dba92ff1 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue May 15 10:58:31 2018 +0300 linux-gen: pktio: use inlined packet functions Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c index 2f39b981..8a5da105 100644 --- a/platform/linux-generic/odp_packet_io.c +++ b/platform/linux-generic/odp_packet_io.c @@ -12,6 +12,7 @@ #include <odp/api/plat/pktio_inlines.h> #include <odp_packet_io_internal.h> #include <odp/api/packet.h> +#include <odp/api/plat/packet_inlines.h> #include <odp_packet_internal.h> #include <odp_internal.h> #include <odp/api/spinlock.h> commit c5b855df5b9e4388efd387810959b0f81f072fc9 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue May 15 00:26:21 2018 +0300 linux-gen: std clib: rework code to follow inlining style Rework std clib module to follow _ODP_INLINE style of code used by the rest of ODP codebase. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 04c04f7c..fb212950 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -216,7 +216,7 @@ __LIB__libodp_linux_la_SOURCES += \ odp_packet_api.c \ odp_packet_flags_api.c \ odp_pktio_api.c \ - odp_std_clib.c \ + odp_std_clib_api.c \ odp_sync_api.c \ odp_thread_api.c \ odp_ticketlock_api.c diff --git a/platform/linux-generic/include/odp/api/plat/std_clib_inlines.h b/platform/linux-generic/include/odp/api/plat/std_clib_inlines.h index c07b57b7..4265eaf1 100644 --- a/platform/linux-generic/include/odp/api/plat/std_clib_inlines.h +++ b/platform/linux-generic/include/odp/api/plat/std_clib_inlines.h @@ -7,12 +7,20 @@ #ifndef ODP_PLAT_STD_CLIB_INLINE_H_ #define ODP_PLAT_STD_CLIB_INLINE_H_ -#ifdef __cplusplus -extern "C" { -#endif +/** @cond _ODP_HIDE_FROM_DOXYGEN_ */ #include <string.h> +#ifndef _ODP_NO_INLINE + /* Inline functions by default */ + #define _ODP_INLINE static inline + #define odp_memcpy __odp_memcpy + #define odp_memset __odp_memset + #define odp_memcmp __odp_memcmp +#else + #define _ODP_INLINE +#endif + _ODP_INLINE void *odp_memcpy(void *dst, const void *src, size_t num) { return memcpy(dst, src, num); @@ -28,8 +36,6 @@ _ODP_INLINE int odp_memcmp(const void *ptr1, const void *ptr2, size_t num) return memcmp(ptr1, ptr2, num); } -#ifdef __cplusplus -} -#endif +/** @endcond */ #endif diff --git a/platform/linux-generic/odp_std_clib.c b/platform/linux-generic/odp_std_clib_api.c similarity index 92% rename from platform/linux-generic/odp_std_clib.c rename to platform/linux-generic/odp_std_clib_api.c index f43f62c9..faa37847 100644 --- a/platform/linux-generic/odp_std_clib.c +++ b/platform/linux-generic/odp_std_clib_api.c @@ -9,5 +9,5 @@ #include <odp/api/std_clib.h> /* Include non-inlined versions of API functions */ -#define _ODP_INLINE +#define _ODP_NO_INLINE #include <odp/api/plat/std_clib_inlines.h> commit 7299adcc939a3d55b2c694744037ea9ea1dd7835 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue May 15 00:26:21 2018 +0300 linux-gen: sync: rework code to follow inlining style Rework sync module to follow _ODP_INLINE style of code used by the rest of ODP codebase. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 96ddb33d..04c04f7c 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -217,7 +217,7 @@ __LIB__libodp_linux_la_SOURCES += \ odp_packet_flags_api.c \ odp_pktio_api.c \ odp_std_clib.c \ - odp_sync.c \ + odp_sync_api.c \ odp_thread_api.c \ odp_ticketlock_api.c endif diff --git a/platform/linux-generic/include/odp/api/plat/sync_inlines.h b/platform/linux-generic/include/odp/api/plat/sync_inlines.h index 34a74444..b6a96188 100644 --- a/platform/linux-generic/include/odp/api/plat/sync_inlines.h +++ b/platform/linux-generic/include/odp/api/plat/sync_inlines.h @@ -17,9 +17,17 @@ extern "C" { #endif -/** @ingroup odp_barrier - * @{ - */ +/** @cond _ODP_HIDE_FROM_DOXYGEN_ */ + +#ifndef _ODP_NO_INLINE + /* Inline functions by default */ + #define _ODP_INLINE static inline + #define odp_mb_release __odp_mb_release + #define odp_mb_acquire __odp_mb_acquire + #define odp_mb_full __odp_mb_full +#else + #define _ODP_INLINE +#endif _ODP_INLINE void odp_mb_release(void) { @@ -36,9 +44,7 @@ _ODP_INLINE void odp_mb_full(void) __atomic_thread_fence(__ATOMIC_SEQ_CST); } -/** - * @} - */ +/** @endcond */ #ifdef __cplusplus } diff --git a/platform/linux-generic/odp_sync.c b/platform/linux-generic/odp_sync_api.c similarity index 91% rename from platform/linux-generic/odp_sync.c rename to platform/linux-generic/odp_sync_api.c index a20278ce..6e91209a 100644 --- a/platform/linux-generic/odp_sync.c +++ b/platform/linux-generic/odp_sync_api.c @@ -9,5 +9,5 @@ #include <odp/api/sync.h> /* Include non-inlined versions of API functions */ -#define _ODP_INLINE +#define _ODP_NO_INLINE #include <odp/api/plat/sync_inlines.h> commit 455230a4331e25a1bb68e6fe1c0058bd790c9d9b Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue May 15 00:26:21 2018 +0300 linux-gen: packet: remove separate API inlining header Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 033f38a5..96ddb33d 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -30,7 +30,6 @@ odpapiplatinclude_HEADERS = \ include/odp/api/plat/packet_flag_inlines.h \ include/odp/api/plat/packet_inline_types.h \ include/odp/api/plat/packet_inlines.h \ - include/odp/api/plat/packet_inlines_api.h \ include/odp/api/plat/pktio_inlines.h \ include/odp/api/plat/pool_inline_types.h \ include/odp/api/plat/std_clib_inlines.h \ diff --git a/platform/linux-generic/include-abi/odp/api/abi/packet.h b/platform/linux-generic/include-abi/odp/api/abi/packet.h index 0b11d0bd..fe21c7d9 100644 --- a/platform/linux-generic/include-abi/odp/api/abi/packet.h +++ b/platform/linux-generic/include-abi/odp/api/abi/packet.h @@ -90,8 +90,6 @@ typedef enum { #define ODP_NUM_PACKET_COLORS 3 #include <odp/api/plat/packet_inlines.h> -#define _ODP_INLINE static inline -#include <odp/api/plat/packet_inlines_api.h> /** * @} diff --git a/platform/linux-generic/include/odp/api/plat/packet_inlines.h b/platform/linux-generic/include/odp/api/plat/packet_inlines.h index 2b9c4322..e2c32728 100644 --- a/platform/linux-generic/include/odp/api/plat/packet_inlines.h +++ b/platform/linux-generic/include/odp/api/plat/packet_inlines.h @@ -28,6 +28,47 @@ /** @cond _ODP_HIDE_FROM_DOXYGEN_ */ +#ifndef _ODP_NO_INLINE + /* Inline functions by default */ + #define _ODP_INLINE static inline + #define odp_packet_data __odp_packet_data + #define odp_packet_seg_len __odp_packet_seg_len + #define odp_packet_data_seg_len __odp_packet_data_seg_len + #define odp_packet_len __odp_packet_len + #define odp_packet_headroom __odp_packet_headroom + #define odp_packet_tailroom __odp_packet_tailroom + #define odp_packet_pool __odp_packet_pool + #define odp_packet_input __odp_packet_input + #define odp_packet_input_index __odp_packet_input_index + #define odp_packet_num_segs __odp_packet_num_segs + #define odp_packet_user_ptr __odp_packet_user_ptr + #define odp_packet_user_area __odp_packet_user_area + #define odp_packet_user_area_size __odp_packet_user_area_size + #define odp_packet_l2_offset __odp_packet_l2_offset + #define odp_packet_l3_offset __odp_packet_l3_offset + #define odp_packet_l4_offset __odp_packet_l4_offset + #define odp_packet_l2_ptr __odp_packet_l2_ptr + #define odp_packet_l3_ptr __odp_packet_l3_ptr + #define odp_packet_l4_ptr __odp_packet_l4_ptr + #define odp_packet_flow_hash __odp_packet_flow_hash + #define odp_packet_ts __odp_packet_ts + #define odp_packet_head __odp_packet_head + #define odp_packet_is_segmented __odp_packet_is_segmented + #define odp_packet_first_seg __odp_packet_first_seg + #define odp_packet_last_seg __odp_packet_last_seg + #define odp_packet_next_seg __odp_packet_next_seg + #define odp_packet_prefetch __odp_packet_prefetch + #define odp_packet_copy_from_mem __odp_packet_copy_from_mem + #define odp_packet_copy_to_mem __odp_packet_copy_to_mem + #define odp_packet_from_event __odp_packet_from_event + #define odp_packet_to_event __odp_packet_to_event + #define odp_packet_from_event_multi __odp_packet_from_event_multi + #define odp_packet_to_event_multi __odp_packet_to_event_multi +#else + #undef _ODP_INLINE + #define _ODP_INLINE +#endif + void *_odp_packet_map(void *pkt_ptr, uint32_t offset, uint32_t *seg_len, int *seg_idx); @@ -53,63 +94,63 @@ static inline odp_packet_seg_t _odp_packet_seg_from_ndx(uint32_t ndx) } #endif -static inline void *_odp_packet_data(odp_packet_t pkt) +_ODP_INLINE void *odp_packet_data(odp_packet_t pkt) { return _odp_pkt_get(pkt, void *, data); } -static inline uint32_t _odp_packet_seg_len(odp_packet_t pkt) +_ODP_INLINE uint32_t odp_packet_seg_len(odp_packet_t pkt) { return _odp_pkt_get(pkt, uint32_t, seg_len); } -static inline void *_odp_packet_data_seg_len(odp_packet_t pkt, +_ODP_INLINE void *odp_packet_data_seg_len(odp_packet_t pkt, uint32_t *seg_len) { - *seg_len = _odp_packet_seg_len(pkt); - return _odp_packet_data(pkt); + *seg_len = odp_packet_seg_len(pkt); + return odp_packet_data(pkt); } -static inline uint32_t _odp_packet_len(odp_packet_t pkt) +_ODP_INLINE uint32_t odp_packet_len(odp_packet_t pkt) { return _odp_pkt_get(pkt, uint32_t, frame_len); } -static inline uint32_t _odp_packet_headroom(odp_packet_t pkt) +_ODP_INLINE uint32_t odp_packet_headroom(odp_packet_t pkt) { return _odp_pkt_get(pkt, uint16_t, headroom); } -static inline uint32_t _odp_packet_tailroom(odp_packet_t pkt) +_ODP_INLINE uint32_t odp_packet_tailroom(odp_packet_t pkt) { return _odp_pkt_get(pkt, uint16_t, tailroom); } -static inline odp_pool_t _odp_packet_pool(odp_packet_t pkt) +_ODP_INLINE odp_pool_t odp_packet_pool(odp_packet_t pkt) { void *pool = _odp_pkt_get(pkt, void *, pool); return _odp_pool_get(pool, odp_pool_t, pool_hdl); } -static inline odp_pktio_t _odp_packet_input(odp_packet_t pkt) +_ODP_INLINE odp_pktio_t odp_packet_input(odp_packet_t pkt) { return _odp_pkt_get(pkt, odp_pktio_t, input); } -static inline int _odp_packet_input_index(odp_packet_t pkt) +_ODP_INLINE int odp_packet_input_index(odp_packet_t pkt) { - odp_pktio_t pktio = _odp_packet_input(pkt); + odp_pktio_t pktio = odp_packet_input(pkt); return odp_pktio_index(pktio); } -static inline int _odp_packet_num_segs(odp_packet_t pkt) +_ODP_INLINE int odp_packet_num_segs(odp_packet_t pkt) { return _odp_pkt_get(pkt, uint8_t, segcount); } -static inline void *_odp_packet_user_ptr(odp_packet_t pkt) +_ODP_INLINE void *odp_packet_user_ptr(odp_packet_t pkt) { _odp_packet_flags_t flags; @@ -121,38 +162,38 @@ static inline void *_odp_packet_user_ptr(odp_packet_t pkt) return _odp_pkt_get(pkt, void *, user_ptr); } -static inline void *_odp_packet_user_area(odp_packet_t pkt) +_ODP_INLINE void *odp_packet_user_area(odp_packet_t pkt) { return _odp_pkt_get(pkt, void *, user_area); } -static inline uint32_t _odp_packet_user_area_size(odp_packet_t pkt) +_ODP_INLINE uint32_t odp_packet_user_area_size(odp_packet_t pkt) { void *pool = _odp_pkt_get(pkt, void *, pool); return _odp_pool_get(pool, uint32_t, uarea_size); } -static inline uint32_t _odp_packet_l2_offset(odp_packet_t pkt) +_ODP_INLINE uint32_t odp_packet_l2_offset(odp_packet_t pkt) { return _odp_pkt_get(pkt, uint16_t, l2_offset); } -static inline uint32_t _odp_packet_l3_offset(odp_packet_t pkt) +_ODP_INLINE uint32_t odp_packet_l3_offset(odp_packet_t pkt) { return _odp_pkt_get(pkt, uint16_t, l3_offset); } -static inline uint32_t _odp_packet_l4_offset(odp_packet_t pkt) +_ODP_INLINE uint32_t odp_packet_l4_offset(odp_packet_t pkt) { return _odp_pkt_get(pkt, uint16_t, l4_offset); } -static inline void *_odp_packet_l2_ptr(odp_packet_t pkt, uint32_t *len) +_ODP_INLINE void *odp_packet_l2_ptr(odp_packet_t pkt, uint32_t *len) { - uint32_t offset = _odp_packet_l2_offset(pkt); - uint32_t seg_len = _odp_packet_seg_len(pkt); - uint8_t *data = (uint8_t *)_odp_packet_data(pkt); + uint32_t offset = odp_packet_l2_offset(pkt); + uint32_t seg_len = odp_packet_seg_len(pkt); + uint8_t *data = (uint8_t *)odp_packet_data(pkt); if (odp_unlikely(offset >= seg_len)) { void *pkt_hdr = (void *)pkt; @@ -166,11 +207,11 @@ static inline void *_odp_packet_l2_ptr(odp_packet_t pkt, uint32_t *len) return data + offset; } -static inline void *_odp_packet_l3_ptr(odp_packet_t pkt, uint32_t *len) +_ODP_INLINE void *odp_packet_l3_ptr(odp_packet_t pkt, uint32_t *len) { - uint32_t offset = _odp_packet_l3_offset(pkt); - uint32_t seg_len = _odp_packet_seg_len(pkt); - uint8_t *data = (uint8_t *)_odp_packet_data(pkt); + uint32_t offset = odp_packet_l3_offset(pkt); + uint32_t seg_len = odp_packet_seg_len(pkt); + uint8_t *data = (uint8_t *)odp_packet_data(pkt); if (odp_unlikely(offset >= seg_len)) { void *pkt_hdr = (void *)pkt; @@ -184,11 +225,11 @@ static inline void *_odp_packet_l3_ptr(odp_packet_t pkt, uint32_t *len) return data + offset; } -static inline void *_odp_packet_l4_ptr(odp_packet_t pkt, uint32_t *len) +_ODP_INLINE void *odp_packet_l4_ptr(odp_packet_t pkt, uint32_t *len) { - uint32_t offset = _odp_packet_l4_offset(pkt); - uint32_t seg_len = _odp_packet_seg_len(pkt); - uint8_t *data = (uint8_t *)_odp_packet_data(pkt); + uint32_t offset = odp_packet_l4_offset(pkt); + uint32_t seg_len = odp_packet_seg_len(pkt); + uint8_t *data = (uint8_t *)odp_packet_data(pkt); if (odp_unlikely(offset >= seg_len)) { void *pkt_hdr = (void *)pkt; @@ -202,53 +243,53 @@ static inline void *_odp_packet_l4_ptr(odp_packet_t pkt, uint32_t *len) return data + offset; } -static inline uint32_t _odp_packet_flow_hash(odp_packet_t pkt) +_ODP_INLINE uint32_t odp_packet_flow_hash(odp_packet_t pkt) { return _odp_pkt_get(pkt, uint32_t, flow_hash); } -static inline odp_time_t _odp_packet_ts(odp_packet_t pkt) +_ODP_INLINE odp_time_t odp_packet_ts(odp_packet_t pkt) { return _odp_pkt_get(pkt, odp_time_t, timestamp); } -static inline void *_odp_packet_head(odp_packet_t pkt) +_ODP_INLINE void *odp_packet_head(odp_packet_t pkt) { - return (uint8_t *)_odp_packet_data(pkt) - _odp_packet_headroom(pkt); + return (uint8_t *)odp_packet_data(pkt) - odp_packet_headroom(pkt); } -static inline int _odp_packet_is_segmented(odp_packet_t pkt) +_ODP_INLINE int odp_packet_is_segmented(odp_packet_t pkt) { return _odp_pkt_get(pkt, uint8_t, segcount) > 1; } -static inline odp_packet_seg_t _odp_packet_first_seg(odp_packet_t pkt) +_ODP_INLINE odp_packet_seg_t odp_packet_first_seg(odp_packet_t pkt) { (void)pkt; return _odp_packet_seg_from_ndx(0); } -static inline odp_packet_seg_t _odp_packet_last_seg(odp_packet_t pkt) +_ODP_INLINE odp_packet_seg_t odp_packet_last_seg(odp_packet_t pkt) { - return _odp_packet_seg_from_ndx(_odp_packet_num_segs(pkt) - 1); + return _odp_packet_seg_from_ndx(odp_packet_num_segs(pkt) - 1); } -static inline odp_packet_seg_t _odp_packet_next_seg(odp_packet_t pkt, +_ODP_INLINE odp_packet_seg_t odp_packet_next_seg(odp_packet_t pkt, odp_packet_seg_t seg) { if (odp_unlikely(_odp_packet_seg_to_ndx(seg) >= - _odp_packet_seg_to_ndx(_odp_packet_last_seg(pkt)))) + _odp_packet_seg_to_ndx(odp_packet_last_seg(pkt)))) return ODP_PACKET_SEG_INVALID; return seg + 1; } -static inline void _odp_packet_prefetch(odp_packet_t pkt, uint32_t offset, +_ODP_INLINE void odp_packet_prefetch(odp_packet_t pkt, uint32_t offset, uint32_t len) { - uint32_t seg_len = _odp_packet_seg_len(pkt); - uint8_t *data = (uint8_t *)_odp_packet_data(pkt); + uint32_t seg_len = odp_packet_seg_len(pkt); + uint8_t *data = (uint8_t *)odp_packet_data(pkt); (void)len; if (odp_unlikely(offset >= seg_len)) @@ -257,11 +298,11 @@ static inline void _odp_packet_prefetch(odp_packet_t pkt, uint32_t offset, odp_prefetch(data + offset); } -static inline int _odp_packet_copy_from_mem(odp_packet_t pkt, uint32_t offset, +_ODP_INLINE int odp_packet_copy_from_mem(odp_packet_t pkt, uint32_t offset, uint32_t len, const void *src) { - uint32_t seg_len = _odp_packet_seg_len(pkt); - uint8_t *data = (uint8_t *)_odp_packet_data(pkt); + uint32_t seg_len = odp_packet_seg_len(pkt); + uint8_t *data = (uint8_t *)odp_packet_data(pkt); if (odp_unlikely(offset + len > seg_len)) return _odp_packet_copy_from_mem_seg(pkt, offset, len, src); @@ -271,11 +312,11 @@ static inline int _odp_packet_copy_from_mem(odp_packet_t pkt, uint32_t offset, return 0; } -static inline int _odp_packet_copy_to_mem(odp_packet_t pkt, uint32_t offset, +_ODP_INLINE int odp_packet_copy_to_mem(odp_packet_t pkt, uint32_t offset, uint32_t len, void *dst) { - uint32_t seg_len = _odp_packet_seg_len(pkt); - uint8_t *data = (uint8_t *)_odp_packet_data(pkt); + uint32_t seg_len = odp_packet_seg_len(pkt); + uint8_t *data = (uint8_t *)odp_packet_data(pkt); if (odp_unlikely(offset + len > seg_len)) return _odp_packet_copy_to_mem_seg(pkt, offset, len, dst); @@ -285,33 +326,33 @@ static inline int _odp_packet_copy_to_mem(odp_packet_t pkt, uint32_t offset, return 0; } -static inline odp_packet_t _odp_packet_from_event(odp_event_t ev) +_ODP_INLINE odp_packet_t odp_packet_from_event(odp_event_t ev) { return (odp_packet_t)ev; } -static inline odp_event_t _odp_packet_to_event(odp_packet_t pkt) +_ODP_INLINE odp_event_t odp_packet_to_event(odp_packet_t pkt) { return (odp_event_t)pkt; } -static inline void _odp_packet_from_event_multi(odp_packet_t pkt[], +_ODP_INLINE void odp_packet_from_event_multi(odp_packet_t pkt[], const odp_event_t ev[], int num) { int i; for (i = 0; i < num; i++) - pkt[i] = _odp_packet_from_event(ev[i]); + pkt[i] = odp_packet_from_event(ev[i]); } -static inline void _odp_packet_to_event_multi(const odp_packet_t pkt[], +_ODP_INLINE void odp_packet_to_event_multi(const odp_packet_t pkt[], odp_event_t ev[], int num) { int i; for (i = 0; i < num; i++) - ev[i] = _odp_packet_to_event(pkt[i]); + ev[i] = odp_packet_to_event(pkt[i]); } /** @endcond */ diff --git a/platform/linux-generic/include/odp/api/plat/packet_inlines_api.h b/platform/linux-generic/include/odp/api/plat/packet_inlines_api.h deleted file mode 100644 index 76210e00..00000000 --- a/platform/linux-generic/include/odp/api/plat/packet_inlines_api.h +++ /dev/null @@ -1,186 +0,0 @@ -/* Copyright (c) 2017-2018, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -/** - * @file - * - * Packet inline functions - */ - -#ifndef _ODP_PLAT_PACKET_INLINES_API_H_ -#define _ODP_PLAT_PACKET_INLINES_API_H_ - -_ODP_INLINE void *odp_packet_data(odp_packet_t pkt) -{ - return _odp_packet_data(pkt); -} - -_ODP_INLINE uint32_t odp_packet_seg_len(odp_packet_t pkt) -{ - return _odp_packet_seg_len(pkt); -} - -_ODP_INLINE void *odp_packet_data_seg_len(odp_packet_t pkt, uint32_t *seg_len) -{ - return _odp_packet_data_seg_len(pkt, seg_len); -} - -_ODP_INLINE uint32_t odp_packet_len(odp_packet_t pkt) -{ - return _odp_packet_len(pkt); -} - -_ODP_INLINE uint32_t odp_packet_headroom(odp_packet_t pkt) -{ - return _odp_packet_headroom(pkt); -} - -_ODP_INLINE uint32_t odp_packet_tailroom(odp_packet_t pkt) -{ - return _odp_packet_tailroom(pkt); -} - -_ODP_INLINE odp_pool_t odp_packet_pool(odp_packet_t pkt) -{ - return _odp_packet_pool(pkt); -} - -_ODP_INLINE odp_pktio_t odp_packet_input(odp_packet_t pkt) -{ - return _odp_packet_input(pkt); -} - -_ODP_INLINE int odp_packet_input_index(odp_packet_t pkt) -{ - return _odp_packet_input_index(pkt); -} - -_ODP_INLINE int odp_packet_num_segs(odp_packet_t pkt) -{ - return _odp_packet_num_segs(pkt); -} - -_ODP_INLINE void *odp_packet_user_ptr(odp_packet_t pkt) -{ - return _odp_packet_user_ptr(pkt); -} - -_ODP_INLINE void *odp_packet_user_area(odp_packet_t pkt) -{ - return _odp_packet_user_area(pkt); -} - -_ODP_INLINE uint32_t odp_packet_user_area_size(odp_packet_t pkt) -{ - return _odp_packet_user_area_size(pkt); -} - -_ODP_INLINE uint32_t odp_packet_l2_offset(odp_packet_t pkt) -{ - return _odp_packet_l2_offset(pkt); -} - -_ODP_INLINE uint32_t odp_packet_l3_offset(odp_packet_t pkt) -{ - return _odp_packet_l3_offset(pkt); -} - -_ODP_INLINE uint32_t odp_packet_l4_offset(odp_packet_t pkt) -{ - return _odp_packet_l4_offset(pkt); -} - -_ODP_INLINE void *odp_packet_l2_ptr(odp_packet_t pkt, uint32_t *len) -{ - return _odp_packet_l2_ptr(pkt, len); -} - -_ODP_INLINE void *odp_packet_l3_ptr(odp_packet_t pkt, uint32_t *len) -{ - return _odp_packet_l3_ptr(pkt, len); -} - -_ODP_INLINE void *odp_packet_l4_ptr(odp_packet_t pkt, uint32_t *len) -{ - return _odp_packet_l4_ptr(pkt, len); -} - -_ODP_INLINE uint32_t odp_packet_flow_hash(odp_packet_t pkt) -{ - return _odp_packet_flow_hash(pkt); -} - -_ODP_INLINE odp_time_t odp_packet_ts(odp_packet_t pkt) -{ - return _odp_packet_ts(pkt); -} - -_ODP_INLINE void *odp_packet_head(odp_packet_t pkt) -{ - return _odp_packet_head(pkt); -} - -_ODP_INLINE int odp_packet_is_segmented(odp_packet_t pkt) -{ - return _odp_packet_is_segmented(pkt); -} - -_ODP_INLINE odp_packet_seg_t odp_packet_first_seg(odp_packet_t pkt) -{ - return _odp_packet_first_seg(pkt); -} - -_ODP_INLINE odp_packet_seg_t odp_packet_last_seg(odp_packet_t pkt) -{ - return _odp_packet_last_seg(pkt); -} - -_ODP_INLINE odp_packet_seg_t odp_packet_next_seg(odp_packet_t pkt, - odp_packet_seg_t seg) -{ - return _odp_packet_next_seg(pkt, seg); -} - -_ODP_INLINE void odp_packet_prefetch(odp_packet_t pkt, uint32_t offset, - uint32_t len) -{ - return _odp_packet_prefetch(pkt, offset, len); -} - -_ODP_INLINE int odp_packet_copy_from_mem(odp_packet_t pkt, uint32_t offset, - uint32_t len, const void *src) -{ - return _odp_packet_copy_from_mem(pkt, offset, len, src); -} - -_ODP_INLINE int odp_packet_copy_to_mem(odp_packet_t pkt, uint32_t offset, - uint32_t len, void *dst) -{ - return _odp_packet_copy_to_mem(pkt, offset, len, dst); -} - -_ODP_INLINE odp_packet_t odp_packet_from_event(odp_event_t ev) -{ - return _odp_packet_from_event(ev); -} - -_ODP_INLINE odp_event_t odp_packet_to_event(odp_packet_t pkt) -{ - return _odp_packet_to_event(pkt); -} - -_ODP_INLINE void odp_packet_from_event_multi(odp_packet_t pkt[], - const odp_event_t ev[], int num) -{ - return _odp_packet_from_event_multi(pkt, ev, num); -} - -_ODP_INLINE void odp_packet_to_event_multi(const odp_packet_t pkt[], - odp_event_t ev[], int num) -{ - return _odp_packet_to_event_multi(pkt, ev, num); -} -#endif diff --git a/platform/linux-generic/include/odp/api/plat/pktio_inlines.h b/platform/linux-generic/include/odp/api/plat/pktio_inlines.h index e219952a..2a2f291b 100644 --- a/platform/linux-generic/include/odp/api/plat/pktio_inlines.h +++ b/platform/linux-generic/include/odp/api/plat/pktio_inlines.h @@ -18,6 +18,7 @@ extern "C" { #define _ODP_INLINE static inline #define odp_pktio_index __odp_pktio_index #else + #undef _ODP_INLINE #define _ODP_INLINE #endif diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index b3e1d150..e3204f88 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -1513,7 +1513,7 @@ int odp_packet_align(odp_packet_t *pkt, uint32_t offset, uint32_t len, return rc; (void)odp_packet_move_data(*pkt, 0, shift, - _odp_packet_len(*pkt) - shift); + odp_packet_len(*pkt) - shift); (void)odp_packet_trunc_tail(pkt, shift, NULL, NULL); return 1; @@ -1555,7 +1555,7 @@ int odp_packet_concat(odp_packet_t *dst, odp_packet_t src) int odp_packet_split(odp_packet_t *pkt, uint32_t len, odp_packet_t *tail) { - uint32_t pktlen = _odp_packet_len(*pkt); + uint32_t pktlen = odp_packet_len(*pkt); if (len >= pktlen || tail == NULL) return -1; @@ -1598,7 +1598,7 @@ odp_packet_t odp_packet_copy(odp_packet_t pkt, odp_pool_t pool) odp_packet_t odp_packet_copy_part(odp_packet_t pkt, uint32_t offset, uint32_t len, odp_pool_t pool) { - uint32_t pktlen = _odp_packet_len(pkt); + uint32_t pktlen = odp_packet_len(pkt); odp_packet_t newpkt; if (offset >= pktlen || offset + len > pktlen) diff --git a/platform/linux-generic/odp_packet_api.c b/platform/linux-generic/odp_packet_api.c index 8f9f8dee..6bc37db4 100644 --- a/platform/linux-generic/odp_packet_api.c +++ b/platform/linux-generic/odp_packet_api.c @@ -7,7 +7,6 @@ #include "config.h" #include <odp/api/packet.h> -#include <odp/api/plat/packet_inlines.h> #include <odp_packet_internal.h> #include <odp_debug_internal.h> #include <odp/api/hints.h> @@ -23,7 +22,9 @@ #include <stdio.h> #include <inttypes.h> +/* Prevent this header from being included again later */ +#include <odp/api/plat/pktio_inlines.h> + /* Include non-inlined versions of API functions */ -#undef _ODP_INLINE -#define _ODP_INLINE -#include <odp/api/plat/packet_inlines_api.h> +#define _ODP_NO_INLINE +#include <odp/api/plat/packet_inlines.h> diff --git a/platform/linux-generic/odp_traffic_mngr.c b/platform/linux-generic/odp_traffic_mngr.c index 6e741e01..f851a7b0 100644 --- a/platform/linux-generic/odp_traffic_mngr.c +++ b/platform/linux-generic/odp_traffic_mngr.c @@ -1931,7 +1931,7 @@ static void egress_vlan_marking(tm_vlan_marking_t *vlan_marking, uint32_t hdr_len; uint16_t old_tci, new_tci; - ether_hdr_ptr = _odp_packet_l2_ptr(odp_pkt, &hdr_len); + ether_hdr_ptr = odp_packet_l2_ptr(odp_pkt, &hdr_len); vlan_hdr_ptr = (_odp_vlanhdr_t *)(ether_hdr_ptr + 1); /* If the split_hdr variable below is TRUE, then this indicates that @@ -1943,7 +1943,7 @@ static void egress_vlan_marking(tm_vlan_marking_t *vlan_marking, * correctness rather then performance. */ split_hdr = hdr_len < (_ODP_ETHHDR_LEN + _ODP_VLANHDR_LEN); if (split_hdr) { - _odp_packet_copy_to_mem(odp_pkt, _ODP_ETHHDR_LEN, + odp_packet_copy_to_mem(odp_pkt, _ODP_ETHHDR_LEN, _ODP_VLANHDR_LEN, &vlan_hdr); vlan_hdr_ptr = &vlan_hdr; } @@ -1958,7 +1958,7 @@ static void egress_vlan_marking(tm_vlan_marking_t *vlan_marking, vlan_hdr_ptr->tci = odp_cpu_to_be_16(new_tci); if (split_hdr) - _odp_packet_copy_from_mem(odp_pkt, _ODP_ETHHDR_LEN, + odp_packet_copy_from_mem(odp_pkt, _ODP_ETHHDR_LEN, _ODP_VLANHDR_LEN, &vlan_hdr); } @@ -1970,8 +1970,8 @@ static void egress_ipv4_tos_marking(tm_tos_marking_t *tos_marking, uint32_t hdr_len, l3_offset, old_chksum, ones_compl_sum, tos_diff; uint8_t old_tos, new_tos, ecn; - l3_offset = _odp_packet_l3_offset(odp_pkt); - ipv4_hdr_ptr = _odp_packet_l3_ptr(odp_pkt, &hdr_len); + l3_offset = odp_packet_l3_offset(odp_pkt); + ipv4_hdr_ptr = odp_packet_l3_ptr(odp_pkt, &hdr_len); /* If the split_hdr variable below is TRUE, then this indicates that * for this odp (output) packet the IPv4 header is not all in the same @@ -1982,7 +1982,7 @@ static void egress_ipv4_tos_marking(tm_tos_marking_t *tos_marking, * correctness rather then performance. */ split_hdr = hdr_len < 12; if (split_hdr) { - _odp_packet_copy_to_mem(odp_pkt, l3_offset, + odp_packet_copy_to_mem(odp_pkt, l3_offset, _ODP_IPV4HDR_LEN, &ipv4_hdr); ipv4_hdr_ptr = &ipv4_hdr; } @@ -2024,7 +2024,7 @@ static void egress_ipv4_tos_marking(tm_tos_marking_t *tos_marking, ipv4_hdr_ptr->tos = new_tos; ipv4_hdr_ptr->chksum = odp_cpu_to_be_16((~ones_compl_sum) & 0xFFFF); if (split_hdr) - _odp_packet_copy_from_mem(odp_pkt, l3_offset, + odp_packet_copy_from_mem(odp_pkt, l3_offset, _ODP_IPV4HDR_LEN, &ipv4_hdr); } @@ -2036,8 +2036,8 @@ static void egress_ipv6_tc_marking(tm_tos_marking_t *tos_marking, uint32_t hdr_len, old_ver_tc_flow, new_ver_tc_flow, l3_offset; uint8_t old_tc, new_tc, ecn; - l3_offset = _odp_packet_l3_offset(odp_pkt); - ipv6_hdr_ptr = _odp_packet_l3_ptr(odp_pkt, &hdr_len); + l3_offset = odp_packet_l3_offset(odp_pkt); + ipv6_hdr_ptr = odp_packet_l3_ptr(odp_pkt, &hdr_len); /* If the split_hdr variable below is TRUE, then this indicates that * for this odp (output) packet the IPv6 header is not all in the same @@ -2048,7 +2048,7 @@ static void egress_ipv6_tc_marking(tm_tos_marking_t *tos_marking, * correctness rather then performance. */ split_hdr = hdr_len < 4; if (split_hdr) { - _odp_packet_copy_to_mem(odp_pkt, l3_offset, + odp_packet_copy_to_mem(odp_pkt, l3_offset, _ODP_IPV6HDR_LEN, &ipv6_hdr); ipv6_hdr_ptr = &ipv6_hdr; } @@ -2077,7 +2077,7 @@ static void egress_ipv6_tc_marking(tm_tos_marking_t *tos_marking, ipv6_hdr_ptr->ver_tc_flow = odp_cpu_to_be_32(new_ver_tc_flow); if (split_hdr) - _odp_packet_copy_from_mem(odp_pkt, l3_offset, + odp_packet_copy_from_mem(odp_pkt, l3_offset, _ODP_IPV6HDR_LEN, &ipv6_hdr); } diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c index 206a6a45..1ecd7d58 100644 --- a/platform/linux-generic/pktio/dpdk.c +++ b/platform/linux-generic/pktio/dpdk.c @@ -483,7 +483,7 @@ static inline int mbuf_to_pkt(pktio_entry_t *pktio_entry, pkt_hdr = packet_hdr(pkt); pull_tail(pkt_hdr, alloc_len - pkt_len); - if (_odp_packet_copy_from_mem(pkt, 0, pkt_len, data) != 0) + if (odp_packet_copy_from_mem(pkt, 0, pkt_len, data) != 0) goto fail; pkt_hdr->input = input; @@ -659,7 +659,7 @@ static inline int pkt_to_mbuf(pktio_entry_t *pktio_entry, /* Packet always fits in mbuf */ data = rte_pktmbuf_append(mbuf_table[i], pkt_len); - _odp_packet_copy_to_mem(pkt_table[i], 0, pkt_len, data); + odp_packet_copy_to_mem(pkt_table[i], 0, pkt_len, data); if (odp_unlikely(pktio_entry->s.chksum_insert_ena)) { odp_pktout_config_opt_t *pktout_capa = @@ -788,7 +788,7 @@ static inline int pkt_to_mbuf_zero(pktio_entry_t *pktio_entry, if (odp_unlikely(pktio_entry->s.chksum_insert_ena)) pkt_set_ol_tx(pktout_cfg, pktout_capa, pkt_hdr, - mbuf, _odp_packet_data(pkt)); + mbuf, odp_packet_data(pkt)); } else { pool_t *pool_entry = pkt_hdr->buf_hdr.pool_ptr; @@ -812,7 +812,7 @@ static inline int pkt_to_mbuf_zero(pktio_entry_t *pktio_entry, if (pktio_entry->s.chksum_insert_ena) pkt_set_ol_tx(pktout_cfg, pktout_capa, pkt_hdr, mbuf, - _odp_packet_data(pkt)); + odp_packet_data(pkt)); } } mbuf_table[i] = mbuf; diff --git a/platform/linux-generic/pktio/netmap.c b/platform/linux-generic/pktio/netmap.c index 1fb76d2a..45f717d5 100644 --- a/platform/linux-generic/pktio/netmap.c +++ b/platform/linux-generic/pktio/netmap.c @@ -715,7 +715,7 @@ static inline int netmap_pkt_to_odp(pktio_entry_t *pktio_entry, /* For now copy the data in the mbuf, worry about zero-copy later */ - if (_odp_packet_copy_from_mem(pkt, 0, len, slot.buf) != 0) + if (odp_packet_copy_from_mem(pkt, 0, len, slot.buf) != 0) goto fail; pkt_hdr->input = pktio_entry->s.handle; @@ -982,7 +982,7 @@ static int netmap_send(pktio_entry_t *pktio_entry, int index, for (nb_tx = 0; nb_tx < num; nb_tx++) { pkt = pkt_table[nb_tx]; - pkt_len = _odp_packet_len(pkt); + pkt_len = odp_packet_len(pkt); if (pkt_len > pkt_nm->mtu) { if (nb_tx == 0) @@ -1000,7 +1000,7 @@ static int netmap_send(pktio_entry_t *pktio_entry, int index, buf = NETMAP_BUF(ring, ring->slot[slot_id].buf_idx); - if (_odp_packet_copy_to_mem(pkt, 0, pkt_len, buf)) { + if (odp_packet_copy_to_mem(pkt, 0, pkt_len, buf)) { i = NM_INJECT_RETRIES; break; } diff --git a/platform/linux-generic/pktio/pcap.c b/platform/linux-generic/pktio/pcap.c index 530a1600..f1662930 100644 --- a/platform/linux-generic/pktio/pcap.c +++ b/platform/linux-generic/pktio/pcap.c @@ -250,7 +250,7 @@ static int pcapif_recv_pkt(pktio_entry_t *pktio_entry, int index ODP_UNUSED, pkt_hdr = packet_hdr(pkt); - if (_odp_packet_copy_from_mem(pkt, 0, hdr->caplen, data) != 0) { + if (odp_packet_copy_from_mem(pkt, 0, hdr->caplen, data) != 0) { ODP_ERR("failed to copy packet data\n"); break; } @@ -285,7 +285,7 @@ static int _pcapif_dump_pkt(pkt_pcap_t *pcap, odp_packet_t pkt) hdr.len = hdr.caplen; (void)gettimeofday(&hdr.ts, NULL); - if (_odp_packet_copy_to_mem(pkt, 0, hdr.len, pcap->buf) != 0) + if (odp_packet_copy_to_mem(pkt, 0, hdr.len, pcap->buf) != 0) return -1; pcap_dump(pcap->tx_dump, &hdr, pcap->buf); diff --git a/platform/linux-generic/pktio/socket_mmap.c b/platform/linux-generic/pktio/socket_mmap.c index 1731e60d..55fb20f4 100644 --- a/platform/linux-generic/pktio/socket_mmap.c +++ b/platform/linux-generic/pktio/socket_mmap.c @@ -245,7 +245,7 @@ static inline unsigned pkt_mmap_v2_rx(pktio_entry_t *pktio_entry, continue; } hdr = packet_hdr(pkt_table[nb_rx]); - ret = _odp_packet_copy_from_mem(pkt_table[nb_rx], 0, + ret = odp_packet_copy_from_mem(pkt_table[nb_rx], 0, pkt_len, pkt_buf); if (ret != 0) { odp_packet_free(pkt_table[nb_rx]); @@ -348,7 +348,7 @@ static inline unsigned pkt_mmap_v2_tx(int sock, struct ring *ring, buf = (uint8_t *)ppd.raw + TPACKET2_HDRLEN - sizeof(struct sockaddr_ll); - _odp_packet_copy_to_mem(pkt_table[i], 0, pkt_len, buf); + odp_packet_copy_to_mem(pkt_table[i], 0, pkt_len, buf); mmap_tx_user_ready(ppd.raw); diff --git a/platform/linux-generic/pktio/tap.c b/platform/linux-generic/pktio/tap.c index d2f5cea1..032a8ecf 100644 --- a/platform/linux-generic/pktio/tap.c +++ b/platform/linux-generic/pktio/tap.c @@ -274,7 +274,7 @@ static odp_packet_t pack_odp_pkt(pktio_entry_t *pktio_entry, const void *data, if (num != 1) return ODP_PACKET_INVALID; - if (_odp_packet_copy_from_mem(pkt, 0, len, data) < 0) { + if (odp_packet_copy_from_mem(pkt, 0, len, data) < 0) { ODP_ERR("failed to copy packet data\n"); odp_packet_free(pkt); return ODP_PACKET_INVALID; @@ -354,7 +354,7 @@ static int tap_pktio_send_lockless(pktio_entry_t *pktio_entry, break; } - if (_odp_packet_copy_to_mem(pkts[i], 0, pkt_len, buf) < 0) { + if (odp_packet_copy_to_mem(pkts[i], 0, pkt_len, buf) < 0) { ODP_ERR("failed to copy packet data\n"); break; } commit a4d31373e5a0f72d028ff73ca9eae0fd6671f350 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue May 15 00:26:21 2018 +0300 linux-gen: thread: remove separate API inlining header Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 373a1b10..033f38a5 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -37,7 +37,6 @@ odpapiplatinclude_HEADERS = \ include/odp/api/plat/strong_types.h \ include/odp/api/plat/sync_inlines.h \ include/odp/api/plat/thread_inlines.h \ - include/odp/api/plat/thread_inlines_api.h \ include/odp/api/plat/ticketlock_inlines.h odpapiabiarchincludedir = $(archincludedir)/odp/api/abi diff --git a/platform/linux-generic/include-abi/odp/api/abi/thread.h b/platform/linux-generic/include-abi/odp/api/abi/thread.h index 8cd36bda..d5628a74 100644 --- a/platform/linux-generic/include-abi/odp/api/abi/thread.h +++ b/platform/linux-generic/include-abi/odp/api/abi/thread.h @@ -6,6 +6,4 @@ #include <odp/api/abi-default/thread.h> -#define _ODP_INLINE static inline #include <odp/api/plat/thread_inlines.h> -#include <odp/api/plat/thread_inlines_api.h> diff --git a/platform/linux-generic/include/odp/api/plat/thread_inlines.h b/platform/linux-generic/include/odp/api/plat/thread_inlines.h index deecc653..ecab29e5 100644 --- a/platform/linux-generic/include/odp/api/plat/thread_inlines.h +++ b/platform/linux-generic/include/odp/api/plat/thread_inlines.h @@ -22,17 +22,27 @@ typedef struct { extern __thread _odp_thread_state_t *_odp_this_thread; -static inline int _odp_thread_id(void) +#ifndef _ODP_NO_INLINE + /* Inline functions by default */ + #define _ODP_INLINE static inline + #define odp_thread_id __odp_thread_id + #define odp_thread_type __odp_thread_type + #define odp_cpu_id __odp_cpu_id +#else + #define _ODP_INLINE +#endif + +_ODP_INLINE int odp_thread_id(void) { return _odp_this_thread->thr; } -static inline odp_thread_type_t _odp_thread_type(void) +_ODP_INLINE odp_thread_type_t odp_thread_type(void) { return _odp_this_thread->type; } -static inline int _odp_cpu_id(void) +_ODP_INLINE int odp_cpu_id(void) { return _odp_this_thread->cpu; } diff --git a/platform/linux-generic/include/odp/api/plat/thread_inlines_api.h b/platform/linux-generic/include/odp/api/plat/thread_inlines_api.h deleted file mode 100644 index 08193e2b..00000000 --- a/platform/linux-generic/include/odp/api/plat/thread_inlines_api.h +++ /dev/null @@ -1,41 +0,0 @@ -/* Copyright (c) 2018-2018, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -/** - * @file - */ - -#ifndef ODP_PLAT_THREAD_INLINES_API_H_ -#define ODP_PLAT_THREAD_INLINES_API_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -_ODP_INLINE int odp_thread_id(void) -{ - return _odp_thread_id(); -} - -_ODP_INLINE odp_thread_type_t odp_thread_type(void) -{ - return _odp_thread_type(); -} - -_ODP_INLINE int odp_cpu_id(void) -{ - return _odp_cpu_id(); -} - -/** - * @} - */ - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/platform/linux-generic/odp_rwlock_recursive.c b/platform/linux-generic/odp_rwlock_recursive.c index 397a054b..dac9ad19 100644 --- a/platform/linux-generic/odp_rwlock_recursive.c +++ b/platform/linux-generic/odp_rwlock_recursive.c @@ -23,7 +23,7 @@ void odp_rwlock_recursive_init(odp_rwlock_recursive_t *rlock) /* Multiple readers can recurse the lock concurrently */ void odp_rwlock_recursive_read_lock(odp_rwlock_recursive_t *rlock) { - int thr = _odp_thread_id(); + int thr = odp_thread_id(); if (rlock->rd_cnt[thr]) { rlock->rd_cnt[thr]++; @@ -37,7 +37,7 @@ void odp_rwlock_recursive_read_lock(odp_rwlock_recursive_t *rlock) /* Multiple readers can recurse the lock concurrently */ int odp_rwlock_recursive_read_trylock(odp_rwlock_recursive_t *rlock) { - int thr = _odp_thread_id(); + int thr = odp_thread_id(); if (rlock->rd_cnt[thr]) { rlock->rd_cnt[thr]++; @@ -54,7 +54,7 @@ int odp_rwlock_recursive_read_trylock(odp_rwlock_recursive_t *rlock) void odp_rwlock_recursive_read_unlock(odp_rwlock_recursive_t *rlock) { - int thr = _odp_thread_id(); + int thr = odp_thread_id(); rlock->rd_cnt[thr]--; @@ -67,7 +67,7 @@ void odp_rwlock_recursive_read_unlock(odp_rwlock_recursive_t *rlock) /* Only one writer can recurse the lock */ void odp_rwlock_recursive_write_lock(odp_rwlock_recursive_t *rlock) { - int thr = _odp_thread_id(); + int thr = odp_thread_id(); if (rlock->wr_owner == thr) { rlock->wr_cnt++; @@ -82,7 +82,7 @@ void odp_rwlock_recursive_write_lock(odp_rwlock_recursive_t *rlock) /* Only one writer can recurse the lock */ int odp_rwlock_recursive_write_trylock(odp_rwlock_recursive_t *rlock) { - int thr = _odp_thread_id(); + int thr = odp_thread_id(); if (rlock->wr_owner == thr) { rlock->wr_cnt++; diff --git a/platform/linux-generic/odp_spinlock_recursive.c b/platform/linux-generic/odp_spinlock_recursive.c index d5288969..59374268 100644 --- a/platform/linux-generic/odp_spinlock_recursive.c +++ b/platform/linux-generic/odp_spinlock_recursive.c @@ -21,7 +21,7 @@ void odp_spinlock_recursive_init(odp_spinlock_recursive_t *rlock) void odp_spinlock_recursive_lock(odp_spinlock_recursive_t *rlock) { - int thr = _odp_thread_id(); + int thr = odp_thread_id(); if (rlock->owner == thr) { rlock->cnt++; @@ -35,7 +35,7 @@ void odp_spinlock_recursive_lock(odp_spinlock_recursive_t *rlock) int odp_spinlock_recursive_trylock(odp_spinlock_recursive_t *rlock) { - int thr = _odp_thread_id(); + int thr = odp_thread_id(); if (rlock->owner == thr) { rlock->cnt++; @@ -64,7 +64,7 @@ void odp_spinlock_recursive_unlock(odp_spinlock_recursive_t *rlock) int odp_spinlock_recursive_is_locked(odp_spinlock_recursive_t *rlock) { - int thr = _odp_thread_id(); + int thr = odp_thread_id(); if (rlock->owner == thr) return 1; diff --git a/platform/linux-generic/odp_thread_api.c b/platform/linux-generic/odp_thread_api.c index 7f07f6a3..cfce705d 100644 --- a/platform/linux-generic/odp_thread_api.c +++ b/platform/linux-generic/odp_thread_api.c @@ -8,8 +8,7 @@ #include <odp/api/thread.h> #include <odp/api/cpu.h> -#include <odp/api/plat/thread_inlines.h> /* Include non-inlined versions of API functions */ -#define _ODP_INLINE -#include <odp/api/plat/thread_inlines_api.h> +#define _ODP_NO_INLINE +#include <odp/api/plat/thread_inlines.h> ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/Makefile.am | 6 +- .../linux-generic/include-abi/odp/api/abi/packet.h | 2 - .../linux-generic/include-abi/odp/api/abi/thread.h | 2 - .../include/odp/api/plat/packet_flag_inlines.h | 1 + .../include/odp/api/plat/packet_inlines.h | 153 ++++++++++------- .../include/odp/api/plat/packet_inlines_api.h | 186 --------------------- .../include/odp/api/plat/pktio_inlines.h | 1 + .../include/odp/api/plat/std_clib_inlines.h | 18 +- .../include/odp/api/plat/sync_inlines.h | 18 +- .../include/odp/api/plat/thread_inlines.h | 16 +- .../include/odp/api/plat/thread_inlines_api.h | 41 ----- .../include/odp/api/plat/ticketlock_inlines.h | 3 + platform/linux-generic/include/odp_ring_internal.h | 1 + platform/linux-generic/odp_barrier.c | 2 + platform/linux-generic/odp_crypto.c | 1 + platform/linux-generic/odp_ipsec_sad.c | 1 + platform/linux-generic/odp_packet.c | 6 +- platform/linux-generic/odp_packet_api.c | 9 +- platform/linux-generic/odp_packet_io.c | 1 + platform/linux-generic/odp_pool.c | 1 + platform/linux-generic/odp_queue_basic.c | 1 + platform/linux-generic/odp_queue_lf.c | 1 + platform/linux-generic/odp_queue_scalable.c | 1 + platform/linux-generic/odp_rwlock.c | 1 + platform/linux-generic/odp_rwlock_recursive.c | 10 +- platform/linux-generic/odp_schedule_basic.c | 1 + platform/linux-generic/odp_schedule_iquery.c | 1 + platform/linux-generic/odp_schedule_scalable.c | 1 + platform/linux-generic/odp_schedule_sp.c | 1 + platform/linux-generic/odp_spinlock_recursive.c | 6 +- .../{odp_std_clib.c => odp_std_clib_api.c} | 2 +- .../linux-generic/{odp_sync.c => odp_sync_api.c} | 2 +- platform/linux-generic/odp_thread_api.c | 5 +- platform/linux-generic/odp_ticketlock_api.c | 1 + platform/linux-generic/odp_traffic_mngr.c | 22 +-- platform/linux-generic/pktio/dpdk.c | 8 +- platform/linux-generic/pktio/netmap.c | 6 +- platform/linux-generic/pktio/pcap.c | 4 +- platform/linux-generic/pktio/socket_mmap.c | 4 +- platform/linux-generic/pktio/tap.c | 4 +- 40 files changed, 201 insertions(+), 350 deletions(-) delete mode 100644 platform/linux-generic/include/odp/api/plat/packet_inlines_api.h delete mode 100644 platform/linux-generic/include/odp/api/plat/thread_inlines_api.h rename platform/linux-generic/{odp_std_clib.c => odp_std_clib_api.c} (92%) rename platform/linux-generic/{odp_sync.c => odp_sync_api.c} (91%) hooks/post-receive --

7 years, 1 month

[COMMIT] branch master updated. v1.19.0.1_tigermoth-24-g37390a88

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 37390a88fd35d972a8e399fc934c612c1043ad77 (commit) via 4b895826e62b9b6e7512d76d05999752ffc93432 (commit) via 3ee54c088ec06a65b1ae7ece2dae8cfabfe90d12 (commit) via 9e1aad1fbffad60e849c9cac613e282fd3f80646 (commit) via 1da9bcf69a3f2c364eb1674b44ede4c0cf280f06 (commit) via d61545b5b2ad42d7e9fca34d3b077942fcc04c01 (commit) via f426dbf3b4dc5be7a1b56d9cc3c0dab00eb9787c (commit) from 40699694b24cceb86ed441308309393de84c3478 (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 37390a88fd35d972a8e399fc934c612c1043ad77 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue May 15 00:26:21 2018 +0300 linux-gen: byteorder: remove separate API inlining header Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index e084eb2c..373a1b10 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -26,7 +26,6 @@ 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_inline_types.h \ @@ -214,7 +213,7 @@ __LIB__libodp_linux_la_SOURCES = \ if ODP_ABI_COMPAT __LIB__libodp_linux_la_SOURCES += \ odp_atomic_api.c \ - odp_byteorder.c \ + odp_byteorder_api.c \ odp_event_api.c \ odp_packet_api.c \ odp_packet_flags_api.c \ diff --git a/platform/linux-generic/include-abi/odp/api/abi/byteorder.h b/platform/linux-generic/include-abi/odp/api/abi/byteorder.h index 8be28603..c0b5ebe0 100644 --- a/platform/linux-generic/include-abi/odp/api/abi/byteorder.h +++ b/platform/linux-generic/include-abi/odp/api/abi/byteorder.h @@ -75,9 +75,7 @@ typedef uint64_t __odp_bitwise odp_u64be_t; typedef uint16_t __odp_bitwise odp_u16sum_t; typedef uint32_t __odp_bitwise odp_u32sum_t; -#define _ODP_INLINE static inline #include <odp/api/plat/byteorder_inlines.h> -#include <odp/api/plat/byteorder_inlines_api.h> /** * @} diff --git a/platform/linux-generic/include/odp/api/plat/byteorder_inlines.h b/platform/linux-generic/include/odp/api/plat/byteorder_inlines.h index 56a2b31c..6cc2a9a1 100644 --- a/platform/linux-generic/include/odp/api/plat/byteorder_inlines.h +++ b/platform/linux-generic/include/odp/api/plat/byteorder_inlines.h @@ -17,13 +17,30 @@ extern "C" { #endif +/** @cond _ODP_HIDE_FROM_DOXYGEN_ */ + #ifndef __odp_force #define __odp_force #endif -/** @ingroup odp_compiler_optim - * @{ - */ +#ifndef _ODP_NO_INLINE + /* Inline functions by default */ + #define _ODP_INLINE static inline + #define odp_be_to_cpu_16 __odp_be_to_cpu_16 + #define odp_be_to_cpu_32 __odp_be_to_cpu_32 + #define odp_be_to_cpu_64 __odp_be_to_cpu_64 + #define odp_cpu_to_be_16 __odp_cpu_to_be_16 + #define odp_cpu_to_be_32 __odp_cpu_to_be_32 + #define odp_cpu_to_be_64 __odp_cpu_to_be_64 + #define odp_le_to_cpu_16 __odp_le_to_cpu_16 + #define odp_le_to_cpu_32 __odp_le_to_cpu_32 + #define odp_le_to_cpu_64 __odp_le_to_cpu_64 + #define odp_cpu_to_le_16 __odp_cpu_to_le_16 + #define odp_cpu_to_le_32 __odp_cpu_to_le_32 + #define odp_cpu_to_le_64 __odp_cpu_to_le_64 +#else + #define _ODP_INLINE +#endif /** @internal GNU compiler version */ #define GCC_VERSION (__GNUC__ * 10000 \ @@ -43,7 +60,7 @@ extern "C" { #define __odp_builtin_bswap16(u16) __builtin_bswap16(u16) #endif -static inline uint16_t _odp_be_to_cpu_16(odp_u16be_t be16) +_ODP_INLINE uint16_t odp_be_to_cpu_16(odp_u16be_t be16) { #if ODP_BYTE_ORDER == ODP_LITTLE_ENDIAN return __odp_builtin_bswap16((__odp_force uint16_t)be16); @@ -52,7 +69,7 @@ static inline uint16_t _odp_be_to_cpu_16(odp_u16be_t be16) #endif } -static inline uint32_t _odp_be_to_cpu_32(odp_u32be_t be32) +_ODP_INLINE uint32_t odp_be_to_cpu_32(odp_u32be_t be32) { #if ODP_BYTE_ORDER == ODP_LITTLE_ENDIAN return __builtin_bswap32((__odp_force uint32_t)be32); @@ -61,7 +78,7 @@ static inline uint32_t _odp_be_to_cpu_32(odp_u32be_t be32) #endif } -static inline uint64_t _odp_be_to_cpu_64(odp_u64be_t be64) +_ODP_INLINE uint64_t odp_be_to_cpu_64(odp_u64be_t be64) { #if ODP_BYTE_ORDER == ODP_LITTLE_ENDIAN return __builtin_bswap64((__odp_force uint64_t)be64); @@ -70,7 +87,7 @@ static inline uint64_t _odp_be_to_cpu_64(odp_u64be_t be64) #endif } -static inline odp_u16be_t _odp_cpu_to_be_16(uint16_t cpu16) +_ODP_INLINE odp_u16be_t odp_cpu_to_be_16(uint16_t cpu16) { #if ODP_BYTE_ORDER == ODP_LITTLE_ENDIAN return (__odp_force odp_u16be_t)__odp_builtin_bswap16(cpu16); @@ -79,7 +96,7 @@ static inline odp_u16be_t _odp_cpu_to_be_16(uint16_t cpu16) #endif } -static inline odp_u32be_t _odp_cpu_to_be_32(uint32_t cpu32) +_ODP_INLINE odp_u32be_t odp_cpu_to_be_32(uint32_t cpu32) { #if ODP_BYTE_ORDER == ODP_LITTLE_ENDIAN return (__odp_force odp_u32be_t)__builtin_bswap32(cpu32); @@ -88,7 +105,7 @@ static inline odp_u32be_t _odp_cpu_to_be_32(uint32_t cpu32) #endif } -static inline odp_u64be_t _odp_cpu_to_be_64(uint64_t cpu64) +_ODP_INLINE odp_u64be_t odp_cpu_to_be_64(uint64_t cpu64) { #if ODP_BYTE_ORDER == ODP_LITTLE_ENDIAN return (__odp_force odp_u64be_t)__builtin_bswap64(cpu64); @@ -97,7 +114,7 @@ static inline odp_u64be_t _odp_cpu_to_be_64(uint64_t cpu64) #endif } -static inline uint16_t _odp_le_to_cpu_16(odp_u16le_t le16) +_ODP_INLINE uint16_t odp_le_to_cpu_16(odp_u16le_t le16) { #if ODP_BYTE_ORDER == ODP_LITTLE_ENDIAN return (__odp_force uint16_t)le16; @@ -106,7 +123,7 @@ static inline uint16_t _odp_le_to_cpu_16(odp_u16le_t le16) #endif } -static inline uint32_t _odp_le_to_cpu_32(odp_u32le_t le32) +_ODP_INLINE uint32_t odp_le_to_cpu_32(odp_u32le_t le32) { #if ODP_BYTE_ORDER == ODP_LITTLE_ENDIAN return (__odp_force uint32_t)le32; @@ -115,7 +132,7 @@ static inline uint32_t _odp_le_to_cpu_32(odp_u32le_t le32) #endif } -static inline uint64_t _odp_le_to_cpu_64(odp_u64le_t le64) +_ODP_INLINE uint64_t odp_le_to_cpu_64(odp_u64le_t le64) { #if ODP_BYTE_ORDER == ODP_LITTLE_ENDIAN return (__odp_force uint64_t)le64; @@ -124,7 +141,7 @@ static inline uint64_t _odp_le_to_cpu_64(odp_u64le_t le64) #endif } -static inline odp_u16le_t _odp_cpu_to_le_16(uint16_t cpu16) +_ODP_INLINE odp_u16le_t odp_cpu_to_le_16(uint16_t cpu16) { #if ODP_BYTE_ORDER == ODP_LITTLE_ENDIAN return (__odp_force odp_u16le_t)cpu16; @@ -133,7 +150,7 @@ static inline odp_u16le_t _odp_cpu_to_le_16(uint16_t cpu16) #endif } -static inline odp_u32le_t _odp_cpu_to_le_32(uint32_t cpu32) +_ODP_INLINE odp_u32le_t odp_cpu_to_le_32(uint32_t cpu32) { #if ODP_BYTE_ORDER == ODP_LITTLE_ENDIAN return (__odp_force odp_u32le_t)cpu32; @@ -142,7 +159,7 @@ static inline odp_u32le_t _odp_cpu_to_le_32(uint32_t cpu32) #endif } -static inline odp_u64le_t _odp_cpu_to_le_64(uint64_t cpu64) +_ODP_INLINE odp_u64le_t odp_cpu_to_le_64(uint64_t cpu64) { #if ODP_BYTE_ORDER == ODP_LITTLE_ENDIAN return (__odp_force odp_u64le_t)cpu64; @@ -151,9 +168,7 @@ static inline odp_u64le_t _odp_cpu_to_le_64(uint64_t cpu64) #endif } -/** - * @} - */ +/** @endcond */ #ifdef __cplusplus } diff --git a/platform/linux-generic/include/odp/api/plat/byteorder_inlines_api.h b/platform/linux-generic/include/odp/api/plat/byteorder_inlines_api.h deleted file mode 100644 index f979f601..00000000 --- a/platform/linux-generic/include/odp/api/plat/byteorder_inlines_api.h +++ /dev/null @@ -1,88 +0,0 @@ -/* Copyright (c) 2018-2018, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -/** - * @file - * - * ODP byteorder - */ - -#ifndef ODP_PLAT_BYTEORDER_INLINES_API_H_ -#define ODP_PLAT_BYTEORDER_INLINES_API_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -_ODP_INLINE uint16_t odp_be_to_cpu_16(odp_u16be_t be16) -{ - return _odp_be_to_cpu_16(be16); -} - -_ODP_INLINE uint32_t odp_be_to_cpu_32(odp_u32be_t be32) -{ - return _odp_be_to_cpu_32(be32); -} - -_ODP_INLINE uint64_t odp_be_to_cpu_64(odp_u64be_t be64) -{ - return _odp_be_to_cpu_64(be64); -} - -_ODP_INLINE odp_u16be_t odp_cpu_to_be_16(uint16_t cpu16) -{ - return _odp_cpu_to_be_16(cpu16); -} - -_ODP_INLINE odp_u32be_t odp_cpu_to_be_32(uint32_t cpu32) -{ - return _odp_cpu_to_be_32(cpu32); -} - -_ODP_INLINE odp_u64be_t odp_cpu_to_be_64(uint64_t cpu64) -{ - return _odp_cpu_to_be_64(cpu64); -} - -_ODP_INLINE uint16_t odp_le_to_cpu_16(odp_u16le_t le16) -{ - return _odp_le_to_cpu_16(le16); -} - -_ODP_INLINE uint32_t odp_le_to_cpu_32(odp_u32le_t le32) -{ - return _odp_le_to_cpu_32(le32); -} - -_ODP_INLINE uint64_t odp_le_to_cpu_64(odp_u64le_t le64) -{ - return _odp_le_to_cpu_64(le64); -} - -_ODP_INLINE odp_u16le_t odp_cpu_to_le_16(uint16_t cpu16) -{ - return _odp_cpu_to_le_16(cpu16); -} - -_ODP_INLINE odp_u32le_t odp_cpu_to_le_32(uint32_t cpu32) -{ - return _odp_cpu_to_le_32(cpu32); -} - -_ODP_INLINE odp_u64le_t odp_cpu_to_le_64(uint64_t cpu64) -{ - return _odp_cpu_to_le_64(cpu64); -} - -/** - * @} - */ - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/platform/linux-generic/include/odp_classification_inlines.h b/platform/linux-generic/include/odp_classification_inlines.h index 3f1d9ce6..69819276 100644 --- a/platform/linux-generic/include/odp_classification_inlines.h +++ b/platform/linux-generic/include/odp_classification_inlines.h @@ -70,7 +70,7 @@ static inline int verify_pmr_ipv4_saddr(const uint8_t *pkt_addr, if (!pkt_hdr->p.input_flags.ipv4) return 0; ip = (const _odp_ipv4hdr_t *)(pkt_addr + pkt_hdr->p.l3_offset); - ipaddr = _odp_be_to_cpu_32(ip->src_addr); + ipaddr = odp_be_to_cpu_32(ip->src_addr); if (term_value->match.value == (ipaddr & term_value->match.mask)) return 1; @@ -86,7 +86,7 @@ static inline int verify_pmr_ipv4_daddr(const uint8_t *pkt_addr, if (!pkt_hdr->p.input_flags.ipv4) return 0; ip = (const _odp_ipv4hdr_t *)(pkt_addr + pkt_hdr->p.l3_offset); - ipaddr = _odp_be_to_cpu_32(ip->dst_addr); + ipaddr = odp_be_to_cpu_32(ip->dst_addr); if (term_value->match.value == (ipaddr & term_value->match.mask)) return 1; @@ -102,7 +102,7 @@ static inline int verify_pmr_tcp_sport(const uint8_t *pkt_addr, if (!pkt_hdr->p.input_flags.tcp) return 0; tcp = (const _odp_tcphdr_t *)(pkt_addr + pkt_hdr->p.l4_offset); - sport = _odp_be_to_cpu_16(tcp->src_port); + sport = odp_be_to_cpu_16(tcp->src_port); if (term_value->match.value == (sport & term_value->match.mask)) return 1; @@ -118,7 +118,7 @@ static inline int verify_pmr_tcp_dport(const uint8_t *pkt_addr, if (!pkt_hdr->p.input_flags.tcp) return 0; tcp = (const _odp_tcphdr_t *)(pkt_addr + pkt_hdr->p.l4_offset); - dport = _odp_be_to_cpu_16(tcp->dst_port); + dport = odp_be_to_cpu_16(tcp->dst_port); if (term_value->match.value == (dport & term_value->match.mask)) return 1; @@ -134,7 +134,7 @@ static inline int verify_pmr_udp_dport(const uint8_t *pkt_addr, if (!pkt_hdr->p.input_flags.udp) return 0; udp = (const _odp_udphdr_t *)(pkt_addr + pkt_hdr->p.l4_offset); - dport = _odp_be_to_cpu_16(udp->dst_port); + dport = odp_be_to_cpu_16(udp->dst_port); if (term_value->match.value == (dport & term_value->match.mask)) return 1; @@ -151,7 +151,7 @@ static inline int verify_pmr_udp_sport(const uint8_t *pkt_addr, if (!pkt_hdr->p.input_flags.udp) return 0; udp = (const _odp_udphdr_t *)(pkt_addr + pkt_hdr->p.l4_offset); - sport = _odp_be_to_cpu_16(udp->src_port); + sport = odp_be_to_cpu_16(udp->src_port); if (term_value->match.value == (sport & term_value->match.mask)) return 1; @@ -171,9 +171,9 @@ static inline int verify_pmr_dmac(const uint8_t *pkt_addr, eth = (const _odp_ethhdr_t *)(pkt_addr + pkt_hdr->p.l2_offset); memcpy(&dmac_be, eth->dst.addr, _ODP_ETHADDR_LEN); - dmac = _odp_be_to_cpu_64(dmac_be); + dmac = odp_be_to_cpu_64(dmac_be); /* since we are converting a 48 bit ethernet address from BE to cpu - format using _odp_be_to_cpu_64() the last 16 bits needs to be right + format using odp_be_to_cpu_64() the last 16 bits needs to be right shifted */ if (dmac_be != dmac) dmac = dmac >> (64 - (_ODP_ETHADDR_LEN * 8)); @@ -247,7 +247,7 @@ static inline int verify_pmr_vlan_id_0(const uint8_t *pkt_addr, eth = (const _odp_ethhdr_t *)(pkt_addr + pkt_hdr->p.l2_offset); vlan = (const _odp_vlanhdr_t *)(eth + 1); - tci = _odp_be_to_cpu_16(vlan->tci); + tci = odp_be_to_cpu_16(vlan->tci); vlan_id = tci & 0x0fff; if (term_value->match.value == (vlan_id & term_value->match.mask)) @@ -271,7 +271,7 @@ static inline int verify_pmr_vlan_id_x(const uint8_t *pkt_addr ODP_UNUSED, eth = (const _odp_ethhdr_t *)(pkt_addr + pkt_hdr->p.l2_offset); vlan = (const _odp_vlanhdr_t *)(eth + 1); vlan++; - tci = _odp_be_to_cpu_16(vlan->tci); + tci = odp_be_to_cpu_16(vlan->tci); vlan_id = tci & 0x0fff; if (term_value->match.value == (vlan_id & term_value->match.mask)) @@ -291,11 +291,11 @@ static inline int verify_pmr_ipsec_spi(const uint8_t *pkt_addr, if (pkt_hdr->p.input_flags.ipsec_ah) { const _odp_ahhdr_t *ahhdr = (const _odp_ahhdr_t *)pkt_addr; - spi = _odp_be_to_cpu_32(ahhdr->spi); + spi = odp_be_to_cpu_32(ahhdr->spi); } else if (pkt_hdr->p.input_flags.ipsec_esp) { const _odp_esphdr_t *esphdr = (const _odp_esphdr_t *)pkt_addr; - spi = _odp_be_to_cpu_32(esphdr->spi); + spi = odp_be_to_cpu_32(esphdr->spi); } else { return 0; } @@ -345,7 +345,7 @@ static inline int verify_pmr_eth_type_0(const uint8_t *pkt_addr, return 0; eth = (const _odp_ethhdr_t *)(pkt_addr + pkt_hdr->p.l2_offset); - ethtype = _odp_be_to_cpu_16(eth->type); + ethtype = odp_be_to_cpu_16(eth->type); if (term_value->match.value == (ethtype & term_value->match.mask)) return 1; @@ -366,7 +366,7 @@ static inline int verify_pmr_eth_type_x(const uint8_t *pkt_addr, eth = (const _odp_ethhdr_t *)(pkt_addr + pkt_hdr->p.l2_offset); vlan = (const _odp_vlanhdr_t *)(eth + 1); - ethtype = _odp_be_to_cpu_16(vlan->type); + ethtype = odp_be_to_cpu_16(vlan->type); if (term_value->match.value == (ethtype & term_value->match.mask)) return 1; diff --git a/platform/linux-generic/include/protocols/thash.h b/platform/linux-generic/include/protocols/thash.h index 0f10a3cb..2109c8a5 100644 --- a/platform/linux-generic/include/protocols/thash.h +++ b/platform/linux-generic/include/protocols/thash.h @@ -67,10 +67,10 @@ void thash_load_ipv6_addr(const _odp_ipv6hdr_t *ipv6, for (i = 0; i < 4; i++) { *(tuple->v6.src_addr.u32 + i) = - _odp_be_to_cpu_32(*(ipv6->src_addr.u32 + i)); + odp_be_to_cpu_32(*(ipv6->src_addr.u32 + i)); *(tuple->v6.dst_addr.u32 + i) = - _odp_be_to_cpu_32(*(ipv6->dst_addr.u32 + i)); + odp_be_to_cpu_32(*(ipv6->dst_addr.u32 + i)); } } @@ -83,9 +83,9 @@ uint32_t thash_softrss(uint32_t *tuple, uint8_t len, for (j = 0; j < len; j++) { for (i = 0; i < 32; i++) { if (tuple[j] & (1 << (31 - i))) { - ret ^= _odp_cpu_to_be_32(((const uint32_t *) + ret ^= odp_cpu_to_be_32(((const uint32_t *) key.u32)[j]) << i | (uint32_t)((uint64_t) - (_odp_cpu_to_be_32(((const uint32_t *)key.u32) + (odp_cpu_to_be_32(((const uint32_t *)key.u32) [j + 1])) >> (32 - i)); } } diff --git a/platform/linux-generic/odp_byteorder.c b/platform/linux-generic/odp_byteorder_api.c similarity index 79% rename from platform/linux-generic/odp_byteorder.c rename to platform/linux-generic/odp_byteorder_api.c index ec7d261d..7d8c9516 100644 --- a/platform/linux-generic/odp_byteorder.c +++ b/platform/linux-generic/odp_byteorder_api.c @@ -9,6 +9,5 @@ #include <odp/api/byteorder.h> /* Include non-inlined versions of API functions */ -#define _ODP_INLINE +#define _ODP_NO_INLINE #include <odp/api/plat/byteorder_inlines.h> -#include <odp/api/plat/byteorder_inlines_api.h> diff --git a/platform/linux-generic/odp_classification.c b/platform/linux-generic/odp_classification.c index ae4eb585..8b25cf4c 100644 --- a/platform/linux-generic/odp_classification.c +++ b/platform/linux-generic/odp_classification.c @@ -1133,7 +1133,7 @@ cos_t *match_qos_l2_cos(pmr_l2_cos_t *l2_cos, const uint8_t *pkt_addr, packet_hdr_has_eth(hdr)) { eth = (const _odp_ethhdr_t *)(pkt_addr + hdr->p.l2_offset); vlan = (const _odp_vlanhdr_t *)(eth + 1); - qos = _odp_be_to_cpu_16(vlan->tci); + qos = odp_be_to_cpu_16(vlan->tci); qos = ((qos >> 13) & 0x07); cos = l2_cos->cos[qos]; } diff --git a/platform/linux-generic/odp_ipsec.c b/platform/linux-generic/odp_ipsec.c index 7401f590..a72dee33 100644 --- a/platform/linux-generic/odp_ipsec.c +++ b/platform/linux-generic/odp_ipsec.c @@ -251,11 +251,11 @@ static int ipsec_parse_ipv4(ipsec_state_t *state, odp_packet_t pkt) odp_packet_copy_to_mem(pkt, state->ip_offset, _ODP_IPV4HDR_LEN, &ipv4hdr); - if (_ODP_IPV4HDR_IS_FRAGMENT(_odp_be_to_cpu_16(ipv4hdr.frag_offset))) + if (_ODP_IPV4HDR_IS_FRAGMENT(odp_be_to_cpu_16(ipv4hdr.frag_offset))) return -1; state->ip_hdr_len = ipv4_hdr_len(&ipv4hdr); - state->ip_tot_len = _odp_be_to_cpu_16(ipv4hdr.tot_len); + state->ip_tot_len = odp_be_to_cpu_16(ipv4hdr.tot_len); state->ip_next_hdr = ipv4hdr.proto; state->ip_next_hdr_offset = state->ip_offset + _ODP_IPV4HDR_PROTO_OFFSET; @@ -276,7 +276,7 @@ static int ipsec_parse_ipv6(ipsec_state_t *state, odp_packet_t pkt) state->ip_next_hdr = ipv6hdr.next_hdr; state->ip_next_hdr_offset = state->ip_offset + _ODP_IPV6HDR_NHDR_OFFSET; /* FIXME: Jumbo frames */ - state->ip_tot_len = _odp_be_to_cpu_16(ipv6hdr.payload_len) + + state->ip_tot_len = odp_be_to_cpu_16(ipv6hdr.payload_len) + _ODP_IPV6HDR_LEN; memcpy(state->ipv6_addr, &ipv6hdr.dst_addr, _ODP_IPV6ADDR_LEN); @@ -379,8 +379,8 @@ static int ipsec_in_esp(odp_packet_t *pkt, odp_packet_copy_to_mem(*pkt, ipsec_offset, _ODP_UDPHDR_LEN, &udp); - if (udp.dst_port != _odp_cpu_to_be_16(_ODP_UDP_IPSEC_PORT) || - udp.length != _odp_cpu_to_be_16(ip_data_len)) { + if (udp.dst_port != odp_cpu_to_be_16(_ODP_UDP_IPSEC_PORT) || + udp.length != odp_cpu_to_be_16(ip_data_len)) { status->error.proto = 1; return -1; } @@ -397,7 +397,7 @@ static int ipsec_in_esp(odp_packet_t *pkt, } ipsec_sa = ipsec_get_sa(sa, ODP_IPSEC_ESP, - _odp_be_to_cpu_32(esp.spi), + odp_be_to_cpu_32(esp.spi), state->is_ipv4 ? ODP_IPSEC_IPV4 : ODP_IPSEC_IPV6, &state->ipv4_addr, status); @@ -435,7 +435,7 @@ static int ipsec_in_esp(odp_packet_t *pkt, state->esp.aad.spi = esp.spi; state->esp.aad.seq_no = esp.seq_no; - state->in.seq_no = _odp_be_to_cpu_32(esp.seq_no); + state->in.seq_no = odp_be_to_cpu_32(esp.seq_no); param->aad_ptr = (uint8_t *)&state->esp.aad; @@ -500,7 +500,7 @@ static int ipsec_in_ah(odp_packet_t *pkt, } ipsec_sa = ipsec_get_sa(sa, ODP_IPSEC_AH, - _odp_be_to_cpu_32(ah.spi), + odp_be_to_cpu_32(ah.spi), state->is_ipv4 ? ODP_IPSEC_IPV4 : ODP_IPSEC_IPV6, &state->ipv4_addr, status); @@ -541,11 +541,11 @@ static int ipsec_in_ah(odp_packet_t *pkt, state->ah_ipv6.ver_tc_flow = ipv6hdr->ver_tc_flow; state->ah_ipv6.hop_limit = ipv6hdr->hop_limit; ipv6hdr->ver_tc_flow = - _odp_cpu_to_be_32(6 << _ODP_IPV6HDR_VERSION_SHIFT); + odp_cpu_to_be_32(6 << _ODP_IPV6HDR_VERSION_SHIFT); ipv6hdr->hop_limit = 0; } - state->in.seq_no = _odp_be_to_cpu_32(ah.seq_no); + state->in.seq_no = odp_be_to_cpu_32(ah.seq_no); param->auth_range.offset = state->ip_offset; param->auth_range.length = state->ip_tot_len; @@ -755,7 +755,7 @@ static ipsec_sa_t *ipsec_in_single(odp_packet_t pkt, _odp_ipv4hdr_t *ipv4hdr = odp_packet_l3_ptr(pkt, NULL); if (ODP_IPSEC_MODE_TRANSPORT == ipsec_sa->mode) - ipv4hdr->tot_len = _odp_cpu_to_be_16(state.ip_tot_len); + ipv4hdr->tot_len = odp_cpu_to_be_16(state.ip_tot_len); else ipv4hdr->ttl -= ipsec_sa->dec_ttl; _odp_packet_ipv4_chksum_insert(pkt); @@ -764,7 +764,7 @@ static ipsec_sa_t *ipsec_in_single(odp_packet_t pkt, if (ODP_IPSEC_MODE_TRANSPORT == ipsec_sa->mode) ipv6hdr->payload_len = - _odp_cpu_to_be_16(state.ip_tot_len - + odp_cpu_to_be_16(state.ip_tot_len - _ODP_IPV6HDR_LEN); else ipv6hdr->hop_limit -= ipsec_sa->dec_ttl; @@ -820,7 +820,7 @@ static int ipsec_out_tunnel_parse_ipv4(ipsec_state_t *state, ipsec_sa_t *ipsec_sa) { _odp_ipv4hdr_t *ipv4hdr = state->ip; - uint16_t flags = _odp_be_to_cpu_16(ipv4hdr->frag_offset); + uint16_t flags = odp_be_to_cpu_16(ipv4hdr->frag_offset); ipv4hdr->ttl -= ipsec_sa->dec_ttl; state->out_tunnel.ip_tos = ipv4hdr->tos; @@ -868,7 +868,7 @@ static int ipsec_out_tunnel_ipv4(odp_packet_t *pkt, state->ip_tot_len = odp_packet_len(*pkt) - state->ip_offset; state->ip_tot_len += _ODP_IPV4HDR_LEN; - out_ip.tot_len = _odp_cpu_to_be_16(state->ip_tot_len); + out_ip.tot_len = odp_cpu_to_be_16(state->ip_tot_len); /* No need to convert to BE: ID just should not be duplicated */ out_ip.id = odp_atomic_fetch_add_u32(&ipsec_sa->out.tun_ipv4.hdr_id, 1); @@ -876,7 +876,7 @@ static int ipsec_out_tunnel_ipv4(odp_packet_t *pkt, flags = state->out_tunnel.ip_df; else flags = ((uint16_t)ipv4_param->df) << 14; - out_ip.frag_offset = _odp_cpu_to_be_16(flags); + out_ip.frag_offset = odp_cpu_to_be_16(flags); out_ip.ttl = ipv4_param->ttl; /* Will be filled later by packet checksum update */ out_ip.chksum = 0; @@ -937,7 +937,7 @@ static int ipsec_out_tunnel_ipv6(odp_packet_t *pkt, out_ip.ver_tc_flow = odp_cpu_to_be_32(ver); state->ip_tot_len = odp_packet_len(*pkt) - state->ip_offset; - out_ip.payload_len = _odp_cpu_to_be_16(state->ip_tot_len); + out_ip.payload_len = odp_cpu_to_be_16(state->ip_tot_len); state->ip_tot_len += _ODP_IPV6HDR_LEN; out_ip.hop_limit = ipv6_param->hlimit; @@ -1054,9 +1054,9 @@ static int ipsec_out_esp(odp_packet_t *pkt, if (ipsec_sa->udp_encap) { hdr_len += _ODP_UDPHDR_LEN; proto = _ODP_IPPROTO_UDP; - udphdr.src_port = _odp_cpu_to_be_16(_ODP_UDP_IPSEC_PORT); - udphdr.dst_port = _odp_cpu_to_be_16(_ODP_UDP_IPSEC_PORT); - udphdr.length = _odp_cpu_to_be_16(ip_data_len + + udphdr.src_port = odp_cpu_to_be_16(_ODP_UDP_IPSEC_PORT); + udphdr.dst_port = odp_cpu_to_be_16(_ODP_UDP_IPSEC_PORT); + udphdr.length = odp_cpu_to_be_16(ip_data_len + hdr_len + trl_len); udphdr.chksum = 0; /* should be 0 by RFC */ } @@ -1075,8 +1075,8 @@ static int ipsec_out_esp(odp_packet_t *pkt, param->auth_iv_ptr = state->iv; memset(&esp, 0, sizeof(esp)); - esp.spi = _odp_cpu_to_be_32(ipsec_sa->spi); - esp.seq_no = _odp_cpu_to_be_32(ipsec_seq_no(ipsec_sa)); + esp.spi = odp_cpu_to_be_32(ipsec_sa->spi); + esp.seq_no = odp_cpu_to_be_32(ipsec_seq_no(ipsec_sa)); state->esp.aad.spi = esp.spi; state->esp.aad.seq_no = esp.seq_no; @@ -1092,11 +1092,11 @@ static int ipsec_out_esp(odp_packet_t *pkt, if (state->is_ipv4) { _odp_ipv4hdr_t *ipv4hdr = state->ip; - ipv4hdr->tot_len = _odp_cpu_to_be_16(state->ip_tot_len); + ipv4hdr->tot_len = odp_cpu_to_be_16(state->ip_tot_len); } else if (state->is_ipv6) { _odp_ipv6hdr_t *ipv6hdr = state->ip; - ipv6hdr->payload_len = _odp_cpu_to_be_16(state->ip_tot_len - + ipv6hdr->payload_len = odp_cpu_to_be_16(state->ip_tot_len - _ODP_IPV6HDR_LEN); } @@ -1205,8 +1205,8 @@ static int ipsec_out_ah(odp_packet_t *pkt, } memset(&ah, 0, sizeof(ah)); - ah.spi = _odp_cpu_to_be_32(ipsec_sa->spi); - ah.seq_no = _odp_cpu_to_be_32(ipsec_seq_no(ipsec_sa)); + ah.spi = odp_cpu_to_be_32(ipsec_sa->spi); + ah.seq_no = odp_cpu_to_be_32(ipsec_seq_no(ipsec_sa)); ah.next_header = state->ip_next_hdr; odp_packet_copy_from_mem(*pkt, state->ip_next_hdr_offset, 1, &proto); @@ -1223,19 +1223,19 @@ static int ipsec_out_ah(odp_packet_t *pkt, ipv4hdr->ttl = 0; hdr_len = IPSEC_PAD_LEN(hdr_len, 4); state->ip_tot_len += hdr_len; - ipv4hdr->tot_len = _odp_cpu_to_be_16(state->ip_tot_len); + ipv4hdr->tot_len = odp_cpu_to_be_16(state->ip_tot_len); } else { _odp_ipv6hdr_t *ipv6hdr = state->ip; state->ah_ipv6.ver_tc_flow = ipv6hdr->ver_tc_flow; state->ah_ipv6.hop_limit = ipv6hdr->hop_limit; ipv6hdr->ver_tc_flow = - _odp_cpu_to_be_32(6 << _ODP_IPV6HDR_VERSION_SHIFT); + odp_cpu_to_be_32(6 << _ODP_IPV6HDR_VERSION_SHIFT); ipv6hdr->hop_limit = 0; hdr_len = IPSEC_PAD_LEN(hdr_len, 8); state->ip_tot_len += hdr_len; - ipv6hdr->payload_len = _odp_cpu_to_be_16(state->ip_tot_len - + ipv6hdr->payload_len = odp_cpu_to_be_16(state->ip_tot_len - _ODP_IPV6HDR_LEN); } diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index 50dbdc45..b3e1d150 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -2036,16 +2036,16 @@ static inline uint16_t parse_eth(packet_parser_t *prs, const uint8_t **parseptr, input_flags.jumbo = 1; /* Handle Ethernet broadcast/multicast addresses */ - macaddr0 = _odp_be_to_cpu_16(*((const uint16_t *)(const void *)eth)); + 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 *) + odp_be_to_cpu_16(*((const uint16_t *) (const void *)eth + 1)); macaddr4 = - _odp_be_to_cpu_16(*((const uint16_t *) + odp_be_to_cpu_16(*((const uint16_t *) (const void *)eth + 2)); if ((macaddr2 == 0xffff) && (macaddr4 == 0xffff)) @@ -2053,7 +2053,7 @@ static inline uint16_t parse_eth(packet_parser_t *prs, const uint8_t **parseptr, } /* Get Ethertype */ - ethtype = _odp_be_to_cpu_16(eth->type); + ethtype = odp_be_to_cpu_16(eth->type); *offset += sizeof(*eth); *parseptr += sizeof(*eth); @@ -2065,7 +2065,7 @@ static inline uint16_t parse_eth(packet_parser_t *prs, const uint8_t **parseptr, ethtype = 0; goto error; } - ethtype = _odp_be_to_cpu_16(*((const uint16_t *)(uintptr_t) + ethtype = odp_be_to_cpu_16(*((const uint16_t *)(uintptr_t) (parseptr + 6))); *offset += 8; *parseptr += 8; @@ -2077,7 +2077,7 @@ static inline uint16_t parse_eth(packet_parser_t *prs, const uint8_t **parseptr, input_flags.vlan = 1; vlan = (const _odp_vlanhdr_t *)*parseptr; - ethtype = _odp_be_to_cpu_16(vlan->type); + ethtype = odp_be_to_cpu_16(vlan->type); *offset += sizeof(_odp_vlanhdr_t); *parseptr += sizeof(_odp_vlanhdr_t); } @@ -2085,7 +2085,7 @@ static inline uint16_t parse_eth(packet_parser_t *prs, const uint8_t **parseptr, if (ethtype == _ODP_ETHTYPE_VLAN) { input_flags.vlan = 1; vlan = (const _odp_vlanhdr_t *)*parseptr; - ethtype = _odp_be_to_cpu_16(vlan->type); + ethtype = odp_be_to_cpu_16(vlan->type); *offset += sizeof(_odp_vlanhdr_t); *parseptr += sizeof(_odp_vlanhdr_t); } @@ -2105,9 +2105,9 @@ static inline uint8_t parse_ipv4(packet_parser_t *prs, const uint8_t **parseptr, 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); - uint32_t l3_len = _odp_be_to_cpu_16(ipv4->tot_len); - uint16_t frag_offset = _odp_be_to_cpu_16(ipv4->frag_offset); + uint32_t dstaddr = odp_be_to_cpu_32(ipv4->dst_addr); + uint32_t l3_len = odp_be_to_cpu_16(ipv4->tot_len); + uint16_t frag_offset = odp_be_to_cpu_16(ipv4->frag_offset); uint8_t ver = _ODP_IPV4HDR_VER(ipv4->ver_ihl); uint8_t ihl = _ODP_IPV4HDR_IHL(ipv4->ver_ihl); @@ -2166,12 +2166,12 @@ static inline uint8_t parse_ipv6(packet_parser_t *prs, const uint8_t **parseptr, { 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) + + uint32_t dstaddr0 = odp_be_to_cpu_32(ipv6->dst_addr.u8[0]); + uint32_t l3_len = odp_be_to_cpu_16(ipv6->payload_len) + _ODP_IPV6HDR_LEN; /* Basic sanity checks on IPv6 header */ - if ((_odp_be_to_cpu_32(ipv6->ver_tc_flow) >> 28) != 6 || + if ((odp_be_to_cpu_32(ipv6->ver_tc_flow) >> 28) != 6 || l3_len > frame_len - *offset) { prs->flags.ip_err = 1; return 0; @@ -2205,7 +2205,7 @@ static inline uint8_t parse_ipv6(packet_parser_t *prs, const uint8_t **parseptr, *offset < seg_len); if (*offset >= prs->l3_offset + - _odp_be_to_cpu_16(ipv6->payload_len)) { + odp_be_to_cpu_16(ipv6->payload_len)) { prs->flags.ip_err = 1; return 0; } @@ -2259,8 +2259,8 @@ static inline void parse_udp(packet_parser_t *prs, const uint8_t **parseptr, 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); + 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; @@ -2528,7 +2528,7 @@ static int _odp_packet_tcp_udp_chksum_insert(odp_packet_t pkt, uint16_t proto) #endif if (proto == _ODP_IPPROTO_TCP) { - sum += _odp_cpu_to_be_16(pkt_hdr->frame_len - + sum += odp_cpu_to_be_16(pkt_hdr->frame_len - pkt_hdr->p.l4_offset); chksum_offset = pkt_hdr->p.l4_offset + _ODP_UDP_CSUM_OFFSET; } else { diff --git a/platform/linux-generic/odp_traffic_mngr.c b/platform/linux-generic/odp_traffic_mngr.c index 96dde266..6e741e01 100644 --- a/platform/linux-generic/odp_traffic_mngr.c +++ b/platform/linux-generic/odp_traffic_mngr.c @@ -1948,7 +1948,7 @@ static void egress_vlan_marking(tm_vlan_marking_t *vlan_marking, vlan_hdr_ptr = &vlan_hdr; } - old_tci = _odp_be_to_cpu_16(vlan_hdr_ptr->tci); + old_tci = odp_be_to_cpu_16(vlan_hdr_ptr->tci); new_tci = old_tci; if (vlan_marking->drop_eligible_enabled) new_tci |= _ODP_VLANHDR_DEI_MASK; @@ -1956,7 +1956,7 @@ static void egress_vlan_marking(tm_vlan_marking_t *vlan_marking, if (new_tci == old_tci) return; - vlan_hdr_ptr->tci = _odp_cpu_to_be_16(new_tci); + vlan_hdr_ptr->tci = odp_cpu_to_be_16(new_tci); if (split_hdr) _odp_packet_copy_from_mem(odp_pkt, _ODP_ETHHDR_LEN, _ODP_VLANHDR_LEN, &vlan_hdr); @@ -2013,7 +2013,7 @@ static void egress_ipv4_tos_marking(tm_tos_marking_t *tos_marking, * in this specific case the carry out check does NOT need to be * repeated since it can be proven that the carry in sum cannot * cause another carry out. */ - old_chksum = (uint32_t)_odp_be_to_cpu_16(ipv4_hdr_ptr->chksum); + old_chksum = (uint32_t)odp_be_to_cpu_16(ipv4_hdr_ptr->chksum); ones_compl_sum = (~old_chksum) & 0xFFFF; tos_diff = ((uint32_t)new_tos) + ((~(uint32_t)old_tos) & 0xFFFF); ones_compl_sum += tos_diff; @@ -2022,7 +2022,7 @@ static void egress_ipv4_tos_marking(tm_tos_marking_t *tos_marking, (ones_compl_sum & 0xFFFF); ipv4_hdr_ptr->tos = new_tos; - ipv4_hdr_ptr->chksum = _odp_cpu_to_be_16((~ones_compl_sum) & 0xFFFF); + ipv4_hdr_ptr->chksum = odp_cpu_to_be_16((~ones_compl_sum) & 0xFFFF); if (split_hdr) _odp_packet_copy_from_mem(odp_pkt, l3_offset, _ODP_IPV4HDR_LEN, &ipv4_hdr); @@ -2053,7 +2053,7 @@ static void egress_ipv6_tc_marking(tm_tos_marking_t *tos_marking, ipv6_hdr_ptr = &ipv6_hdr; } - old_ver_tc_flow = _odp_be_to_cpu_32(ipv6_hdr_ptr->ver_tc_flow); + old_ver_tc_flow = odp_be_to_cpu_32(ipv6_hdr_ptr->ver_tc_flow); old_tc = (old_ver_tc_flow & _ODP_IPV6HDR_TC_MASK) >> _ODP_IPV6HDR_TC_SHIFT; new_tc = old_tc; @@ -2074,7 +2074,7 @@ static void egress_ipv6_tc_marking(tm_tos_marking_t *tos_marking, new_ver_tc_flow = (old_ver_tc_flow & ~_ODP_IPV6HDR_TC_MASK) | (new_tc << _ODP_IPV6HDR_TC_SHIFT); - ipv6_hdr_ptr->ver_tc_flow = _odp_cpu_to_be_32(new_ver_tc_flow); + ipv6_hdr_ptr->ver_tc_flow = odp_cpu_to_be_32(new_ver_tc_flow); if (split_hdr) _odp_packet_copy_from_mem(odp_pkt, l3_offset, diff --git a/platform/linux-generic/pktio/dpdk_parse.c b/platform/linux-generic/pktio/dpdk_parse.c index 155c6832..e9de0756 100644 --- a/platform/linux-generic/pktio/dpdk_parse.c +++ b/platform/linux-generic/pktio/dpdk_parse.c @@ -47,16 +47,16 @@ static inline uint16_t dpdk_parse_eth(packet_parser_t *prs, input_flags.jumbo = 1; /* Handle Ethernet broadcast/multicast addresses */ - macaddr0 = _odp_be_to_cpu_16(*((const uint16_t *)(const void *)eth)); + 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 *) + odp_be_to_cpu_16(*((const uint16_t *) (const void *)eth + 1)); macaddr4 = - _odp_be_to_cpu_16(*((const uint16_t *) + odp_be_to_cpu_16(*((const uint16_t *) (const void *)eth + 2)); if ((macaddr2 == 0xffff) && (macaddr4 == 0xffff)) @@ -72,13 +72,13 @@ static inline uint16_t dpdk_parse_eth(packet_parser_t *prs, else if (RTE_ETH_IS_IPV6_HDR(mbuf_packet_type)) ethtype = _ODP_ETHTYPE_IPV6; else - ethtype = _odp_be_to_cpu_16(eth->type); + 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); + ethtype = odp_be_to_cpu_16(eth->type); } *offset += sizeof(*eth); @@ -92,7 +92,7 @@ static inline uint16_t dpdk_parse_eth(packet_parser_t *prs, ethtype = 0; goto error; } - ethtype = _odp_be_to_cpu_16(*((const uint16_t *)(uintptr_t) + ethtype = odp_be_to_cpu_16(*((const uint16_t *)(uintptr_t) (parseptr + 6))); *offset += 8; *parseptr += 8; @@ -104,7 +104,7 @@ static inline uint16_t dpdk_parse_eth(packet_parser_t *prs, input_flags.vlan = 1; vlan = (const _odp_vlanhdr_t *)*parseptr; - ethtype = _odp_be_to_cpu_16(vlan->type); + ethtype = odp_be_to_cpu_16(vlan->type); *offset += sizeof(_odp_vlanhdr_t); *parseptr += sizeof(_odp_vlanhdr_t); } @@ -112,7 +112,7 @@ static inline uint16_t dpdk_parse_eth(packet_parser_t *prs, if (ethtype == _ODP_ETHTYPE_VLAN) { input_flags.vlan = 1; vlan = (const _odp_vlanhdr_t *)*parseptr; - ethtype = _odp_be_to_cpu_16(vlan->type); + ethtype = odp_be_to_cpu_16(vlan->type); *offset += sizeof(_odp_vlanhdr_t); *parseptr += sizeof(_odp_vlanhdr_t); } @@ -134,8 +134,8 @@ static inline uint8_t dpdk_parse_ipv4(packet_parser_t *prs, 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); - uint32_t l3_len = _odp_be_to_cpu_16(ipv4->tot_len); + 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; @@ -173,7 +173,7 @@ static inline uint8_t dpdk_parse_ipv4(packet_parser_t *prs, proto = _ODP_IPPROTO_TCP; } else { proto = ipv4->proto; - frag_offset = _odp_be_to_cpu_16(ipv4->frag_offset); + 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) @@ -205,13 +205,13 @@ static inline uint8_t dpdk_parse_ipv6(packet_parser_t *prs, { 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) + + 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 || + if ((odp_be_to_cpu_32(ipv6->ver_tc_flow) >> 28) != 6 || l3_len > frame_len - *offset) { prs->flags.ip_err = 1; return 0; @@ -246,7 +246,7 @@ static inline uint8_t dpdk_parse_ipv6(packet_parser_t *prs, *offset < seg_len); if (*offset >= prs->l3_offset + - _odp_be_to_cpu_16(ipv6->payload_len)) { + odp_be_to_cpu_16(ipv6->payload_len)) { prs->flags.ip_err = 1; return 0; } @@ -303,8 +303,8 @@ static inline void dpdk_parse_udp(packet_parser_t *prs, uint32_t do_csum) { 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); + 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; diff --git a/platform/linux-generic/pktio/loop.c b/platform/linux-generic/pktio/loop.c index 99b09e6a..5e30447f 100644 --- a/platform/linux-generic/pktio/loop.c +++ b/platform/linux-generic/pktio/loop.c @@ -188,7 +188,7 @@ static inline int check_proto(void *l3_hdr, if (l3_proto_ver == _ODP_IPV4 && l3_len >= _ODP_IPV4HDR_LEN) { _odp_ipv4hdr_t *ip = l3_hdr; - uint16_t frag_offset = _odp_be_to_cpu_16(ip->frag_offset); + uint16_t frag_offset = odp_be_to_cpu_16(ip->frag_offset); *l3_proto_v4 = 1; if (!_ODP_IPV4HDR_IS_FRAGMENT(frag_offset)) commit 4b895826e62b9b6e7512d76d05999752ffc93432 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue May 15 00:10:07 2018 +0300 linux-gen: ticketlock: drop unused @internal documentation Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/include/odp/api/plat/ticketlock_inlines.h b/platform/linux-generic/include/odp/api/plat/ticketlock_inlines.h index be38de8c..eabf1f82 100644 --- a/platform/linux-generic/include/odp/api/plat/ticketlock_inlines.h +++ b/platform/linux-generic/include/odp/api/plat/ticketlock_inlines.h @@ -4,17 +4,13 @@ * SPDX-License-Identifier: BSD-3-Clause */ -/** - * @file - * - * Ticketlock inline functions - */ - #ifndef _ODP_PLAT_TICKETLOCK_INLINES_H_ #define _ODP_PLAT_TICKETLOCK_INLINES_H_ #include <odp/api/atomic.h> +/** @cond _ODP_HIDE_FROM_DOXYGEN_ */ + #ifndef _ODP_NO_INLINE /* Inline functions by default */ #define _ODP_INLINE static inline @@ -33,11 +29,6 @@ _ODP_INLINE void odp_ticketlock_init(odp_ticketlock_t *ticketlock) odp_atomic_init_u32(&ticketlock->cur_ticket, 0); } -/** @internal - * Acquire ticket lock. - * - * @param ticketlock Pointer to a ticket lock - */ _ODP_INLINE void odp_ticketlock_lock(odp_ticketlock_t *ticketlock) { uint32_t ticket; @@ -53,14 +44,6 @@ _ODP_INLINE void odp_ticketlock_lock(odp_ticketlock_t *ticketlock) odp_cpu_pause(); } -/** @internal - * Try to acquire ticket lock. - * - * @param tklock Pointer to a ticket lock - * - * @retval 1 lock acquired - * @retval 0 lock not acquired - */ _ODP_INLINE int odp_ticketlock_trylock(odp_ticketlock_t *tklock) { /* We read 'next_ticket' and 'cur_ticket' non-atomically which should @@ -89,11 +72,6 @@ _ODP_INLINE int odp_ticketlock_trylock(odp_ticketlock_t *tklock) return 0; } -/** @internal - * Release ticket lock - * - * @param ticketlock Pointer to a ticket lock - */ _ODP_INLINE void odp_ticketlock_unlock(odp_ticketlock_t *ticketlock) { /* Release the lock by incrementing 'cur_ticket'. As we are the @@ -106,14 +84,6 @@ _ODP_INLINE void odp_ticketlock_unlock(odp_ticketlock_t *ticketlock) odp_atomic_store_rel_u32(&ticketlock->cur_ticket, cur + 1); } -/** @internal - * Check if ticket lock is locked - * - * @param ticketlock Pointer to a ticket lock - * - * @retval 1 the lock is busy (locked) - * @retval 0 the lock is available (unlocked) - */ _ODP_INLINE int odp_ticketlock_is_locked(odp_ticketlock_t *ticketlock) { /* Compare 'cur_ticket' with 'next_ticket'. Ideally we should read @@ -125,4 +95,6 @@ _ODP_INLINE int odp_ticketlock_is_locked(odp_ticketlock_t *ticketlock) odp_atomic_load_u32(&ticketlock->next_ticket); } +/** @endcond */ + #endif commit 3ee54c088ec06a65b1ae7ece2dae8cfabfe90d12 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Sun Apr 22 20:05:34 2018 +0300 linux-gen: ticketlock: remove separate API inlining header Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 586a0637..e084eb2c 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -39,8 +39,7 @@ odpapiplatinclude_HEADERS = \ include/odp/api/plat/sync_inlines.h \ include/odp/api/plat/thread_inlines.h \ include/odp/api/plat/thread_inlines_api.h \ - include/odp/api/plat/ticketlock_inlines.h \ - include/odp/api/plat/ticketlock_inlines_api.h + include/odp/api/plat/ticketlock_inlines.h odpapiabiarchincludedir = $(archincludedir)/odp/api/abi odpapiabiarchinclude_HEADERS = \ @@ -223,7 +222,7 @@ __LIB__libodp_linux_la_SOURCES += \ odp_std_clib.c \ odp_sync.c \ odp_thread_api.c \ - odp_ticketlock.c + odp_ticketlock_api.c endif if ARCH_IS_ARM diff --git a/platform/linux-generic/include-abi/odp/api/abi/ticketlock.h b/platform/linux-generic/include-abi/odp/api/abi/ticketlock.h index 5d335946..6543a1cf 100644 --- a/platform/linux-generic/include-abi/odp/api/abi/ticketlock.h +++ b/platform/linux-generic/include-abi/odp/api/abi/ticketlock.h @@ -30,9 +30,7 @@ typedef struct odp_ticketlock_s { } odp_ticketlock_t; /* Include inlined versions of API functions */ -#define _ODP_INLINE static inline #include <odp/api/plat/ticketlock_inlines.h> -#include <odp/api/plat/ticketlock_inlines_api.h> /** * @} diff --git a/platform/linux-generic/include/odp/api/plat/ticketlock_inlines.h b/platform/linux-generic/include/odp/api/plat/ticketlock_inlines.h index ac8031ae..be38de8c 100644 --- a/platform/linux-generic/include/odp/api/plat/ticketlock_inlines.h +++ b/platform/linux-generic/include/odp/api/plat/ticketlock_inlines.h @@ -15,12 +15,30 @@ #include <odp/api/atomic.h> +#ifndef _ODP_NO_INLINE + /* Inline functions by default */ + #define _ODP_INLINE static inline + #define odp_ticketlock_init __odp_ticketlock_init + #define odp_ticketlock_lock __odp_ticketlock_lock + #define odp_ticketlock_trylock __odp_ticketlock_trylock + #define odp_ticketlock_unlock __odp_ticketlock_unlock + #define odp_ticketlock_is_locked __odp_ticketlock_is_locked +#else + #define _ODP_INLINE +#endif + +_ODP_INLINE void odp_ticketlock_init(odp_ticketlock_t *ticketlock) +{ + odp_atomic_init_u32(&ticketlock->next_ticket, 0); + odp_atomic_init_u32(&ticketlock->cur_ticket, 0); +} + /** @internal * Acquire ticket lock. * * @param ticketlock Pointer to a ticket lock */ -static inline void _odp_ticketlock_lock(odp_ticketlock_t *ticketlock) +_ODP_INLINE void odp_ticketlock_lock(odp_ticketlock_t *ticketlock) { uint32_t ticket; @@ -43,7 +61,7 @@ static inline void _odp_ticketlock_lock(odp_ticketlock_t *ticketlock) * @retval 1 lock acquired * @retval 0 lock not acquired */ -static inline int _odp_ticketlock_trylock(odp_ticketlock_t *tklock) +_ODP_INLINE int odp_ticketlock_trylock(odp_ticketlock_t *tklock) { /* We read 'next_ticket' and 'cur_ticket' non-atomically which should * not be a problem as they are not independent of each other. @@ -76,7 +94,7 @@ static inline int _odp_ticketlock_trylock(odp_ticketlock_t *tklock) * * @param ticketlock Pointer to a ticket lock */ -static inline void _odp_ticketlock_unlock(odp_ticketlock_t *ticketlock) +_ODP_INLINE void odp_ticketlock_unlock(odp_ticketlock_t *ticketlock) { /* Release the lock by incrementing 'cur_ticket'. As we are the * lock owner and thus the only thread that is allowed to write @@ -96,7 +114,7 @@ static inline void _odp_ticketlock_unlock(odp_ticketlock_t *ticketlock) * @retval 1 the lock is busy (locked) * @retval 0 the lock is available (unlocked) */ -static inline int _odp_ticketlock_is_locked(odp_ticketlock_t *ticketlock) +_ODP_INLINE int odp_ticketlock_is_locked(odp_ticketlock_t *ticketlock) { /* Compare 'cur_ticket' with 'next_ticket'. Ideally we should read * both variables atomically but the information can become stale diff --git a/platform/linux-generic/odp_pool.c b/platform/linux-generic/odp_pool.c index 0df8aa3f..f030ff04 100644 --- a/platform/linux-generic/odp_pool.c +++ b/platform/linux-generic/odp_pool.c @@ -25,8 +25,8 @@ #include <odp/api/plat/pool_inline_types.h> #include <odp/api/plat/ticketlock_inlines.h> -#define LOCK(a) _odp_ticketlock_lock(a) -#define UNLOCK(a) _odp_ticketlock_unlock(a) +#define LOCK(a) odp_ticketlock_lock(a) +#define UNLOCK(a) odp_ticketlock_unlock(a) #define LOCK_INIT(a) odp_ticketlock_init(a) #define CACHE_BURST 32 diff --git a/platform/linux-generic/odp_queue_basic.c b/platform/linux-generic/odp_queue_basic.c index 764f39e8..69fad639 100644 --- a/platform/linux-generic/odp_queue_basic.c +++ b/platform/linux-generic/odp_queue_basic.c @@ -29,9 +29,9 @@ #define NUM_INTERNAL_QUEUES 64 #include <odp/api/plat/ticketlock_inlines.h> -#define LOCK(queue_ptr) _odp_ticketlock_lock(&((queue_ptr)->s.lock)) -#define UNLOCK(queue_ptr) _odp_ticketlock_unlock(&((queue_ptr)->s.lock)) -#define LOCK_INIT(queue_ptr) odp_ticketlock_init(&((queue_ptr)->s.lock)) +#define LOCK(queue_ptr) odp_ticketlock_lock(&((queue_ptr)->s.lock)) +#define UNLOCK(queue_ptr) odp_ticketlock_unlock(&((queue_ptr)->s.lock)) +#define LOCK_INIT(queue_ptr) odp_ticketlock_init(&((queue_ptr)->s.lock)) #include <string.h> #include <inttypes.h> diff --git a/platform/linux-generic/odp_queue_scalable.c b/platform/linux-generic/odp_queue_scalable.c index 05246410..8f956911 100644 --- a/platform/linux-generic/odp_queue_scalable.c +++ b/platform/linux-generic/odp_queue_scalable.c @@ -39,8 +39,8 @@ tmp_a < tmp_b ? tmp_a : tmp_b; \ }) -#define LOCK(a) _odp_ticketlock_lock(a) -#define UNLOCK(a) _odp_ticketlock_unlock(a) +#define LOCK(a) odp_ticketlock_lock(a) +#define UNLOCK(a) odp_ticketlock_unlock(a) #define LOCK_INIT(a) odp_ticketlock_init(a) extern __thread sched_scalable_thread_state_t *sched_ts; diff --git a/platform/linux-generic/odp_schedule_scalable.c b/platform/linux-generic/odp_schedule_scalable.c index 58d5190c..44629378 100644 --- a/platform/linux-generic/odp_schedule_scalable.c +++ b/platform/linux-generic/odp_schedule_scalable.c @@ -36,8 +36,8 @@ #include <string.h> #include <odp/api/plat/ticketlock_inlines.h> -#define LOCK(a) _odp_ticketlock_lock((a)) -#define UNLOCK(a) _odp_ticketlock_unlock((a)) +#define LOCK(a) odp_ticketlock_lock((a)) +#define UNLOCK(a) odp_ticketlock_unlock((a)) #define MAXTHREADS ATOM_BITSET_SIZE diff --git a/platform/linux-generic/odp_ticketlock.c b/platform/linux-generic/odp_ticketlock_api.c similarity index 60% rename from platform/linux-generic/odp_ticketlock.c rename to platform/linux-generic/odp_ticketlock_api.c index 1f1e1128..1de55d90 100644 --- a/platform/linux-generic/odp_ticketlock.c +++ b/platform/linux-generic/odp_ticketlock_api.c @@ -8,9 +8,5 @@ #include <odp/api/ticketlock.h> +#define _ODP_NO_INLINE #include <odp/api/plat/ticketlock_inlines.h> - -/* Include non-inlined versions of API functions */ -#undef _ODP_INLINE -#define _ODP_INLINE -#include <odp/api/plat/ticketlock_inlines_api.h> commit 9e1aad1fbffad60e849c9cac613e282fd3f80646 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Sun Apr 22 20:05:34 2018 +0300 linux-gen: atomic: remove separate API inlining header Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/include/odp/api/plat/atomic_inlines.h b/platform/linux-generic/include/odp/api/plat/atomic_inlines.h index 02eda195..5f0cba05 100644 --- a/platform/linux-generic/include/odp/api/plat/atomic_inlines.h +++ b/platform/linux-generic/include/odp/api/plat/atomic_inlines.h @@ -13,6 +13,79 @@ #ifndef _ODP_PLAT_ATOMIC_INLINES_H_ #define _ODP_PLAT_ATOMIC_INLINES_H_ +/** @cond _ODP_HIDE_FROM_DOXYGEN_ */ + +#ifndef _ODP_NO_INLINE + /* Inline functions by default */ + #define _ODP_INLINE static inline + #define odp_atomic_init_u32 __odp_atomic_init_u32 + #define odp_atomic_load_u32 __odp_atomic_load_u32 + #define odp_atomic_store_u32 __odp_atomic_store_u32 + #define odp_atomic_fetch_add_u32 __odp_atomic_fetch_add_u32 + #define odp_atomic_add_u32 __odp_atomic_add_u32 + #define odp_atomic_fetch_sub_u32 __odp_atomic_fetch_sub_u32 + #define odp_atomic_sub_u32 __odp_atomic_sub_u32 + #define odp_atomic_fetch_inc_u32 __odp_atomic_fetch_inc_u32 + #define odp_atomic_inc_u32 __odp_atomic_inc_u32 + #define odp_atomic_fetch_dec_u32 __odp_atomic_fetch_dec_u32 + #define odp_atomic_dec_u32 __odp_atomic_dec_u32 + #define odp_atomic_cas_u32 __odp_atomic_cas_u32 + #define odp_atomic_xchg_u32 __odp_atomic_xchg_u32 + #define odp_atomic_max_u32 __odp_atomic_max_u32 + #define odp_atomic_min_u32 __odp_atomic_min_u32 + #define odp_atomic_init_u64 __odp_atomic_init_u64 + #define odp_atomic_load_u64 __odp_atomic_load_u64 + #define odp_atomic_store_u64 __odp_atomic_store_u64 + #define odp_atomic_fetch_add_u64 __odp_atomic_fetch_add_u64 + #define odp_atomic_add_u64 __odp_atomic_add_u64 + #define odp_atomic_fetch_sub_u64 __odp_atomic_fetch_sub_u64 + #define odp_atomic_sub_u64 __odp_atomic_sub_u64 + #define odp_atomic_fetch_inc_u64 __odp_atomic_fetch_inc_u64 + #define odp_atomic_inc_u64 __odp_atomic_inc_u64 + #define odp_atomic_fetch_dec_u64 __odp_atomic_fetch_dec_u64 + #define odp_atomic_dec_u64 __odp_atomic_dec_u64 + #define odp_atomic_cas_u64 __odp_atomic_cas_u64 + #define odp_atomic_xchg_u64 __odp_atomic_xchg_u64 + #define odp_atomic_load_acq_u64 __odp_atomic_load_acq_u64 + #define odp_atomic_store_rel_u64 __odp_atomic_store_rel_u64 + #define odp_atomic_add_rel_u64 __odp_atomic_add_rel_u64 + #define odp_atomic_sub_rel_u64 __odp_atomic_sub_rel_u64 + #define odp_atomic_cas_acq_u64 __odp_atomic_cas_acq_u64 + #define odp_atomic_cas_rel_u64 __odp_atomic_cas_rel_u64 + #define odp_atomic_cas_acq_rel_u64 __odp_atomic_cas_acq_rel_u64 + #define odp_atomic_init_u64 __odp_atomic_init_u64 + #define odp_atomic_load_u64 __odp_atomic_load_u64 + #define odp_atomic_store_u64 __odp_atomic_store_u64 + #define odp_atomic_fetch_add_u64 __odp_atomic_fetch_add_u64 + #define odp_atomic_add_u64 __odp_atomic_add_u64 + #define odp_atomic_fetch_sub_u64 __odp_atomic_fetch_sub_u64 + #define odp_atomic_sub_u64 __odp_atomic_sub_u64 + #define odp_atomic_fetch_inc_u64 __odp_atomic_fetch_inc_u64 + #define odp_atomic_inc_u64 __odp_atomic_inc_u64 + #define odp_atomic_fetch_dec_u64 __odp_atomic_fetch_dec_u64 + #define odp_atomic_dec_u64 __odp_atomic_dec_u64 + #define odp_atomic_cas_u64 __odp_atomic_cas_u64 + #define odp_atomic_xchg_u64 __odp_atomic_xchg_u64 + #define odp_atomic_load_acq_u64 __odp_atomic_load_acq_u64 + #define odp_atomic_store_rel_u64 __odp_atomic_store_rel_u64 + #define odp_atomic_add_rel_u64 __odp_atomic_add_rel_u64 + #define odp_atomic_sub_rel_u64 __odp_atomic_sub_rel_u64 + #define odp_atomic_cas_acq_u64 __odp_atomic_cas_acq_u64 + #define odp_atomic_cas_rel_u64 __odp_atomic_cas_rel_u64 + #define odp_atomic_cas_acq_rel_u64 __odp_atomic_cas_acq_rel_u64 + #define odp_atomic_max_u64 __odp_atomic_max_u64 + #define odp_atomic_min_u64 __odp_atomic_min_u64 + #define odp_atomic_load_acq_u32 __odp_atomic_load_acq_u32 + #define odp_atomic_store_rel_u32 __odp_atomic_store_rel_u32 + #define odp_atomic_add_rel_u32 __odp_atomic_add_rel_u32 + #define odp_atomic_sub_rel_u32 __odp_atomic_sub_rel_u32 + #define odp_atomic_cas_acq_u32 __odp_atomic_cas_acq_u32 + #define odp_atomic_cas_rel_u32 __odp_atomic_cas_rel_u32 + #define odp_atomic_cas_acq_rel_u32 __odp_atomic_cas_acq_rel_u32 +#else + #define _ODP_INLINE +#endif + _ODP_INLINE void odp_atomic_init_u32(odp_atomic_u32_t *atom, uint32_t val) { __atomic_store_n(&atom->v, val, __ATOMIC_RELAXED); @@ -457,4 +530,6 @@ _ODP_INLINE int odp_atomic_cas_acq_rel_u32(odp_atomic_u32_t *atom, __ATOMIC_RELAXED); } +/** @endcond */ + #endif diff --git a/platform/linux-generic/odp_atomic_api.c b/platform/linux-generic/odp_atomic_api.c index d99f8052..72b55a8f 100644 --- a/platform/linux-generic/odp_atomic_api.c +++ b/platform/linux-generic/odp_atomic_api.c @@ -9,5 +9,5 @@ #include <odp/api/atomic.h> /* Include non-inlined versions of API functions */ -#define _ODP_INLINE +#define _ODP_NO_INLINE #include <odp/api/plat/atomic_inlines.h> diff --git a/platform/linux-generic/odp_ticketlock.c b/platform/linux-generic/odp_ticketlock.c index 6a2c3be6..1f1e1128 100644 --- a/platform/linux-generic/odp_ticketlock.c +++ b/platform/linux-generic/odp_ticketlock.c @@ -11,5 +11,6 @@ #include <odp/api/plat/ticketlock_inlines.h> /* Include non-inlined versions of API functions */ +#undef _ODP_INLINE #define _ODP_INLINE #include <odp/api/plat/ticketlock_inlines_api.h> commit 1da9bcf69a3f2c364eb1674b44ede4c0cf280f06 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue May 15 00:10:07 2018 +0300 linux-gen: packet_flags: drop unused @internal annotations Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/include/odp/api/plat/packet_flag_inlines.h b/platform/linux-generic/include/odp/api/plat/packet_flag_inlines.h index c366daa1..cbb79758 100644 --- a/platform/linux-generic/include/odp/api/plat/packet_flag_inlines.h +++ b/platform/linux-generic/include/odp/api/plat/packet_flag_inlines.h @@ -17,10 +17,10 @@ #include <odp/api/plat/packet_inline_types.h> #include <odp/api/hints.h> -/** @internal Inline function offsets */ +/** @cond _ODP_HIDE_FROM_DOXYGEN_ */ + extern const _odp_packet_inline_offset_t _odp_packet_inline; -/** @internal Inline function @param pkt @return */ static inline uint64_t _odp_packet_input_flags(odp_packet_t pkt) { return _odp_pkt_get(pkt, uint64_t, input_flags); @@ -39,7 +39,6 @@ static inline uint64_t _odp_packet_input_flags(odp_packet_t pkt) #define _ODP_INLINE #endif -/** @internal Inline function @param pkt @return */ _ODP_INLINE int odp_packet_has_l2(odp_packet_t pkt) { _odp_packet_input_flags_t flags; @@ -48,7 +47,6 @@ _ODP_INLINE int odp_packet_has_l2(odp_packet_t pkt) return flags.l2; } -/** @internal Inline function @param pkt @return */ _ODP_INLINE int odp_packet_has_eth(odp_packet_t pkt) { _odp_packet_input_flags_t flags; @@ -57,7 +55,6 @@ _ODP_INLINE int odp_packet_has_eth(odp_packet_t pkt) return flags.eth; } -/** @internal Inline function @param pkt @return */ _ODP_INLINE int odp_packet_has_jumbo(odp_packet_t pkt) { _odp_packet_input_flags_t flags; @@ -66,7 +63,6 @@ _ODP_INLINE int odp_packet_has_jumbo(odp_packet_t pkt) return flags.jumbo; } -/** @internal Inline function @param pkt @return */ _ODP_INLINE int odp_packet_has_flow_hash(odp_packet_t pkt) { _odp_packet_input_flags_t flags; @@ -75,7 +71,6 @@ _ODP_INLINE int odp_packet_has_flow_hash(odp_packet_t pkt) return flags.flow_hash; } -/** @internal Inline function @param pkt @return */ _ODP_INLINE int odp_packet_has_ts(odp_packet_t pkt) { _odp_packet_input_flags_t flags; @@ -84,7 +79,6 @@ _ODP_INLINE int odp_packet_has_ts(odp_packet_t pkt) return flags.timestamp; } -/** @internal Inline function @param pkt @return */ _ODP_INLINE int odp_packet_has_ipsec(odp_packet_t pkt) { _odp_packet_input_flags_t flags; @@ -93,4 +87,6 @@ _ODP_INLINE int odp_packet_has_ipsec(odp_packet_t pkt) return flags.ipsec; } +/** @endcond */ + #endif commit d61545b5b2ad42d7e9fca34d3b077942fcc04c01 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Sun Apr 22 20:05:34 2018 +0300 linux-gen: packet_flags: remove separate API inlining header Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index cb9ca6f3..586a0637 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -29,7 +29,6 @@ odpapiplatinclude_HEADERS = \ 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 \ include/odp/api/plat/packet_inlines.h \ include/odp/api/plat/packet_inlines_api.h \ diff --git a/platform/linux-generic/include-abi/odp/api/abi/packet_flags.h b/platform/linux-generic/include-abi/odp/api/abi/packet_flags.h index 58aee1f4..8e7b88ca 100644 --- a/platform/linux-generic/include-abi/odp/api/abi/packet_flags.h +++ b/platform/linux-generic/include-abi/odp/api/abi/packet_flags.h @@ -18,7 +18,6 @@ extern "C" { #endif #include <odp/api/plat/packet_flag_inlines.h> -#include <odp/api/plat/packet_flag_inlines_api.h> #ifdef __cplusplus } diff --git a/platform/linux-generic/include/odp/api/plat/packet_flag_inlines.h b/platform/linux-generic/include/odp/api/plat/packet_flag_inlines.h index b677cf45..c366daa1 100644 --- a/platform/linux-generic/include/odp/api/plat/packet_flag_inlines.h +++ b/platform/linux-generic/include/odp/api/plat/packet_flag_inlines.h @@ -14,7 +14,7 @@ #define _ODP_PLAT_PACKET_FLAG_INLINES_H_ #include <odp/api/abi/packet.h> -#include <odp/api/plat/packet_inlines.h> +#include <odp/api/plat/packet_inline_types.h> #include <odp/api/hints.h> /** @internal Inline function offsets */ @@ -26,8 +26,21 @@ static inline uint64_t _odp_packet_input_flags(odp_packet_t pkt) return _odp_pkt_get(pkt, uint64_t, input_flags); } +#ifndef _ODP_NO_INLINE + /* Inline functions by default */ + #define _ODP_INLINE static inline + #define odp_packet_has_l2 __odp_packet_has_l2 + #define odp_packet_has_eth __odp_packet_has_eth + #define odp_packet_has_jumbo __odp_packet_has_jumbo + #define odp_packet_has_flow_hash __odp_packet_has_flow_hash + #define odp_packet_has_ts __odp_packet_has_ts + #define odp_packet_has_ipsec __odp_packet_has_ipsec +#else + #define _ODP_INLINE +#endif + /** @internal Inline function @param pkt @return */ -static inline int _odp_packet_has_l2(odp_packet_t pkt) +_ODP_INLINE int odp_packet_has_l2(odp_packet_t pkt) { _odp_packet_input_flags_t flags; @@ -36,7 +49,7 @@ static inline int _odp_packet_has_l2(odp_packet_t pkt) } /** @internal Inline function @param pkt @return */ -static inline int _odp_packet_has_eth(odp_packet_t pkt) +_ODP_INLINE int odp_packet_has_eth(odp_packet_t pkt) { _odp_packet_input_flags_t flags; @@ -45,7 +58,7 @@ static inline int _odp_packet_has_eth(odp_packet_t pkt) } /** @internal Inline function @param pkt @return */ -static inline int _odp_packet_has_jumbo(odp_packet_t pkt) +_ODP_INLINE int odp_packet_has_jumbo(odp_packet_t pkt) { _odp_packet_input_flags_t flags; @@ -54,7 +67,7 @@ static inline int _odp_packet_has_jumbo(odp_packet_t pkt) } /** @internal Inline function @param pkt @return */ -static inline int _odp_packet_has_flow_hash(odp_packet_t pkt) +_ODP_INLINE int odp_packet_has_flow_hash(odp_packet_t pkt) { _odp_packet_input_flags_t flags; @@ -63,7 +76,7 @@ static inline int _odp_packet_has_flow_hash(odp_packet_t pkt) } /** @internal Inline function @param pkt @return */ -static inline int _odp_packet_has_ts(odp_packet_t pkt) +_ODP_INLINE int odp_packet_has_ts(odp_packet_t pkt) { _odp_packet_input_flags_t flags; @@ -72,7 +85,7 @@ static inline int _odp_packet_has_ts(odp_packet_t pkt) } /** @internal Inline function @param pkt @return */ -static inline int _odp_packet_has_ipsec(odp_packet_t pkt) +_ODP_INLINE int odp_packet_has_ipsec(odp_packet_t pkt) { _odp_packet_input_flags_t flags; diff --git a/platform/linux-generic/include/odp/api/plat/packet_flag_inlines_api.h b/platform/linux-generic/include/odp/api/plat/packet_flag_inlines_api.h deleted file mode 100644 index bbe5f68f..00000000 --- a/platform/linux-generic/include/odp/api/plat/packet_flag_inlines_api.h +++ /dev/null @@ -1,41 +0,0 @@ -/* Copyright (c) 2017-2018, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -/** - * @file - * - * Packet inline functions - */ - -#ifndef _ODP_PLAT_PACKET_FLAG_INLINES_API_H_ -#define _ODP_PLAT_PACKET_FLAG_INLINES_API_H_ - -_ODP_INLINE int odp_packet_has_l2(odp_packet_t pkt) -{ - return _odp_packet_has_l2(pkt); -} - -_ODP_INLINE int odp_packet_has_eth(odp_packet_t pkt) -{ - return _odp_packet_has_eth(pkt); -} - -_ODP_INLINE int odp_packet_has_jumbo(odp_packet_t pkt) -{ - return _odp_packet_has_jumbo(pkt); -} - -_ODP_INLINE int odp_packet_has_flow_hash(odp_packet_t pkt) -{ - return _odp_packet_has_flow_hash(pkt); -} - -_ODP_INLINE int odp_packet_has_ts(odp_packet_t pkt) -{ - return _odp_packet_has_ts(pkt); -} - -#endif diff --git a/platform/linux-generic/include/odp/api/plat/ticketlock_inlines_api.h b/platform/linux-generic/include/odp/api/plat/ticketlock_inlines_api.h deleted file mode 100644 index ee2613db..00000000 --- a/platform/linux-generic/include/odp/api/plat/ticketlock_inlines_api.h +++ /dev/null @@ -1,42 +0,0 @@ -/* Copyright (c) 2017-2018, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -/** - * @file - * - * Ticketlock inline functions - */ - -#ifndef _ODP_PLAT_TICKETLOCK_INLINES_API_H_ -#define _ODP_PLAT_TICKETLOCK_INLINES_API_H_ - -_ODP_INLINE void odp_ticketlock_lock(odp_ticketlock_t *lock) -{ - return _odp_ticketlock_lock(lock); -} - -_ODP_INLINE int odp_ticketlock_trylock(odp_ticketlock_t *lock) -{ - return _odp_ticketlock_trylock(lock); -} - -_ODP_INLINE void odp_ticketlock_unlock(odp_ticketlock_t *lock) -{ - _odp_ticketlock_unlock(lock); -} - -_ODP_INLINE int odp_ticketlock_is_locked(odp_ticketlock_t *lock) -{ - return _odp_ticketlock_is_locked(lock); -} - -_ODP_INLINE void odp_ticketlock_init(odp_ticketlock_t *ticketlock) -{ - odp_atomic_init_u32(&ticketlock->next_ticket, 0); - odp_atomic_init_u32(&ticketlock->cur_ticket, 0); -} - -#endif diff --git a/platform/linux-generic/odp_packet_flags.c b/platform/linux-generic/odp_packet_flags.c index efd564d0..48ebab10 100644 --- a/platform/linux-generic/odp_packet_flags.c +++ b/platform/linux-generic/odp_packet_flags.c @@ -116,11 +116,6 @@ int odp_packet_has_ipopt(odp_packet_t pkt) retflag(pkt, input_flags.ipopt); } -int odp_packet_has_ipsec(odp_packet_t pkt) -{ - retflag(pkt, input_flags.ipsec); -} - int odp_packet_has_udp(odp_packet_t pkt) { retflag(pkt, input_flags.udp); diff --git a/platform/linux-generic/odp_packet_flags_api.c b/platform/linux-generic/odp_packet_flags_api.c index e2bc217b..a4ecbc63 100644 --- a/platform/linux-generic/odp_packet_flags_api.c +++ b/platform/linux-generic/odp_packet_flags_api.c @@ -6,11 +6,9 @@ #include "config.h" -#include <odp/api/plat/packet_flag_inlines.h> #include <odp/api/packet_flags.h> #include <odp_packet_internal.h> /* Include non-inlined versions of API functions */ -#undef _ODP_INLINE -#define _ODP_INLINE -#include <odp/api/plat/packet_flag_inlines_api.h> +#define _ODP_NO_INLINE +#include <odp/api/plat/packet_flag_inlines.h> diff --git a/platform/linux-generic/pktio/loop.c b/platform/linux-generic/pktio/loop.c index f9faba5c..99b09e6a 100644 --- a/platform/linux-generic/pktio/loop.c +++ b/platform/linux-generic/pktio/loop.c @@ -161,7 +161,7 @@ static int loopback_recv(pktio_entry_t *pktio_entry, int index ODP_UNUSED, /* Try IPsec inline processing */ if (pktio_entry->s.config.inbound_ipsec && !pkt_hdr->p.flags.ip_err && - _odp_packet_has_ipsec(pkt)) + odp_packet_has_ipsec(pkt)) _odp_ipsec_try_inline(&pkt); pktio_entry->s.stats.in_octets += pkt_len; commit f426dbf3b4dc5be7a1b56d9cc3c0dab00eb9787c Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Sun Apr 22 20:05:34 2018 +0300 linux-gen: pktio: remove separate API inlining header Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index b904877c..cb9ca6f3 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -34,7 +34,6 @@ odpapiplatinclude_HEADERS = \ include/odp/api/plat/packet_inlines.h \ include/odp/api/plat/packet_inlines_api.h \ include/odp/api/plat/pktio_inlines.h \ - include/odp/api/plat/pktio_inlines_api.h \ include/odp/api/plat/pool_inline_types.h \ include/odp/api/plat/std_clib_inlines.h \ include/odp/api/plat/strong_types.h \ diff --git a/platform/linux-generic/include-abi/odp/api/abi/packet.h b/platform/linux-generic/include-abi/odp/api/abi/packet.h index ecac4737..0b11d0bd 100644 --- a/platform/linux-generic/include-abi/odp/api/abi/packet.h +++ b/platform/linux-generic/include-abi/odp/api/abi/packet.h @@ -89,8 +89,8 @@ typedef enum { #define ODP_NUM_PACKET_COLORS 3 -#define _ODP_INLINE static inline #include <odp/api/plat/packet_inlines.h> +#define _ODP_INLINE static inline #include <odp/api/plat/packet_inlines_api.h> /** diff --git a/platform/linux-generic/include-abi/odp/api/abi/packet_io.h b/platform/linux-generic/include-abi/odp/api/abi/packet_io.h index 41ea94a1..dcae5393 100644 --- a/platform/linux-generic/include-abi/odp/api/abi/packet_io.h +++ b/platform/linux-generic/include-abi/odp/api/abi/packet_io.h @@ -51,9 +51,7 @@ typedef struct odp_pktout_queue_t { * @} */ -#define _ODP_INLINE static inline #include <odp/api/plat/pktio_inlines.h> -#include <odp/api/plat/pktio_inlines_api.h> #ifdef __cplusplus } diff --git a/platform/linux-generic/include/odp/api/plat/packet_inlines.h b/platform/linux-generic/include/odp/api/plat/packet_inlines.h index ae90ec5b..2b9c4322 100644 --- a/platform/linux-generic/include/odp/api/plat/packet_inlines.h +++ b/platform/linux-generic/include/odp/api/plat/packet_inlines.h @@ -101,7 +101,7 @@ static inline int _odp_packet_input_index(odp_packet_t pkt) { odp_pktio_t pktio = _odp_packet_input(pkt); - return _odp_pktio_index(pktio); + return odp_pktio_index(pktio); } static inline int _odp_packet_num_segs(odp_packet_t pkt) diff --git a/platform/linux-generic/include/odp/api/plat/pktio_inlines.h b/platform/linux-generic/include/odp/api/plat/pktio_inlines.h index c7398dd5..e219952a 100644 --- a/platform/linux-generic/include/odp/api/plat/pktio_inlines.h +++ b/platform/linux-generic/include/odp/api/plat/pktio_inlines.h @@ -13,7 +13,15 @@ extern "C" { /** @cond _ODP_HIDE_FROM_DOXYGEN_ */ -static inline int _odp_pktio_index(odp_pktio_t pktio) +#ifndef _ODP_NO_INLINE + /* Inline functions by default */ + #define _ODP_INLINE static inline + #define odp_pktio_index __odp_pktio_index +#else + #define _ODP_INLINE +#endif + +_ODP_INLINE int odp_pktio_index(odp_pktio_t pktio) { return (int)(uintptr_t)pktio - 1; } diff --git a/platform/linux-generic/include/odp/api/plat/pktio_inlines_api.h b/platform/linux-generic/include/odp/api/plat/pktio_inlines_api.h deleted file mode 100644 index 6b264ea1..00000000 --- a/platform/linux-generic/include/odp/api/plat/pktio_inlines_api.h +++ /dev/null @@ -1,31 +0,0 @@ -/* Copyright (c) 2018-2018, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -/** - * @file - */ - -#ifndef ODP_PLAT_PKTIO_INLINES_API_H_ -#define ODP_PLAT_PKTIO_INLINES_API_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -_ODP_INLINE int odp_pktio_index(odp_pktio_t pktio) -{ - return _odp_pktio_index(pktio); -} - -/** - * @} - */ - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/platform/linux-generic/include/odp_packet_io_internal.h b/platform/linux-generic/include/odp_packet_io_internal.h index cf02476d..8019dfe9 100644 --- a/platform/linux-generic/include/odp_packet_io_internal.h +++ b/platform/linux-generic/include/odp_packet_io_internal.h @@ -260,7 +260,7 @@ static inline pktio_entry_t *get_pktio_entry(odp_pktio_t pktio) return NULL; } - idx = _odp_pktio_index(pktio); + idx = odp_pktio_index(pktio); return pktio_entry_ptr[idx]; } diff --git a/platform/linux-generic/odp_packet_api.c b/platform/linux-generic/odp_packet_api.c index f2e4f860..8f9f8dee 100644 --- a/platform/linux-generic/odp_packet_api.c +++ b/platform/linux-generic/odp_packet_api.c @@ -24,5 +24,6 @@ #include <inttypes.h> /* Include non-inlined versions of API functions */ +#undef _ODP_INLINE #define _ODP_INLINE #include <odp/api/plat/packet_inlines_api.h> diff --git a/platform/linux-generic/odp_packet_flags_api.c b/platform/linux-generic/odp_packet_flags_api.c index c9441bb4..e2bc217b 100644 --- a/platform/linux-generic/odp_packet_flags_api.c +++ b/platform/linux-generic/odp_packet_flags_api.c @@ -11,5 +11,6 @@ #include <odp_packet_internal.h> /* Include non-inlined versions of API functions */ +#undef _ODP_INLINE #define _ODP_INLINE #include <odp/api/plat/packet_flag_inlines_api.h> diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c index 1721cdec..2f39b981 100644 --- a/platform/linux-generic/odp_packet_io.c +++ b/platform/linux-generic/odp_packet_io.c @@ -513,7 +513,7 @@ int odp_pktio_start(odp_pktio_t hdl) } } - sched_fn->pktio_start(_odp_pktio_index(hdl), num, index, odpq); + sched_fn->pktio_start(odp_pktio_index(hdl), num, index, odpq); } ODP_DBG("interface: %s, input queues: %u, output queues: %u\n", @@ -1189,7 +1189,7 @@ void odp_pktio_print(odp_pktio_t hdl) len += snprintf(&str[len], n - len, " type %s\n", entry->s.ops->name); len += snprintf(&str[len], n - len, - " index %i\n", _odp_pktio_index(hdl)); + " index %i\n", odp_pktio_index(hdl)); len += snprintf(&str[len], n - len, " handle (u64) %" PRIu64 "\n", odp_pktio_to_u64(hdl)); @@ -1463,7 +1463,7 @@ int odp_pktin_queue_config(odp_pktio_t pktio, mode == ODP_PKTIN_MODE_SCHED) { odp_queue_param_t queue_param; char name[ODP_QUEUE_NAME_LEN]; - int pktio_id = _odp_pktio_index(pktio); + int pktio_id = odp_pktio_index(pktio); snprintf(name, sizeof(name), "odp-pktin-%i-%i", pktio_id, i); @@ -1598,7 +1598,7 @@ int odp_pktout_queue_config(odp_pktio_t pktio, odp_queue_param_t queue_param; queue_t q_int; char name[ODP_QUEUE_NAME_LEN]; - int pktio_id = _odp_pktio_index(pktio); + int pktio_id = odp_pktio_index(pktio); snprintf(name, sizeof(name), "odp-pktout-%i-%i", pktio_id, i); diff --git a/platform/linux-generic/odp_pktio_api.c b/platform/linux-generic/odp_pktio_api.c index 52f0b571..16c30743 100644 --- a/platform/linux-generic/odp_pktio_api.c +++ b/platform/linux-generic/odp_pktio_api.c @@ -7,8 +7,7 @@ #include "config.h" #include <odp/api/packet_io.h> -#include <odp/api/plat/pktio_inlines.h> /* Include non-inlined versions of API functions */ -#define _ODP_INLINE -#include <odp/api/plat/pktio_inlines_api.h> +#define _ODP_NO_INLINE +#include <odp/api/plat/pktio_inlines.h> ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/Makefile.am | 10 +-- .../include-abi/odp/api/abi/byteorder.h | 2 - .../linux-generic/include-abi/odp/api/abi/packet.h | 2 +- .../include-abi/odp/api/abi/packet_flags.h | 1 - .../include-abi/odp/api/abi/packet_io.h | 2 - .../include-abi/odp/api/abi/ticketlock.h | 2 - .../include/odp/api/plat/atomic_inlines.h | 75 ++++++++++++++++++ .../include/odp/api/plat/byteorder_inlines.h | 51 ++++++++----- .../include/odp/api/plat/byteorder_inlines_api.h | 88 ---------------------- .../include/odp/api/plat/packet_flag_inlines.h | 39 ++++++---- .../include/odp/api/plat/packet_flag_inlines_api.h | 41 ---------- .../include/odp/api/plat/packet_inlines.h | 2 +- .../include/odp/api/plat/pktio_inlines.h | 10 ++- .../include/odp/api/plat/pktio_inlines_api.h | 31 -------- .../include/odp/api/plat/ticketlock_inlines.h | 62 +++++++-------- .../include/odp/api/plat/ticketlock_inlines_api.h | 42 ----------- .../include/odp_classification_inlines.h | 28 +++---- .../linux-generic/include/odp_packet_io_internal.h | 2 +- platform/linux-generic/include/protocols/thash.h | 8 +- platform/linux-generic/odp_atomic_api.c | 2 +- .../{odp_byteorder.c => odp_byteorder_api.c} | 3 +- platform/linux-generic/odp_classification.c | 2 +- platform/linux-generic/odp_ipsec.c | 56 +++++++------- platform/linux-generic/odp_packet.c | 34 ++++----- platform/linux-generic/odp_packet_api.c | 1 + platform/linux-generic/odp_packet_flags.c | 5 -- platform/linux-generic/odp_packet_flags_api.c | 5 +- platform/linux-generic/odp_packet_io.c | 8 +- platform/linux-generic/odp_pktio_api.c | 5 +- platform/linux-generic/odp_pool.c | 4 +- platform/linux-generic/odp_queue_basic.c | 6 +- platform/linux-generic/odp_queue_scalable.c | 4 +- platform/linux-generic/odp_schedule_scalable.c | 4 +- .../{odp_ticketlock.c => odp_ticketlock_api.c} | 5 +- platform/linux-generic/odp_traffic_mngr.c | 12 +-- platform/linux-generic/pktio/dpdk_parse.c | 34 ++++----- platform/linux-generic/pktio/loop.c | 4 +- 37 files changed, 283 insertions(+), 409 deletions(-) delete mode 100644 platform/linux-generic/include/odp/api/plat/byteorder_inlines_api.h delete mode 100644 platform/linux-generic/include/odp/api/plat/packet_flag_inlines_api.h delete mode 100644 platform/linux-generic/include/odp/api/plat/pktio_inlines_api.h delete mode 100644 platform/linux-generic/include/odp/api/plat/ticketlock_inlines_api.h rename platform/linux-generic/{odp_byteorder.c => odp_byteorder_api.c} (79%) rename platform/linux-generic/{odp_ticketlock.c => odp_ticketlock_api.c} (64%) hooks/post-receive --

7 years, 1 month

[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 --

7 years, 1 month

[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 --

7 years, 1 month

[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 --

7 years, 1 month

[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 --

7 years, 1 month

[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 --

7 years, 1 month

[COMMIT] annotated tag v1.19.0.1_tigermoth 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_tigermoth has been created at ec4ef079c6a5fa71d719a23cb4ab669ee436c9f5 (tag) tagging 332877d51e773a584d272a03f08446d18cbe1634 (commit) replaces v1.19.0.0_tigermoth tagged by Maxim Uvarov on Thu May 10 22:17:37 2018 +0300 - Log ----------------------------------------------------------------- Tiger Moth LTS update 1 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 --

7 years, 1 month

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

git-lng-odp