git-lng-odp December 2017

git-lng-odp@lists.linaro.org

1 participants
58 discussions

[COMMIT] branch api-next updated. v1.16.0.0-740-g8f528c36

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 8f528c3624b449e9b93604e293bee029b077b521 (commit) from eb8be4f5a77b45fe279c1412231c5bc7de32a166 (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 8f528c3624b449e9b93604e293bee029b077b521 Author: Nikhil Agarwal <nikhil.agarwal(a)linaro.org> Date: Mon Apr 10 15:42:48 2017 +0300 example: ipsec_offload: add ipsec_offload example [DES: adapted example to updated API.] [DES: minor rework to drop odp_ prefix from function names.] Signed-off-by: Nikhil Agarwal <nikhil.agarwal(a)linaro.org> Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/example/Makefile.am b/example/Makefile.am index 695e029c..c5aa513c 100644 --- a/example/Makefile.am +++ b/example/Makefile.am @@ -3,6 +3,7 @@ SUBDIRS = classifier \ hello \ ipsec \ ipfragreass \ + ipsec_offload \ l2fwd_simple \ l3fwd \ packet \ diff --git a/example/ipsec/odp_ipsec_cache.c b/example/ipsec/odp_ipsec_cache.c index 2a1416b0..bd4c1eab 100644 --- a/example/ipsec/odp_ipsec_cache.c +++ b/example/ipsec/odp_ipsec_cache.c @@ -26,6 +26,10 @@ void init_ipsec_cache(void) sizeof(ipsec_cache_t), ODP_CACHE_LINE_SIZE, 0); + if (shm == ODP_SHM_INVALID) { + EXAMPLE_ERR("Error: shared mem alloc failed.\n"); + exit(EXIT_FAILURE); + } ipsec_cache = odp_shm_addr(shm); diff --git a/example/ipsec_offload/.gitignore b/example/ipsec_offload/.gitignore new file mode 100644 index 00000000..2fc73aa3 --- /dev/null +++ b/example/ipsec_offload/.gitignore @@ -0,0 +1 @@ +odp_ipsec_offload diff --git a/example/ipsec_offload/Makefile.am b/example/ipsec_offload/Makefile.am new file mode 100644 index 00000000..0afe4ffa --- /dev/null +++ b/example/ipsec_offload/Makefile.am @@ -0,0 +1,18 @@ +include $(top_srcdir)/example/Makefile.inc + +bin_PROGRAMS = odp_ipsec_offload + +odp_ipsec_offload_SOURCES = odp_ipsec_offload.c \ + odp_ipsec_offload_misc.h \ + odp_ipsec_offload_sa_db.c \ + odp_ipsec_offload_sp_db.c \ + odp_ipsec_offload_fwd_db.c \ + odp_ipsec_offload_fwd_db.h \ + odp_ipsec_offload_cache.c \ + odp_ipsec_offload_cache.h \ + odp_ipsec_offload_sa_db.h \ + odp_ipsec_offload_sp_db.h + +dist_noinst_SCRIPTS = \ + run_left.sh \ + run_right.sh diff --git a/example/ipsec_offload/odp_ipsec_offload.c b/example/ipsec_offload/odp_ipsec_offload.c new file mode 100644 index 00000000..a2c6ef51 --- /dev/null +++ b/example/ipsec_offload/odp_ipsec_offload.c @@ -0,0 +1,854 @@ +/* Copyright (c) 2017, Linaro Limited + * Copyright (C) 2017 NXP + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +/** + * @file + * + * @example odp_ipsec_offload.c ODP basic packet IO cross connect with IPsec + * test application + */ + +#define _DEFAULT_SOURCE +/* enable strtok */ +#define _POSIX_C_SOURCE 200112L +#include <stdlib.h> +#include <getopt.h> +#include <unistd.h> +#include <inttypes.h> + +#include <example_debug.h> + +#include <odp_api.h> +#include <odp/helper/linux.h> +#include <odp/helper/eth.h> +#include <odp/helper/ip.h> +#include <odp/helper/icmp.h> +#include <odp/helper/udp.h> +#include <odp/helper/ipsec.h> + +#include <stdbool.h> +#include <sys/socket.h> +#include <net/if.h> +#include <sys/ioctl.h> +#include <sys/socket.h> +#include <netpacket/packet.h> +#include <net/ethernet.h> +#include <arpa/inet.h> + +#include <odp_ipsec_offload_misc.h> +#include <odp_ipsec_offload_sa_db.h> +#include <odp_ipsec_offload_sp_db.h> +#include <odp_ipsec_offload_fwd_db.h> +#include <odp_ipsec_offload_cache.h> + +#define MAX_WORKERS 32 /**< maximum number of worker threads */ + +/** + * Parsed command line application arguments + */ +typedef struct { + int cpu_count; + int flows; + int if_count; /**< Number of interfaces to be used */ + char **if_names; /**< Array of pointers to interface names */ + char *if_str; /**< Storage for interface names */ + int queue_type; /**< Queue synchronization type*/ +} appl_args_t; + +/** + * Grouping of both parsed CL args and thread specific args - alloc together + */ +typedef struct { + /** Application (parsed) arguments */ + appl_args_t appl; +} args_t; + +/* helper funcs */ +static void parse_args(int argc, char *argv[], appl_args_t *appl_args); +static void print_info(char *progname, appl_args_t *appl_args); +static void usage(char *progname); + +/** Global pointer to args */ +static args_t *args; + +/** + * Buffer pool for packet IO + */ +#define SHM_PKT_POOL_BUF_COUNT 1024 +#define SHM_PKT_POOL_BUF_SIZE 4096 +#define SHM_PKT_POOL_SIZE (SHM_PKT_POOL_BUF_COUNT * SHM_PKT_POOL_BUF_SIZE) + +static odp_pool_t pkt_pool = ODP_POOL_INVALID; + +/** Synchronize threads before packet processing begins */ +static odp_barrier_t sync_barrier; + +/** + * Packet processing result codes + */ +typedef enum { + PKT_CONTINUE, /**< No events posted, keep processing */ + PKT_POSTED, /**< Event posted, stop processing */ + PKT_DROP, /**< Reason to drop detected, stop processing */ + PKT_DONE /**< Finished with packet, stop processing */ +} pkt_disposition_e; + +#define MAX_COMPL_QUEUES 32 +#define GET_THR_QUEUE_ID(x) ((odp_thread_id() - 1) % (x)) + +/** Atomic queue IPSEC completion events */ +static odp_queue_t completionq[MAX_COMPL_QUEUES]; + +static int num_compl_queues; +static int num_workers; + +/** + * Calculate hash value on given 2-tuple i.e. sip, dip + * + * @param ip_src Source IP Address + * @param ip_dst Destination IP Address + * + * @return Resultant hash value + */ +static inline uint64_t calculate_flow_hash(uint32_t ip_src, uint32_t ip_dst) +{ + uint64_t hash = 0; + + ip_dst += JHASH_GOLDEN_RATIO; + BJ3_MIX(ip_src, ip_dst, hash); + return hash; +} + +/** + * IPsec pre argument processing initialization + */ +static +void ipsec_init_pre(void) +{ + /* Initialize our data bases */ + init_sp_db(); + init_sa_db(); + init_tun_db(); + init_ipsec_cache(); +} + +/** + * IPsec post argument processing initialization + * + * Resolve SP DB with SA DB and create corresponding IPsec cache entries + */ +static +void ipsec_init_post(void) +{ + sp_db_entry_t *entry; + int queue_id = 0; + + /* Attempt to find appropriate SA for each SP */ + for (entry = sp_db->list; NULL != entry; entry = entry->next) { + sa_db_entry_t *cipher_sa = NULL; + sa_db_entry_t *auth_sa = NULL; + tun_db_entry_t *tun = NULL; + + queue_id %= num_workers; + if (num_compl_queues < num_workers) + num_compl_queues++; + queue_id++; + if (entry->esp) { + cipher_sa = find_sa_db_entry(&entry->src_subnet, + &entry->dst_subnet, 1); + tun = find_tun_db_entry(cipher_sa->src_ip, + cipher_sa->dst_ip); + } + if (entry->ah) { + auth_sa = find_sa_db_entry(&entry->src_subnet, + &entry->dst_subnet, 0); + tun = find_tun_db_entry(auth_sa->src_ip, + auth_sa->dst_ip); + } + + if (cipher_sa && auth_sa) { + if (create_ipsec_cache_entry(cipher_sa, + auth_sa, + tun, + entry->input, + completionq[queue_id - 1]) + ) { + EXAMPLE_ABORT("Error: IPSec cache entry failed.\n"); + } + } else { + printf(" WARNING: SA not found for SP\n"); + dump_sp_db_entry(entry); + } + } +} + +/** + * Initialize interface + * + * Initialize ODP pktio and queues, query MAC address and update + * forwarding database. + * + * @param intf Interface name string + * @param queue_type Type of queue to configure. + */ +static void initialize_intf(char *intf, int queue_type) +{ + odp_pktio_t pktio; + odp_pktout_queue_t pktout; + int ret; + uint8_t src_mac[ODPH_ETHADDR_LEN]; + odp_pktio_param_t pktio_param; + odp_pktio_capability_t capa; + odp_pktin_queue_param_t pktin_param; + + odp_pktio_param_init(&pktio_param); + + pktio_param.in_mode = ODP_PKTIN_MODE_SCHED; + + /* + * Open a packet IO instance for thread and get default output queue + */ + pktio = odp_pktio_open(intf, pkt_pool, &pktio_param); + if (ODP_PKTIO_INVALID == pktio) + EXAMPLE_ABORT("Error: pktio create failed for %s\n", intf); + + odp_pktin_queue_param_init(&pktin_param); + + ret = odp_pktio_capability(pktio, &capa); + if (ret != 0) + EXAMPLE_ABORT("Error: Unable to get pktio capability %s\n", + intf); + + pktin_param.queue_param.type = ODP_QUEUE_TYPE_SCHED; + pktin_param.queue_param.sched.sync = queue_type; + pktin_param.queue_param.sched.prio = ODP_SCHED_PRIO_DEFAULT; + pktin_param.num_queues = capa.max_input_queues; + + if (pktin_param.num_queues > 1) + pktin_param.hash_enable = 1; + + if (odp_pktin_queue_config(pktio, &pktin_param)) + EXAMPLE_ABORT("Error: pktin config failed for %s\n", intf); + + if (odp_pktout_queue_config(pktio, NULL)) + EXAMPLE_ABORT("Error: pktout config failed for %s\n", intf); + + if (odp_pktout_queue(pktio, &pktout, 1) != 1) + EXAMPLE_ABORT("Error: failed to get pktout queue for %s\n", + intf); + + ret = odp_pktio_start(pktio); + if (ret) + EXAMPLE_ABORT("Error: unable to start %s\n", intf); + + /* Read the source MAC address for this interface */ + ret = odp_pktio_mac_addr(pktio, src_mac, sizeof(src_mac)); + if (ret < 0) { + EXAMPLE_ABORT("Error: failed during MAC address get for %s\n", + intf); + } + + printf("Created pktio:%02" PRIu64 "\n", odp_pktio_to_u64(pktio)); + + /* Resolve any routes using this interface for output */ + resolve_fwd_db(intf, pktout, src_mac); +} + +/** + * Packet Processing - Input verification + * + * @param pkt Packet to inspect + * + * @return PKT_CONTINUE if good, supported packet else PKT_DROP + */ +static pkt_disposition_e do_input_verify(odp_packet_t pkt) +{ + if (odp_unlikely(odp_packet_has_error(pkt))) { + odp_packet_free(pkt); + return PKT_DROP; + } + + if (!odp_packet_has_eth(pkt)) { + odp_packet_free(pkt); + return PKT_DROP; + } + + if (!odp_packet_has_ipv4(pkt)) { + odp_packet_free(pkt); + return PKT_DROP; + } + + return PKT_CONTINUE; +} + +/** + * Packet Processing - Route lookup in forwarding database + * + * @param pkt Packet to route + * + * @return PKT_CONTINUE if route found else PKT_DROP + */ +static +pkt_disposition_e do_route_fwd_db(odp_packet_t pkt) +{ + odph_ipv4hdr_t *ip = (odph_ipv4hdr_t *)odp_packet_l3_ptr(pkt, NULL); + fwd_db_entry_t *fwd_entry; + ipsec_cache_entry_t *ipsec_entry; + odp_ipsec_out_param_t params; + uint32_t sip, dip; + uint64_t hash; + flow_entry_t *flow; + + if (ip->ttl > 1) { + ip->ttl -= 1; + if (ip->chksum >= odp_cpu_to_be_16(0xffff - 0x100)) + ip->chksum += odp_cpu_to_be_16(0x100) + 1; + else + ip->chksum += odp_cpu_to_be_16(0x100); + } else { + odp_packet_free(pkt); + return PKT_DROP; + } + + sip = odp_be_to_cpu_32(ip->src_addr); + dip = odp_be_to_cpu_32(ip->dst_addr); + + hash = calculate_flow_hash(sip, dip); + + flow = route_flow_lookup_in_bucket(sip, dip, + &flow_table[hash & + (bucket_count - 1)]); + if (!flow) { + /*Check into Routing table*/ + fwd_entry = find_fwd_db_entry(dip); + if (!fwd_entry) { + EXAMPLE_DBG("No flow match found. Packet is dropped.\n"); + odp_packet_free(pkt); + return PKT_DROP; + } + + /*Entry found. Updated in Flow table first.*/ + flow = calloc(1, sizeof(flow_entry_t)); + if (!flow) { + EXAMPLE_ABORT("Failure to allocate memory"); + return PKT_DROP; + } + flow->l3_src = sip; + flow->l3_dst = dip; + flow->out_port.pktout = fwd_entry->pktout; + memcpy(flow->out_port.addr.addr, + fwd_entry->src_mac, + ODPH_ETHADDR_LEN); + memcpy(flow->out_port.next_hop_addr.addr, + fwd_entry->dst_mac, + ODPH_ETHADDR_LEN); + ipsec_entry = find_ipsec_cache_entry_out(sip, dip); + if (ipsec_entry) + flow->out_port.sa = ipsec_entry->sa; + else + flow->out_port.sa = ODP_IPSEC_SA_INVALID; + flow->next = NULL; + /*Insert new flow into flow cache table*/ + route_flow_insert_in_bucket(flow, &flow_table[hash & + (bucket_count - 1)]); + } + + odp_packet_user_ptr_set(pkt, &flow->out_port); + if (flow->out_port.sa == ODP_IPSEC_SA_INVALID) + return PKT_CONTINUE; + + /* Initialize parameters block */ + params.sa = &flow->out_port.sa; + params.opt = NULL; + params.num_sa = 1; + params.num_opt = 1; + + /* Issue ipsec request */ + if (odp_unlikely(odp_ipsec_out_enq(&pkt, 1, &params) < 0)) { + EXAMPLE_DBG("Unable to out enqueue\n"); + odp_packet_free(pkt); + return PKT_DROP; + } + return PKT_POSTED; +} + +/** + * Packet Processing - Input IPsec packet classification + * + * Verify the received packet has IPsec headers, + * if so issue ipsec request else skip. + * + * @param pkt Packet to classify + * + * @return PKT_CONTINUE if done else PKT_POSTED + */ +static +pkt_disposition_e do_ipsec_in_classify(odp_packet_t pkt) +{ + odp_ipsec_in_param_t params; + + if (!odp_packet_has_ipsec(pkt)) + return PKT_CONTINUE; + + /* Initialize parameters block */ + params.num_sa = 0; + params.sa = NULL; + + /* Issue ipsec request */ + if (odp_unlikely(odp_ipsec_in_enq(&pkt, 1, &params) < 0)) { + EXAMPLE_DBG("Unable to in enqueue\n"); + odp_packet_free(pkt); + return PKT_DROP; + } + return PKT_POSTED; +} + +/** + * Packet IO worker thread + * + * Loop calling odp_schedule to obtain packet from the two sources, + * and continue processing the packet. + * + * - Input interfaces (i.e. new work) + * - Per packet ipsec API completion queue + * + * @param arg Required by "odph_linux_pthread_create", unused + * + * @return NULL (should never return) + */ +static +int pktio_thread(void *arg EXAMPLE_UNUSED) +{ + int thr = odp_thread_id(); + odp_packet_t pkt; + odp_pktout_queue_t out_queue; + ipsec_out_entry_t *out_port; + odp_event_t ev = ODP_EVENT_INVALID; + + printf("Pktio thread [%02i] starts\n", thr); + odp_barrier_wait(&sync_barrier); + + /* Loop packets */ + for (;;) { + pkt_disposition_e rc; + odp_event_subtype_t subtype; + + ev = odp_schedule(NULL, ODP_SCHED_WAIT); + /* Use schedule to get event from any input queue */ + /* Determine new work versus IPsec result */ + if (ODP_EVENT_PACKET == odp_event_types(ev, &subtype)) { + pkt = odp_packet_from_event(ev); + + if (ODP_EVENT_PACKET_IPSEC == subtype) { + odp_ipsec_packet_result_t res; + + if (odp_unlikely(odp_ipsec_result(&res, + pkt) < 0)) { + EXAMPLE_DBG("Error Event\n"); + odp_event_free((odp_event_t)ev); + continue; + } + + if (odp_unlikely(res.status.error.all)) { + odp_packet_free(pkt); + continue; + } + } else { + rc = do_input_verify(pkt); + if (odp_unlikely(rc)) + continue; + + rc = do_ipsec_in_classify(pkt); + if (rc) + continue; + } + + rc = do_route_fwd_db(pkt); + if (rc) + continue; + + out_port = odp_packet_user_ptr(pkt); + out_queue = out_port->pktout; + + if (odp_unlikely(odp_pktout_send(out_queue, + &pkt, 1) < 0)) + odp_packet_free(pkt); + + } else { + EXAMPLE_DBG("Invalid Event\n"); + odp_event_free(ev); + continue; + } + } + + /* unreachable */ + return 0; +} + +/** + * ODP ipsec proto example main function + */ +int +main(int argc, char *argv[]) +{ + odph_odpthread_t thread_tbl[MAX_WORKERS]; + int i; + odp_shm_t shm; + odp_cpumask_t cpumask; + char cpumaskstr[ODP_CPUMASK_STR_SIZE]; + odp_pool_param_t params; + odp_queue_param_t qparam; + odp_instance_t instance; + odph_odpthread_params_t thr_params; + odp_ipsec_config_t config; + odp_ipsec_capability_t capa; + + /*Validate if user has passed only help option*/ + if (argc == 2) { + if (!strcmp(argv[1], "-h") || !strcmp(argv[1], "--help")) { + usage(argv[0]); + exit(EXIT_SUCCESS); + } + } + + /* Initialize ODP before calling anything else */ + if (odp_init_global(&instance, NULL, NULL)) + EXAMPLE_ABORT("Error: ODP global init failed.\n"); + /* Initialize this thread */ + if (odp_init_local(instance, ODP_THREAD_CONTROL)) + EXAMPLE_ABORT("Error: ODP local init failed.\n"); + /* Reserve memory for arguments from shared memory */ + shm = odp_shm_reserve("shm_args", sizeof(args_t), + ODP_CACHE_LINE_SIZE, 0); + args = odp_shm_addr(shm); + + if (NULL == args) + EXAMPLE_ABORT("Error: shared mem alloc failed.\n"); + memset(args, 0, sizeof(*args)); + + /* Must init our databases before parsing args */ + ipsec_init_pre(); + init_fwd_db(); + + /* Parse and store the application arguments */ + parse_args(argc, argv, &args->appl); + + /*Initialize route table for user given parameter*/ + init_routing_table(); + + /* Print both system and application information */ + print_info(NO_PATH(argv[0]), &args->appl); + + if (odp_ipsec_capability(&capa)) + EXAMPLE_ABORT("Error: Capability not configured.\n"); + + odp_ipsec_config_init(&config); + + if (capa.op_mode_async && (capa.op_mode_async >= capa.op_mode_sync)) { + config.inbound_mode = ODP_IPSEC_OP_MODE_ASYNC; + config.outbound_mode = ODP_IPSEC_OP_MODE_ASYNC; + } else { + EXAMPLE_ABORT("Error: Sync mode not supported.\n"); + } + + if (odp_ipsec_config(&config)) + EXAMPLE_ABORT("Error: IPSec not configured.\n"); + + /* Default to system CPU count unless user specified */ + num_workers = MAX_WORKERS; + if (args->appl.cpu_count && args->appl.cpu_count <= MAX_WORKERS) + num_workers = args->appl.cpu_count; + + /* + * By default CPU #0 runs Linux kernel background tasks. + * Start mapping thread from CPU #1 + */ + num_workers = odp_cpumask_default_worker(&cpumask, num_workers); + (void)odp_cpumask_to_str(&cpumask, cpumaskstr, sizeof(cpumaskstr)); + + /* + * Create completion queues + */ + odp_queue_param_init(&qparam); + qparam.type = ODP_QUEUE_TYPE_SCHED; + qparam.sched.prio = ODP_SCHED_PRIO_HIGHEST; + qparam.sched.sync = args->appl.queue_type; + qparam.sched.group = ODP_SCHED_GROUP_ALL; + + for (i = 0; i < num_workers; i++) { + completionq[i] = odp_queue_create("completion", &qparam); + if (ODP_QUEUE_INVALID == completionq[i]) + EXAMPLE_ABORT("Error: completion queue creation failed\n"); + } + printf("num worker threads: %i\n", num_workers); + printf("first CPU: %i\n", odp_cpumask_first(&cpumask)); + printf("cpu mask: %s\n", cpumaskstr); + + /* Create a barrier to synchronize thread startup */ + odp_barrier_init(&sync_barrier, num_workers); + + /* Create packet buffer pool */ + odp_pool_param_init(&params); + params.pkt.seg_len = SHM_PKT_POOL_BUF_SIZE; + params.pkt.len = SHM_PKT_POOL_BUF_SIZE; + params.pkt.num = SHM_PKT_POOL_BUF_COUNT; + params.type = ODP_POOL_PACKET; + + pkt_pool = odp_pool_create("packet_pool", &params); + + if (ODP_POOL_INVALID == pkt_pool) + EXAMPLE_ABORT("Error: packet pool create failed.\n"); + + ipsec_init_post(); + + /* Initialize interfaces (which resolves FWD DB entries */ + for (i = 0; i < args->appl.if_count; i++) + initialize_intf(args->appl.if_names[i], args->appl.queue_type); + + printf(" Configured queues SYNC type: [%s]\n", + (args->appl.queue_type == 0) ? + "PARALLEL" : + (args->appl.queue_type == 1) ? + "ATOMIC" : "ORDERED"); + memset(&thr_params, 0, sizeof(thr_params)); + thr_params.start = pktio_thread; + thr_params.arg = NULL; + thr_params.thr_type = ODP_THREAD_WORKER; + thr_params.instance = instance; + + /* Create and initialize worker threads */ + odph_odpthreads_create(thread_tbl, &cpumask, + &thr_params); + odph_odpthreads_join(thread_tbl); + + free(args->appl.if_names); + free(args->appl.if_str); + printf("Exit\n\n"); + return 0; +} + +/** + * Parse and store the command line arguments + * + * @param argc argument count + * @param argv[] argument vector + * @param appl_args Store application arguments here + */ +static void parse_args(int argc, char *argv[], appl_args_t *appl_args) +{ + int opt; + int long_index; + char *token; + size_t len; + int rc = 0; + int i; + + static struct option longopts[] = { + {"count", required_argument, NULL, 'c'}, + {"interface", required_argument, NULL, 'i'}, /* return 'i' */ + {"route", required_argument, NULL, 'r'}, /* return 'r' */ + {"policy", required_argument, NULL, 'p'}, /* return 'p' */ + {"ah", required_argument, NULL, 'a'}, /* return 'a' */ + {"esp", required_argument, NULL, 'e'}, /* return 'e' */ + {"tunnel", required_argument, NULL, 't'}, /* return 't' */ + {"flows", no_argument, NULL, 'f'}, /* return 'f' */ + {"queue type", required_argument, NULL, 'q'}, /* return 'q' */ + {"help", no_argument, NULL, 'h'}, /* return 'h' */ + {NULL, 0, NULL, 0} + }; + + appl_args->flows = 1; + appl_args->queue_type = ODP_SCHED_SYNC_ATOMIC; + + while (!rc) { + opt = getopt_long(argc, argv, "+c:i:h:r:p:a:e:t:s:q:f:", + longopts, &long_index); + if (opt < 0) + break; /* No more options */ + switch (opt) { + case 'f': + appl_args->flows = atoi(optarg); + if (appl_args->flows > 256) { + printf("Maximum acceptable value for -f is 256\n"); + rc = -1; + } + if (optind != 3) { + printf("-f must be the 1st argument of the command\n"); + rc = -1; + } + EXAMPLE_DBG("Bucket count = %d\n", bucket_count); + break; + case 'c': + appl_args->cpu_count = atoi(optarg); + break; + case 'i': + /* parse packet-io interface names */ + len = strlen(optarg); + if (0 == len) { + usage(argv[0]); + exit(EXIT_FAILURE); + } + len += 1; /* add room for '\0' */ + + appl_args->if_str = malloc(len); + if (appl_args->if_str == NULL) { + usage(argv[0]); + exit(EXIT_FAILURE); + } + + /* count the number of tokens separated by ',' */ + strcpy(appl_args->if_str, optarg); + for (token = strtok(appl_args->if_str, ","), i = 0; + token; + token = strtok(NULL, ","), i++) + ; + appl_args->if_count = i; + if (!appl_args->if_count) { + usage(argv[0]); + exit(EXIT_FAILURE); + } + /* Allocate storage for the if names */ + appl_args->if_names = + calloc(appl_args->if_count, sizeof(char *)); + if (!appl_args->if_names) + EXAMPLE_ABORT("Memory allocation failure\n"); + /* Store the if names (reset names string) */ + strcpy(appl_args->if_str, optarg); + for (token = strtok(appl_args->if_str, ","), i = 0; + token; token = strtok(NULL, ","), i++) { + appl_args->if_names[i] = token; + } + break; + case 'r': + rc = create_fwd_db_entry(optarg, appl_args->if_names, + appl_args->if_count, + appl_args->flows); + break; + case 'p': + rc = create_sp_db_entry(optarg, appl_args->flows); + break; + case 'a': + rc = create_sa_db_entry(optarg, FALSE, + appl_args->flows); + break; + case 'e': + rc = create_sa_db_entry(optarg, TRUE, appl_args->flows); + break; + case 't': + rc = create_tun_db_entry(optarg, appl_args->flows); + break; + case 'q': + i = atoi(optarg); + if (i > ODP_SCHED_SYNC_ORDERED || + i < ODP_SCHED_SYNC_PARALLEL) { + printf("Invalid queue type: setting default to atomic"); + break; + } + appl_args->queue_type = i; + break; + case 'h': + usage(argv[0]); + exit(EXIT_SUCCESS); + break; + default: + break; + } + } + + if (rc) { + printf("ERROR: failed parsing -%c option\n", opt); + usage(argv[0]); + exit(EXIT_FAILURE); + } + + if (0 == appl_args->if_count) { + usage(argv[0]); + exit(EXIT_FAILURE); + } + + optind = 1; /* reset 'extern optind' from the getopt lib */ +} + +/** + * Print system and application info + */ +static void print_info(char *progname, appl_args_t *appl_args) +{ + int i; + + printf("\n" + "ODP system info\n" + "---------------\n" + "ODP API version: %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_cpu_model_str(), odp_cpu_hz_max(), + odp_sys_cache_line_size(), odp_cpu_count()); + printf("Running ODP application: \"%s\"\n" + "------------------------\n" + "IF-count: %i\n" + "Using IFs: ", + progname, appl_args->if_count); + for (i = 0; i < appl_args->if_count; ++i) + printf(" %s", appl_args->if_names[i]); + printf("\n"); + dump_fwd_db(); + dump_sp_db(); + dump_sa_db(); + dump_tun_db(); + printf("\n\n"); + fflush(NULL); +} + +/** + * Prinf usage information + */ +static void usage(char *progname) +{ + printf("\n" + "Usage: %s OPTIONS\n" + " E.g. %s -i eth1,eth2,eth3 -m 0\n" + "\n" + "OpenDataPlane example application.\n" + "\n" + "Mandatory OPTIONS:\n" + " -i, --interface Eth interfaces (comma-separated, no spaces)\n" + "Routing / IPSec OPTIONS:\n" + " -r, --route SubNet:Intf:NextHopMAC\n" + " -p, --policy SrcSubNet:DstSubNet:(in|out):(ah|esp|both)\n" + " -e, --esp SrcIP:DstIP:(3des|null):SPI:Key192\n" + " -a, --ah SrcIP:DstIP:(md5|null):SPI:Key128\n" + " -t, --tun SrcIP:DstIP:TunSrcIP:TunDstIP\n" + "\n" + " Where: NextHopMAC is raw hex/dot notation, i.e. 03.BA.44.9A.CE.02\n" + " IP is decimal/dot notation, i.e. 192.168.1.1\n" + " SubNet is decimal/dot/slash notation, i.e 192.168.0.0/16\n" + " SPI is raw hex, 32 bits\n" + " KeyXXX is raw hex, XXX bits long\n" + "\n" + " Examples:\n" + " -r 192.168.222.0/24:p8p1:08.00.27.F5.8B.DB\n" + " -p 192.168.111.0/24:192.168.222.0/24:out:esp\n" + " -e 192.168.111.2:192.168.222.2:3des:201:656c8523255ccc23a66c1917aa0cf30991fce83532a4b224\n" + " -a 192.168.111.2:192.168.222.2:md5:201:a731649644c5dee92cbd9c2e7e188ee6\n" + " -t 192.168.111.2:192.168.222.2:192.168.150.1:192.168.150.2\n" + "\n" + "Optional OPTIONS\n" + " -f, --flows <number> routes count.\n" + " -c, --count <number> CPU count.\n" + " -q specify the queue type\n" + " 0: ODP_SCHED_SYNC_PARALLEL\n" + " 1: ODP_SCHED_SYNC_ATOMIC\n" + " 2: ODP_SCHED_SYNC_ORDERED\n" + " default is ODP_SCHED_SYNC_ATOMIC\n" + " -h, --help Display help and exit.\n" + "\n", NO_PATH(progname), NO_PATH(progname) + ); +} diff --git a/example/ipsec_offload/odp_ipsec_offload_cache.c b/example/ipsec_offload/odp_ipsec_offload_cache.c new file mode 100644 index 00000000..74585d2c --- /dev/null +++ b/example/ipsec_offload/odp_ipsec_offload_cache.c @@ -0,0 +1,146 @@ +/* + * Copyright (c) 2017 NXP. All rights reserved. + */ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <stdlib.h> +#include <string.h> + +#include <example_debug.h> + +#include <odp.h> + +#include <odp/helper/ipsec.h> +#include <odp/helper/ip.h> + +#include <odp_ipsec_offload_cache.h> + +/** Global pointer to ipsec_cache db */ +ipsec_cache_t *ipsec_cache; + +#define IPDEFTTL 64 + +void init_ipsec_cache(void) +{ + odp_shm_t shm; + + shm = odp_shm_reserve("shm_ipsec_cache", + sizeof(ipsec_cache_t), + ODP_CACHE_LINE_SIZE, + 0); + + ipsec_cache = odp_shm_addr(shm); + + if (ipsec_cache == NULL) + EXAMPLE_ABORT("Error: shared mem alloc failed.\n"); + memset(ipsec_cache, 0, sizeof(*ipsec_cache)); +} + +int create_ipsec_cache_entry(sa_db_entry_t *cipher_sa, + sa_db_entry_t *auth_sa, + tun_db_entry_t *tun, + odp_bool_t in, + odp_queue_t completionq) +{ + odp_ipsec_sa_param_t sa_params; + ipsec_cache_entry_t *entry; + odp_ipsec_sa_t sa; + uint32_t src_ip, dst_ip; + + odp_ipsec_sa_param_init(&sa_params); + + /* Verify we have a good entry */ + entry = &ipsec_cache->array[ipsec_cache->index]; + if (MAX_DB <= ipsec_cache->index) + return -1; + + /* Verify SA mode match in case of cipher&auth */ + if (!tun) { + printf("\n TRANSPORT MODE not supported"); + return -1; + } + + /* Setup parameters and call ipsec library to create sa */ + if (in) { + sa_params.dir = ODP_IPSEC_DIR_INBOUND; + sa_params.inbound.lookup_mode = ODP_IPSEC_LOOKUP_SPI; + } else { + sa_params.dir = ODP_IPSEC_DIR_OUTBOUND; + + src_ip = odp_cpu_to_be_32(tun->tun_src_ip); + dst_ip = odp_cpu_to_be_32(tun->tun_dst_ip); + sa_params.outbound.tunnel.type = ODP_IPSEC_TUNNEL_IPV4; + sa_params.outbound.tunnel.ipv4.src_addr = &src_ip; + sa_params.outbound.tunnel.ipv4.dst_addr = &dst_ip; + sa_params.outbound.tunnel.ipv4.ttl = IPDEFTTL; + sa_params.outbound.tunnel.ipv4.dscp = 0; + sa_params.outbound.tunnel.ipv4.df = 1; + } + + sa_params.dest_queue = completionq; + sa_params.mode = ODP_IPSEC_MODE_TUNNEL; + + /* Cipher */ + if (cipher_sa) { + sa_params.crypto.cipher_alg = cipher_sa->alg.u.cipher; + sa_params.crypto.cipher_key.data = cipher_sa->key.data; + sa_params.crypto.cipher_key.length = cipher_sa->key.length; + sa_params.spi = cipher_sa->spi; + } else { + sa_params.crypto.cipher_alg = ODP_CIPHER_ALG_NULL; + } + + /* Auth */ + if (auth_sa) { + sa_params.crypto.auth_alg = auth_sa->alg.u.auth; + sa_params.crypto.auth_key.data = auth_sa->key.data; + sa_params.crypto.auth_key.length = auth_sa->key.length; + } else { + sa_params.crypto.auth_alg = ODP_AUTH_ALG_NULL; + } + + sa = odp_ipsec_sa_create(&sa_params); + if (sa == ODP_IPSEC_SA_INVALID) + return -1; + + /* Copy selector IPs in cache entry*/ + if (cipher_sa) { + entry->src_ip = cipher_sa->src_ip; + entry->dst_ip = cipher_sa->dst_ip; + } else if (auth_sa) { + entry->src_ip = auth_sa->src_ip; + entry->dst_ip = auth_sa->dst_ip; + } + + /* Initialize state */ + entry->sa = sa; + + /* Add entry to the appropriate list */ + ipsec_cache->index++; + if (in) { + entry->next = ipsec_cache->in_list; + ipsec_cache->in_list = entry; + } else { + entry->next = ipsec_cache->out_list; + ipsec_cache->out_list = entry; + } + + return 0; +} + +ipsec_cache_entry_t *find_ipsec_cache_entry_out(uint32_t src_ip, + uint32_t dst_ip) +{ + ipsec_cache_entry_t *entry = ipsec_cache->out_list; + + /* Look for a hit */ + for (; NULL != entry; entry = entry->next) { + if ((entry->src_ip == src_ip) && (entry->dst_ip == dst_ip)) + break; + } + return entry; +} diff --git a/example/ipsec_offload/odp_ipsec_offload_cache.h b/example/ipsec_offload/odp_ipsec_offload_cache.h new file mode 100644 index 00000000..eecdd6be --- /dev/null +++ b/example/ipsec_offload/odp_ipsec_offload_cache.h @@ -0,0 +1,78 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#ifndef ODP_IPSEC_CACHE_H_ +#define ODP_IPSEC_CACHE_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#include <odp.h> +#include <odp/helper/ipsec.h> + +#include <odp_ipsec_offload_misc.h> +#include <odp_ipsec_offload_sa_db.h> + +/** + * IPsec cache data base entry + */ +typedef struct ipsec_cache_entry_s { + struct ipsec_cache_entry_s *next; /**< Next entry on list */ + uint32_t src_ip; /**< Source v4 address */ + uint32_t dst_ip; /**< Destination v4 address */ + odp_ipsec_sa_t sa; /**< IPSec sa handle */ +} ipsec_cache_entry_t; + +/** + * IPsec cache data base global structure + */ +typedef struct ipsec_cache_s { + uint32_t index; /**< Index of next available entry */ + ipsec_cache_entry_t *in_list; /**< List of active input entries */ + ipsec_cache_entry_t *out_list; /**< List of active output entries */ + ipsec_cache_entry_t array[MAX_DB]; /**< Entry storage */ +} ipsec_cache_t; + +/** Global pointer to ipsec_cache db */ +extern ipsec_cache_t *ipsec_cache; + +/** Initialize IPsec cache */ +void init_ipsec_cache(void); + +/** + * Create an entry in the IPsec cache + * + * @param cipher_sa Cipher SA DB entry pointer + * @param auth_sa Auth SA DB entry pointer + * @param tun Tunnel DB entry pointer + * @param in Direction (input versus output) + * @param completionq Completion queue + * + * @return 0 if successful else -1 + */ +int create_ipsec_cache_entry(sa_db_entry_t *cipher_sa, + sa_db_entry_t *auth_sa, + tun_db_entry_t *tun, + odp_bool_t in, + odp_queue_t completionq); + +/** + * Find a matching IPsec cache entry for output packet + * + * @param src_ip Source IPv4 address + * @param dst_ip Destination IPv4 address + * + * @return pointer to IPsec cache entry else NULL + */ +ipsec_cache_entry_t *find_ipsec_cache_entry_out(uint32_t src_ip, + uint32_t dst_ip); + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/example/ipsec_offload/odp_ipsec_offload_fwd_db.c b/example/ipsec_offload/odp_ipsec_offload_fwd_db.c new file mode 100644 index 00000000..ea07c9b0 --- /dev/null +++ b/example/ipsec_offload/odp_ipsec_offload_fwd_db.c @@ -0,0 +1,223 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +/* enable strtok */ +#define _POSIX_C_SOURCE 200112L + +#include <stdlib.h> +#include <string.h> + +#include <example_debug.h> +#include <odp.h> + +#include <odp_ipsec_offload_fwd_db.h> + +/** + * Pointer to Flow cache table + */ +flow_bucket_t *flow_table; + +/** + * bucket count. It will be updated with user argument if provided + */ +uint32_t bucket_count = DEFAULT_BUCKET_COUNT; + +/** Global pointer to fwd db */ +fwd_db_t *fwd_db; + +void init_routing_table(void) +{ + odp_shm_t hash_shm; + uint32_t i; + flow_bucket_t *bucket; + + /*Reserve memory for Routing hash table*/ + hash_shm = odp_shm_reserve("route_table", + sizeof(flow_bucket_t) * bucket_count, + ODP_CACHE_LINE_SIZE, 0); + if (hash_shm == ODP_SHM_INVALID) + EXAMPLE_ABORT("Error: shared mem alloc failed.\n"); + flow_table = odp_shm_addr(hash_shm); + if (!flow_table) + EXAMPLE_ABORT("Error: shared mem alloc failed.\n"); + /*Inialize Locks*/ + for (i = 0; i < bucket_count; i++) { + bucket = &flow_table[i]; + LOCK_INIT(&bucket->lock); + } + + memset(flow_table, 0, bucket_count * sizeof(flow_bucket_t)); +} + +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_ABORT("Error: shared mem alloc failed.\n"); + memset(fwd_db, 0, sizeof(*fwd_db)); +} + +int create_fwd_db_entry(char *input, char **if_names, int if_count, int entries) +{ + int pos = 0, i, match = 0, count = 0; + char *local; + char *str; + char *save; + char *token; + fwd_db_entry_t *entry = &fwd_db->array[fwd_db->index]; + + /* 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.mask); + break; + case 1: + strncpy(entry->oif, token, OIF_LEN - 1); + entry->oif[OIF_LEN - 1] = 0; + for (i = 0; i < if_count; i++) { + if (!strcmp(if_names[i], entry->oif)) { + match = 1; + break; + } + } + if (!match) { + printf("ERROR: interface name not correct for route\n"); + free(local); + return -1; + } + break; + case 2: + parse_mac_string(token, entry->dst_mac); + break; + default: + printf("ERROR: extra token \"%s\" at position %d\n", + token, pos); + break; + } + + /* Advance to next position */ + pos++; + } + + /* Verify we parsed exactly the number of tokens we expected */ + if (3 != pos) { + printf("ERROR: \"%s\" contains %d tokens, expected 3\n", + input, + pos); + free(local); + return -1; + } + + /* Add route to the list */ + fwd_db->index++; + entry->next = fwd_db->list; + fwd_db->list = entry; + + count++; + + while (count < entries) { + fwd_db_entry_t *new_entry = &fwd_db->array[fwd_db->index]; + + /* Verify we haven't run out of space */ + if (MAX_DB <= fwd_db->index) + return -1; + + new_entry->subnet.addr = entry->subnet.addr + count; + new_entry->subnet.mask = entry->subnet.mask; + strncpy(new_entry->oif, entry->oif, OIF_LEN - 1); + new_entry->oif[OIF_LEN - 1] = 0; + new_entry->dst_mac[0] = entry->dst_mac[0]; + new_entry->dst_mac[1] = entry->dst_mac[1]; + new_entry->dst_mac[2] = entry->dst_mac[2]; + new_entry->dst_mac[3] = entry->dst_mac[3]; + new_entry->dst_mac[4] = entry->dst_mac[4]; + new_entry->dst_mac[5] = entry->dst_mac[5]; + + /* Add route to the list */ + fwd_db->index++; + new_entry->next = fwd_db->list; + fwd_db->list = new_entry; + count++; + } + + free(local); + return 0; +} + +void resolve_fwd_db(char *intf, odp_pktout_queue_t pktout, uint8_t *mac) +{ + fwd_db_entry_t *entry; + + /* Walk the list and attempt to set output queue and MAC */ + for (entry = fwd_db->list; NULL != entry; entry = entry->next) { + if (strcmp(intf, entry->oif)) + continue; + + entry->pktout = pktout; + memcpy(entry->src_mac, mac, ODPH_ETHADDR_LEN); + } +} + +void dump_fwd_db_entry(fwd_db_entry_t *entry) +{ + char subnet_str[MAX_STRING]; + char mac_str[MAX_STRING]; + + printf(" %s %s %s\n", + ipv4_subnet_str(subnet_str, &entry->subnet), + entry->oif, + mac_addr_str(mac_str, entry->dst_mac)); +} + +void dump_fwd_db(void) +{ + fwd_db_entry_t *entry; + + printf("\n" + "Routing table\n" + "-------------\n"); + + for (entry = fwd_db->list; NULL != entry; entry = entry->next) + dump_fwd_db_entry(entry); +} + +fwd_db_entry_t *find_fwd_db_entry(uint32_t dst_ip) +{ + fwd_db_entry_t *entry; + + for (entry = fwd_db->list; NULL != entry; entry = entry->next) + if (entry->subnet.addr == (dst_ip & entry->subnet.mask)) + break; + return entry; +} diff --git a/example/ipsec_offload/odp_ipsec_offload_fwd_db.h b/example/ipsec_offload/odp_ipsec_offload_fwd_db.h new file mode 100644 index 00000000..492dddd8 --- /dev/null +++ b/example/ipsec_offload/odp_ipsec_offload_fwd_db.h @@ -0,0 +1,197 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#ifndef ODP_IPSEC_FWD_DB_H_ +#define ODP_IPSEC_FWD_DB_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#include <odp.h> +#include <odp/helper/eth.h> +#include <odp_ipsec_offload_misc.h> + +#define OIF_LEN 32 + +/** + * 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 */ + odp_pktout_queue_t pktout; /**< Output transmit queue */ + uint8_t src_mac[ODPH_ETHADDR_LEN]; /**< Output source MAC */ + uint8_t dst_mac[ODPH_ETHADDR_LEN]; /**< Output destination MAC */ + ip_addr_range_t subnet; /**< Subnet for this router */ +} fwd_db_entry_t; + +/** + * Forwarding data base global structure + */ +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; + +/** + * Flow cache table entry + */ +typedef struct { + void *next; /**< Pointer to next flow in list*/ + uint32_t l3_src; /**< Source IP Address*/ + uint32_t l3_dst; /**< Destination IP Address*/ + ipsec_out_entry_t out_port; /**< Out interface of matching flow*/ +} flow_entry_t; + +/** + * Flow cache table bucket + */ +typedef struct { + odp_spinlock_t lock; /**< Bucket lock*/ + flow_entry_t *next; /**< Pointer to first flow entry in bucket*/ +} flow_bucket_t; + +/** +* Pointers to Flow cache tables +*/ +extern flow_bucket_t *flow_table; + +extern flow_bucket_t *ipsec_out_flow_table; + +extern flow_bucket_t *ipsec_in_flow_table; + +/** + * Number of buckets in hash table + */ +extern uint32_t bucket_count; + +/* + * Allocate and Initialize routing table with default Route entries. + * + */ +void init_routing_table(void); + +/* + * Searches flow entry in given hash bucket according to given 5-tuple + * information + * + * @param sip Source IP Address + * @param dip Destination IP Address + * @param sport Source Port Number + * @param dport Destination Port Number + * @param proto IP protocol + * @param bucket Hash Bucket + * + * @return Matching flow entry + */ +static inline flow_entry_t *route_flow_lookup_in_bucket(uint32_t sip, + uint32_t dip, + void *bucket) +{ + flow_entry_t *flow, *head; + + head = ((flow_bucket_t *)bucket)->next; + for (flow = head; flow != NULL; flow = flow->next) { + if ((flow->l3_src == sip) && (flow->l3_dst == dip)) + return flow; + } + return NULL; +} + +/** + * Insert the flow into given hash bucket + * + * @param flow Which is to be inserted + * @param bucket Target Hash Bucket + */ +static inline void route_flow_insert_in_bucket(flow_entry_t *flow, + void *bucket) +{ + flow_entry_t *temp; + flow_bucket_t *bkt = (flow_bucket_t *)bucket; + + if (!flow) { + EXAMPLE_ERR("Invalid flow entry passed\n"); + return; + } + + LOCK(&bkt->lock); + /*Check that entry already exist or not*/ + temp = route_flow_lookup_in_bucket(flow->l3_src, flow->l3_dst, bkt); + if (temp) { + UNLOCK(&bkt->lock); + return; + } + + if (!bkt->next) { + bkt->next = flow; + } else { + temp = bkt->next; + flow->next = temp; + bkt->next = flow; + } + UNLOCK(&bkt->lock); +} + +/** Initialize FWD DB */ +void init_fwd_db(void); + +/** + * Create a forwarding database entry + * + * String is of the format "SubNet:Intf:NextHopMAC" + * + * @param input Pointer to string describing route + * @param if_names Array of Name of the interfaces available + * @param if_count number of interfaces in if_names array + * @param entries number of entries + * + * @return 0 if successful else -1 + */ +int create_fwd_db_entry(char *input, char **if_names, int if_count, + int entries); + +/** + * Scan FWD DB entries and resolve output queue and source MAC address + * + * @param intf Interface name string + * @param outq Output queue for packet transmit + * @param mac MAC address of this interface + */ +void resolve_fwd_db(char *intf, odp_pktout_queue_t pktout, uint8_t *mac); + +/** + * Display one fowarding 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); + +/** + * Find a matching forwarding database entry + * + * @param dst_ip Destination IPv4 address + * + * @return pointer to forwarding DB entry else NULL + */ +fwd_db_entry_t *find_fwd_db_entry(uint32_t dst_ip); + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/example/ipsec_offload/odp_ipsec_offload_misc.h b/example/ipsec_offload/odp_ipsec_offload_misc.h new file mode 100644 index 00000000..2a679983 --- /dev/null +++ b/example/ipsec_offload/odp_ipsec_offload_misc.h @@ -0,0 +1,366 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#ifndef ODP_IPSEC_MISC_H_ +#define ODP_IPSEC_MISC_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#include <odp.h> +#include <odp/helper/eth.h> +#include <odp/helper/ip.h> +#include <odp/helper/ipsec.h> + +#ifndef TRUE +#define TRUE 1 +#endif +#ifndef FALSE +#define FALSE 0 +#endif + +#define MAX_DB 1024 /**< maximum number of data base entries */ +#define MAX_STRING 32 /**< maximum string length */ +#define KEY_BITS_3DES 192 /**< 3DES cipher key length in bits */ +#define KEY_BITS_MD5_96 128 /**< MD5_96 auth key length in bits */ +#define KEY_BITS_AES 128 /**< AES cipher key length in bits */ +#define KEY_BITS_SHA1_96 160 /**< SHA1_96 auth key length in bits */ +#define KEY_BITS_SHA2_256 256 /**< SHA2_256 auth key length in bits */ + +/** + * Number of buckets in hash table + */ +extern uint32_t bucket_count; + +#define LOCK(a) odp_spinlock_lock(a) +#define UNLOCK(a) odp_spinlock_unlock(a) +#define LOCK_INIT(a) odp_spinlock_init(a) + +/** + * Hash calculation utility + */ +#define JHASH_GOLDEN_RATIO 0x9e3779b9 +#define rot(x, k) (((x) << (k)) | ((x) >> (32 - (k)))) +#define 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; \ +} + +/** + * Default Hash bucket number + */ +#define DEFAULT_BUCKET_COUNT 1024 + +/**< Number of bits represented by a string of hexadecimal characters */ +#define KEY_STR_BITS(str) (4 * strlen(str)) + +/** IPv4 helpers for data length and uint8t pointer */ +#define ipv4_data_p(ip) ((uint8_t *)((odph_ipv4hdr_t *)ip + 1)) + +/** 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)) + +/** + * Actual entries + */ +typedef struct { + odp_pktout_queue_t pktout; /**< queue handle*/ + odph_ethaddr_t addr; /**< pktio MAC Address*/ + odph_ethaddr_t next_hop_addr; /**< Next Hop MAC Address*/ + odp_ipsec_sa_t sa; /**< IPSec sa handle*/ +} ipsec_out_entry_t; + +/** + * IPsec key + */ +typedef struct { + uint8_t data[32]; /**< Key data */ + uint8_t length; /**< Key length */ +} ipsec_key_t; + +/** + * IPsec algorithm + */ +typedef struct { + odp_bool_t cipher; + union { + odp_cipher_alg_t cipher; + odp_auth_alg_t auth; + } u; +} ipsec_alg_t; + +/** + * IP address range (subnet) + */ +typedef struct ip_addr_range_s { + uint32_t addr; /**< IP address */ + uint32_t mask; /**< mask, 1 indicates bits are valid */ +} ip_addr_range_t; + +/** + * Parse text string representing a key into ODP key structure + * + * @param keystring Pointer to key string to convert + * @param key Pointer to ODP key structure to populate + * @param alg Cipher/authentication algorithm associated with the key + * + * @return 0 if successful else -1 + */ +static inline +int parse_key_string(char *keystring, + ipsec_key_t *key, + ipsec_alg_t *alg) +{ + int idx; + int key_bits_in = KEY_STR_BITS(keystring); + char temp[3]; + + key->length = 0; + + /* Algorithm is either cipher or authentication */ + if (alg->cipher) { + if ((alg->u.cipher == ODP_CIPHER_ALG_3DES_CBC) && + (KEY_BITS_3DES == key_bits_in)) + key->length = key_bits_in / 8; + if ((alg->u.cipher == ODP_CIPHER_ALG_AES_CBC) && + (KEY_BITS_AES == key_bits_in)) + key->length = key_bits_in / 8; + } else { + if ((alg->u.auth == ODP_AUTH_ALG_MD5_HMAC) && + (KEY_BITS_MD5_96 == key_bits_in)) + key->length = key_bits_in / 8; + if ((alg->u.auth == ODP_AUTH_ALG_SHA1_HMAC) && + (KEY_BITS_SHA1_96 == key_bits_in)) + key->length = key_bits_in / 8; + if ((alg->u.auth == ODP_AUTH_ALG_SHA256_HMAC) && + (KEY_BITS_SHA2_256 == key_bits_in)) + key->length = key_bits_in / 8; + } + + for (idx = 0; idx < key->length; idx++) { + temp[0] = *keystring++; + temp[1] = *keystring++; + temp[2] = 0; + key->data[idx] = strtol(temp, NULL, 16); + } + + return key->length ? 0 : -1; +} + +/** + * Check IPv4 address against a range/subnet + * + * @param addr IPv4 address to check + * @param range Pointer to address range to check against + * + * @return 1 if match else 0 + */ +static inline +int match_ip_range(uint32_t addr, ip_addr_range_t *range) +{ + return (range->addr == (addr & range->mask)); +} + +/** + * Generate text string representing IPv4 address + * + * @param b Pointer to buffer to store string + * @param addr IPv4 address + * + * @return Pointer to supplied buffer + */ +static inline +char *ipv4_addr_str(char *b, uint32_t addr) +{ + sprintf(b, "%03d.%03d.%03d.%03d", + 0xFF & ((addr) >> 24), + 0xFF & ((addr) >> 16), + 0xFF & ((addr) >> 8), + 0xFF & ((addr) >> 0)); + return b; +} + +/** + * 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 + * @param mask Pointer (optional) to return IPv4 mask + * + * @return 0 if successful else -1 + */ +static inline +int parse_ipv4_string(char *ipaddress, uint32_t *addr, uint32_t *mask) +{ + int b[4]; + int qualifier = 32; + int converted; + + 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 = b[0] | b[1] << 8 | b[2] << 16 | b[3] << 24; + if (mask) + *mask = ~(0xFFFFFFFF & ((1ULL << (32 - qualifier)) - 1)); + + 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) +{ + int idx; + int len; + + for (idx = 0; idx < 32; idx++) + if (range->mask & (1 << idx)) + break; + len = 32 - idx; + + sprintf(b, "%03d.%03d.%03d.%03d/%d", + 0xFF & ((range->addr) >> 24), + 0xFF & ((range->addr) >> 16), + 0xFF & ((range->addr) >> 8), + 0xFF & ((range->addr) >> 0), + len); + 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, uint8_t *mac) +{ + sprintf(b, "%02X.%02X.%02X.%02X.%02X.%02X", + mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); + return b; +} + +/** + * Parse text string representing a MAC address into byte araray + * + * String is of the format "XX.XX.XX.XX.XX.XX" where XX is hexadecimal + * + * @param macaddress Pointer to MAC address string to convert + * @param mac Pointer to MAC address byte array to populate + * + * @return 0 if successful else -1 + */ +static inline +int parse_mac_string(char *macaddress, uint8_t *mac) +{ + int macwords[ODPH_ETHADDR_LEN]; + int converted; + + converted = sscanf(macaddress, + "%x.%x.%x.%x.%x.%x", + &macwords[0], &macwords[1], &macwords[2], + &macwords[3], &macwords[4], &macwords[5]); + if (6 != converted) + return -1; + + mac[0] = macwords[0]; + mac[1] = macwords[1]; + mac[2] = macwords[2]; + mac[3] = macwords[3]; + mac[4] = macwords[4]; + mac[5] = macwords[5]; + + return 0; +} + +/** + * Locate IPsec headers (AH and/or ESP) in packet + * + * @param ip Pointer to packets IPv4 header + * @param ah_p Pointer to location to return AH header pointer + * @param esp_p Pointer to location to return ESP header pointer + * + * @return length of IPsec headers found + */ +static inline +int locate_ipsec_headers(odph_ipv4hdr_t *ip, + odph_ahhdr_t **ah_p, + odph_esphdr_t **esp_p) +{ + uint8_t *in = ipv4_data_p(ip); + odph_ahhdr_t *ah = NULL; + odph_esphdr_t *esp = NULL; + + if (ODPH_IPPROTO_AH == ip->proto) { + ah = (odph_ahhdr_t *)in; + in += ((ah)->ah_len + 2) * 4; + if (ODPH_IPPROTO_ESP == ah->next_header) { + esp = (odph_esphdr_t *)in; + in += sizeof(odph_esphdr_t); + } + } else if (ODPH_IPPROTO_ESP == ip->proto) { + esp = (odph_esphdr_t *)in; + in += sizeof(odph_esphdr_t); + } + + *ah_p = ah; + *esp_p = esp; + return in - (ipv4_data_p(ip)); +} + +/** + * Adjust IPv4 length + * + * @param ip Pointer to IPv4 header + * @param adj Signed adjustment value + */ +static inline +void ipv4_adjust_len(odph_ipv4hdr_t *ip, int adj) +{ + ip->tot_len = odp_cpu_to_be_16(odp_be_to_cpu_16(ip->tot_len) + adj); +} + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/example/ipsec_offload/odp_ipsec_offload_sa_db.c b/example/ipsec_offload/odp_ipsec_offload_sa_db.c new file mode 100644 index 00000000..602ed8db --- /dev/null +++ b/example/ipsec_offload/odp_ipsec_offload_sa_db.c @@ -0,0 +1,359 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +/* enable strtok */ +#define _POSIX_C_SOURCE 200112L + +#include <stdlib.h> +#include <string.h> + +#include <example_debug.h> + +#include <odp.h> + +#include <odp_ipsec_offload_sa_db.h> + +/** Global pointer to sa db */ +static sa_db_t *sa_db; + +/** Global pointer to tun db */ +static tun_db_t *tun_db; + +void init_sa_db(void) +{ + odp_shm_t shm; + + shm = odp_shm_reserve("shm_sa_db", + sizeof(sa_db_t), + ODP_CACHE_LINE_SIZE, + 0); + + sa_db = odp_shm_addr(shm); + + if (sa_db == NULL) + EXAMPLE_ABORT("Error: shared mem alloc failed.\n"); + memset(sa_db, 0, sizeof(*sa_db)); +} + +void init_tun_db(void) +{ + odp_shm_t shm; + + shm = odp_shm_reserve("shm_tun_db", + sizeof(tun_db_t), + ODP_CACHE_LINE_SIZE, + 0); + tun_db = odp_shm_addr(shm); + + if (!tun_db) + EXAMPLE_ABORT("Error: shared mem alloc failed.\n"); + memset(tun_db, 0, sizeof(*tun_db)); +} + +int create_sa_db_entry(char *input, odp_bool_t cipher, int entries) +{ + int pos = 0, count = 0; + char *local; + char *str; + char *save; + char *token; + sa_db_entry_t *entry = &sa_db->array[sa_db->index]; + + /* Verify we have a good entry */ + if (MAX_DB <= sa_db->index) + return -1; + + /* Make a local copy */ + local = malloc(strlen(input) + 1); + if (NULL == local) + return -1; + strcpy(local, input); + + /* Set cipher versus auth */ + entry->alg.cipher = cipher; + + /* 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->src_ip, NULL); + break; + case 1: + parse_ipv4_string(token, &entry->dst_ip, NULL); + break; + case 2: + if (cipher) { + if (0 == strcmp(token, "3des")) { + entry->alg.u.cipher = + ODP_CIPHER_ALG_3DES_CBC; + } else if (0 == strcmp(token, "aes")) { + entry->alg.u.cipher = + ODP_CIPHER_ALG_AES_CBC; + } else { + entry->alg.u.cipher = + ODP_CIPHER_ALG_NULL; + } + } else { + if (0 == strcmp(token, "md5")) { + entry->alg.u.auth = + ODP_AUTH_ALG_MD5_HMAC; + } else if (0 == strcmp(token, "sha1")) { + entry->alg.u.auth = + ODP_AUTH_ALG_SHA1_HMAC; + } else if (0 == strcmp(token, "sha256")) { + entry->alg.u.auth = + ODP_AUTH_ALG_SHA256_HMAC; + } else { + entry->alg.u.auth = ODP_AUTH_ALG_NULL; + } + } + break; + case 3: + entry->spi = strtol(token, NULL, 16); + break; + case 4: + parse_key_string(token, + &entry->key, + &entry->alg); + break; + default: + printf("ERROR: extra token \"%s\" at position %d\n", + token, pos); + break; + } + + /* Advance to next position */ + pos++; + } + + /* Verify we parsed exactly the number of tokens we expected */ + if (5 != pos) { + printf("ERROR: \"%s\" contains %d tokens, expected 5\n", + input, + pos); + free(local); + return -1; + } + + /* Add route to the list */ + sa_db->index++; + entry->next = sa_db->list; + sa_db->list = entry; + count++; + + while (count < entries) { + sa_db_entry_t *new_entry = &sa_db->array[sa_db->index]; + + /* Verify we have a good entry */ + if (MAX_DB <= sa_db->index) + return -1; + + new_entry->alg.cipher = entry->alg.cipher; + new_entry->src_ip = entry->src_ip + count; + new_entry->dst_ip = entry->dst_ip + count; + new_entry->alg.u.cipher = entry->alg.u.cipher; + new_entry->alg.u.auth = entry->alg.u.auth; + new_entry->spi = entry->spi + count; + new_entry->key = entry->key; + new_entry->alg = entry->alg; + /* Add route to the list */ + sa_db->index++; + new_entry->next = sa_db->list; + sa_db->list = new_entry; + count++; + } + + free(local); + return 0; +} + +int create_tun_db_entry(char *input, int entries) +{ + int pos = 0, count = 0; + char *local; + char *str; + char *save; + char *token; + tun_db_entry_t *entry = &tun_db->array[tun_db->index]; + + /* Verify we have a good entry */ + if (MAX_DB <= tun_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->src_ip, NULL); + break; + case 1: + parse_ipv4_string(token, &entry->dst_ip, NULL); + break; + case 2: + parse_ipv4_string(token, &entry->tun_src_ip, NULL); + break; + case 3: + parse_ipv4_string(token, &entry->tun_dst_ip, NULL); + break; + default: + printf("ERROR: extra token \"%s\" at position %d\n", + token, pos); + break; + } + pos++; + } + + /* Verify we parsed exactly the number of tokens we expected */ + if (4 != pos) { + printf("ERROR: \"%s\" contains %d tokens, expected 4\n", + input, + pos); + free(local); + return -1; + } + + /* Add route to the list */ + tun_db->index++; + entry->next = tun_db->list; + tun_db->list = entry; + count++; + + while (count < entries) { + tun_db_entry_t *new_entry = &tun_db->array[tun_db->index]; + + /* Verify we have a good entry */ + if (MAX_DB <= tun_db->index) + return -1; + + new_entry->src_ip = entry->src_ip + count; + new_entry->dst_ip = entry->dst_ip + count; + new_entry->tun_src_ip = entry->tun_src_ip + count; + new_entry->tun_dst_ip = entry->tun_dst_ip + count; + /* Add route to the list */ + tun_db->index++; + new_entry->next = tun_db->list; + tun_db->list = new_entry; + count++; + } + + free(local); + return 0; +} + +tun_db_entry_t *find_tun_db_entry(uint32_t ip_src, + uint32_t ip_dst) +{ + tun_db_entry_t *entry = NULL; + + /* Scan all entries and return first match */ + for (entry = tun_db->list; NULL != entry; entry = entry->next) { + if (entry->src_ip != ip_src) + continue; + if (entry->dst_ip != ip_dst) + continue; + break; + } + return entry; +} + +void dump_sa_db(void) +{ + sa_db_entry_t *entry; + + printf("\n" + "Security association table (ESP Only)\n" + "--------------------------\n"); + + for (entry = sa_db->list; NULL != entry; entry = entry->next) { + uint32_t idx; + char src_ip_str[MAX_STRING]; + char dst_ip_str[MAX_STRING]; + uint8_t *p = entry->key.data; + + if (entry->alg.cipher) { + printf(" %s %s %s %X %d ", + "cipher", + ipv4_addr_str(src_ip_str, entry->src_ip), + ipv4_addr_str(dst_ip_str, entry->dst_ip), + entry->spi, + (int)entry->alg.u.cipher); + } else { + printf(" %s \t\t\t\t\t %X %d ", + "auth", + entry->spi, + (int)entry->alg.u.auth); + } + /* Brute force key display */ + for (idx = 0; idx < entry->key.length; idx++) + printf("%02X", *p++); + + printf("\n"); + } +} + +sa_db_entry_t *find_sa_db_entry(ip_addr_range_t *src, + ip_addr_range_t *dst, + odp_bool_t cipher) +{ + sa_db_entry_t *entry = NULL; + + /* Scan all entries and return first match */ + for (entry = sa_db->list; NULL != entry; entry = entry->next) { + if (cipher != entry->alg.cipher) + continue; + if (!match_ip_range(entry->src_ip, src)) + continue; + if (!match_ip_range(entry->dst_ip, dst)) + continue; + break; + } + return entry; +} + +void dump_tun_db(void) +{ + tun_db_entry_t *entry; + + printf("\n" + "Tunnel table\n" + "--------------------------\n"); + + for (entry = tun_db->list; NULL != entry; entry = entry->next) { + char src_ip_str[MAX_STRING]; + char dst_ip_str[MAX_STRING]; + char tun_src_ip_str[MAX_STRING]; + char tun_dst_ip_str[MAX_STRING]; + + printf(" %s:%s %s:%s ", + ipv4_addr_str(src_ip_str, entry->src_ip), + ipv4_addr_str(dst_ip_str, entry->dst_ip), + ipv4_addr_str(tun_src_ip_str, entry->tun_src_ip), + ipv4_addr_str(tun_dst_ip_str, entry->tun_dst_ip) + ); + + printf("\n"); + } +} diff --git a/example/ipsec_offload/odp_ipsec_offload_sa_db.h b/example/ipsec_offload/odp_ipsec_offload_sa_db.h new file mode 100644 index 00000000..02b49d40 --- /dev/null +++ b/example/ipsec_offload/odp_ipsec_offload_sa_db.h @@ -0,0 +1,126 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#ifndef ODP_IPSEC_SA_DB_H_ +#define ODP_IPSEC_SA_DB_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#include <odp_ipsec_offload_misc.h> + +/** + * Security Association (SA) data base entry + */ +typedef struct sa_db_entry_s { + struct sa_db_entry_s *next; /**< Next entry on list */ + uint32_t src_ip; /**< Source IPv4 address */ + uint32_t dst_ip; /**< Desitnation IPv4 address */ + uint32_t spi; /**< Security Parameter Index */ + ipsec_alg_t alg; /**< Cipher/auth algorithm */ + ipsec_key_t key; /**< Cipher/auth key */ + odp_ipsec_mode_t mode; /**< SA mode - transport/tun */ +} sa_db_entry_t; + +/** + * Security Association (SA) data base global structure + */ +typedef struct sa_db_s { + uint32_t index; /**< Index of next available entry */ + sa_db_entry_t *list; /**< List of active entries */ + sa_db_entry_t array[MAX_DB]; /**< Entry storage */ +} sa_db_t; + +/** Initialize SA database global control structure */ +void init_sa_db(void); + +/** + * Create an SA DB entry + * + * String is of the format "SrcIP:DstIP:Alg:SPI:Key" + * + * @param input Pointer to string describing SA + * @param cipher TRUE if cipher else FALSE for auth + * @param entries number of entries + * + * @return 0 if successful else -1 + */ +int create_sa_db_entry(char *input, odp_bool_t cipher, int entries); +/** + * Display the SA DB + */ +void dump_sa_db(void); + +/** + * Find a matching SA DB entry + * + * @param src Pointer to source subnet/range + * @param dst Pointer to destination subnet/range + * @param cipher TRUE if cipher else FALSE for auth + * + * @return pointer to SA DB entry else NULL + */ +sa_db_entry_t *find_sa_db_entry(ip_addr_range_t *src, + ip_addr_range_t *dst, + odp_bool_t cipher); + +/** + * Tunnel entry + */ +typedef struct tun_db_entry_s { + struct tun_db_entry_s *next; + uint32_t src_ip; /**< Inner Source IPv4 address */ + uint32_t dst_ip; /**< Inner Destination IPv4 address */ + uint32_t tun_src_ip; /**< Tunnel Source IPv4 address */ + uint32_t tun_dst_ip; /**< Tunnel Source IPv4 address */ +} tun_db_entry_t; + +/** + * Tunnel database + */ +typedef struct tun_db_s { + uint32_t index; /**< Index of next available entry */ + tun_db_entry_t *list; /**< List of active entries */ + tun_db_entry_t array[MAX_DB]; /**< Entry storage */ +} tun_db_t; + +/** Initialize tun database global control structure */ +void init_tun_db(void); + +/** + * Create an tunnel DB entry + * + * String is of the format "SrcIP:DstIP:TunSrcIp:TunDstIp" + * + * @param input Pointer to string describing tun + * @param entries number of entries + * + * @return 0 if successful else -1 + */ +int create_tun_db_entry(char *input, int entries); + +/** + * Display the tun DB + */ +void dump_tun_db(void); + +/** + * Find a matching tun DB entry + * + * @param ip_src Inner source IP address + * @param ip_dst Inner destination IP address + * + * @return pointer to tun DB entry else NULL + */ +tun_db_entry_t *find_tun_db_entry(uint32_t ip_src, + uint32_t ip_dst); + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/example/ipsec_offload/odp_ipsec_offload_sp_db.c b/example/ipsec_offload/odp_ipsec_offload_sp_db.c new file mode 100644 index 00000000..a286a1c4 --- /dev/null +++ b/example/ipsec_offload/odp_ipsec_offload_sp_db.c @@ -0,0 +1,165 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +/* enable strtok */ +#define _POSIX_C_SOURCE 200112L + +#include <stdlib.h> +#include <string.h> + +#include <example_debug.h> + +#include <odp.h> + +#include <odp_ipsec_offload_sp_db.h> + +/** Global pointer to sp db */ +sp_db_t *sp_db; + +void init_sp_db(void) +{ + odp_shm_t shm; + + shm = odp_shm_reserve("shm_sp_db", + sizeof(sp_db_t), + ODP_CACHE_LINE_SIZE, + 0); + + sp_db = odp_shm_addr(shm); + + if (sp_db == NULL) + EXAMPLE_ABORT("Error: shared mem alloc failed.\n"); + memset(sp_db, 0, sizeof(*sp_db)); +} + +int create_sp_db_entry(char *input, int entries) +{ + int pos = 0, count = 0; + char *local; + char *str; + char *save; + char *token; + sp_db_entry_t *entry = &sp_db->array[sp_db->index]; + + /* Verify we have a good entry */ + if (MAX_DB <= sp_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->src_subnet.addr, + &entry->src_subnet.mask); + break; + case 1: + parse_ipv4_string(token, + &entry->dst_subnet.addr, + &entry->dst_subnet.mask); + break; + case 2: + if (0 == strcmp(token, "in")) + entry->input = TRUE; + else + entry->input = FALSE; + break; + case 3: + if (0 == strcmp(token, "esp")) { + entry->esp = TRUE; + } else if (0 == strcmp(token, "ah")) { + entry->ah = TRUE; + } else if (0 == strcmp(token, "both")) { + entry->esp = TRUE; + entry->ah = TRUE; + } + break; + default: + printf("ERROR: extra token \"%s\" at position %d\n", + token, pos); + break; + } + + /* Advance to next position */ + pos++; + } + + /* Verify we parsed exactly the number of tokens we expected */ + if (4 != pos) { + printf("ERROR: \"%s\" contains %d tokens, expected 4\n", + input, + pos); + free(local); + return -1; + } + + /* Add route to the list */ + sp_db->index++; + entry->next = sp_db->list; + sp_db->list = entry; + count++; + while (count < entries) { + sp_db_entry_t *new_entry = &sp_db->array[sp_db->index]; + + /* Verify we have a good entry */ + if (MAX_DB <= sp_db->index) + return -1; + + new_entry->src_subnet.addr = entry->src_subnet.addr + count; + new_entry->src_subnet.mask = entry->src_subnet.mask; + new_entry->dst_subnet.addr = entry->dst_subnet.addr + count; + new_entry->dst_subnet.mask = entry->dst_subnet.mask; + new_entry->input = entry->input; + new_entry->esp = entry->esp; + new_entry->ah = entry->ah; + /* Add route to the list */ + sp_db->index++; + new_entry->next = sp_db->list; + sp_db->list = new_entry; + count++; + } + + free(local); + return 0; +} + +void dump_sp_db_entry(sp_db_entry_t *entry) +{ + char src_subnet_str[MAX_STRING]; + char dst_subnet_str[MAX_STRING]; + + printf(" %s %s %s %s:%s\n", + ipv4_subnet_str(src_subnet_str, &entry->src_subnet), + ipv4_subnet_str(dst_subnet_str, &entry->dst_subnet), + entry->input ? "in" : "out", + entry->esp ? "esp" : "none", + entry->ah ? "ah" : "none"); +} + +void dump_sp_db(void) +{ + sp_db_entry_t *entry; + + printf("\n" + "Security policy table\n" + "---------------------\n"); + + for (entry = sp_db->list; NULL != entry; entry = entry->next) + dump_sp_db_entry(entry); +} diff --git a/example/ipsec_offload/odp_ipsec_offload_sp_db.h b/example/ipsec_offload/odp_ipsec_offload_sp_db.h new file mode 100644 index 00000000..bc6ba1aa --- /dev/null +++ b/example/ipsec_offload/odp_ipsec_offload_sp_db.h @@ -0,0 +1,72 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#ifndef ODP_IPSEC_SP_DB_H_ +#define ODP_IPSEC_SP_DB_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#include <odp_ipsec_offload_misc.h> + +/** + * Security Policy (SP) data base entry + */ +typedef struct sp_db_entry_s { + struct sp_db_entry_s *next; /**< Next entry on list */ + ip_addr_range_t src_subnet; /**< Source IPv4 subnet/range */ + ip_addr_range_t dst_subnet; /**< Destination IPv4 subnet/range */ + odp_bool_t input; /**< Direction when applied */ + odp_bool_t esp; /**< Enable cipher (ESP) */ + odp_bool_t ah; /**< Enable authentication (AH) */ +} sp_db_entry_t; + +/** + * Security Policy (SP) data base global structure + */ +typedef struct sp_db_s { + uint32_t index; /**< Index of next available entry */ + sp_db_entry_t *list; /**< List of active entries */ + sp_db_entry_t array[MAX_DB]; /**< Entry storage */ +} sp_db_t; + +/** Global pointer to sp db */ +extern sp_db_t *sp_db; + +/** Initialize SP database global control structure */ +void init_sp_db(void); + +/** + * Create an SP DB entry + * + * String is of the format "SrcSubNet:DstSubNet:(in|out):(ah|esp|both)" + * + * @param input Pointer to string describing SP + * + * @param entries number of entries + * + * @return 0 if successful else -1 + */ +int create_sp_db_entry(char *input, int entries); + +/** + * Display one SP DB entry + * + * @param entry Pointer to entry to display + */ +void dump_sp_db_entry(sp_db_entry_t *entry); + +/** + * Display the SP DB + */ +void dump_sp_db(void); + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/example/ipsec_offload/run_left.sh b/example/ipsec_offload/run_left.sh new file mode 100755 index 00000000..58986a2f --- /dev/null +++ b/example/ipsec_offload/run_left.sh @@ -0,0 +1,14 @@ +#!/bin/bash +# + +./odp_ipsec_offload -f 64 -i dpni.1,dpni.2 \ +-r 192.168.111.2/32:dpni.1:00.10.94.00.00.02 \ +-r 192.168.222.2/32:dpni.2:00.00.00.00.00.1 \ +-p 192.168.111.2:192.168.222.2:out:both \ +-e 192.168.111.2:192.168.222.2:aes:201:656c8523255ccc23a66c1917aa0cf309 \ +-a 192.168.111.2:192.168.222.2:sha256:201:a731649644c5dee92cbd9c2e7e188ee6aa0cf309a731649644c5dee92cbd9c2e \ +-t 192.168.111.2:192.168.222.2:192.168.100.1:192.168.200.1 \ +-p 192.168.222.2:192.168.111.2:in:both \ +-e 192.168.222.2:192.168.111.2:aes:201:656c8523255ccc23a66c1917aa0cf309 \ +-a 192.168.222.2:192.168.111.2:sha256:201:a731649644c5dee92cbd9c2e7e188ee6aa0cf309a731649644c5dee92cbd9c2e \ +-t 192.168.222.2:192.168.111.2:192.168.200.1:192.168.100.1 & diff --git a/example/ipsec_offload/run_right.sh b/example/ipsec_offload/run_right.sh new file mode 100755 index 00000000..d49aa194 --- /dev/null +++ b/example/ipsec_offload/run_right.sh @@ -0,0 +1,14 @@ +#!/bin/bash +# + +./odp_ipsec_offload -f 64 -i dpni.1,dpni.2 \ +-r 192.168.111.2/32:dpni.1:00.00.00.00.00.2 \ +-r 192.168.222.2/32:dpni.2:00.10.94.00.00.03 \ +-p 192.168.111.2:192.168.222.2:in:both \ +-e 192.168.111.2:192.168.222.2:aes:201:656c8523255ccc23a66c1917aa0cf309 \ +-a 192.168.111.2:192.168.222.2:sha256:201:a731649644c5dee92cbd9c2e7e188ee6aa0cf309a731649644c5dee92cbd9c2e \ +-t 192.168.111.2:192.168.222.2:192.168.100.1:192.168.200.1 \ +-p 192.168.222.2:192.168.111.2:out:both \ +-e 192.168.222.2:192.168.111.2:aes:201:656c8523255ccc23a66c1917aa0cf309 \ +-a 192.168.222.2:192.168.111.2:sha256:201:a731649644c5dee92cbd9c2e7e188ee6aa0cf309a731649644c5dee92cbd9c2e \ +-t 192.168.222.2:192.168.111.2:192.168.200.1:192.168.100.1 & diff --git a/example/m4/configure.m4 b/example/m4/configure.m4 index cab7f8b8..fb62e288 100644 --- a/example/m4/configure.m4 +++ b/example/m4/configure.m4 @@ -12,6 +12,7 @@ AC_CONFIG_FILES([example/classifier/Makefile example/hello/Makefile example/ipsec/Makefile example/ipfragreass/Makefile + example/ipsec_offload/Makefile example/l2fwd_simple/Makefile example/l3fwd/Makefile example/packet/Makefile ----------------------------------------------------------------------- Summary of changes: example/Makefile.am | 1 + example/ipsec/odp_ipsec_cache.c | 4 + example/ipsec_offload/.gitignore | 1 + example/ipsec_offload/Makefile.am | 18 + example/ipsec_offload/odp_ipsec_offload.c | 854 +++++++++++++++++++++ example/ipsec_offload/odp_ipsec_offload_cache.c | 146 ++++ example/ipsec_offload/odp_ipsec_offload_cache.h | 78 ++ .../odp_ipsec_offload_fwd_db.c} | 80 +- example/ipsec_offload/odp_ipsec_offload_fwd_db.h | 197 +++++ .../odp_ipsec_offload_misc.h} | 93 ++- .../odp_ipsec_offload_sa_db.c} | 109 ++- .../odp_ipsec_offload_sa_db.h} | 19 +- .../odp_ipsec_offload_sp_db.c} | 41 +- .../odp_ipsec_offload_sp_db.h} | 8 +- example/ipsec_offload/run_left.sh | 14 + example/ipsec_offload/run_right.sh | 14 + example/m4/configure.m4 | 1 + 17 files changed, 1570 insertions(+), 108 deletions(-) create mode 100644 example/ipsec_offload/.gitignore create mode 100644 example/ipsec_offload/Makefile.am create mode 100644 example/ipsec_offload/odp_ipsec_offload.c create mode 100644 example/ipsec_offload/odp_ipsec_offload_cache.c create mode 100644 example/ipsec_offload/odp_ipsec_offload_cache.h copy example/{ipsec/odp_ipsec_fwd_db.c => ipsec_offload/odp_ipsec_offload_fwd_db.c} (62%) create mode 100644 example/ipsec_offload/odp_ipsec_offload_fwd_db.h copy example/{ipsec/odp_ipsec_misc.h => ipsec_offload/odp_ipsec_offload_misc.h} (78%) copy example/{ipsec/odp_ipsec_sa_db.c => ipsec_offload/odp_ipsec_offload_sa_db.c} (72%) copy example/{ipsec/odp_ipsec_sa_db.h => ipsec_offload/odp_ipsec_offload_sa_db.h} (84%) copy example/{ipsec/odp_ipsec_sp_db.c => ipsec_offload/odp_ipsec_offload_sp_db.c} (74%) copy example/{ipsec/odp_ipsec_sp_db.h => ipsec_offload/odp_ipsec_offload_sp_db.h} (90%) create mode 100755 example/ipsec_offload/run_left.sh create mode 100755 example/ipsec_offload/run_right.sh hooks/post-receive --

7 years, 2 months

[COMMIT] branch api-next updated. v1.16.0.0-739-geb8be4f5

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 eb8be4f5a77b45fe279c1412231c5bc7de32a166 (commit) via b15b01036bd985d6218f9f756d108712c8d84fed (commit) from 85b2f8e1f52929dec7f5d8933c8cb4b9373b6754 (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 eb8be4f5a77b45fe279c1412231c5bc7de32a166 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Wed Dec 13 22:38:10 2017 +0300 linux-gen: pktio: loop: reset packet subtype to BASIC Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/pktio/loop.c b/platform/linux-generic/pktio/loop.c index 6d19863f..7f2e35c1 100644 --- a/platform/linux-generic/pktio/loop.c +++ b/platform/linux-generic/pktio/loop.c @@ -172,19 +172,18 @@ static int loopback_send(pktio_entry_t *pktio_entry, int index ODP_UNUSED, bytes += odp_packet_len(pkt_tbl[i]); } - if (pktio_entry->s.config.outbound_ipsec) - for (i = 0; i < len; ++i) { - odp_ipsec_packet_result_t result; + for (i = 0; i < len; ++i) { + odp_ipsec_packet_result_t result; - if (packet_subtype(pkt_tbl[i]) != - ODP_EVENT_PACKET_IPSEC) - continue; + if (packet_subtype(pkt_tbl[i]) == + ODP_EVENT_PACKET_IPSEC && + pktio_entry->s.config.outbound_ipsec) { /* Possibly postprocessing packet */ odp_ipsec_result(&result, pkt_tbl[i]); - - packet_subtype_set(pkt_tbl[i], ODP_EVENT_PACKET_BASIC); } + packet_subtype_set(pkt_tbl[i], ODP_EVENT_PACKET_BASIC); + } odp_ticketlock_lock(&pktio_entry->s.txl); commit b15b01036bd985d6218f9f756d108712c8d84fed Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Wed Dec 13 22:35:51 2017 +0300 linux-gen: pktio: loop: reset flags before reparsing packtes Stale flags can interfere with packet processing, so let's reset them. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/pktio/loop.c b/platform/linux-generic/pktio/loop.c index f887e1a2..6d19863f 100644 --- a/platform/linux-generic/pktio/loop.c +++ b/platform/linux-generic/pktio/loop.c @@ -88,6 +88,7 @@ static int loopback_recv(pktio_entry_t *pktio_entry, int index ODP_UNUSED, pkt_len = odp_packet_len(pkt); pkt_hdr = odp_packet_hdr(pkt); + packet_parse_reset(pkt_hdr); if (pktio_cls_enabled(pktio_entry)) { odp_packet_t new_pkt; odp_pool_t new_pool; ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/pktio/loop.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) hooks/post-receive --

7 years, 2 months

[COMMIT] branch api-next updated. v1.16.0.0-737-g85b2f8e1

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 85b2f8e1f52929dec7f5d8933c8cb4b9373b6754 (commit) via ba4559f569397e401ea41e67661d9fd0052b33ba (commit) from d3d70123198484f659f1aebc6e34a4da89e10b29 (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 85b2f8e1f52929dec7f5d8933c8cb4b9373b6754 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Fri Dec 22 01:09:28 2017 +0300 validation: ipsec: fix two c&p errors Fix two c&p errors in testsuite configuration setup/validation. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/ipsec/ipsec.c b/test/validation/api/ipsec/ipsec.c index d6ce34aa..ea3cff05 100644 --- a/test/validation/api/ipsec/ipsec.c +++ b/test/validation/api/ipsec/ipsec.c @@ -136,7 +136,7 @@ int ipsec_check(odp_bool_t ah, if ((ODP_IPSEC_OP_MODE_SYNC == suite_context.inbound_op_mode && ODP_SUPPORT_NO == capa.op_mode_sync) || - (ODP_IPSEC_OP_MODE_ASYNC == suite_context.outbound_op_mode && + (ODP_IPSEC_OP_MODE_SYNC == suite_context.outbound_op_mode && ODP_SUPPORT_NO == capa.op_mode_sync) || (ODP_IPSEC_OP_MODE_ASYNC == suite_context.inbound_op_mode && ODP_SUPPORT_NO == capa.op_mode_async) || @@ -888,7 +888,7 @@ int ipsec_config(odp_instance_t ODP_UNUSED inst) * in test checking function and just say that the test is inactive. */ if ((ODP_IPSEC_OP_MODE_SYNC == suite_context.inbound_op_mode && ODP_SUPPORT_NO == capa.op_mode_sync) || - (ODP_IPSEC_OP_MODE_ASYNC == suite_context.outbound_op_mode && + (ODP_IPSEC_OP_MODE_SYNC == suite_context.outbound_op_mode && ODP_SUPPORT_NO == capa.op_mode_sync) || (ODP_IPSEC_OP_MODE_ASYNC == suite_context.inbound_op_mode && ODP_SUPPORT_NO == capa.op_mode_async) || commit ba4559f569397e401ea41e67661d9fd0052b33ba Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue Dec 19 07:16:18 2017 +0300 validation: crypto: run the test twice to catch no-reinit errors Add another iteration of crypto opertion to be run when testing to catch different 'not reinitialized' or 'not cleared' errors. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/crypto/odp_crypto_test_inp.c b/test/validation/api/crypto/odp_crypto_test_inp.c index 8474ed83..f1da6989 100644 --- a/test/validation/api/crypto/odp_crypto_test_inp.c +++ b/test/validation/api/crypto/odp_crypto_test_inp.c @@ -276,6 +276,13 @@ static int alg_packet_op_enq(odp_packet_t pkt, return 0; } +typedef enum crypto_test { + NORMAL_TEST = 0, /**< Plain execution */ + REPEAT_TEST, /**< Rerun without reinitializing the session */ + WRONG_DIGEST_TEST, /**< Check against wrong digest */ + MAX_TEST, /**< Final mark */ +} crypto_test; + /* Basic algorithm run function for async inplace mode. * Creates a session from input parameters and runs one operation * on input_vec. Checks the output of the crypto operation against @@ -296,7 +303,7 @@ static void alg_test(odp_crypto_op_t op, int rc; odp_crypto_ses_create_err_t status; odp_bool_t ok = false; - odp_bool_t should_fail = false; + int iteration; odp_crypto_session_param_t ses_params; odp_crypto_cipher_capability_t cipher_capa[MAX_ALG_CAPA]; odp_crypto_auth_capability_t auth_capa[MAX_ALG_CAPA]; @@ -451,66 +458,71 @@ static void alg_test(odp_crypto_op_t op, odp_packet_t pkt = odp_packet_alloc(suite_context.pool, ref->length + ref->digest_length); CU_ASSERT(pkt != ODP_PACKET_INVALID); -restart: - if (op == ODP_CRYPTO_OP_ENCODE) { - odp_packet_copy_from_mem(pkt, 0, ref->length, ref->plaintext); - } else { - odp_packet_copy_from_mem(pkt, 0, ref->length, ref->ciphertext); - odp_packet_copy_from_mem(pkt, ref->length, - ref->digest_length, - ref->digest); - if (should_fail) { - uint8_t byte = ~ref->digest[0]; + for (iteration = NORMAL_TEST; iteration < MAX_TEST; iteration++) { + /* checking against wrong digest is meaningless for NULL digest + * or when generating digest */ + if (iteration == WRONG_DIGEST_TEST && + (auth_alg == ODP_AUTH_ALG_NULL || + op == ODP_CRYPTO_OP_ENCODE)) + continue; + + if (op == ODP_CRYPTO_OP_ENCODE) { + odp_packet_copy_from_mem(pkt, 0, ref->length, + ref->plaintext); + } else { + odp_packet_copy_from_mem(pkt, 0, ref->length, + ref->ciphertext); odp_packet_copy_from_mem(pkt, ref->length, - 1, &byte); + ref->digest_length, + ref->digest); + if (iteration == WRONG_DIGEST_TEST) { + uint8_t byte = ~ref->digest[0]; + + odp_packet_copy_from_mem(pkt, ref->length, + 1, &byte); + } } - } - if (!suite_context.packet) - rc = alg_op(pkt, &ok, session, - ovr_iv ? ref->iv : NULL, - &cipher_range, &auth_range, - ref->aad, ref->length); - else if (ODP_CRYPTO_ASYNC == suite_context.op_mode) - rc = alg_packet_op_enq(pkt, &ok, session, - ovr_iv ? ref->iv : NULL, - &cipher_range, &auth_range, - ref->aad, ref->length); - else - rc = alg_packet_op(pkt, &ok, session, - ovr_iv ? ref->iv : NULL, - &cipher_range, &auth_range, - ref->aad, ref->length); - if (rc < 0) { - goto cleanup; - } + if (!suite_context.packet) + rc = alg_op(pkt, &ok, session, + ovr_iv ? ref->iv : NULL, + &cipher_range, &auth_range, + ref->aad, ref->length); + else if (ODP_CRYPTO_ASYNC == suite_context.op_mode) + rc = alg_packet_op_enq(pkt, &ok, session, + ovr_iv ? ref->iv : NULL, + &cipher_range, &auth_range, + ref->aad, ref->length); + else + rc = alg_packet_op(pkt, &ok, session, + ovr_iv ? ref->iv : NULL, + &cipher_range, &auth_range, + ref->aad, ref->length); + if (rc < 0) + break; - if (should_fail) { - CU_ASSERT(!ok); - goto cleanup; - } + if (iteration == WRONG_DIGEST_TEST) { + CU_ASSERT(!ok); + continue; + } - CU_ASSERT(ok); - - if (op == ODP_CRYPTO_OP_ENCODE) { - CU_ASSERT(!packet_cmp_mem(pkt, 0, - ref->ciphertext, - ref->length)); - CU_ASSERT(!packet_cmp_mem(pkt, ref->length, - ref->digest, - ref->digest_length)); - } else { - CU_ASSERT(!packet_cmp_mem(pkt, 0, - ref->plaintext, - ref->length)); - if (ref->digest_length != 0) { - should_fail = true; - goto restart; + CU_ASSERT(ok); + + if (op == ODP_CRYPTO_OP_ENCODE) { + CU_ASSERT(!packet_cmp_mem(pkt, 0, + ref->ciphertext, + ref->length)); + CU_ASSERT(!packet_cmp_mem(pkt, ref->length, + ref->digest, + ref->digest_length)); + } else { + CU_ASSERT(!packet_cmp_mem(pkt, 0, + ref->plaintext, + ref->length)); } } -cleanup: rc = odp_crypto_session_destroy(session); CU_ASSERT(!rc); ----------------------------------------------------------------------- Summary of changes: test/validation/api/crypto/odp_crypto_test_inp.c | 116 +++++++++++++---------- test/validation/api/ipsec/ipsec.c | 4 +- 2 files changed, 66 insertions(+), 54 deletions(-) hooks/post-receive --

7 years, 2 months

[COMMIT] branch api-next updated. v1.16.0.0-735-gd3d70123

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 d3d70123198484f659f1aebc6e34a4da89e10b29 (commit) via 1adc8ef5dbcfde127c1b52df84152c187519b27e (commit) from 177eeff39e19289e771119cfdffc515cb16f9db5 (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 d3d70123198484f659f1aebc6e34a4da89e10b29 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Thu Dec 21 00:35:46 2017 +0300 validation: crypto: do not run tests if mode is not supported Do not run packet tests if corresponding packet-mode operation is not supported by the platform. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/crypto/odp_crypto_test_inp.c b/test/validation/api/crypto/odp_crypto_test_inp.c index 7ad2889f..8474ed83 100644 --- a/test/validation/api/crypto/odp_crypto_test_inp.c +++ b/test/validation/api/crypto/odp_crypto_test_inp.c @@ -533,6 +533,15 @@ static int check_alg_support(odp_cipher_alg_t cipher, odp_auth_alg_t auth) if (odp_crypto_capability(&capability)) return ODP_TEST_INACTIVE; + if (suite_context.packet) { + if (suite_context.op_mode == ODP_CRYPTO_SYNC && + capability.sync_mode == ODP_SUPPORT_NO) + return ODP_TEST_INACTIVE; + if (suite_context.op_mode == ODP_CRYPTO_ASYNC && + capability.async_mode == ODP_SUPPORT_NO) + return ODP_TEST_INACTIVE; + } + /* Cipher algorithms */ switch (cipher) { case ODP_CIPHER_ALG_NULL: commit 1adc8ef5dbcfde127c1b52df84152c187519b27e Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Thu Dec 21 00:35:03 2017 +0300 linux-gen: crypto: populate sync/async_mode caps Report to application that crypto module supports packet operation in both sync and async modes. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/odp_crypto.c b/platform/linux-generic/odp_crypto.c index 11635cda..69e6d0da 100644 --- a/platform/linux-generic/odp_crypto.c +++ b/platform/linux-generic/odp_crypto.c @@ -722,6 +722,9 @@ int odp_crypto_capability(odp_crypto_capability_t *capa) /* Initialize crypto capability structure */ memset(capa, 0, sizeof(odp_crypto_capability_t)); + capa->sync_mode = ODP_SUPPORT_PREFERRED; + capa->async_mode = ODP_SUPPORT_YES; + capa->ciphers.bit.null = 1; capa->ciphers.bit.trides_cbc = 1; capa->ciphers.bit.aes_cbc = 1; ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/odp_crypto.c | 3 +++ test/validation/api/crypto/odp_crypto_test_inp.c | 9 +++++++++ 2 files changed, 12 insertions(+) hooks/post-receive --

7 years, 2 months

[COMMIT] branch next updated. v1.16.0.0-733-g177eeff3

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 177eeff39e19289e771119cfdffc515cb16f9db5 (commit) via 49665e54259bc04b1ba0f9bc0456714d98ab13c6 (commit) via 1f82edd05f4e83ac3a6d6a3a3cd0ec914d5ad359 (commit) via c38fc105f0e9a88dd4ebb4d9e7ac9e1160466322 (commit) via 4c4052f894b8df5784d2aae2e36b96796ee020fd (commit) via 9e388b884efed8d653cf453f6516f34019d02305 (commit) via 11da2d3bc8871379321048a5e951e142aa594b9d (commit) via 192693591500302fd5232eee92144dba204abaaf (commit) via 75f0096e1af7eca556e9f1c896f7cc34cc325edc (commit) via 3c02836d9d9ca16b1277bdd30e523779b9fe8374 (commit) via bb003e11ae7bfacc1fb1e9b8276dd49a32a31b4e (commit) via b5dfcef4586e0a1618c202aaeb7e863c17cc4d06 (commit) via f2a1a84b43642f3d0911a351d9308d5501693290 (commit) via 233d0aa078f6c70a10c84e1bc1365b18c39a7ae9 (commit) via b1c287aa71c7559ee0cd1b1f3eef971491cf1c04 (commit) via 9e35c84dea1b66bae27a35dfc71018a0bb455950 (commit) via 54a0bc673c5fa6f1f579821faab8390556a6d424 (commit) via 567764ef01021210b8aa587df90ac1477715ec5c (commit) via 38487572609049023e51c88adbe1b2e77d62d996 (commit) via 9e0a675bacbbc497065e66e467a0ed75b1296a16 (commit) via 12fd3a9224a856271934986a1bad981843915d68 (commit) via 0588040068a50d0d15a641d091fce23214b15594 (commit) via 82f09d83ab85401f4d8d81c7c843c9b4c9f888f4 (commit) via 8a3c2a83b81c6f5b9f697681c970593c95141828 (commit) via 2269d302cdb9356255c9e0e004b170f016ec0e5e (commit) via cffa4354cf0eb389e3ebb0108c71d4b1620463b7 (commit) via 27c53bc0cd34582b772dff0b104385e8869caf07 (commit) via 81ab0809af1b12eb5d65ed1ed6ddddfb0dfce833 (commit) via 511178e589b1865d93ed0eb3cb0e33e3b18f8027 (commit) via 73f047f65c214f7dd81c93e9cb54b00576650217 (commit) via 0d6b4b8b03370a79c5f090a521f89186a821f350 (commit) via 30762920eaed9ecb1d2e5d68f05c90b349e1b472 (commit) via 661fa940d2d6c2897f96d22bffdf2c71d6fee2de (commit) via 11815a8c8efc1c614d334430e24b0d9ebc913f87 (commit) via 3842b5fa56f460b3c571dc0b5154fa2fa8291c5a (commit) via b60b7080c27f72a197af8312a531d6c89772aaea (commit) via 1a92f9cf847bc00d923076c1c0d32240b3e3dc5b (commit) via da9d347e0bbe337ea86448306432080206f3ef49 (commit) via d533d85ad15ea431a431c407dad468e38ae87ec0 (commit) via fa7ce5da4b669e55b8d34c7d90b67070879ba5da (commit) via 6b5cdc77eb9759a2349b10372a964648559bc92c (commit) via bb0ec2f991bc5b295928e87c8b9bc0efb92479d3 (commit) via ffcd7991e44109464fb8a71f9ee10546ea5b84b0 (commit) via d96a8207591fbcaac25b79286d7d72a537354c1f (commit) via 21ed0fc8045e32e3263f5782401dbfe860152965 (commit) via 87d47c93d93ed934af9502937d2aceaec59d229a (commit) via bcbbe7e92c5a9510735a541d06342cc4923e5bbd (commit) via 99a2871375955861c46a271162e86a4ac13a2d8b (commit) via fe7221162f62b820b053a8b12fa2b11005769693 (commit) via 4612aa0de04cea3b7dc1b74678a9b25d2bc832b0 (commit) via 76997bb4087981751966df0fa1d0897486a3da1d (commit) via 65d690fbcf03c6a4d5eb3f01bde36807833feaaa (commit) via 8e2b2acb39e27ff172461b425abf2fef6413f522 (commit) via d43523f0e0175ade19a7d944ef7fbd98247f5d7a (commit) via 428099c6200e764bd50581b65084e1e4cbe07dce (commit) via d187988a5f1c16efc67e2bc70730bd3735683742 (commit) via f2092a68171e9cdd83ce9f055b81cba4f9b5899d (commit) via 58a6affec5db9c2e21d21ad5513d45e4b9e07c63 (commit) via cc727d927fe007c1fb85d97bd3225fbb4a044166 (commit) via 0405287898a99821691928e4fd1f9afe91681c3a (commit) via bb77b93e77c75a4a7507543ff0d38d32fe8b51ed (commit) via b8c85795ffd6fc98813b4882ba671866d19762ba (commit) via 015674f10e67c319e6299fe99332787c491d59c2 (commit) via 0c7769e1e8e7893f3631d7c8b8297f87b718d27d (commit) via 87ec9465899591ddc2125740d19a395d4b8b9608 (commit) via 411629a3e9efb8e44f5d0c6337c565720418d653 (commit) via 072b0d72318cfb5b847300404a2bd2130e5130c1 (commit) via ced550922123b8fd8151d98490a78766a0bcf847 (commit) via 630d8422564ebf4991b468cb38a29e9483fc2ec2 (commit) via 6881620135a179911a5839d4be97423a8d80e5ab (commit) via e118bc6c2084c306968cb5d947649eca4a8029ba (commit) via f55bd7c695d142cfb2306b5f156bc401ba11473b (commit) via 6e09adf147ad3ccb4df1cc988d20d31c3246d2aa (commit) via ec42b01dc4f9992d0efef95d7f55399bba115f90 (commit) via 1b9cf6bc48e3ce6ef889e84cff400974a6ec2ed2 (commit) via bf6d0c8164f4f53192405a238262f1135b637679 (commit) via 5158e0deb21aa90d1e032f75e703c9fa8e0b95c0 (commit) via ab18a721760b8a4b61c0feec8fa6724ef2990a86 (commit) via 1b285bbdd1abbec9853e1bc51bdb6ee02643b1a7 (commit) via 37b4da286aeff3321084e62045d0b3ab10c07399 (commit) via e02d9f43ea8675db5ad5202ef605e6dd8014abb5 (commit) via 442638dd1514f8dda882d48fbb1ebc88ef9af430 (commit) via c6573eb58dcf0d0316ada1e91ae1993100c4d559 (commit) via aab8ff7237c117e9ed63a8b7d595aca7f5665ff9 (commit) via c15a810b7a47f2e07200f83aa534163ca06e2b16 (commit) via aef79483e3d3e517b4cf2d71b3c22985326532c0 (commit) via f49d7bad7316ed0be807f37984908fc37da68004 (commit) via 0980001e33b4190133d478a0aa2e718fd1e3c164 (commit) via 297df8bbdd88a2104c6dd0f6c2e506eb5140dd1c (commit) via 32bd7464a8d86b0d83daf1760202dbdc5eabccec (commit) via 811281a22b6274b7f41b926a9cfbe09e48a366bd (commit) via cf7d38c194f1a9183a524790511de8bfd74a36a9 (commit) via c3f33dfa9ad624a7450b3f03bd06af7f92b69d8b (commit) via 94530b3d56086e446fe056098fa37da048efd1b6 (commit) via a65377ad173426db06b023764703f158e88565e2 (commit) via ea8e4fff42411c5534ba7fbeeefd8fec4c1ac8be (commit) via 52b07a3ffadeb7f653b1a3a1a129402e3becd027 (commit) via 1e41d8bb45ccc1d7f5b7340742d8c9f85eb9660c (commit) via 7c027d493295ba07fd27697827300e4c8e15475d (commit) via bdb7cbf620ada8682c89b5ae5a97cb84f16c0ed0 (commit) via e4b4bab2247e7724fb4b5983e54fd62676f1d206 (commit) via 22441cdcb569d5c6147db5d67e62fde67a3daad5 (commit) via 2ae5d875aab20e728c231361af95e1c57336daa5 (commit) via c370d7950524a968bbc148644f7c5fc619c78600 (commit) via 28a3b9e30fb4e8784a8781e06e28d3f175e05749 (commit) via ad990bbf88d95b2a4f9583b7fda718bf5d7d4212 (commit) via d6be400839611af3ca47baa85e8fed12d0c87e29 (commit) via d2a70019d5fb5443f80a4896dd30b710d3988e8e (commit) via 2526489e826f49dede472782621c0e0ba8976745 (commit) via 8ff99a64d79b6e3e350037575b9d5bc9adeca267 (commit) via 4cb02e1caccb9179575e95448fd46979e17d0905 (commit) via 90f2fe4ce26e7a2b66bb5eb13e372ccf3dec0d1c (commit) via b95e7d08043ba45d12635c5afaa3fbf3a07ecc90 (commit) via a8caa46fbe095a8308538539907e5af664fafea8 (commit) via a72a1e82ad31d5555c644508d5f35c590b3c4073 (commit) via 94cea0ca54d4a10f5e46c76d6047422274294aec (commit) via 2e93b540f69eae505b4505ada1912ac0d2bdea31 (commit) via a2c78489c30722a5d0b14e994f713e4a393a0801 (commit) via be13cd9dfdc276d039cbd5658ec1b0166397ac0c (commit) via 84cf048f83fb15fbfae66bca824220635ddc0339 (commit) via 89159170e2e4fc90f6f2c8b0d7f017a3a650623d (commit) via 5329e5211c447b9b823149baf76112eedfeb07fb (commit) via ce058b8fdde37cc302bcf589f458dab7b8d3e365 (commit) via 5d6a9f036cdeeb79215328a63b2dc63962e292a0 (commit) via 4459e1bd35534dd1b6a313890c74086c0e86c617 (commit) via 163f57de92d66336433cf5638538828e10053655 (commit) via fe1f56c168423800534b85d61f319d1dc327b49b (commit) via d4b364849c4abb4c71e0c5260e1a793ebb8dc97d (commit) via 4ddb329e3ed4401c9e5ebd42a2e54af28a1c4df6 (commit) via 0d50939e19104a179af57de555c35d209e5d7ae6 (commit) via f052591a39aa7c08d4868face4e6be17696ee946 (commit) via b8ca2afddff13fb79dabc9b04748dde24afb53e5 (commit) via b571aebe37d22c2ec1642b51a05aedcb73f83247 (commit) via 34b945c77b9d88ce3b984d2703e9a69883b565c9 (commit) via c4c795f20e7b726b820481a1130847a30f55aab8 (commit) via 871e5ba93165c5f46a339989018549fffc483299 (commit) via 12a572044af7311bc900ec8819b6221aca6f90a4 (commit) via a975690536d3e78bd7d6aa8a27a22f58a0c7d4ea (commit) via 718b5ce6e5871dafab4e198f0429bd2047a0eee7 (commit) via a3c129506c5a08c50af4722148c698ad6b575011 (commit) via 9163719bd4c04321592dad9da7f26539f49c8b7a (commit) via 7e9004e87bab2eacd82d449286a84ae7a8cb75ab (commit) via d593398b2d55faf1e07f124a4c807c006eb856ea (commit) via 4af5396e77ff170c80ec3720028493ed2c9f4826 (commit) via ba93e355ddf151215aa18b59cbfca08fe175fe65 (commit) via c5ff08b1496abd9a5fcbb1944f49e54a4e9bbabe (commit) via be65d81a9342e322b70376adab69270c5c9bb9e2 (commit) via 71b8cfcecb99c8416200f1f54ab5d6dab004a69a (commit) via dae20519a6825217dbe27842f1a24b1401410836 (commit) via 5a5a8148fcd174cffd3e9140bed3259ac1af2d9f (commit) via c54180d65bc9b86200f46b4f0ac540f74b884ee8 (commit) via 7c665557d21db3ba7c4dd3d3845e7175a4a2acb6 (commit) via 774f242c72008eecf5b07b341b76f577445fb4fb (commit) via a4165611e5aa58b138946e17a079f8a7f065d08c (commit) via fee9e59ca4a53ac30fea62d6b2f4b22a53042fe1 (commit) via ad863d29c6e46487ed1ef3fad0766037faac919f (commit) via 44f8d1421361c3238fed85a1a3d5ebff8f39cc88 (commit) via 412235594802aa4e4b3f63efc464de18955265c5 (commit) via 11620182599921c91e2d4f764b0ef921c171523b (commit) via 043db6742a8dfc218409aba0e456365163b8b249 (commit) via 16568d747ba2eb4a91962641e19b5da1d7a6091c (commit) via cf17398302b4114b17d92d41de4dd4fe7d72a16a (commit) via 26a556e03e07e62e4bcdf3dec6c76ebb02aa5efd (commit) via 12403213da9cd4600f4e3b61a10e2369219061f0 (commit) via 5cbb3749e3478d9ed22423399c2339b7fa39442f (commit) via a908a4dead95321e84d6a8a23de060051dcd8969 (commit) via 157234c02e26c66581b9a661ab3bbb62439c906d (commit) via ab19e58de943b3324e96a2ef92e4aa533b1be165 (commit) via fc020907bee7ec2ba976bc02399f6fd47f110d65 (commit) via 9ff682c8d0315f3f1921d5b9fe13d62897c78710 (commit) via 1ae234f54c17374997a89e5858f9e0d7855f8cf0 (commit) via 58bc37399f6bdb2426bf2eb6ba4eee6791a9c8a4 (commit) via 9b3a29ddb261d2b030a7806933787aaaee497aab (commit) via a57dc0bce7aab4600548096dd358e88ca2f4fe1c (commit) via a1312ccf383637b5711c0f8c4bab6f43e63325dc (commit) via 4da1cb6040dece2ece108cd383ab4212e7f7fe85 (commit) via f6d3bc302664e2c4121e798e86758d93fdb156f5 (commit) via 6333b39f1bd5ebe184780260566b84340104efeb (commit) via 78ced32df325dac7ff58ff28684fdb941f5ec1b3 (commit) via fbb6a7feba146acb1495fbdcd93e1b691a7363a0 (commit) via 23b6eee83bc5717f4797441bddbb035e3388ff10 (commit) via 0ec5bc6b5c3a178d7b316bdf9e18db452ba5ed58 (commit) via 9c389e1785fd000203eb2198f9fc2778be8f83e6 (commit) via 3d254a24a1a911aad72f0535412644824872307f (commit) via f4d6c91588b414fcb70abcc83941e8e4c1cd2f5e (commit) via fd192cba9c4e1f36a1bf3819f35f5e684ca80b1e (commit) via 43cff7996bcdd6264bf6066a8be9424b2e12ca21 (commit) via d22c949cc466bf28de559855a1cb525740578137 (commit) via 637353bbd96770741cbb58711c78c9dc01e4ea34 (commit) via ebdf6e27af66a58fff6a17a1c6c2cd6ae85909f1 (commit) via cc97d3ae6d6d4c07ec77e7b33e2529154fb0ed24 (commit) via 94cb17b703f1efba6a89207b893d9f4ef5297d8d (commit) via c04eff910a7b18f47365f90fadb6133474e9cae5 (commit) via 201a96f9bbcbabd904362ba05a179c72689a578e (commit) via d61d32590d1772b70b8dcd0d0ec44d29029d7443 (commit) via 66b363634fe1bba003cdb9e4e49a5980fc8c79f4 (commit) via 63d92eb289261d1534b5b9e1e04291faa5e45d30 (commit) via 825f75ed8644ef57c5648961e7982daf13cd9375 (commit) via 18977d0684ef7a26ddd6777ca341f7b1ca9e5c3e (commit) via f4d54b8831df52878b66bb145124a9adb4beab28 (commit) via e733d6ba6382ccbf9d6c84a6a10bf720c2e16c0d (commit) via ec6510b33e8b96d6d6670efb9dc3c9101baed6c6 (commit) via af4565caa0f9d171db466554ee631338b9844cbe (commit) via afa7e20ab3b7a6e68a556f00b49aa19ea4a29be6 (commit) via e3108af2f0b58c2ceca422b418439bba5de04b11 (commit) via cd196cf12f957456b24c844b2c38be5062130cf1 (commit) via dee4a7512c21a8b7f15a4a05e6736de373df92f0 (commit) via f70ff3bc542961d52f9b0f867298014650c8e49e (commit) via 700c0ac917fedf532e9a7e21c42624faa4b09a5f (commit) via 20aba9a17664fb8d5261bece23a1c20f1a3465f7 (commit) via ce4bd52afcef245b069acfe8dc53bd62aec576fd (commit) via 01b5f7e0c0bcec5beb58c99573906b1a4ee8e5f0 (commit) via 5e8f87ae22ca0c3e6137f91f15c967aec958a67e (commit) via 9e10a562dfb67b7a37c67fecff3de00be798961a (commit) via 86d651b86c10dd77603354110644ad346dfb3e26 (commit) via bc3cad50ec6668064bae1af164875c93832caff8 (commit) via 9c747985d4c448ef737376c5c8180b78ae1e7378 (commit) via 698f370e71db55624e1bd78063569369f86db389 (commit) via edca8cd1e55898826f79383b689c2c4bd2c28b3a (commit) via afeda4d14bb6f449cb269680cdbd56b26726eedf (commit) via 60a1a4f1cc531d7f0117cd79daf1cbe4206e12ef (commit) via 2fb72324f0a247ffb800b54f112eb75716b42c22 (commit) via 90c3fdd7124ad1ed887fa6b09b7665a39021e895 (commit) via 9d65b4659d98c0c5c2b45c2733d7cc2ef3d13123 (commit) via 39126ab23611e57d4015b376f1e7222489ca2c63 (commit) via beff45d25a614e7b4c84fc734fc588f1c26bb8c4 (commit) via d340de6d0a6002d7f145d278ccf18d4c9c9b233d (commit) via e943f8213505508125e39bf228ba80dab1cb8378 (commit) via a197b3ca3ae732cb8b9aa8237e3ffd5249ecb361 (commit) via bf803098eb1518dfb9e719071256fe22700b8c72 (commit) via a2e288f35da1f3838f0650157932a93091e6c3f4 (commit) via 7ea3096a0b64b605fd14d654a6b1f644ea72ba3d (commit) via 458683cb05ecdf60c38d2827e8f6241ab4afa8e4 (commit) via 9695d43dc1afa2baf968c97f1afff11e381408aa (commit) via d74515dcb08a8f15ffee5fca621bd8dc1742a9f5 (commit) via 24bf1003e1fbf6ca4003c31a79dfe5ddc40e38d9 (commit) via 506bf9dcf0e071cd8b168806b1d279124551af86 (commit) via 41472f5887d172234aaa89af0775b9e32f2209e9 (commit) via 8f63377237e1f783f77c2baf94922f07bcb24a55 (commit) via 75cfc6f70d5b21d6f04082e1d03a7e677a895280 (commit) via 50cb30d14d432257f0a80da45b71bce2ddacad8d (commit) via e04e5f90df69e3031622b77fb5273b85d47eb966 (commit) via a9f4c8dd372b1846390ceae6f3f7c8e7578ad743 (commit) via 13322ca632f8ffba292bec058e597719bc54142d (commit) via bfbe4f50a2e8a2532fdcb4d2c16d42a477183c07 (commit) via 6e79d897e3d5010991bf6e6ebf207bfd988f1129 (commit) via c6ab55e8bc2b797af290349b56c829e38839929b (commit) via f2da0136e11df9372ada5f01efdc4cf176680dea (commit) via e344e4364f771f32b86d822d0c447770588fe65d (commit) via f3fa10fa00f5040f5ce2bfd18894227a7ef76c02 (commit) via 4e6dbf3c8151335c2a5361da3f228666c688d8fa (commit) via f172905f96be14da4760653cba92cd1f9c820374 (commit) via 7018fa1c5e446ca8f60490c848a95b27e942783b (commit) via f66f92352bb5d1ed3a19fe5b5b8ca0419e525274 (commit) via e35949df96b46d2e23ca83029f468415efcbf18a (commit) via d248692dfe6ace13138e48eb1c23c1f5e942269c (commit) via 88efcd91e325438d7e2b7c410213ca95a9acefe5 (commit) via f91cde2bb770eefcfe791ce49c67ce3b1f5bf6d2 (commit) via 3e03317f3663abc76708141233b18d6225b2482b (commit) via cc6d4562f16e134299e21ca3e545999c97549ad0 (commit) via 80321bd9880b03929056483be9bc9d8861636b33 (commit) via 8c5516bba62ee7250cbf64d1f4b89ee4f0b12824 (commit) via 32f5f3ff343b516cb0dbe98e81479e6c748f0ebf (commit) via 3c9248f5c98b194d91712fafed4bf3b21327f2a8 (commit) via 6b6253c30f88c80bf632436ff06c1b000860a2f1 (commit) via c0c20e6ed7d0f86dca02a276a7f991586fa7f33d (commit) via 7fa8e2c97ed18f8dd6e95cbc78b7e668ccb98869 (commit) via 53120868fba0d742961817683f01b1bee25f4e4c (commit) via 8d21533c341c0624f693af554341dd389c358238 (commit) via a3ca7d17f74e515f9ab4a738191a6a1da96463ab (commit) via 60d79f29df4ace1eac5ee53fbc4ab153398d36fd (commit) via 4eae04e80a634c17ac276bb06bce468cbe28cde0 (commit) via 3b8515fbd81fe4017632e7e48754a5b99f684d2e (commit) via 91c0b58fc87ba0431241818758cea94438cd5498 (commit) via 4c8578a2105e37e645e3606622fd8c6e46b77443 (commit) via 1bc3a176474ccb199caba9a05cbfaf713ed00707 (commit) via d5bd5c2634af91c1088a1de931f7a72666e8993e (commit) via b2270c5b1d2badb93dd7e6dc743191c04c562ad1 (commit) via 0b2b26281c0d1d8d00d69f9829e32c9a99b7af0f (commit) via 1bc1b6fed4c75b3bd9305d2c9e646efc50de5fb3 (commit) via 1e1ee0b03cc481e027b1cb911cce1b16fb2fee9a (commit) via 859293ad9b3c862264bb0fbfe8e7037b5e04d084 (commit) via 307ebe505ceb2de6ea03c29f37de0d3a5db850ed (commit) via 7b835f0e9eac18eba901e42f4054110bae9b78f5 (commit) via 7bb364313bfeed59556e167bfa848e9ea6f52669 (commit) via 0bc12ffcf7898515c74a5567b832dcfc913d831a (commit) via 22ec8f3aefe9b2c92020cd9aa36e9f8e5a380799 (commit) via 2119e4548281ed50fecc5fe9f5bddcaa2adee2de (commit) via 3547226b19e6982bf74fc8c258b89db2c5f6a39c (commit) via 762372f299b64c8c30c3f5a0ba51fbb48e234e1e (commit) via e420668cd3886f003c8bd6022e210bf08a0ee3b5 (commit) via 2394317ab247fa14b4e239aec512afee7eac4524 (commit) via 09ce9406e09eacadf8f739ae8499323ad1401d36 (commit) via a165ff4093f666e5481ae5113f70b41e3354520d (commit) via 41abc837a5c25d8df3429398bcb51c72b83999e5 (commit) via 8390f890d4bd2babb63a24f7b15d2f4763e44050 (commit) via e02f89b3a981d5f87332cd9a3dfd6b532f92c3bc (commit) via 8eeb3366d62c34665bcef2392b22b73489d70f88 (commit) via 705062dc19a4ce5e6ae2224c21bc9e32dae64ebc (commit) via b4cd6c50f9f0c2e1fa975b768253d4f4b35fad07 (commit) via e65248393a0d7263a26e4e8e4f64ac12c7142c54 (commit) via 999042e51837a7ed8c7fb616f75707349515fc3d (commit) via aaceddaf56175ee207fcbf9c241a7839bdea091b (commit) via 30ed14c05ac17406c2f7890b34c4ac580b5e7a45 (commit) via c16f1363303cd5fc11324acbc4dfebe0a9680a41 (commit) via fbdc9ca1e38e6c97014e68bf7b83e59096a170b7 (commit) via 2e08ac6e40551704c43233b40a9227a19fd4623b (commit) via 5386c44d204f0b42f2773cf87126ff8981bf3270 (commit) via 56dbc8702500f7d7e518fcea4f3b1ff853722004 (commit) via 70714a8c35381330647a3578d3b853af4ea4a045 (commit) via 985db92075ffcdc48eb89954a90429e4cb9b4501 (commit) via daa04baf2cc2fc562dbf4ee8eaeed00f9594e08a (commit) via db7cc41aeb559dd296f3a6d8570aa10326a31d5e (commit) via ae42f98c1a1c309c0718a3b5fc8589660de0f867 (commit) via 7e71ca2883bbdeb4765e476fcfe3334e4fbfbd88 (commit) via 333c585111723d2cb7dae0cf1517cc1f3453df4d (commit) via bc36acc21368ff3f27d5b3836e8524747e0ab4c9 (commit) via f49ce736d461c3e8c2534ed216e8a70e8bee954e (commit) via d4b85d07214fb1f566b8ac346375cfe097c0bb51 (commit) via 127c73198b07dfe413e8ce401bb26f3e5ff71e91 (commit) via 2cd78610004d755dbe7a8e9c29086791793aea19 (commit) via e58e1fc97f392f63a267c2252656367b12417152 (commit) via a3ff4f6726582e41dd1398a6939a1877b9f25edc (commit) via 4e3598f34f16aa9e50ac1aaae2b4074cd806e419 (commit) via 697c4a58d57c286e679dd570722d8875ccf05a27 (commit) via 6879ecd2d136508e59cf8d9b8f15c6475ba74c99 (commit) via 698d82ce41a3f6ca08c6f218784d3eea6ac81e42 (commit) via cd097450cbf9d7bb6cd24654f8d43ceade5b114a (commit) via ee5be324411a7520528a367967c28fc529d3bc2e (commit) via 533a2fe155aa16268bfe4091a3a056a78d5dbfc6 (commit) via b4edd15ea49b38a0c1ed2bd021ee36aa296a79b0 (commit) via 99b74cbb3c77902322933192ce68f8c1abe21e84 (commit) via d0e3acc0cfdab0d4c66b49ea70207d8938569b80 (commit) via c6e3edd5dc52764e4f1772341dc568a549d7eaa9 (commit) via 26644862f90f4dc2f6ed99534d16f8b4d136de82 (commit) via e777674f2d484e98e3329c3e22022fb4c6d86069 (commit) via 0275cc02d5cdb54b955cfce1988f5ee158ad0423 (commit) via d30dc0774647b3f635afea67e56147b8e6e3f24e (commit) via bf5d48ee13aa4fb737ee430038d5f2b865f45d47 (commit) via 1ba2bcd7b9ebfa1a5d8dda257c7b309d3553fa03 (commit) via 8869e18f490d0ffc35e0359a92ef96eacbf5b0b7 (commit) via 91c4f94f1ed01ed22b7cd489016016b0599f4065 (commit) via 1cb0a8863eb8309c3e532a168fed34d6e3257218 (commit) via faf97a341df8e92fd692029fe2c6c353f043950b (commit) via c7718962c6633c80eb71a0400d89c31f11f88045 (commit) via 79ce62cf3266b0d1b05acc68be382cd6271b7371 (commit) via 39e4ebd39f2d171bbfef5bfee6596033b83c56a0 (commit) via f9e7f458cf7151c75a9145272c62306b96f9ff27 (commit) via b668182d6ea0cb942c2cf43771c618c9457bf146 (commit) via eb564bfb6f813ec3f2fe8a8d4ce0da25220b4215 (commit) via 8fea9ff7d8fde984981e681f49133dbda8429b7f (commit) via 15c97427d01c81dc9f4d0aafe9b0a99cdb2d1fc6 (commit) via 00a21c6dce65a30c8250db59a42a43c658e8ca1b (commit) via 08463cdedd4ab64ea94dbf90c7417bf403bf7aaa (commit) via 500cb603d5e1cb4926986242ad51d995b494c2e8 (commit) via dd394c9d9a88161e157317fa8a6eba92cb6f2e01 (commit) via 60ad22e8bd7624432e9504d32309c691fedcf27f (commit) via 4a38c7c61a370007bea53f9bb36279ce3ba42233 (commit) via e91a24138eec9054fc083174e3d071269dc1e4b6 (commit) via 3687001250f4b50af8c2f9d9aa61d3ee99976a1e (commit) via 7a5813042d58598e1c66243d8cfed548302edfc4 (commit) via 759a54bf66317fee539f2b2649c283be937d832a (commit) via 9fd48a9215a7831ca951839b7187bd1eb3f7bb06 (commit) via bf554b2d9472ed8ed04580904d0aa906cdbe1e83 (commit) via ac89f9c568830498b186dff33e908053dbdc88c7 (commit) via 5b08cc290a4a84ed0ffbc4a591427f1891b9ace3 (commit) via 5551c0d76bd721110a0fa4ba1423fe1edb0fd530 (commit) via e2169ff2026af51eec351cd679891c303ab651e0 (commit) via e3c2e06c4420f41d7053e615ac1cc6c1dc315407 (commit) via f9dcbcc3f45fcd6d825c087fc55c631d6b30fa8c (commit) via 845743bd80da73f2a296f24090dfe058d3be7dec (commit) via bbd08a6c0c31c12275089c3134c9e7e58eb0fafa (commit) via 0468dc01b3ae1517d57cf960b511ab066a9d5f05 (commit) via 274a0b016d8c2eed9f065186ad5458c5edb94dad (commit) via 0ce5d628d817003ca0f96beddece3f618f4593bb (commit) via 65a46f66bfcb6b2034d4b0563facc36cbac1e286 (commit) via 441fb964f22b2baaa97641e6f8dda88d32d153f6 (commit) via d5ff31f14e87c815d3a0e0461206aa2687152dd5 (commit) via 4bcd15e2bfb839ac0ef6419aa9e7b720958638f7 (commit) via 58a8ec90b57eae43be6461d1ae407e70a87c65d2 (commit) via ebbd8301f396e3f2f106ed94ce5c3970ec8bacce (commit) via a5ef33a6f2575cd011cb05c3fb1b06d1c017f879 (commit) via 361f0fa4addf83ae9b30d5e705e1f86643a45bab (commit) via cb17e380f1231328cbaaf35635f6db9fb5b99bb8 (commit) via 244fce69b25af28cbe5c19b11bfc3da5aa8da95d (commit) via 974e4477a35742b8021e25692a458d16cd2087f1 (commit) via 4f97e500a097928e308a415c32a88465adc5f5cc (commit) via 2ea71a57ae4b6122e3e74782aeea2846a757cb14 (commit) via 8b30e228ba2c303b3c69ffa4fbb9f138d2523d9a (commit) via 57783b35f4383bdfdd146f2a3333bbc8bb995896 (commit) via 904631219eab0af46cb99e8a56742401452ac2c3 (commit) via f7bd3a7bbb3613260ef2bad1e3ede5145571dd6c (commit) via d3602cb56413bb31b4535976dfd3dd723a16bfc9 (commit) via 908e27635dfe08e249407f4c4e53aa2c7ce12ea1 (commit) via d80e025c8baebed0305648737e528580b84fae2a (commit) via 33a0dad444fab1c1567083b289eac7727eab3b31 (commit) via ccb2cd5eb7383f46051dff2b1e7675ed54f635b2 (commit) via d8e4647baa7b1159480dfde4d5a2143146e8c6cb (commit) via 20cc38e36a52f70758c3464014f4f00a94d2139d (commit) via 9bb2a439ae2a8751df5a6007a7e242d7bcb963e5 (commit) via a6fa9f3e721dbdb99e2a0bac320f988930e5f874 (commit) via b2261b9485e6993642c5c0c7ea58abb8a2d356a9 (commit) via c969cc4e6f6e2e0cc5c4e407dd696be069cf4525 (commit) via 3a1832865c90865de3fd8bd30103995637e7851c (commit) via ab5a099937bc3d81f610fcfc2a98bfb7e677a06a (commit) via 9f506fecfcd408a8af0df0e9627795d0b1059730 (commit) via c184a9c8d35c10b30014e7538a862a7bc42556e7 (commit) via 9ebcb7c6e2f3226c915c39c81dcd1895dda3639b (commit) via 2f137b2bc9cb9c03a586d2cb324a6a5659098c39 (commit) via 2f1a96d47bb2e6c413ed06749633dcfe33f02b97 (commit) via 4cdaf5527dba63858080c0942ac1c971c615f066 (commit) via 77dff4e05611bc5b06b4bfb5dd86da6d4c3fffa5 (commit) via a9fc17e1bbef1c3585fd5de47e5023e4d66504f5 (commit) via b67bfce457a7546bbae4dad16b5185629eda77e5 (commit) via 552817483e9d4b6a84d49960920f1de50029f111 (commit) via 2e36f75db71b230021cd907a5aadf39559683d16 (commit) via f20dee9db3da9425d8764e414b04cdcbd41bece8 (commit) via 3faf025987a1640983080a2743e58fbb3cbac55e (commit) via 0a3e5be140e77167173b9af4b72cdad8451aff71 (commit) via f15441382809525bea73554ccba9ca44d0337466 (commit) via 826ee894aa0ebd09d42a17e1de077c46bc5b366a (commit) via 191ee818e5951e8334ec54d40d5b02065ee33c5c (commit) via f4c213cccc49b4b28557506ad19fba49b872d24f (commit) via 900dd9e2d3d2ae751ab2bc4e11dbd48ea7ed7030 (commit) via 15ba8d1e557073921f8fa2cf5eb1e7673052526f (commit) via 1d01a8cb56618aa062740a2e9ad13898c7aa5a38 (commit) via 3ea9c1dac34e0fb4785b0d643056c731daa55e85 (commit) via 540490ddf3a1b3da4b80ed15fc874ccdfc49b60c (commit) via 56fd0a5135769bee1b7b841e7b8d1e391fba377f (commit) via 0707c974ed19c859fb92778c35a2f92bf7cd9fc6 (commit) via 8e3a2c996b3bc212b82ddb779a1ea27ae5b13d83 (commit) via a4a49d582128e0be434c3dbd99688708396396ad (commit) via e4b3ebcfddacc605cca78fe123a985e478262d11 (commit) via 467285f59991e0f28d22a50c99e56f07a4380b8d (commit) via e0e038bab9fc2a9641e1eddd50d115ace2a66cef (commit) via 4584e90f7b19a1f7456f46e61f818e73ff0c7377 (commit) via 419cab0fcfccc7b702a7592dff98d108c24e49bf (commit) via 8b29e0ad33bb176374f47ae0bc2388b0d8d2b926 (commit) via 09a0e859caa4dbd68deb459e0160aed1ff8b5168 (commit) via 617999503a54c52daf86abcaef12542e67c3d47a (commit) via 54e52ac90cc564e83d9fd3d22e5fd0d084fec1c3 (commit) via 4fd46d42fb7fb7867ef269fc491eae7a7b303630 (commit) via b8c3fffa30ff5c07fe28bab562510157050ebeff (commit) via 0b1dbf37b4030c6da4c6f13645c63fd4ac8ff923 (commit) via 4702cbf3b3aaa62c7f5438526164a314c86e7d37 (commit) via fce704f34f8af56d8c63b9e77c9a4f7a590655b4 (commit) via 8df1b60560ac49b403bfb044c04595b831bc393b (commit) via bac3806356694060d30bf3c83e4133410fecd9ab (commit) via 9393c7ab63c79de0037e0b63443107c0f5462654 (commit) via 758bec9d721e3cba97d1a8abbe252f4abbd1e2d9 (commit) via 492973829259043135528e2313a8012412e09a3b (commit) via 432ff281b9c9b534f413cdd78b8c616fff310878 (commit) via 2da3adc6e475a336ddb81bf4bdb495f039dca9a9 (commit) via c29707f5604dd365412fd6c39987c9956590447b (commit) via f28f05a4df320c6a7ba8be858bdc3d8d6b91c0b2 (commit) via cba5ed063304a619bd709a9f37400884dce90485 (commit) via c4c5fbb7ab395443d53efed0741136d92ef13d7a (commit) via d4419b080f46aa347637f04445f856e2badaabfa (commit) via 58a963ccab214829a7526498b2b63349d4f5caef (commit) via 6ce267197a66180042916368a469ed9dcc33eaa7 (commit) via d025907602c5cae0f46b8b5219bf392bdba8dc21 (commit) via dd36b4758d0cd9f9929a13d42ec2ac38ae972e37 (commit) via f9a28807aaf8781c9b9576a04dce207f95fb8118 (commit) via 186c93faeecb570db14da3d4ce3b192a25724de1 (commit) via 984778d1562767ab963b9f8098836b87a83a07b0 (commit) via 2dd92b8e9c95882a5137cbccfc20c1b3fc64cb73 (commit) via 6ae7b56334f1795203355f3f4429d3f76bce15bf (commit) via 38485719c028918b019c6a5fc67cf05053421c83 (commit) via 5a770508ecf93cd026eed5091d6325688c3c375d (commit) via f6486c42c9fd0c3e3853c7a69096372ecce2bd69 (commit) via 49228f455b870bacb9dce9edc3e03ffe7e9be2bb (commit) via cd0d6fc0adfbc7442c36053f61dc75b1ea15ef78 (commit) via 912d68821ff365d29c1487287d6e1c44276f3380 (commit) via 5f9dc6f33876b5c797a046164db8a919dc7b9751 (commit) via ce1850c781e3a60d6a2afaf52eced67ebcaa95f4 (commit) via e91cf8bb39da24d2a7dbfbb328aa35d1c4cab4ea (commit) via acdefa627a82975d90fc3fe686f7e8b1b62434a3 (commit) via 35e0f869ff3db3c0b2f2100541ba4897d8bef7b4 (commit) via ff6c083358f97f7b5b261d8e75ca7a2eaaab5dea (commit) via 834c4787fd48b2532266c9ba49c15edc64bdb8b6 (commit) via 2138886d47cc41cf145ce9c085bd26439b1b2438 (commit) via d4627e38c1750ef3a0f063c72bbc0e8c3f1775a8 (commit) via 6111bd9ec71787f86375f333ace6c731b4d3f0d4 (commit) via 2eb3e7aa8afebb137a5aac2be4166c3ccfa3e581 (commit) via ba70a2a8ef150ac62f2850e0b47d4708f3730a79 (commit) via 926505016132ba543251eb109d5c9c93f8520314 (commit) via 037e35f0f948a87e3daede33747177615aa3bab0 (commit) via 144a2cd89865b5565a6064c3b1db4987bd1b4e58 (commit) via e554ba1a30e0bd7f6fe0c3ccd8c8846ef41ae9e4 (commit) via 06eed47498a6697365cb3498975caf90a581179a (commit) via effdb6228cd9c56a0f3af7f1ef3277cbf1971c23 (commit) via 2e2d96234dd05c5a4dac03c31d1634bc9008da0a (commit) via a820c285a87dfa274c6290638983575bb2e63ba4 (commit) via 44ae9773bc94f8cd349034901f08a2eed46dc822 (commit) via 82e5497c801ee3be6f49371c065b4eb43628048c (commit) via 3f5d8c5b1f50efe8bf017b8a0014af668c664c43 (commit) via f72f999552de02c602864baa82bb374322415b24 (commit) via 56ee80a8482f1161a84b3e5145fab2e0f7653ccb (commit) via abc36ae6747eb7729ea10ab4fa806939abca8c3e (commit) via cc9544d7d0289f20bf52636b78ec59b22852816c (commit) via fbab0b2bab55742ceface59778de8606e3bd062c (commit) via a1bcdb71f9c5525e02a9609fb32b767f4f76b082 (commit) via f21b2d23874d517e147a3e096e99aa272b99dbe4 (commit) via 3ffa326e2dbdcfcc631c672bc5f443f4ca8fe911 (commit) via 66bc236b2059f554c378b90d5291ca4a8aecf5b4 (commit) via 22a659377f3b181e351428708708971c819582f7 (commit) via 458bc7ddf290806f0a95c76da6f6d4f3c8a07737 (commit) via 12229e66492f7947c180cf540aecd53096431bc8 (commit) via 7378c0ddeb8c34a38d0021230a65bccfc21a6f1b (commit) via 2961df923de0b3034c09a288b28394c1a2ea1a9d (commit) via 9fbdbe9a6a86705339858a906ea66f076cc66785 (commit) via 0b6dec84249c688b00c3044064ed6645aff696fb (commit) via 530fa00fb2d341a0869af63fa9ab003dc526dc6f (commit) via f8efe73e2991c480d76eb636be61ab90f1053591 (commit) via 91d481e072a0283216979e1a88467fdeef5cca6b (commit) via 0ae648ccc23a8d71086746656a10b68a7c5ebe80 (commit) via 355f20a9f0eaa99359fa1bddcce8b192fef36ad5 (commit) via a8cf3e576ab37b597a3d7e28130affc4988f2579 (commit) via 1588c49a0bf0332512d5e08e1feaad5e4005df31 (commit) via 9f88e0b17e7e814f2c15c3c9ee0103196864a7d5 (commit) via 0abda2f57e088c9db6e48a265a417f47b1e4720c (commit) via 9107db16944d821a1c959049acc1fe3ff29f2341 (commit) via 567c2e8a0fd6b51db8b82ce926cc41d4c0e7898b (commit) via 91f1ce71dc3d2694152d71690c1e7638716b9391 (commit) via 00070be1d569bd575b100d52e5e263eb89ac962c (commit) via 7c24a62ac2cf48e42306db70fcc9967ab7709a8d (commit) via 746253e631e4926b3e2e383ae02c258c0cca583f (commit) via c674957bf300963c33246c01c565a888888ec6a8 (commit) via d00173ec9c344a7f0383848c0a778dd32eb96629 (commit) via a30f753880f71d631e54ff5a020e312d7ab5dc3c (commit) via 0bc071471f0466b6c821d561c5b4aadb7a548a36 (commit) via bf65cf6e5d0385262e317c7931a68d61301cb042 (commit) via 23e46735f93fa6dfc02b3fe78000b137f3c2d983 (commit) via df97183dd71b214df6da679bbaf795a66bae4fdc (commit) via b7da911ca3a7d3ed172f4e4010912ef920ddcf1f (commit) via 9d65090ebcf45deb5677ffeb4aa2a26a96235dc5 (commit) via 13debc384227f93fbad3118d9ab28f89c451d849 (commit) via f405a3d63893f863afb6a503ecd992829cc36cb6 (commit) via f71a2aa01d7be1bbe6abec4610ee3708bd9b65b5 (commit) via c28c81745896d433262cc964d341f6e2d448c12f (commit) via c10a2195b23c5ad230dad2ee252a96d1e418b5c7 (commit) via c5f11369e83182f6c9df7b567806e25c3ee316a4 (commit) via ef7c7ef43f3a5d8f84d5e78e7868da241a1b4bdb (commit) via 22b3986fea090986625f3255d57b64de35bbc475 (commit) via 31e7ccd795e3b61374566963fb1a8fa493cfed99 (commit) via da32d187cee59c0cb0c5ddf4fb0b22d387e8d951 (commit) via fdea056cbbf922f09591a5b6c8012f9363d64a5f (commit) via b1c5e3268121cd5a47a4891160307a77d2f37658 (commit) via aac8e11d594697717aca51597738a83eda248eed (commit) via 086cf0a8ff813bbf5a0876a5d19dc2817607a06b (commit) via ed3cfdeed1a99f024be2538aac31b71c8eddcf07 (commit) via 29b05df013426838fe166084fed9f1d56c59ebed (commit) via 54c15b2da776d8c71366a2f952998be23933d6de (commit) via c237528646417ba4056118b9e95ca1f690489274 (commit) via 82fe6add4af42dcbc44ffc14a7b693004791d03f (commit) via 913d9b1a83ddd6a03daa181eeb6f62fd70f506e8 (commit) via dcb3c06f4c894c7e6eca93a56233a4dc00493ea3 (commit) via 1f5f12f6c7d3862f1c5c29b0773a1473c3f24b06 (commit) via 0f329751b46ce9b0378c10bf8b0040cd010736c8 (commit) via db0c6cd9dc0dd3821aaa1320faa24c12ec578c41 (commit) via 894bc720a8a849a6bd9b41cf20d483f9da19793c (commit) via 0b9981a71186cd065a7429cb8fd116e70b20fc23 (commit) via 910f5cda1a83fcfcc8f14d491b2956dceea4e827 (commit) via 3b20a21d0a45af4f78db993449052462590db22d (commit) via f039391ec2778ff53886b1546deb9ab614521caa (commit) via 2e9f8ccdd0b8f7cacd9e57b851e24541416f1c58 (commit) via 1d869f0b49dd998066672d588c68057c9149bc04 (commit) via 98dc3a0e18246252f6eec30de9bc5bf2664c50a8 (commit) via b843386fb4f62585c637bc81e04c0b44fa907aab (commit) via f6772a1c2c86c1982d68fc50480748751ac36e98 (commit) via ea51e9f8dba20f06b56c3e293b5b1eebc01e3d71 (commit) via 58a2fd9358675a54f2ed0f43ef3574a7b4a2c7dd (commit) via 9fa4b3c5efa041351ba915ca35b3dfe252ecb34c (commit) via 983712f43845f8fa7967039d2fd067f9a3ecba20 (commit) via 7e0461544a5bb9052d84843c5043c68d34b17ba3 (commit) via 6a45b47fdb150658936a8d2f301dc3309d55050d (commit) via 9214e4aa94f59fb6c0a193ed7083bb90abba682b (commit) via f5f8d1b315b050520c1743a29f48c6c9e9675487 (commit) via 03ec3dcd7ed9d55b91d58d6969114e7de71b88fe (commit) via 362035d60fda8a566636aa5ba58250a8fae9169b (commit) via eba96af88d36a5cf132c15e0adafb19f92706510 (commit) via c628e7cbed766a5467fb1ee1fc3113b42e738d08 (commit) via f1a8dab157c3288d93287a8d6a49f50c84d10342 (commit) via a05fb250afe4bf6c82d39f28239b08fb7e405b96 (commit) via c52864e0956c3f57a059af8c90f7ff2b8fb10e6c (commit) via 9f084f0c90509a354452ef75325c507224c7cd93 (commit) via b6de862e041b500ade8a94917429f196173d5d90 (commit) via 87b505031e709ac218eece691bb2e98b2987702a (commit) via 8acf38df013c6d89e5a2dc3f84fb928e97d27752 (commit) via dd23be24475a4b96a3f33ea91224fd0fe2c0f083 (commit) via b5e957111c9cb23737b7ab2a7dfa1389c61c6311 (commit) via 2048b8030ce1150214123038f275cff1ff8895c9 (commit) via f759631fb9c373804caeaee27c5ad7de3405e55b (commit) via f0d6c01a0fb51904d5dd049be8402531ec185dcc (commit) via 10f2f857f6a38c89afff6bdfcc932e18e49ca9a2 (commit) via d16d1783b8b01c5a7bbd256567fa226775a4ba93 (commit) via d762feebade0ac71bbfbfeb31a9ed7c181ff1d91 (commit) via 2796eef79f73c47e29c0d40d411a5547277836ee (commit) via d235cfacc743bf0524fbc6c7f0f5810fa85ecd93 (commit) via a70fa333ebb25a8331bd203440fbe81bf84946b1 (commit) via b5781eeee0fa56710ea865e67f47ad9b3656b955 (commit) via b8693f93ee8aa586af5f39111195506d9a826c8a (commit) via ecf6f8e63c7da7ad020dd3179481d98b86e676f9 (commit) via ef13af84fb6e8649679b06585bec9dead71cfbe5 (commit) via bf4660cc53039e11f11c3bcf5f8c536a23844f52 (commit) via beaf855847ba00fe180629b4fad1b93b59ca1f0f (commit) via 32d6c59d28b39dbe1835f19f3ec0d422091ad5b0 (commit) via 05c128e2550c2deaaab57f043c2bdac295aa0089 (commit) via b31642f889d6d3b8a3d4ef7abb2efd46722df577 (commit) via 1caad5bab2e9d74ab7001ee5efe5c3d15f9fda0d (commit) via 9a4a9bfbbad489077ed35a20b564ef650417fb84 (commit) via 7b5ba54f3d71ceaca21b988964df4cf8d29b1f02 (commit) via fb432fef933e276b674a29a24d3ebb9e5c91abbc (commit) via 02c58efd7bd80ca0d7656e867c0ea70d39e17169 (commit) via a3013bbd8d534b856693873e46fa95cefa824756 (commit) via f452a9e04b0da3e71f86d8bb02370b7f86ec0098 (commit) via 3665147240b4df0b322629f47ca0cd10ed97082d (commit) via 6794ac225910c56d93fa3cf464644b633ee35f32 (commit) via 04537e7c3942664fe61fe9adaeb95b6afcb6e36c (commit) via cc8303560e95a12790103364240e2581cf3213bb (commit) via ac4ba826d777262b1f25944a4ceb840469ad0bd0 (commit) via ab531245e61a6a3f4a36dbebba4bb42f2ee65ae9 (commit) via e28f851c8b5ec257102e63eac0cfb59ad9b30bd5 (commit) via d551362cbdb427daec14f065259826c2f51784f5 (commit) via 7b369d43f432053d03077c1ad30f216d2148b009 (commit) via 39dd766513a0c51ff8747c2a53a0e0ac0f53f434 (commit) via 3e208bb64df7c2811bb4d04359c35eb7c0a51ddb (commit) via 8cc2ea83ca6318421bfa67044f0dc39b1a510cda (commit) via f4d83d4e5b86f655809f97d278f1f6b5bb488849 (commit) via ce3f91503e397b70e8470b4b61c074756d541ef2 (commit) via 7daaf31cb033e044f5b241bc00df7d708cbee53f (commit) via dab3168796ed7809e717d40c12dabd9b24778168 (commit) via c09d396bd393a6cbc09f668389b6c9e172a53f7f (commit) via 8f0af9b08006290e35b117a02212b6881987adef (commit) via 6301ce94a988b2dee431ebbd791cad49cf6772a2 (commit) via 0e67e186489081513b1fa141461ff44fb74ac7f1 (commit) via 48681b60b4ccc6fc39b6fd02baec82eefe300830 (commit) via c8cf1d87783d4b4c628f219803b78731b8d4ade4 (commit) via 0948333e6bee32cb3de7e872ebb852bbed06e094 (commit) via 1220a970be53403d86cbdf0be97bad7d54cdc335 (commit) via b2ce189680ee17d6019b199c0905cb3f608a71a5 (commit) via c3ab55dc80882b8a1309fdc198abb1ac8f02437d (commit) via 1ecf0ad51eac59ffb71352573aa99146da2c0649 (commit) via 64c06865788ad5c58af3c3d42d857a7ceb9f6ab9 (commit) via eb6efdf362305c0e3045e7fae78fe3558ed3df6f (commit) via 65ac842c34f26abbed230c857d8d34d7d7635d36 (commit) via 7b67dfa45578985d847fb76efca47143941e04cc (commit) via 50ee20cbc2ddac792faee909ed304efde1ab8455 (commit) via 37b125c76beef9a32b74fd3f1ea754561772efc1 (commit) via 6dc0b0a60d08ffb3f9b13a2ae6a9a84242bcecf1 (commit) via 192cbb2e987211e0706c315ef2349ddc5b263d3f (commit) via 0cc926cea639f5a4538ec8f1f25437f995484e3b (commit) via 28d95ca27265aeaf95f06bcc7b937263f96fd826 (commit) via 6b806e0dc32f28e7c8a15ef4fbb3a3fa215bb0f3 (commit) via cf6425f16f8ee554815f6697a231e398ddb0546c (commit) via 6085237938d93c68710db69f70014eca2238492a (commit) via 03626c586519818ef4de9a2f733ebfd46a0bf6be (commit) via c070eda5f78f9209ef3c7a0fe6dfc0cff210894b (commit) via 07bee0be1f22f8a136982935ee06313e5bbc6f3a (commit) via 1594671cc63d7d1ac0192acb0a8496e7fec9f4a2 (commit) via b08633c5740311374f509cef5245f19bd53e55f7 (commit) via 6147511e8b2d8c5ae0a3fda161f346ba40203569 (commit) via ab82e67f3ea25b392c90557dfc4cad43750c8d94 (commit) via 6ec6cf6347efec4bf4268c6db37f287b9de35e30 (commit) via 442b93274d8f24f31557fe678245f65a2c499f97 (commit) via a4dd0bade1ca02eb91178834a159c9d26f140c38 (commit) via 4871852cc509ca998802616fadfbb5619e3324da (commit) via 48ae68961873bb818a75aa8aa1b93d697fe39517 (commit) via 85c4f0bd3f18900e484b0e71670fc18c555e75b1 (commit) via 57962f1b9c3a5a41a7dd6146f9666da18e62ec9c (commit) via 9a45802c94f58d9dd443c10e6dc204a58fa0f9ce (commit) via 0293146428ef9c6d8d2b24e0bdd6c781486904a5 (commit) via a6d9960b81c1c5d4dff0c25b43ac5f9de7e36b8a (commit) via 645e5ccf90c00c634c29fbb4276a8875699d8893 (commit) via 8cc7373f536b86ca56a080f4a4bb67edd03bded3 (commit) via 9fcbfb975cdc500bf18117c31f54d2c9f77079c4 (commit) via a8d5848de4cd79122ebb2a831d465e05b77e52a3 (commit) via e259ced4849018066194b49f723d2d6d2ec559b1 (commit) via fa657759a41b23b4fd76c30b8f3ca27d709950d2 (commit) via 179074e0d0771c82d064e29a20531b75d17289d7 (commit) via 32e95a4ed19e5cd567d02125c4b74bb6e41ee197 (commit) via b9995659aabf9a20cae2ae6905b84c94b733636c (commit) via 65ea1213c75e323c4ff8ee2de48ce6dd84b1f7f2 (commit) via becb0250ea30f65f3beb02f0094197704f450352 (commit) via 90e456db5f983f3fff9126dd70f6fea907fed361 (commit) via e45799924207308fcac2928a64e6ecc3ca102a8c (commit) via a47f5fbb6ed8122a3453f5f5a3fabf53a98d7fdf (commit) via 414c4c75b0beb8cd4e4d2abe090921bcf058ec69 (commit) via 2c494b4a67123c838b4b6915679cca06f9e0bdd2 (commit) via bbb10c23626657723466a42b94612b554858ce1d (commit) via 5c4d38e42aa63c3d8b30b243f0b58f2cab04a466 (commit) via ca7d1dd9372957732fc1dc95d0ffe36cf34c23ba (commit) via 064cdece468e83bb72ef9ece63e8f0e05856eeb7 (commit) via 8fede35ce4e41dc8a5de3164be40e2e630cd0812 (commit) via 2151bf694d870493846e02f5d85fbda189008259 (commit) via d5a6c1289da50b0923e5db7293d21fabb22ffeb3 (commit) via a3eae446071b31767ea8b1a27ceb412cd36ab66b (commit) via 1ed6a4fab0cc48e1d1a8978a36b84c4d5334647c (commit) via c62004cb48ab1cba876ae46d19adbf14641c8476 (commit) via 8a0b084a61b07aae811df1c4fd7eab74b52a6d75 (commit) via b39a4f517176d7f65210056026d7f7842467bb20 (commit) via 283b4a449cefcdf7a9a781b9b126a35598cc9c65 (commit) via 701f695013218b1bbaf97212bb00b708ec738819 (commit) via 2deaffd485fec676e29e379451d8f1ebdde79c54 (commit) via e2bea00c339c2aae29476b436bcd6ee3b9a51342 (commit) via ff5dd845b8ea8a3ecafeeca366b0d950d1455a25 (commit) via d82a651c0029a13c27065d57a68fd471785dc97c (commit) via d01c316a31f02155f55ea898a35381ff5060bfa9 (commit) via 0e6bdb3fd61c818aed53827e96263fd14ed6edcc (commit) via 44dc80798aa4fb92f60e1cd38f2f518b7e11946f (commit) via 309aab7862f8047e96062853729ec709bade5ed6 (commit) via 70dc2963eaf9e8dbd528607fdd08ac6204c5c13c (commit) via 3f58ed15a080a4dd9538d0a62afe8d229342249c (commit) via 77a27212b563299959fb2a609b86bb9117a8f918 (commit) via ca7514cf4325838ca04c3a21a972cb963efd07a4 (commit) via 1e919d30be9ecf9683e30bba3f6109d9356b4638 (commit) via c4aefb88d31452b3add8cf16f9eef152525c3e93 (commit) via 52dbfc9fc964ca292a777f11336854e88538f46d (commit) via 1a24b758857eef4caf2a1801851315b6c93edd76 (commit) via d1e693d7177d10f382d69b659ab359fddee783b5 (commit) via 449cd8f2c3a694b219fcbb98d7d9948bce583ca1 (commit) via 093fb17ce654532dc1e6c379aa13a3dbab9407d6 (commit) via 5db841fb0b0b3e705c3a10345df3d2c41bc0ef5b (commit) via 55a303143d64b8052bca36903315970287ee0a23 (commit) via 213835061241618c9d6f235ab0961489a604df8d (commit) via 7e369c107095687301e55bcbcf14440d68909c37 (commit) via 5f6132e546717ee55cf2d9d14d3caa934fa2cd07 (commit) via 730df10b97aa15a5c617e964dabc7633975c1eca (commit) via b9bb840b831186a412d234a08ce5c42d3af12c2a (commit) via 4aa246430e2cc0a22b4ffdd817a4a2cdeb0b4f46 (commit) via 43e06cc36fd00e4b03adc7a6cb4f2ac87e9e8d23 (commit) via e9d952943ae96007d93e06593916c5cb796a8c68 (commit) via 84720ea2e37fb9217839dd572ffdd0fa9058441e (commit) from 2cfe11680ecc2186339183e94f291ce586740f8b (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: .gitignore | 4 + .shippable.yml | 8 +- .travis.yml | 101 +- DEPENDENCIES | 16 +- configure.ac | 8 +- doc/.gitignore | 1 + doc/Doxyfile_common | 5 +- doc/driver-api-guide/Doxyfile | 9 + doc/images/.gitignore | 1 + doc/images/ipsec-inline.svg | 31 + doc/images/ipsec-lookaside.svg | 29 + doc/images/ipsec_sa_states.msc | 76 + doc/users-guide/Makefile.am | 5 + doc/users-guide/users-guide-crypto.adoc | 120 +- doc/users-guide/users-guide-ipsec.adoc | 467 +++++ doc/users-guide/users-guide-timer.adoc | 3 +- doc/users-guide/users-guide.adoc | 2 + example/generator/odp_generator.c | 355 ++-- example/ipsec/odp_ipsec.c | 124 +- example/ipsec/odp_ipsec_cache.c | 6 +- example/ipsec/odp_ipsec_cache.h | 1 + example/ipsec/odp_ipsec_misc.h | 2 +- example/ipsec/odp_ipsec_stream.c | 5 +- example/l2fwd_simple/odp_l2fwd_simple.c | 2 +- example/l3fwd/odp_l3fwd.c | 4 +- example/switch/odp_switch.c | 2 +- example/timer/odp_timer_simple.c | 10 +- example/timer/odp_timer_test.c | 9 +- example/traffic_mgmt/.gitignore | 4 +- helper/include/odp/helper/chksum.h | 27 - helper/include/odp/helper/ip.h | 2 +- include/Makefile.am | 4 + include/odp/api/spec/chksum.h | 53 + include/odp/api/spec/classification.h | 301 ++- include/odp/api/spec/crypto.h | 220 +- include/odp/api/spec/event.h | 146 +- include/odp/api/spec/ipsec.h | 1495 ++++++++++++++ include/odp/api/spec/packet.h | 347 +++- include/odp/api/spec/packet_flags.h | 236 ++- include/odp/api/spec/packet_io.h | 284 ++- include/odp/api/spec/pool.h | 236 ++- include/odp/api/spec/queue.h | 74 +- include/odp/api/spec/schedule.h | 28 +- include/odp/api/spec/schedule_types.h | 2 +- include/odp/api/spec/shared_memory.h | 81 +- include/odp/api/spec/std_types.h | 10 + include/odp/api/spec/support.h | 57 + include/odp/api/spec/threshold.h | 105 + include/odp/api/spec/time.h | 10 + include/odp/api/spec/timer.h | 27 + include/odp/api/spec/traffic_mngr.h | 639 +++--- include/odp/arch/default/api/abi/event.h | 9 +- include/odp_api.h | 3 + m4/odp_dpdk.m4 | 76 + platform/linux-generic/Makefile.am | 50 + platform/linux-generic/_ishm.c | 133 +- platform/linux-generic/_ishmpool.c | 807 ++++++++ platform/linux-generic/_modules.c | 54 + platform/linux-generic/arch/aarch64/odp_atomic.h | 208 ++ platform/linux-generic/arch/aarch64/odp_cpu.h | 62 + .../linux-generic/arch/aarch64/odp_cpu_idling.h | 45 + platform/linux-generic/arch/aarch64/odp_llsc.h | 165 ++ platform/linux-generic/arch/arm/odp_atomic.h | 31 + platform/linux-generic/arch/arm/odp_cpu.h | 55 + platform/linux-generic/arch/arm/odp_cpu_idling.h | 45 + platform/linux-generic/arch/arm/odp_llsc.h | 96 + platform/linux-generic/arch/default/odp_cpu.h | 21 + .../linux-generic/arch/default/odp_cpu_idling.h | 36 + platform/linux-generic/include/_ishm_internal.h | 1 + .../linux-generic/include/_ishmpool_internal.h | 56 + .../include/odp/api/{feature.h => chksum.h} | 10 +- platform/linux-generic/include/odp/api/ipsec.h | 36 + .../include/odp/api/plat/event_types.h | 8 + .../include/odp/api/plat/ipsec_types.h | 39 + .../include/odp/api/plat/packet_inlines.h | 15 +- .../include/odp/api/plat/packet_types.h | 6 +- .../include/odp/api/plat/pool_types.h | 13 + .../include/odp/api/plat/schedule_types.h | 4 +- .../include/odp/api/plat/strong_types.h | 4 +- .../include/odp/api/{feature.h => support.h} | 10 +- .../include/odp/api/{feature.h => threshold.h} | 10 +- platform/linux-generic/include/odp_bitset.h | 212 ++ .../linux-generic/include/odp_buffer_internal.h | 10 - .../include/odp_classification_datamodel.h | 64 +- .../include/odp_classification_inlines.h | 2 +- .../include/odp_classification_internal.h | 9 - .../linux-generic/include/odp_config_internal.h | 36 +- .../linux-generic/include/odp_crypto_internal.h | 17 +- platform/linux-generic/include/odp_internal.h | 15 +- .../linux-generic/include/odp_ipsec_internal.h | 275 +++ platform/linux-generic/include/odp_llqueue.h | 311 +++ platform/linux-generic/include/odp_packet_dpdk.h | 21 +- .../linux-generic/include/odp_packet_internal.h | 46 +- .../linux-generic/include/odp_packet_io_internal.h | 5 +- platform/linux-generic/include/odp_packet_netmap.h | 1 - platform/linux-generic/include/odp_pool_internal.h | 1 + platform/linux-generic/include/odp_queue_if.h | 2 +- .../include/odp_queue_scalable_internal.h | 106 + platform/linux-generic/include/odp_schedule_if.h | 22 +- .../linux-generic/include/odp_schedule_scalable.h | 148 ++ .../include/odp_schedule_scalable_config.h | 52 + .../include/odp_schedule_scalable_ordered.h | 125 ++ .../linux-generic/include/odp_timer_internal.h | 21 + platform/linux-generic/include/protocols/ip.h | 3 + platform/linux-generic/include/protocols/thash.h | 105 + platform/linux-generic/include/protocols/udp.h | 2 + platform/linux-generic/libodp-linux.pc.in | 2 +- platform/linux-generic/m4/configure.m4 | 4 + platform/linux-generic/m4/odp_dpdk.m4 | 57 +- platform/linux-generic/m4/odp_modules.m4 | 11 + platform/linux-generic/m4/odp_schedule.m4 | 8 + platform/linux-generic/odp_buffer.c | 5 +- platform/linux-generic/odp_chksum.c | 36 + platform/linux-generic/odp_classification.c | 289 ++- platform/linux-generic/odp_crypto.c | 642 ++++-- platform/linux-generic/odp_event.c | 56 + platform/linux-generic/odp_init.c | 120 +- platform/linux-generic/odp_ipsec.c | 1793 +++++++++++++++++ platform/linux-generic/odp_ipsec_events.c | 156 ++ platform/linux-generic/odp_ipsec_sad.c | 682 +++++++ platform/linux-generic/odp_packet.c | 454 ++++- platform/linux-generic/odp_packet_io.c | 114 +- platform/linux-generic/odp_pool.c | 115 +- platform/linux-generic/odp_queue.c | 7 +- platform/linux-generic/odp_queue_if.c | 10 +- platform/linux-generic/odp_queue_scalable.c | 1009 ++++++++++ platform/linux-generic/odp_schedule.c | 24 +- platform/linux-generic/odp_schedule_if.c | 15 +- platform/linux-generic/odp_schedule_iquery.c | 29 +- platform/linux-generic/odp_schedule_scalable.c | 2099 ++++++++++++++++++++ .../linux-generic/odp_schedule_scalable_ordered.c | 373 ++++ platform/linux-generic/odp_schedule_sp.c | 24 +- platform/linux-generic/odp_shared_memory.c | 5 + platform/linux-generic/odp_time.c | 9 + platform/linux-generic/odp_timer.c | 222 ++- platform/linux-generic/pktio/dpdk.c | 248 ++- platform/linux-generic/pktio/ipc.c | 1 + platform/linux-generic/pktio/loop.c | 25 + platform/linux-generic/pktio/netmap.c | 13 +- platform/linux-generic/pktio/pcap.c | 1 + platform/linux-generic/pktio/socket.c | 1 + platform/linux-generic/pktio/socket_mmap.c | 1 + platform/linux-generic/pktio/tap.c | 114 +- .../test/validation/api/shmem/shmem_odp1.c | 10 +- scripts/Dockerfile | 3 +- test/common/Makefile.am | 2 +- test/common/odp_cunit_common.c | 13 +- test/common/odp_cunit_common.h | 5 +- .../pktio/parser.h => common/test_packet_parser.h} | 41 +- test/m4/configure.m4 | 3 + test/m4/miscellaneous.m4 | 18 +- test/performance/Makefile.am | 5 +- test/performance/odp_crypto.c | 160 +- test/performance/odp_l2fwd.c | 130 +- test/performance/odp_pktio_ordered.c | 2 +- test/performance/odp_pktio_perf.c | 2 +- test/validation/{api => }/Makefile.inc | 3 - test/validation/api/Makefile.am | 9 + test/validation/api/Makefile.inc | 9 +- test/validation/api/buffer/buffer.c | 50 +- test/validation/api/chksum/.gitignore | 1 + test/validation/api/chksum/Makefile.am | 5 + test/validation/api/chksum/chksum.c | 343 ++++ test/validation/api/chksum/chksum.h | 26 + .../validation/api/chksum/chksum_main.c | 7 +- test/validation/api/crypto/crypto.c | 12 +- test/validation/api/crypto/crypto.h | 22 +- test/validation/api/crypto/odp_crypto_test_inp.c | 1475 ++++++-------- test/validation/api/crypto/odp_crypto_test_inp.h | 8 +- test/validation/api/crypto/test_vectors.h | 1090 ++++++---- test/validation/api/crypto/test_vectors_len.h | 57 +- test/validation/api/event/.gitignore | 1 + test/validation/api/event/Makefile.am | 5 + test/validation/api/event/event.c | 417 ++++ .../api/abi => test/validation/api/event}/event.h | 7 +- .../api/{lock/lock_main.c => event/event_main.c} | 7 +- test/validation/api/ipsec/.gitignore | 4 + test/validation/api/ipsec/Makefile.am | 27 + test/validation/api/ipsec/ipsec.c | 956 +++++++++ test/validation/api/ipsec/ipsec.h | 95 + test/validation/api/ipsec/ipsec_async.c | 55 + test/validation/api/ipsec/ipsec_inline_in.c | 56 + test/validation/api/ipsec/ipsec_inline_out.c | 56 + test/validation/api/ipsec/ipsec_sync.c | 53 + test/validation/api/ipsec/ipsec_test_in.c | 1548 +++++++++++++++ test/validation/api/ipsec/ipsec_test_out.c | 1004 ++++++++++ test/validation/api/ipsec/test_vectors.h | 1785 +++++++++++++++++ test/validation/api/packet/packet.c | 305 ++- test/validation/api/packet/packet.h | 2 + test/validation/api/pktio/parser.c | 3 +- test/validation/api/pktio/parser.h | 149 -- test/validation/api/pktio/pktio.c | 99 +- test/validation/api/pool/pool.c | 213 +- test/validation/api/pool/pool.h | 4 +- test/validation/api/queue/queue.c | 11 +- test/validation/api/scheduler/scheduler.c | 20 +- test/validation/api/shmem/shmem.c | 65 +- test/validation/api/time/time.c | 20 +- test/validation/api/timer/timer.c | 62 +- 199 files changed, 25384 insertions(+), 3443 deletions(-) create mode 100644 doc/.gitignore create mode 100644 doc/driver-api-guide/Doxyfile create mode 100644 doc/images/ipsec-inline.svg create mode 100644 doc/images/ipsec-lookaside.svg create mode 100644 doc/images/ipsec_sa_states.msc create mode 100644 doc/users-guide/users-guide-ipsec.adoc create mode 100644 include/odp/api/spec/chksum.h create mode 100644 include/odp/api/spec/ipsec.h create mode 100644 include/odp/api/spec/support.h create mode 100644 include/odp/api/spec/threshold.h create mode 100644 m4/odp_dpdk.m4 create mode 100644 platform/linux-generic/_ishmpool.c create mode 100644 platform/linux-generic/_modules.c create mode 100644 platform/linux-generic/arch/aarch64/odp_atomic.h create mode 100644 platform/linux-generic/arch/aarch64/odp_cpu.h create mode 100644 platform/linux-generic/arch/aarch64/odp_cpu_idling.h create mode 100644 platform/linux-generic/arch/aarch64/odp_llsc.h create mode 100644 platform/linux-generic/arch/arm/odp_atomic.h create mode 100644 platform/linux-generic/arch/arm/odp_cpu.h create mode 100644 platform/linux-generic/arch/arm/odp_cpu_idling.h create mode 100644 platform/linux-generic/arch/arm/odp_llsc.h create mode 100644 platform/linux-generic/arch/default/odp_cpu.h create mode 100644 platform/linux-generic/arch/default/odp_cpu_idling.h create mode 100644 platform/linux-generic/include/_ishmpool_internal.h copy platform/linux-generic/include/odp/api/{feature.h => chksum.h} (63%) create mode 100644 platform/linux-generic/include/odp/api/ipsec.h create mode 100644 platform/linux-generic/include/odp/api/plat/ipsec_types.h copy platform/linux-generic/include/odp/api/{feature.h => support.h} (59%) copy platform/linux-generic/include/odp/api/{feature.h => threshold.h} (58%) create mode 100644 platform/linux-generic/include/odp_bitset.h create mode 100644 platform/linux-generic/include/odp_ipsec_internal.h create mode 100644 platform/linux-generic/include/odp_llqueue.h create mode 100644 platform/linux-generic/include/odp_queue_scalable_internal.h create mode 100644 platform/linux-generic/include/odp_schedule_scalable.h create mode 100644 platform/linux-generic/include/odp_schedule_scalable_config.h create mode 100644 platform/linux-generic/include/odp_schedule_scalable_ordered.h create mode 100644 platform/linux-generic/include/protocols/thash.h create mode 100644 platform/linux-generic/m4/odp_modules.m4 create mode 100644 platform/linux-generic/odp_chksum.c create mode 100644 platform/linux-generic/odp_ipsec.c create mode 100644 platform/linux-generic/odp_ipsec_events.c create mode 100644 platform/linux-generic/odp_ipsec_sad.c create mode 100644 platform/linux-generic/odp_queue_scalable.c create mode 100644 platform/linux-generic/odp_schedule_scalable.c create mode 100644 platform/linux-generic/odp_schedule_scalable_ordered.c copy test/{validation/api/pktio/parser.h => common/test_packet_parser.h} (88%) copy test/validation/{api => }/Makefile.inc (85%) create mode 100644 test/validation/api/chksum/.gitignore create mode 100644 test/validation/api/chksum/Makefile.am create mode 100644 test/validation/api/chksum/chksum.c create mode 100644 test/validation/api/chksum/chksum.h copy include/odp/arch/arm32-linux/odp/api/abi/crypto.h => test/validation/api/chksum/chksum_main.c (55%) create mode 100644 test/validation/api/event/.gitignore create mode 100644 test/validation/api/event/Makefile.am create mode 100644 test/validation/api/event/event.c copy {include/odp/arch/arm32-linux/odp/api/abi => test/validation/api/event}/event.h (52%) copy test/validation/api/{lock/lock_main.c => event/event_main.c} (60%) create mode 100644 test/validation/api/ipsec/.gitignore create mode 100644 test/validation/api/ipsec/Makefile.am create mode 100644 test/validation/api/ipsec/ipsec.c create mode 100644 test/validation/api/ipsec/ipsec.h create mode 100644 test/validation/api/ipsec/ipsec_async.c create mode 100644 test/validation/api/ipsec/ipsec_inline_in.c create mode 100644 test/validation/api/ipsec/ipsec_inline_out.c create mode 100644 test/validation/api/ipsec/ipsec_sync.c create mode 100644 test/validation/api/ipsec/ipsec_test_in.c create mode 100644 test/validation/api/ipsec/ipsec_test_out.c create mode 100644 test/validation/api/ipsec/test_vectors.h hooks/post-receive --

7 years, 2 months

[COMMIT] branch api-next updated. v1.16.0.0-733-g177eeff3

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 177eeff39e19289e771119cfdffc515cb16f9db5 (commit) via 49665e54259bc04b1ba0f9bc0456714d98ab13c6 (commit) via 1f82edd05f4e83ac3a6d6a3a3cd0ec914d5ad359 (commit) from c38fc105f0e9a88dd4ebb4d9e7ac9e1160466322 (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: include/odp/api/spec/ipsec.h | 22 ++++- .../linux-generic/include/odp_ipsec_internal.h | 6 ++ platform/linux-generic/odp_ipsec.c | 67 +++++++++++++- platform/linux-generic/odp_ipsec_sad.c | 101 ++++++++++++++------- test/validation/api/ipsec/ipsec.c | 4 +- 5 files changed, 159 insertions(+), 41 deletions(-) hooks/post-receive --

7 years, 2 months

[COMMIT] branch master updated. v1.16.0.0-37-g4c4052f8

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 4c4052f894b8df5784d2aae2e36b96796ee020fd (commit) via 9e388b884efed8d653cf453f6516f34019d02305 (commit) via 11da2d3bc8871379321048a5e951e142aa594b9d (commit) via 192693591500302fd5232eee92144dba204abaaf (commit) via 75f0096e1af7eca556e9f1c896f7cc34cc325edc (commit) from 3c02836d9d9ca16b1277bdd30e523779b9fe8374 (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: .gitignore | 3 +++ .shippable.yml | 8 +++++++- .travis.yml | 2 ++ doc/.gitignore | 1 + .../linux-generic/test/validation/api/shmem/shmem_odp1.c | 10 ++++++++-- scripts/Dockerfile | 3 ++- test/common/odp_cunit_common.c | 13 +++++++++++-- test/common/odp_cunit_common.h | 5 +++-- 8 files changed, 37 insertions(+), 8 deletions(-) create mode 100644 doc/.gitignore hooks/post-receive --

7 years, 2 months

[COMMIT] branch api-next updated. v1.16.0.0-730-gc38fc105

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 c38fc105f0e9a88dd4ebb4d9e7ac9e1160466322 (commit) via 4c4052f894b8df5784d2aae2e36b96796ee020fd (commit) via 9e388b884efed8d653cf453f6516f34019d02305 (commit) via 11da2d3bc8871379321048a5e951e142aa594b9d (commit) via 192693591500302fd5232eee92144dba204abaaf (commit) via 75f0096e1af7eca556e9f1c896f7cc34cc325edc (commit) via 3c02836d9d9ca16b1277bdd30e523779b9fe8374 (commit) via bb003e11ae7bfacc1fb1e9b8276dd49a32a31b4e (commit) via b5dfcef4586e0a1618c202aaeb7e863c17cc4d06 (commit) via 6b5cdc77eb9759a2349b10372a964648559bc92c (commit) via bb0ec2f991bc5b295928e87c8b9bc0efb92479d3 (commit) via ffcd7991e44109464fb8a71f9ee10546ea5b84b0 (commit) from f2a1a84b43642f3d0911a351d9308d5501693290 (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 c38fc105f0e9a88dd4ebb4d9e7ac9e1160466322 Merge: f2a1a84b 4c4052f8 Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Thu Dec 21 17:33:36 2017 +0300 Merge branch 'master' into api-next Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --cc DEPENDENCIES index 008c4df4,0805a183..829ff363 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@@ -19,9 -19,9 +19,9 @@@ Prerequisites for building the OpenData 3. Required libraries - Libraries currently required to link: openssl, libconfig - Libraries currently required to link: openssl, libatomic ++ Libraries currently required to link: openssl, libconfig, libatomic -3.1 OpenSSL native compile +3.1 OpenSSL and libconf native compile For native compilation, simply load the necessary libraries using the appropriate tool set. ----------------------------------------------------------------------- Summary of changes: .gitignore | 3 + .shippable.yml | 8 +- .travis.yml | 2 + DEPENDENCIES | 10 ++- doc/.gitignore | 1 + platform/linux-generic/odp_pool.c | 87 ++++++++++------------ .../test/validation/api/shmem/shmem_odp1.c | 10 ++- scripts/Dockerfile | 3 +- test/common/odp_cunit_common.c | 13 +++- test/common/odp_cunit_common.h | 5 +- test/m4/miscellaneous.m4 | 18 ++++- test/performance/Makefile.am | 5 +- 12 files changed, 105 insertions(+), 60 deletions(-) create mode 100644 doc/.gitignore hooks/post-receive --

7 years, 2 months

[COMMIT] branch master updated. v1.16.0.0-32-g3c02836d

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 3c02836d9d9ca16b1277bdd30e523779b9fe8374 (commit) via bb003e11ae7bfacc1fb1e9b8276dd49a32a31b4e (commit) via b5dfcef4586e0a1618c202aaeb7e863c17cc4d06 (commit) from 6b5cdc77eb9759a2349b10372a964648559bc92c (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 3c02836d9d9ca16b1277bdd30e523779b9fe8374 Author: Matias Elo <matias.elo(a)nokia.com> Date: Fri Dec 15 15:23:59 2017 +0200 DEPENDENCIES: update requirements for Red Hat Update instructions to support RHEL 7.4. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/DEPENDENCIES b/DEPENDENCIES index 68c7b8be..0805a183 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -19,7 +19,7 @@ Prerequisites for building the OpenDataPlane (ODP) API 3. Required libraries - Libraries currently required to link: openssl + Libraries currently required to link: openssl, libatomic 3.1 OpenSSL native compile @@ -163,6 +163,8 @@ Prerequisites for building the OpenDataPlane (ODP) API DPDK pktio adds a depency to NUMA library. # Debian/Ubuntu $ sudo apt-get install libnuma-dev + # CentOS/RedHat/Fedora + $ sudo yum install numactl-devel Note: only packet I/O is accelerated with DPDK. Use https://git.linaro.org/lng/odp-dpdk.git @@ -227,14 +229,16 @@ Prerequisites for building the OpenDataPlane (ODP) API make sudo make install + # On RedHat you also have to add path /usr/local/lib to /etc/ld.so.conf + # ... OR ... Install CUnit into user defined location. The same path is # used in step 4.4: PKG_CONFIG_PATH=/home/<my_cunit_path>/lib/pkgconfig ./configure --prefix=/home/<my_cunit_path> make make install - # Also (in Ubuntu at least) run ldconfig to update shared lib cache or - # reboot, before trying to run e.g. 'make distcheck'. + # Also (in Ubuntu/RedHat at least) run ldconfig to update shared lib + # cache or reboot, before trying to run e.g. 'make distcheck'. sudo ldconfig 4.3 Cross compile of CUnit commit bb003e11ae7bfacc1fb1e9b8276dd49a32a31b4e Author: Matias Elo <matias.elo(a)nokia.com> Date: Mon Dec 18 16:22:42 2017 +0200 test: odp_pktio_ordered: run test only if pcap is available The odp_pktio_ordered test depends on pcap pktio, so skip it if pcap is not available. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/performance/Makefile.am b/test/performance/Makefile.am index 1dccd82e..9c709e79 100644 --- a/test/performance/Makefile.am +++ b/test/performance/Makefile.am @@ -12,10 +12,13 @@ COMPILE_ONLY = odp_l2fwd \ odp_scheduling TESTSCRIPTS = odp_l2fwd_run.sh \ - odp_pktio_ordered_run.sh \ odp_sched_latency_run.sh \ odp_scheduling_run.sh +if HAVE_PCAP +TESTSCRIPTS += odp_pktio_ordered_run.sh +endif + TEST_EXTENSIONS = .sh if test_perf commit b5dfcef4586e0a1618c202aaeb7e863c17cc4d06 Author: Matias Elo <matias.elo(a)nokia.com> Date: Mon Dec 18 15:24:04 2017 +0200 test: disable C++ test if no compiler is found Enables building ODP on systems which have no C++ compiler available. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/m4/miscellaneous.m4 b/test/m4/miscellaneous.m4 index dac236a6..07c32377 100644 --- a/test/m4/miscellaneous.m4 +++ b/test/m4/miscellaneous.m4 @@ -2,7 +2,21 @@ # Enable/disable test-cpp ########################################################################## AC_ARG_ENABLE([test-cpp], - [AS_HELP_STRING([--disable-test-cpp], [run basic test aginast cpp])], + [AS_HELP_STRING([--disable-test-cpp], [run basic test against cpp])], [test_cpp=$enableval], - [test_cpp=yes]) + [test_cpp=check]) + +if test "x$test_cpp" != "xno" ; then + AC_CACHE_CHECK([if C++ compiler works], [odp_cv_cxx_works], + [AC_LANG_PUSH([C++]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], [odp_cv_cxx_works=yes], + [odp_cv_cxx_works=no]) + AC_LANG_POP([C++])]) + AS_IF([test "x$test_cpp$odp_cv_cxx_works" = "xyesno"], + [AC_MSG_FAILURE([C++ compiler test failed])], + [test "x$test_cpp$odp_cv_cxx_works" = "xcheckno"], + [AC_MSG_NOTICE([disabling C++ test]) ; test_cpp=no], + [test_cpp=yes]) +fi + AM_CONDITIONAL([test_cpp], [test x$test_cpp = xyes ]) ----------------------------------------------------------------------- Summary of changes: DEPENDENCIES | 10 +++++++--- test/m4/miscellaneous.m4 | 18 ++++++++++++++++-- test/performance/Makefile.am | 5 ++++- 3 files changed, 27 insertions(+), 6 deletions(-) hooks/post-receive --

7 years, 2 months

[COMMIT] branch api-next updated. v1.16.0.0-718-gf2a1a84b

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 f2a1a84b43642f3d0911a351d9308d5501693290 (commit) via 233d0aa078f6c70a10c84e1bc1365b18c39a7ae9 (commit) from b1c287aa71c7559ee0cd1b1f3eef971491cf1c04 (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 f2a1a84b43642f3d0911a351d9308d5501693290 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue Dec 12 19:20:16 2017 +0300 api: ipsec: drop odp_ipsec_proto_layer_t Use odp_proto_layer_t to specify outer header retention level. Drop separate odp_ipsec_proto_layer_t. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/include/odp/api/spec/ipsec.h b/include/odp/api/spec/ipsec.h index c6795468..4f8748a6 100644 --- a/include/odp/api/spec/ipsec.h +++ b/include/odp/api/spec/ipsec.h @@ -69,27 +69,6 @@ typedef enum odp_ipsec_op_mode_t { } odp_ipsec_op_mode_t; -/** - * Protocol layers in IPSEC configuration - */ -typedef enum odp_ipsec_proto_layer_t { - /** No layers */ - ODP_IPSEC_LAYER_NONE = ODP_PROTO_LAYER_NONE, - - /** Layer L2 protocols (Ethernet, VLAN, etc) */ - ODP_IPSEC_LAYER_L2 = ODP_PROTO_LAYER_L2, - - /** Layer L3 protocols (IPv4, IPv6, ICMP, IPSEC, etc) */ - ODP_IPSEC_LAYER_L3 = ODP_PROTO_LAYER_L3, - - /** Layer L4 protocols (UDP, TCP, SCTP) */ - ODP_IPSEC_LAYER_L4 = ODP_PROTO_LAYER_L4, - - /** All layers */ - ODP_IPSEC_LAYER_ALL = ODP_PROTO_LAYER_ALL - -} odp_ipsec_proto_layer_t; - /** * Configuration options for IPSEC inbound processing */ @@ -125,25 +104,25 @@ typedef struct odp_ipsec_inbound_config_t { * * Select up to which protocol layer (at least) outer headers are * retained in inbound inline processing. Default value is - * ODP_IPSEC_LAYER_NONE. + * ODP_PROTO_LAYER_NONE. * - * ODP_IPSEC_LAYER_NONE: Application does not require any outer + * ODP_PROTO_LAYER_NONE: Application does not require any outer * headers to be retained. * - * ODP_IPSEC_LAYER_L2: Retain headers up to layer 2. + * ODP_PROTO_LAYER_L2: Retain headers up to layer 2. * - * ODP_IPSEC_LAYER_L3: Retain headers up to layer 3, otherwise the - * same as ODP_IPSEC_LAYER_ALL. + * ODP_PROTO_LAYER_L3: Retain headers up to layer 3, otherwise the + * same as ODP_PROTO_LAYER_ALL. * - * ODP_IPSEC_LAYER_L4: Retain headers up to layer 4, otherwise the - * same as ODP_IPSEC_LAYER_ALL. + * ODP_PROTO_LAYER_L4: Retain headers up to layer 4, otherwise the + * same as ODP_PROTO_LAYER_ALL. * - * ODP_IPSEC_LAYER_ALL: In tunnel mode, all headers before IPSEC are + * ODP_PROTO_LAYER_ALL: In tunnel mode, all headers before IPSEC are * retained. In transport mode, all headers * before IP (carrying IPSEC) are retained. * */ - odp_ipsec_proto_layer_t retain_outer; + odp_proto_layer_t retain_outer; /** Parse packet headers after IPSEC transformation * commit 233d0aa078f6c70a10c84e1bc1365b18c39a7ae9 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue Dec 12 19:18:29 2017 +0300 api: ipsec: use odp_proto_layer_t for parse layer spec Usign odp_proto_layer_t for parse layer spec is more logical, as it is the same enum that is used for the rest of packet parsing API. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/include/odp/api/spec/ipsec.h b/include/odp/api/spec/ipsec.h index 538472a5..c6795468 100644 --- a/include/odp/api/spec/ipsec.h +++ b/include/odp/api/spec/ipsec.h @@ -156,9 +156,9 @@ typedef struct odp_ipsec_inbound_config_t { * * Each successfully transformed packet has a valid value for L3 offset * regardless of the parse configuration. Default value is - * ODP_IPSEC_LAYER_NONE. ODP_IPSEC_LAYER_L2 is not a valid value. + * ODP_PROTO_LAYER_NONE. ODP_PROTO_LAYER_L2 is not a valid value. */ - odp_ipsec_proto_layer_t parse; + odp_proto_layer_t parse_level; /** Flags to control IPSEC payload data checks up to the selected parse * level. Checksum checking status can be queried for each packet with diff --git a/platform/linux-generic/odp_ipsec.c b/platform/linux-generic/odp_ipsec.c index ff8201c4..49d5531f 100644 --- a/platform/linux-generic/odp_ipsec.c +++ b/platform/linux-generic/odp_ipsec.c @@ -756,7 +756,7 @@ static ipsec_sa_t *ipsec_in_single(odp_packet_t pkt, parse_param.proto = state.is_ipv4 ? ODP_PROTO_IPV4 : ODP_PROTO_IPV6; - parse_param.last_layer = (odp_proto_layer_t)ipsec_config.inbound.parse; + parse_param.last_layer = ipsec_config.inbound.parse_level; parse_param.chksums = ipsec_config.inbound.chksums; /* We do not care about return code here. diff --git a/test/validation/api/ipsec/ipsec.c b/test/validation/api/ipsec/ipsec.c index 9d263dfc..9729efb4 100644 --- a/test/validation/api/ipsec/ipsec.c +++ b/test/validation/api/ipsec/ipsec.c @@ -904,7 +904,7 @@ int ipsec_config(odp_instance_t ODP_UNUSED inst) ipsec_config.inbound_mode = suite_context.inbound_op_mode; ipsec_config.outbound_mode = suite_context.outbound_op_mode; ipsec_config.inbound.default_queue = suite_context.queue; - ipsec_config.inbound.parse = ODP_IPSEC_LAYER_ALL; + ipsec_config.inbound.parse_level = ODP_PROTO_LAYER_ALL; if (ODP_IPSEC_OK != odp_ipsec_config(&ipsec_config)) return -1; ----------------------------------------------------------------------- Summary of changes: include/odp/api/spec/ipsec.h | 43 ++++++++++---------------------------- platform/linux-generic/odp_ipsec.c | 2 +- test/validation/api/ipsec/ipsec.c | 2 +- 3 files changed, 13 insertions(+), 34 deletions(-) hooks/post-receive --

7 years, 2 months

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

git-lng-odp December 2017