git-lng-odp

git-lng-odp@lists.linaro.org

1203 discussions

[COMMIT] branch api-next updated. v1.10.1.0-161-ga6d9960

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, api-next has been updated via a6d9960b81c1c5d4dff0c25b43ac5f9de7e36b8a (commit) from 645e5ccf90c00c634c29fbb4276a8875699d8893 (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 a6d9960b81c1c5d4dff0c25b43ac5f9de7e36b8a Author: Christophe Milard <christophe.milard(a)linaro.org> Date: Fri Aug 19 16:46:23 2016 +0200 doc: drv: fix doxyfile for drv doc generation Restricting to the driver interface and defining general macros. Signed-off-by: Christophe Milard <christophe.milard(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/doc/driver-api-guide/Doxyfile b/doc/driver-api-guide/Doxyfile index 680d1d4..b5f7260 100644 --- a/doc/driver-api-guide/Doxyfile +++ b/doc/driver-api-guide/Doxyfile @@ -5,10 +5,13 @@ PROJECT_NUMBER = $(VERSION) PROJECT_LOGO = $(SRCDIR)/doc/images/ODP-Logo-HQ.svg INPUT = $(SRCDIR)/doc/driver-api-guide \ $(SRCDIR)/include/odp/drv \ + $(SRCDIR)/platform/$(WITH_PLATFORM)/include/odp/drv \ $(SRCDIR)/include/odp_drv.h -EXCLUDE_PATTERNS = drv* odp_drv.h -EXAMPLE_PATH = $(SRCDIR)/example $(SRCDIR) PREDEFINED = __GNUC__ \ - "ODP_HANDLE_T(type)=odp_handle_t type" \ - odpdrv_bool_t=int -WARNINGS = NO + __attribute__(x)= \ + ODPDRV_ALIGNED(x)= \ + __BIG_ENDIAN_BITFIELD \ + __LITTLE_ENDIAN_BITFIELD \ + __x86_64__ \ + ODPDRV_PACKED \ + "ODPDRV_HANDLE_T(type)=odpdrv_handle_t type" ----------------------------------------------------------------------- Summary of changes: doc/driver-api-guide/Doxyfile | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) hooks/post-receive --

8 years, 9 months

[COMMIT] branch master updated. v1.10.1.0-103-g7cd13f4

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 7cd13f48c935a88d56fd7d393fea6f02e5b0365a (commit) via ba2298af4f3912598043938c19bfedc5a8c89567 (commit) via 84c399d72a287115189bc8e8f272e4d7b9eaec47 (commit) from be6d2d4f3de94cc314d2367f76432306f4c88b94 (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 7cd13f48c935a88d56fd7d393fea6f02e5b0365a Author: Xuelin Shi <forrest.shi(a)linaro.org> Date: Wed Aug 31 09:54:15 2016 +0800 example/l3fwd: enhance flow lookup performance in hash increase the hash size to accommodate more entries. pre-compute the hash keys of possible ip destinations in a subnet. Signed-off-by: Xuelin Shi <forrest.shi(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/example/l3fwd/odp_l3fwd.c b/example/l3fwd/odp_l3fwd.c index 0998614..44778b0 100644 --- a/example/l3fwd/odp_l3fwd.c +++ b/example/l3fwd/odp_l3fwd.c @@ -1061,9 +1061,6 @@ int main(int argc, char **argv) for (i = 0; i < nb_worker; i++) odph_odpthreads_join(&thread_tbl[i]); - /* release resource on exit */ - destroy_fwd_db(); - /* if_names share a single buffer, so only one free */ free(args->if_names[0]); diff --git a/example/l3fwd/odp_l3fwd_db.c b/example/l3fwd/odp_l3fwd_db.c index b3a237f..4731237 100644 --- a/example/l3fwd/odp_l3fwd_db.c +++ b/example/l3fwd/odp_l3fwd_db.c @@ -150,7 +150,7 @@ char *mac_addr_str(char *b, odph_ethaddr_t *mac) */ typedef struct flow_entry_s { ipv4_tuple5_t key; /**< match key */ - struct flow_entry_s *next; /**< next entry on the list */ + struct flow_entry_s *next; /**< next entry in the bucket */ fwd_db_entry_t *fwd_entry; /**< entry info in db */ } flow_entry_t; @@ -158,59 +158,96 @@ typedef struct flow_entry_s { * Flow cache table bucket */ typedef struct flow_bucket_s { - odp_spinlock_t lock; /**< Bucket lock*/ - flow_entry_t *next; /**< Pointer to first flow entry in bucket*/ + odp_rwlock_t lock; /**< Bucket lock*/ + flow_entry_t *next; /**< First flow entry in bucket*/ } flow_bucket_t; /** * Flow hash table, fast lookup cache */ typedef struct flow_table_s { - flow_bucket_t *bucket; - uint32_t count; + odp_rwlock_t flow_lock; /**< flow table lock*/ + flow_entry_t *flows; /**< flow store */ + flow_bucket_t *bucket; /**< bucket store */ + uint32_t bkt_cnt; + uint32_t flow_cnt; + uint32_t next_flow; /**< next available flow in the store */ } flow_table_t; static flow_table_t fwd_lookup_cache; -void init_fwd_hash_cache(void) +static void create_fwd_hash_cache(void) { odp_shm_t hash_shm; flow_bucket_t *bucket; - uint32_t bucket_count; + flow_entry_t *flows; + uint32_t bucket_count, flow_count, size; uint32_t i; - bucket_count = FWD_DEF_BUCKET_COUNT; + flow_count = FWD_MAX_FLOW_COUNT; + bucket_count = flow_count / FWD_DEF_BUCKET_ENTRIES; /*Reserve memory for Routing hash table*/ - hash_shm = odp_shm_reserve("route_table", - sizeof(flow_bucket_t) * bucket_count, - ODP_CACHE_LINE_SIZE, 0); + size = sizeof(flow_bucket_t) * bucket_count + + sizeof(flow_entry_t) * flow_count; + hash_shm = odp_shm_reserve("flow_table", size, ODP_CACHE_LINE_SIZE, 0); bucket = odp_shm_addr(hash_shm); if (!bucket) { - EXAMPLE_ERR("Error: shared mem alloc failed.\n"); - exit(-1); + /* Try the second time with small request */ + flow_count /= 4; + bucket_count = flow_count / FWD_DEF_BUCKET_ENTRIES; + size = sizeof(flow_bucket_t) * bucket_count + + sizeof(flow_entry_t) * flow_count; + hash_shm = odp_shm_reserve("flow_table", size, + ODP_CACHE_LINE_SIZE, 0); + bucket = odp_shm_addr(hash_shm); + if (!bucket) { + EXAMPLE_ERR("Error: shared mem alloc failed.\n"); + exit(-1); + } } + size = sizeof(flow_bucket_t) * bucket_count; + flows = (flow_entry_t *)((char *)bucket + size); + fwd_lookup_cache.bucket = bucket; - fwd_lookup_cache.count = bucket_count; + fwd_lookup_cache.bkt_cnt = bucket_count; + fwd_lookup_cache.flows = flows; + fwd_lookup_cache.flow_cnt = flow_count; - /*Initialize Locks*/ + /*Initialize bucket locks*/ for (i = 0; i < bucket_count; i++) { bucket = &fwd_lookup_cache.bucket[i]; - odp_spinlock_init(&bucket->lock); + odp_rwlock_init(&bucket->lock); bucket->next = NULL; } + + memset(flows, 0, sizeof(flow_entry_t) * flow_count); + odp_rwlock_init(&fwd_lookup_cache.flow_lock); + fwd_lookup_cache.next_flow = 0; +} + +static inline flow_entry_t *get_new_flow(void) +{ + uint32_t next; + flow_entry_t *flow = NULL; + + odp_rwlock_write_lock(&fwd_lookup_cache.flow_lock); + next = fwd_lookup_cache.next_flow; + if (next < fwd_lookup_cache.flow_cnt) { + flow = &fwd_lookup_cache.flows[next]; + fwd_lookup_cache.next_flow++; + } + odp_rwlock_write_unlock(&fwd_lookup_cache.flow_lock); + + return flow; } static inline int match_key_flow(ipv4_tuple5_t *key, flow_entry_t *flow) { - if (key->src_ip == flow->key.src_ip && - key->dst_ip == flow->key.dst_ip && - key->src_port == flow->key.src_port && - key->dst_port == flow->key.dst_port && - key->proto == flow->key.proto) + if (key->hi64 == flow->key.hi64 && key->lo64 == flow->key.lo64) return 1; return 0; @@ -221,10 +258,12 @@ flow_entry_t *lookup_fwd_cache(ipv4_tuple5_t *key, flow_bucket_t *bucket) { flow_entry_t *rst; + odp_rwlock_read_lock(&bucket->lock); for (rst = bucket->next; rst != NULL; rst = rst->next) { if (match_key_flow(key, rst)) break; } + odp_rwlock_read_unlock(&bucket->lock); return rst; } @@ -239,22 +278,58 @@ flow_entry_t *insert_fwd_cache(ipv4_tuple5_t *key, if (!entry) return NULL; - flow = malloc(sizeof(flow_entry_t)); + flow = get_new_flow(); + if (!flow) + return NULL; + flow->key = *key; flow->fwd_entry = entry; - odp_spinlock_lock(&bucket->lock); - if (!bucket->next) { - bucket->next = flow; - } else { + odp_rwlock_write_lock(&bucket->lock); + if (bucket->next) flow->next = bucket->next; - bucket->next = flow; - } - odp_spinlock_unlock(&bucket->lock); + bucket->next = flow; + odp_rwlock_write_unlock(&bucket->lock); return flow; } +void init_fwd_hash_cache(void) +{ + fwd_db_entry_t *entry; + flow_entry_t *flow; + flow_bucket_t *bucket; + uint64_t hash; + uint32_t i, nb_hosts; + ipv4_tuple5_t key; + + create_fwd_hash_cache(); + + /** + * warm up the lookup cache with possible hosts. + * with millions flows, save significant time during runtime. + */ + memset(&key, 0, sizeof(key)); + for (entry = fwd_db->list; NULL != entry; entry = entry->next) { + nb_hosts = 1 << (32 - entry->subnet.depth); + for (i = 0; i < nb_hosts; i++) { + key.dst_ip = entry->subnet.addr + i; + hash = l3fwd_calc_hash(&key); + hash &= fwd_lookup_cache.bkt_cnt - 1; + bucket = &fwd_lookup_cache.bucket[hash]; + flow = lookup_fwd_cache(&key, bucket); + if (flow) + return; + + flow = insert_fwd_cache(&key, bucket, entry); + if (!flow) + goto out; + } + } +out: + return; +} + /** Global pointer to fwd db */ fwd_db_t *fwd_db; @@ -382,35 +457,22 @@ void dump_fwd_db(void) printf("\n"); } -void destroy_fwd_db(void) -{ - flow_bucket_t *bucket; - flow_entry_t *flow, *tmp; - uint32_t i; - - for (i = 0; i < fwd_lookup_cache.count; i++) { - bucket = &fwd_lookup_cache.bucket[i]; - flow = bucket->next; - odp_spinlock_lock(&bucket->lock); - while (flow) { - tmp = flow->next; - free(flow); - flow = tmp; - } - odp_spinlock_unlock(&bucket->lock); - } -} - fwd_db_entry_t *find_fwd_db_entry(ipv4_tuple5_t *key) { fwd_db_entry_t *entry; flow_entry_t *flow; flow_bucket_t *bucket; uint64_t hash; + ipv4_tuple5_t newkey; + + newkey.hi64 = 0; + newkey.lo64 = 0; + newkey.dst_ip = key->dst_ip; + key = &newkey; /* first find in cache */ hash = l3fwd_calc_hash(key); - hash &= fwd_lookup_cache.count - 1; + hash &= fwd_lookup_cache.bkt_cnt - 1; bucket = &fwd_lookup_cache.bucket[hash]; flow = lookup_fwd_cache(key, bucket); if (flow) diff --git a/example/l3fwd/odp_l3fwd_db.h b/example/l3fwd/odp_l3fwd_db.h index d9f6d61..1b24f1a 100644 --- a/example/l3fwd/odp_l3fwd_db.h +++ b/example/l3fwd/odp_l3fwd_db.h @@ -19,14 +19,14 @@ extern "C" { #define MAX_STRING 32 /** - * Default number of flows + * Max number of flows */ -#define FWD_DEF_FLOW_COUNT 100000 +#define FWD_MAX_FLOW_COUNT (1 << 22) /** - * Default Hash bucket number + * Default hash entries in a bucket */ -#define FWD_DEF_BUCKET_COUNT (FWD_DEF_FLOW_COUNT / 8) +#define FWD_DEF_BUCKET_ENTRIES 4 /** * IP address range (subnet) @@ -40,12 +40,22 @@ typedef struct ip_addr_range_s { * TCP/UDP flow */ typedef struct ipv4_tuple5_s { - uint32_t src_ip; - uint32_t dst_ip; - uint16_t src_port; - uint16_t dst_port; - uint8_t proto; -} ipv4_tuple5_t; + union { + struct { + int32_t src_ip; + int32_t dst_ip; + int16_t src_port; + int16_t dst_port; + int8_t proto; + int8_t pad1; + int16_t pad2; + }; + struct { + int64_t hi64; + int64_t lo64; + }; + }; +} ipv4_tuple5_t ODP_ALIGNED_CACHE; /** * Forwarding data base entry @@ -116,11 +126,6 @@ void dump_fwd_db_entry(fwd_db_entry_t *entry); void dump_fwd_db(void); /** - * Destroy the forwarding database - */ -void destroy_fwd_db(void); - -/** * Find a matching forwarding database entry * * @param key ipv4 tuple commit ba2298af4f3912598043938c19bfedc5a8c89567 Author: Xuelin Shi <forrest.shi(a)linaro.org> Date: Wed Aug 31 09:54:14 2016 +0800 example/l3fwd: add test script Signed-off-by: Xuelin Shi <forrest.shi(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/example/l3fwd/Makefile.am b/example/l3fwd/Makefile.am index f926717..422a3bf 100644 --- a/example/l3fwd/Makefile.am +++ b/example/l3fwd/Makefile.am @@ -10,3 +10,11 @@ noinst_HEADERS = \ $(top_srcdir)/example/example_debug.h dist_odp_l3fwd_SOURCES = odp_l3fwd.c odp_l3fwd_db.c odp_l3fwd_lpm.c + +if test_example +if HAVE_PCAP +TESTS = odp_l3fwd_run.sh +endif +endif + +EXTRA_DIST = odp_l3fwd_run.sh udp64.pcap diff --git a/example/l3fwd/odp_l3fwd_run.sh b/example/l3fwd/odp_l3fwd_run.sh new file mode 100755 index 0000000..6f0b11a --- /dev/null +++ b/example/l3fwd/odp_l3fwd_run.sh @@ -0,0 +1,28 @@ +#!/bin/bash +# +# Copyright (c) 2016, Linaro Limited +# All rights reserved. +# +# SPDX-License-Identifier: BSD-3-Clause +# + +PCAP_IN=`find . ${TEST_DIR} $(dirname $0) -name udp64.pcap -print -quit` +PCAP_OUT="pcapout.pcap" +PCAP_IN_SIZE=`stat -c %s ${PCAP_IN}` +echo "using PCAP_IN = ${PCAP_IN}, PCAP_OUT = ${PCAP_OUT}" + +./odp_l3fwd -i pcap:in=${PCAP_IN},pcap:out=${PCAP_OUT} \ + -r "10.0.0.0/24,pcap:out=${PCAP_OUT}" -d 30 + +STATUS=$? +PCAP_OUT_SIZE=`stat -c %s ${PCAP_OUT}` +rm -f ${PCAP_OUT} + +if [ ${STATUS} -ne 0 ] || [ ${PCAP_IN_SIZE} -ne ${PCAP_OUT_SIZE} ]; then + echo "Error: status ${STATUS}, in:${PCAP_IN_SIZE} out:${PCAP_OUT_SIZE}" + exit 1 +fi + +echo "Pass: status ${STATUS}, in:${PCAP_IN_SIZE} out:${PCAP_OUT_SIZE}" + +exit 0 diff --git a/example/l3fwd/udp64.pcap b/example/l3fwd/udp64.pcap new file mode 100644 index 0000000..45f9d6e Binary files /dev/null and b/example/l3fwd/udp64.pcap differ commit 84c399d72a287115189bc8e8f272e4d7b9eaec47 Author: Xuelin Shi <forrest.shi(a)linaro.org> Date: Wed Aug 31 09:54:13 2016 +0800 example: introducing l3fwd multi-thread, multi-queues and bi-directional forwarding. support (port, queue, thread) arguments in cmdline which specify how the threads handle which rx queue at which port, if no this argument, default specification used. both hash and lpm based lookup methods are supported, default lpm. Signed-off-by: Xuelin Shi <forrest.shi(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/example/Makefile.am b/example/Makefile.am index 37542af..dfc07b6 100644 --- a/example/Makefile.am +++ b/example/Makefile.am @@ -1 +1,11 @@ -SUBDIRS = classifier generator ipsec packet time timer traffic_mgmt l2fwd_simple switch hello +SUBDIRS = classifier \ + generator \ + hello \ + ipsec \ + l2fwd_simple \ + l3fwd \ + packet \ + switch \ + time \ + timer \ + traffic_mgmt diff --git a/example/l3fwd/.gitignore b/example/l3fwd/.gitignore new file mode 100644 index 0000000..74e501f --- /dev/null +++ b/example/l3fwd/.gitignore @@ -0,0 +1 @@ +odp_l3fwd diff --git a/example/l3fwd/Makefile.am b/example/l3fwd/Makefile.am new file mode 100644 index 0000000..f926717 --- /dev/null +++ b/example/l3fwd/Makefile.am @@ -0,0 +1,12 @@ +include $(top_srcdir)/example/Makefile.inc + +bin_PROGRAMS = odp_l3fwd$(EXEEXT) +odp_l3fwd_LDFLAGS = $(AM_LDFLAGS) -static +odp_l3fwd_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/example -I${top_srcdir}/test + +noinst_HEADERS = \ + $(top_srcdir)/example/l3fwd/odp_l3fwd_db.h \ + $(top_srcdir)/example/l3fwd/odp_l3fwd_lpm.h \ + $(top_srcdir)/example/example_debug.h + +dist_odp_l3fwd_SOURCES = odp_l3fwd.c odp_l3fwd_db.c odp_l3fwd_lpm.c diff --git a/example/l3fwd/odp_l3fwd.c b/example/l3fwd/odp_l3fwd.c new file mode 100644 index 0000000..0998614 --- /dev/null +++ b/example/l3fwd/odp_l3fwd.c @@ -0,0 +1,1089 @@ +/* Copyright (c) 2016, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <stdlib.h> +#include <stdio.h> +#include <errno.h> +#include <getopt.h> +#include <unistd.h> +#include <inttypes.h> + +#include <test_debug.h> + +#include <odp_api.h> +#include <odp/helper/linux.h> +#include <odp/helper/eth.h> +#include <odp/helper/ip.h> +#include <odp/helper/udp.h> +#include <odp/helper/tcp.h> + +#include "odp_l3fwd_db.h" +#include "odp_l3fwd_lpm.h" + +#define POOL_NUM_PKT 8192 +#define POOL_SEG_LEN 1856 +#define MAX_PKT_BURST 32 + +#define MAX_NB_WORKER 32 +#define MAX_NB_PKTIO 32 +#define MAX_NB_QUEUE 32 +#define MAX_NB_QCONFS 1024 +#define MAX_NB_ROUTE 32 + +#define INVALID_ID (-1) +#define PRINT_INTERVAL 10 /* interval seconds of printing stats */ + +/** Get rid of path in filename - only for unix-type paths using '/' */ +#define NO_PATH(file_name) (strrchr((file_name), '/') ? \ + strrchr((file_name), '/') + 1 : (file_name)) + +struct l3fwd_pktio_s { + odp_pktio_t pktio; + odph_ethaddr_t mac_addr; + odp_pktin_queue_t ifin[MAX_NB_QUEUE]; + odp_pktout_queue_t ifout[MAX_NB_QUEUE]; + int nb_rxq; /* capa max */ + int nb_txq; /* capa max */ + int rxq_idx; /* requested, maybe greater than nb_rxq */ + int txq_idx; /* requested, maybe greater than nb_txq */ +}; + +struct l3fwd_qconf_s { + uint8_t if_idx; /* port index */ + uint8_t rxq_idx; /* recv queue index in a port */ + uint8_t core_idx; /* this core should handle traffic */ +}; + +struct thread_arg_s { + uint64_t packets; + uint64_t rx_drops; + uint64_t tx_drops; + struct { + int nb_rxq; /* number of rxq this thread will access */ + int rxq[MAX_NB_QUEUE]; /* rxq[i] is index in pktio.ifin[] */ + int txq_idx; /* index in pktio.ifout[] */ + } pktio[MAX_NB_PKTIO]; + int nb_pktio; + int thr_idx; +}; + +typedef struct { + char *if_names[MAX_NB_PKTIO]; + int if_count; + char *route_str[MAX_NB_ROUTE]; + int worker_count; + struct l3fwd_qconf_s qconf_config[MAX_NB_QCONFS]; + int qconf_count; + uint32_t duration; /* seconds to run */ + uint8_t hash_mode; /* 1:hash, 0:lpm */ + uint8_t dest_mac_changed[MAX_NB_PKTIO]; /* 1: dest mac from cmdline */ +} app_args_t; + +struct { + app_args_t cmd_args; + struct l3fwd_pktio_s l3fwd_pktios[MAX_NB_PKTIO]; + odph_odpthread_t l3fwd_workers[MAX_NB_WORKER]; + struct thread_arg_s worker_args[MAX_NB_WORKER]; + odph_ethaddr_t eth_dest_mac[MAX_NB_PKTIO]; + + /* forward func, hash or lpm */ + int (*fwd_func)(odp_packet_t pkt, int sif); +} global; + +/** Global barrier to synchronize main and workers */ +static odp_barrier_t barrier; +static int exit_threads; /**< Break workers loop if set to 1 */ + +static int create_pktio(const char *name, odp_pool_t pool, + struct l3fwd_pktio_s *fwd_pktio) +{ + odp_pktio_param_t pktio_param; + odp_pktio_t pktio; + odp_pktio_capability_t capa; + int rc; + + odp_pktio_param_init(&pktio_param); + + pktio = odp_pktio_open(name, pool, &pktio_param); + if (pktio == ODP_PKTIO_INVALID) { + printf("Failed to open %s\n", name); + return -1; + } + fwd_pktio->pktio = pktio; + + rc = odp_pktio_capability(pktio, &capa); + if (rc) { + printf("Error: pktio %s: unable to read capabilities!\n", + name); + + return -1; + } + + fwd_pktio->nb_rxq = (int)capa.max_input_queues; + fwd_pktio->nb_txq = (int)capa.max_output_queues; + + if (fwd_pktio->nb_rxq > MAX_NB_QUEUE) + fwd_pktio->nb_rxq = MAX_NB_QUEUE; + + if (fwd_pktio->nb_txq > MAX_NB_QUEUE) + fwd_pktio->nb_txq = MAX_NB_QUEUE; + + return 0; +} + +static void setup_fwd_db(void) +{ + fwd_db_entry_t *entry; + int if_idx; + app_args_t *args; + + args = &global.cmd_args; + if (args->hash_mode) + init_fwd_hash_cache(); + else + fib_tbl_init(); + + for (entry = fwd_db->list; NULL != entry; entry = entry->next) { + if_idx = entry->oif_id; + if (!args->hash_mode) + fib_tbl_insert(entry->subnet.addr, if_idx, + entry->subnet.depth); + if (args->dest_mac_changed[if_idx]) + global.eth_dest_mac[if_idx] = entry->dst_mac; + else + entry->dst_mac = global.eth_dest_mac[if_idx]; + } +} + +static int l3fwd_pkt_hash(odp_packet_t pkt, int sif) +{ + fwd_db_entry_t *entry; + ipv4_tuple5_t key; + odph_ethhdr_t *eth; + odph_udphdr_t *udp; + odph_ipv4hdr_t *ip; + uint32_t len; + int dif; + + ip = odp_packet_l3_ptr(pkt, &len); + key.dst_ip = odp_be_to_cpu_32(ip->dst_addr); + key.src_ip = odp_be_to_cpu_32(ip->src_addr); + key.proto = ip->proto; + + if (odp_packet_has_udp(pkt) || + odp_packet_has_tcp(pkt)) { + /* UDP or TCP*/ + void *ptr = odp_packet_l4_ptr(pkt, NULL); + + udp = (odph_udphdr_t *)ptr; + key.src_port = odp_be_to_cpu_16(udp->src_port); + key.dst_port = odp_be_to_cpu_16(udp->dst_port); + } else { + key.src_port = 0; + key.dst_port = 0; + } + entry = find_fwd_db_entry(&key); + ip->ttl--; + ip->chksum = odph_ipv4_csum_update(pkt); + eth = odp_packet_l2_ptr(pkt, NULL); + if (entry) { + eth->src = entry->src_mac; + eth->dst = entry->dst_mac; + dif = entry->oif_id; + } else { + /* no route, send by src port */ + eth->dst = eth->src; + dif = sif; + } + + return dif; +} + +static int l3fwd_pkt_lpm(odp_packet_t pkt, int sif) +{ + odph_ipv4hdr_t *ip; + odph_ethhdr_t *eth; + uint32_t len; + int dif; + int ret; + + ip = odp_packet_l3_ptr(pkt, &len); + ip->ttl--; + ip->chksum = odph_ipv4_csum_update(pkt); + eth = odp_packet_l2_ptr(pkt, NULL); + + /* network byte order maybe different from host */ + ret = fib_tbl_lookup(odp_be_to_cpu_32(ip->dst_addr), &dif); + if (ret) + dif = sif; + + eth->dst = global.eth_dest_mac[dif]; + eth->src = global.l3fwd_pktios[dif].mac_addr; + + return dif; +} + +/** + * Drop packets which input parsing marked as containing errors. + * + * Frees packets with error and modifies pkt_tbl[] to only contain packets with + * no detected errors. + * + * @param pkt_tbl Array of packets + * @param num Number of packets in pkt_tbl[] + * + * @return Number of packets dropped + */ +static inline int drop_err_pkts(odp_packet_t pkt_tbl[], unsigned num) +{ + odp_packet_t pkt; + unsigned dropped = 0; + unsigned i, j; + + for (i = 0, j = 0; i < num; ++i) { + pkt = pkt_tbl[i]; + + if (odp_unlikely(odp_packet_has_error(pkt) || + !odp_packet_has_ipv4(pkt))) { + odp_packet_free(pkt); + dropped++; + } else if (odp_unlikely(i != j++)) { + pkt_tbl[j - 1] = pkt; + } + } + + return dropped; +} + +static void l3fwd_one_queue(uint32_t sif, int rxq_idx, void *thr_arg) +{ + odp_packet_t *tbl; + odp_pktout_queue_t outq; + odp_pktin_queue_t inq; + odp_packet_t pkt_tbl[MAX_PKT_BURST]; + struct thread_arg_s *arg; + int pkts, drop, sent; + int dst_port, dif; + int i; + + arg = thr_arg; + inq = global.l3fwd_pktios[sif].ifin[rxq_idx]; + pkts = odp_pktin_recv(inq, pkt_tbl, MAX_PKT_BURST); + if (pkts <= 0) + return; + + arg->packets += pkts; + drop = drop_err_pkts(pkt_tbl, pkts); + pkts -= drop; + arg->rx_drops += drop; + + dif = global.fwd_func(pkt_tbl[0], sif); + tbl = &pkt_tbl[0]; + while (pkts) { + int txq_idx; + + dst_port = dif; + for (i = 1; i < pkts; i++) { + dif = global.fwd_func(tbl[i], sif); + if (dif != dst_port) + break; + } + + txq_idx = arg->pktio[dst_port].txq_idx; + outq = global.l3fwd_pktios[dst_port].ifout[txq_idx]; + sent = odp_pktout_send(outq, tbl, i); + if (odp_unlikely(sent < i)) { + sent = sent < 0 ? 0 : sent; + odp_packet_free_multi(&tbl[sent], i - sent); + arg->tx_drops += i - sent; + } + + if (i < pkts) + tbl += i; + + pkts -= i; + } +} + +static int run_worker(void *arg) +{ + int if_idx, rxq, nb_rxq; + struct thread_arg_s *thr_arg = arg; + + odp_barrier_wait(&barrier); + + while (!exit_threads) { + for (if_idx = 0; if_idx < thr_arg->nb_pktio; if_idx++) { + nb_rxq = thr_arg->pktio[if_idx].nb_rxq; + if (!nb_rxq || thr_arg->thr_idx == INVALID_ID) + continue; + + for (rxq = 0; rxq < nb_rxq; rxq++) { + int rxq_idx; + + rxq_idx = thr_arg->pktio[if_idx].rxq[rxq]; + l3fwd_one_queue(if_idx, rxq_idx, arg); + } + } + } + + /* Make sure that latest stat writes are visible to other threads */ + odp_mb_full(); + + return 0; +} + +static int find_port_id_by_name(char *name, app_args_t *args) +{ + int i; + + if (!name) + return -1; + + for (i = 0; i < args->if_count; i++) { + if (!strcmp(name, args->if_names[i])) + return i; + } + + return -1; +} + +/* split string into tokens */ +static int split_string(char *str, int stringlen, + char **tokens, int maxtokens, char delim) +{ + int i, tok = 0; + int tokstart = 1; /* first token is right at start of string */ + + if (str == NULL || tokens == NULL) + goto einval_error; + + for (i = 0; i < stringlen; i++) { + if (str[i] == '\0' || tok >= maxtokens) + break; + if (tokstart) { + tokstart = 0; + tokens[tok++] = &str[i]; + } + if (str[i] == delim) { + str[i] = '\0'; + tokstart = 1; + } + } + return tok; + +einval_error: + errno = EINVAL; + return -1; +} + +static int parse_config(char *cfg_str, app_args_t *args) +{ + char s[256]; + const char *p, *p0 = cfg_str; + char *end; + enum fieldnames { + FLD_PORT = 0, + FLD_QUEUE, + FLD_LCORE, + FLD_LAST + }; + unsigned long int_fld[FLD_LAST]; + char *str_fld[FLD_LAST]; + int i; + unsigned size; + int nb_qconfs = 0; + struct l3fwd_qconf_s *qconf_array = &args->qconf_config[0]; + + p = strchr(p0, '('); + while (p != NULL) { + ++p; + p0 = strchr(p, ')'); + if (p0 == NULL) + return -1; + + size = p0 - p; + if (size >= sizeof(s)) + return -1; + + snprintf(s, sizeof(s), "%.*s", size, p); + i = split_string(s, sizeof(s), str_fld, FLD_LAST, ','); + if (i != FLD_LAST) + return -1; + for (i = 0; i < FLD_LAST; i++) { + errno = 0; + int_fld[i] = strtoul(str_fld[i], &end, 0); + if (errno != 0 || end == str_fld[i] || int_fld[i] > 255) + return -1; + } + if (nb_qconfs >= MAX_NB_QCONFS) { + printf("exceeded max number of queue params: %d\n", + nb_qconfs); + return -1; + } + qconf_array[nb_qconfs].if_idx = (uint8_t)int_fld[FLD_PORT]; + qconf_array[nb_qconfs].rxq_idx = (uint8_t)int_fld[FLD_QUEUE]; + qconf_array[nb_qconfs].core_idx = (uint8_t)int_fld[FLD_LCORE]; + ++nb_qconfs; + + p = strchr(p0, '('); + } + args->qconf_count = nb_qconfs; + + return 0; +} + +static void print_usage(char *progname) +{ + printf("\n" + "ODP L3 forwarding application.\n" + "\n" + "Usage: %s OPTIONS\n" + " E.g. %s -i eth0,eth1 -r 1.1.1.0/24,eth0 -r 2.2.2.0/24,eth1\n" + " In the above example,\n" + " eth0 will send pkts to eth1 and vice versa\n" + "\n" + "Mandatory OPTIONS:\n" + " -i, --interface eth interfaces (comma-separated, no spaces)\n" + " -r, --route SubNet,Intf[,NextHopMAC]\n" + " NextHopMAC can be optional\n" + "\n" + "Optional OPTIONS:\n" + " -s, --style [lpm|hash], ip lookup method\n" + " optional, default as lpm\n" + " -d, --duration Seconds to run and print stats\n" + " optional, default as 0, run forever\n" + " -t, --thread Number of threads to do forwarding\n" + " optional, default as availbe worker cpu count\n" + " -q, --queue Configure rx queue(s) for port\n" + " optional, format: [(port, queue, thread),...]\n" + " for example: -q '(0, 0, 1),(1,0,2)'\n" + " -h, --help Display help and exit.\n\n" + "\n", NO_PATH(progname), NO_PATH(progname) + ); +} + +static void parse_cmdline_args(int argc, char *argv[], app_args_t *args) +{ + int opt; + int long_index; + char *token, *local; + size_t len, route_index = 0; + int i, mem_failure = 0; + + static struct option longopts[] = { + {"interface", required_argument, NULL, 'i'}, /* return 'i' */ + {"route", required_argument, NULL, 'r'}, /* return 'r' */ + {"style", optional_argument, NULL, 's'}, /* return 's' */ + {"duration", optional_argument, NULL, 'd'}, /* return 'd' */ + {"thread", optional_argument, NULL, 't'}, /* return 't' */ + {"queue", optional_argument, NULL, 'q'}, /* return 'q' */ + {"help", no_argument, NULL, 'h'}, /* return 'h' */ + {NULL, 0, NULL, 0} + }; + + while (1) { + opt = getopt_long(argc, argv, "+s:t:d:i:r:q:h", + longopts, &long_index); + + if (opt == -1) + break; /* No more options */ + + switch (opt) { + /* parse ip lookup method */ + case 's': + if (!strcmp(optarg, "hash")) + args->hash_mode = 1; + break; + /* parse number of worker threads to be run*/ + case 't': + i = odp_cpu_count(); + args->worker_count = atoi(optarg); + if (args->worker_count > i) { + printf("Too many threads," + "truncate to cpu count: %d\n", i); + args->worker_count = i; + } + + break; + + /* parse seconds to run */ + case 'd': + args->duration = atoi(optarg); + break; + + /* parse packet-io interface names */ + case 'i': + len = strlen(optarg); + if (len == 0) { + print_usage(argv[0]); + exit(EXIT_FAILURE); + } + len += 1; /* add room for '\0' */ + + local = malloc(len); + if (!local) { + print_usage(argv[0]); + exit(EXIT_FAILURE); + } + + /* count the number of tokens separated by ',' */ + strcpy(local, optarg); + for (token = strtok(local, ","), i = 0; + token != NULL; + token = strtok(NULL, ","), i++) + ; + + if (i == 0) { + print_usage(argv[0]); + free(local); + exit(EXIT_FAILURE); + } else if (i > MAX_NB_PKTIO) { + printf("too many ports specified, " + "truncated to %d", MAX_NB_PKTIO); + } + args->if_count = i; + + /* store the if names (reset names string) */ + strcpy(local, optarg); + for (token = strtok(local, ","), i = 0; + token != NULL; token = strtok(NULL, ","), i++) { + args->if_names[i] = token; + } + break; + + /*Configure Route in forwarding database*/ + case 'r': + if (route_index >= MAX_NB_ROUTE) { + printf("No more routes can be added\n"); + break; + } + local = calloc(1, strlen(optarg) + 1); + if (!local) { + mem_failure = 1; + break; + } + memcpy(local, optarg, strlen(optarg)); + local[strlen(optarg)] = '\0'; + args->route_str[route_index++] = local; + break; + + case 'h': + print_usage(argv[0]); + exit(EXIT_SUCCESS); + break; + + case 'q': + parse_config(optarg, args); + break; + + default: + break; + } + } + + /* checking arguments */ + if (args->if_count == 0) { + printf("\nNo option -i specified.\n"); + goto out; + } + + if (args->route_str[0] == NULL) { + printf("\nNo option -r specified.\n"); + goto out; + } + + if (mem_failure == 1) { + printf("\nAllocate memory failure.\n"); + goto out; + } + optind = 1; /* reset 'extern optind' from the getopt lib */ + return; + +out: + print_usage(argv[0]); + exit(EXIT_FAILURE); +} + +static void print_info(char *progname, app_args_t *args) +{ + int i; + + printf("\n" + "ODP system info\n" + "---------------\n" + "ODP API version: %s\n" + "ODP impl name: %s\n" + "CPU model: %s\n" + "CPU freq (hz): %" PRIu64 "\n" + "Cache line size: %i\n" + "CPU count: %i\n" + "\n", + odp_version_api_str(), odp_version_impl_name(), + odp_cpu_model_str(), odp_cpu_hz_max(), + odp_sys_cache_line_size(), odp_cpu_count()); + + printf("Running ODP appl: \"%s\"\n" + "-----------------\n" + "IP Lookup: %s\n" + "IF Count: %i\n" + "Using IFs: ", + progname, + args->hash_mode ? "hash" : "lpm", + args->if_count); + + for (i = 0; i < args->if_count; ++i) + printf(" %s", args->if_names[i]); + + printf("\n\n"); + fflush(NULL); +} + +/** + * Setup rx and tx queues, distribute them among threads. + * + * If no q argument, the queues are distribute among threads as default. + * The thread take one rx queue of a port one time as round-robin order. + * One txq for each thread on each port + */ +static void setup_worker_qconf(app_args_t *args) +{ + int nb_worker, if_count; + int i, j, rxq_idx; + struct thread_arg_s *arg; + struct l3fwd_pktio_s *port; + uint8_t queue_mask[MAX_NB_PKTIO][MAX_NB_QUEUE]; + + nb_worker = args->worker_count; + if_count = args->if_count; + + /* distribute rx queues among threads as round-robin */ + if (!args->qconf_count) { + if (nb_worker > if_count) { + for (i = 0; i < nb_worker; i++) { + arg = &global.worker_args[i]; + arg->thr_idx = i; + j = i % if_count; + port = &global.l3fwd_pktios[j]; + rxq_idx = arg->pktio[j].nb_rxq; + arg->pktio[j].rxq[rxq_idx] = + port->rxq_idx % port->nb_rxq; + arg->pktio[j].nb_rxq++; + port->rxq_idx++; + } + } else { + for (i = 0; i < if_count; i++) { + j = i % nb_worker; + arg = &global.worker_args[j]; + arg->thr_idx = j; + port = &global.l3fwd_pktios[i]; + rxq_idx = arg->pktio[i].nb_rxq; + arg->pktio[i].rxq[rxq_idx] = + port->rxq_idx % port->nb_rxq; + arg->pktio[i].nb_rxq++; + port->rxq_idx++; + } + } + } + + /* distribute rx queues among threads as q argument */ + memset(queue_mask, 0, sizeof(queue_mask)); + for (i = 0; i < args->qconf_count; i++) { + struct l3fwd_qconf_s *q; + + q = &args->qconf_config[i]; + if (q->core_idx >= nb_worker || q->if_idx >= if_count) + LOG_ABORT("Error queue (%d, %d, %d), max port: " + "%d, max core: %d\n", q->if_idx, q->rxq_idx, + q->core_idx, args->if_count - 1, + args->worker_count - 1); + + /* check if one queue is configured twice or more */ + if (queue_mask[q->if_idx][q->rxq_idx]) + LOG_ABORT("Error queue (%d, %d, %d), reconfig queue\n", + q->if_idx, q->rxq_idx, q->core_idx); + queue_mask[q->if_idx][q->rxq_idx] = 1; + + port = &global.l3fwd_pktios[q->if_idx]; + if (port->rxq_idx < q->rxq_idx) + LOG_ABORT("Error queue (%d, %d, %d), queue should be" + " in sequence and start from 0, queue %d\n", + q->if_idx, q->rxq_idx, q->core_idx, + q->rxq_idx); + + if (q->rxq_idx > port->nb_rxq) { + LOG_ABORT("Error queue (%d, %d, %d), max queue %d\n", + q->if_idx, q->rxq_idx, q->core_idx, + port->nb_rxq - 1); + } + port->rxq_idx = q->rxq_idx + 1; + + /* put the queue into worker_args */ + arg = &global.worker_args[q->core_idx]; + rxq_idx = arg->pktio[q->if_idx].nb_rxq; + arg->pktio[q->if_idx].rxq[rxq_idx] = q->rxq_idx; + arg->pktio[q->if_idx].nb_rxq++; + arg->thr_idx = q->core_idx; + } + + /* distribute tx queues among threads */ + for (i = 0; i < args->worker_count; i++) { + arg = &global.worker_args[i]; + for (j = 0; j < args->if_count; j++) { + port = &global.l3fwd_pktios[j]; + arg->pktio[j].txq_idx = + port->txq_idx % port->nb_txq; + port->txq_idx++; + } + } + + /* config and initialize rx and tx queues. */ + for (i = 0; i < if_count; i++) { + odp_pktin_queue_param_t in_queue_param; + odp_pktout_queue_param_t out_queue_param; + odp_pktin_queue_t *inq; + odp_pktout_queue_t *outq; + const char *name; + int nb_rxq, nb_txq; + + port = &global.l3fwd_pktios[i]; + name = args->if_names[i]; + odp_pktin_queue_param_init(&in_queue_param); + odp_pktout_queue_param_init(&out_queue_param); + + in_queue_param.op_mode = ODP_PKTIO_OP_MT_UNSAFE; + out_queue_param.op_mode = ODP_PKTIO_OP_MT_UNSAFE; + + in_queue_param.hash_enable = 1; + in_queue_param.hash_proto.proto.ipv4 = 1; + in_queue_param.hash_proto.proto.ipv4_tcp = 1; + in_queue_param.hash_proto.proto.ipv4_udp = 1; + + in_queue_param.num_queues = port->rxq_idx; + if (port->rxq_idx > port->nb_rxq) { + in_queue_param.num_queues = port->nb_rxq; + in_queue_param.op_mode = ODP_PKTIO_OP_MT; + } + + if (odp_pktin_queue_config(port->pktio, &in_queue_param)) + LOG_ABORT("Fail to config input queue for port %s\n", + name); + + out_queue_param.num_queues = port->txq_idx; + if (port->txq_idx > port->nb_txq) { + out_queue_param.num_queues = port->nb_txq; + out_queue_param.op_mode = ODP_PKTIO_OP_MT; + } + if (odp_pktout_queue_config(port->pktio, &out_queue_param)) + LOG_ABORT("Fail to config output queue for port %s\n", + name); + + inq = port->ifin; + nb_rxq = in_queue_param.num_queues; + if (odp_pktin_queue(port->pktio, inq, nb_rxq) != nb_rxq) + LOG_ABORT("Fail to set pktin queue for port %s\n", + name); + + outq = port->ifout; + nb_txq = out_queue_param.num_queues; + if (odp_pktout_queue(port->pktio, outq, nb_txq) != nb_txq) + LOG_ABORT("Fail to set pktout queue for port %s\n", + name); + } +} + +static void print_qconf_table(app_args_t *args) +{ + int i, j, k, qid; + char buf[32]; + struct thread_arg_s *thr_arg; + + printf("Rx Queue table\n" + "-----------------\n" + "%-32s%-16s%-16s\n", + "port/id", "rxq", "thread"); + + for (i = 0; i < args->worker_count; i++) { + thr_arg = &global.worker_args[i]; + for (j = 0; j < args->if_count; j++) { + if (!thr_arg->pktio[j].nb_rxq) + continue; + + snprintf(buf, 32, "%s/%d", args->if_names[j], j); + for (k = 0; k < MAX_NB_QUEUE; k++) { + qid = thr_arg->pktio[j].rxq[k]; + if (qid != INVALID_ID) + printf("%-32s%-16d%-16d\n", buf, qid, + thr_arg->thr_idx); + } + } + } + printf("\n"); + fflush(NULL); +} + +/** + * Print statistics + * + * @param num_workers Number of worker threads + * @param duration Number of seconds to loop in + * @param timeout Number of seconds for stats calculation + * + */ +static int print_speed_stats(int num_workers, int duration, int timeout) +{ + uint64_t pkts = 0; + uint64_t pkts_prev = 0; + uint64_t pps; + uint64_t rx_drops, tx_drops; + uint64_t maximum_pps = 0; + int i; + int elapsed = 0; + int stats_enabled = 1; + int loop_forever = (duration == 0); + + if (timeout <= 0) { + stats_enabled = 0; + timeout = 1; + } + /* Wait for all threads to be ready*/ + odp_barrier_wait(&barrier); + + do { + pkts = 0; + rx_drops = 0; + tx_drops = 0; + sleep(timeout); + + for (i = 0; i < num_workers; i++) { + pkts += global.worker_args[i].packets; + rx_drops += global.worker_args[i].rx_drops; + tx_drops += global.worker_args[i].tx_drops; + } + if (stats_enabled) { + pps = (pkts - pkts_prev) / timeout; + if (pps > maximum_pps) + maximum_pps = pps; + printf("%" PRIu64 " pps, %" PRIu64 " max pps, ", pps, + maximum_pps); + + printf(" %" PRIu64 " rx drops, %" PRIu64 " tx drops\n", + rx_drops, tx_drops); + + pkts_prev = pkts; + } + elapsed += timeout; + } while (loop_forever || (elapsed < duration)); + + if (stats_enabled) + printf("TEST RESULT: %" PRIu64 " maximum packets per second.\n", + maximum_pps); + + return pkts > 100 ? 0 : -1; +} + +int main(int argc, char **argv) +{ + odph_odpthread_t thread_tbl[MAX_NB_WORKER]; + odp_pool_t pool; + odp_pool_param_t params; + odp_instance_t instance; + odph_odpthread_params_t thr_params; + odp_cpumask_t cpumask; + int cpu, i, j, nb_worker; + uint8_t mac[ODPH_ETHADDR_LEN]; + uint8_t *dst_mac; + app_args_t *args; + struct thread_arg_s *thr_arg; + char *oif; + + if (odp_init_global(&instance, NULL, NULL)) { + printf("Error: ODP global init failed.\n"); + exit(1); + } + + if (odp_init_local(instance, ODP_THREAD_CONTROL)) { + printf("Error: ODP local init failed.\n"); + exit(1); + } + + /* Clear global argument and initialize the dest mac as 2:0:0:0:0:x */ + memset(&global, 0, sizeof(global)); + mac[0] = 2; + for (i = 0; i < MAX_NB_PKTIO; i++) { + mac[ODPH_ETHADDR_LEN - 1] = (uint8_t)i; + memcpy(global.eth_dest_mac[i].addr, mac, ODPH_ETHADDR_LEN); + } + + /* Initialize the thread arguments */ + for (i = 0; i < MAX_NB_WORKER; i++) { + thr_arg = &global.worker_args[i]; + for (j = 0; j < MAX_NB_PKTIO; j++) { + thr_arg->thr_idx = INVALID_ID; + thr_arg->pktio[j].txq_idx = INVALID_ID; + memset(thr_arg->pktio[j].rxq, INVALID_ID, + sizeof(thr_arg->pktio[j].rxq)); + } + } + + /* Parse cmdline arguments */ + args = &global.cmd_args; + parse_cmdline_args(argc, argv, args); + + /* Init l3fwd table */ + init_fwd_db(); + + /* Add route into table */ + for (i = 0; i < MAX_NB_ROUTE; i++) { + if (args->route_str[i]) { + create_fwd_db_entry(args->route_str[i], &oif, &dst_mac); + if (oif == NULL) { + printf("Error: fail to create route entry.\n"); + exit(1); + } + + j = find_port_id_by_name(oif, args); + if (j == -1) { + printf("Error: port %s not used.\n", oif); + exit(1); + } + + if (dst_mac) + args->dest_mac_changed[j] = 1; + } + } + + print_info(NO_PATH(argv[0]), args); + + /* Create packet pool */ + odp_pool_param_init(&params); + params.pkt.seg_len = POOL_SEG_LEN; + params.pkt.len = POOL_SEG_LEN; + params.pkt.num = POOL_NUM_PKT; + params.type = ODP_POOL_PACKET; + + pool = odp_pool_create("packet pool", &params); + + if (pool == ODP_POOL_INVALID) { + printf("Error: packet pool create failed.\n"); + exit(1); + } + + /* Resolve fwd db*/ + for (i = 0; i < args->if_count; i++) { + struct l3fwd_pktio_s *port; + char *if_name; + + if_name = args->if_names[i]; + port = &global.l3fwd_pktios[i]; + if (create_pktio(if_name, pool, port)) { + printf("Error: create pktio %s\n", if_name); + exit(1); + } + odp_pktio_mac_addr(port->pktio, mac, ODPH_ETHADDR_LEN); + resolve_fwd_db(if_name, i, mac); + memcpy(port->mac_addr.addr, mac, ODPH_ETHADDR_LEN); + } + setup_fwd_db(); + dump_fwd_db(); + + /* Dicide available workers */ + nb_worker = MAX_NB_WORKER; + if (args->worker_count) + nb_worker = args->worker_count; + nb_worker = odp_cpumask_default_worker(&cpumask, nb_worker); + args->worker_count = nb_worker; + + /* Setup rx and tx queues for each port */ + setup_worker_qconf(args); + print_qconf_table(args); + + /* Decide ip lookup method */ + if (args->hash_mode) + global.fwd_func = l3fwd_pkt_hash; + else + global.fwd_func = l3fwd_pkt_lpm; + + /* Start all the available ports */ + for (i = 0; i < args->if_count; i++) { + struct l3fwd_pktio_s *port; + char *if_name; + char buf[32]; + + if_name = args->if_names[i]; + port = &global.l3fwd_pktios[i]; + /* start pktio */ + if (odp_pktio_start(port->pktio)) { + printf("unable to start pktio: %s\n", if_name); + exit(1); + } + + sprintf(buf, "%02x:%02x:%02x:%02x:%02x:%02x", + port->mac_addr.addr[0], + port->mac_addr.addr[1], + port->mac_addr.addr[2], + port->mac_addr.addr[3], + port->mac_addr.addr[4], + port->mac_addr.addr[5]); + printf("start pktio: %s, mac %s\n", if_name, buf); + } + + odp_barrier_init(&barrier, nb_worker + 1); + + memset(&thr_params, 0, sizeof(thr_params)); + thr_params.start = run_worker; + thr_params.thr_type = ODP_THREAD_WORKER; + thr_params.instance = instance; + + memset(thread_tbl, 0, sizeof(thread_tbl)); + cpu = odp_cpumask_first(&cpumask); + for (i = 0; i < nb_worker; i++) { + struct thread_arg_s *arg; + odp_cpumask_t thr_mask; + + arg = &global.worker_args[i]; + arg->nb_pktio = args->if_count; + odp_cpumask_zero(&thr_mask); + odp_cpumask_set(&thr_mask, cpu); + thr_params.arg = arg; + odph_odpthreads_create(&thread_tbl[i], &thr_mask, + &thr_params); + cpu = odp_cpumask_next(&cpumask, cpu); + } + + print_speed_stats(nb_worker, args->duration, PRINT_INTERVAL); + exit_threads = 1; + + /* wait for other threads to join */ + for (i = 0; i < nb_worker; i++) + odph_odpthreads_join(&thread_tbl[i]); + + /* release resource on exit */ + destroy_fwd_db(); + + /* if_names share a single buffer, so only one free */ + free(args->if_names[0]); + + for (i = 0; i < MAX_NB_ROUTE; i++) + free(args->route_str[i]); + + if (odp_pool_destroy(pool)) { + printf("Error: pool destroy\n"); + exit(EXIT_FAILURE); + } + + if (odp_term_local()) { + printf("Error: term local\n"); + exit(EXIT_FAILURE); + } + + if (odp_term_global(instance)) { + printf("Error: term global\n"); + exit(EXIT_FAILURE); + } + + return 0; +} diff --git a/example/l3fwd/odp_l3fwd_db.c b/example/l3fwd/odp_l3fwd_db.c new file mode 100644 index 0000000..b3a237f --- /dev/null +++ b/example/l3fwd/odp_l3fwd_db.c @@ -0,0 +1,432 @@ +/* Copyright (c) 2016, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#ifndef _GNU_SOURCE +#define _GNU_SOURCE +#endif + +#include <stdlib.h> +#include <string.h> + +#include <example_debug.h> +#include <odp_api.h> +#include <odp_l3fwd_db.h> + +/** Jenkins hash support. + * + * Copyright (C) 2006 Bob Jenkins (bob_jenkins(a)burtleburtle.net) + * + * http://burtleburtle.net/bob/hash/ + * + * These are the credits from Bob's sources: + * + * lookup3.c, by Bob Jenkins, May 2006, Public Domain. + * + * These are functions for producing 32-bit hashes for hash table lookup. + * hashword(), hashlittle(), hashlittle2(), hashbig(), mix(), and final() + * are externally useful functions. Routines to test the hash are included + * if SELF_TEST is defined. You can use this free for any purpose. It's in + * the public domain. It has no warranty. + * + * $FreeBSD$ + */ +#define JHASH_GOLDEN_RATIO 0x9e3779b9 +#define rot(x, k) (((x) << (k)) | ((x) >> (32 - (k)))) +#define FWD_BJ3_MIX(a, b, c) \ +{ \ + a -= c; a ^= rot(c, 4); c += b; \ + b -= a; b ^= rot(a, 6); a += c; \ + c -= b; c ^= rot(b, 8); b += a; \ + a -= c; a ^= rot(c, 16); c += b; \ + b -= a; b ^= rot(a, 19); a += c; \ + c -= b; c ^= rot(b, 4); b += a; \ +} + +/** + * Compute hash value from a flow + */ +static inline +uint64_t l3fwd_calc_hash(ipv4_tuple5_t *key) +{ + uint64_t l4_ports = 0; + uint32_t dst_ip, src_ip; + + src_ip = key->src_ip; + dst_ip = key->dst_ip + JHASH_GOLDEN_RATIO; + FWD_BJ3_MIX(src_ip, dst_ip, l4_ports); + + return l4_ports; +} + +/** + * Parse text string representing an IPv4 address or subnet + * + * String is of the format "XXX.XXX.XXX.XXX(/W)" where + * "XXX" is decimal value and "/W" is optional subnet length + * + * @param ipaddress Pointer to IP address/subnet string to convert + * @param addr Pointer to return IPv4 address, host endianness + * @param depth Pointer to subnet bit width + * @return 0 if successful else -1 + */ +static inline +int parse_ipv4_string(char *ipaddress, uint32_t *addr, uint32_t *depth) +{ + int b[4]; + int qualifier = 32; + int converted; + uint32_t addr_le; + + if (strchr(ipaddress, '/')) { + converted = sscanf(ipaddress, "%d.%d.%d.%d/%d", + &b[3], &b[2], &b[1], &b[0], + &qualifier); + if (5 != converted) + return -1; + } else { + converted = sscanf(ipaddress, "%d.%d.%d.%d", + &b[3], &b[2], &b[1], &b[0]); + if (4 != converted) + return -1; + } + + if ((b[0] > 255) || (b[1] > 255) || (b[2] > 255) || (b[3] > 255)) + return -1; + if (!qualifier || (qualifier > 32)) + return -1; + + addr_le = b[0] | b[1] << 8 | b[2] << 16 | b[3] << 24; + *addr = odp_le_to_cpu_32(addr_le); + *depth = qualifier; + + return 0; +} + +/** + * Generate text string representing IPv4 range/subnet, output + * in "XXX.XXX.XXX.XXX/W" format + * + * @param b Pointer to buffer to store string + * @param range Pointer to IPv4 address range + * + * @return Pointer to supplied buffer + */ +static inline +char *ipv4_subnet_str(char *b, ip_addr_range_t *range) +{ + sprintf(b, "%d.%d.%d.%d/%d", + 0xFF & ((range->addr) >> 24), + 0xFF & ((range->addr) >> 16), + 0xFF & ((range->addr) >> 8), + 0xFF & ((range->addr) >> 0), + range->depth); + return b; +} + +/** + * Generate text string representing MAC address + * + * @param b Pointer to buffer to store string + * @param mac Pointer to MAC address + * + * @return Pointer to supplied buffer + */ +static inline +char *mac_addr_str(char *b, odph_ethaddr_t *mac) +{ + uint8_t *byte; + + byte = mac->addr; + sprintf(b, "%02X:%02X:%02X:%02X:%02X:%02X", + byte[0], byte[1], byte[2], byte[3], byte[4], byte[5]); + return b; +} + +/** + * Flow cache table entry + */ +typedef struct flow_entry_s { + ipv4_tuple5_t key; /**< match key */ + struct flow_entry_s *next; /**< next entry on the list */ + fwd_db_entry_t *fwd_entry; /**< entry info in db */ +} flow_entry_t; + +/** + * Flow cache table bucket + */ +typedef struct flow_bucket_s { + odp_spinlock_t lock; /**< Bucket lock*/ + flow_entry_t *next; /**< Pointer to first flow entry in bucket*/ +} flow_bucket_t; + +/** + * Flow hash table, fast lookup cache + */ +typedef struct flow_table_s { + flow_bucket_t *bucket; + uint32_t count; +} flow_table_t; + +static flow_table_t fwd_lookup_cache; + +void init_fwd_hash_cache(void) +{ + odp_shm_t hash_shm; + flow_bucket_t *bucket; + uint32_t bucket_count; + uint32_t i; + + bucket_count = FWD_DEF_BUCKET_COUNT; + + /*Reserve memory for Routing hash table*/ + hash_shm = odp_shm_reserve("route_table", + sizeof(flow_bucket_t) * bucket_count, + ODP_CACHE_LINE_SIZE, 0); + + bucket = odp_shm_addr(hash_shm); + if (!bucket) { + EXAMPLE_ERR("Error: shared mem alloc failed.\n"); + exit(-1); + } + + fwd_lookup_cache.bucket = bucket; + fwd_lookup_cache.count = bucket_count; + + /*Initialize Locks*/ + for (i = 0; i < bucket_count; i++) { + bucket = &fwd_lookup_cache.bucket[i]; + odp_spinlock_init(&bucket->lock); + bucket->next = NULL; + } +} + +static inline +int match_key_flow(ipv4_tuple5_t *key, flow_entry_t *flow) +{ + if (key->src_ip == flow->key.src_ip && + key->dst_ip == flow->key.dst_ip && + key->src_port == flow->key.src_port && + key->dst_port == flow->key.dst_port && + key->proto == flow->key.proto) + return 1; + + return 0; +} + +static inline +flow_entry_t *lookup_fwd_cache(ipv4_tuple5_t *key, flow_bucket_t *bucket) +{ + flow_entry_t *rst; + + for (rst = bucket->next; rst != NULL; rst = rst->next) { + if (match_key_flow(key, rst)) + break; + } + + return rst; +} + +static inline +flow_entry_t *insert_fwd_cache(ipv4_tuple5_t *key, + flow_bucket_t *bucket, + fwd_db_entry_t *entry) +{ + flow_entry_t *flow; + + if (!entry) + return NULL; + + flow = malloc(sizeof(flow_entry_t)); + flow->key = *key; + flow->fwd_entry = entry; + + odp_spinlock_lock(&bucket->lock); + if (!bucket->next) { + bucket->next = flow; + } else { + flow->next = bucket->next; + bucket->next = flow; + } + odp_spinlock_unlock(&bucket->lock); + + return flow; +} + +/** Global pointer to fwd db */ +fwd_db_t *fwd_db; + +void init_fwd_db(void) +{ + odp_shm_t shm; + + shm = odp_shm_reserve("shm_fwd_db", + sizeof(fwd_db_t), + ODP_CACHE_LINE_SIZE, + 0); + + fwd_db = odp_shm_addr(shm); + + if (fwd_db == NULL) { + EXAMPLE_ERR("Error: shared mem alloc failed.\n"); + exit(EXIT_FAILURE); + } + memset(fwd_db, 0, sizeof(*fwd_db)); +} + +int create_fwd_db_entry(char *input, char **oif, uint8_t **dst_mac) +{ + int pos = 0; + char *local; + char *str; + char *save; + char *token; + fwd_db_entry_t *entry = &fwd_db->array[fwd_db->index]; + + *oif = NULL; + *dst_mac = NULL; + + /* Verify we haven't run out of space */ + if (MAX_DB <= fwd_db->index) + return -1; + + /* Make a local copy */ + local = malloc(strlen(input) + 1); + if (NULL == local) + return -1; + strcpy(local, input); + + /* Setup for using "strtok_r" to search input string */ + str = local; + save = NULL; + + /* Parse tokens separated by ',' */ + while (NULL != (token = strtok_r(str, ",", &save))) { + str = NULL; /* reset str for subsequent strtok_r calls */ + + /* Parse token based on its position */ + switch (pos) { + case 0: + parse_ipv4_string(token, + &entry->subnet.addr, + &entry->subnet.depth); + break; + case 1: + strncpy(entry->oif, token, OIF_LEN - 1); + entry->oif[OIF_LEN - 1] = 0; + *oif = entry->oif; + break; + case 2: + odph_eth_addr_parse(&entry->dst_mac, token); + *dst_mac = entry->dst_mac.addr; + break; + + default: + printf("ERROR: extra token \"%s\" at position %d\n", + token, pos); + break; + } + + /* Advance to next position */ + pos++; + } + + /* Add route to the list */ + fwd_db->index++; + entry->next = fwd_db->list; + fwd_db->list = entry; + + free(local); + return 0; +} + +void resolve_fwd_db(char *intf, int portid, uint8_t *mac) +{ + fwd_db_entry_t *entry; + + /* Walk the list and attempt to set output and MAC */ + for (entry = fwd_db->list; NULL != entry; entry = entry->next) { + if (strcmp(intf, entry->oif)) + continue; + + entry->oif_id = portid; + memcpy(entry->src_mac.addr, mac, ODPH_ETHADDR_LEN); + } +} + +void dump_fwd_db_entry(fwd_db_entry_t *entry) +{ + char subnet_str[MAX_STRING]; + char mac_str[MAX_STRING]; + + mac_addr_str(mac_str, &entry->dst_mac); + printf("%-32s%-32s%-16s\n", + ipv4_subnet_str(subnet_str, &entry->subnet), + entry->oif, mac_str); +} + +void dump_fwd_db(void) +{ + fwd_db_entry_t *entry; + + printf("Routing table\n" + "-----------------\n" + "%-32s%-32s%-16s\n", + "subnet", "next_hop", "dest_mac"); + + for (entry = fwd_db->list; NULL != entry; entry = entry->next) + dump_fwd_db_entry(entry); + + printf("\n"); +} + +void destroy_fwd_db(void) +{ + flow_bucket_t *bucket; + flow_entry_t *flow, *tmp; + uint32_t i; + + for (i = 0; i < fwd_lookup_cache.count; i++) { + bucket = &fwd_lookup_cache.bucket[i]; + flow = bucket->next; + odp_spinlock_lock(&bucket->lock); + while (flow) { + tmp = flow->next; + free(flow); + flow = tmp; + } + odp_spinlock_unlock(&bucket->lock); + } +} + +fwd_db_entry_t *find_fwd_db_entry(ipv4_tuple5_t *key) +{ + fwd_db_entry_t *entry; + flow_entry_t *flow; + flow_bucket_t *bucket; + uint64_t hash; + + /* first find in cache */ + hash = l3fwd_calc_hash(key); + hash &= fwd_lookup_cache.count - 1; + bucket = &fwd_lookup_cache.bucket[hash]; + flow = lookup_fwd_cache(key, bucket); + if (flow) + return flow->fwd_entry; + + for (entry = fwd_db->list; NULL != entry; entry = entry->next) { + uint32_t mask; + + mask = ((1u << entry->subnet.depth) - 1) << + (32 - entry->subnet.depth); + + if (entry->subnet.addr == (key->dst_ip & mask)) + break; + } + + insert_fwd_cache(key, bucket, entry); + + return entry; +} diff --git a/example/l3fwd/odp_l3fwd_db.h b/example/l3fwd/odp_l3fwd_db.h new file mode 100644 index 0000000..d9f6d61 --- /dev/null +++ b/example/l3fwd/odp_l3fwd_db.h @@ -0,0 +1,136 @@ +/* Copyright (c) 2016, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#ifndef _ODP_L3FWD_DB_H_ +#define _ODP_L3FWD_DB_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#include <odp_api.h> +#include <odp/helper/eth.h> + +#define OIF_LEN 32 +#define MAX_DB 32 +#define MAX_STRING 32 + +/** + * Default number of flows + */ +#define FWD_DEF_FLOW_COUNT 100000 + +/** + * Default Hash bucket number + */ +#define FWD_DEF_BUCKET_COUNT (FWD_DEF_FLOW_COUNT / 8) + +/** + * IP address range (subnet) + */ +typedef struct ip_addr_range_s { + uint32_t addr; /**< IP address, host endianness */ + uint32_t depth; /**< subnet bit width */ +} ip_addr_range_t; + +/** + * TCP/UDP flow + */ +typedef struct ipv4_tuple5_s { + uint32_t src_ip; + uint32_t dst_ip; + uint16_t src_port; + uint16_t dst_port; + uint8_t proto; +} ipv4_tuple5_t; + +/** + * Forwarding data base entry + */ +typedef struct fwd_db_entry_s { + struct fwd_db_entry_s *next; /**< Next entry on list */ + char oif[OIF_LEN]; /**< Output interface name */ + int oif_id; /**< Output interface idx */ + odph_ethaddr_t src_mac; /**< Output source MAC */ + odph_ethaddr_t dst_mac; /**< Output destination MAC */ + ip_addr_range_t subnet; /**< Subnet for this router */ +} fwd_db_entry_t; + +/** + * Forwarding data base + */ +typedef struct fwd_db_s { + uint32_t index; /**< Next available entry */ + fwd_db_entry_t *list; /**< List of active routes */ + fwd_db_entry_t array[MAX_DB]; /**< Entry storage */ +} fwd_db_t; + +/** Global pointer to fwd db */ +extern fwd_db_t *fwd_db; + +/** + * Initialize FWD DB + */ +void init_fwd_db(void); + +/** + * Initialize forward lookup cache based on hash + */ +void init_fwd_hash_cache(void); + +/** + * Create a forwarding database entry + * + * String is of the format "SubNet,Intf,NextHopMAC" + * + * @param input Pointer to string describing route + * @param oif Pointer to out interface name, as a return value + * @param dst_mac Pointer to dest mac for output packet, as a return value + * + * @return 0 if successful else -1 + */ +int create_fwd_db_entry(char *input, char **oif, uint8_t **dst_mac); + +/** + * Scan FWD DB entries and resolve output queue and source MAC address + * + * @param intf Interface name string + * @param portid Output queue for packet transmit + * @param mac MAC address of this interface + */ +void resolve_fwd_db(char *intf, int portid, uint8_t *mac); + +/** + * Display one forwarding database entry + * + * @param entry Pointer to entry to display + */ +void dump_fwd_db_entry(fwd_db_entry_t *entry); + +/** + * Display the forwarding database + */ +void dump_fwd_db(void); + +/** + * Destroy the forwarding database + */ +void destroy_fwd_db(void); + +/** + * Find a matching forwarding database entry + * + * @param key ipv4 tuple + * + * @return pointer to forwarding DB entry else NULL + */ +fwd_db_entry_t *find_fwd_db_entry(ipv4_tuple5_t *key); + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/example/l3fwd/odp_l3fwd_lpm.c b/example/l3fwd/odp_l3fwd_lpm.c new file mode 100644 index 0000000..65a3389 --- /dev/null +++ b/example/l3fwd/odp_l3fwd_lpm.c @@ -0,0 +1,224 @@ +/* Copyright (c) 2016, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ +#ifndef _GNU_SOURCE +#define _GNU_SOURCE +#endif + +#include <stdio.h> +#include <stdlib.h> + +#include <example_debug.h> +#include <odp_api.h> + +#include <odp_l3fwd_lpm.h> + +/** + * This is a simple implementation of lpm based on patricia tree. + * + * Tradeoff exists between memory consumption and lookup time. + * Currently it prefers 5 levels: {16, 4, 4, 4, 4}, could be 3 + * levels: {16, 8, 8} by defining FIB_NEXT_STRIDE as 8. Other + * levels are also possible. + * + * the ip here is host endian, when doing init or lookup, the + * caller should do endianness conversion if needed. + */ + +#define FIB_IP_WIDTH 32 +#define FIB_FIRST_STRIDE 16 +#define FIB_NEXT_STRIDE 4 +#define FIB_NEXT_SIZE (1 << FIB_NEXT_STRIDE) +#define FIB_SUB_COUNT 16384 +#define DEPTH_TO_MASK(depth) ((1 << (depth)) - 1) + +typedef struct fib_node_s { + union { + uint32_t next_hop; + struct fib_node_s *next; /* next level table */ + }; + uint8_t valid :1; /* 1, this node has a valid next hop */ + uint8_t end :1; /* 0, next points to the extended table */ + uint8_t depth :6; /* bit length of subnet mask */ +} fib_node_t; + +typedef struct fib_sub_tbl_s { + fib_node_t *fib_nodes; + uint32_t fib_count; + uint32_t fib_idx; +} fib_sub_tbl_t; + +static fib_node_t fib_rt_tbl[1 << FIB_FIRST_STRIDE]; +static fib_sub_tbl_t fib_lpm_cache; + +static inline fib_node_t *fib_alloc_sub(void) +{ + fib_node_t *sub_tbl = NULL; + uint32_t i, nb_entry; + + /* extend to next level */ + if (fib_lpm_cache.fib_idx < fib_lpm_cache.fib_count) { + nb_entry = (fib_lpm_cache.fib_idx + 1) * FIB_NEXT_SIZE; + sub_tbl = &fib_lpm_cache.fib_nodes[nb_entry]; + fib_lpm_cache.fib_idx++; + for (i = 0; i < nb_entry; i++) { + sub_tbl[i].valid = 0; + sub_tbl[i].end = 1; + } + } + + return sub_tbl; +} + +static void fib_update_node(fib_node_t *fe, int port, int depth) +{ + fib_node_t *p; + int i; + + if (fe->end) { + if (!fe->valid) { + fe->depth = depth; + fe->next_hop = port; + fe->valid = 1; + } else if (fe->depth <= depth) { + fe->next_hop = port; + fe->depth = depth; + } + + return; + } + + for (i = 0; i < FIB_NEXT_SIZE; i++) { + p = &fe->next[i]; + if (p->end) + fib_update_node(p, port, depth); + } +} + +static void fib_insert_node(fib_node_t *fe, uint32_t ip, uint32_t next_hop, + int ip_width, int eat_bits, int depth) +{ + int i; + uint32_t idx, port; + fib_node_t *p; + + if (fe->end) { + port = fe->next_hop; + p = fib_alloc_sub(); + if (!p) + return; + + fe->next = p; + fe->end = 0; + if (fe->valid) { + for (i = 0; i < FIB_NEXT_SIZE; i++) { + p = &fe->next[i]; + p->next_hop = port; + p->depth = fe->depth; + } + } + } + if (depth - eat_bits <= FIB_NEXT_STRIDE) { + ip_width -= depth - eat_bits; + idx = ip >> ip_width; + ip &= DEPTH_TO_MASK(ip_width); + p = &fe->next[idx]; + fib_update_node(p, next_hop, depth); + } else { + ip_width -= FIB_NEXT_STRIDE; + idx = ip >> ip_width; + p = &fe->next[idx]; + ip &= DEPTH_TO_MASK(ip_width); + eat_bits += FIB_NEXT_STRIDE; + fib_insert_node(p, ip, next_hop, ip_width, eat_bits, depth); + } +} + +void fib_tbl_init(void) +{ + int i; + fib_node_t *fe; + uint32_t size; + odp_shm_t lpm_shm; + + for (i = 0; i < (1 << FIB_FIRST_STRIDE); i++) { + fe = &fib_rt_tbl[i]; + fe->valid = 0; + fe->end = 1; + fe->depth = 0; + fe->next_hop = 0; + } + + size = FIB_NEXT_SIZE * FIB_SUB_COUNT; + /*Reserve memory for Routing hash table*/ + lpm_shm = odp_shm_reserve("fib_lpm_sub", size, ODP_CACHE_LINE_SIZE, 0); + fe = odp_shm_addr(lpm_shm); + if (!fe) { + EXAMPLE_ERR("Error: shared mem alloc failed for lpm cache.\n"); + exit(-1); + } + + fib_lpm_cache.fib_nodes = fe; + fib_lpm_cache.fib_count = FIB_SUB_COUNT; + fib_lpm_cache.fib_idx = 0; +} + +void fib_tbl_insert(uint32_t ip, int port, int depth) +{ + fib_node_t *fe, *p; + uint32_t idx; + int i, j; + int nb_bits; + + nb_bits = FIB_FIRST_STRIDE; + idx = ip >> (FIB_IP_WIDTH - nb_bits); + fe = &fib_rt_tbl[idx]; + if (depth <= nb_bits) { + if (fe->end) { + fe->next_hop = port; + fe->depth = depth; + fe->valid = 1; + return; + } + + for (i = 0; i < FIB_NEXT_SIZE; i++) { + p = &fe->next[i]; + if (p->end) + fib_update_node(p, port, depth); + else + for (j = 0; j < FIB_NEXT_SIZE; j++) + fib_update_node(&p->next[j], port, + depth); + } + + return; + } + + /* need to check sub table */ + ip &= DEPTH_TO_MASK(FIB_IP_WIDTH - nb_bits); + fib_insert_node(fe, ip, port, FIB_IP_WIDTH - nb_bits, nb_bits, depth); +} + +int fib_tbl_lookup(uint32_t ip, int *port) +{ + fib_node_t *fe; + uint32_t idx; + int nb_bits; + + nb_bits = FIB_IP_WIDTH - FIB_FIRST_STRIDE; + idx = ip >> nb_bits; + fe = &fib_rt_tbl[idx]; + + ip &= DEPTH_TO_MASK(nb_bits); + while (!fe->end) { + nb_bits -= FIB_NEXT_STRIDE; + idx = ip >> nb_bits; + fe = &fe->next[idx]; + ip &= DEPTH_TO_MASK(nb_bits); + } + *port = fe->next_hop; + + return fe->valid ? 0 : -1; +} diff --git a/example/l3fwd/odp_l3fwd_lpm.h b/example/l3fwd/odp_l3fwd_lpm.h new file mode 100644 index 0000000..9256642 --- /dev/null +++ b/example/l3fwd/odp_l3fwd_lpm.h @@ -0,0 +1,20 @@ +/* Copyright (c) 2016, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#ifndef _ODP_L3FWD_LPM_H_ +#define _ODP_L3FWD_LPM_H_ + +#ifdef __cplusplus +extern "C" { +#endif +void fib_tbl_init(void); +void fib_tbl_insert(uint32_t ip, int port, int depth); +int fib_tbl_lookup(uint32_t ip, int *port); +#ifdef __cplusplus +} +#endif + +#endif diff --git a/example/m4/configure.m4 b/example/m4/configure.m4 index bbda38f..620db04 100644 --- a/example/m4/configure.m4 +++ b/example/m4/configure.m4 @@ -12,12 +12,13 @@ AC_ARG_ENABLE([test-example], AC_CONFIG_FILES([example/classifier/Makefile example/generator/Makefile + example/hello/Makefile example/ipsec/Makefile - example/Makefile + example/l2fwd_simple/Makefile + example/l3fwd/Makefile example/packet/Makefile + example/switch/Makefile example/time/Makefile example/timer/Makefile example/traffic_mgmt/Makefile - example/l2fwd_simple/Makefile - example/switch/Makefile - example/hello/Makefile]) + example/Makefile]) ----------------------------------------------------------------------- Summary of changes: example/Makefile.am | 12 +- example/l3fwd/.gitignore | 1 + example/l3fwd/Makefile.am | 20 + example/l3fwd/odp_l3fwd.c | 1086 ++++++++++++++++++++ example/l3fwd/odp_l3fwd_db.c | 494 +++++++++ example/l3fwd/odp_l3fwd_db.h | 141 +++ example/l3fwd/odp_l3fwd_lpm.c | 224 ++++ .../cpu_arch.h => example/l3fwd/odp_l3fwd_lpm.h | 14 +- example/l3fwd/odp_l3fwd_run.sh | 28 + example/{l2fwd_simple => l3fwd}/udp64.pcap | Bin example/m4/configure.m4 | 9 +- 11 files changed, 2015 insertions(+), 14 deletions(-) create mode 100644 example/l3fwd/.gitignore create mode 100644 example/l3fwd/Makefile.am create mode 100644 example/l3fwd/odp_l3fwd.c create mode 100644 example/l3fwd/odp_l3fwd_db.c create mode 100644 example/l3fwd/odp_l3fwd_db.h create mode 100644 example/l3fwd/odp_l3fwd_lpm.c copy platform/linux-generic/arch/powerpc/odp/api/cpu_arch.h => example/l3fwd/odp_l3fwd_lpm.h (52%) create mode 100755 example/l3fwd/odp_l3fwd_run.sh copy example/{l2fwd_simple => l3fwd}/udp64.pcap (100%) hooks/post-receive --

8 years, 9 months

[COMMIT] branch api-next updated. v1.10.1.0-160-g645e5cc

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, api-next has been updated via 645e5ccf90c00c634c29fbb4276a8875699d8893 (commit) via be6d2d4f3de94cc314d2367f76432306f4c88b94 (commit) via 95b2d51738e97067f2e2423a83dd077b34c51b8f (commit) via ffda91e73c9153d7a7b7d7948de2f902c261d36e (commit) via 40fb071be7c22776a190d1c7fa32b100510e2b82 (commit) via 6e95b8923cd013f9db4d7198a2add5cc4cdc9e28 (commit) from 8cc7373f536b86ca56a080f4a4bb67edd03bded3 (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 645e5ccf90c00c634c29fbb4276a8875699d8893 Merge: 8cc7373 be6d2d4 Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Fri Sep 2 11:38:37 2016 +0300 Merge branch 'master' into api-next Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/include/odp_packet_dpdk.h | 2 +- platform/linux-generic/odp_pkt_queue.c | 12 ++--- platform/linux-generic/odp_traffic_mngr.c | 26 +++++----- platform/linux-generic/pktio/dpdk.c | 56 ++++++++++++---------- test/common_plat/performance/odp_scheduling.c | 2 +- test/common_plat/performance/odp_scheduling_run.sh | 6 ++- .../performance/odp_scheduling_run_proc.sh | 6 ++- 7 files changed, 60 insertions(+), 50 deletions(-) hooks/post-receive --

8 years, 9 months

[COMMIT] branch master updated. v1.10.1.0-100-gbe6d2d4

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 be6d2d4f3de94cc314d2367f76432306f4c88b94 (commit) via 95b2d51738e97067f2e2423a83dd077b34c51b8f (commit) via ffda91e73c9153d7a7b7d7948de2f902c261d36e (commit) from 40fb071be7c22776a190d1c7fa32b100510e2b82 (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 be6d2d4f3de94cc314d2367f76432306f4c88b94 Author: Matias Elo <matias.elo(a)nokia.com> Date: Wed Aug 31 17:24:08 2016 +0300 linux-gen: dpdk: move rx/tx locks Protect only the required sections of rx/tx functions. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-and-tested-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c index 99eb868..11f3509 100644 --- a/platform/linux-generic/pktio/dpdk.c +++ b/platform/linux-generic/pktio/dpdk.c @@ -912,6 +912,9 @@ static int dpdk_recv(pktio_entry_t *pktio_entry, int index, rx_mbufs, num); } + if (!pkt_dpdk->lockless_rx) + odp_ticketlock_unlock(&pkt_dpdk->rx_lock[index]); + if (nb_rx > 0) { if (pktio_entry->s.config.pktin.bit.ts_all || pktio_entry->s.config.pktin.bit.ts_ptp) { @@ -922,9 +925,6 @@ static int dpdk_recv(pktio_entry_t *pktio_entry, int index, ts); } - if (!pktio_entry->s.pkt_dpdk.lockless_rx) - odp_ticketlock_unlock(&pkt_dpdk->rx_lock[index]); - return nb_rx; } @@ -940,14 +940,17 @@ static int dpdk_send(pktio_entry_t *pktio_entry, int index, if (odp_unlikely(pktio_entry->s.state != PKTIO_STATE_STARTED)) return 0; - if (!pktio_entry->s.pkt_dpdk.lockless_tx) - odp_ticketlock_lock(&pkt_dpdk->tx_lock[index]); - mbufs = pkt_to_mbuf(pktio_entry, tx_mbufs, pkt_table, num); + if (!pkt_dpdk->lockless_tx) + odp_ticketlock_lock(&pkt_dpdk->tx_lock[index]); + tx_pkts = rte_eth_tx_burst(pkt_dpdk->port_id, index, tx_mbufs, mbufs); + if (!pkt_dpdk->lockless_tx) + odp_ticketlock_unlock(&pkt_dpdk->tx_lock[index]); + if (odp_unlikely(tx_pkts < num)) { for (i = tx_pkts; i < mbufs; i++) rte_pktmbuf_free(tx_mbufs[i]); @@ -955,9 +958,6 @@ static int dpdk_send(pktio_entry_t *pktio_entry, int index, odp_packet_free_multi(pkt_table, tx_pkts); - if (!pktio_entry->s.pkt_dpdk.lockless_tx) - odp_ticketlock_unlock(&pkt_dpdk->tx_lock[index]); - if (odp_unlikely(tx_pkts == 0 && __odp_errno != 0)) return -1; commit 95b2d51738e97067f2e2423a83dd077b34c51b8f Author: Matias Elo <matias.elo(a)nokia.com> Date: Wed Aug 31 17:24:07 2016 +0300 linux-gen: dpdk: bulk alloc mbufs in tx Bulk alloc mbufs in dpdk_send(). Combined with dpdk mempool cache size increase this improves odp_l2fwd throughput by 5-10 %. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-and-tested-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/include/odp_packet_dpdk.h b/platform/linux-generic/include/odp_packet_dpdk.h index 31e1ed7..c63685e 100644 --- a/platform/linux-generic/include/odp_packet_dpdk.h +++ b/platform/linux-generic/include/odp_packet_dpdk.h @@ -20,7 +20,7 @@ #define DPDK_MEMORY_MB 512 #define DPDK_NB_MBUF 16384 #define DPDK_MBUF_BUF_SIZE RTE_MBUF_DEFAULT_BUF_SIZE -#define DPDK_MEMPOOL_CACHE_SIZE 32 +#define DPDK_MEMPOOL_CACHE_SIZE 64 #define DPDK_NM_RX_DESC 128 #define DPDK_NM_TX_DESC 512 diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c index 0a800b7..99eb868 100644 --- a/platform/linux-generic/pktio/dpdk.c +++ b/platform/linux-generic/pktio/dpdk.c @@ -826,36 +826,36 @@ static inline int pkt_to_mbuf(pktio_entry_t *pktio_entry, const odp_packet_t pkt_table[], uint16_t num) { pkt_dpdk_t *pkt_dpdk = &pktio_entry->s.pkt_dpdk; - int i; + int i, j; char *data; uint16_t pkt_len; + if (odp_unlikely((rte_pktmbuf_alloc_bulk(pkt_dpdk->pkt_pool, + mbuf_table, num)))) { + ODP_ERR("Failed to alloc mbuf\n"); + return 0; + } for (i = 0; i < num; i++) { pkt_len = odp_packet_len(pkt_table[i]); if (pkt_len > pkt_dpdk->mtu) { if (i == 0) __odp_errno = EMSGSIZE; - break; - } - - mbuf_table[i] = rte_pktmbuf_alloc(pkt_dpdk->pkt_pool); - if (mbuf_table[i] == NULL) { - ODP_ERR("Failed to alloc mbuf\n"); - break; + goto fail; } + /* Packet always fits in mbuf */ data = rte_pktmbuf_append(mbuf_table[i], pkt_len); - if (data == NULL) { - ODP_ERR("Failed to append mbuf\n"); - rte_pktmbuf_free(mbuf_table[i]); - break; - } - odp_packet_copy_to_mem(pkt_table[i], 0, pkt_len, data); } return i; + +fail: + for (j = i; j < num; j++) + rte_pktmbuf_free(mbuf_table[j]); + + return i; } static int dpdk_recv(pktio_entry_t *pktio_entry, int index, commit ffda91e73c9153d7a7b7d7948de2f902c261d36e Author: Matias Elo <matias.elo(a)nokia.com> Date: Wed Aug 31 17:24:06 2016 +0300 linux-gen: dpdk: fix buffer freeing in mbuf_to_pkt() Free dpdk mbufs and odp packets correctly when packet_alloc_multi() isn't able to allocate all requested packets. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-and-tested-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c index b45c9a8..0a800b7 100644 --- a/platform/linux-generic/pktio/dpdk.c +++ b/platform/linux-generic/pktio/dpdk.c @@ -755,6 +755,12 @@ static inline int mbuf_to_pkt(pktio_entry_t *pktio_entry, alloc_len = pktio_entry->s.pkt_dpdk.data_room; num = packet_alloc_multi(pool, alloc_len, pkt_table, mbuf_num); + if (num != mbuf_num) { + ODP_DBG("packet_alloc_multi() unable to allocate all packets: " + "%d/%" PRIu16 " allocated\n", num, mbuf_num); + for (i = num; i < mbuf_num; i++) + rte_pktmbuf_free(mbuf_table[i]); + } for (i = 0; i < num; i++) { odp_packet_hdr_t parsed_hdr; @@ -807,9 +813,9 @@ static inline int mbuf_to_pkt(pktio_entry_t *pktio_entry, return nb_pkts; fail: - odp_packet_free_multi(&pkt_table[i], mbuf_num - i); + odp_packet_free_multi(&pkt_table[i], num - i); - for (j = i; j < mbuf_num; j++) + for (j = i; j < num; j++) rte_pktmbuf_free(mbuf_table[j]); return (i > 0 ? i : -1); ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/include/odp_packet_dpdk.h | 2 +- platform/linux-generic/pktio/dpdk.c | 56 +++++++++++++----------- 2 files changed, 32 insertions(+), 26 deletions(-) hooks/post-receive --

8 years, 9 months

[COMMIT] branch master updated. v1.10.1.0-97-g40fb071

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 40fb071be7c22776a190d1c7fa32b100510e2b82 (commit) from 6e95b8923cd013f9db4d7198a2add5cc4cdc9e28 (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 40fb071be7c22776a190d1c7fa32b100510e2b82 Author: Mike Holmes <mike.holmes(a)linaro.org> Date: Mon Aug 29 12:15:50 2016 -0400 test: perf: add prime num threads to odp_scheduling A recent bug showed the limitations of using powers of two, add a prime number of threads as a new test case. Signed-off-by: Mike Holmes <mike.holmes(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/common_plat/performance/odp_scheduling.c b/test/common_plat/performance/odp_scheduling.c index 1de79f7..9407636 100644 --- a/test/common_plat/performance/odp_scheduling.c +++ b/test/common_plat/performance/odp_scheduling.c @@ -723,7 +723,7 @@ static void print_usage(void) { printf("\n\nUsage: ./odp_example [options]\n"); printf("Options:\n"); - printf(" -c, --count <number> CPU count\n"); + printf(" -c, --count <number> CPU count, 0=all available, default=0\n"); printf(" -h, --help this help\n"); printf(" -f, --fair collect fairness statistics\n"); printf("\n\n"); diff --git a/test/common_plat/performance/odp_scheduling_run.sh b/test/common_plat/performance/odp_scheduling_run.sh index 755b0c1..a22326d 100755 --- a/test/common_plat/performance/odp_scheduling_run.sh +++ b/test/common_plat/performance/odp_scheduling_run.sh @@ -10,16 +10,20 @@ TEST_DIR="${TEST_DIR:-$(dirname $0)}" ret=0 +ALL=0 run() { - echo odp_scheduling_run starts with $1 worker threads + echo odp_scheduling_run starts requesting $1 worker threads echo =============================================== $TEST_DIR/odp_scheduling${EXEEXT} -c $1 || ret=1 } run 1 +run 5 run 8 +run 11 +run $ALL exit $ret diff --git a/test/linux-generic/performance/odp_scheduling_run_proc.sh b/test/linux-generic/performance/odp_scheduling_run_proc.sh index b3ef26f..384017a 100755 --- a/test/linux-generic/performance/odp_scheduling_run_proc.sh +++ b/test/linux-generic/performance/odp_scheduling_run_proc.sh @@ -11,16 +11,20 @@ TEST_DIR="${TEST_DIR:-$(dirname $0)}" PERFORMANCE="$TEST_DIR/../../common_plat/performance" ret=0 +ALL=0 run() { - echo odp_scheduling_run_proc starts with $1 worker threads + echo odp_scheduling_run starts requesting $1 worker threads echo ===================================================== $PERFORMANCE/odp_scheduling${EXEEXT} --odph_proc -c $1 || ret=1 } run 1 +run 5 run 8 +run 11 +run $ALL exit $ret ----------------------------------------------------------------------- Summary of changes: test/common_plat/performance/odp_scheduling.c | 2 +- test/common_plat/performance/odp_scheduling_run.sh | 6 +++++- test/linux-generic/performance/odp_scheduling_run_proc.sh | 6 +++++- 3 files changed, 11 insertions(+), 3 deletions(-) hooks/post-receive --

8 years, 10 months

[COMMIT] branch master updated. v1.10.1.0-96-g6e95b89

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 6e95b8923cd013f9db4d7198a2add5cc4cdc9e28 (commit) from 972fef8f7202cc90e14d83a217fa19999fac0489 (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 6e95b8923cd013f9db4d7198a2add5cc4cdc9e28 Author: Barry Spinney <spinney(a)mellanox.com> Date: Tue Aug 23 17:51:45 2016 -0400 linux-generic: tm: fix off by 1 bug accessing queue_num_tbl Both odp_pkt_queue.c and odp_traffic_mngr.c has similar bugs where an array was malloc'd but the valid indicies run from 1 to the number of entries malloc'd. This is because queue_num == 0 is used as a special value indicating an invalid queue_num. The value 0 is used for this same special purpose throughout the traffic mngr. The fix involved using "queue_num - 1" as the array index, but only after checking that queue_num is not 0. Also in a few cases a common function used to get and check the queue_num was used in a few more cases. Signed-off-by: Barry Spinney <spinney(a)mellanox.com> Reviewed-and-tested-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/odp_pkt_queue.c b/platform/linux-generic/odp_pkt_queue.c index 7734ee9..7c6cd87 100644 --- a/platform/linux-generic/odp_pkt_queue.c +++ b/platform/linux-generic/odp_pkt_queue.c @@ -92,7 +92,7 @@ static int pkt_queue_free_list_add(queue_pool_t *pool, queue_blks_t *queue_blks; queue_blk_t *queue_blk; uint32_t which_region, blks_added, num_blks, start_idx; - uint32_t malloc_len, blks_to_add, cnt; + uint32_t malloc_len, blks_to_add, cnt, i; which_region = pool->current_region; blks_added = 0; @@ -102,7 +102,6 @@ static int pkt_queue_free_list_add(queue_pool_t *pool, num_blks = region_desc->num_blks; queue_blks = region_desc->queue_blks; if (!queue_blks) { - uint32_t i; malloc_len = num_blks * sizeof(queue_blk_t); queue_blks = malloc(malloc_len); @@ -263,13 +262,13 @@ int _odp_pkt_queue_append(_odp_int_queue_pool_t queue_pool, return -3; pool->total_pkt_appends++; - first_blk_idx = pool->queue_num_tbl[queue_num]; + first_blk_idx = pool->queue_num_tbl[queue_num - 1]; if (first_blk_idx == 0) { first_blk = queue_blk_alloc(pool, &first_blk_idx); if (!first_blk) return -1; - pool->queue_num_tbl[queue_num] = first_blk_idx; + pool->queue_num_tbl[queue_num - 1] = first_blk_idx; init_queue_blk(first_blk); first_blk->pkts[0] = pkt; return 0; @@ -316,7 +315,7 @@ int _odp_pkt_queue_remove(_odp_int_queue_pool_t queue_pool, if ((queue_num == 0) || (pool->max_queue_num < queue_num)) return -2; - first_blk_idx = pool->queue_num_tbl[queue_num]; + first_blk_idx = pool->queue_num_tbl[queue_num - 1]; if (first_blk_idx == 0) return 0; /* pkt queue is empty. */ @@ -344,7 +343,8 @@ int _odp_pkt_queue_remove(_odp_int_queue_pool_t queue_pool, first_blk->tail_queue_blk_idx; } - pool->queue_num_tbl[queue_num] = next_blk_idx; + pool->queue_num_tbl[queue_num - 1] = + next_blk_idx; queue_blk_free(pool, first_blk, first_blk_idx); } diff --git a/platform/linux-generic/odp_traffic_mngr.c b/platform/linux-generic/odp_traffic_mngr.c index a5271ed..4fe07ef 100644 --- a/platform/linux-generic/odp_traffic_mngr.c +++ b/platform/linux-generic/odp_traffic_mngr.c @@ -109,7 +109,7 @@ static tm_queue_obj_t *get_tm_queue_obj(tm_system_t *tm_system, return NULL; queue_num = pkt_desc->queue_num; - tm_queue_obj = tm_system->queue_num_tbl[queue_num]; + tm_queue_obj = tm_system->queue_num_tbl[queue_num - 1]; return tm_queue_obj; } @@ -1596,11 +1596,10 @@ static odp_bool_t tm_consume_sent_pkt(tm_system_t *tm_system, tm_queue_obj_t *tm_queue_obj; odp_packet_t pkt; pkt_desc_t *new_pkt_desc; - uint32_t queue_num, pkt_len; + uint32_t pkt_len; int rc; - queue_num = sent_pkt_desc->queue_num; - tm_queue_obj = tm_system->queue_num_tbl[queue_num]; + tm_queue_obj = get_tm_queue_obj(tm_system, sent_pkt_desc); if (!tm_queue_obj) return false; @@ -2088,15 +2087,11 @@ static void tm_send_pkt(tm_system_t *tm_system, uint32_t max_sends) tm_queue_obj_t *tm_queue_obj; odp_packet_t odp_pkt; pkt_desc_t *pkt_desc; - uint32_t cnt, queue_num; + uint32_t cnt; for (cnt = 1; cnt <= max_sends; cnt++) { pkt_desc = &tm_system->egress_pkt_desc; - queue_num = pkt_desc->queue_num; - if (queue_num == 0) - return; - - tm_queue_obj = tm_system->queue_num_tbl[queue_num]; + tm_queue_obj = get_tm_queue_obj(tm_system, pkt_desc); if (!tm_queue_obj) return; @@ -2149,7 +2144,8 @@ static int tm_process_input_work_queue(tm_system_t *tm_system, return rc; } - tm_queue_obj = tm_system->queue_num_tbl[work_item.queue_num]; + tm_queue_obj = + tm_system->queue_num_tbl[work_item.queue_num - 1]; pkt = work_item.pkt; if (!tm_queue_obj) { odp_packet_free(pkt); @@ -2204,7 +2200,7 @@ static int tm_process_expired_timers(tm_system_t *tm_system, queue_num = (timer_context & 0xFFFFFFFF) >> 4; timer_seq = timer_context >> 32; - tm_queue_obj = tm_system->queue_num_tbl[queue_num]; + tm_queue_obj = tm_system->queue_num_tbl[queue_num - 1]; if (!tm_queue_obj) return work_done; @@ -3904,7 +3900,7 @@ odp_tm_queue_t odp_tm_queue_create(odp_tm_t odp_tm, tm_queue_obj->tm_qentry.s.enqueue = queue_tm_reenq; tm_queue_obj->tm_qentry.s.enqueue_multi = queue_tm_reenq_multi; - tm_system->queue_num_tbl[tm_queue_obj->queue_num] = tm_queue_obj; + tm_system->queue_num_tbl[tm_queue_obj->queue_num - 1] = tm_queue_obj; odp_ticketlock_lock(&tm_system->tm_system_lock); if (params->shaper_profile != ODP_TM_INVALID) tm_shaper_config_set(tm_system, params->shaper_profile, @@ -3972,7 +3968,7 @@ int odp_tm_queue_destroy(odp_tm_queue_t tm_queue) /* Now that all of the checks are done, time to so some freeing. */ odp_ticketlock_lock(&tm_system->tm_system_lock); - tm_system->queue_num_tbl[tm_queue_obj->queue_num] = NULL; + tm_system->queue_num_tbl[tm_queue_obj->queue_num - 1] = NULL; /* First delete any associated tm_wred_node and then the tm_queue_obj * itself */ @@ -4634,7 +4630,7 @@ void odp_tm_stats_print(odp_tm_t odp_tm) max_queue_num = tm_system->next_queue_num; for (queue_num = 1; queue_num < max_queue_num; queue_num++) { - tm_queue_obj = tm_system->queue_num_tbl[queue_num]; + tm_queue_obj = tm_system->queue_num_tbl[queue_num - 1]; if (tm_queue_obj && tm_queue_obj->pkts_rcvd_cnt != 0) ODP_DBG("queue_num=%u priority=%u rcvd=%u enqueued=%u " "dequeued=%u consumed=%u\n", ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/odp_pkt_queue.c | 12 ++++++------ platform/linux-generic/odp_traffic_mngr.c | 26 +++++++++++--------------- 2 files changed, 17 insertions(+), 21 deletions(-) hooks/post-receive --

8 years, 10 months

[COMMIT] branch next updated. v1.10.1.0-95-g972fef8

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, next has been updated via 972fef8f7202cc90e14d83a217fa19999fac0489 (commit) via 99b5da310aded4ed933c848c11e00046c8aed766 (commit) via 7528454aaab5c21356631515faf63117dbb9a66b (commit) via f11a255716190184f8eaeef1888fd5b82773aa66 (commit) via 84bc9a4cdc3569f79d894f4644a4e0051155be24 (commit) via 35af07b2469e9f41769648b2d17b7d2be52ee270 (commit) from e5492930c13b8b17a6333050fd5078c89b305c17 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: DEPENDENCIES | 4 +-- doc/process-guide/release-guide.adoc | 52 +++++++++++++++++++++++++++ example/l2fwd_simple/l2fwd_simple_run.sh | 6 ++-- example/l2fwd_simple/odp_l2fwd_simple.c | 39 ++++++++++++++++++-- platform/linux-generic/pktio/dpdk.c | 51 +++++++++++++++++++++----- platform/linux-generic/pktio/socket_mmap.c | 1 - scripts/build-pktio-dpdk | 3 +- test/common_plat/performance/odp_scheduling.c | 12 +++---- 8 files changed, 142 insertions(+), 26 deletions(-) hooks/post-receive --

8 years, 10 months

[COMMIT] branch api-next updated. v1.10.1.0-154-g8cc7373

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, api-next has been updated via 8cc7373f536b86ca56a080f4a4bb67edd03bded3 (commit) via 972fef8f7202cc90e14d83a217fa19999fac0489 (commit) via 99b5da310aded4ed933c848c11e00046c8aed766 (commit) via 7528454aaab5c21356631515faf63117dbb9a66b (commit) via f11a255716190184f8eaeef1888fd5b82773aa66 (commit) via 84bc9a4cdc3569f79d894f4644a4e0051155be24 (commit) via 35af07b2469e9f41769648b2d17b7d2be52ee270 (commit) from 9fcbfb975cdc500bf18117c31f54d2c9f77079c4 (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 8cc7373f536b86ca56a080f4a4bb67edd03bded3 Merge: 9fcbfb9 972fef8 Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Mon Aug 22 17:21:24 2016 +0300 Merge branch 'master' into api-next ----------------------------------------------------------------------- Summary of changes: DEPENDENCIES | 4 +-- doc/process-guide/release-guide.adoc | 52 +++++++++++++++++++++++++++ example/l2fwd_simple/l2fwd_simple_run.sh | 6 ++-- example/l2fwd_simple/odp_l2fwd_simple.c | 39 ++++++++++++++++++-- platform/linux-generic/pktio/dpdk.c | 51 +++++++++++++++++++++----- platform/linux-generic/pktio/socket_mmap.c | 1 - scripts/build-pktio-dpdk | 3 +- test/common_plat/performance/odp_scheduling.c | 12 +++---- 8 files changed, 142 insertions(+), 26 deletions(-) hooks/post-receive --

8 years, 10 months

[COMMIT] branch api-next updated. v1.10.1.0-147-g9fcbfb9

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, api-next has been updated via 9fcbfb975cdc500bf18117c31f54d2c9f77079c4 (commit) from a8d5848de4cd79122ebb2a831d465e05b77e52a3 (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 9fcbfb975cdc500bf18117c31f54d2c9f77079c4 Author: Christophe Milard <christophe.milard(a)linaro.org> Date: Sat Aug 20 00:24:31 2016 +0200 drv: byteorder: added bitfield order mostly to keep the symmetry with the API side Signed-off-by: Christophe Milard <christophe.milard(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/include/odp/drv/spec/byteorder.h b/include/odp/drv/spec/byteorder.h index d3f5d7e..bf363f5 100644 --- a/include/odp/drv/spec/byteorder.h +++ b/include/odp/drv/spec/byteorder.h @@ -38,6 +38,9 @@ extern "C" { * * @def ODPDRV_BYTE_ORDER * Selected byte order + * + * @def ODPDRV_BITFIELD_ORDER + * Selected bitfield order */ /** diff --git a/platform/linux-generic/include/odp/drv/plat/byteorder_types.h b/platform/linux-generic/include/odp/drv/plat/byteorder_types.h index cb7aec2..5dd182d 100644 --- a/platform/linux-generic/include/odp/drv/plat/byteorder_types.h +++ b/platform/linux-generic/include/odp/drv/plat/byteorder_types.h @@ -49,12 +49,16 @@ extern "C" { #define ODPDRV_LITTLE_ENDIAN 1 #define ODPDRV_BIG_ENDIAN 0 #define ODPDRV_BYTE_ORDER ODPDRV_LITTLE_ENDIAN - #define ODPDRV_LITTLE_ENDIAN_BITFIELD + #define ODPDRV_LITTLE_ENDIAN_BITFIELD 1 + #define ODPDRV_BIG_ENDIAN_BITFIELD 0 + #define ODPDRV_BITFIELD_ORDER ODPDRV_LITTLE_ENDIAN_BITFIELD #else #define ODPDRV_LITTLE_ENDIAN 0 #define ODPDRV_BIG_ENDIAN 1 - #define ODPDRV_BYTE_ORDER ODP_BIG_ENDIAN - #define ODPDRV_BIG_ENDIAN_BITFIELD + #define ODPDRV_BYTE_ORDER ODPDRV_BIG_ENDIAN + #define ODPDRV_LITTLE_ENDIAN_BITFIELD 0 + #define ODPDRV_BIG_ENDIAN_BITFIELD 1 + #define ODPDRV_BITFIELD_ORDER ODPDRV_BIG_ENDIAN_BITFIELD #endif typedef uint16_t __odpdrv_bitwise odpdrv_u16le_t; ----------------------------------------------------------------------- Summary of changes: include/odp/drv/spec/byteorder.h | 3 +++ platform/linux-generic/include/odp/drv/plat/byteorder_types.h | 10 +++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) hooks/post-receive --

8 years, 10 months

[COMMIT] branch master updated. v1.10.1.0-95-g972fef8

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 972fef8f7202cc90e14d83a217fa19999fac0489 (commit) via 99b5da310aded4ed933c848c11e00046c8aed766 (commit) from 7528454aaab5c21356631515faf63117dbb9a66b (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 972fef8f7202cc90e14d83a217fa19999fac0489 Author: Matias Elo <matias.elo(a)nokia.com> Date: Wed Aug 17 12:59:21 2016 +0300 linux-gen: dpdk: free used mempool when closing pktio device DPDK 16.07 finally supports freeing memory pools. Signed-off-by: Matias Elo <matias.elo(a)nokia.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/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c index bf8b499..b45c9a8 100644 --- a/platform/linux-generic/pktio/dpdk.c +++ b/platform/linux-generic/pktio/dpdk.c @@ -390,6 +390,8 @@ static int dpdk_close(pktio_entry_t *pktio_entry) if (pktio_entry->s.state != PKTIO_STATE_OPENED) rte_eth_dev_close(pkt_dpdk->port_id); + rte_mempool_free(pkt_dpdk->pkt_pool); + return 0; } @@ -650,14 +652,9 @@ static int dpdk_open(odp_pktio_t id ODP_UNUSED, else pkt_dpdk->min_rx_burst = 0; - /* Look for previously opened packet pool */ - pkt_pool = rte_mempool_lookup(pkt_dpdk->pool_name); - if (pkt_pool == NULL) - pkt_pool = rte_pktmbuf_pool_create(pkt_dpdk->pool_name, - DPDK_NB_MBUF, - DPDK_MEMPOOL_CACHE_SIZE, 0, - DPDK_MBUF_BUF_SIZE, - rte_socket_id()); + pkt_pool = rte_pktmbuf_pool_create(pkt_dpdk->pool_name, DPDK_NB_MBUF, + DPDK_MEMPOOL_CACHE_SIZE, 0, + DPDK_MBUF_BUF_SIZE, rte_socket_id()); if (pkt_pool == NULL) { ODP_ERR("Cannot init mbuf packet pool\n"); return -1; commit 99b5da310aded4ed933c848c11e00046c8aed766 Author: Matias Elo <matias.elo(a)nokia.com> Date: Wed Aug 17 12:59:20 2016 +0300 linux-gen: dpdk: bump target dpdk version to 16.07 Change target dpdk version to 16.07 and add init functions for the new drivers. Update dpdk build script. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Signed-off-by: Zoltan Kiss <zoltan.kiss(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/DEPENDENCIES b/DEPENDENCIES index a5266c9..f1f0edd 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -165,7 +165,7 @@ Prerequisites for building the OpenDataPlane (ODP) API 3.4.1 Building DPDK and ODP with DPDK pktio support - DPDK packet I/O has been tested to work with DPDK v16.04. + DPDK packet I/O has been tested to work with DPDK v16.07. Follow steps in ./scripts/build-pktio-dpdk @@ -179,7 +179,7 @@ Prerequisites for building the OpenDataPlane (ODP) API Reserve and mount hugepages and bind supported interfaces to DPDK modules following the DPDK documentation. ODP DPDK packet I/O has been tested with 512 x 2MB hugepages. All this can be done with the DPDK setup script - (<dpdk-dir>/tools/setup.sh). + (<dpdk-dir>/tools/dpdk-setup.sh). 3.4.3 Running ODP with DPDK pktio diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c index 1fad8a9..bf8b499 100644 --- a/platform/linux-generic/pktio/dpdk.c +++ b/platform/linux-generic/pktio/dpdk.c @@ -36,12 +36,14 @@ extern void devinitfn_##drv(void) PMD_EXT(aesni_gcm_pmd_drv); PMD_EXT(cryptodev_aesni_mb_pmd_drv); +PMD_EXT(cryptodev_kasumi_pmd_drv); PMD_EXT(cryptodev_null_pmd_drv); PMD_EXT(cryptodev_snow3g_pmd_drv); PMD_EXT(pmd_qat_drv); PMD_EXT(pmd_af_packet_drv); PMD_EXT(rte_bnx2x_driver); PMD_EXT(rte_bnx2xvf_driver); +PMD_EXT(bnxt_pmd_drv); PMD_EXT(bond_drv); PMD_EXT(rte_cxgbe_driver); PMD_EXT(em_pmd_drv); @@ -61,17 +63,30 @@ PMD_EXT(pmd_mpipe_gbe_drv); PMD_EXT(rte_nfp_net_driver); PMD_EXT(pmd_null_drv); PMD_EXT(pmd_pcap_drv); +PMD_EXT(rte_qede_driver); +PMD_EXT(rte_qedevf_driver); PMD_EXT(pmd_ring_drv); PMD_EXT(pmd_szedata2_drv); +PMD_EXT(rte_nicvf_driver); PMD_EXT(pmd_vhost_drv); PMD_EXT(rte_virtio_driver); +PMD_EXT(virtio_user_driver); PMD_EXT(rte_vmxnet3_driver); PMD_EXT(pmd_xenvirt_drv); +#define MEMPOOL_OPS(hdl) \ +extern void mp_hdlr_init_##hdl(void) + +MEMPOOL_OPS(ops_mp_mc); +MEMPOOL_OPS(ops_sp_sc); +MEMPOOL_OPS(ops_mp_sc); +MEMPOOL_OPS(ops_sp_mc); +MEMPOOL_OPS(ops_stack); + /* * This function is not called from anywhere, it's only purpose is to make sure * that if ODP and DPDK are statically linked to an application, the GCC - * constuctors of the PMDs are linked as well. Otherwise the linker would omit + * constructors of the PMDs are linked as well. Otherwise the linker would omit * them. It's not an issue with dynamic linking. */ void refer_constructors(void); void refer_constructors(void) @@ -82,6 +97,9 @@ void refer_constructors(void) #ifdef RTE_LIBRTE_PMD_AESNI_MB devinitfn_cryptodev_aesni_mb_pmd_drv(); #endif +#ifdef RTE_LIBRTE_PMD_KASUMI + devinitfn_cryptodev_kasumi_pmd_drv(); +#endif #ifdef RTE_LIBRTE_PMD_NULL_CRYPTO devinitfn_cryptodev_null_pmd_drv(); #endif @@ -98,6 +116,9 @@ void refer_constructors(void) devinitfn_rte_bnx2x_driver(); devinitfn_rte_bnx2xvf_driver(); #endif +#ifdef RTE_LIBRTE_BNXT_PMD + devinitfn_bnxt_pmd_drv(); +#endif #ifdef RTE_LIBRTE_PMD_BOND devinitfn_bond_drv(); #endif @@ -147,24 +168,39 @@ void refer_constructors(void) #ifdef RTE_LIBRTE_PMD_PCAP devinitfn_pmd_pcap_drv(); #endif +#ifdef RTE_LIBRTE_QEDE_PMD + devinitfn_rte_qede_driver(); + devinitfn_rte_qedevf_driver(); +#endif #ifdef RTE_LIBRTE_PMD_RING devinitfn_pmd_ring_drv(); #endif #ifdef RTE_LIBRTE_PMD_SZEDATA2 devinitfn_pmd_szedata2_drv(); #endif +#ifdef RTE_LIBRTE_THUNDERX_NICVF_PMD + devinitfn_rte_nicvf_driver(); +#endif #ifdef RTE_LIBRTE_PMD_VHOST devinitfn_pmd_vhost_drv(); #endif #ifdef RTE_LIBRTE_VIRTIO_PMD devinitfn_rte_virtio_driver(); #endif +#ifdef RTE_VIRTIO_USER + devinitfn_rte_virtio_driver(); +#endif #ifdef RTE_LIBRTE_VMXNET3_PMD devinitfn_rte_vmxnet3_driver(); #endif #ifdef RTE_LIBRTE_PMD_XENVIRT devinitfn_pmd_xenvirt_drv(); #endif + mp_hdlr_init_ops_mp_mc(); + mp_hdlr_init_ops_sp_sc(); + mp_hdlr_init_ops_mp_sc(); + mp_hdlr_init_ops_sp_mc(); + mp_hdlr_init_ops_stack(); } /* Test if s has only digits or not. Dpdk pktio uses only digits.*/ diff --git a/scripts/build-pktio-dpdk b/scripts/build-pktio-dpdk index 53f703a..280f518 100755 --- a/scripts/build-pktio-dpdk +++ b/scripts/build-pktio-dpdk @@ -12,12 +12,11 @@ fi git clone http://dpdk.org/git/dpdk dpdk pushd dpdk -git checkout -b bv16.04 v16.04 +git checkout -b bv16.07 v16.07 #Make and edit DPDK configuration make config T=${TARGET} O=${TARGET} pushd ${TARGET} -sed -ri 's,(CONFIG_RTE_BUILD_COMBINE_LIBS=).*,\1y,' .config #To use I/O without DPDK supported NIC's enable pcap pmd: sed -ri 's,(CONFIG_RTE_LIBRTE_PMD_PCAP=).*,\1y,' .config popd ----------------------------------------------------------------------- Summary of changes: DEPENDENCIES | 4 +-- platform/linux-generic/pktio/dpdk.c | 51 ++++++++++++++++++++++++++++++------- scripts/build-pktio-dpdk | 3 +-- 3 files changed, 45 insertions(+), 13 deletions(-) hooks/post-receive --

8 years, 10 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

git-lng-odp