git-lng-odp January 2018

git-lng-odp@lists.linaro.org

1 participants
53 discussions

[COMMIT] branch caterpillar updated. v1.15.0.0-956-gea7b4281

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, caterpillar has been updated via ea7b4281992e3cf772fb84708ed7f3985bce78e7 (commit) from 4d17f8ae64aba0e6f24877be30f86ae5880cef7e (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 ea7b4281992e3cf772fb84708ed7f3985bce78e7 Author: Ilias Apalodimas <ilias.apalodimas(a)linaro.org> Date: Wed Dec 20 19:15:31 2017 +0100 linux-gen: mediated devices common code Add APIs to create/destroy mediated devices, manipulate their regions and allocate/free DMA areas accessible by both ODP and HW. Signed-off-by: Ilias Apalodimas <ilias.apalodimas(a)linaro.org> Signed-off-by: Mykyta Iziumtsev <mykyta.iziumtsev(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Yi He <yi.he(a)linaro.org> diff --git a/configure.ac b/configure.ac index d774ae86..3f509232 100644 --- a/configure.ac +++ b/configure.ac @@ -410,4 +410,5 @@ AC_MSG_RESULT([ test_helper: ${test_helper} test_example: ${test_example} user_guides: ${user_guides} + mdev: ${mdev_support} ]) diff --git a/platform/linux-dpdk/m4/configure.m4 b/platform/linux-dpdk/m4/configure.m4 index 9d299bf3..8c5e0670 100644 --- a/platform/linux-dpdk/m4/configure.m4 +++ b/platform/linux-dpdk/m4/configure.m4 @@ -80,6 +80,7 @@ AC_SUBST([ATOMIC_LIBS]) # linux-generic pktio at all. And DPDK has its own PCAP support anyway AM_CONDITIONAL([HAVE_PCAP], [false]) AM_CONDITIONAL([netmap_support], [false]) +AM_CONDITIONAL([mdev_support], [false]) AM_CONDITIONAL([PKTIO_DPDK], [false]) m4_include([platform/linux-dpdk/m4/odp_pthread.m4]) ODP_TIMER diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 8813aea9..42223199 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -177,10 +177,12 @@ noinst_HEADERS = \ include/odp_packet_io_pool.h \ include/odp_packet_io_pool_access.h \ include/odp_packet_io_ring_internal.h \ - pktio/ethtool.h \ pktio/common.h \ - pktio/sysfs.h \ pktio/dpdk.h \ + pktio/ethtool.h \ + pktio/mdev.h \ + pktio/sysfs.h \ + pktio/uapi_net_mdev.h \ include/odp_pktio_ops_ipc.h \ include/odp_pktio_ops_loopback.h \ include/odp_pktio_ops_netmap.h \ @@ -243,18 +245,19 @@ __LIB__libodp_linux_la_SOURCES = \ odp_packet_flags.c \ odp_packet_io.c \ odp_packet_io_pool.c \ + pktio/common.c \ + pktio/dpdk.c \ pktio/ethtool.c \ - pktio/subsystem.c \ pktio/ipc.c \ - pktio/common.c \ pktio/loopback.c \ + pktio/mdev.c \ pktio/netmap.c \ - pktio/dpdk.c \ + pktio/ring.c \ pktio/socket.c \ pktio/socket_mmap.c \ + pktio/subsystem.c \ pktio/sysfs.c \ pktio/tap.c \ - pktio/ring.c \ pool/generic.c \ pool/subsystem.c \ odp_pkt_queue.c \ diff --git a/platform/linux-generic/m4/configure.m4 b/platform/linux-generic/m4/configure.m4 index fc29f9cb..a0d65a31 100644 --- a/platform/linux-generic/m4/configure.m4 +++ b/platform/linux-generic/m4/configure.m4 @@ -14,6 +14,7 @@ m4_include([platform/linux-generic/m4/odp_modules.m4]) m4_include([platform/linux-generic/m4/odp_netmap.m4]) m4_include([platform/linux-generic/m4/odp_dpdk.m4]) m4_include([platform/linux-generic/m4/odp_schedule.m4]) +m4_include([platform/linux-generic/m4/odp_mdev.m4]) m4_include([platform/linux-generic/m4/performance.m4]) diff --git a/platform/linux-generic/m4/odp_mdev.m4 b/platform/linux-generic/m4/odp_mdev.m4 new file mode 100644 index 00000000..64f9e096 --- /dev/null +++ b/platform/linux-generic/m4/odp_mdev.m4 @@ -0,0 +1,34 @@ +########################################################################## +# Enable mdev support +########################################################################## +mdev_support=no +AC_ARG_ENABLE([mdev_support], + [ --enable-mdev-support include mediated device drivers support], + [if test x$enableval = xyes; then + mdev_support=yes + fi]) + +########################################################################## +# Save and set temporary compilation flags +########################################################################## +OLD_CPPFLAGS=$CPPFLAGS +CPPFLAGS="$MDEV_CPPFLAGS $CPPFLAGS" + +########################################################################## +# Check for mdev availability +########################################################################## +if test x$mdev_support = xyes +then + AC_DEFINE([ODP_MDEV], [1], + [Define to 1 to enable mediated device drivers support]) + AC_SUBST([MDEV_CPPFLAGS]) +else + mdev_support=no +fi + +########################################################################## +# Restore old saved variables +########################################################################## +CPPFLAGS=$OLD_CPPFLAGS + +AM_CONDITIONAL([mdev_support], [test x$mdev_support = xyes ]) diff --git a/platform/linux-generic/pktio/mdev.c b/platform/linux-generic/pktio/mdev.c new file mode 100644 index 00000000..45ea2d11 --- /dev/null +++ b/platform/linux-generic/pktio/mdev.c @@ -0,0 +1,593 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include "config.h" + +#ifdef ODP_MDEV + +#include <dirent.h> +#include <errno.h> +#include <fcntl.h> +#include <stddef.h> +#include <stdint.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <sys/ioctl.h> +#include <sys/mman.h> +#include <unistd.h> + +#include <linux/vfio.h> + +#include <odp_posix_extensions.h> +#include <odp_align_internal.h> +#include <odp_debug_internal.h> + +#include <odp/api/hints.h> + +#include <pktio/mdev.h> +#include <pktio/uapi_net_mdev.h> + +/** + * returns a valid VFIO container + * fd must be closed by caller + */ +static int get_container(void) +{ + int container; + int ret; + + /* Create a new container */ + container = open("/dev/vfio/vfio", O_RDWR); + if (container < 0) { + ODP_ERR("Failed to create new VFIO container\n"); + goto out; + } + + ret = ioctl(container, VFIO_GET_API_VERSION); + if (ret != VFIO_API_VERSION) { + ODP_ERR("VFIO API version mismatch: expected %i, got %i\n", + VFIO_API_VERSION, ret); + goto out; + } + + ret = ioctl(container, VFIO_CHECK_EXTENSION, VFIO_TYPE1_IOMMU); + if (!ret) { + ODP_ERR("Container doesn't support VFIO_TYPE1_IOMMU\n"); + goto out; + } + + return container; + +out: + if (container != -1) + close(container); + return -1; +} + +/** + * returns a valid VFIO group + * fd must be closed by caller + */ +static int get_group(int grp_id) +{ + char path[32]; + int group; + int ret; + struct vfio_group_status group_status = { + .argsz = sizeof(group_status) + }; + + snprintf(path, sizeof(path), "/dev/vfio/%d", grp_id); + group = open(path, O_RDWR); + if (group < 0) { + ODP_ERR("Failed to open %s: %s\n", path, strerror(errno)); + goto out; + } + + ret = ioctl(group, VFIO_GROUP_GET_STATUS, &group_status); + if (ret < 0) { + ODP_ERR("Failed to get group status\n"); + goto out; + } + + /* Test the group is viable and available */ + if (!(group_status.flags & VFIO_GROUP_FLAGS_VIABLE)) { + ODP_ERR("Group is not viable\n"); + goto out; + } + + return group; + +out: + if (group != -1) + close(group); + return -1; +} + +static void vfio_find_sparse_mmaps(struct vfio_info_cap_header *hdr, + struct vfio_region_info_cap_sparse_mmap + **sparse) +{ + *sparse = + odp_container_of(hdr, struct vfio_region_info_cap_sparse_mmap, + header); +} + +static struct vfio_info_cap_header * +vfio_get_region_info_cap(struct vfio_region_info *info, __u16 id) +{ + struct vfio_info_cap_header *hdr; + void *ptr = info; + + if (!(info->flags & VFIO_REGION_INFO_FLAG_CAPS)) + return NULL; + + for (hdr = + (struct vfio_info_cap_header *)(void *)((uint8_t *)ptr + + info->cap_offset); + hdr != ptr; + hdr = (struct vfio_info_cap_header *)(void *)((uint8_t *)ptr + + hdr->next)) { + if (hdr->id == id) + return hdr; + } + + return NULL; +} + +static struct vfio_info_cap_header * +vfio_get_cap_info(struct vfio_region_info *region_info, __u16 id) +{ + struct vfio_info_cap_header *caps = NULL; + + caps = vfio_get_region_info_cap(region_info, id); + + return caps; +} + +int vfio_get_region_sparse_mmaps(struct vfio_region_info *region_info, + struct vfio_region_info_cap_sparse_mmap + **sparse) +{ + struct vfio_info_cap_header *caps = NULL; + int ret = -ENOENT; + + if (region_info->flags & VFIO_REGION_INFO_FLAG_CAPS && + region_info->argsz > sizeof(*region_info)) { + caps = vfio_get_cap_info(region_info, + VFIO_REGION_INFO_CAP_SPARSE_MMAP); + if (!caps) + goto out; + vfio_find_sparse_mmaps(caps, sparse); + if (*sparse) { + for (uint32_t i = 0; i < (*sparse)->nr_areas; i++) + ODP_DBG("Sparse region: %d 0x%llx %llu\n", i, + (*sparse)->areas[i].offset, + (*sparse)->areas[i].size); + } + + ret = 0; + } + +out: + return ret; +} + +/** Match capability type + * returns 0 on succcess + */ +int vfio_get_region_cap_type(struct vfio_region_info *region_info, + mdev_region_class_t *class_info) +{ + struct vfio_info_cap_header *caps = NULL; + int ret = 0; + struct vfio_region_info_cap_type *cap_type; + + if (region_info->flags & VFIO_REGION_INFO_FLAG_CAPS && + region_info->argsz > sizeof(*region_info)) { + caps = vfio_get_cap_info(region_info, + VFIO_REGION_INFO_CAP_TYPE); + if (!caps) { + ret = -EINVAL; + goto out; + } + + cap_type = + odp_container_of(caps, struct vfio_region_info_cap_type, + header); + + class_info->type = cap_type->type; + class_info->subtype = cap_type->subtype; + } +out: + return ret; +} + +/** + * Get specific region info + */ +static struct vfio_region_info *vfio_get_region(mdev_device_t *mdev, + __u32 region) +{ + int ret; + struct vfio_region_info *region_info = NULL; + + ODP_DBG("Region:%d\n", region); + region_info = calloc(1, sizeof(*region_info)); + if (!region_info) + goto out; + + region_info->index = region; + region_info->argsz = sizeof(*region_info); + ret = ioctl(mdev->device, VFIO_DEVICE_GET_REGION_INFO, region_info); + if (ret < 0) { + ODP_ERR("Failed to get PCI region info\n"); + goto out; + } + + if (region_info->argsz > sizeof(*region_info)) { + struct vfio_region_info *tmp; + + tmp = realloc(region_info, region_info->argsz); + if (!tmp) + goto out; + + region_info = tmp; + + ODP_DBG("region info %d with extended capabilities size: %u\n", + region, region_info->argsz); + ret = ioctl(mdev->device, VFIO_DEVICE_GET_REGION_INFO, + region_info); + if (ret < 0) { + ODP_ERR("Failed to get PCI region info\n"); + goto out; + } + } + + if (!region_info->size) { + ODP_DBG("region info %d is empty, skipping\n", region); + goto out; + } + + return region_info; + +out: + if (region_info) + free(region_info); + return NULL; +} + +/** + * mmap a VFIO region + */ +void *mdev_region_mmap(mdev_device_t *mdev, uint64_t offset, uint64_t size) +{ + void *addr; + + /* Make sure we're page aligned */ + ODP_ASSERT(offset == ROUNDUP_ALIGN(offset, ODP_PAGE_SIZE)); + ODP_ASSERT(size == ROUNDUP_ALIGN(size, ODP_PAGE_SIZE)); + + if (mdev->mappings_count >= ARRAY_SIZE(mdev->mappings)) + return MAP_FAILED; + + addr = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED, + mdev->device, offset); + if (addr == MAP_FAILED) + return addr; + + mdev->mappings[mdev->mappings_count].addr = addr; + mdev->mappings[mdev->mappings_count].size = size; + mdev->mappings_count++; + + return addr; +} + +int mdev_dma_area_alloc(mdev_device_t *mdev, mdev_dma_area_t *dma_area) +{ + struct vfio_iommu_type1_dma_map req; + void *tmp; + + /* Make sure we're page aligned */ + if (dma_area->size != ROUNDUP_ALIGN(dma_area->size, ODP_PAGE_SIZE)) + return -EINVAL; + + memset(&req, 0, sizeof(req)); + req.argsz = sizeof(req); + + tmp = mmap(NULL, dma_area->size, PROT_READ | PROT_WRITE, + MAP_SHARED | MAP_ANONYMOUS | MAP_NORESERVE | MAP_FIXED, -1, + 0); + if (tmp == MAP_FAILED) { + ODP_ERR("mmap failed\n"); + return -EFAULT; + } + + dma_area->vaddr = (uint64_t)tmp; + + req.vaddr = dma_area->vaddr; + req.size = dma_area->size; + req.flags = VFIO_DMA_MAP_FLAG_READ | VFIO_DMA_MAP_FLAG_WRITE; + + if (ioctl(mdev->device, VFIO_IOMMU_MAP_DMA, &req) < 0) { + ODP_ERR("ioctl failed\n"); + return -EFAULT; + } + + dma_area->iova = req.iova; + + ODP_DBG("dma_area alloc: %llx@%llx -> %llx\n", dma_area->size, + dma_area->vaddr, dma_area->iova); + + return 0; +} + +int mdev_dma_area_free(mdev_device_t *mdev, mdev_dma_area_t *dma_area) +{ + struct vfio_iommu_type1_dma_unmap req; + + memset(&req, 0, sizeof(req)); + req.argsz = sizeof(req); + req.iova = dma_area->iova; + req.size = dma_area->size; + req.flags = VFIO_DMA_MAP_FLAG_READ | VFIO_DMA_MAP_FLAG_WRITE; + + if (ioctl(mdev->device, VFIO_IOMMU_UNMAP_DMA, &req) < 0) { + ODP_ERR("ioctl failed\n"); + return -EFAULT; + } + + if (munmap((void *)dma_area->vaddr, dma_area->size) < 0) { + ODP_ERR("munmap failed\n"); + return -EFAULT; + } + + ODP_DBG("dma_area free: %llx@%llx -> %llx\n", dma_area->size, + dma_area->vaddr, dma_area->iova); + + return 0; +} + +static char *mdev_basename(char *path) +{ + char *rpath; + + rpath = basename(path); + if (rpath) + return rpath; + + return NULL; +} + +static int mdev_readlink(const char *path, char *link, size_t linksz) +{ + ssize_t len; + + len = readlink(path, link, linksz - 1); + if (len != -1) { + link[len] = '\0'; + return 0; + } + return -1; +} + +/** + * returns group_id or -1 on fail and fills group_uuid + */ +static int mdev_sysfs_discover(const char *mod_name, const char *if_name, + char *uuid, size_t sz) +{ + int ret; + char *driver, *iommu_group; + char sysfs_path[2048], sysfs_link[2048]; + DIR *dir; + struct dirent *dp; + + /* Don't put / on the end of the path */ + snprintf(sysfs_path, sizeof(sysfs_path), + "/sys/class/net/%s/device/driver", if_name); + ret = mdev_readlink(sysfs_path, sysfs_link, sizeof(sysfs_link)); + if (ret) { + ODP_ERR("Can't locate sysfs driver path\n"); + return -1; + } + + driver = mdev_basename(sysfs_link); + if (!driver) { + ODP_ERR("Can't driver in sysfs\n"); + return -1; + } + + if (strcmp(driver, mod_name)) { + ODP_ERR("Invalid driver name\n"); + return -1; + } + + snprintf(sysfs_path, sizeof(sysfs_path), + "/sys/class/net/%s/device/mdev_supported_types/%s-netmdev/devices/", + if_name, driver); + + dir = opendir(sysfs_path); + if (!dir) + return -1; + + /* We assume only one UUID per network interface */ + uuid[0] = '\0'; + while ((dp = readdir(dir)) != NULL) { + if (strcmp(dp->d_name, ".") && strcmp(dp->d_name, "..")) { + strncpy(uuid, dp->d_name, sz); + break; + } + } + closedir(dir); + + if (uuid[0] == '\0') + return -1; + + snprintf(sysfs_path, sizeof(sysfs_path), + "/sys/bus/mdev/devices/%s/iommu_group", uuid); + ret = mdev_readlink(sysfs_path, sysfs_link, sizeof(sysfs_link)); + if (ret) { + ODP_ERR("Can't locate IOMMU sysfs path\n"); + return -1; + } + + iommu_group = mdev_basename(sysfs_link); + if (!iommu_group) { + ODP_ERR("Can't locate iommu group in sysfs\n"); + return -1; + } + ret = atoi(iommu_group); + + return ret; +} + +/** + * Initialize VFIO variables. + * set IOMMU and get device regions + */ +static int vfio_init_dev(int grp, int container, + struct vfio_group_status *grp_status, + struct vfio_iommu_type1_info *iommu_info, + struct vfio_device_info *dev_info, char *grp_uuid) +{ + int device = -1; + int ret; + + ret = ioctl(container, VFIO_CHECK_EXTENSION, VFIO_TYPE1_IOMMU); + if (ret < 0) { + ODP_ERR("Doesn't support the IOMMU driver we want\n"); + goto out; + } + + /* Test the group is viable and available */ + ret = ioctl(grp, VFIO_GROUP_GET_STATUS, grp_status); + if (ret < 0 || !(grp_status->flags & VFIO_GROUP_FLAGS_VIABLE)) { + ODP_ERR("Can't get status\n"); + goto out; + } + + ret = ioctl(grp, VFIO_GROUP_SET_CONTAINER, &container); + if (ret < 0) { + ODP_ERR("Failed to set container\n"); + goto out; + } + + ret = ioctl(container, VFIO_SET_IOMMU, VFIO_TYPE1_IOMMU); + if (ret < 0) { + ODP_ERR("Failed to set IOMMU\n"); + goto out; + } + + ret = ioctl(container, VFIO_IOMMU_GET_INFO, iommu_info); + if (ret < 0) { + ODP_ERR("Failed to get IOMMU info\n"); + goto out; + } + + ODP_DBG("iova_pgsizes bitmask=0x%llx\n", iommu_info->iova_pgsizes); + /* Get a file descriptor for the device */ + device = ioctl(grp, VFIO_GROUP_GET_DEVICE_FD, grp_uuid); + if (device < 0) { + ODP_ERR("Failed to get device FD\n"); + goto out; + } + + /* Test and setup the device */ + ret = ioctl(device, VFIO_DEVICE_GET_INFO, dev_info); + if (ret < 0) { + ODP_ERR("Failed to get device info\n"); + goto out; + } + + ODP_DBG("Device %d Regions: %d, irqs:%d\n", device, + dev_info->num_regions, dev_info->num_irqs); + + return device; + +out: + return -1; +} + +int mdev_device_create(mdev_device_t *mdev, const char *mod_name, + const char *if_name, + mdev_region_info_cb_t region_info_cb) +{ + struct vfio_group_status group_status = { + .argsz = sizeof(group_status) + }; + struct vfio_iommu_type1_info iommu_info = { + .argsz = sizeof(iommu_info) + }; + struct vfio_device_info device_info = { + .argsz = sizeof(device_info) + }; + int ret; + + memset(mdev, 0, sizeof(*mdev)); + mdev->container = -1; + mdev->group = -1; + + strncpy(mdev->if_name, if_name, sizeof(mdev->if_name) - 1); + + mdev->group_id = + mdev_sysfs_discover(mod_name, mdev->if_name, mdev->group_uuid, + sizeof(mdev->group_uuid)); + if (mdev->group_id < 0) + goto fail; + + mdev->container = get_container(); + if (mdev->container < 0) + goto fail; + + mdev->group = get_group(mdev->group_id); + if (mdev->group < 0) + goto fail; + + mdev->device = + vfio_init_dev(mdev->group, mdev->container, &group_status, + &iommu_info, &device_info, mdev->group_uuid); + if (mdev->device < 0) + goto fail; + + ret = -EINVAL; + for (uint32_t region = 0; region < device_info.num_regions; region++) { + struct vfio_region_info *region_info; + + region_info = vfio_get_region(mdev, region); + if (!region_info) + continue; + + ret = region_info_cb(mdev, region_info); + free(region_info); + if (ret < 0) { + ODP_ERR("Region info cb fail on region_info[%u]\n", + region); + return -1; + } + + ret = 0; + } + + return ret; + +fail: + return -1; +} + +void mdev_device_destroy(mdev_device_t *mdev) +{ + if (mdev->group != -1) + close(mdev->group); + if (mdev->container != -1) + close(mdev->container); + + for (uint16_t i = 0; i < mdev->mappings_count; i++) + munmap(mdev->mappings[i].addr, mdev->mappings[i].size); +} + +#endif /* ODP_MDEV */ diff --git a/platform/linux-generic/pktio/mdev.h b/platform/linux-generic/pktio/mdev.h new file mode 100644 index 00000000..5249a6d0 --- /dev/null +++ b/platform/linux-generic/pktio/mdev.h @@ -0,0 +1,61 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#ifndef ODP_PKTIO_MDEV_H_ +#define ODP_PKTIO_MDEV_H_ + +#include <linux/vfio.h> +#include <net/if.h> + +#define NET_MDEV_PREFIX "mdev:" + +typedef struct { + uint16_t type; + uint16_t subtype; +} mdev_region_class_t; + +typedef struct { + uint64_t vaddr; + uint64_t iova; + uint64_t size; +} mdev_dma_area_t; + +typedef struct { + char if_name[IF_NAMESIZE]; /**< Interface name */ + + int container; + int group; + int device; + + int group_id; + char group_uuid[64]; + + struct { + uint8_t *addr; + size_t size; + } mappings[256]; + uint16_t mappings_count; +} mdev_device_t; + +typedef int (*mdev_region_info_cb_t)(mdev_device_t *, + struct vfio_region_info *); + +int mdev_device_create(mdev_device_t *mdev, const char *mod_name, + const char *if_name, mdev_region_info_cb_t cb); +void mdev_device_destroy(mdev_device_t *mdev); + +void *mdev_region_mmap(mdev_device_t *mdev, uint64_t offset, uint64_t size); + +int vfio_get_region_cap_type(struct vfio_region_info *region_info, + mdev_region_class_t *type_info); +int vfio_get_region_sparse_mmaps(struct vfio_region_info *region_info, + struct vfio_region_info_cap_sparse_mmap + **sparse); + +int mdev_dma_area_alloc(mdev_device_t *mdev, mdev_dma_area_t *dma_area); +int mdev_dma_area_free(mdev_device_t *mdev, mdev_dma_area_t *dma_area); + +#endif diff --git a/platform/linux-generic/pktio/uapi_net_mdev.h b/platform/linux-generic/pktio/uapi_net_mdev.h new file mode 100644 index 00000000..d355042b --- /dev/null +++ b/platform/linux-generic/pktio/uapi_net_mdev.h @@ -0,0 +1,19 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#ifndef _UAPI__LINUX_NET_MDEV_H +#define _UAPI__LINUX_NET_MDEV_H + +#include <linux/types.h> +#include <linux/ioctl.h> + +enum net_mdev_types { + VFIO_NET_MDEV_MMIO, + VFIO_NET_MDEV_RX_RING, + VFIO_NET_MDEV_TX_RING, +}; + +#endif /* _UAPI__LINUX_NET_MDEV_H */ ----------------------------------------------------------------------- Summary of changes: configure.ac | 1 + platform/linux-dpdk/m4/configure.m4 | 1 + platform/linux-generic/Makefile.am | 15 +- platform/linux-generic/m4/configure.m4 | 1 + platform/linux-generic/m4/odp_mdev.m4 | 34 ++ platform/linux-generic/pktio/mdev.c | 593 +++++++++++++++++++++++++++ platform/linux-generic/pktio/mdev.h | 61 +++ platform/linux-generic/pktio/uapi_net_mdev.h | 19 + 8 files changed, 719 insertions(+), 6 deletions(-) create mode 100644 platform/linux-generic/m4/odp_mdev.m4 create mode 100644 platform/linux-generic/pktio/mdev.c create mode 100644 platform/linux-generic/pktio/mdev.h create mode 100644 platform/linux-generic/pktio/uapi_net_mdev.h hooks/post-receive --

7 years, 5 months

[COMMIT] branch api-next updated. v1.17.0.0_tigermoth_rc1-19-g0c7741d0

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 0c7741d067d9b96e14e420b53a256a1b93096e16 (commit) via 614773850d4d572b793ce2db6cb0cd6c94dada3b (commit) via 6a2d72b399388d7d29cba4f60bf3aea3f1ff555c (commit) via e8ec57b012fea43ae501adb66f5c8ee2f03d0a6c (commit) from f6dab2bfa90ef5d3146cb76f86bc8782666f0f3e (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 0c7741d067d9b96e14e420b53a256a1b93096e16 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Tue Dec 12 15:12:37 2017 +0200 linux-gen: queue: lock-free implementation Simple implementation of non-blocking, lock-free plain queues. Enqueues are done freely to any free ring node with an atomically increasing counter value. Dequeue operation finds the node with lowest counter value. Implementation requires lockfree 128 bit atomics. Lock-free queues are not supported when those are not available. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index e25970b0..b701d807 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -160,6 +160,7 @@ noinst_HEADERS = \ include/odp_queue_scalable_internal.h \ include/odp_ring_internal.h \ include/odp_queue_if.h \ + include/odp_queue_lf.h \ include/odp_schedule_if.h \ include/odp_schedule_scalable.h \ include/odp_schedule_scalable_config.h \ @@ -220,6 +221,7 @@ __LIB__libodp_linux_la_SOURCES = \ odp_pool.c \ odp_queue.c \ odp_queue_if.c \ + odp_queue_lf.c \ odp_queue_scalable.c \ odp_rwlock.c \ odp_rwlock_recursive.c \ diff --git a/platform/linux-generic/include/odp_queue_internal.h b/platform/linux-generic/include/odp_queue_internal.h index dd846d59..26410ac7 100644 --- a/platform/linux-generic/include/odp_queue_internal.h +++ b/platform/linux-generic/include/odp_queue_internal.h @@ -53,6 +53,7 @@ struct queue_entry_s { odp_queue_param_t param; odp_pktin_queue_t pktin; odp_pktout_queue_t pktout; + void *queue_lf; char name[ODP_QUEUE_NAME_LEN]; }; diff --git a/platform/linux-generic/include/odp_queue_lf.h b/platform/linux-generic/include/odp_queue_lf.h new file mode 100644 index 00000000..9bd61e42 --- /dev/null +++ b/platform/linux-generic/include/odp_queue_lf.h @@ -0,0 +1,36 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#ifndef ODP_QUEUE_LF_H_ +#define ODP_QUEUE_LF_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#include <odp_queue_if.h> +#include <odp_queue_internal.h> + +/* Lock-free queue functions */ +typedef struct { + queue_enq_fn_t enq; + queue_enq_multi_fn_t enq_multi; + queue_deq_fn_t deq; + queue_deq_multi_fn_t deq_multi; + +} queue_lf_func_t; + +uint32_t queue_lf_init_global(uint32_t *queue_lf_size, + queue_lf_func_t *lf_func); +void queue_lf_term_global(void); +void *queue_lf_create(queue_entry_t *queue); +void queue_lf_destroy(void *queue_lf); + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/platform/linux-generic/odp_queue.c b/platform/linux-generic/odp_queue.c index 6a69eb84..7cb60562 100644 --- a/platform/linux-generic/odp_queue.c +++ b/platform/linux-generic/odp_queue.c @@ -8,6 +8,7 @@ #include <odp/api/queue.h> #include <odp_queue_internal.h> +#include <odp_queue_lf.h> #include <odp_queue_if.h> #include <odp/api/std_types.h> #include <odp/api/align.h> @@ -39,11 +40,16 @@ static int queue_init(queue_entry_t *queue, const char *name, const odp_queue_param_t *param); -typedef struct queue_table_t { - queue_entry_t queue[ODP_CONFIG_QUEUES]; -} queue_table_t; +typedef struct queue_global_t { + queue_entry_t queue[ODP_CONFIG_QUEUES]; -static queue_table_t *queue_tbl; + uint32_t queue_lf_num; + uint32_t queue_lf_size; + queue_lf_func_t queue_lf_func; + +} queue_global_t; + +static queue_global_t *queue_glb; static queue_entry_t *get_qentry(uint32_t queue_id); @@ -64,26 +70,28 @@ static inline odp_queue_t queue_from_id(uint32_t queue_id) static queue_entry_t *get_qentry(uint32_t queue_id) { - return &queue_tbl->queue[queue_id]; + return &queue_glb->queue[queue_id]; } static int queue_init_global(void) { uint32_t i; odp_shm_t shm; + uint32_t lf_size = 0; + queue_lf_func_t *lf_func; ODP_DBG("Queue init ... "); shm = odp_shm_reserve("odp_queues", - sizeof(queue_table_t), + sizeof(queue_global_t), sizeof(queue_entry_t), 0); - queue_tbl = odp_shm_addr(shm); + queue_glb = odp_shm_addr(shm); - if (queue_tbl == NULL) + if (queue_glb == NULL) return -1; - memset(queue_tbl, 0, sizeof(queue_table_t)); + memset(queue_glb, 0, sizeof(queue_global_t)); for (i = 0; i < ODP_CONFIG_QUEUES; i++) { /* init locks */ @@ -93,6 +101,10 @@ static int queue_init_global(void) queue->s.handle = queue_from_id(i); } + lf_func = &queue_glb->queue_lf_func; + queue_glb->queue_lf_num = queue_lf_init_global(&lf_size, lf_func); + queue_glb->queue_lf_size = lf_size; + ODP_DBG("done\n"); ODP_DBG("Queue init global\n"); ODP_DBG(" struct queue_entry_s size %zu\n", @@ -122,7 +134,7 @@ static int queue_term_global(void) int i; for (i = 0; i < ODP_CONFIG_QUEUES; i++) { - queue = &queue_tbl->queue[i]; + queue = &queue_glb->queue[i]; LOCK(&queue->s.lock); if (queue->s.status != QUEUE_STATUS_FREE) { ODP_ERR("Not destroyed queue: %s\n", queue->s.name); @@ -131,6 +143,8 @@ static int queue_term_global(void) UNLOCK(&queue->s.lock); } + queue_lf_term_global(); + ret = odp_shm_free(odp_shm_lookup("odp_queues")); if (ret < 0) { ODP_ERR("shm free failed for odp_queues"); @@ -151,6 +165,8 @@ static int queue_capability(odp_queue_capability_t *capa) capa->sched_prios = odp_schedule_num_prio(); capa->plain.max_num = capa->max_queues; capa->sched.max_num = capa->max_queues; + capa->plain.lockfree.max_num = queue_glb->queue_lf_num; + capa->plain.lockfree.max_size = queue_glb->queue_lf_size; return 0; } @@ -188,6 +204,7 @@ static odp_queue_t queue_create(const char *name, { uint32_t i; queue_entry_t *queue; + void *queue_lf; odp_queue_t handle = ODP_QUEUE_INVALID; odp_queue_type_t type = ODP_QUEUE_TYPE_PLAIN; odp_queue_param_t default_param; @@ -198,7 +215,7 @@ static odp_queue_t queue_create(const char *name, } for (i = 0; i < ODP_CONFIG_QUEUES; i++) { - queue = &queue_tbl->queue[i]; + queue = &queue_glb->queue[i]; if (queue->s.status != QUEUE_STATUS_FREE) continue; @@ -207,7 +224,26 @@ static odp_queue_t queue_create(const char *name, if (queue->s.status == QUEUE_STATUS_FREE) { if (queue_init(queue, name, param)) { UNLOCK(&queue->s.lock); - return handle; + return ODP_QUEUE_INVALID; + } + + if (param->nonblocking == ODP_NONBLOCKING_LF) { + queue_lf_func_t *lf_func; + + lf_func = &queue_glb->queue_lf_func; + + queue_lf = queue_lf_create(queue); + + if (queue_lf == NULL) { + UNLOCK(&queue->s.lock); + return ODP_QUEUE_INVALID; + } + queue->s.queue_lf = queue_lf; + + queue->s.enqueue = lf_func->enq; + queue->s.enqueue_multi = lf_func->enq_multi; + queue->s.dequeue = lf_func->deq; + queue->s.dequeue_multi = lf_func->deq_multi; } type = queue->s.type; @@ -224,7 +260,10 @@ static odp_queue_t queue_create(const char *name, UNLOCK(&queue->s.lock); } - if (handle != ODP_QUEUE_INVALID && type == ODP_QUEUE_TYPE_SCHED) { + if (handle == ODP_QUEUE_INVALID) + return ODP_QUEUE_INVALID; + + if (type == ODP_QUEUE_TYPE_SCHED) { if (sched_fn->init_queue(queue->s.index, &queue->s.param.sched)) { queue->s.status = QUEUE_STATUS_FREE; @@ -289,6 +328,10 @@ static int queue_destroy(odp_queue_t handle) default: ODP_ABORT("Unexpected queue status\n"); } + + if (queue->s.param.nonblocking == ODP_NONBLOCKING_LF) + queue_lf_destroy(queue->s.queue_lf); + UNLOCK(&queue->s.lock); return 0; @@ -313,7 +356,7 @@ static odp_queue_t queue_lookup(const char *name) uint32_t i; for (i = 0; i < ODP_CONFIG_QUEUES; i++) { - queue_entry_t *queue = &queue_tbl->queue[i]; + queue_entry_t *queue = &queue_glb->queue[i]; if (queue->s.status == QUEUE_STATUS_FREE || queue->s.status == QUEUE_STATUS_DESTROYED) diff --git a/platform/linux-generic/odp_queue_lf.c b/platform/linux-generic/odp_queue_lf.c new file mode 100644 index 00000000..9f509082 --- /dev/null +++ b/platform/linux-generic/odp_queue_lf.c @@ -0,0 +1,346 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/queue.h> +#include <odp/api/atomic.h> +#include <odp/api/shared_memory.h> +#include <odp_queue_lf.h> +#include <string.h> +#include <stdio.h> + +#include "config.h" +#include <odp_debug_internal.h> + +#define RING_LF_SIZE 32 +#define QUEUE_LF_NUM 128 +#define ENQ_RETRIES (RING_LF_SIZE / 4) +#define DEQ_RETRIES (RING_LF_SIZE / 8) + +#ifdef __SIZEOF_INT128__ + +typedef unsigned __int128 u128_t; + +static inline u128_t atomic_load_u128(u128_t *atomic) +{ + return __atomic_load_n(atomic, __ATOMIC_RELAXED); +} + +static inline void atomic_zero_u128(u128_t *atomic) +{ + __atomic_store_n(atomic, 0, __ATOMIC_RELAXED); +} + +static inline int atomic_cas_rel_u128(u128_t *atomic, u128_t old_val, + u128_t new_val) +{ + return __atomic_compare_exchange_n(atomic, &old_val, new_val, + 0 /* strong */, + __ATOMIC_RELEASE, + __ATOMIC_RELAXED); +} + +static inline int atomic_cas_acq_u128(u128_t *atomic, u128_t old_val, + u128_t new_val) +{ + return __atomic_compare_exchange_n(atomic, &old_val, new_val, + 0 /* strong */, + __ATOMIC_ACQUIRE, + __ATOMIC_RELAXED); +} + +#else + +/* These definitions enable build in non 128 bit compatible systems. + * Implementation is active only when 128 bit lockfree atomics are available. + * So, these are never actually used. */ +typedef struct { + uint64_t u64[2]; +} u128_t ODP_ALIGNED(16); + +static inline u128_t atomic_load_u128(u128_t *atomic) +{ + return *atomic; +} + +static inline void atomic_zero_u128(u128_t *atomic) +{ + atomic->u64[0] = 0; + atomic->u64[1] = 0; +} + +static inline int atomic_cas_rel_u128(u128_t *atomic, u128_t old_val, + u128_t new_val) +{ + (void)old_val; + *atomic = new_val; + return 1; +} + +static inline int atomic_cas_acq_u128(u128_t *atomic, u128_t old_val, + u128_t new_val) +{ + return atomic_cas_rel_u128(atomic, old_val, new_val); +} + +#endif + +/* Node in lock-free ring */ +typedef union { + u128_t u128; + + struct { + /* 0: empty, 1: data */ + uint64_t mark: 1; + + /* A cache aligned pointer fits into 63 bits, since the least + * significant bits are zero. */ + uint64_t ptr: 63; + + /* Data with lowest counter value is the head. */ + uint64_t count; + } s; + +} ring_lf_node_t; + +/* Lock-free ring */ +typedef struct { + ring_lf_node_t node[RING_LF_SIZE]; + int used; + odp_atomic_u64_t enq_counter; + +} queue_lf_t ODP_ALIGNED_CACHE; + +/* Lock-free queue globals */ +typedef struct { + queue_lf_t queue_lf[QUEUE_LF_NUM]; + odp_shm_t shm; + +} queue_lf_global_t ODP_ALIGNED_CACHE; + +static queue_lf_global_t *queue_lf_glb; + +static inline int next_idx(int idx) +{ + int next = idx + 1; + + if (next == RING_LF_SIZE) + next = 0; + + return next; +} + +static int queue_lf_enq(queue_t q_int, odp_buffer_hdr_t *buf_hdr) +{ + queue_entry_t *queue; + queue_lf_t *queue_lf; + int i, j, i_node; + int found; + ring_lf_node_t node_val; + ring_lf_node_t new_val; + ring_lf_node_t *node; + uint64_t counter; + + queue = qentry_from_int(q_int); + queue_lf = queue->s.queue_lf; + + i_node = 0; + + counter = odp_atomic_fetch_inc_u64(&queue_lf->enq_counter); + + for (j = 0; j < ENQ_RETRIES; j++) { + found = 0; + + /* Find empty node */ + for (i = 0; i < RING_LF_SIZE; i++) { + i_node = next_idx(i_node); + node = &queue_lf->node[i_node]; + node_val.u128 = atomic_load_u128(&node->u128); + + if (node_val.s.mark == 0) { + found = 1; + break; + } + } + + /* Queue is full */ + if (found == 0) + return -1; + + /* Try to insert data */ + new_val.s.mark = 1; + new_val.s.count = counter; + new_val.s.ptr = ((uintptr_t)buf_hdr) >> 1; + + if (atomic_cas_rel_u128(&node->u128, node_val.u128, + new_val.u128)) + return 0; + } + + return -1; +} + +static int queue_lf_enq_multi(queue_t q_int, odp_buffer_hdr_t **buf_hdr, + int num) +{ + (void)num; + + if (queue_lf_enq(q_int, buf_hdr[0]) == 0) + return 1; + + return 0; +} + +static odp_buffer_hdr_t *queue_lf_deq(queue_t q_int) +{ + queue_entry_t *queue; + queue_lf_t *queue_lf; + int i, j, i_node; + int found; + ring_lf_node_t node_val, old_val, new_val; + ring_lf_node_t *node, *old; + uint64_t lowest; + + queue = qentry_from_int(q_int); + queue_lf = queue->s.queue_lf; + i_node = 0; + + for (j = 0; j < DEQ_RETRIES; j++) { + found = 0; + lowest = -1; + + /* Find the head node. The one with data and + * the lowest counter. */ + for (i = 0; i < RING_LF_SIZE; i++) { + i_node = next_idx(i_node); + node = &queue_lf->node[i_node]; + node_val.u128 = atomic_load_u128(&node->u128); + + if (node_val.s.mark == 1 && node_val.s.count < lowest) { + old = node; + old_val.u128 = node_val.u128; + lowest = node_val.s.count; + found = 1; + } + } + + /* Queue is empty */ + if (found == 0) + return NULL; + + /* Try to remove data */ + new_val.u128 = old_val.u128; + new_val.s.mark = 0; + + if (atomic_cas_acq_u128(&old->u128, old_val.u128, + new_val.u128)) + return (void *)(((uintptr_t)old_val.s.ptr) << 1); + } + + return NULL; +} + +static int queue_lf_deq_multi(queue_t q_int, odp_buffer_hdr_t **buf_hdr, + int num) +{ + odp_buffer_hdr_t *buf; + + (void)num; + + buf = queue_lf_deq(q_int); + + if (buf == NULL) + return 0; + + buf_hdr[0] = buf; + return 1; +} + +uint32_t queue_lf_init_global(uint32_t *queue_lf_size, + queue_lf_func_t *lf_func) +{ + odp_shm_t shm; + bool lockfree = 0; + + /* 16 byte lockfree CAS operation is needed. */ +#ifdef __SIZEOF_INT128__ + lockfree = __atomic_is_lock_free(16, NULL); +#endif + + ODP_DBG("\nLock-free queue init\n"); + ODP_DBG(" u128 lock-free: %i\n\n", lockfree); + + if (!lockfree) + return 0; + + shm = odp_shm_reserve("odp_queues_lf", sizeof(queue_lf_global_t), + ODP_CACHE_LINE_SIZE, 0); + + queue_lf_glb = odp_shm_addr(shm); + memset(queue_lf_glb, 0, sizeof(queue_lf_global_t)); + + queue_lf_glb->shm = shm; + + memset(lf_func, 0, sizeof(queue_lf_func_t)); + lf_func->enq = queue_lf_enq; + lf_func->enq_multi = queue_lf_enq_multi; + lf_func->deq = queue_lf_deq; + lf_func->deq_multi = queue_lf_deq_multi; + + *queue_lf_size = RING_LF_SIZE; + + return QUEUE_LF_NUM; +} + +void queue_lf_term_global(void) +{ + odp_shm_t shm; + + if (queue_lf_glb == NULL) + return; + + shm = queue_lf_glb->shm; + + if (odp_shm_free(shm) < 0) + ODP_ERR("shm free failed"); +} + +static void init_queue(queue_lf_t *queue_lf) +{ + int i; + + odp_atomic_init_u64(&queue_lf->enq_counter, 0); + + for (i = 0; i < RING_LF_SIZE; i++) + atomic_zero_u128(&queue_lf->node[i].u128); +} + +void *queue_lf_create(queue_entry_t *queue) +{ + int i; + queue_lf_t *queue_lf = NULL; + + if (queue->s.type != ODP_QUEUE_TYPE_PLAIN) + return NULL; + + for (i = 0; i < QUEUE_LF_NUM; i++) { + if (queue_lf_glb->queue_lf[i].used == 0) { + queue_lf = &queue_lf_glb->queue_lf[i]; + memset(queue_lf, 0, sizeof(queue_lf_t)); + init_queue(queue_lf); + queue_lf->used = 1; + break; + } + } + + return queue_lf; +} + +void queue_lf_destroy(void *queue_lf_ptr) +{ + queue_lf_t *queue_lf = queue_lf_ptr; + + queue_lf->used = 0; +} commit 614773850d4d572b793ce2db6cb0cd6c94dada3b Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Wed Jan 10 15:44:00 2018 +0200 validation: queue: multi-thread plain queue test Test plain queue enqueue and dequeue with multiple concurrent threads. Test blocking and non-blocking lock-free implementations. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/queue/queue.c b/test/validation/api/queue/queue.c index 1ff02917..59a917c0 100644 --- a/test/validation/api/queue/queue.c +++ b/test/validation/api/queue/queue.c @@ -14,6 +14,22 @@ #define MAX_NUM_EVENT (1 * 1024) #define MAX_ITERATION (100) #define MAX_QUEUES (64 * 1024) +#define GLOBALS_NAME "queue_test_globals" +#define DEQ_RETRIES 100 +#define ENQ_RETRIES 100 + +typedef struct { + pthrd_arg cu_thr; + int num_workers; + odp_barrier_t barrier; + odp_queue_t queue; + odp_atomic_u32_t num_event; + + struct { + uint32_t num_event; + } thread[ODP_THREAD_COUNT_MAX]; + +} test_globals_t; static int queue_context = 0xff; static odp_pool_t pool; @@ -31,7 +47,30 @@ static void generate_name(char *name, uint32_t index) int queue_suite_init(void) { + odp_shm_t shm; + test_globals_t *globals; odp_pool_param_t params; + int num_workers; + odp_cpumask_t mask; + + shm = odp_shm_reserve(GLOBALS_NAME, sizeof(test_globals_t), + ODP_CACHE_LINE_SIZE, 0); + + if (shm == ODP_SHM_INVALID) { + printf("Shared memory reserve failed\n"); + return -1; + } + + globals = odp_shm_addr(shm); + memset(globals, 0, sizeof(test_globals_t)); + + num_workers = odp_cpumask_default_worker(&mask, 0); + + if (num_workers > MAX_WORKERS) + num_workers = MAX_WORKERS; + + globals->num_workers = num_workers; + odp_barrier_init(&globals->barrier, num_workers); odp_pool_param_init(&params); @@ -51,7 +90,25 @@ int queue_suite_init(void) int queue_suite_term(void) { - return odp_pool_destroy(pool); + odp_shm_t shm; + + shm = odp_shm_lookup(GLOBALS_NAME); + if (shm == ODP_SHM_INVALID) { + printf("SHM lookup failed.\n"); + return -1; + } + + if (odp_shm_free(shm)) { + printf("SHM free failed.\n"); + return -1; + } + + if (odp_pool_destroy(pool)) { + printf("Pool destroy failed.\n"); + return -1; + } + + return 0; } void queue_test_capa(void) @@ -411,12 +468,211 @@ void queue_test_info(void) CU_ASSERT(odp_queue_destroy(q_order) == 0); } +static uint32_t alloc_and_enqueue(odp_queue_t queue, odp_pool_t pool, + uint32_t num) +{ + uint32_t i, ret; + odp_buffer_t buf; + odp_event_t ev; + + for (i = 0; i < num; i++) { + buf = odp_buffer_alloc(pool); + + CU_ASSERT(buf != ODP_BUFFER_INVALID); + + ev = odp_buffer_to_event(buf); + + ret = odp_queue_enq(queue, ev); + + CU_ASSERT(ret == 0); + + if (ret) + break; + } + + return i; +} + +static uint32_t dequeue_and_free_all(odp_queue_t queue) +{ + odp_event_t ev; + uint32_t num, retries; + + num = 0; + retries = 0; + + while (1) { + ev = odp_queue_deq(queue); + + if (ev == ODP_EVENT_INVALID) { + if (retries >= DEQ_RETRIES) + return num; + + retries++; + continue; + } + + retries = 0; + num++; + + odp_event_free(ev); + } + + return num; +} + +static int enqueue_with_retry(odp_queue_t queue, odp_event_t ev) +{ + int i; + + for (i = 0; i < ENQ_RETRIES; i++) + if (odp_queue_enq(queue, ev) == 0) + return 0; + + return -1; +} + +static int queue_test_worker(void *arg) +{ + uint32_t num, retries, num_workers; + int thr_id, ret; + odp_event_t ev; + odp_queue_t queue; + test_globals_t *globals = arg; + + thr_id = odp_thread_id(); + queue = globals->queue; + num_workers = globals->num_workers; + + if (num_workers > 1) + odp_barrier_wait(&globals->barrier); + + retries = 0; + num = odp_atomic_fetch_inc_u32(&globals->num_event); + + /* On average, each worker deq-enq each event once */ + while (num < (num_workers * MAX_NUM_EVENT)) { + ev = odp_queue_deq(queue); + + if (ev == ODP_EVENT_INVALID) { + if (retries < DEQ_RETRIES) { + retries++; + continue; + } + + /* Prevent thread to starve */ + num = odp_atomic_fetch_inc_u32(&globals->num_event); + retries = 0; + continue; + } + + globals->thread[thr_id].num_event++; + + ret = enqueue_with_retry(queue, ev); + + CU_ASSERT(ret == 0); + + num = odp_atomic_fetch_inc_u32(&globals->num_event); + } + + return 0; +} + +static void reset_thread_stat(test_globals_t *globals) +{ + int i; + + odp_atomic_init_u32(&globals->num_event, 0); + + for (i = 0; i < ODP_THREAD_COUNT_MAX; i++) + globals->thread[i].num_event = 0; +} + +static void multithread_test(odp_nonblocking_t nonblocking) +{ + odp_shm_t shm; + test_globals_t *globals; + odp_queue_t queue; + odp_queue_param_t qparams; + odp_queue_capability_t capa; + uint32_t queue_size, max_size; + uint32_t num, sum, num_free, i; + + CU_ASSERT(odp_queue_capability(&capa) == 0); + + queue_size = 2 * MAX_NUM_EVENT; + + max_size = capa.plain.max_size; + + if (nonblocking == ODP_NONBLOCKING_LF) { + if (capa.plain.lockfree.max_num == 0) + return; + + max_size = capa.plain.lockfree.max_size; + } + + if (max_size && queue_size > max_size) + queue_size = max_size; + + num = MAX_NUM_EVENT; + + if (num > queue_size) + num = queue_size / 2; + + shm = odp_shm_lookup(GLOBALS_NAME); + CU_ASSERT_FATAL(shm != ODP_SHM_INVALID); + + globals = odp_shm_addr(shm); + globals->cu_thr.numthrds = globals->num_workers; + + odp_queue_param_init(&qparams); + qparams.type = ODP_QUEUE_TYPE_PLAIN; + qparams.size = queue_size; + qparams.nonblocking = nonblocking; + + queue = odp_queue_create("queue_test_mt", &qparams); + CU_ASSERT_FATAL(queue != ODP_QUEUE_INVALID); + + globals->queue = queue; + reset_thread_stat(globals); + + CU_ASSERT(alloc_and_enqueue(queue, pool, num) == num); + + odp_cunit_thread_create(queue_test_worker, (pthrd_arg *)globals); + + /* Wait for worker threads to terminate */ + odp_cunit_thread_exit((pthrd_arg *)globals); + + sum = 0; + for (i = 0; i < ODP_THREAD_COUNT_MAX; i++) + sum += globals->thread[i].num_event; + + CU_ASSERT(sum != 0); + + num_free = dequeue_and_free_all(queue); + + CU_ASSERT(num_free == num); + CU_ASSERT(odp_queue_destroy(queue) == 0); +} + +static void queue_test_mt_plain_block(void) +{ + multithread_test(ODP_BLOCKING); +} + +static void queue_test_mt_plain_nonblock_lf(void) +{ + multithread_test(ODP_NONBLOCKING_LF); +} + odp_testinfo_t queue_suite[] = { ODP_TEST_INFO(queue_test_capa), ODP_TEST_INFO(queue_test_mode), ODP_TEST_INFO(queue_test_lockfree), ODP_TEST_INFO(queue_test_param), ODP_TEST_INFO(queue_test_info), + ODP_TEST_INFO(queue_test_mt_plain_block), + ODP_TEST_INFO(queue_test_mt_plain_nonblock_lf), ODP_TEST_INFO_NULL, }; commit 6a2d72b399388d7d29cba4f60bf3aea3f1ff555c Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Wed Dec 20 13:10:55 2017 +0200 validation: queue: test lock-free queue Added simple, single threaded enqueue/dequeue test for lock-free queues. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/queue/queue.c b/test/validation/api/queue/queue.c index f674b081..1ff02917 100644 --- a/test/validation/api/queue/queue.c +++ b/test/validation/api/queue/queue.c @@ -10,9 +10,9 @@ #include <odp_cunit_common.h> #include "queue.h" -#define MAX_BUFFER_QUEUE (8) -#define MSG_POOL_SIZE (4 * 1024 * 1024) -#define CONFIG_MAX_ITERATION (100) +#define BURST_SIZE (8) +#define MAX_NUM_EVENT (1 * 1024) +#define MAX_ITERATION (100) #define MAX_QUEUES (64 * 1024) static int queue_context = 0xff; @@ -33,9 +33,11 @@ int queue_suite_init(void) { odp_pool_param_t params; - params.buf.size = 0; + odp_pool_param_init(&params); + + params.buf.size = 4; params.buf.align = ODP_CACHE_LINE_SIZE; - params.buf.num = 1024 * 10; + params.buf.num = MAX_NUM_EVENT; params.type = ODP_POOL_BUFFER; pool = odp_pool_create("msg_pool", &params); @@ -153,18 +155,105 @@ void queue_test_mode(void) } } +static odp_event_t dequeue_event(odp_queue_t queue) +{ + odp_event_t ev; + int i; + + for (i = 0; i < MAX_ITERATION; i++) { + ev = odp_queue_deq(queue); + if (ev != ODP_EVENT_INVALID) + break; + } + + return ev; +} + +void queue_test_lockfree(void) +{ + odp_queue_param_t param; + odp_queue_t queue; + odp_queue_capability_t capa; + uint32_t max_burst, burst, i, j; + odp_pool_t pool; + odp_buffer_t buf; + odp_event_t ev; + uint32_t *data; + + CU_ASSERT_FATAL(odp_queue_capability(&capa) == 0); + + if (capa.plain.lockfree.max_num == 0) + return; + + max_burst = capa.plain.lockfree.max_size; + + if (max_burst == 0 || max_burst > MAX_NUM_EVENT) + max_burst = MAX_NUM_EVENT; + + pool = odp_pool_lookup("msg_pool"); + CU_ASSERT_FATAL(pool != ODP_POOL_INVALID); + + odp_queue_param_init(&param); + param.type = ODP_QUEUE_TYPE_PLAIN; + param.nonblocking = ODP_NONBLOCKING_LF; + param.size = max_burst; + + queue = odp_queue_create("lockfree_queue", &param); + CU_ASSERT_FATAL(queue != ODP_QUEUE_INVALID); + + CU_ASSERT(odp_queue_deq(queue) == ODP_EVENT_INVALID); + + buf = odp_buffer_alloc(pool); + CU_ASSERT_FATAL(buf != ODP_BUFFER_INVALID); + ev = odp_buffer_to_event(buf); + CU_ASSERT(odp_queue_enq(queue, ev) == 0); + ev = dequeue_event(queue); + CU_ASSERT_FATAL(ev != ODP_EVENT_INVALID); + if (ev != ODP_EVENT_INVALID) + odp_event_free(ev); + + for (j = 0; j < 2; j++) { + if (j == 0) + burst = max_burst / 4; + else + burst = max_burst; + + for (i = 0; i < burst; i++) { + buf = odp_buffer_alloc(pool); + CU_ASSERT_FATAL(buf != ODP_BUFFER_INVALID); + data = odp_buffer_addr(buf); + *data = i; + ev = odp_buffer_to_event(buf); + CU_ASSERT(odp_queue_enq(queue, ev) == 0); + } + + for (i = 0; i < burst; i++) { + ev = dequeue_event(queue); + CU_ASSERT(ev != ODP_EVENT_INVALID); + if (ev != ODP_EVENT_INVALID) { + buf = odp_buffer_from_event(ev); + data = odp_buffer_addr(buf); + CU_ASSERT(*data == i); + odp_event_free(ev); + } + } + } + + CU_ASSERT(odp_queue_destroy(queue) == 0); +} + void queue_test_param(void) { odp_queue_t queue, null_queue; - odp_event_t enev[MAX_BUFFER_QUEUE]; - odp_event_t deev[MAX_BUFFER_QUEUE]; + odp_event_t enev[BURST_SIZE]; + odp_event_t deev[BURST_SIZE]; odp_buffer_t buf; odp_event_t ev; odp_pool_t msg_pool; odp_event_t *pev_tmp; int i, deq_ret, ret; int nr_deq_entries = 0; - int max_iteration = CONFIG_MAX_ITERATION; + int max_iteration = MAX_ITERATION; odp_queue_param_t qparams; odp_buffer_t enbuf; @@ -223,7 +312,7 @@ void queue_test_param(void) odp_buffer_free(buf); } - for (i = 0; i < MAX_BUFFER_QUEUE; i++) { + for (i = 0; i < BURST_SIZE; i++) { buf = odp_buffer_alloc(msg_pool); enev[i] = odp_buffer_to_event(buf); } @@ -233,23 +322,22 @@ void queue_test_param(void) * constraints in the implementation at that given point of time. * But here we assume that we succeed in enqueuing all buffers. */ - ret = odp_queue_enq_multi(queue, enev, MAX_BUFFER_QUEUE); - CU_ASSERT(MAX_BUFFER_QUEUE == ret); + ret = odp_queue_enq_multi(queue, enev, BURST_SIZE); + CU_ASSERT(BURST_SIZE == ret); i = ret < 0 ? 0 : ret; - for ( ; i < MAX_BUFFER_QUEUE; i++) + for ( ; i < BURST_SIZE; i++) odp_event_free(enev[i]); pev_tmp = deev; do { - deq_ret = odp_queue_deq_multi(queue, pev_tmp, - MAX_BUFFER_QUEUE); + deq_ret = odp_queue_deq_multi(queue, pev_tmp, BURST_SIZE); nr_deq_entries += deq_ret; max_iteration--; pev_tmp += deq_ret; CU_ASSERT(max_iteration >= 0); - } while (nr_deq_entries < MAX_BUFFER_QUEUE); + } while (nr_deq_entries < BURST_SIZE); - for (i = 0; i < MAX_BUFFER_QUEUE; i++) { + for (i = 0; i < BURST_SIZE; i++) { enbuf = odp_buffer_from_event(enev[i]); CU_ASSERT(enev[i] == deev[i]); odp_buffer_free(enbuf); @@ -326,6 +414,7 @@ void queue_test_info(void) odp_testinfo_t queue_suite[] = { ODP_TEST_INFO(queue_test_capa), ODP_TEST_INFO(queue_test_mode), + ODP_TEST_INFO(queue_test_lockfree), ODP_TEST_INFO(queue_test_param), ODP_TEST_INFO(queue_test_info), ODP_TEST_INFO_NULL, diff --git a/test/validation/api/queue/queue.h b/test/validation/api/queue/queue.h index 6b787b1d..b8509070 100644 --- a/test/validation/api/queue/queue.h +++ b/test/validation/api/queue/queue.h @@ -12,6 +12,7 @@ /* test functions: */ void queue_test_capa(void); void queue_test_mode(void); +void queue_test_lockfree(void); void queue_test_param(void); void queue_test_info(void); commit e8ec57b012fea43ae501adb66f5c8ee2f03d0a6c Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Tue Dec 12 15:52:38 2017 +0200 api: queue: block-free capabilities Lock-free and wait-free implementations may differ a lot from the default (blocking) implementation. Thus the maximum number of queues and queue sizes may be more limited. Non-blocking enum is not needed anymore as capability, since number of queues may be zero for LF/WF when not implemented. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/include/odp/api/spec/queue.h b/include/odp/api/spec/queue.h index 79a26df3..107ef3f7 100644 --- a/include/odp/api/spec/queue.h +++ b/include/odp/api/spec/queue.h @@ -164,35 +164,81 @@ typedef struct odp_queue_capability_t { /** Plain queue capabilities */ struct { - /** Maximum number of plain queues of the default size. */ + /** Maximum number of plain (ODP_BLOCKING) queues of the + * default size. */ uint32_t max_num; - /** Maximum number of events a plain queue can store - * simultaneously. The value of zero means that plain + /** Maximum number of events a plain (ODP_BLOCKING) queue can + * store simultaneously. The value of zero means that plain * queues do not have a size limit, but a single queue can * store all available events. */ uint32_t max_size; - /** The strongest guarantee of block freedom that is supported - * for plain queues. */ - odp_nonblocking_t nonblocking; + /** Lock-free (ODP_NONBLOCKING_LF) implementation capabilities. + * The specification is the same as for the blocking + * implementation. */ + struct { + /** Maximum number of queues. Lock-free queues are not + * supported when zero. */ + uint32_t max_num; + + /** Maximum queue size */ + uint32_t max_size; + + } lockfree; + + /** Wait-free (ODP_NONBLOCKING_WF) implementation capabilities. + * The specification is the same as for the blocking + * implementation. */ + struct { + /** Maximum number of queues. Wait-free queues are not + * supported when zero. */ + uint32_t max_num; + + /** Maximum queue size */ + uint32_t max_size; + + } waitfree; } plain; /** Scheduled queue capabilities */ struct { - /** Maximum number of scheduled queues of the default size. */ + /** Maximum number of scheduled (ODP_BLOCKING) queues of the + * default size. */ uint32_t max_num; - /** Maximum number of events a scheduled queue can store - * simultaneously. The value of zero means that scheduled - * queues do not have a size limit, but a single queue can - * store all available events. */ + /** Maximum number of events a scheduled (ODP_BLOCKING) queue + * can store simultaneously. The value of zero means that + * scheduled queues do not have a size limit, but a single + * queue can store all available events. */ uint32_t max_size; - /** The strongest guarantee of block freedom that is supported - * for scheduled queues. */ - odp_nonblocking_t nonblocking; + /** Lock-free (ODP_NONBLOCKING_LF) implementation capabilities. + * The specification is the same as for the blocking + * implementation. */ + struct { + /** Maximum number of queues. Lock-free queues are not + * supported when zero. */ + uint32_t max_num; + + /** Maximum queue size */ + uint32_t max_size; + + } lockfree; + + /** Wait-free (ODP_NONBLOCKING_WF) implementation capabilities. + * The specification is the same as for the blocking + * implementation. */ + struct { + /** Maximum number of queues. Wait-free queues are not + * supported when zero. */ + uint32_t max_num; + + /** Maximum queue size */ + uint32_t max_size; + + } waitfree; } sched; diff --git a/platform/linux-generic/odp_queue.c b/platform/linux-generic/odp_queue.c index 58103930..6a69eb84 100644 --- a/platform/linux-generic/odp_queue.c +++ b/platform/linux-generic/odp_queue.c @@ -150,9 +150,7 @@ static int queue_capability(odp_queue_capability_t *capa) capa->max_sched_groups = sched_fn->num_grps(); capa->sched_prios = odp_schedule_num_prio(); capa->plain.max_num = capa->max_queues; - capa->plain.nonblocking = ODP_BLOCKING; capa->sched.max_num = capa->max_queues; - capa->sched.nonblocking = ODP_BLOCKING; return 0; } diff --git a/platform/linux-generic/odp_queue_scalable.c b/platform/linux-generic/odp_queue_scalable.c index 88a5a8c2..72dec15b 100644 --- a/platform/linux-generic/odp_queue_scalable.c +++ b/platform/linux-generic/odp_queue_scalable.c @@ -315,10 +315,8 @@ static int queue_capability(odp_queue_capability_t *capa) capa->sched_prios = odp_schedule_num_prio(); capa->plain.max_num = ODP_CONFIG_QUEUES - NUM_INTERNAL_QUEUES; capa->plain.max_size = 0; - capa->plain.nonblocking = ODP_BLOCKING; capa->sched.max_num = ODP_CONFIG_QUEUES - NUM_INTERNAL_QUEUES; capa->sched.max_size = 0; - capa->sched.nonblocking = ODP_BLOCKING; return 0; } diff --git a/test/validation/api/queue/queue.c b/test/validation/api/queue/queue.c index 3c6db33a..f674b081 100644 --- a/test/validation/api/queue/queue.c +++ b/test/validation/api/queue/queue.c @@ -69,8 +69,6 @@ void queue_test_capa(void) CU_ASSERT(capa.sched_prios != 0); CU_ASSERT(capa.plain.max_num != 0); CU_ASSERT(capa.sched.max_num != 0); - CU_ASSERT(capa.plain.nonblocking >= ODP_BLOCKING); - CU_ASSERT(capa.sched.nonblocking >= ODP_BLOCKING); min = capa.plain.max_num; if (min > capa.sched.max_num) ----------------------------------------------------------------------- Summary of changes: include/odp/api/spec/queue.h | 74 +++- platform/linux-generic/Makefile.am | 2 + .../linux-generic/include/odp_queue_internal.h | 1 + platform/linux-generic/include/odp_queue_lf.h | 36 ++ platform/linux-generic/odp_queue.c | 73 +++- platform/linux-generic/odp_queue_lf.c | 346 +++++++++++++++++++ platform/linux-generic/odp_queue_scalable.c | 2 - test/validation/api/queue/queue.c | 381 ++++++++++++++++++++- test/validation/api/queue/queue.h | 1 + 9 files changed, 865 insertions(+), 51 deletions(-) create mode 100644 platform/linux-generic/include/odp_queue_lf.h create mode 100644 platform/linux-generic/odp_queue_lf.c hooks/post-receive --

7 years, 5 months

[COMMIT] branch master updated. v1.17.0.0_tigermoth_rc1-28-g520c170d

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 520c170d758f2d37554631bf1467ec50e027cd3e (commit) via f73cd6de167b16bae0256fee65c77d11ee18699e (commit) via 1e2435a49ca5380143546f33aebc32e0b935bc54 (commit) via 2237981c5e20dd4efb2e181ad59785e6f9f099bb (commit) from 6c0942658b564835e200def502c053f63d55c400 (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 520c170d758f2d37554631bf1467ec50e027cd3e Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Mon Dec 25 19:43:04 2017 +0300 validation: crypto: don't output untested cipher for NULL cipher AES-GMAC adds synthetic NULL cipher capability with IV length = 12. Skip CIPHER_ALG_NULL entries when printing untested messages (as untested entry does not really mean a thing for NULL cipher algo). 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 8d1489ae..ad9784a6 100644 --- a/test/validation/api/crypto/odp_crypto_test_inp.c +++ b/test/validation/api/crypto/odp_crypto_test_inp.c @@ -559,12 +559,16 @@ static void check_alg(odp_crypto_op_t op, for (i = 0; i < cipher_num; i++) { cipher_ok |= cipher_tested[i]; - if (!cipher_tested[i]) + if (!cipher_tested[i]) { + /* GMAC-related hacks */ + if (cipher_alg == ODP_CIPHER_ALG_NULL) + continue; printf("\n Untested: alg=%s, key_len=%" PRIu32 ", " "iv_len=%" PRIu32 "\n", cipher_alg_name(cipher_alg), cipher_capa[i].key_len, cipher_capa[i].iv_len); + } } for (i = 0; i < auth_num; i++) { commit f73cd6de167b16bae0256fee65c77d11ee18699e Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Mon Dec 25 19:31:05 2017 +0300 validation: crypto: fail if no tests were executed Fail the test if we were not able to match any test vectors to capabilities. 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 ddbad309..8d1489ae 100644 --- a/test/validation/api/crypto/odp_crypto_test_inp.c +++ b/test/validation/api/crypto/odp_crypto_test_inp.c @@ -437,6 +437,8 @@ static void check_alg(odp_crypto_op_t op, int rc, cipher_num, auth_num, i; odp_bool_t cipher_tested[MAX_ALG_CAPA]; odp_bool_t auth_tested[MAX_ALG_CAPA]; + odp_bool_t cipher_ok = false; + odp_bool_t auth_ok = false; size_t idx; rc = odp_crypto_capability(&capa); @@ -555,21 +557,29 @@ static void check_alg(odp_crypto_op_t op, auth_tested[auth_idx] = true; } - for (i = 0; i < cipher_num; i++) + for (i = 0; i < cipher_num; i++) { + cipher_ok |= cipher_tested[i]; if (!cipher_tested[i]) printf("\n Untested: alg=%s, key_len=%" PRIu32 ", " "iv_len=%" PRIu32 "\n", cipher_alg_name(cipher_alg), cipher_capa[i].key_len, cipher_capa[i].iv_len); + } - for (i = 0; i < auth_num; i++) + for (i = 0; i < auth_num; i++) { + auth_ok |= auth_tested[i]; if (!auth_tested[i]) printf("\n Untested: alg=%s, key_len=%" PRIu32 ", " "digest_len=%" PRIu32 "\n", auth_alg_name(auth_alg), auth_capa[i].key_len, auth_capa[i].digest_len); + } + + /* Verify that we were able to run at least several tests */ + CU_ASSERT(cipher_ok); + CU_ASSERT(auth_ok); } /** commit 1e2435a49ca5380143546f33aebc32e0b935bc54 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Mon Dec 25 19:27:00 2017 +0300 validation: crypto: add test vectors for full HMAC length for HMAC tests add test vectors covering full HMAC length in addition to truncated tests. 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/test_vectors.h b/test/validation/api/crypto/test_vectors.h index f2ce9eb2..6592a335 100644 --- a/test/validation/api/crypto/test_vectors.h +++ b/test/validation/api/crypto/test_vectors.h @@ -486,7 +486,7 @@ static crypto_test_reference_t hmac_md5_reference[] = { .ciphertext = { 0x48, 0x69, 0x20, 0x54, 0x68, 0x65, 0x72, 0x65}, .digest_length = HMAC_MD5_96_CHECK_LEN, .digest = { 0x92, 0x94, 0x72, 0x7a, 0x36, 0x38, 0xbb, 0x1c, - 0x13, 0xf4, 0x8e, 0xf8, 0x15, 0x8b, 0xfc, 0x9d }, + 0x13, 0xf4, 0x8e, 0xf8 }, }, { @@ -505,7 +505,7 @@ static crypto_test_reference_t hmac_md5_reference[] = { 0x69, 0x6e, 0x67, 0x3f }, .digest_length = HMAC_MD5_96_CHECK_LEN, .digest = { 0x75, 0x0c, 0x78, 0x3e, 0x6a, 0xb0, 0xb5, 0x03, - 0xea, 0xa8, 0x6e, 0x31, 0x0a, 0x5d, 0xb7, 0x38 }, + 0xea, 0xa8, 0x6e, 0x31 }, }, { @@ -528,6 +528,61 @@ static crypto_test_reference_t hmac_md5_reference[] = { 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd }, .digest_length = HMAC_MD5_96_CHECK_LEN, + .digest = { 0x56, 0xbe, 0x34, 0x52, 0x1d, 0x14, 0x4c, 0x88, + 0xdb, 0xb8, 0xc7, 0x33 } + }, + { + .auth_key_length = HMAC_MD5_KEY_LEN, + .auth_key = { 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, + 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b }, + .length = 8, + /* "Hi There" */ + .plaintext = { 0x48, 0x69, 0x20, 0x54, 0x68, 0x65, 0x72, 0x65}, + .ciphertext = { 0x48, 0x69, 0x20, 0x54, 0x68, 0x65, 0x72, 0x65}, + .digest_length = HMAC_MD5_CHECK_LEN, + .digest = { 0x92, 0x94, 0x72, 0x7a, 0x36, 0x38, 0xbb, 0x1c, + 0x13, 0xf4, 0x8e, 0xf8, 0x15, 0x8b, 0xfc, 0x9d }, + + }, + { + .auth_key_length = HMAC_MD5_KEY_LEN, + /* "Jefe" */ + .auth_key = { 0x4a, 0x65, 0x66, 0x65 }, + .length = 28, + /* what do ya want for nothing?*/ + .plaintext = { 0x77, 0x68, 0x61, 0x74, 0x20, 0x64, 0x6f, 0x20, + 0x79, 0x61, 0x20, 0x77, 0x61, 0x6e, 0x74, 0x20, + 0x66, 0x6f, 0x72, 0x20, 0x6e, 0x6f, 0x74, 0x68, + 0x69, 0x6e, 0x67, 0x3f }, + .ciphertext = { 0x77, 0x68, 0x61, 0x74, 0x20, 0x64, 0x6f, 0x20, + 0x79, 0x61, 0x20, 0x77, 0x61, 0x6e, 0x74, 0x20, + 0x66, 0x6f, 0x72, 0x20, 0x6e, 0x6f, 0x74, 0x68, + 0x69, 0x6e, 0x67, 0x3f }, + .digest_length = HMAC_MD5_CHECK_LEN, + .digest = { 0x75, 0x0c, 0x78, 0x3e, 0x6a, 0xb0, 0xb5, 0x03, + 0xea, 0xa8, 0x6e, 0x31, 0x0a, 0x5d, 0xb7, 0x38 }, + + }, + { + .auth_key_length = HMAC_MD5_KEY_LEN, + .auth_key = { 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, + 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa }, + .length = 50, + .plaintext = { 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, + 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, + 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, + 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, + 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, + 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, + 0xdd, 0xdd }, + .ciphertext = { 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, + 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, + 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, + 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, + 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, + 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, + 0xdd, 0xdd }, + .digest_length = HMAC_MD5_CHECK_LEN, .digest = { 0x56, 0xbe, 0x34, 0x52, 0x1d, 0x14, 0x4c, 0x88, 0xdb, 0xb8, 0xc7, 0x33, 0xf0, 0xe8, 0xb3, 0xf6 } } @@ -588,6 +643,64 @@ static crypto_test_reference_t hmac_sha1_reference[] = { .digest_length = HMAC_SHA1_96_CHECK_LEN, .digest = { 0x12, 0x5d, 0x73, 0x42, 0xb9, 0xac, 0x11, 0xcd, 0x91, 0xa3, 0x9a, 0xf4 } + }, + { + .auth_key_length = HMAC_SHA1_KEY_LEN, + .auth_key = { 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, + 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, + 0x0b, 0x0b, 0x0b, 0x0b }, + .length = 8, + /* "Hi There" */ + .plaintext = { 0x48, 0x69, 0x20, 0x54, 0x68, 0x65, 0x72, 0x65}, + .ciphertext = { 0x48, 0x69, 0x20, 0x54, 0x68, 0x65, 0x72, 0x65}, + .digest_length = HMAC_SHA1_CHECK_LEN, + .digest = { 0xb6, 0x17, 0x31, 0x86, 0x55, 0x05, 0x72, 0x64, + 0xe2, 0x8b, 0xc0, 0xb6, 0xfb, 0x37, 0x8c, 0x8e, + 0xf1, 0x46, 0xbe, 0x00 } + }, + { + .auth_key_length = HMAC_SHA1_KEY_LEN, + /* "Jefe" */ + .auth_key = { 0x4a, 0x65, 0x66, 0x65 }, + .length = 28, + /* what do ya want for nothing?*/ + .plaintext = { 0x77, 0x68, 0x61, 0x74, 0x20, 0x64, 0x6f, 0x20, + 0x79, 0x61, 0x20, 0x77, 0x61, 0x6e, 0x74, 0x20, + 0x66, 0x6f, 0x72, 0x20, 0x6e, 0x6f, 0x74, 0x68, + 0x69, 0x6e, 0x67, 0x3f }, + .ciphertext = { 0x77, 0x68, 0x61, 0x74, 0x20, 0x64, 0x6f, 0x20, + 0x79, 0x61, 0x20, 0x77, 0x61, 0x6e, 0x74, 0x20, + 0x66, 0x6f, 0x72, 0x20, 0x6e, 0x6f, 0x74, 0x68, + 0x69, 0x6e, 0x67, 0x3f }, + .digest_length = HMAC_SHA1_CHECK_LEN, + .digest = { 0xef, 0xfc, 0xdf, 0x6a, 0xe5, 0xeb, 0x2f, 0xa2, + 0xd2, 0x74, 0x16, 0xd5, 0xf1, 0x84, 0xdf, 0x9c, + 0x25, 0x9a, 0x7c, 0x79 } + }, + { + .auth_key_length = HMAC_SHA1_KEY_LEN, + .auth_key = { 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, + 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, + 0xaa, 0xaa, 0xaa, 0xaa }, + .length = 50, + .plaintext = { 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, + 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, + 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, + 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, + 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, + 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, + 0xdd, 0xdd }, + .ciphertext = { 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, + 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, + 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, + 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, + 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, + 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, + 0xdd, 0xdd }, + .digest_length = HMAC_SHA1_CHECK_LEN, + .digest = { 0x12, 0x5d, 0x73, 0x42, 0xb9, 0xac, 0x11, 0xcd, + 0x91, 0xa3, 0x9a, 0xf4, 0x8a, 0xa1, 0x7b, 0x4f, + 0x63, 0xf1, 0x75, 0xd3 } } }; @@ -646,6 +759,67 @@ static crypto_test_reference_t hmac_sha256_reference[] = { .digest_length = HMAC_SHA256_128_CHECK_LEN, .digest = { 0x77, 0x3e, 0xa9, 0x1e, 0x36, 0x80, 0x0e, 0x46, 0x85, 0x4d, 0xb8, 0xeb, 0xd0, 0x91, 0x81, 0xa7 } + }, + { + .auth_key_length = HMAC_SHA256_KEY_LEN, + .auth_key = { 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, + 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, + 0x0b, 0x0b, 0x0b, 0x0b }, + .length = 8, + /* "Hi There" */ + .plaintext = { 0x48, 0x69, 0x20, 0x54, 0x68, 0x65, 0x72, 0x65}, + .ciphertext = { 0x48, 0x69, 0x20, 0x54, 0x68, 0x65, 0x72, 0x65}, + .digest_length = HMAC_SHA256_CHECK_LEN, + .digest = { 0xb0, 0x34, 0x4c, 0x61, 0xd8, 0xdb, 0x38, 0x53, + 0x5c, 0xa8, 0xaf, 0xce, 0xaf, 0x0b, 0xf1, 0x2b, + 0x88, 0x1d, 0xc2, 0x00, 0xc9, 0x83, 0x3d, 0xa7, + 0x26, 0xe9, 0x37, 0x6c, 0x2e, 0x32, 0xcf, 0xf7 } + }, + { + .auth_key_length = HMAC_SHA256_KEY_LEN, + /* "Jefe" */ + .auth_key = { 0x4a, 0x65, 0x66, 0x65 }, + .length = 28, + /* what do ya want for nothing?*/ + .plaintext = { 0x77, 0x68, 0x61, 0x74, 0x20, 0x64, 0x6f, 0x20, + 0x79, 0x61, 0x20, 0x77, 0x61, 0x6e, 0x74, 0x20, + 0x66, 0x6f, 0x72, 0x20, 0x6e, 0x6f, 0x74, 0x68, + 0x69, 0x6e, 0x67, 0x3f }, + .ciphertext = { 0x77, 0x68, 0x61, 0x74, 0x20, 0x64, 0x6f, 0x20, + 0x79, 0x61, 0x20, 0x77, 0x61, 0x6e, 0x74, 0x20, + 0x66, 0x6f, 0x72, 0x20, 0x6e, 0x6f, 0x74, 0x68, + 0x69, 0x6e, 0x67, 0x3f }, + .digest_length = HMAC_SHA256_CHECK_LEN, + .digest = { 0x5b, 0xdc, 0xc1, 0x46, 0xbf, 0x60, 0x75, 0x4e, + 0x6a, 0x04, 0x24, 0x26, 0x08, 0x95, 0x75, 0xc7, + 0x5a, 0x00, 0x3f, 0x08, 0x9d, 0x27, 0x39, 0x83, + 0x9d, 0xec, 0x58, 0xb9, 0x64, 0xec, 0x38, 0x43 } + }, + { + .auth_key_length = HMAC_SHA256_KEY_LEN, + .auth_key = { 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, + 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, + 0xaa, 0xaa, 0xaa, 0xaa }, + .length = 50, + .plaintext = { 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, + 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, + 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, + 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, + 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, + 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, + 0xdd, 0xdd }, + .ciphertext = { 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, + 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, + 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, + 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, + 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, + 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, + 0xdd, 0xdd }, + .digest_length = HMAC_SHA256_CHECK_LEN, + .digest = { 0x77, 0x3e, 0xa9, 0x1e, 0x36, 0x80, 0x0e, 0x46, + 0x85, 0x4d, 0xb8, 0xeb, 0xd0, 0x91, 0x81, 0xa7, + 0x29, 0x59, 0x09, 0x8b, 0x3e, 0xf8, 0xc1, 0x22, + 0xd9, 0x63, 0x55, 0x14, 0xce, 0xd5, 0x65, 0xfe } } }; @@ -710,6 +884,79 @@ static crypto_test_reference_t hmac_sha512_reference[] = { 0xef, 0xb0, 0xf0, 0x75, 0x6c, 0x89, 0x0b, 0xe9, 0xb1, 0xb5, 0xdb, 0xdd, 0x8e, 0xe8, 0x1a, 0x36, 0x55, 0xf8, 0x3e, 0x33, 0xb2, 0x27, 0x9d, 0x39 } + }, + { + .auth_key_length = HMAC_SHA512_KEY_LEN, + .auth_key = { 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, + 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, + 0x0b, 0x0b, 0x0b, 0x0b }, + .length = 8, + /* "Hi There" */ + .plaintext = { 0x48, 0x69, 0x20, 0x54, 0x68, 0x65, 0x72, 0x65}, + .ciphertext = { 0x48, 0x69, 0x20, 0x54, 0x68, 0x65, 0x72, 0x65}, + .digest_length = HMAC_SHA512_CHECK_LEN, + .digest = { 0x87, 0xaa, 0x7c, 0xde, 0xa5, 0xef, 0x61, 0x9d, + 0x4f, 0xf0, 0xb4, 0x24, 0x1a, 0x1d, 0x6c, 0xb0, + 0x23, 0x79, 0xf4, 0xe2, 0xce, 0x4e, 0xc2, 0x78, + 0x7a, 0xd0, 0xb3, 0x05, 0x45, 0xe1, 0x7c, 0xde, + 0xda, 0xa8, 0x33, 0xb7, 0xd6, 0xb8, 0xa7, 0x02, + 0x03, 0x8b, 0x27, 0x4e, 0xae, 0xa3, 0xf4, 0xe4, + 0xbe, 0x9d, 0x91, 0x4e, 0xeb, 0x61, 0xf1, 0x70, + 0x2e, 0x69, 0x6c, 0x20, 0x3a, 0x12, 0x68, 0x54 } + }, + { + .auth_key_length = HMAC_SHA512_KEY_LEN, + /* "Jefe" */ + .auth_key = { 0x4a, 0x65, 0x66, 0x65 }, + .length = 28, + /* what do ya want for nothing?*/ + .plaintext = { 0x77, 0x68, 0x61, 0x74, 0x20, 0x64, 0x6f, 0x20, + 0x79, 0x61, 0x20, 0x77, 0x61, 0x6e, 0x74, 0x20, + 0x66, 0x6f, 0x72, 0x20, 0x6e, 0x6f, 0x74, 0x68, + 0x69, 0x6e, 0x67, 0x3f }, + .ciphertext = { 0x77, 0x68, 0x61, 0x74, 0x20, 0x64, 0x6f, 0x20, + 0x79, 0x61, 0x20, 0x77, 0x61, 0x6e, 0x74, 0x20, + 0x66, 0x6f, 0x72, 0x20, 0x6e, 0x6f, 0x74, 0x68, + 0x69, 0x6e, 0x67, 0x3f }, + .digest_length = HMAC_SHA512_CHECK_LEN, + .digest = { 0x16, 0x4b, 0x7a, 0x7b, 0xfc, 0xf8, 0x19, 0xe2, + 0xe3, 0x95, 0xfb, 0xe7, 0x3b, 0x56, 0xe0, 0xa3, + 0x87, 0xbd, 0x64, 0x22, 0x2e, 0x83, 0x1f, 0xd6, + 0x10, 0x27, 0x0c, 0xd7, 0xea, 0x25, 0x05, 0x54, + 0x97, 0x58, 0xbf, 0x75, 0xc0, 0x5a, 0x99, 0x4a, + 0x6d, 0x03, 0x4f, 0x65, 0xf8, 0xf0, 0xe6, 0xfd, + 0xca, 0xea, 0xb1, 0xa3, 0x4d, 0x4a, 0x6b, 0x4b, + 0x63, 0x6e, 0x07, 0x0a, 0x38, 0xbc, 0xe7, 0x37 } + }, + { + .auth_key_length = HMAC_SHA512_KEY_LEN, + .auth_key = { 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, + 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, + 0xaa, 0xaa, 0xaa, 0xaa }, + .length = 50, + .plaintext = { 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, + 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, + 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, + 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, + 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, + 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, + 0xdd, 0xdd }, + .ciphertext = { 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, + 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, + 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, + 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, + 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, + 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, + 0xdd, 0xdd }, + .digest_length = HMAC_SHA512_CHECK_LEN, + .digest = { 0xfa, 0x73, 0xb0, 0x08, 0x9d, 0x56, 0xa2, 0x84, + 0xef, 0xb0, 0xf0, 0x75, 0x6c, 0x89, 0x0b, 0xe9, + 0xb1, 0xb5, 0xdb, 0xdd, 0x8e, 0xe8, 0x1a, 0x36, + 0x55, 0xf8, 0x3e, 0x33, 0xb2, 0x27, 0x9d, 0x39, + 0xbf, 0x3e, 0x84, 0x82, 0x79, 0xa7, 0x22, 0xc8, + 0x06, 0xb4, 0x85, 0xa4, 0x7e, 0x67, 0xc8, 0x07, + 0xb9, 0x46, 0xa3, 0x37, 0xbe, 0xe8, 0x94, 0x26, + 0x74, 0x27, 0x88, 0x59, 0xe1, 0x32, 0x92, 0xfb } } }; diff --git a/test/validation/api/crypto/test_vectors_len.h b/test/validation/api/crypto/test_vectors_len.h index 0062299e..140bef2a 100644 --- a/test/validation/api/crypto/test_vectors_len.h +++ b/test/validation/api/crypto/test_vectors_len.h @@ -57,17 +57,21 @@ /* HMAC-MD5 */ #define HMAC_MD5_KEY_LEN 16 #define HMAC_MD5_96_CHECK_LEN 12 +#define HMAC_MD5_CHECK_LEN 16 /* HMAC-SHA256 */ #define HMAC_SHA256_KEY_LEN 32 -#define HMAC_SHA256_128_CHECK_LEN 16 +#define HMAC_SHA256_128_CHECK_LEN 16 +#define HMAC_SHA256_CHECK_LEN 32 /* HMAC-SHA1 */ #define HMAC_SHA1_KEY_LEN 20 #define HMAC_SHA1_96_CHECK_LEN 12 +#define HMAC_SHA1_CHECK_LEN 20 /* HMAC-SHA512 */ #define HMAC_SHA512_KEY_LEN 64 #define HMAC_SHA512_256_CHECK_LEN 32 +#define HMAC_SHA512_CHECK_LEN 64 #endif commit 2237981c5e20dd4efb2e181ad59785e6f9f099bb Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Mon Dec 25 19:25:40 2017 +0300 validation: crypto: print untested capabilities Print all capability variants that were not covered by reference tests. 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 821bdc7e..ddbad309 100644 --- a/test/validation/api/crypto/odp_crypto_test_inp.c +++ b/test/validation/api/crypto/odp_crypto_test_inp.c @@ -299,14 +299,11 @@ static void alg_test(odp_crypto_op_t op, odp_bool_t ovr_iv) { odp_crypto_session_t session; - odp_crypto_capability_t capa; int rc; odp_crypto_ses_create_err_t status; odp_bool_t ok = 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]; odp_packet_data_range_t cipher_range; odp_packet_data_range_t auth_range; odp_crypto_key_t cipher_key = { @@ -321,111 +318,6 @@ static void alg_test(odp_crypto_op_t op, .data = ovr_iv ? NULL : ref->iv, .length = ref->iv_length }; - int num, i; - int found; - - rc = odp_crypto_capability(&capa); - CU_ASSERT(!rc); - - if (cipher_alg == ODP_CIPHER_ALG_3DES_CBC && - !(capa.ciphers.bit.trides_cbc)) - rc = -1; - if (cipher_alg == ODP_CIPHER_ALG_AES_CBC && - !(capa.ciphers.bit.aes_cbc)) - rc = -1; - if (cipher_alg == ODP_CIPHER_ALG_AES_CTR && - !(capa.ciphers.bit.aes_ctr)) - rc = -1; - if (cipher_alg == ODP_CIPHER_ALG_AES_GCM && - !(capa.ciphers.bit.aes_gcm)) - rc = -1; - if (cipher_alg == ODP_CIPHER_ALG_DES && - !(capa.ciphers.bit.des)) - rc = -1; - if (cipher_alg == ODP_CIPHER_ALG_NULL && - !(capa.ciphers.bit.null)) - rc = -1; - - CU_ASSERT(!rc); - CU_ASSERT((~capa.ciphers.all_bits & capa.hw_ciphers.all_bits) == 0); - - if (auth_alg == ODP_AUTH_ALG_AES_GCM && - !(capa.auths.bit.aes_gcm)) - rc = -1; - if (auth_alg == ODP_AUTH_ALG_AES_GMAC && - !(capa.auths.bit.aes_gmac)) - rc = -1; - if (auth_alg == ODP_AUTH_ALG_MD5_HMAC && - !(capa.auths.bit.md5_hmac)) - rc = -1; - if (auth_alg == ODP_AUTH_ALG_NULL && - !(capa.auths.bit.null)) - rc = -1; - if (auth_alg == ODP_AUTH_ALG_SHA1_HMAC && - !(capa.auths.bit.sha1_hmac)) - rc = -1; - if (auth_alg == ODP_AUTH_ALG_SHA256_HMAC && - !(capa.auths.bit.sha256_hmac)) - rc = -1; - if (auth_alg == ODP_AUTH_ALG_SHA512_HMAC && - !(capa.auths.bit.sha512_hmac)) - rc = -1; - - CU_ASSERT(!rc); - CU_ASSERT((~capa.auths.all_bits & capa.hw_auths.all_bits) == 0); - - num = odp_crypto_cipher_capability(cipher_alg, cipher_capa, - MAX_ALG_CAPA); - - CU_ASSERT(num > 0); - found = 0; - - CU_ASSERT(num <= MAX_ALG_CAPA); - - if (num > MAX_ALG_CAPA) - num = MAX_ALG_CAPA; - - /* Search for the test case */ - for (i = 0; i < num; i++) { - if (cipher_capa[i].key_len == cipher_key.length && - cipher_capa[i].iv_len == iv.length) { - found = 1; - break; - } - } - - if (!found) { - printf("\n Unsupported: alg=%s, key_len=%" PRIu32 ", " - "iv_len=%" PRIu32 "\n", cipher_alg_name(cipher_alg), - cipher_key.length, iv.length); - return; - } - - num = odp_crypto_auth_capability(auth_alg, auth_capa, MAX_ALG_CAPA); - - CU_ASSERT(num > 0); - found = 0; - - CU_ASSERT(num <= MAX_ALG_CAPA); - - if (num > MAX_ALG_CAPA) - num = MAX_ALG_CAPA; - - /* Search for the test case */ - for (i = 0; i < num; i++) { - if (auth_capa[i].digest_len == ref->digest_length && - auth_capa[i].key_len == auth_key.length) { - found = 1; - break; - } - } - - if (!found) { - printf("\n Unsupported: alg=%s, key_len=%" PRIu32 ", " - "digest_len=%" PRIu32 "\n", auth_alg_name(auth_alg), - auth_key.length, ref->digest_length); - return; - } /* Create a crypto session */ odp_crypto_session_param_init(&ses_params); @@ -532,6 +424,154 @@ cleanup: CU_ASSERT(!rc); } +static void check_alg(odp_crypto_op_t op, + odp_cipher_alg_t cipher_alg, + odp_auth_alg_t auth_alg, + crypto_test_reference_t *ref, + size_t count, + odp_bool_t ovr_iv) +{ + odp_crypto_capability_t capa; + odp_crypto_cipher_capability_t cipher_capa[MAX_ALG_CAPA]; + odp_crypto_auth_capability_t auth_capa[MAX_ALG_CAPA]; + int rc, cipher_num, auth_num, i; + odp_bool_t cipher_tested[MAX_ALG_CAPA]; + odp_bool_t auth_tested[MAX_ALG_CAPA]; + size_t idx; + + rc = odp_crypto_capability(&capa); + CU_ASSERT(!rc); + + if (cipher_alg == ODP_CIPHER_ALG_3DES_CBC && + !(capa.ciphers.bit.trides_cbc)) + rc = -1; + if (cipher_alg == ODP_CIPHER_ALG_AES_CBC && + !(capa.ciphers.bit.aes_cbc)) + rc = -1; + if (cipher_alg == ODP_CIPHER_ALG_AES_CTR && + !(capa.ciphers.bit.aes_ctr)) + rc = -1; + if (cipher_alg == ODP_CIPHER_ALG_AES_GCM && + !(capa.ciphers.bit.aes_gcm)) + rc = -1; + if (cipher_alg == ODP_CIPHER_ALG_DES && + !(capa.ciphers.bit.des)) + rc = -1; + if (cipher_alg == ODP_CIPHER_ALG_NULL && + !(capa.ciphers.bit.null)) + rc = -1; + + CU_ASSERT(!rc); + CU_ASSERT((~capa.ciphers.all_bits & capa.hw_ciphers.all_bits) == 0); + + if (auth_alg == ODP_AUTH_ALG_AES_GCM && + !(capa.auths.bit.aes_gcm)) + rc = -1; + if (auth_alg == ODP_AUTH_ALG_AES_GMAC && + !(capa.auths.bit.aes_gmac)) + rc = -1; + if (auth_alg == ODP_AUTH_ALG_MD5_HMAC && + !(capa.auths.bit.md5_hmac)) + rc = -1; + if (auth_alg == ODP_AUTH_ALG_NULL && + !(capa.auths.bit.null)) + rc = -1; + if (auth_alg == ODP_AUTH_ALG_SHA1_HMAC && + !(capa.auths.bit.sha1_hmac)) + rc = -1; + if (auth_alg == ODP_AUTH_ALG_SHA256_HMAC && + !(capa.auths.bit.sha256_hmac)) + rc = -1; + if (auth_alg == ODP_AUTH_ALG_SHA512_HMAC && + !(capa.auths.bit.sha512_hmac)) + rc = -1; + + CU_ASSERT(!rc); + CU_ASSERT((~capa.auths.all_bits & capa.hw_auths.all_bits) == 0); + + cipher_num = odp_crypto_cipher_capability(cipher_alg, cipher_capa, + MAX_ALG_CAPA); + + CU_ASSERT(cipher_num > 0); + CU_ASSERT(cipher_num <= MAX_ALG_CAPA); + if (cipher_num > MAX_ALG_CAPA) + cipher_num = MAX_ALG_CAPA; + + auth_num = odp_crypto_auth_capability(auth_alg, auth_capa, + MAX_ALG_CAPA); + + CU_ASSERT(auth_num > 0); + CU_ASSERT(auth_num <= MAX_ALG_CAPA); + if (auth_num > MAX_ALG_CAPA) + auth_num = MAX_ALG_CAPA; + + memset(cipher_tested, 0, sizeof(cipher_tested)); + memset(auth_tested, 0, sizeof(auth_tested)); + + for (idx = 0; idx < count; idx++) { + int cipher_idx = -1, auth_idx = -1; + + for (i = 0; i < cipher_num; i++) { + if (cipher_capa[i].key_len == + ref[idx].cipher_key_length && + cipher_capa[i].iv_len == + ref[idx].iv_length) { + cipher_idx = i; + break; + } + } + + if (cipher_idx < 0) { + printf("\n Unsupported: alg=%s, key_len=%" PRIu32 + ", iv_len=%" PRIu32 "\n", + cipher_alg_name(cipher_alg), + ref[idx].cipher_key_length, + ref[idx].iv_length); + continue; + } + + for (i = 0; i < auth_num; i++) { + if (auth_capa[i].digest_len == + ref[idx].digest_length && + auth_capa[i].key_len == + ref[idx].auth_key_length) { + auth_idx = i; + break; + } + } + + if (auth_idx < 0) { + printf("\n Unsupported: alg=%s, key_len=%" PRIu32 + ", digest_len=%" PRIu32 "\n", + auth_alg_name(auth_alg), + ref[idx].auth_key_length, + ref[idx].digest_length); + continue; + } + + alg_test(op, cipher_alg, auth_alg, &ref[idx], ovr_iv); + + cipher_tested[cipher_idx] = true; + auth_tested[auth_idx] = true; + } + + for (i = 0; i < cipher_num; i++) + if (!cipher_tested[i]) + printf("\n Untested: alg=%s, key_len=%" PRIu32 ", " + "iv_len=%" PRIu32 "\n", + cipher_alg_name(cipher_alg), + cipher_capa[i].key_len, + cipher_capa[i].iv_len); + + for (i = 0; i < auth_num; i++) + if (!auth_tested[i]) + printf("\n Untested: alg=%s, key_len=%" PRIu32 ", " + "digest_len=%" PRIu32 "\n", + auth_alg_name(auth_alg), + auth_capa[i].key_len, + auth_capa[i].digest_len); +} + /** * Check if given cipher and authentication algorithms are supported * @@ -631,32 +671,25 @@ static int check_alg_null(void) return check_alg_support(ODP_CIPHER_ALG_NULL, ODP_AUTH_ALG_NULL); } +#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0])) void crypto_test_enc_alg_null(void) { - unsigned int test_vec_num = (sizeof(null_reference) / - sizeof(null_reference[0])); - unsigned int i; - - for (i = 0; i < test_vec_num; i++) - alg_test(ODP_CRYPTO_OP_ENCODE, - ODP_CIPHER_ALG_NULL, - ODP_AUTH_ALG_NULL, - &null_reference[i], - false); + check_alg(ODP_CRYPTO_OP_ENCODE, + ODP_CIPHER_ALG_NULL, + ODP_AUTH_ALG_NULL, + null_reference, + ARRAY_SIZE(null_reference), + false); } void crypto_test_dec_alg_null(void) { - unsigned int test_vec_num = (sizeof(null_reference) / - sizeof(null_reference[0])); - unsigned int i; - - for (i = 0; i < test_vec_num; i++) - alg_test(ODP_CRYPTO_OP_DECODE, - ODP_CIPHER_ALG_NULL, - ODP_AUTH_ALG_NULL, - &null_reference[i], - false); + check_alg(ODP_CRYPTO_OP_DECODE, + ODP_CIPHER_ALG_NULL, + ODP_AUTH_ALG_NULL, + null_reference, + ARRAY_SIZE(null_reference), + false); } static int check_alg_3des_cbc(void) @@ -670,16 +703,12 @@ static int check_alg_3des_cbc(void) * packet buffer as completion event buffer.*/ void crypto_test_enc_alg_3des_cbc(void) { - unsigned int test_vec_num = (sizeof(tdes_cbc_reference) / - sizeof(tdes_cbc_reference[0])); - unsigned int i; - - for (i = 0; i < test_vec_num; i++) - alg_test(ODP_CRYPTO_OP_ENCODE, - ODP_CIPHER_ALG_3DES_CBC, - ODP_AUTH_ALG_NULL, - &tdes_cbc_reference[i], - false); + check_alg(ODP_CRYPTO_OP_ENCODE, + ODP_CIPHER_ALG_3DES_CBC, + ODP_AUTH_ALG_NULL, + tdes_cbc_reference, + ARRAY_SIZE(tdes_cbc_reference), + false); } /* This test verifies the correctness of encode (plaintext -> ciphertext) @@ -687,16 +716,12 @@ void crypto_test_enc_alg_3des_cbc(void) * */ void crypto_test_enc_alg_3des_cbc_ovr_iv(void) { - unsigned int test_vec_num = (sizeof(tdes_cbc_reference) / - sizeof(tdes_cbc_reference[0])); - unsigned int i; - - for (i = 0; i < test_vec_num; i++) - alg_test(ODP_CRYPTO_OP_ENCODE, - ODP_CIPHER_ALG_3DES_CBC, - ODP_AUTH_ALG_NULL, - &tdes_cbc_reference[i], - true); + check_alg(ODP_CRYPTO_OP_ENCODE, + ODP_CIPHER_ALG_3DES_CBC, + ODP_AUTH_ALG_NULL, + tdes_cbc_reference, + ARRAY_SIZE(tdes_cbc_reference), + true); } /* This test verifies the correctness of decode (ciphertext -> plaintext) @@ -706,16 +731,12 @@ void crypto_test_enc_alg_3des_cbc_ovr_iv(void) * */ void crypto_test_dec_alg_3des_cbc(void) { - unsigned int test_vec_num = (sizeof(tdes_cbc_reference) / - sizeof(tdes_cbc_reference[0])); - unsigned int i; - - for (i = 0; i < test_vec_num; i++) - alg_test(ODP_CRYPTO_OP_DECODE, - ODP_CIPHER_ALG_3DES_CBC, - ODP_AUTH_ALG_NULL, - &tdes_cbc_reference[i], - false); + check_alg(ODP_CRYPTO_OP_DECODE, + ODP_CIPHER_ALG_3DES_CBC, + ODP_AUTH_ALG_NULL, + tdes_cbc_reference, + ARRAY_SIZE(tdes_cbc_reference), + false); } /* This test verifies the correctness of decode (ciphertext -> plaintext) @@ -725,16 +746,12 @@ void crypto_test_dec_alg_3des_cbc(void) * */ void crypto_test_dec_alg_3des_cbc_ovr_iv(void) { - unsigned int test_vec_num = (sizeof(tdes_cbc_reference) / - sizeof(tdes_cbc_reference[0])); - unsigned int i; - - for (i = 0; i < test_vec_num; i++) - alg_test(ODP_CRYPTO_OP_DECODE, - ODP_CIPHER_ALG_3DES_CBC, - ODP_AUTH_ALG_NULL, - &tdes_cbc_reference[i], - true); + check_alg(ODP_CRYPTO_OP_DECODE, + ODP_CIPHER_ALG_3DES_CBC, + ODP_AUTH_ALG_NULL, + tdes_cbc_reference, + ARRAY_SIZE(tdes_cbc_reference), + true); } static int check_alg_aes_gcm(void) @@ -748,17 +765,12 @@ static int check_alg_aes_gcm(void) * packet buffer as completion event buffer.*/ void crypto_test_enc_alg_aes_gcm(void) { - unsigned int test_vec_num = (sizeof(aes_gcm_reference) / - sizeof(aes_gcm_reference[0])); - unsigned int i; - - for (i = 0; i < test_vec_num; i++) { - alg_test(ODP_CRYPTO_OP_ENCODE, - ODP_CIPHER_ALG_AES_GCM, - ODP_AUTH_ALG_AES_GCM, - &aes_gcm_reference[i], - false); - } + check_alg(ODP_CRYPTO_OP_ENCODE, + ODP_CIPHER_ALG_AES_GCM, + ODP_AUTH_ALG_AES_GCM, + aes_gcm_reference, + ARRAY_SIZE(aes_gcm_reference), + false); } /* This test verifies the correctness of encode (plaintext -> ciphertext) @@ -767,17 +779,12 @@ void crypto_test_enc_alg_aes_gcm(void) * packet buffer as completion event buffer.*/ void crypto_test_enc_alg_aes_gcm_ovr_iv(void) { - unsigned int test_vec_num = (sizeof(aes_gcm_reference) / - sizeof(aes_gcm_reference[0])); - unsigned int i; - - for (i = 0; i < test_vec_num; i++) { - alg_test(ODP_CRYPTO_OP_ENCODE, - ODP_CIPHER_ALG_AES_GCM, - ODP_AUTH_ALG_AES_GCM, - &aes_gcm_reference[i], - true); - } + check_alg(ODP_CRYPTO_OP_ENCODE, + ODP_CIPHER_ALG_AES_GCM, + ODP_AUTH_ALG_AES_GCM, + aes_gcm_reference, + ARRAY_SIZE(aes_gcm_reference), + true); } /* This test verifies the correctness of decode (ciphertext -> plaintext) @@ -787,17 +794,12 @@ void crypto_test_enc_alg_aes_gcm_ovr_iv(void) * */ void crypto_test_dec_alg_aes_gcm(void) { - unsigned int test_vec_num = (sizeof(aes_gcm_reference) / - sizeof(aes_gcm_reference[0])); - unsigned int i; - - for (i = 0; i < test_vec_num; i++) { - alg_test(ODP_CRYPTO_OP_DECODE, - ODP_CIPHER_ALG_AES_GCM, - ODP_AUTH_ALG_AES_GCM, - &aes_gcm_reference[i], - false); - } + check_alg(ODP_CRYPTO_OP_DECODE, + ODP_CIPHER_ALG_AES_GCM, + ODP_AUTH_ALG_AES_GCM, + aes_gcm_reference, + ARRAY_SIZE(aes_gcm_reference), + false); } /* This test verifies the correctness of decode (ciphertext -> plaintext) @@ -807,17 +809,12 @@ void crypto_test_dec_alg_aes_gcm(void) * */ void crypto_test_dec_alg_aes_gcm_ovr_iv(void) { - unsigned int test_vec_num = (sizeof(aes_gcm_reference) / - sizeof(aes_gcm_reference[0])); - unsigned int i; - - for (i = 0; i < test_vec_num; i++) { - alg_test(ODP_CRYPTO_OP_DECODE, - ODP_CIPHER_ALG_AES_GCM, - ODP_AUTH_ALG_AES_GCM, - &aes_gcm_reference[i], - true); - } + check_alg(ODP_CRYPTO_OP_DECODE, + ODP_CIPHER_ALG_AES_GCM, + ODP_AUTH_ALG_AES_GCM, + aes_gcm_reference, + ARRAY_SIZE(aes_gcm_reference), + true); } static int check_alg_aes_cbc(void) @@ -831,17 +828,12 @@ static int check_alg_aes_cbc(void) * packet buffer as completion event buffer.*/ void crypto_test_enc_alg_aes_cbc(void) { - unsigned int test_vec_num = (sizeof(aes_cbc_reference) / - sizeof(aes_cbc_reference[0])); - unsigned int i; - - for (i = 0; i < test_vec_num; i++) { - alg_test(ODP_CRYPTO_OP_ENCODE, - ODP_CIPHER_ALG_AES_CBC, - ODP_AUTH_ALG_NULL, - &aes_cbc_reference[i], - false); - } + check_alg(ODP_CRYPTO_OP_ENCODE, + ODP_CIPHER_ALG_AES_CBC, + ODP_AUTH_ALG_NULL, + aes_cbc_reference, + ARRAY_SIZE(aes_cbc_reference), + false); } /* This test verifies the correctness of encode (plaintext -> ciphertext) @@ -849,17 +841,12 @@ void crypto_test_enc_alg_aes_cbc(void) * */ void crypto_test_enc_alg_aes_cbc_ovr_iv(void) { - unsigned int test_vec_num = (sizeof(aes_cbc_reference) / - sizeof(aes_cbc_reference[0])); - unsigned int i; - - for (i = 0; i < test_vec_num; i++) { - alg_test(ODP_CRYPTO_OP_ENCODE, - ODP_CIPHER_ALG_AES_CBC, - ODP_AUTH_ALG_NULL, - &aes_cbc_reference[i], - true); - } + check_alg(ODP_CRYPTO_OP_ENCODE, + ODP_CIPHER_ALG_AES_CBC, + ODP_AUTH_ALG_NULL, + aes_cbc_reference, + ARRAY_SIZE(aes_cbc_reference), + true); } /* This test verifies the correctness of decode (ciphertext -> plaintext) @@ -869,17 +856,12 @@ void crypto_test_enc_alg_aes_cbc_ovr_iv(void) * */ void crypto_test_dec_alg_aes_cbc(void) { - unsigned int test_vec_num = (sizeof(aes_cbc_reference) / - sizeof(aes_cbc_reference[0])); - unsigned int i; - - for (i = 0; i < test_vec_num; i++) { - alg_test(ODP_CRYPTO_OP_DECODE, - ODP_CIPHER_ALG_AES_CBC, - ODP_AUTH_ALG_NULL, - &aes_cbc_reference[i], - false); - } + check_alg(ODP_CRYPTO_OP_DECODE, + ODP_CIPHER_ALG_AES_CBC, + ODP_AUTH_ALG_NULL, + aes_cbc_reference, + ARRAY_SIZE(aes_cbc_reference), + false); } /* This test verifies the correctness of decode (ciphertext -> plaintext) @@ -889,17 +871,12 @@ void crypto_test_dec_alg_aes_cbc(void) * */ void crypto_test_dec_alg_aes_cbc_ovr_iv(void) { - unsigned int test_vec_num = (sizeof(aes_cbc_reference) / - sizeof(aes_cbc_reference[0])); - unsigned int i; - - for (i = 0; i < test_vec_num; i++) { - alg_test(ODP_CRYPTO_OP_DECODE, - ODP_CIPHER_ALG_AES_CBC, - ODP_AUTH_ALG_NULL, - &aes_cbc_reference[i], - true); - } + check_alg(ODP_CRYPTO_OP_DECODE, + ODP_CIPHER_ALG_AES_CBC, + ODP_AUTH_ALG_NULL, + aes_cbc_reference, + ARRAY_SIZE(aes_cbc_reference), + true); } static int check_alg_aes_ctr(void) @@ -913,17 +890,12 @@ static int check_alg_aes_ctr(void) * packet buffer as completion event buffer.*/ void crypto_test_enc_alg_aes_ctr(void) { - unsigned int test_vec_num = (sizeof(aes_ctr_reference) / - sizeof(aes_ctr_reference[0])); - unsigned int i; - - for (i = 0; i < test_vec_num; i++) { - alg_test(ODP_CRYPTO_OP_ENCODE, - ODP_CIPHER_ALG_AES_CTR, - ODP_AUTH_ALG_NULL, - &aes_ctr_reference[i], - false); - } + check_alg(ODP_CRYPTO_OP_ENCODE, + ODP_CIPHER_ALG_AES_CTR, + ODP_AUTH_ALG_NULL, + aes_ctr_reference, + ARRAY_SIZE(aes_ctr_reference), + false); } /* This test verifies the correctness of encode (plaintext -> ciphertext) @@ -931,17 +903,12 @@ void crypto_test_enc_alg_aes_ctr(void) * */ void crypto_test_enc_alg_aes_ctr_ovr_iv(void) { - unsigned int test_vec_num = (sizeof(aes_ctr_reference) / - sizeof(aes_ctr_reference[0])); - unsigned int i; - - for (i = 0; i < test_vec_num; i++) { - alg_test(ODP_CRYPTO_OP_ENCODE, - ODP_CIPHER_ALG_AES_CTR, - ODP_AUTH_ALG_NULL, - &aes_ctr_reference[i], - true); - } + check_alg(ODP_CRYPTO_OP_ENCODE, + ODP_CIPHER_ALG_AES_CTR, + ODP_AUTH_ALG_NULL, + aes_ctr_reference, + ARRAY_SIZE(aes_ctr_reference), + true); } /* This test verifies the correctness of decode (ciphertext -> plaintext) @@ -951,17 +918,12 @@ void crypto_test_enc_alg_aes_ctr_ovr_iv(void) * */ void crypto_test_dec_alg_aes_ctr(void) { - unsigned int test_vec_num = (sizeof(aes_ctr_reference) / - sizeof(aes_ctr_reference[0])); - unsigned int i; - - for (i = 0; i < test_vec_num; i++) { - alg_test(ODP_CRYPTO_OP_DECODE, - ODP_CIPHER_ALG_AES_CTR, - ODP_AUTH_ALG_NULL, - &aes_ctr_reference[i], - false); - } + check_alg(ODP_CRYPTO_OP_DECODE, + ODP_CIPHER_ALG_AES_CTR, + ODP_AUTH_ALG_NULL, + aes_ctr_reference, + ARRAY_SIZE(aes_ctr_reference), + false); } /* This test verifies the correctness of decode (ciphertext -> plaintext) @@ -971,17 +933,12 @@ void crypto_test_dec_alg_aes_ctr(void) * */ void crypto_test_dec_alg_aes_ctr_ovr_iv(void) { - unsigned int test_vec_num = (sizeof(aes_ctr_reference) / - sizeof(aes_ctr_reference[0])); - unsigned int i; - - for (i = 0; i < test_vec_num; i++) { - alg_test(ODP_CRYPTO_OP_DECODE, - ODP_CIPHER_ALG_AES_CTR, - ODP_AUTH_ALG_NULL, - &aes_ctr_reference[i], - true); - } + check_alg(ODP_CRYPTO_OP_DECODE, + ODP_CIPHER_ALG_AES_CTR, + ODP_AUTH_ALG_NULL, + aes_ctr_reference, + ARRAY_SIZE(aes_ctr_reference), + true); } static int check_alg_hmac_md5(void) @@ -998,30 +955,22 @@ static int check_alg_hmac_md5(void) * */ void crypto_test_gen_alg_hmac_md5(void) { - unsigned int test_vec_num = (sizeof(hmac_md5_reference) / - sizeof(hmac_md5_reference[0])); - unsigned int i; - - for (i = 0; i < test_vec_num; i++) - alg_test(ODP_CRYPTO_OP_ENCODE, - ODP_CIPHER_ALG_NULL, - ODP_AUTH_ALG_MD5_HMAC, - &hmac_md5_reference[i], - false); + check_alg(ODP_CRYPTO_OP_ENCODE, + ODP_CIPHER_ALG_NULL, + ODP_AUTH_ALG_MD5_HMAC, + hmac_md5_reference, + ARRAY_SIZE(hmac_md5_reference), + false); } void crypto_test_check_alg_hmac_md5(void) { - unsigned int test_vec_num = (sizeof(hmac_md5_reference) / - sizeof(hmac_md5_reference[0])); - unsigned int i; - - for (i = 0; i < test_vec_num; i++) - alg_test(ODP_CRYPTO_OP_DECODE, - ODP_CIPHER_ALG_NULL, - ODP_AUTH_ALG_MD5_HMAC, - &hmac_md5_reference[i], - false); + check_alg(ODP_CRYPTO_OP_DECODE, + ODP_CIPHER_ALG_NULL, + ODP_AUTH_ALG_MD5_HMAC, + hmac_md5_reference, + ARRAY_SIZE(hmac_md5_reference), + false); } static int check_alg_hmac_sha1(void) @@ -1038,30 +987,22 @@ static int check_alg_hmac_sha1(void) * */ void crypto_test_gen_alg_hmac_sha1(void) { - unsigned int test_vec_num = (sizeof(hmac_sha1_reference) / - sizeof(hmac_sha1_reference[0])); - unsigned int i; - - for (i = 0; i < test_vec_num; i++) - alg_test(ODP_CRYPTO_OP_ENCODE, - ODP_CIPHER_ALG_NULL, - ODP_AUTH_ALG_SHA1_HMAC, - &hmac_sha1_reference[i], - false); + check_alg(ODP_CRYPTO_OP_ENCODE, + ODP_CIPHER_ALG_NULL, + ODP_AUTH_ALG_SHA1_HMAC, + hmac_sha1_reference, + ARRAY_SIZE(hmac_sha1_reference), + false); } void crypto_test_check_alg_hmac_sha1(void) { - unsigned int test_vec_num = (sizeof(hmac_sha1_reference) / - sizeof(hmac_sha1_reference[0])); - unsigned int i; - - for (i = 0; i < test_vec_num; i++) - alg_test(ODP_CRYPTO_OP_DECODE, - ODP_CIPHER_ALG_NULL, - ODP_AUTH_ALG_SHA1_HMAC, - &hmac_sha1_reference[i], - false); + check_alg(ODP_CRYPTO_OP_DECODE, + ODP_CIPHER_ALG_NULL, + ODP_AUTH_ALG_SHA1_HMAC, + hmac_sha1_reference, + ARRAY_SIZE(hmac_sha1_reference), + false); } static int check_alg_hmac_sha256(void) @@ -1078,30 +1019,22 @@ static int check_alg_hmac_sha256(void) * */ void crypto_test_gen_alg_hmac_sha256(void) { - unsigned int test_vec_num = (sizeof(hmac_sha256_reference) / - sizeof(hmac_sha256_reference[0])); - unsigned int i; - - for (i = 0; i < test_vec_num; i++) - alg_test(ODP_CRYPTO_OP_ENCODE, - ODP_CIPHER_ALG_NULL, - ODP_AUTH_ALG_SHA256_HMAC, - &hmac_sha256_reference[i], - false); + check_alg(ODP_CRYPTO_OP_ENCODE, + ODP_CIPHER_ALG_NULL, + ODP_AUTH_ALG_SHA256_HMAC, + hmac_sha256_reference, + ARRAY_SIZE(hmac_sha256_reference), + false); } void crypto_test_check_alg_hmac_sha256(void) { - unsigned int test_vec_num = (sizeof(hmac_sha256_reference) / - sizeof(hmac_sha256_reference[0])); - unsigned int i; - - for (i = 0; i < test_vec_num; i++) - alg_test(ODP_CRYPTO_OP_DECODE, - ODP_CIPHER_ALG_NULL, - ODP_AUTH_ALG_SHA256_HMAC, - &hmac_sha256_reference[i], - false); + check_alg(ODP_CRYPTO_OP_DECODE, + ODP_CIPHER_ALG_NULL, + ODP_AUTH_ALG_SHA256_HMAC, + hmac_sha256_reference, + ARRAY_SIZE(hmac_sha256_reference), + false); } static int check_alg_hmac_sha512(void) @@ -1118,30 +1051,22 @@ static int check_alg_hmac_sha512(void) * */ void crypto_test_gen_alg_hmac_sha512(void) { - unsigned int test_vec_num = (sizeof(hmac_sha512_reference) / - sizeof(hmac_sha512_reference[0])); - unsigned int i; - - for (i = 0; i < test_vec_num; i++) - alg_test(ODP_CRYPTO_OP_ENCODE, - ODP_CIPHER_ALG_NULL, - ODP_AUTH_ALG_SHA512_HMAC, - &hmac_sha512_reference[i], - false); + check_alg(ODP_CRYPTO_OP_ENCODE, + ODP_CIPHER_ALG_NULL, + ODP_AUTH_ALG_SHA512_HMAC, + hmac_sha512_reference, + ARRAY_SIZE(hmac_sha512_reference), + false); } void crypto_test_check_alg_hmac_sha512(void) { - unsigned int test_vec_num = (sizeof(hmac_sha512_reference) / - sizeof(hmac_sha512_reference[0])); - unsigned int i; - - for (i = 0; i < test_vec_num; i++) - alg_test(ODP_CRYPTO_OP_DECODE, - ODP_CIPHER_ALG_NULL, - ODP_AUTH_ALG_SHA512_HMAC, - &hmac_sha512_reference[i], - false); + check_alg(ODP_CRYPTO_OP_DECODE, + ODP_CIPHER_ALG_NULL, + ODP_AUTH_ALG_SHA512_HMAC, + hmac_sha512_reference, + ARRAY_SIZE(hmac_sha512_reference), + false); } static int check_alg_aes_gmac(void) @@ -1156,25 +1081,22 @@ void crypto_test_gen_alg_aes_gmac(void) unsigned int i; for (i = 0; i < test_vec_num; i++) - alg_test(ODP_CRYPTO_OP_ENCODE, - ODP_CIPHER_ALG_NULL, - ODP_AUTH_ALG_AES_GMAC, - &aes_gmac_reference[i], - false); + check_alg(ODP_CRYPTO_OP_ENCODE, + ODP_CIPHER_ALG_NULL, + ODP_AUTH_ALG_AES_GMAC, + aes_gmac_reference, + ARRAY_SIZE(aes_gmac_reference), + false); } void crypto_test_check_alg_aes_gmac(void) { - unsigned int test_vec_num = (sizeof(aes_gmac_reference) / - sizeof(aes_gmac_reference[0])); - unsigned int i; - - for (i = 0; i < test_vec_num; i++) - alg_test(ODP_CRYPTO_OP_DECODE, - ODP_CIPHER_ALG_NULL, - ODP_AUTH_ALG_AES_GMAC, - &aes_gmac_reference[i], - false); + check_alg(ODP_CRYPTO_OP_DECODE, + ODP_CIPHER_ALG_NULL, + ODP_AUTH_ALG_AES_GMAC, + aes_gmac_reference, + ARRAY_SIZE(aes_gmac_reference), + false); } int crypto_suite_sync_init(void) ----------------------------------------------------------------------- Summary of changes: test/validation/api/crypto/odp_crypto_test_inp.c | 726 +++++++++++------------ test/validation/api/crypto/test_vectors.h | 251 +++++++- test/validation/api/crypto/test_vectors_len.h | 6 +- 3 files changed, 585 insertions(+), 398 deletions(-) hooks/post-receive --

7 years, 5 months

[COMMIT] branch devel/native-drivers updated. v1.15.0.0-974-gd99b3beb

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, devel/native-drivers has been updated via d99b3beb5ba18f061b4baa2debd46d674e542403 (commit) from 217b610fa1c7c14e0e8f4a33a94dba6f50c79328 (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 d99b3beb5ba18f061b4baa2debd46d674e542403 Author: Josep Puigdemont <josep.puigdemont(a)linaro.org> Date: Tue Jan 2 15:47:50 2018 +0100 physmem: change API, alloc now does a mapping too We add the _reserve() function to the API to do what was previously achieved with _alloc(), which is to reserve a set of huge pages that are physically contiguous. We changed _alloc() so it now calls _reserve() and _map() and it returns a block that is already mapped in the process' virtual address space. Signed-off-by: Josep Puigdemont <josep.puigdemont(a)linaro.org> Reviewed-by: Yi He <yi.he(a)linaro.org> diff --git a/platform/linux-generic/pktio/physmem/physmem.c b/platform/linux-generic/pktio/physmem/physmem.c index 297ff2fa..a01b54fe 100644 --- a/platform/linux-generic/pktio/physmem/physmem.c +++ b/platform/linux-generic/pktio/physmem/physmem.c @@ -251,7 +251,7 @@ static struct physmem_block *block_get(void) return block; } -struct physmem_block *physmem_block_alloc(uint64_t size) +struct physmem_block *physmem_block_reserve(uint64_t size) { struct physmem_block *block; struct physmem_block *ret = NULL; @@ -331,6 +331,22 @@ struct physmem_block *physmem_block_alloc(uint64_t size) return ret; } +struct physmem_block *physmem_block_alloc(uint64_t size) +{ + struct physmem_block *block; + + block = physmem_block_reserve(size); + if (block == NULL) + return NULL; + + if (physmem_block_map(block, NULL)) { + physmem_block_free(block); + return NULL; + } + + return block; +} + void physmem_block_free(struct physmem_block *block) { if (block == NULL) @@ -547,7 +563,6 @@ exit_failure: block->va_reserved = NULL; block->va_reserved_size = 0; - while (mapped_cnt--) { hp = &pages[block->first + mapped_cnt]; munmap(hp->va, hp->size); diff --git a/platform/linux-generic/pktio/physmem/physmem.h b/platform/linux-generic/pktio/physmem/physmem.h index 77dcb389..ea3e6567 100644 --- a/platform/linux-generic/pktio/physmem/physmem.h +++ b/platform/linux-generic/pktio/physmem/physmem.h @@ -37,6 +37,7 @@ struct physmem_block { int physmem_block_init_global(void); int physmem_block_term_global(void); +struct physmem_block *physmem_block_reserve(uint64_t size); struct physmem_block *physmem_block_alloc(uint64_t size); void physmem_block_free(struct physmem_block *block); int physmem_block_map(struct physmem_block *block, void *addr); ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/pktio/physmem/physmem.c | 19 +++++++++++++++++-- platform/linux-generic/pktio/physmem/physmem.h | 1 + 2 files changed, 18 insertions(+), 2 deletions(-) hooks/post-receive --

7 years, 5 months

[COMMIT] branch master updated. v1.17.0.0_tigermoth_rc1-24-g6c094265

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 6c0942658b564835e200def502c053f63d55c400 (commit) via 4b06ab1aadb653958dd49b62899929e2720b5c9f (commit) via ea2c187b7ba3ca3b9e21624b139c871c2bd8f11c (commit) via fdcaa6d73a4c577ea92d69d95d851c1b2de86c61 (commit) via fac80a8a4b26b863a85266cd62fb07a5e2cd84e4 (commit) via 13171a0c3f83e905a99250fdfca925231dcaa7e2 (commit) via 4b5776e8e8bbec6340392af74b7ee7a18c191b52 (commit) via 76b9155ed01abcd3287b659d35b9217f77b81cc2 (commit) via d59a6b8a1b049ab3e978accbd420eb25993a5997 (commit) via 8609d2eba06d8e964daff5cb8ecb81bb802ea585 (commit) via cd793bfd9667e25db7cb1dbd9c276374e0ee879b (commit) via 09188114d855456920113c8d6889c5c1e2451d75 (commit) via 8296d0e9a91e2a435ec780052e22095563dfbf12 (commit) via d831814b8d0a1d7817f014aae91031dafd1ceeb6 (commit) via ee5d0385064f4bacb511cfd497abcd014930ffaa (commit) via 5d44e562a5c0c1252dbfd11b49c87084767da2e2 (commit) from 634b380b63de53c65b92c214d91aaf03785d69db (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 6c0942658b564835e200def502c053f63d55c400 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue Jan 2 21:19:28 2018 +0300 shippable: process test results in post_ci stage Processing tests in ci stage ends up with empty test results in case of failure (as ci stage will abort after failure). Process them in post_ci stage to actually capture failed test results. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/.shippable.yml b/.shippable.yml index 6e5c66fc..9bc2cb6f 100644 --- a/.shippable.yml +++ b/.shippable.yml @@ -39,6 +39,8 @@ build: - ./configure --disable-test-perf - make - sudo env ODP_SHM_DIR=/dev/shm/odp ODP_TEST_OUT_XML=yes make check + + post_ci: - wget https://raw.githubusercontent.com/shawnliang/cunit-to-junit/master/cunit-to… - | for FILE in `find ./test ./platform/ -name "*.xml"`; do commit 4b06ab1aadb653958dd49b62899929e2720b5c9f Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Sun Dec 31 04:13:06 2017 +0300 linux-gen: dpdk: simplify linking with shared libdpdk There is no need to pass PMDs when linking with shared DPDK library. Just pass -ldpdk which will pick up all PMDS dynamically. When linking with static DPKD library it is required to pass additional libraries after whole PMD string to fix linking when Libtool will reorder flags. So provide just two variables DPDK_LIBS and DPDK_LIBS_LT. Former should be passed directly to gcc, while later should be passed to libtool. 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.inc b/example/Makefile.inc index 1609066e..fa122433 100644 --- a/example/Makefile.inc +++ b/example/Makefile.inc @@ -1,7 +1,7 @@ TESTS_ENVIRONMENT = EXEEXT=${EXEEXT} LIB = $(top_builddir)/lib -LDADD = $(LIB)/libodp-linux.la $(LIB)/libodphelper.la $(DPDK_PMDS) +LDADD = $(LIB)/libodp-linux.la $(LIB)/libodphelper.la $(DPDK_LIBS_LT) AM_CFLAGS = \ -I$(srcdir) \ -I$(top_srcdir)/example \ diff --git a/m4/odp_dpdk.m4 b/m4/odp_dpdk.m4 index 05e60cc0..1887b043 100644 --- a/m4/odp_dpdk.m4 +++ b/m4/odp_dpdk.m4 @@ -1,22 +1,38 @@ # ODP_DPDK_PMDS(DPDK_DRIVER_PATH) # ------------------------------- -# Build a list of DPDK PMD drivers in DPDK_PMDS variable +# Build a list of DPDK PMD drivers in DPDK_PMDS variable. +# Updated DPDK_LIBS to include dependencies. AC_DEFUN([ODP_DPDK_PMDS], [dnl -AS_VAR_SET([DPDK_PMDS], [-Wl,--whole-archive,]) +AS_VAR_SET([DPDK_PMDS], ["-Wl,--whole-archive,"]) for filename in "$1"/librte_pmd_*.a; do cur_driver=`basename "$filename" .a | sed -e 's/^lib//'` -# rte_pmd_nfp has external dependencies which break linking -if test "$cur_driver" = "rte_pmd_nfp"; then - echo "skip linking rte_pmd_nfp" -else - AS_VAR_APPEND([DPDK_PMDS], [-l$cur_driver,]) -fi +AS_VAR_APPEND([DPDK_PMDS], [-l$cur_driver,]) +AS_CASE([$cur_driver], + [rte_pmd_nfp], [AS_VAR_APPEND([DPDK_LIBS], [" -lm"])], + [rte_pmd_pcap], [AS_VAR_APPEND([DPDK_LIBS], [" -lpcap"])], + [rte_pmd_openssl], [AS_VAR_APPEND([DPDK_LIBS], [" -lcrypto"])]) done AS_VAR_APPEND([DPDK_PMDS], [--no-whole-archive]) -AC_SUBST([DPDK_PMDS]) ]) -# _ODP_DPDK_CHECK_LIB(LDFLAGS, [LIBS], [EXTRA_LIBS]) +# _ODP_DPDK_SET_LIBS +# -------------------- +# Set DPDK_LIBS/DPDK_LIBS_LT depending on DPDK setup +AC_DEFUN([_ODP_DPDK_SET_LIBS], [dnl +AS_IF([test "x$DPDK_SHARED" = "xyes"], [dnl + DPDK_LIBS_LT="" + DPDK_LIBS="$DPDK_LDFLAGS $DPDK_RPATH $DPDK_LIBS" +], [dnl + ODP_DPDK_PMDS([$DPDK_PMD_PATH]) + DPDK_LIBS_LT="`echo $DPDK_LIBS | sed -e 's/^/-Wc,/' -e 's/ /,/g'`" + DPDK_LIBS_LT="$DPDK_LDFLAGS $DPDK_PMDS $DPDK_LIBS_LT $DPDK_LIBS" + DPDK_LIBS="$DPDK_LDFLAGS $DPDK_PMDS $DPDK_LIBS" +]) +AC_SUBST([DPDK_LIBS]) +AC_SUBST([DPDK_LIBS_LT]) +]) + +# _ODP_DPDK_CHECK_LIB(LDFLAGS, [LIBS]) # ---------------------------------- # Check if one can use -ldpdk with provided set of libs AC_DEFUN([_ODP_DPDK_CHECK_LIB], [dnl @@ -31,7 +47,7 @@ LIBS="$LIBS -ldpdk $2" AC_MSG_CHECKING([for rte_eal_init in -ldpdk $2]) AC_LINK_IFELSE([AC_LANG_CALL([], [rte_eal_init])], [AC_MSG_RESULT([yes]) - DPDK_LIBS="$1 -ldpdk $3 $2"], + DPDK_LIBS="-ldpdk $2"], [AC_MSG_RESULT([no])]) ########################################################################## @@ -41,10 +57,10 @@ LDFLAGS=$OLD_LDFLAGS LIBS=$OLD_LIBS ]) -# ODP_DPDK_CHECK(CPPFLAGS, LDFLAGS, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND) -# ----------------------------------------------------------------------- +# _ODP_DPDK_CHECK(CPPFLAGS, LDFLAGS, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND) +# ------------------------------------------------------------------------ # Check for DPDK availability -AC_DEFUN([ODP_DPDK_CHECK], [dnl +AC_DEFUN([_ODP_DPDK_CHECK], [dnl ########################################################################## # Save and set temporary compilation flags ########################################################################## @@ -59,13 +75,14 @@ AC_CHECK_HEADERS([rte_config.h], [], DPDK_LIBS="" _ODP_DPDK_CHECK_LIB([$2]) AS_IF([test "x$DPDK_LIBS" = "x"], - [_ODP_DPDK_CHECK_LIB([$2], [-ldl -lpthread], [-lm])]) + [_ODP_DPDK_CHECK_LIB([$2], [-ldl -lpthread])]) AS_IF([test "x$DPDK_LIBS" = "x"], - [_ODP_DPDK_CHECK_LIB([$2], [-ldl -lpthread -lnuma], [-lm])]) + [_ODP_DPDK_CHECK_LIB([$2], [-ldl -lpthread -lnuma])]) AS_IF([test "x$DPDK_LIBS" = "x"], [dpdk_check_ok=no]) AS_IF([test "x$dpdk_check_ok" != "xno"], - [AC_SUBST([DPDK_LIBS]) + [_ODP_DPDK_SET_LIBS + AC_SUBST([DPDK_CPPFLAGS]) m4_default([$3], [:])], [m4_default([$4], [:])]) @@ -74,3 +91,35 @@ AS_IF([test "x$dpdk_check_ok" != "xno"], ########################################################################## CPPFLAGS=$OLD_CPPFLAGS ]) + +# ODP_DPDK(DPDK_PATH, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# ----------------------------------------------------------------------- +# Check for DPDK availability +AC_DEFUN([ODP_DPDK], [dnl +AS_IF([test "x$1" = "xsystem"], [dnl + DPDK_CPPFLAGS="-isystem/usr/include/dpdk" + DPDK_LDFLAGS="" + DPDK_RPATH="" + DPDK_LIB_PATH="`$CC --print-file-name=libdpdk.so`" + if test "x$DPDK_LIB_PATH" = "x" ; then + DPDK_LIB_PATH="`$CC --print-file-name=libdpdk.a`" + else + DPDK_SHARED=yes + fi + AS_IF([test "x$DPDK_LIB_PATH" = "x"], + [AC_MSG_FAILURE([Could not locate system DPDK library directory])]) + DPDK_PMD_PATH=`AS_DIRNAME(["$DPDK_PMD_PATH"])` +], [dnl + DPDK_CPPFLAGS="-isystem $1/include" + DPDK_LIB_PATH="$1/lib" + DPDK_LDFLAGS="-L$DPDK_LIB_PATH" + DPDK_PMD_PATH="$DPDK_LIB_PATH" + if test -r "$DPDK_LIB_PATH"/libdpdk.so ; then + DPDK_RPATH="-R$DPDK_LIB_PATH" + DPDK_SHARED=yes + else + DPDK_RPATH= + fi +]) +_ODP_DPDK_CHECK([$DPDK_CPPFLAGS], [$DPDK_LDFLAGS], [$2], [$3]) +]) diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 415e7b8b..b7a8ff25 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -305,7 +305,7 @@ endif __LIB__libodp_linux_la_LIBADD = $(ATOMIC_LIBS) __LIB__libodp_linux_la_LIBADD += $(OPENSSL_LIBS) -__LIB__libodp_linux_la_LIBADD += $(DPDK_LIBS) $(DPDK_PMDS) +__LIB__libodp_linux_la_LIBADD += $(DPDK_LIBS_LT) __LIB__libodp_linux_la_LIBADD += $(PTHREAD_LIBS) __LIB__libodp_linux_la_LIBADD += $(TIMER_LIBS) diff --git a/platform/linux-generic/libodp-linux.pc.in b/platform/linux-generic/libodp-linux.pc.in index 962a4f78..5125f83a 100644 --- a/platform/linux-generic/libodp-linux.pc.in +++ b/platform/linux-generic/libodp-linux.pc.in @@ -7,5 +7,5 @@ Name: libodp-linux Description: The ODP packet processing engine Version: @PKGCONFIG_VERSION@ Libs: -L${libdir} -lodp-linux -Libs.private: @OPENSSL_STATIC_LIBS@ @DPDK_PMDS@ @DPDK_LIBS@ @PCAP_LIBS@ @PTHREAD_LIBS@ @TIMER_LIBS@ -lpthread @ATOMIC_LIBS@ +Libs.private: @OPENSSL_STATIC_LIBS@ @DPDK_LIBS@ @PCAP_LIBS@ @PTHREAD_LIBS@ @TIMER_LIBS@ -lpthread @ATOMIC_LIBS@ Cflags: -I${includedir} diff --git a/platform/linux-generic/m4/odp_dpdk.m4 b/platform/linux-generic/m4/odp_dpdk.m4 index 471bbcd5..b2193a16 100644 --- a/platform/linux-generic/m4/odp_dpdk.m4 +++ b/platform/linux-generic/m4/odp_dpdk.m4 @@ -13,17 +13,6 @@ AC_ARG_WITH([dpdk-path], [DPDK_PATH="$withval" pktio_dpdk_support=yes],[]) -AS_IF([test "x$DPDK_PATH" = "xsystem"], - [DPDK_CPPFLAGS="-isystem/usr/include/dpdk" - DPDK_LDFLAGS="" - DPDK_PMD_PATH="`$CC --print-file-name=librte_pmd_null.a`" - DPDK_PMD_PATH="`dirname "$DPDK_PMD_PATH"`" - AS_IF([test "x$DPDK_PMD_PATH" = "x"], - [AC_MSG_FAILURE([Could not locate system DPDK PMD directory])])], - [DPDK_CPPFLAGS="-isystem $DPDK_PATH/include" - DPDK_LDFLAGS="-L$DPDK_PATH/lib" - DPDK_PMD_PATH="$DPDK_PATH/lib"]) - ########################################################################## # Enable zero-copy DPDK pktio ########################################################################## @@ -42,22 +31,13 @@ AC_ARG_ENABLE([dpdk-zero-copy], ########################################################################## if test x$pktio_dpdk_support = xyes then - ODP_DPDK_CHECK([$DPDK_CPPFLAGS], [$DPDK_LDFLAGS], [], - [AC_MSG_FAILURE([can't find DPDK])]) - - ODP_DPDK_PMDS([$DPDK_PMD_PATH]) + ODP_DPDK([$DPDK_PATH], [], + [AC_MSG_FAILURE([can't find DPDK])]) AC_DEFINE([ODP_PKTIO_DPDK], [1], [Define to 1 to enable DPDK packet I/O support]) AC_DEFINE_UNQUOTED([ODP_DPDK_ZERO_COPY], [$zero_copy], [Define to 1 to enable DPDK zero copy support]) - - if test -r "$DPDK_PMD_PATH/librte_pmd_pcap.a" && - ! test -r "$DPDK_PMD_PATH/librte_pmd_pcap.so" ; then - DPDK_LIBS="$DPDK_LIBS -lpcap" - fi - AC_SUBST([DPDK_CPPFLAGS]) - AC_SUBST([DPDK_LIBS]) else pktio_dpdk_support=no fi diff --git a/test/Makefile.inc b/test/Makefile.inc index 192dab22..b0a8749d 100644 --- a/test/Makefile.inc +++ b/test/Makefile.inc @@ -11,7 +11,7 @@ LIBTHRMASK_COMMON = $(COMMON_DIR)/libthrmask_common.la #in the following line, the libs using the symbols should come before #the libs containing them! The includer is given a chance to add things #before libodp by setting PRELDADD before the inclusion. -LDADD = $(PRELDADD) $(LIBODP) $(DPDK_PMDS) +LDADD = $(PRELDADD) $(LIBODP) $(DPDK_LIBS_LT) PRELDADD = INCFLAGS = \ commit ea2c187b7ba3ca3b9e21624b139c871c2bd8f11c Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue Jan 2 21:02:55 2018 +0300 example: ipsec_api: remove file conflict with ipsec example ipsec_api example installs program with the same name, as ipsec example does. Remove file conflict between two examples. 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/ipsec_api/Makefile.am b/example/ipsec_api/Makefile.am index 14bc5dd6..848683e0 100644 --- a/example/ipsec_api/Makefile.am +++ b/example/ipsec_api/Makefile.am @@ -3,22 +3,23 @@ include $(top_srcdir)/example/Makefile.inc AM_CPPFLAGS = $(OPENSSL_CPPFLAGS) LDADD += $(OPENSSL_LIBS) -bin_PROGRAMS = odp_ipsec +bin_PROGRAMS = odp_ipsec_api dist_bin_SCRIPTS = \ - $(srcdir)/odp_ipsec_run_ah_in.sh \ - $(srcdir)/odp_ipsec_run_ah_out.sh \ - $(srcdir)/odp_ipsec_run_ah_tun_in.sh \ - $(srcdir)/odp_ipsec_run_ah_tun_out.sh \ - $(srcdir)/odp_ipsec_run_esp_in.sh \ - $(srcdir)/odp_ipsec_run_esp_out.sh \ - $(srcdir)/odp_ipsec_run_esp_tun_in.sh \ - $(srcdir)/odp_ipsec_run_esp_tun_out.sh \ - $(srcdir)/odp_ipsec_run_live.sh \ - $(srcdir)/odp_ipsec_run_router.sh \ - $(srcdir)/odp_ipsec_run_simple.sh + $(srcdir)/odp_ipsec_api_run_ah_in.sh \ + $(srcdir)/odp_ipsec_api_run_ah_out.sh \ + $(srcdir)/odp_ipsec_api_run_ah_tun_in.sh \ + $(srcdir)/odp_ipsec_api_run_ah_tun_out.sh \ + $(srcdir)/odp_ipsec_api_run_esp_in.sh \ + $(srcdir)/odp_ipsec_api_run_esp_out.sh \ + $(srcdir)/odp_ipsec_api_run_esp_tun_in.sh \ + $(srcdir)/odp_ipsec_api_run_esp_tun_out.sh \ + $(srcdir)/odp_ipsec_api_run_live.sh \ + $(srcdir)/odp_ipsec_api_run_router.sh \ + $(srcdir)/odp_ipsec_api_run_simple.sh -odp_ipsec_SOURCES = odp_ipsec.c \ +odp_ipsec_api_SOURCES = \ + odp_ipsec.c \ odp_ipsec_sa_db.c \ odp_ipsec_sa_db.h \ odp_ipsec_sp_db.c \ diff --git a/example/ipsec_api/odp_ipsec_run_ah_in.sh b/example/ipsec_api/odp_ipsec_api_run_ah_in.sh similarity index 91% rename from example/ipsec_api/odp_ipsec_run_ah_in.sh rename to example/ipsec_api/odp_ipsec_api_run_ah_in.sh index c5b105f5..becfc892 100755 --- a/example/ipsec_api/odp_ipsec_run_ah_in.sh +++ b/example/ipsec_api/odp_ipsec_api_run_ah_in.sh @@ -4,7 +4,7 @@ # - 2 loop interfaces # - 10 packets # - Specify API mode on command line -odp_ipsec -i loop1,loop2 \ +odp_ipsec_api -i loop1,loop2 \ -r 192.168.111.2/32:loop1:08.00.27.76.B5.E0 \ -p 192.168.222.0/24:192.168.111.0/24:in:ah \ -a 192.168.222.2:192.168.111.2:md5:300:27f6d123d7077b361662fc6e451f65d8 \ diff --git a/example/ipsec_api/odp_ipsec_run_ah_out.sh b/example/ipsec_api/odp_ipsec_api_run_ah_out.sh similarity index 91% rename from example/ipsec_api/odp_ipsec_run_ah_out.sh rename to example/ipsec_api/odp_ipsec_api_run_ah_out.sh index c8926d5a..023809a1 100755 --- a/example/ipsec_api/odp_ipsec_run_ah_out.sh +++ b/example/ipsec_api/odp_ipsec_api_run_ah_out.sh @@ -4,7 +4,7 @@ # - 2 loop interfaces # - 10 packets # - Specify API mode on command line -odp_ipsec -i loop1,loop2 \ +odp_ipsec_api -i loop1,loop2 \ -r 192.168.222.2/32:loop2:08.00.27.F5.8B.DB \ -p 192.168.111.0/24:192.168.222.0/24:out:ah \ -a 192.168.111.2:192.168.222.2:md5:200:a731649644c5dee92cbd9c2e7e188ee6 \ diff --git a/example/ipsec_api/odp_ipsec_run_ah_tun_in.sh b/example/ipsec_api/odp_ipsec_api_run_ah_tun_in.sh similarity index 92% rename from example/ipsec_api/odp_ipsec_run_ah_tun_in.sh rename to example/ipsec_api/odp_ipsec_api_run_ah_tun_in.sh index a0d4c433..40c488f0 100755 --- a/example/ipsec_api/odp_ipsec_run_ah_tun_in.sh +++ b/example/ipsec_api/odp_ipsec_api_run_ah_tun_in.sh @@ -4,7 +4,7 @@ # - 2 loop interfaces # - 10 packets # - Specify API mode on command line -odp_ipsec -i loop1,loop2 \ +odp_ipsec_api -i loop1,loop2 \ -r 192.168.111.2/32:loop1:08.00.27.76.B5.E0 \ -p 192.168.222.0/24:192.168.111.0/24:in:ah \ -a 192.168.222.2:192.168.111.2:md5:300:27f6d123d7077b361662fc6e451f65d8 \ diff --git a/example/ipsec_api/odp_ipsec_run_ah_tun_out.sh b/example/ipsec_api/odp_ipsec_api_run_ah_tun_out.sh similarity index 92% rename from example/ipsec_api/odp_ipsec_run_ah_tun_out.sh rename to example/ipsec_api/odp_ipsec_api_run_ah_tun_out.sh index 74a0e3b4..d7118586 100755 --- a/example/ipsec_api/odp_ipsec_run_ah_tun_out.sh +++ b/example/ipsec_api/odp_ipsec_api_run_ah_tun_out.sh @@ -4,7 +4,7 @@ # - 2 loop interfaces # - 10 packets # - Specify API mode on command line -odp_ipsec -i loop1,loop2 \ +odp_ipsec_api -i loop1,loop2 \ -r 192.168.222.2/32:loop2:08.00.27.F5.8B.DB \ -p 192.168.111.0/24:192.168.222.0/24:out:ah \ -a 192.168.111.2:192.168.222.2:md5:200:a731649644c5dee92cbd9c2e7e188ee6 \ diff --git a/example/ipsec_api/odp_ipsec_run_esp_in.sh b/example/ipsec_api/odp_ipsec_api_run_esp_in.sh similarity index 91% rename from example/ipsec_api/odp_ipsec_run_esp_in.sh rename to example/ipsec_api/odp_ipsec_api_run_esp_in.sh index 39e171cd..cdb302ef 100755 --- a/example/ipsec_api/odp_ipsec_run_esp_in.sh +++ b/example/ipsec_api/odp_ipsec_api_run_esp_in.sh @@ -4,7 +4,7 @@ # - 2 loop interfaces # - 10 packets # - Specify API mode on command line -odp_ipsec -i loop1,loop2 \ +odp_ipsec_api -i loop1,loop2 \ -r 192.168.111.2/32:loop1:08.00.27.76.B5.E0 \ -p 192.168.222.0/24:192.168.111.0/24:in:esp \ -e 192.168.222.2:192.168.111.2:\ diff --git a/example/ipsec_api/odp_ipsec_run_esp_out.sh b/example/ipsec_api/odp_ipsec_api_run_esp_out.sh similarity index 92% rename from example/ipsec_api/odp_ipsec_run_esp_out.sh rename to example/ipsec_api/odp_ipsec_api_run_esp_out.sh index 98ab04e5..f1c15ffe 100755 --- a/example/ipsec_api/odp_ipsec_run_esp_out.sh +++ b/example/ipsec_api/odp_ipsec_api_run_esp_out.sh @@ -4,7 +4,7 @@ # - 2 loop interfaces # - 10 packets # - Specify API mode on command line -odp_ipsec -i loop1,loop2 \ +odp_ipsec_api -i loop1,loop2 \ -r 192.168.222.2/32:loop2:08.00.27.F5.8B.DB \ -p 192.168.111.0/24:192.168.222.0/24:out:esp \ -e 192.168.111.2:192.168.222.2:\ diff --git a/example/ipsec_api/odp_ipsec_run_esp_tun_in.sh b/example/ipsec_api/odp_ipsec_api_run_esp_tun_in.sh similarity index 92% rename from example/ipsec_api/odp_ipsec_run_esp_tun_in.sh rename to example/ipsec_api/odp_ipsec_api_run_esp_tun_in.sh index 7ef3e2d0..5d78479e 100755 --- a/example/ipsec_api/odp_ipsec_run_esp_tun_in.sh +++ b/example/ipsec_api/odp_ipsec_api_run_esp_tun_in.sh @@ -4,7 +4,7 @@ # - 2 loop interfaces # - 10 packets # - Specify API mode on command line -odp_ipsec -i loop1,loop2 \ +odp_ipsec_api -i loop1,loop2 \ -r 192.168.111.2/32:loop1:08.00.27.76.B5.E0 \ -p 192.168.222.0/24:192.168.111.0/24:in:esp \ -e 192.168.222.2:192.168.111.2:\ diff --git a/example/ipsec_api/odp_ipsec_run_esp_tun_out.sh b/example/ipsec_api/odp_ipsec_api_run_esp_tun_out.sh similarity index 92% rename from example/ipsec_api/odp_ipsec_run_esp_tun_out.sh rename to example/ipsec_api/odp_ipsec_api_run_esp_tun_out.sh index 98ab04e5..f1c15ffe 100755 --- a/example/ipsec_api/odp_ipsec_run_esp_tun_out.sh +++ b/example/ipsec_api/odp_ipsec_api_run_esp_tun_out.sh @@ -4,7 +4,7 @@ # - 2 loop interfaces # - 10 packets # - Specify API mode on command line -odp_ipsec -i loop1,loop2 \ +odp_ipsec_api -i loop1,loop2 \ -r 192.168.222.2/32:loop2:08.00.27.F5.8B.DB \ -p 192.168.111.0/24:192.168.222.0/24:out:esp \ -e 192.168.111.2:192.168.222.2:\ diff --git a/example/ipsec_api/odp_ipsec_run_live.sh b/example/ipsec_api/odp_ipsec_api_run_live.sh similarity index 94% rename from example/ipsec_api/odp_ipsec_run_live.sh rename to example/ipsec_api/odp_ipsec_api_run_live.sh index b506b2af..9bc0a60f 100755 --- a/example/ipsec_api/odp_ipsec_run_live.sh +++ b/example/ipsec_api/odp_ipsec_api_run_live.sh @@ -3,7 +3,7 @@ # Live router test # - 2 interfaces interfaces # - Specify API mode on command line -sudo odp_ipsec -i p7p1,p8p1 \ +sudo odp_ipsec_api -i p7p1,p8p1 \ -r 192.168.111.2/32:p7p1:08.00.27.76.B5.E0 \ -r 192.168.222.2/32:p8p1:08.00.27.F5.8B.DB \ -p 192.168.111.0/24:192.168.222.0/24:out:both \ diff --git a/example/ipsec_api/odp_ipsec_run_router.sh b/example/ipsec_api/odp_ipsec_api_run_router.sh similarity index 85% rename from example/ipsec_api/odp_ipsec_run_router.sh rename to example/ipsec_api/odp_ipsec_api_run_router.sh index 31b9e765..982a27e9 100755 --- a/example/ipsec_api/odp_ipsec_run_router.sh +++ b/example/ipsec_api/odp_ipsec_api_run_router.sh @@ -3,7 +3,7 @@ # Live router test # - 2 interfaces interfaces # - Specify API mode on command line -sudo odp_ipsec -i p7p1,p8p1 \ +sudo odp_ipsec_api -i p7p1,p8p1 \ -r 192.168.111.2/32:p7p1:08.00.27.76.B5.E0 \ -r 192.168.222.2/32:p8p1:08.00.27.F5.8B.DB \ -c 1 "$@" diff --git a/example/ipsec_api/odp_ipsec_run_simple.sh b/example/ipsec_api/odp_ipsec_api_run_simple.sh similarity index 87% rename from example/ipsec_api/odp_ipsec_run_simple.sh rename to example/ipsec_api/odp_ipsec_api_run_simple.sh index ddda612a..bdc2777c 100755 --- a/example/ipsec_api/odp_ipsec_run_simple.sh +++ b/example/ipsec_api/odp_ipsec_api_run_simple.sh @@ -4,7 +4,7 @@ # - 2 loop interfaces # - 10 packets # - Specify API mode on command line -odp_ipsec -i loop1,loop2 \ +odp_ipsec_api -i loop1,loop2 \ -r 192.168.222.2/32:loop2:08.00.27.F5.8B.DB \ -s 192.168.111.2:192.168.222.2:loop1:loop2:10:100 \ -c 2 "$@" commit fdcaa6d73a4c577ea92d69d95d851c1b2de86c61 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue Jan 2 19:17:22 2018 +0300 tests: don't use ODP_SYSCONFIG_FILE libconfig is not used in TigerMoth, so let's drop the variable in test's Makefile.inc. 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/Makefile.inc b/test/Makefile.inc index 0b5b66dd..192dab22 100644 --- a/test/Makefile.inc +++ b/test/Makefile.inc @@ -33,5 +33,4 @@ AM_LDFLAGS = -L$(LIB) -static @VALGRIND_CHECK_RULES@ TESTS_ENVIRONMENT = ODP_PLATFORM=${with_platform} \ - EXEEXT=${EXEEXT} \ - ODP_SYSCONFIG_FILE=none + EXEEXT=${EXEEXT} commit fac80a8a4b26b863a85266cd62fb07a5e2cd84e4 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue Jan 2 19:17:22 2018 +0300 linux-gen: don't use SYSCONFDIR sysconfig is not used in TigerMoth, so let's drop the variable in linux-gen's Makefile. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 7e40448b..415e7b8b 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -11,7 +11,6 @@ AM_CPPFLAGS += -I$(top_builddir)/include AM_CPPFLAGS += -Iinclude AM_CPPFLAGS += -I$(top_srcdir)/platform/$(with_platform)/arch/$(ARCH_DIR) AM_CPPFLAGS += -I$(top_srcdir)/platform/$(with_platform)/arch/default -AM_CPPFLAGS += -DSYSCONFDIR=\"@sysconfdir@\" AM_CPPFLAGS += $(OPENSSL_CPPFLAGS) AM_CPPFLAGS += $(DPDK_CPPFLAGS) commit 13171a0c3f83e905a99250fdfca925231dcaa7e2 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Mon Jan 15 02:39:31 2018 +0300 Revert "test: time: do not fail under gcov" This reverts commit commit 7a7e3ff9d50d ("test: time: do not fail under gcov") After fixing time test to use clock_gettime() instead of clock(), this test should not fail under Travis/coverage. Reenable the test. 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/Makefile.am b/test/validation/api/Makefile.am index 0503e092..c92d123c 100644 --- a/test/validation/api/Makefile.am +++ b/test/validation/api/Makefile.am @@ -56,7 +56,7 @@ TESTS = \ scheduler/scheduler_main$(EXEEXT) \ std_clib/std_clib_main$(EXEEXT) \ thread/thread_main$(EXEEXT) \ - time/time.sh \ + time/time_main$(EXEEXT) \ timer/timer_main$(EXEEXT) \ traffic_mngr/traffic_mngr.sh \ shmem/shmem_main$(EXEEXT) \ diff --git a/test/validation/api/time/Makefile.am b/test/validation/api/time/Makefile.am index 4c3340e0..bedbfa37 100644 --- a/test/validation/api/time/Makefile.am +++ b/test/validation/api/time/Makefile.am @@ -1,14 +1,4 @@ include ../Makefile.inc -TESTS_ENVIRONMENT += TEST_DIR=${builddir} - -TESTSCRIPTS = time.sh -TEST_EXTENSIONS = .sh - -TESTS = $(TESTSCRIPTS) - test_PROGRAMS = time_main time_main_SOURCES = time_main.c time.c time_test.h - -dist_check_SCRIPTS = $(TESTSCRIPTS) -test_SCRIPTS = $(dist_check_SCRIPTS) diff --git a/test/validation/api/time/time.sh b/test/validation/api/time/time.sh deleted file mode 100755 index ecedddb7..00000000 --- a/test/validation/api/time/time.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 2017, Linaro Limited -# All rights reserved. -# -# SPDX-License-Identifier: BSD-3-Clause -# - -# directories where time_main binary can be found: -# -in the validation dir when running make check (intree or out of tree) -# -in the script directory, when running after 'make install', or -# -in the validation when running standalone (./time) intree. -# -in the current directory. -# running stand alone out of tree requires setting PATH -PATH=${TEST_DIR}/api/time:$PATH -PATH=$(dirname $0)/../../../../validation/api/time:$PATH -PATH=$(dirname $0):$PATH -PATH=`pwd`:$PATH - -time_main_path=$(which time_main${EXEEXT}) -if [ -x "$time_main_path" ] ; then - echo "running with time_main: $time_run_path" -else - echo "cannot find time_main: please set you PATH for it." - exit 1 -fi - -# exit codes expected by automake for skipped tests -TEST_SKIPPED=77 - -time_main${EXEEXT} -ret=$? - -SIGSEGV=139 - -if [ "${TRAVIS}" = "true" ] && [ $ret -ne 0 ] && - [ ${TEST} = "coverage" ] && [ $ret -ne ${SIGSEGV} ]; then - echo "SKIP: skip due significant slowdown under code coverage" - exit ${TEST_SKIPPED} -fi - -exit $ret commit 4b5776e8e8bbec6340392af74b7ee7a18c191b52 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue Jan 2 00:33:39 2018 +0300 validation: time: use clock_gettime() instead of clock() ODP test for time API uses clock() to compare time against. However clock() returns processor time used by program, which can differ between runs. Use clock_gettime() as a time source to compare against. Fixes: https://bugs.linaro.org/show_bug.cgi?id=3572 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/time/time.c b/test/validation/api/time/time.c index c8f90dba..d7d5b790 100644 --- a/test/validation/api/time/time.c +++ b/test/validation/api/time/time.c @@ -423,11 +423,12 @@ static void time_test_accuracy(time_cb time_cur, time_from_ns_cb time_from_ns) { int i; odp_time_t t1, t2, wait, diff; - clock_t c1, c2; + struct timespec ts1, ts2, tsdiff; double sec_t, sec_c; odp_time_t sec = time_from_ns(ODP_TIME_SEC_IN_NS); - c1 = clock(); + i = clock_gettime(CLOCK_MONOTONIC, &ts1); + CU_ASSERT(i == 0); t1 = time_cur(); wait = odp_time_sum(t1, sec); @@ -436,12 +437,21 @@ static void time_test_accuracy(time_cb time_cur, time_from_ns_cb time_from_ns) wait = odp_time_sum(wait, sec); } + i = clock_gettime(CLOCK_MONOTONIC, &ts2); + CU_ASSERT(i == 0); t2 = time_cur(); - c2 = clock(); + + if (ts2.tv_nsec < ts1.tv_nsec) { + tsdiff.tv_nsec = 1000000000L + ts2.tv_nsec - ts1.tv_nsec; + tsdiff.tv_sec = ts2.tv_sec - 1 - ts1.tv_sec; + } else { + tsdiff.tv_nsec = ts2.tv_nsec - ts1.tv_nsec; + tsdiff.tv_sec = ts2.tv_sec - ts1.tv_sec; + } diff = odp_time_diff(t2, t1); sec_t = ((double)odp_time_to_ns(diff)) / ODP_TIME_SEC_IN_NS; - sec_c = ((double)(c2 - c1)) / CLOCKS_PER_SEC; + sec_c = ((double)(tsdiff.tv_nsec) / 1000000000L) + tsdiff.tv_sec; /* Check that ODP time is within +-5% of system time */ CU_ASSERT(sec_t < sec_c * 1.05); commit 76b9155ed01abcd3287b659d35b9217f77b81cc2 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Wed Jan 3 04:42:54 2018 +0300 validation: stop overriding LDADD variable LDADD variable can be used to pass other libraries (like DPDK). Stop overriding LDADD entirely. Instead use PRELDADD variable or appending to LDADD. 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/test/ring/Makefile.am b/platform/linux-generic/test/ring/Makefile.am index 95e5e87f..8287c7e0 100644 --- a/platform/linux-generic/test/ring/Makefile.am +++ b/platform/linux-generic/test/ring/Makefile.am @@ -6,4 +6,4 @@ ring_main_SOURCES = \ ring_suites.c ring_suites.h \ ring_basic.c ring_stress.c -ring_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) +PRELDADD += $(LIBCUNIT_COMMON) diff --git a/platform/linux-generic/test/validation/api/shmem/Makefile.am b/platform/linux-generic/test/validation/api/shmem/Makefile.am index f75cbc97..07d311d2 100644 --- a/platform/linux-generic/test/validation/api/shmem/Makefile.am +++ b/platform/linux-generic/test/validation/api/shmem/Makefile.am @@ -7,10 +7,9 @@ test_PROGRAMS = shmem_linux shmem_odp1 shmem_odp2 shmem_linux_SOURCES = shmem_linux.c shmem_linux.h shmem_common.h shmem_linux_CFLAGS = $(AM_CFLAGS) -I$(top_builddir)/include shmem_linux_LDFLAGS = $(AM_LDFLAGS) -lrt +shmem_linux_LDADD = #shmem_odp1 and shmem_odp2 are the 2 ODP processes: shmem_odp1_SOURCES = shmem_odp1.c shmem_odp1.h shmem_common.h -shmem_odp1_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) shmem_odp2_SOURCES = shmem_odp2.c shmem_odp2.h shmem_common.h -shmem_odp2_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/Makefile.inc b/test/Makefile.inc index d4d74c25..0b5b66dd 100644 --- a/test/Makefile.inc +++ b/test/Makefile.inc @@ -10,8 +10,9 @@ LIBTHRMASK_COMMON = $(COMMON_DIR)/libthrmask_common.la #in the following line, the libs using the symbols should come before #the libs containing them! The includer is given a chance to add things -#before libodp by setting PRE_LDADD before the inclusion. -LDADD = $(PRE_LDADD) $(LIB)/libodphelper.la $(LIB)/libodp-linux.la $(DPDK_PMDS) +#before libodp by setting PRELDADD before the inclusion. +LDADD = $(PRELDADD) $(LIBODP) $(DPDK_PMDS) +PRELDADD = INCFLAGS = \ -I$(top_builddir)/platform/@with_platform@/include \ diff --git a/test/validation/api/Makefile.inc b/test/validation/api/Makefile.inc index 871a3779..8610b568 100644 --- a/test/validation/api/Makefile.inc +++ b/test/validation/api/Makefile.inc @@ -1,2 +1,3 @@ include $(top_srcdir)/test/Makefile.inc +PRELDADD += $(LIBCUNIT_COMMON) diff --git a/test/validation/api/atomic/Makefile.am b/test/validation/api/atomic/Makefile.am index 859e3c51..4de45970 100644 --- a/test/validation/api/atomic/Makefile.am +++ b/test/validation/api/atomic/Makefile.am @@ -2,4 +2,3 @@ include ../Makefile.inc test_PROGRAMS = atomic_main atomic_main_SOURCES = atomic_main.c atomic.c atomic.h -atomic_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/barrier/Makefile.am b/test/validation/api/barrier/Makefile.am index b0310e3a..aad5ddd6 100644 --- a/test/validation/api/barrier/Makefile.am +++ b/test/validation/api/barrier/Makefile.am @@ -2,4 +2,3 @@ include ../Makefile.inc test_PROGRAMS = barrier_main barrier_main_SOURCES = barrier_main.c barrier.c barrier.h -barrier_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/buffer/Makefile.am b/test/validation/api/buffer/Makefile.am index 59639ff7..901fdadc 100644 --- a/test/validation/api/buffer/Makefile.am +++ b/test/validation/api/buffer/Makefile.am @@ -2,4 +2,3 @@ include ../Makefile.inc test_PROGRAMS = buffer_main buffer_main_SOURCES = buffer_main.c buffer.c buffer.h -buffer_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/chksum/Makefile.am b/test/validation/api/chksum/Makefile.am index 3227294d..9bd44385 100644 --- a/test/validation/api/chksum/Makefile.am +++ b/test/validation/api/chksum/Makefile.am @@ -2,4 +2,3 @@ include ../Makefile.inc test_PROGRAMS = chksum_main chksum_main_SOURCES = chksum_main.c chksum.c chksum.h -chksum_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/classification/Makefile.am b/test/validation/api/classification/Makefile.am index b5870307..303a3576 100644 --- a/test/validation/api/classification/Makefile.am +++ b/test/validation/api/classification/Makefile.am @@ -9,4 +9,3 @@ classification_main_SOURCES = classification_main.c \ odp_classification_common.c \ classification.c \ classification.h -classification_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/cpumask/Makefile.am b/test/validation/api/cpumask/Makefile.am index ff12f56f..e5c78d92 100644 --- a/test/validation/api/cpumask/Makefile.am +++ b/test/validation/api/cpumask/Makefile.am @@ -2,4 +2,4 @@ include ../Makefile.inc test_PROGRAMS = cpumask_main cpumask_main_SOURCES = cpumask_main.c cpumask.c cpumask.h -cpumask_main_LDADD = $(LIBCPUMASK_COMMON) $(LIBCUNIT_COMMON) $(LIBODP) +LDADD += $(LIBCPUMASK_COMMON) diff --git a/test/validation/api/crypto/Makefile.am b/test/validation/api/crypto/Makefile.am index 94f1c1ca..238ce189 100644 --- a/test/validation/api/crypto/Makefile.am +++ b/test/validation/api/crypto/Makefile.am @@ -8,4 +8,3 @@ crypto_main_SOURCES = crypto_main.c \ odp_crypto_test_inp.h \ test_vectors.h \ test_vectors_len.h -crypto_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/errno/Makefile.am b/test/validation/api/errno/Makefile.am index 9eddfb48..ad5c7ded 100644 --- a/test/validation/api/errno/Makefile.am +++ b/test/validation/api/errno/Makefile.am @@ -2,4 +2,3 @@ include ../Makefile.inc test_PROGRAMS = errno_main errno_main_SOURCES = errno_main.c errno.c errno.h -errno_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/event/Makefile.am b/test/validation/api/event/Makefile.am index be4764b5..762f9356 100644 --- a/test/validation/api/event/Makefile.am +++ b/test/validation/api/event/Makefile.am @@ -2,4 +2,3 @@ include ../Makefile.inc test_PROGRAMS = event_main event_main_SOURCES = event_main.c event.c event.h -event_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/hash/Makefile.am b/test/validation/api/hash/Makefile.am index bd098ffb..8f005778 100644 --- a/test/validation/api/hash/Makefile.am +++ b/test/validation/api/hash/Makefile.am @@ -2,4 +2,3 @@ include ../Makefile.inc test_PROGRAMS = hash_main hash_main_SOURCES = hash_main.c hash.c hash.h -hash_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/init/Makefile.am b/test/validation/api/init/Makefile.am index 522c3a18..2d066143 100644 --- a/test/validation/api/init/Makefile.am +++ b/test/validation/api/init/Makefile.am @@ -7,6 +7,3 @@ test_PROGRAMS = init_main_abort init_main_log init_main_ok init_main_abort_SOURCES = init_main_abort.c init.c init.h init_main_log_SOURCES = init_main_log.c init.c init.h init_main_ok_SOURCES = init_main_ok.c init.c init.h -init_main_abort_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) -init_main_log_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) -init_main_ok_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/ipsec/Makefile.am b/test/validation/api/ipsec/Makefile.am index b300c8e8..32882699 100644 --- a/test/validation/api/ipsec/Makefile.am +++ b/test/validation/api/ipsec/Makefile.am @@ -21,7 +21,4 @@ ipsec_async_SOURCES = ipsec_async.c ipsec_inline_in_SOURCES = ipsec_inline_in.c ipsec_inline_out_SOURCES = ipsec_inline_out.c -ipsec_sync_LDADD = libtestipsec.la $(LIBCUNIT_COMMON) $(LIBODP) -ipsec_async_LDADD = libtestipsec.la $(LIBCUNIT_COMMON) $(LIBODP) -ipsec_inline_in_LDADD = libtestipsec.la $(LIBCUNIT_COMMON) $(LIBODP) -ipsec_inline_out_LDADD = libtestipsec.la $(LIBCUNIT_COMMON) $(LIBODP) +LDADD += libtestipsec.la diff --git a/test/validation/api/lock/Makefile.am b/test/validation/api/lock/Makefile.am index b434fe77..c5518b3a 100644 --- a/test/validation/api/lock/Makefile.am +++ b/test/validation/api/lock/Makefile.am @@ -2,4 +2,3 @@ include ../Makefile.inc test_PROGRAMS = lock_main lock_main_SOURCES = lock_main.c lock.c lock.h -lock_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/packet/Makefile.am b/test/validation/api/packet/Makefile.am index 43300ed0..d33cdadb 100644 --- a/test/validation/api/packet/Makefile.am +++ b/test/validation/api/packet/Makefile.am @@ -2,4 +2,3 @@ include ../Makefile.inc test_PROGRAMS = packet_main packet_main_SOURCES = packet_main.c packet.c packet.h -packet_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/pktio/Makefile.am b/test/validation/api/pktio/Makefile.am index a416fd1d..a6a16e2f 100644 --- a/test/validation/api/pktio/Makefile.am +++ b/test/validation/api/pktio/Makefile.am @@ -2,4 +2,3 @@ include ../Makefile.inc test_PROGRAMS = pktio_main pktio_main_SOURCES = pktio_main.c parser.c parser.h pktio.c pktio.h -pktio_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/pool/Makefile.am b/test/validation/api/pool/Makefile.am index 9e7c42b5..7951d048 100644 --- a/test/validation/api/pool/Makefile.am +++ b/test/validation/api/pool/Makefile.am @@ -2,4 +2,3 @@ include ../Makefile.inc test_PROGRAMS = pool_main pool_main_SOURCES = pool_main.c pool.c pool.h -pool_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/queue/Makefile.am b/test/validation/api/queue/Makefile.am index 9b1c6b77..5ed4638b 100644 --- a/test/validation/api/queue/Makefile.am +++ b/test/validation/api/queue/Makefile.am @@ -2,4 +2,3 @@ include ../Makefile.inc test_PROGRAMS = queue_main queue_main_SOURCES = queue_main.c queue.c queue.h -queue_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/random/Makefile.am b/test/validation/api/random/Makefile.am index e9e7ffc0..8f1ba9fe 100644 --- a/test/validation/api/random/Makefile.am +++ b/test/validation/api/random/Makefile.am @@ -2,4 +2,3 @@ include ../Makefile.inc test_PROGRAMS = random_main random_main_SOURCES = random_main.c random.c random.h -random_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/scheduler/Makefile.am b/test/validation/api/scheduler/Makefile.am index 34abf7d6..3673ad7c 100644 --- a/test/validation/api/scheduler/Makefile.am +++ b/test/validation/api/scheduler/Makefile.am @@ -2,4 +2,3 @@ include ../Makefile.inc test_PROGRAMS = scheduler_main scheduler_main_SOURCES = scheduler_main.c scheduler.c scheduler.h -scheduler_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/shmem/Makefile.am b/test/validation/api/shmem/Makefile.am index 8c5d7f70..9a10668f 100644 --- a/test/validation/api/shmem/Makefile.am +++ b/test/validation/api/shmem/Makefile.am @@ -2,4 +2,3 @@ include ../Makefile.inc test_PROGRAMS = shmem_main shmem_main_SOURCES = shmem_main.c shmem.c shmem.h -shmem_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/std_clib/Makefile.am b/test/validation/api/std_clib/Makefile.am index dc75c95c..34b888bb 100644 --- a/test/validation/api/std_clib/Makefile.am +++ b/test/validation/api/std_clib/Makefile.am @@ -2,4 +2,3 @@ include ../Makefile.inc test_PROGRAMS = std_clib_main std_clib_main_SOURCES = std_clib_main.c std_clib.c std_clib.h -std_clib_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/system/Makefile.am b/test/validation/api/system/Makefile.am index 123d3a69..e6fbb0ea 100644 --- a/test/validation/api/system/Makefile.am +++ b/test/validation/api/system/Makefile.am @@ -2,4 +2,3 @@ include ../Makefile.inc test_PROGRAMS = system_main system_main_SOURCES = system_main.c system.c system.h -system_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/thread/Makefile.am b/test/validation/api/thread/Makefile.am index 1c56574f..2282169b 100644 --- a/test/validation/api/thread/Makefile.am +++ b/test/validation/api/thread/Makefile.am @@ -3,4 +3,4 @@ include ../Makefile.inc test_PROGRAMS = thread_main thread_main_CPPFLAGS = $(AM_CPPFLAGS) -DTEST_THRMASK thread_main_SOURCES = thread_main.c thread.c thread.h -thread_main_LDADD = $(LIBTHRMASK_COMMON) $(LIBCUNIT_COMMON) $(LIBODP) +LDADD += $(LIBTHRMASK_COMMON) diff --git a/test/validation/api/time/Makefile.am b/test/validation/api/time/Makefile.am index 669d1226..4c3340e0 100644 --- a/test/validation/api/time/Makefile.am +++ b/test/validation/api/time/Makefile.am @@ -9,7 +9,6 @@ TESTS = $(TESTSCRIPTS) test_PROGRAMS = time_main time_main_SOURCES = time_main.c time.c time_test.h -time_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) dist_check_SCRIPTS = $(TESTSCRIPTS) test_SCRIPTS = $(dist_check_SCRIPTS) diff --git a/test/validation/api/timer/Makefile.am b/test/validation/api/timer/Makefile.am index c953dcb3..57617440 100644 --- a/test/validation/api/timer/Makefile.am +++ b/test/validation/api/timer/Makefile.am @@ -2,4 +2,3 @@ include ../Makefile.inc test_PROGRAMS = timer_main timer_main_SOURCES = timer_main.c timer.c timer.h -timer_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/traffic_mngr/Makefile.am b/test/validation/api/traffic_mngr/Makefile.am index dc4f8709..82996afe 100644 --- a/test/validation/api/traffic_mngr/Makefile.am +++ b/test/validation/api/traffic_mngr/Makefile.am @@ -9,7 +9,7 @@ TESTS = $(TESTSCRIPTS) test_PROGRAMS = traffic_mngr_main traffic_mngr_main_SOURCES = traffic_mngr_main.c traffic_mngr.c traffic_mngr.h -traffic_mngr_main_LDADD = -lm $(LIBCUNIT_COMMON) $(LIBODP) +LDADD += -lm dist_check_SCRIPTS = $(TESTSCRIPTS) test_SCRIPTS = $(dist_check_SCRIPTS) commit d59a6b8a1b049ab3e978accbd420eb25993a5997 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Thu Jan 4 00:26:17 2018 +0300 test, linux-gen: use common test/Makefile.inc Populate test/Makefile.inc with more variables, allowing us to drop platform test/Makefile.inc. 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/test/Makefile.inc b/platform/linux-generic/test/Makefile.inc deleted file mode 100644 index dd21917e..00000000 --- a/platform/linux-generic/test/Makefile.inc +++ /dev/null @@ -1,22 +0,0 @@ -# The following definitions may be used by platform tests that wish to -# build specific ODP applications, (i.e those whose do more than validation -# test wrapping) - -AM_LDFLAGS = -static - -AM_CFLAGS = $(CUNIT_CFLAGS) - -LIBCUNIT_COMMON = $(top_builddir)/test/common/libcunit_common.la -LIB = $(top_builddir)/lib -LIBODP = $(LIB)/libodphelper.la $(LIB)/libodp-linux.la $(DPDK_PMDS) - -INCCUNIT_COMMON = -I$(top_srcdir)/test/common -INCODP = \ - -I$(top_builddir)/include \ - -I$(top_builddir)/platform/@with_platform@/include \ - -I$(top_srcdir)/helper/include \ - -I$(top_srcdir)/include \ - -I$(top_srcdir)/include/odp/arch/@ARCH_ABI@ \ - -I$(top_srcdir)/platform/@with_platform@/arch/$(ARCH_DIR) \ - -I$(top_srcdir)/platform/@with_platform@/include \ - -I$(top_srcdir)/test diff --git a/platform/linux-generic/test/ring/Makefile.am b/platform/linux-generic/test/ring/Makefile.am index 37604755..95e5e87f 100644 --- a/platform/linux-generic/test/ring/Makefile.am +++ b/platform/linux-generic/test/ring/Makefile.am @@ -1,4 +1,4 @@ -include ../Makefile.inc +include $(top_srcdir)/test/Makefile.inc test_PROGRAMS = ring_main ring_main_SOURCES = \ @@ -6,6 +6,4 @@ ring_main_SOURCES = \ ring_suites.c ring_suites.h \ ring_basic.c ring_stress.c -ring_main_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_builddir)/include \ - $(INCCUNIT_COMMON) $(INCODP) ring_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/platform/linux-generic/test/validation/Makefile.inc b/platform/linux-generic/test/validation/Makefile.inc deleted file mode 100644 index b9030850..00000000 --- a/platform/linux-generic/test/validation/Makefile.inc +++ /dev/null @@ -1 +0,0 @@ -include $(top_srcdir)/platform/linux-generic/test/Makefile.inc diff --git a/platform/linux-generic/test/validation/api/Makefile.inc b/platform/linux-generic/test/validation/api/Makefile.inc index c47217d1..cda6237e 100644 --- a/platform/linux-generic/test/validation/api/Makefile.inc +++ b/platform/linux-generic/test/validation/api/Makefile.inc @@ -1 +1 @@ -include $(top_srcdir)/platform/linux-generic/test/validation/Makefile.inc +include $(top_srcdir)/test/validation/api/Makefile.inc diff --git a/platform/linux-generic/test/validation/api/shmem/Makefile.am b/platform/linux-generic/test/validation/api/shmem/Makefile.am index 131a511b..f75cbc97 100644 --- a/platform/linux-generic/test/validation/api/shmem/Makefile.am +++ b/platform/linux-generic/test/validation/api/shmem/Makefile.am @@ -10,13 +10,7 @@ shmem_linux_LDFLAGS = $(AM_LDFLAGS) -lrt #shmem_odp1 and shmem_odp2 are the 2 ODP processes: shmem_odp1_SOURCES = shmem_odp1.c shmem_odp1.h shmem_common.h -shmem_odp1_CFLAGS = $(AM_CFLAGS) \ - $(INCCUNIT_COMMON) \ - $(INCODP) shmem_odp1_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) shmem_odp2_SOURCES = shmem_odp2.c shmem_odp2.h shmem_common.h -shmem_odp2_CFLAGS = $(AM_CFLAGS) \ - $(INCCUNIT_COMMON) \ - $(INCODP) shmem_odp2_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/Makefile.inc b/test/Makefile.inc index f7c0da21..d4d74c25 100644 --- a/test/Makefile.inc +++ b/test/Makefile.inc @@ -1,5 +1,13 @@ LIB = $(top_builddir)/lib +COMMON_DIR = $(top_builddir)/test/common + +LIBODP = $(LIB)/libodphelper.la $(LIB)/libodp-linux.la + +LIBCUNIT_COMMON = $(COMMON_DIR)/libcunit_common.la +LIBCPUMASK_COMMON = $(COMMON_DIR)/libcpumask_common.la +LIBTHRMASK_COMMON = $(COMMON_DIR)/libthrmask_common.la + #in the following line, the libs using the symbols should come before #the libs containing them! The includer is given a chance to add things #before libodp by setting PRE_LDADD before the inclusion. @@ -16,6 +24,7 @@ INCFLAGS = \ -I$(top_builddir)/include AM_CPPFLAGS = $(INCFLAGS) +AM_CPPFLAGS += -I$(top_srcdir)/test/common AM_CFLAGS = $(CUNIT_CFLAGS) AM_LDFLAGS = -L$(LIB) -static diff --git a/test/validation/api/Makefile.inc b/test/validation/api/Makefile.inc index 4af01000..871a3779 100644 --- a/test/validation/api/Makefile.inc +++ b/test/validation/api/Makefile.inc @@ -1,13 +1,2 @@ include $(top_srcdir)/test/Makefile.inc -COMMON_DIR = $(top_builddir)/test/common - -AM_CFLAGS += -I$(top_srcdir)/test/common -AM_LDFLAGS += $(DPDK_PMDS) - -AM_CFLAGS += $(CUNIT_CFLAGS) - -LIBCUNIT_COMMON = $(COMMON_DIR)/libcunit_common.la -LIBCPUMASK_COMMON = $(COMMON_DIR)/libcpumask_common.la -LIBTHRMASK_COMMON = $(COMMON_DIR)/libthrmask_common.la -LIBODP = $(LIB)/libodphelper.la $(LIB)/libodp-linux.la commit 8609d2eba06d8e964daff5cb8ecb81bb802ea585 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Mon Jan 1 23:41:31 2018 +0300 helper/tests: use common Makefile.inc for tests 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/helper/test/Makefile.am b/helper/test/Makefile.am index 8eee643b..662d6c75 100644 --- a/helper/test/Makefile.am +++ b/helper/test/Makefile.am @@ -1,26 +1,4 @@ -TESTS_ENVIRONMENT = EXEEXT=${EXEEXT} - -LIB = $(top_builddir)/lib - -#in the following line, the libs using the symbols should come before -#the libs containing them! The includer is given a chance to add things -#before libodp by setting PRE_LDADD before the inclusion. -LDADD = $(PRE_LDADD) $(LIB)/libodphelper.la $(LIB)/libodp-linux.la - -INCFLAGS = \ - -I$(top_builddir)/platform/@with_platform@/include \ - -I$(top_srcdir)/helper/include \ - -I$(top_srcdir)/include \ - -I$(top_srcdir)/include/odp/arch/@ARCH_ABI@ \ - -I$(top_srcdir)/platform/@with_platform@/include \ - -I$(top_srcdir)/platform/@with_platform@/arch/@ARCH_DIR@ \ - -I$(top_builddir)/include \ - -I$(top_srcdir)/helper - -ODP_PLATFORM=${with_platform} - -AM_CPPFLAGS = $(INCFLAGS) -AM_LDFLAGS = -static +include $(top_srcdir)/test/Makefile.inc EXECUTABLES = chksum \ cuckootable \ commit cd793bfd9667e25db7cb1dbd9c276374e0ee879b Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Sun Dec 31 04:20:35 2017 +0300 example: add missing libraries to LDADD variables 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/ipfragreass/Makefile.am b/example/ipfragreass/Makefile.am index fa7d5c8b..b98e066f 100644 --- a/example/ipfragreass/Makefile.am +++ b/example/ipfragreass/Makefile.am @@ -1,5 +1,7 @@ include $(top_srcdir)/example/Makefile.inc +LDADD += $(ATOMIC_LIBS) + bin_PROGRAMS = odp_ipfragreass odp_ipfragreass_SOURCES = odp_ipfragreass.c \ diff --git a/example/ipsec/Makefile.am b/example/ipsec/Makefile.am index 85905ffa..eba9b8bd 100644 --- a/example/ipsec/Makefile.am +++ b/example/ipsec/Makefile.am @@ -1,6 +1,7 @@ include $(top_srcdir)/example/Makefile.inc AM_CPPFLAGS = $(OPENSSL_CPPFLAGS) +LDADD += $(OPENSSL_LIBS) bin_PROGRAMS = odp_ipsec diff --git a/example/ipsec_api/Makefile.am b/example/ipsec_api/Makefile.am index 847326fc..14bc5dd6 100644 --- a/example/ipsec_api/Makefile.am +++ b/example/ipsec_api/Makefile.am @@ -1,5 +1,8 @@ include $(top_srcdir)/example/Makefile.inc +AM_CPPFLAGS = $(OPENSSL_CPPFLAGS) +LDADD += $(OPENSSL_LIBS) + bin_PROGRAMS = odp_ipsec dist_bin_SCRIPTS = \ commit 09188114d855456920113c8d6889c5c1e2451d75 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Sun Dec 31 04:20:08 2017 +0300 linux-gen: don't pass DPKD_LIBS for dynamic linking with libodp-linux 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/libodp-linux.pc.in b/platform/linux-generic/libodp-linux.pc.in index 220dbc9c..962a4f78 100644 --- a/platform/linux-generic/libodp-linux.pc.in +++ b/platform/linux-generic/libodp-linux.pc.in @@ -6,6 +6,6 @@ includedir=@includedir@ Name: libodp-linux Description: The ODP packet processing engine Version: @PKGCONFIG_VERSION@ -Libs: -L${libdir} -lodp-linux @DPDK_LIBS@ +Libs: -L${libdir} -lodp-linux Libs.private: @OPENSSL_STATIC_LIBS@ @DPDK_PMDS@ @DPDK_LIBS@ @PCAP_LIBS@ @PTHREAD_LIBS@ @TIMER_LIBS@ -lpthread @ATOMIC_LIBS@ Cflags: -I${includedir} commit 8296d0e9a91e2a435ec780052e22095563dfbf12 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Sun Dec 31 03:27:20 2017 +0300 performance: odp_crypto: correct typo Receieved -> Received. 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/performance/odp_crypto.c b/test/performance/odp_crypto.c index 0cbc2754..761cc8cf 100644 --- a/test/performance/odp_crypto.c +++ b/test/performance/odp_crypto.c @@ -612,7 +612,7 @@ run_measure_one(crypto_args_t *cargs, if (cargs->debug_packets) { mem = odp_packet_data(out_pkt); - print_mem("Receieved encrypted packet", + print_mem("Received encrypted packet", mem, payload_length + config-> commit d831814b8d0a1d7817f014aae91031dafd1ceeb6 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Sun Dec 31 02:43:08 2017 +0300 doc: add missing implementers-guide images to Makefile.am Omitting those images in Makefile.am made them disappear from distribution tarball resulting in an improperly-built documentation files. 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/doc/implementers-guide/Makefile.am b/doc/implementers-guide/Makefile.am index 07ee141c..c407339e 100644 --- a/doc/implementers-guide/Makefile.am +++ b/doc/implementers-guide/Makefile.am @@ -2,10 +2,12 @@ include ../Makefile.inc SRC = implementers-guide.adoc TARGET = implementers-guide.html +IMAGES = $(IMAGES_DIR)/abi_llvm.svg \ + $(IMAGES_DIR)/abi_traditional.svg -EXTRA_DIST = $(SRC) +EXTRA_DIST = $(SRC) $(IMAGES) doc_DATA = $(TARGET) -$(TARGET): $(SRC) +$(TARGET): $(SRC) $(IMAGES) CLEANFILES = $(doc_DATA) commit ee5d0385064f4bacb511cfd497abcd014930ffaa Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Sun Dec 31 02:43:08 2017 +0300 doc: add missing user-guide images to Makefile.am Omitting those images in Makefile.am made them disappear from distribution tarball resulting in an improperly-built documentation files. 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/doc/users-guide/Makefile.am b/doc/users-guide/Makefile.am index b2ebd4d4..7be32ddc 100644 --- a/doc/users-guide/Makefile.am +++ b/doc/users-guide/Makefile.am @@ -32,6 +32,12 @@ IMAGES = $(IMAGES_DIR)/overview.svg \ $(IMAGES_DIR)/pktio_fsm.svg \ $(IMAGES_DIR)/pktout_direct_send.svg \ $(IMAGES_DIR)/pktout_queue_send.svg \ + $(IMAGES_DIR)/ref.svg \ + $(IMAGES_DIR)/refpkt1.svg \ + $(IMAGES_DIR)/refpkt2.svg \ + $(IMAGES_DIR)/refpktmulti.svg \ + $(IMAGES_DIR)/refpktsingle.svg \ + $(IMAGES_DIR)/refstatic.svg \ $(IMAGES_DIR)/release_git.svg \ $(IMAGES_DIR)/segment.svg \ $(IMAGES_DIR)/simple_release_git.svg \ commit 5d44e562a5c0c1252dbfd11b49c87084767da2e2 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Sun Dec 31 02:38:44 2017 +0300 helper: link against libpthread and libodp-linux libodphelper.so uses symbols from libpthread and libodp-linux.so, link it aganst those libraries. 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/helper/Makefile.am b/helper/Makefile.am index ee1c17d6..ebb67346 100644 --- a/helper/Makefile.am +++ b/helper/Makefile.am @@ -10,6 +10,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/platform/@with_platform@/include \ -I$(top_srcdir)/platform/@with_platform@/arch/@ARCH_DIR@ \ -I$(top_builddir)/include +AM_CFLAGS = $(PTHREAD_CFLAGS) AM_LDFLAGS = -version-number '$(ODPHELPER_LIBSO_VERSION)' @@ -60,4 +61,6 @@ __LIB__libodphelper_la_SOURCES += \ linux/thread.c endif +__LIB__libodphelper_la_LIBADD = $(PTHREAD_LIBS) $(LIB)/libodp-linux.la + lib_LTLIBRARIES = $(LIB)/libodphelper.la ----------------------------------------------------------------------- Summary of changes: .shippable.yml | 2 + doc/implementers-guide/Makefile.am | 6 +- doc/users-guide/Makefile.am | 6 ++ example/Makefile.inc | 2 +- example/ipfragreass/Makefile.am | 2 + example/ipsec/Makefile.am | 1 + example/ipsec_api/Makefile.am | 30 ++++---- ...sec_run_ah_in.sh => odp_ipsec_api_run_ah_in.sh} | 2 +- ...c_run_ah_out.sh => odp_ipsec_api_run_ah_out.sh} | 2 +- ...ah_tun_in.sh => odp_ipsec_api_run_ah_tun_in.sh} | 2 +- ..._tun_out.sh => odp_ipsec_api_run_ah_tun_out.sh} | 2 +- ...c_run_esp_in.sh => odp_ipsec_api_run_esp_in.sh} | 2 +- ...esp_tun_out.sh => odp_ipsec_api_run_esp_out.sh} | 2 +- ...p_tun_in.sh => odp_ipsec_api_run_esp_tun_in.sh} | 2 +- ...esp_out.sh => odp_ipsec_api_run_esp_tun_out.sh} | 2 +- ...ipsec_run_live.sh => odp_ipsec_api_run_live.sh} | 2 +- ...c_run_router.sh => odp_ipsec_api_run_router.sh} | 2 +- ...c_run_simple.sh => odp_ipsec_api_run_simple.sh} | 2 +- helper/Makefile.am | 3 + helper/test/Makefile.am | 24 +------ m4/odp_dpdk.m4 | 83 +++++++++++++++++----- platform/linux-generic/Makefile.am | 3 +- platform/linux-generic/libodp-linux.pc.in | 4 +- platform/linux-generic/m4/odp_dpdk.m4 | 24 +------ platform/linux-generic/test/Makefile.inc | 22 ------ platform/linux-generic/test/ring/Makefile.am | 6 +- .../linux-generic/test/validation/Makefile.inc | 1 - .../linux-generic/test/validation/api/Makefile.inc | 2 +- .../test/validation/api/shmem/Makefile.am | 9 +-- test/Makefile.inc | 17 +++-- test/performance/odp_crypto.c | 2 +- test/validation/api/Makefile.am | 2 +- test/validation/api/Makefile.inc | 12 +--- test/validation/api/atomic/Makefile.am | 1 - test/validation/api/barrier/Makefile.am | 1 - test/validation/api/buffer/Makefile.am | 1 - test/validation/api/chksum/Makefile.am | 1 - test/validation/api/classification/Makefile.am | 1 - test/validation/api/cpumask/Makefile.am | 2 +- test/validation/api/crypto/Makefile.am | 1 - test/validation/api/errno/Makefile.am | 1 - test/validation/api/event/Makefile.am | 1 - test/validation/api/hash/Makefile.am | 1 - test/validation/api/init/Makefile.am | 3 - test/validation/api/ipsec/Makefile.am | 5 +- test/validation/api/lock/Makefile.am | 1 - test/validation/api/packet/Makefile.am | 1 - test/validation/api/pktio/Makefile.am | 1 - test/validation/api/pool/Makefile.am | 1 - test/validation/api/queue/Makefile.am | 1 - test/validation/api/random/Makefile.am | 1 - test/validation/api/scheduler/Makefile.am | 1 - test/validation/api/shmem/Makefile.am | 1 - test/validation/api/std_clib/Makefile.am | 1 - test/validation/api/system/Makefile.am | 1 - test/validation/api/thread/Makefile.am | 2 +- test/validation/api/time/Makefile.am | 11 --- test/validation/api/time/time.c | 18 +++-- test/validation/api/time/time.sh | 42 ----------- test/validation/api/timer/Makefile.am | 1 - test/validation/api/traffic_mngr/Makefile.am | 2 +- 61 files changed, 157 insertions(+), 233 deletions(-) rename example/ipsec_api/{odp_ipsec_run_ah_in.sh => odp_ipsec_api_run_ah_in.sh} (91%) rename example/ipsec_api/{odp_ipsec_run_ah_out.sh => odp_ipsec_api_run_ah_out.sh} (91%) rename example/ipsec_api/{odp_ipsec_run_ah_tun_in.sh => odp_ipsec_api_run_ah_tun_in.sh} (92%) rename example/ipsec_api/{odp_ipsec_run_ah_tun_out.sh => odp_ipsec_api_run_ah_tun_out.sh} (92%) rename example/ipsec_api/{odp_ipsec_run_esp_in.sh => odp_ipsec_api_run_esp_in.sh} (91%) rename example/ipsec_api/{odp_ipsec_run_esp_tun_out.sh => odp_ipsec_api_run_esp_out.sh} (92%) rename example/ipsec_api/{odp_ipsec_run_esp_tun_in.sh => odp_ipsec_api_run_esp_tun_in.sh} (92%) rename example/ipsec_api/{odp_ipsec_run_esp_out.sh => odp_ipsec_api_run_esp_tun_out.sh} (92%) rename example/ipsec_api/{odp_ipsec_run_live.sh => odp_ipsec_api_run_live.sh} (94%) rename example/ipsec_api/{odp_ipsec_run_router.sh => odp_ipsec_api_run_router.sh} (85%) rename example/ipsec_api/{odp_ipsec_run_simple.sh => odp_ipsec_api_run_simple.sh} (87%) delete mode 100644 platform/linux-generic/test/Makefile.inc delete mode 100644 platform/linux-generic/test/validation/Makefile.inc delete mode 100755 test/validation/api/time/time.sh hooks/post-receive --

7 years, 5 months

[COMMIT] branch api-next updated. v1.17.0.0_tigermoth_rc1-15-gf6dab2bf

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 f6dab2bfa90ef5d3146cb76f86bc8782666f0f3e (commit) via 65c00a291990417d195508fa6ae768e6dd094f51 (commit) via 862efab5e4903d39b69ebb4f79566bdbf0c52c76 (commit) via 5521c3f5fe71b50de2ec3a3bb96c3a156a9dace7 (commit) via a9fd2354bed9fbcabc743c4f8afed282ef1748e8 (commit) via 1f1e24e6c2b66bdebeb9c640cc184537631a809d (commit) via d6cc12b26f644d8add4567bcd1ade6fd738e1562 (commit) from 634b380b63de53c65b92c214d91aaf03785d69db (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 f6dab2bfa90ef5d3146cb76f86bc8782666f0f3e Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue Dec 19 19:58:00 2017 +0300 linux-gen: crypto, ipsec: use auth_iv Separate handling of authentication IV data. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(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 35a83ce0..b7065e73 100644 --- a/platform/linux-generic/odp_crypto.c +++ b/platform/linux-generic/odp_crypto.c @@ -36,9 +36,7 @@ * Keep sorted: first by key length, then by IV length */ static const odp_crypto_cipher_capability_t cipher_capa_null[] = { -{.key_len = 0, .iv_len = 0}, -/* Special case for GMAC */ -{.key_len = 0, .iv_len = 12} }; +{.key_len = 0, .iv_len = 0} }; static const odp_crypto_cipher_capability_t cipher_capa_trides_cbc[] = { {.key_len = 24, .iv_len = 8} }; @@ -86,7 +84,8 @@ static const odp_crypto_auth_capability_t auth_capa_aes_gcm[] = { {.digest_len = 16, .key_len = 0, .aad_len = {.min = 8, .max = 12, .inc = 4} } }; static const odp_crypto_auth_capability_t auth_capa_aes_gmac[] = { -{.digest_len = 16, .key_len = 16, .aad_len = {.min = 0, .max = 0, .inc = 0} } }; +{.digest_len = 16, .key_len = 16, .aad_len = {.min = 0, .max = 0, .inc = 0}, + .iv_len = 12 } }; /** Forward declaration of session structure */ typedef struct odp_crypto_generic_session_t odp_crypto_generic_session_t; @@ -121,6 +120,7 @@ struct odp_crypto_generic_session_t { struct { uint8_t key[EVP_MAX_KEY_LENGTH]; + uint8_t iv_data[EVP_MAX_IV_LENGTH]; uint32_t key_length; uint32_t bytes; union { @@ -641,10 +641,10 @@ odp_crypto_alg_err_t aes_gmac_gen(odp_packet_t pkt, uint8_t block[EVP_MAX_MD_SIZE]; int ret; - if (param->cipher_iv_ptr) - iv_ptr = param->cipher_iv_ptr; - else if (session->p.cipher_iv.data) - iv_ptr = session->cipher.iv_data; + if (param->auth_iv_ptr) + iv_ptr = param->auth_iv_ptr; + else if (session->p.auth_iv.data) + iv_ptr = session->auth.iv_data; else return ODP_CRYPTO_ALG_ERR_IV_INVALID; @@ -680,10 +680,10 @@ odp_crypto_alg_err_t aes_gmac_check(odp_packet_t pkt, uint8_t block[EVP_MAX_MD_SIZE]; int ret; - if (param->cipher_iv_ptr) - iv_ptr = param->cipher_iv_ptr; - else if (session->p.cipher_iv.data) - iv_ptr = session->cipher.iv_data; + if (param->auth_iv_ptr) + iv_ptr = param->auth_iv_ptr; + else if (session->p.auth_iv.data) + iv_ptr = session->auth.iv_data; else return ODP_CRYPTO_ALG_ERR_IV_INVALID; @@ -909,11 +909,21 @@ odp_crypto_session_create(odp_crypto_session_param_t *param, goto err; } + if (session->p.auth_iv.length > EVP_MAX_IV_LENGTH) { + ODP_DBG("Maximum auth IV length exceeded\n"); + *status = ODP_CRYPTO_SES_CREATE_ERR_INV_CIPHER; + goto err; + } + /* Copy IV data */ if (session->p.cipher_iv.data) memcpy(session->cipher.iv_data, session->p.cipher_iv.data, session->p.cipher_iv.length); + if (session->p.auth_iv.data) + memcpy(session->auth.iv_data, session->p.auth_iv.data, + session->p.auth_iv.length); + /* Derive order */ if (ODP_CRYPTO_OP_ENCODE == param->op) session->do_cipher_first = param->auth_cipher_text; @@ -1102,6 +1112,7 @@ odp_crypto_operation(odp_crypto_op_param_t *param, packet_param.session = param->session; packet_param.cipher_iv_ptr = param->cipher_iv_ptr; + packet_param.auth_iv_ptr = param->auth_iv_ptr; packet_param.hash_result_offset = param->hash_result_offset; packet_param.aad_ptr = param->aad_ptr; packet_param.cipher_range = param->cipher_range; diff --git a/platform/linux-generic/odp_ipsec.c b/platform/linux-generic/odp_ipsec.c index ab4fb554..e19907a5 100644 --- a/platform/linux-generic/odp_ipsec.c +++ b/platform/linux-generic/odp_ipsec.c @@ -478,6 +478,7 @@ static int ipsec_in_esp(odp_packet_t *pkt, state->in.hdr_len - ipsec_sa->icv_len; param->cipher_iv_ptr = state->iv; + param->auth_iv_ptr = state->iv; state->esp.aad.spi = esp.spi; state->esp.aad.seq_no = esp.seq_no; @@ -560,7 +561,7 @@ static int ipsec_in_ah(odp_packet_t *pkt, return -1; } - param->cipher_iv_ptr = state->iv; + param->auth_iv_ptr = state->iv; state->in.hdr_len = (ah.ah_len + 2) * 4; state->in.trl_len = 0; @@ -1080,6 +1081,7 @@ static int ipsec_out_esp(odp_packet_t *pkt, } param->cipher_iv_ptr = state->iv; + param->auth_iv_ptr = state->iv; memset(&esp, 0, sizeof(esp)); esp.spi = odp_cpu_to_be_32(ipsec_sa->spi); @@ -1229,7 +1231,7 @@ static int ipsec_out_ah(odp_packet_t *pkt, return -1; } - param->cipher_iv_ptr = state->iv; + param->auth_iv_ptr = state->iv; if (odp_packet_extend_head(pkt, hdr_len, NULL, NULL) < 0) { status->error.alg = 1; diff --git a/platform/linux-generic/odp_ipsec_sad.c b/platform/linux-generic/odp_ipsec_sad.c index 11227a5f..38cf7755 100644 --- a/platform/linux-generic/odp_ipsec_sad.c +++ b/platform/linux-generic/odp_ipsec_sad.c @@ -409,7 +409,7 @@ odp_ipsec_sa_t odp_ipsec_sa_create(const odp_ipsec_sa_param_t *param) ipsec_sa->use_counter_iv = 1; ipsec_sa->esp_iv_len = 8; ipsec_sa->esp_block_len = 16; - crypto_param.cipher_iv.length = 12; + crypto_param.auth_iv.length = 12; break; default: break; commit 65c00a291990417d195508fa6ae768e6dd094f51 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue Dec 19 19:57:09 2017 +0300 validation: crypto: use auth IV for GMAC test case Change GMAC testing code to use new auth IV fields. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(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 7309b5d5..976c8882 100644 --- a/test/validation/api/crypto/odp_crypto_test_inp.c +++ b/test/validation/api/crypto/odp_crypto_test_inp.c @@ -79,6 +79,7 @@ static int alg_op(odp_packet_t pkt, odp_bool_t *ok, odp_crypto_session_t session, uint8_t *cipher_iv_ptr, + uint8_t *auth_iv_ptr, odp_packet_data_range_t *cipher_range, odp_packet_data_range_t *auth_range, uint8_t *aad, @@ -101,6 +102,8 @@ static int alg_op(odp_packet_t pkt, op_params.auth_range = *auth_range; if (cipher_iv_ptr) op_params.cipher_iv_ptr = cipher_iv_ptr; + if (auth_iv_ptr) + op_params.auth_iv_ptr = auth_iv_ptr; op_params.aad_ptr = aad; @@ -154,6 +157,7 @@ static int alg_packet_op(odp_packet_t pkt, odp_bool_t *ok, odp_crypto_session_t session, uint8_t *cipher_iv_ptr, + uint8_t *auth_iv_ptr, odp_packet_data_range_t *cipher_range, odp_packet_data_range_t *auth_range, uint8_t *aad, @@ -173,6 +177,8 @@ static int alg_packet_op(odp_packet_t pkt, op_params.auth_range = *auth_range; if (cipher_iv_ptr) op_params.cipher_iv_ptr = cipher_iv_ptr; + if (auth_iv_ptr) + op_params.auth_iv_ptr = auth_iv_ptr; op_params.aad_ptr = aad; @@ -211,6 +217,7 @@ static int alg_packet_op_enq(odp_packet_t pkt, odp_bool_t *ok, odp_crypto_session_t session, uint8_t *cipher_iv_ptr, + uint8_t *auth_iv_ptr, odp_packet_data_range_t *cipher_range, odp_packet_data_range_t *auth_range, uint8_t *aad, @@ -231,6 +238,8 @@ static int alg_packet_op_enq(odp_packet_t pkt, op_params.auth_range = *auth_range; if (cipher_iv_ptr) op_params.cipher_iv_ptr = cipher_iv_ptr; + if (auth_iv_ptr) + op_params.auth_iv_ptr = auth_iv_ptr; op_params.aad_ptr = aad; @@ -321,6 +330,10 @@ static void alg_test(odp_crypto_op_t op, .data = ovr_iv ? NULL : ref->cipher_iv, .length = ref->cipher_iv_length }; + odp_crypto_iv_t auth_iv = { + .data = ovr_iv ? NULL : ref->auth_iv, + .length = ref->auth_iv_length + }; int num, i; int found; @@ -414,6 +427,7 @@ static void alg_test(odp_crypto_op_t op, /* Search for the test case */ for (i = 0; i < num; i++) { if (auth_capa[i].digest_len == ref->digest_length && + auth_capa[i].iv_len == auth_iv.length && auth_capa[i].key_len == auth_key.length) { found = 1; break; @@ -422,8 +436,9 @@ static void alg_test(odp_crypto_op_t op, if (!found) { printf("\n Unsupported: alg=%s, key_len=%" PRIu32 ", " - "digest_len=%" PRIu32 "\n", auth_alg_name(auth_alg), - auth_key.length, ref->digest_length); + "digest_len=%" PRIu32 ", iv_len=%" PRIu32 "\n", + auth_alg_name(auth_alg), auth_key.length, + ref->digest_length, auth_iv.length); return; } @@ -439,6 +454,7 @@ static void alg_test(odp_crypto_op_t op, ses_params.output_pool = suite_context.pool; ses_params.cipher_key = cipher_key; ses_params.cipher_iv = cipher_iv; + ses_params.auth_iv = auth_iv; ses_params.auth_key = auth_key; ses_params.auth_digest_len = ref->digest_length; ses_params.auth_aad_len = ref->aad_length; @@ -489,16 +505,19 @@ static void alg_test(odp_crypto_op_t op, if (!suite_context.packet) rc = alg_op(pkt, &ok, session, ovr_iv ? ref->cipher_iv : NULL, + ovr_iv ? ref->auth_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->cipher_iv : NULL, + ovr_iv ? ref->auth_iv : NULL, &cipher_range, &auth_range, ref->aad, ref->length); else rc = alg_packet_op(pkt, &ok, session, ovr_iv ? ref->cipher_iv : NULL, + ovr_iv ? ref->auth_iv : NULL, &cipher_range, &auth_range, ref->aad, ref->length); if (rc < 0) @@ -1163,6 +1182,20 @@ static void crypto_test_gen_alg_aes_gmac(void) false); } +static void crypto_test_gen_alg_aes_gmac_ovr_iv(void) +{ + unsigned int test_vec_num = (sizeof(aes_gmac_reference) / + sizeof(aes_gmac_reference[0])); + unsigned int i; + + for (i = 0; i < test_vec_num; i++) + alg_test(ODP_CRYPTO_OP_ENCODE, + ODP_CIPHER_ALG_NULL, + ODP_AUTH_ALG_AES_GMAC, + &aes_gmac_reference[i], + true); +} + static void crypto_test_check_alg_aes_gmac(void) { unsigned int test_vec_num = (sizeof(aes_gmac_reference) / @@ -1177,6 +1210,20 @@ static void crypto_test_check_alg_aes_gmac(void) false); } +static void crypto_test_check_alg_aes_gmac_ovr_iv(void) +{ + unsigned int test_vec_num = (sizeof(aes_gmac_reference) / + sizeof(aes_gmac_reference[0])); + unsigned int i; + + for (i = 0; i < test_vec_num; i++) + alg_test(ODP_CRYPTO_OP_DECODE, + ODP_CIPHER_ALG_NULL, + ODP_AUTH_ALG_AES_GMAC, + &aes_gmac_reference[i], + true); +} + int crypto_suite_sync_init(void) { suite_context.pool = odp_pool_lookup("packet_pool"); @@ -1284,8 +1331,12 @@ odp_testinfo_t crypto_suite[] = { check_alg_hmac_sha512), ODP_TEST_INFO_CONDITIONAL(crypto_test_gen_alg_aes_gmac, check_alg_aes_gmac), + ODP_TEST_INFO_CONDITIONAL(crypto_test_gen_alg_aes_gmac_ovr_iv, + check_alg_aes_gmac), ODP_TEST_INFO_CONDITIONAL(crypto_test_check_alg_aes_gmac, check_alg_aes_gmac), + ODP_TEST_INFO_CONDITIONAL(crypto_test_check_alg_aes_gmac_ovr_iv, + check_alg_aes_gmac), ODP_TEST_INFO_NULL, }; diff --git a/test/validation/api/crypto/test_vectors.h b/test/validation/api/crypto/test_vectors.h index 6673ba4b..d08bf150 100644 --- a/test/validation/api/crypto/test_vectors.h +++ b/test/validation/api/crypto/test_vectors.h @@ -16,6 +16,8 @@ typedef struct crypto_test_reference_s { uint8_t auth_key[MAX_KEY_LEN]; uint32_t cipher_iv_length; uint8_t cipher_iv[MAX_IV_LEN]; + uint32_t auth_iv_length; + uint8_t auth_iv[MAX_IV_LEN]; uint32_t length; uint8_t plaintext[MAX_DATA_LEN]; uint8_t ciphertext[MAX_DATA_LEN]; @@ -447,9 +449,9 @@ static crypto_test_reference_t aes_gmac_reference[] = { .auth_key_length = AES128_GCM_KEY_LEN, .auth_key = { 0x4c, 0x80, 0xcd, 0xef, 0xbb, 0x5d, 0x10, 0xda, 0x90, 0x6a, 0xc7, 0x3c, 0x36, 0x13, 0xa6, 0x34}, - .cipher_iv_length = AES_GCM_IV_LEN, - .cipher_iv = { 0x22, 0x43, 0x3c, 0x64, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00 }, + .auth_iv_length = AES_GCM_IV_LEN, + .auth_iv = { 0x22, 0x43, 0x3c, 0x64, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00 }, .length = 68, .plaintext = { 0x00, 0x00, 0x43, 0x21, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, commit 862efab5e4903d39b69ebb4f79566bdbf0c52c76 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue Dec 19 19:47:54 2017 +0300 api: crypto: add separate auth IV GMAC auth algorithm requires IV to work. Instead of hacking the ODP_CIPHER_ALG_NULL iv to include value for ODP_AUTH_ALG_GMAC, provide separate iv (in auth capability, session params and operation params). Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/include/odp/api/spec/crypto.h b/include/odp/api/spec/crypto.h index e44892fb..ea2a14d6 100644 --- a/include/odp/api/spec/crypto.h +++ b/include/odp/api/spec/crypto.h @@ -333,6 +333,9 @@ typedef struct odp_crypto_session_param_t { */ odp_crypto_key_t auth_key; + /** Authentication Initialization Vector (IV) */ + odp_crypto_iv_t auth_iv; + /** Authentication digest length in bytes * * Use odp_crypto_auth_capability() for supported digest lengths. @@ -408,6 +411,9 @@ typedef struct odp_crypto_op_param_t { uint8_t *cipher_iv_ptr; }; + /** Override session authentication IV pointer */ + uint8_t *auth_iv_ptr; + /** Offset from start of packet for hash result * * Specifies the offset where the hash result is to be stored. In case @@ -449,6 +455,9 @@ typedef struct odp_crypto_packet_op_param_t { uint8_t *cipher_iv_ptr; }; + /** Override session IV pointer for authentication */ + uint8_t *auth_iv_ptr; + /** Offset from start of packet for hash result * * Specifies the offset where the hash result is to be stored. In case @@ -614,6 +623,9 @@ typedef struct odp_crypto_auth_capability_t { /** Key length in bytes */ uint32_t key_len; + /** IV length in bytes */ + uint32_t iv_len; + /** Additional Authenticated Data (AAD) lengths */ struct { /** Minimum AAD length in bytes */ commit 5521c3f5fe71b50de2ec3a3bb96c3a156a9dace7 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Thu Jan 4 01:05:53 2018 +0300 api: crypto: use cipher_iv_ptr instead of override_iv_ptr In preparation to add auth-specific IV, rename override_iv_ptr field to ciper_iv_ptr. Provide deprecated compatibility field override_iv_ptr. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/example/ipsec/odp_ipsec.c b/example/ipsec/odp_ipsec.c index 001f5208..c0978d0d 100644 --- a/example/ipsec/odp_ipsec.c +++ b/example/ipsec/odp_ipsec.c @@ -635,7 +635,7 @@ pkt_disposition_e do_ipsec_in_classify(odp_packet_t *pkt, if (esp) { params.cipher_range.offset = ipv4_data_p(ip) + hdr_len - buf; params.cipher_range.length = ipv4_data_len(ip) - hdr_len; - params.override_iv_ptr = esp->iv; + params.cipher_iv_ptr = esp->iv; } /* Issue crypto request */ diff --git a/include/odp/api/spec/crypto.h b/include/odp/api/spec/crypto.h index 25ce2f86..e44892fb 100644 --- a/include/odp/api/spec/crypto.h +++ b/include/odp/api/spec/crypto.h @@ -400,8 +400,13 @@ typedef struct odp_crypto_op_param_t { */ odp_packet_t out_pkt; - /** Override session IV pointer */ - uint8_t *override_iv_ptr; + /** Override session IV pointer for cipher */ + union { + /** @deprecated use cipher_iv_ptr */ + uint8_t *ODP_DEPRECATE(override_iv_ptr); + /** Override session IV pointer for cipher */ + uint8_t *cipher_iv_ptr; + }; /** Offset from start of packet for hash result * @@ -436,8 +441,13 @@ typedef struct odp_crypto_packet_op_param_t { /** Session handle from creation */ odp_crypto_session_t session; - /** Override session IV pointer */ - uint8_t *override_iv_ptr; + /** Override session IV pointer for cipher */ + union { + /** @deprecated use cipher_iv_ptr */ + uint8_t *ODP_DEPRECATE(override_iv_ptr); + /** Override session IV pointer for cipher */ + uint8_t *cipher_iv_ptr; + }; /** Offset from start of packet for hash result * diff --git a/platform/linux-generic/odp_crypto.c b/platform/linux-generic/odp_crypto.c index eab82e9f..35a83ce0 100644 --- a/platform/linux-generic/odp_crypto.c +++ b/platform/linux-generic/odp_crypto.c @@ -434,8 +434,8 @@ odp_crypto_alg_err_t cipher_encrypt(odp_packet_t pkt, void *iv_ptr; int ret; - if (param->override_iv_ptr) - iv_ptr = param->override_iv_ptr; + if (param->cipher_iv_ptr) + iv_ptr = param->cipher_iv_ptr; else if (session->p.cipher_iv.data) iv_ptr = session->cipher.iv_data; else @@ -465,8 +465,8 @@ odp_crypto_alg_err_t cipher_decrypt(odp_packet_t pkt, void *iv_ptr; int ret; - if (param->override_iv_ptr) - iv_ptr = param->override_iv_ptr; + if (param->cipher_iv_ptr) + iv_ptr = param->cipher_iv_ptr; else if (session->p.cipher_iv.data) iv_ptr = session->cipher.iv_data; else @@ -528,8 +528,8 @@ odp_crypto_alg_err_t aes_gcm_encrypt(odp_packet_t pkt, uint8_t block[EVP_MAX_MD_SIZE]; int ret; - if (param->override_iv_ptr) - iv_ptr = param->override_iv_ptr; + if (param->cipher_iv_ptr) + iv_ptr = param->cipher_iv_ptr; else if (session->p.cipher_iv.data) iv_ptr = session->cipher.iv_data; else @@ -575,8 +575,8 @@ odp_crypto_alg_err_t aes_gcm_decrypt(odp_packet_t pkt, uint8_t block[EVP_MAX_MD_SIZE]; int ret; - if (param->override_iv_ptr) - iv_ptr = param->override_iv_ptr; + if (param->cipher_iv_ptr) + iv_ptr = param->cipher_iv_ptr; else if (session->p.cipher_iv.data) iv_ptr = session->cipher.iv_data; else @@ -641,8 +641,8 @@ odp_crypto_alg_err_t aes_gmac_gen(odp_packet_t pkt, uint8_t block[EVP_MAX_MD_SIZE]; int ret; - if (param->override_iv_ptr) - iv_ptr = param->override_iv_ptr; + if (param->cipher_iv_ptr) + iv_ptr = param->cipher_iv_ptr; else if (session->p.cipher_iv.data) iv_ptr = session->cipher.iv_data; else @@ -680,8 +680,8 @@ odp_crypto_alg_err_t aes_gmac_check(odp_packet_t pkt, uint8_t block[EVP_MAX_MD_SIZE]; int ret; - if (param->override_iv_ptr) - iv_ptr = param->override_iv_ptr; + if (param->cipher_iv_ptr) + iv_ptr = param->cipher_iv_ptr; else if (session->p.cipher_iv.data) iv_ptr = session->cipher.iv_data; else @@ -1101,7 +1101,7 @@ odp_crypto_operation(odp_crypto_op_param_t *param, int rc; packet_param.session = param->session; - packet_param.override_iv_ptr = param->override_iv_ptr; + packet_param.cipher_iv_ptr = param->cipher_iv_ptr; packet_param.hash_result_offset = param->hash_result_offset; packet_param.aad_ptr = param->aad_ptr; packet_param.cipher_range = param->cipher_range; diff --git a/platform/linux-generic/odp_ipsec.c b/platform/linux-generic/odp_ipsec.c index b023d308..ab4fb554 100644 --- a/platform/linux-generic/odp_ipsec.c +++ b/platform/linux-generic/odp_ipsec.c @@ -477,7 +477,7 @@ static int ipsec_in_esp(odp_packet_t *pkt, state->ip_hdr_len - state->in.hdr_len - ipsec_sa->icv_len; - param->override_iv_ptr = state->iv; + param->cipher_iv_ptr = state->iv; state->esp.aad.spi = esp.spi; state->esp.aad.seq_no = esp.seq_no; @@ -560,7 +560,7 @@ static int ipsec_in_ah(odp_packet_t *pkt, return -1; } - param->override_iv_ptr = state->iv; + param->cipher_iv_ptr = state->iv; state->in.hdr_len = (ah.ah_len + 2) * 4; state->in.trl_len = 0; @@ -1079,7 +1079,7 @@ static int ipsec_out_esp(odp_packet_t *pkt, return -1; } - param->override_iv_ptr = state->iv; + param->cipher_iv_ptr = state->iv; memset(&esp, 0, sizeof(esp)); esp.spi = odp_cpu_to_be_32(ipsec_sa->spi); @@ -1229,7 +1229,7 @@ static int ipsec_out_ah(odp_packet_t *pkt, return -1; } - param->override_iv_ptr = state->iv; + param->cipher_iv_ptr = state->iv; if (odp_packet_extend_head(pkt, hdr_len, NULL, NULL) < 0) { status->error.alg = 1; diff --git a/test/validation/api/crypto/odp_crypto_test_inp.c b/test/validation/api/crypto/odp_crypto_test_inp.c index d795baaf..7309b5d5 100644 --- a/test/validation/api/crypto/odp_crypto_test_inp.c +++ b/test/validation/api/crypto/odp_crypto_test_inp.c @@ -78,7 +78,7 @@ static const char *cipher_alg_name(odp_cipher_alg_t cipher) static int alg_op(odp_packet_t pkt, odp_bool_t *ok, odp_crypto_session_t session, - uint8_t *op_iv_ptr, + uint8_t *cipher_iv_ptr, odp_packet_data_range_t *cipher_range, odp_packet_data_range_t *auth_range, uint8_t *aad, @@ -99,8 +99,8 @@ static int alg_op(odp_packet_t pkt, op_params.cipher_range = *cipher_range; op_params.auth_range = *auth_range; - if (op_iv_ptr) - op_params.override_iv_ptr = op_iv_ptr; + if (cipher_iv_ptr) + op_params.cipher_iv_ptr = cipher_iv_ptr; op_params.aad_ptr = aad; @@ -153,7 +153,7 @@ static int alg_op(odp_packet_t pkt, static int alg_packet_op(odp_packet_t pkt, odp_bool_t *ok, odp_crypto_session_t session, - uint8_t *op_iv_ptr, + uint8_t *cipher_iv_ptr, odp_packet_data_range_t *cipher_range, odp_packet_data_range_t *auth_range, uint8_t *aad, @@ -171,8 +171,8 @@ static int alg_packet_op(odp_packet_t pkt, op_params.cipher_range = *cipher_range; op_params.auth_range = *auth_range; - if (op_iv_ptr) - op_params.override_iv_ptr = op_iv_ptr; + if (cipher_iv_ptr) + op_params.cipher_iv_ptr = cipher_iv_ptr; op_params.aad_ptr = aad; @@ -210,7 +210,7 @@ static int alg_packet_op(odp_packet_t pkt, static int alg_packet_op_enq(odp_packet_t pkt, odp_bool_t *ok, odp_crypto_session_t session, - uint8_t *op_iv_ptr, + uint8_t *cipher_iv_ptr, odp_packet_data_range_t *cipher_range, odp_packet_data_range_t *auth_range, uint8_t *aad, @@ -229,8 +229,8 @@ static int alg_packet_op_enq(odp_packet_t pkt, op_params.cipher_range = *cipher_range; op_params.auth_range = *auth_range; - if (op_iv_ptr) - op_params.override_iv_ptr = op_iv_ptr; + if (cipher_iv_ptr) + op_params.cipher_iv_ptr = cipher_iv_ptr; op_params.aad_ptr = aad; commit a9fd2354bed9fbcabc743c4f8afed282ef1748e8 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Thu Jan 4 01:05:53 2018 +0300 api: crypto: use cipher_iv instead of iv in session params In preparation to add auth-specific IV, rename iv field to ciper_iv. Provide deprecated compatibility field iv. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/example/ipsec/odp_ipsec_cache.c b/example/ipsec/odp_ipsec_cache.c index bd4c1eab..220df782 100644 --- a/example/ipsec/odp_ipsec_cache.c +++ b/example/ipsec/odp_ipsec_cache.c @@ -92,13 +92,13 @@ int create_ipsec_cache_entry(sa_db_entry_t *cipher_sa, params.cipher_alg = cipher_sa->alg.u.cipher; params.cipher_key.data = cipher_sa->key.data; params.cipher_key.length = cipher_sa->key.length; - params.iv.data = entry->state.iv; - params.iv.length = cipher_sa->iv_len; + params.cipher_iv.data = entry->state.iv; + params.cipher_iv.length = cipher_sa->iv_len; mode = cipher_sa->mode; } else { params.cipher_alg = ODP_CIPHER_ALG_NULL; - params.iv.data = NULL; - params.iv.length = 0; + params.cipher_iv.data = NULL; + params.cipher_iv.length = 0; } /* Auth */ @@ -113,10 +113,10 @@ int create_ipsec_cache_entry(sa_db_entry_t *cipher_sa, } /* Generate an IV */ - if (params.iv.length) { - int32_t size = params.iv.length; + if (params.cipher_iv.length) { + int32_t size = params.cipher_iv.length; - int32_t ret = odp_random_data(params.iv.data, size, 1); + int32_t ret = odp_random_data(params.cipher_iv.data, size, 1); if (ret != size) return -1; } diff --git a/include/odp/api/spec/crypto.h b/include/odp/api/spec/crypto.h index 81fecbc3..25ce2f86 100644 --- a/include/odp/api/spec/crypto.h +++ b/include/odp/api/spec/crypto.h @@ -313,7 +313,13 @@ typedef struct odp_crypto_session_param_t { odp_crypto_key_t cipher_key; /** Cipher Initialization Vector (IV) */ - odp_crypto_iv_t iv; + union { + /** @deprecated Use cipher_iv */ + odp_crypto_iv_t ODP_DEPRECATE(iv); + + /** Cipher Initialization Vector (IV) */ + odp_crypto_iv_t cipher_iv; + }; /** Authentication algorithm * diff --git a/platform/linux-generic/odp_crypto.c b/platform/linux-generic/odp_crypto.c index 3b110c19..eab82e9f 100644 --- a/platform/linux-generic/odp_crypto.c +++ b/platform/linux-generic/odp_crypto.c @@ -436,7 +436,7 @@ odp_crypto_alg_err_t cipher_encrypt(odp_packet_t pkt, if (param->override_iv_ptr) iv_ptr = param->override_iv_ptr; - else if (session->p.iv.data) + else if (session->p.cipher_iv.data) iv_ptr = session->cipher.iv_data; else return ODP_CRYPTO_ALG_ERR_IV_INVALID; @@ -467,7 +467,7 @@ odp_crypto_alg_err_t cipher_decrypt(odp_packet_t pkt, if (param->override_iv_ptr) iv_ptr = param->override_iv_ptr; - else if (session->p.iv.data) + else if (session->p.cipher_iv.data) iv_ptr = session->cipher.iv_data; else return ODP_CRYPTO_ALG_ERR_IV_INVALID; @@ -496,8 +496,9 @@ static int process_cipher_param(odp_crypto_generic_session_t *session, return -1; /* Verify IV len is correct */ - if (!((0 == session->p.iv.length) || - ((uint32_t)EVP_CIPHER_iv_length(cipher) == session->p.iv.length))) + if (!((0 == session->p.cipher_iv.length) || + ((uint32_t)EVP_CIPHER_iv_length(cipher) == + session->p.cipher_iv.length))) return -1; session->cipher.evp_cipher = cipher; @@ -529,7 +530,7 @@ odp_crypto_alg_err_t aes_gcm_encrypt(odp_packet_t pkt, if (param->override_iv_ptr) iv_ptr = param->override_iv_ptr; - else if (session->p.iv.data) + else if (session->p.cipher_iv.data) iv_ptr = session->cipher.iv_data; else return ODP_CRYPTO_ALG_ERR_IV_INVALID; @@ -539,7 +540,7 @@ odp_crypto_alg_err_t aes_gcm_encrypt(odp_packet_t pkt, EVP_EncryptInit_ex(ctx, session->cipher.evp_cipher, NULL, session->cipher.key_data, NULL); EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_SET_IVLEN, - session->p.iv.length, NULL); + session->p.cipher_iv.length, NULL); EVP_EncryptInit_ex(ctx, NULL, NULL, NULL, iv_ptr); EVP_CIPHER_CTX_set_padding(ctx, 0); @@ -576,7 +577,7 @@ odp_crypto_alg_err_t aes_gcm_decrypt(odp_packet_t pkt, if (param->override_iv_ptr) iv_ptr = param->override_iv_ptr; - else if (session->p.iv.data) + else if (session->p.cipher_iv.data) iv_ptr = session->cipher.iv_data; else return ODP_CRYPTO_ALG_ERR_IV_INVALID; @@ -586,7 +587,7 @@ odp_crypto_alg_err_t aes_gcm_decrypt(odp_packet_t pkt, EVP_DecryptInit_ex(ctx, session->cipher.evp_cipher, NULL, session->cipher.key_data, NULL); EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_SET_IVLEN, - session->p.iv.length, NULL); + session->p.cipher_iv.length, NULL); EVP_DecryptInit_ex(ctx, NULL, NULL, NULL, iv_ptr); EVP_CIPHER_CTX_set_padding(ctx, 0); @@ -642,7 +643,7 @@ odp_crypto_alg_err_t aes_gmac_gen(odp_packet_t pkt, if (param->override_iv_ptr) iv_ptr = param->override_iv_ptr; - else if (session->p.iv.data) + else if (session->p.cipher_iv.data) iv_ptr = session->cipher.iv_data; else return ODP_CRYPTO_ALG_ERR_IV_INVALID; @@ -652,7 +653,7 @@ odp_crypto_alg_err_t aes_gmac_gen(odp_packet_t pkt, EVP_EncryptInit_ex(ctx, session->auth.evp_cipher, NULL, session->auth.key, NULL); EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_SET_IVLEN, - session->p.iv.length, NULL); + session->p.cipher_iv.length, NULL); EVP_EncryptInit_ex(ctx, NULL, NULL, NULL, iv_ptr); EVP_CIPHER_CTX_set_padding(ctx, 0); @@ -681,7 +682,7 @@ odp_crypto_alg_err_t aes_gmac_check(odp_packet_t pkt, if (param->override_iv_ptr) iv_ptr = param->override_iv_ptr; - else if (session->p.iv.data) + else if (session->p.cipher_iv.data) iv_ptr = session->cipher.iv_data; else return ODP_CRYPTO_ALG_ERR_IV_INVALID; @@ -691,7 +692,7 @@ odp_crypto_alg_err_t aes_gmac_check(odp_packet_t pkt, EVP_DecryptInit_ex(ctx, session->auth.evp_cipher, NULL, session->auth.key, NULL); EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_SET_IVLEN, - session->p.iv.length, NULL); + session->p.cipher_iv.length, NULL); EVP_DecryptInit_ex(ctx, NULL, NULL, NULL, iv_ptr); EVP_CIPHER_CTX_set_padding(ctx, 0); @@ -902,16 +903,16 @@ odp_crypto_session_create(odp_crypto_session_param_t *param, /* Copy parameters */ session->p = *param; - if (session->p.iv.length > EVP_MAX_IV_LENGTH) { + if (session->p.cipher_iv.length > EVP_MAX_IV_LENGTH) { ODP_DBG("Maximum IV length exceeded\n"); *status = ODP_CRYPTO_SES_CREATE_ERR_INV_CIPHER; goto err; } /* Copy IV data */ - if (session->p.iv.data) - memcpy(session->cipher.iv_data, session->p.iv.data, - session->p.iv.length); + if (session->p.cipher_iv.data) + memcpy(session->cipher.iv_data, session->p.cipher_iv.data, + session->p.cipher_iv.length); /* Derive order */ if (ODP_CRYPTO_OP_ENCODE == param->op) diff --git a/platform/linux-generic/odp_ipsec_sad.c b/platform/linux-generic/odp_ipsec_sad.c index 845a73de..11227a5f 100644 --- a/platform/linux-generic/odp_ipsec_sad.c +++ b/platform/linux-generic/odp_ipsec_sad.c @@ -351,13 +351,13 @@ odp_ipsec_sa_t odp_ipsec_sa_create(const odp_ipsec_sa_param_t *param) crypto_param.auth_alg = param->crypto.auth_alg; crypto_param.auth_key = param->crypto.auth_key; - crypto_param.iv.length = + crypto_param.cipher_iv.length = _odp_ipsec_cipher_iv_len(crypto_param.cipher_alg); crypto_param.auth_digest_len = _odp_ipsec_auth_digest_len(crypto_param.auth_alg); - if ((uint32_t)-1 == crypto_param.iv.length || + if ((uint32_t)-1 == crypto_param.cipher_iv.length || (uint32_t)-1 == crypto_param.auth_digest_len) goto error; @@ -409,7 +409,7 @@ odp_ipsec_sa_t odp_ipsec_sa_create(const odp_ipsec_sa_param_t *param) ipsec_sa->use_counter_iv = 1; ipsec_sa->esp_iv_len = 8; ipsec_sa->esp_block_len = 16; - crypto_param.iv.length = 12; + crypto_param.cipher_iv.length = 12; break; default: break; diff --git a/test/performance/odp_crypto.c b/test/performance/odp_crypto.c index 0cbc2754..21d91688 100644 --- a/test/performance/odp_crypto.c +++ b/test/performance/odp_crypto.c @@ -187,7 +187,7 @@ static crypto_alg_config_t algs_config[] = { .data = test_key24, .length = sizeof(test_key24) }, - .iv = { + .cipher_iv = { .data = test_iv, .length = 8, }, @@ -202,7 +202,7 @@ static crypto_alg_config_t algs_config[] = { .data = test_key24, .length = sizeof(test_key24) }, - .iv = { + .cipher_iv = { .data = test_iv, .length = 8, }, diff --git a/test/validation/api/crypto/odp_crypto_test_inp.c b/test/validation/api/crypto/odp_crypto_test_inp.c index c7076d30..d795baaf 100644 --- a/test/validation/api/crypto/odp_crypto_test_inp.c +++ b/test/validation/api/crypto/odp_crypto_test_inp.c @@ -317,9 +317,9 @@ static void alg_test(odp_crypto_op_t op, .data = ref->auth_key, .length = ref->auth_key_length }; - odp_crypto_iv_t iv = { - .data = ovr_iv ? NULL : ref->iv, - .length = ref->iv_length + odp_crypto_iv_t cipher_iv = { + .data = ovr_iv ? NULL : ref->cipher_iv, + .length = ref->cipher_iv_length }; int num, i; int found; @@ -388,7 +388,7 @@ static void alg_test(odp_crypto_op_t op, /* Search for the test case */ for (i = 0; i < num; i++) { if (cipher_capa[i].key_len == cipher_key.length && - cipher_capa[i].iv_len == iv.length) { + cipher_capa[i].iv_len == cipher_iv.length) { found = 1; break; } @@ -397,7 +397,7 @@ static void alg_test(odp_crypto_op_t op, if (!found) { printf("\n Unsupported: alg=%s, key_len=%" PRIu32 ", " "iv_len=%" PRIu32 "\n", cipher_alg_name(cipher_alg), - cipher_key.length, iv.length); + cipher_key.length, cipher_iv.length); return; } @@ -438,7 +438,7 @@ static void alg_test(odp_crypto_op_t op, ses_params.compl_queue = suite_context.queue; ses_params.output_pool = suite_context.pool; ses_params.cipher_key = cipher_key; - ses_params.iv = iv; + ses_params.cipher_iv = cipher_iv; ses_params.auth_key = auth_key; ses_params.auth_digest_len = ref->digest_length; ses_params.auth_aad_len = ref->aad_length; @@ -488,17 +488,17 @@ static void alg_test(odp_crypto_op_t op, if (!suite_context.packet) rc = alg_op(pkt, &ok, session, - ovr_iv ? ref->iv : NULL, + ovr_iv ? ref->cipher_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, + ovr_iv ? ref->cipher_iv : NULL, &cipher_range, &auth_range, ref->aad, ref->length); else rc = alg_packet_op(pkt, &ok, session, - ovr_iv ? ref->iv : NULL, + ovr_iv ? ref->cipher_iv : NULL, &cipher_range, &auth_range, ref->aad, ref->length); if (rc < 0) diff --git a/test/validation/api/crypto/test_vectors.h b/test/validation/api/crypto/test_vectors.h index f2ce9eb2..6673ba4b 100644 --- a/test/validation/api/crypto/test_vectors.h +++ b/test/validation/api/crypto/test_vectors.h @@ -14,8 +14,8 @@ typedef struct crypto_test_reference_s { uint8_t cipher_key[MAX_KEY_LEN]; uint32_t auth_key_length; uint8_t auth_key[MAX_KEY_LEN]; - uint32_t iv_length; - uint8_t iv[MAX_IV_LEN]; + uint32_t cipher_iv_length; + uint8_t cipher_iv[MAX_IV_LEN]; uint32_t length; uint8_t plaintext[MAX_DATA_LEN]; uint8_t ciphertext[MAX_DATA_LEN]; @@ -49,8 +49,8 @@ static crypto_test_reference_t tdes_cbc_reference[] = { .cipher_key = { 0x62, 0x7f, 0x46, 0x0e, 0x08, 0x10, 0x4a, 0x10, 0x43, 0xcd, 0x26, 0x5d, 0x58, 0x40, 0xea, 0xf1, 0x31, 0x3e, 0xdf, 0x97, 0xdf, 0x2a, 0x8a, 0x8c}, - .iv_length = TDES_CBC_IV_LEN, - .iv = { 0x8e, 0x29, 0xf7, 0x5e, 0xa7, 0x7e, 0x54, 0x75 }, + .cipher_iv_length = TDES_CBC_IV_LEN, + .cipher_iv = { 0x8e, 0x29, 0xf7, 0x5e, 0xa7, 0x7e, 0x54, 0x75 }, .length = 8, .plaintext = { 0x32, 0x6a, 0x49, 0x4c, 0xd3, 0x3f, 0xe7, 0x56 }, .ciphertext = { 0xb2, 0x2b, 0x8d, 0x66, 0xde, 0x97, 0x06, 0x92 } @@ -60,8 +60,8 @@ static crypto_test_reference_t tdes_cbc_reference[] = { .cipher_key = { 0x37, 0xae, 0x5e, 0xbf, 0x46, 0xdf, 0xf2, 0xdc, 0x07, 0x54, 0xb9, 0x4f, 0x31, 0xcb, 0xb3, 0x85, 0x5e, 0x7f, 0xd3, 0x6d, 0xc8, 0x70, 0xbf, 0xae}, - .iv_length = TDES_CBC_IV_LEN, - .iv = {0x3d, 0x1d, 0xe3, 0xcc, 0x13, 0x2e, 0x3b, 0x65 }, + .cipher_iv_length = TDES_CBC_IV_LEN, + .cipher_iv = {0x3d, 0x1d, 0xe3, 0xcc, 0x13, 0x2e, 0x3b, 0x65 }, .length = 16, .plaintext = { 0x84, 0x40, 0x1f, 0x78, 0xfe, 0x6c, 0x10, 0x87, 0x6d, 0x8e, 0xa2, 0x30, 0x94, 0xea, 0x53, 0x09 }, @@ -75,9 +75,9 @@ static crypto_test_reference_t aes_cbc_reference[] = { .cipher_key_length = AES128_CBC_KEY_LEN, .cipher_key = { 0x06, 0xa9, 0x21, 0x40, 0x36, 0xb8, 0xa1, 0x5b, 0x51, 0x2e, 0x03, 0xd5, 0x34, 0x12, 0x00, 0x06}, - .iv_length = AES_CBC_IV_LEN, - .iv = { 0x3d, 0xaf, 0xba, 0x42, 0x9d, 0x9e, 0xb4, 0x30, - 0xb4, 0x22, 0xda, 0x80, 0x2c, 0x9f, 0xac, 0x41 }, + .cipher_iv_length = AES_CBC_IV_LEN, + .cipher_iv = { 0x3d, 0xaf, 0xba, 0x42, 0x9d, 0x9e, 0xb4, 0x30, + 0xb4, 0x22, 0xda, 0x80, 0x2c, 0x9f, 0xac, 0x41 }, .length = 16, .plaintext = "Single block msg", .ciphertext = { 0xe3, 0x53, 0x77, 0x9c, 0x10, 0x79, 0xae, 0xb8, @@ -87,9 +87,9 @@ static crypto_test_reference_t aes_cbc_reference[] = { .cipher_key_length = AES128_CBC_KEY_LEN, .cipher_key = { 0xc2, 0x86, 0x69, 0x6d, 0x88, 0x7c, 0x9a, 0xa0, 0x61, 0x1b, 0xbb, 0x3e, 0x20, 0x25, 0xa4, 0x5a}, - .iv_length = AES_CBC_IV_LEN, - .iv = { 0x56, 0x2e, 0x17, 0x99, 0x6d, 0x09, 0x3d, 0x28, - 0xdd, 0xb3, 0xba, 0x69, 0x5a, 0x2e, 0x6f, 0x58 }, + .cipher_iv_length = AES_CBC_IV_LEN, + .cipher_iv = { 0x56, 0x2e, 0x17, 0x99, 0x6d, 0x09, 0x3d, 0x28, + 0xdd, 0xb3, 0xba, 0x69, 0x5a, 0x2e, 0x6f, 0x58 }, .length = 32, .plaintext = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, @@ -104,9 +104,9 @@ static crypto_test_reference_t aes_cbc_reference[] = { .cipher_key_length = AES128_CBC_KEY_LEN, .cipher_key = { 0x6c, 0x3e, 0xa0, 0x47, 0x76, 0x30, 0xce, 0x21, 0xa2, 0xce, 0x33, 0x4a, 0xa7, 0x46, 0xc2, 0xcd}, - .iv_length = AES_CBC_IV_LEN, - .iv = { 0xc7, 0x82, 0xdc, 0x4c, 0x09, 0x8c, 0x66, 0xcb, - 0xd9, 0xcd, 0x27, 0xd8, 0x25, 0x68, 0x2c, 0x81 }, + .cipher_iv_length = AES_CBC_IV_LEN, + .cipher_iv = { 0xc7, 0x82, 0xdc, 0x4c, 0x09, 0x8c, 0x66, 0xcb, + 0xd9, 0xcd, 0x27, 0xd8, 0x25, 0x68, 0x2c, 0x81 }, .length = 48, .plaintext = "This is a 48-byte message (exactly 3 AES blocks)", .ciphertext = { 0xd0, 0xa0, 0x2b, 0x38, 0x36, 0x45, 0x17, 0x53, @@ -120,9 +120,9 @@ static crypto_test_reference_t aes_cbc_reference[] = { .cipher_key_length = AES128_CBC_KEY_LEN, .cipher_key = { 0x56, 0xe4, 0x7a, 0x38, 0xc5, 0x59, 0x89, 0x74, 0xbc, 0x46, 0x90, 0x3d, 0xba, 0x29, 0x03, 0x49}, - .iv_length = AES_CBC_IV_LEN, - .iv = { 0x8c, 0xe8, 0x2e, 0xef, 0xbe, 0xa0, 0xda, 0x3c, - 0x44, 0x69, 0x9e, 0xd7, 0xdb, 0x51, 0xb7, 0xd9 }, + .cipher_iv_length = AES_CBC_IV_LEN, + .cipher_iv = { 0x8c, 0xe8, 0x2e, 0xef, 0xbe, 0xa0, 0xda, 0x3c, + 0x44, 0x69, 0x9e, 0xd7, 0xdb, 0x51, 0xb7, 0xd9 }, .length = 64, .plaintext = { 0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, @@ -146,9 +146,9 @@ static crypto_test_reference_t aes_cbc_reference[] = { .cipher_key = { 0xfe, 0xff, 0xe9, 0x92, 0x86, 0x65, 0x73, 0x1c, 0x6d, 0x6a, 0x8f, 0x94, 0x67, 0x30, 0x83, 0x08, 0xfe, 0xff, 0xe9, 0x92, 0x86, 0x65, 0x73, 0x1c}, - .iv_length = AES_CBC_IV_LEN, - .iv = { 0xca, 0xfe, 0xba, 0xbe, 0xfa, 0xce, 0xdb, 0xad, - 0xde, 0xca, 0xf8, 0x88, 0x01, 0x23, 0x45, 0x67 }, + .cipher_iv_length = AES_CBC_IV_LEN, + .cipher_iv = { 0xca, 0xfe, 0xba, 0xbe, 0xfa, 0xce, 0xdb, 0xad, + 0xde, 0xca, 0xf8, 0x88, 0x01, 0x23, 0x45, 0x67 }, .length = 32, .plaintext = { 0x45, 0x00, 0x00, 0x28, 0xa4, 0xad, 0x40, 0x00, 0x40, 0x06, 0x78, 0x80, 0x0a, 0x01, 0x03, 0x8f, @@ -165,9 +165,9 @@ static crypto_test_reference_t aes_cbc_reference[] = { 0x34, 0x45, 0x56, 0x67, 0x78, 0x89, 0x9a, 0xab, 0xab, 0xbc, 0xcd, 0xde, 0xf0, 0x01, 0x12, 0x23, 0x34, 0x45, 0x56, 0x67, 0x78, 0x89, 0x9a, 0xab}, - .iv_length = AES_CBC_IV_LEN, - .iv = { 0x11, 0x22, 0x33, 0x44, 0x01, 0x02, 0x03, 0x04, - 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c }, + .cipher_iv_length = AES_CBC_IV_LEN, + .cipher_iv = { 0x11, 0x22, 0x33, 0x44, 0x01, 0x02, 0x03, 0x04, + 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c }, .length = 48, .plaintext = { 0x45, 0x00, 0x00, 0x30, 0x69, 0xa6, 0x40, 0x00, 0x80, 0x06, 0x26, 0x90, 0xc0, 0xa8, 0x01, 0x02, @@ -189,9 +189,9 @@ static crypto_test_reference_t aes_ctr_reference[] = { .cipher_key_length = AES128_CTR_KEY_LEN, .cipher_key = { 0x2b, 0x7e, 0x15, 0x16, 0x28, 0xae, 0xd2, 0xa6, 0xab, 0xf7, 0x15, 0x88, 0x09, 0xcf, 0x4f, 0x3c}, - .iv_length = AES_CTR_IV_LEN, - .iv = { 0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, - 0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff }, + .cipher_iv_length = AES_CTR_IV_LEN, + .cipher_iv = { 0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, + 0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff }, .length = 64, .plaintext = { 0x6b, 0xc1, 0xbe, 0xe2, 0x2e, 0x40, 0x9f, 0x96, 0xe9, 0x3d, 0x7e, 0x11, 0x73, 0x93, 0x17, 0x2a, @@ -215,9 +215,9 @@ static crypto_test_reference_t aes_ctr_reference[] = { .cipher_key = { 0x8e, 0x73, 0xb0, 0xf7, 0xda, 0x0e, 0x64, 0x52, 0xc8, 0x10, 0xf3, 0x2b, 0x80, 0x90, 0x79, 0xe5, 0x62, 0xf8, 0xea, 0xd2, 0x52, 0x2c, 0x6b, 0x7b}, - .iv_length = AES_CTR_IV_LEN, - .iv = { 0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, - 0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff }, + .cipher_iv_length = AES_CTR_IV_LEN, + .cipher_iv = { 0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, + 0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff }, .length = 64, .plaintext = { 0x6b, 0xc1, 0xbe, 0xe2, 0x2e, 0x40, 0x9f, 0x96, 0xe9, 0x3d, 0x7e, 0x11, 0x73, 0x93, 0x17, 0x2a, @@ -242,9 +242,9 @@ static crypto_test_reference_t aes_ctr_reference[] = { 0x2b, 0x73, 0xae, 0xf0, 0x85, 0x7d, 0x77, 0x81, 0x1f, 0x35, 0x2c, 0x07, 0x3b, 0x61, 0x08, 0xd7, 0x2d, 0x98, 0x10, 0xa3, 0x09, 0x14, 0xdf, 0xf4}, - .iv_length = AES_CTR_IV_LEN, - .iv = { 0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, - 0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff }, + .cipher_iv_length = AES_CTR_IV_LEN, + .cipher_iv = { 0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, + 0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff }, .length = 64, .plaintext = { 0x6b, 0xc1, 0xbe, 0xe2, 0x2e, 0x40, 0x9f, 0x96, 0xe9, 0x3d, 0x7e, 0x11, 0x73, 0x93, 0x17, 0x2a, @@ -273,9 +273,9 @@ static crypto_test_reference_t aes_gcm_reference[] = { .cipher_key_length = AES128_GCM_KEY_LEN, .cipher_key = { 0x4c, 0x80, 0xcd, 0xef, 0xbb, 0x5d, 0x10, 0xda, 0x90, 0x6a, 0xc7, 0x3c, 0x36, 0x13, 0xa6, 0x34}, - .iv_length = AES_GCM_IV_LEN, - .iv = { 0x2e, 0x44, 0x3b, 0x68, 0x49, 0x56, 0xed, 0x7e, - 0x3b, 0x24, 0x4c, 0xfe }, + .cipher_iv_length = AES_GCM_IV_LEN, + .cipher_iv = { 0x2e, 0x44, 0x3b, 0x68, 0x49, 0x56, 0xed, 0x7e, + 0x3b, 0x24, 0x4c, 0xfe }, .length = 72, .plaintext = { 0x45, 0x00, 0x00, 0x48, 0x69, 0x9a, 0x00, 0x00, 0x80, 0x11, 0x4d, 0xb7, 0xc0, 0xa8, 0x01, 0x02, @@ -306,9 +306,9 @@ static crypto_test_reference_t aes_gcm_reference[] = { .cipher_key_length = AES128_GCM_KEY_LEN, .cipher_key = { 0xfe, 0xff, 0xe9, 0x92, 0x86, 0x65, 0x73, 0x1c, 0x6d, 0x6a, 0x8f, 0x94, 0x67, 0x30, 0x83, 0x08}, - .iv_length = AES_GCM_IV_LEN, - .iv = { 0xca, 0xfe, 0xba, 0xbe, 0xfa, 0xce, 0xdb, 0xad, - 0xde, 0xca, 0xf8, 0x88 }, + .cipher_iv_length = AES_GCM_IV_LEN, + .cipher_iv = { 0xca, 0xfe, 0xba, 0xbe, 0xfa, 0xce, 0xdb, 0xad, + 0xde, 0xca, 0xf8, 0x88 }, .length = 64, .plaintext = { 0x45, 0x00, 0x00, 0x3e, 0x69, 0x8f, 0x00, 0x00, 0x80, 0x11, 0x4d, 0xcc, 0xc0, 0xa8, 0x01, 0x02, @@ -336,9 +336,9 @@ static crypto_test_reference_t aes_gcm_reference[] = { .cipher_key_length = AES128_GCM_KEY_LEN, .cipher_key = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, - .iv_length = AES_GCM_IV_LEN, - .iv = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00 }, + .cipher_iv_length = AES_GCM_IV_LEN, + .cipher_iv = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00 }, .length = 64, .plaintext = { 0x45, 0x00, 0x00, 0x3c, 0x99, 0xc5, 0x00, 0x00, 0x80, 0x01, 0xcb, 0x7a, 0x40, 0x67, 0x93, 0x18, @@ -366,9 +366,9 @@ static crypto_test_reference_t aes_gcm_reference[] = { .cipher_key_length = AES128_GCM_KEY_LEN, .cipher_key = { 0x3d, 0xe0, 0x98, 0x74, 0xb3, 0x88, 0xe6, 0x49, 0x19, 0x88, 0xd0, 0xc3, 0x60, 0x7e, 0xae, 0x1f}, - .iv_length = AES_GCM_IV_LEN, - .iv = { 0x57, 0x69, 0x0e, 0x43, 0x4e, 0x28, 0x00, 0x00, - 0xa2, 0xfc, 0xa1, 0xa3 }, + .cipher_iv_length = AES_GCM_IV_LEN, + .cipher_iv = { 0x57, 0x69, 0x0e, 0x43, 0x4e, 0x28, 0x00, 0x00, + 0xa2, 0xfc, 0xa1, 0xa3 }, .length = 28, .plaintext = { 0x45, 0x00, 0x00, 0x1c, 0x42, 0xa2, 0x00, 0x00, 0x80, 0x01, 0x44, 0x1f, 0x40, 0x67, 0x93, 0xb6, @@ -390,9 +390,9 @@ static crypto_test_reference_t aes_gcm_reference[] = { .cipher_key = { 0xfe, 0xff, 0xe9, 0x92, 0x86, 0x65, 0x73, 0x1c, 0x6d, 0x6a, 0x8f, 0x94, 0x67, 0x30, 0x83, 0x08, 0xfe, 0xff, 0xe9, 0x92, 0x86, 0x65, 0x73, 0x1c}, - .iv_length = AES_GCM_IV_LEN, - .iv = { 0xca, 0xfe, 0xba, 0xbe, 0xfa, 0xce, 0xdb, 0xad, - 0xde, 0xca, 0xf8, 0x88 }, + .cipher_iv_length = AES_GCM_IV_LEN, + .cipher_iv = { 0xca, 0xfe, 0xba, 0xbe, 0xfa, 0xce, 0xdb, 0xad, + 0xde, 0xca, 0xf8, 0x88 }, .length = 40, .plaintext = { 0x45, 0x00, 0x00, 0x28, 0xa4, 0xad, 0x40, 0x00, 0x40, 0x06, 0x78, 0x80, 0x0a, 0x01, 0x03, 0x8f, @@ -416,9 +416,9 @@ static crypto_test_reference_t aes_gcm_reference[] = { 0x34, 0x45, 0x56, 0x67, 0x78, 0x89, 0x9a, 0xab, 0xab, 0xbc, 0xcd, 0xde, 0xf0, 0x01, 0x12, 0x23, 0x34, 0x45, 0x56, 0x67, 0x78, 0x89, 0x9a, 0xab}, - .iv_length = AES_GCM_IV_LEN, - .iv = { 0x11, 0x22, 0x33, 0x44, 0x01, 0x02, 0x03, 0x04, 0x05, - 0x06, 0x07, 0x08 }, + .cipher_iv_length = AES_GCM_IV_LEN, + .cipher_iv = { 0x11, 0x22, 0x33, 0x44, 0x01, 0x02, 0x03, 0x04, + 0x05, 0x06, 0x07, 0x08 }, .length = 52, .plaintext = { 0x45, 0x00, 0x00, 0x30, 0x69, 0xa6, 0x40, 0x00, 0x80, 0x06, 0x26, 0x90, 0xc0, 0xa8, 0x01, 0x02, @@ -447,9 +447,9 @@ static crypto_test_reference_t aes_gmac_reference[] = { .auth_key_length = AES128_GCM_KEY_LEN, .auth_key = { 0x4c, 0x80, 0xcd, 0xef, 0xbb, 0x5d, 0x10, 0xda, 0x90, 0x6a, 0xc7, 0x3c, 0x36, 0x13, 0xa6, 0x34}, - .iv_length = AES_GCM_IV_LEN, - .iv = { 0x22, 0x43, 0x3c, 0x64, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00 }, + .cipher_iv_length = AES_GCM_IV_LEN, + .cipher_iv = { 0x22, 0x43, 0x3c, 0x64, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00 }, .length = 68, .plaintext = { 0x00, 0x00, 0x43, 0x21, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, commit 1f1e24e6c2b66bdebeb9c640cc184537631a809d Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Thu Dec 14 12:26:21 2017 +0300 linux-gen: crypto: move session type to odp_crypto module There is no point in having odp_crypto_generic_session_t definition in global include file. Move it to odp_crypto module. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 7e40448b..e25970b0 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -138,7 +138,6 @@ noinst_HEADERS = \ include/odp_classification_inlines.h \ include/odp_classification_internal.h \ include/odp_config_internal.h \ - include/odp_crypto_internal.h \ include/odp_debug_internal.h \ include/odp_errno_define.h \ include/odp_forward_typedefs_internal.h \ diff --git a/platform/linux-generic/include/odp_crypto_internal.h b/platform/linux-generic/include/odp_crypto_internal.h deleted file mode 100644 index 32178d9d..00000000 --- a/platform/linux-generic/include/odp_crypto_internal.h +++ /dev/null @@ -1,73 +0,0 @@ -/* Copyright (c) 2014, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#ifndef ODP_CRYPTO_INTERNAL_H_ -#define ODP_CRYPTO_INTERNAL_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -#include <openssl/evp.h> - -#define MAX_IV_LEN 64 -#define OP_RESULT_MAGIC 0x91919191 - -/** Forward declaration of session structure */ -typedef struct odp_crypto_generic_session odp_crypto_generic_session_t; - -/** - * Algorithm handler function prototype - */ -typedef -odp_crypto_alg_err_t (*crypto_func_t)(odp_packet_t pkt, - const odp_crypto_packet_op_param_t *param, - odp_crypto_generic_session_t *session); - -/** - * Per crypto session data structure - */ -struct odp_crypto_generic_session { - struct odp_crypto_generic_session *next; - - /* Session creation parameters */ - odp_crypto_session_param_t p; - - odp_bool_t do_cipher_first; - - struct { - /* Copy of session IV data */ - uint8_t iv_data[MAX_IV_LEN]; - uint8_t key_data[EVP_MAX_KEY_LENGTH]; - - const EVP_CIPHER *evp_cipher; - crypto_func_t func; - } cipher; - - struct { - uint8_t key[EVP_MAX_KEY_LENGTH]; - uint32_t key_length; - union { - const EVP_MD *evp_md; - const EVP_CIPHER *evp_cipher; - }; - crypto_func_t func; - } auth; -}; - -/** - * Per session creation operation result - */ -typedef struct odp_crypto_generic_session_result { - odp_crypto_ses_create_err_t rc; - odp_crypto_session_t session; -} odp_crypto_generic_session_result_t; - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/platform/linux-generic/odp_crypto.c b/platform/linux-generic/odp_crypto.c index 2038aa46..3b110c19 100644 --- a/platform/linux-generic/odp_crypto.c +++ b/platform/linux-generic/odp_crypto.c @@ -15,7 +15,6 @@ #include <odp/api/debug.h> #include <odp/api/align.h> #include <odp/api/shared_memory.h> -#include <odp_crypto_internal.h> #include <odp_debug_internal.h> #include <odp/api/hints.h> #include <odp/api/random.h> @@ -89,6 +88,49 @@ static const odp_crypto_auth_capability_t auth_capa_aes_gcm[] = { static const odp_crypto_auth_capability_t auth_capa_aes_gmac[] = { {.digest_len = 16, .key_len = 16, .aad_len = {.min = 0, .max = 0, .inc = 0} } }; +/** Forward declaration of session structure */ +typedef struct odp_crypto_generic_session_t odp_crypto_generic_session_t; + +/** + * Algorithm handler function prototype + */ +typedef +odp_crypto_alg_err_t (*crypto_func_t)(odp_packet_t pkt, + const odp_crypto_packet_op_param_t *param, + odp_crypto_generic_session_t *session); + +/** + * Per crypto session data structure + */ +struct odp_crypto_generic_session_t { + odp_crypto_generic_session_t *next; + + /* Session creation parameters */ + odp_crypto_session_param_t p; + + odp_bool_t do_cipher_first; + + struct { + /* Copy of session IV data */ + uint8_t iv_data[EVP_MAX_IV_LENGTH]; + uint8_t key_data[EVP_MAX_KEY_LENGTH]; + + const EVP_CIPHER *evp_cipher; + crypto_func_t func; + } cipher; + + struct { + uint8_t key[EVP_MAX_KEY_LENGTH]; + uint32_t key_length; + uint32_t bytes; + union { + const EVP_MD *evp_md; + const EVP_CIPHER *evp_cipher; + }; + crypto_func_t func; + } auth; +}; + typedef struct odp_crypto_global_s odp_crypto_global_t; struct odp_crypto_global_s { @@ -860,7 +902,7 @@ odp_crypto_session_create(odp_crypto_session_param_t *param, /* Copy parameters */ session->p = *param; - if (session->p.iv.length > MAX_IV_LEN) { + if (session->p.iv.length > EVP_MAX_IV_LENGTH) { ODP_DBG("Maximum IV length exceeded\n"); *status = ODP_CRYPTO_SES_CREATE_ERR_INV_CIPHER; goto err; commit d6cc12b26f644d8add4567bcd1ade6fd738e1562 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue Dec 26 01:52:23 2017 +0300 validation: crypto: stop declaring test functions as public There is no use to declare test functions as public, they are defined and used in the same file. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/crypto/crypto.h b/test/validation/api/crypto/crypto.h index 078a1909..7c248d9e 100644 --- a/test/validation/api/crypto/crypto.h +++ b/test/validation/api/crypto/crypto.h @@ -9,36 +9,6 @@ #include "odp_cunit_common.h" -/* test functions: */ -void crypto_test_enc_alg_null(void); -void crypto_test_dec_alg_null(void); -void crypto_test_enc_alg_3des_cbc(void); -void crypto_test_enc_alg_3des_cbc_ovr_iv(void); -void crypto_test_dec_alg_3des_cbc(void); -void crypto_test_dec_alg_3des_cbc_ovr_iv(void); -void crypto_test_enc_alg_aes_cbc(void); -void crypto_test_enc_alg_aes_cbc_ovr_iv(void); -void crypto_test_dec_alg_aes_cbc(void); -void crypto_test_dec_alg_aes_cbc_ovr_iv(void); -void crypto_test_enc_alg_aes_ctr(void); -void crypto_test_enc_alg_aes_ctr_ovr_iv(void); -void crypto_test_dec_alg_aes_ctr(void); -void crypto_test_dec_alg_aes_ctr_ovr_iv(void); -void crypto_test_enc_alg_aes_gcm(void); -void crypto_test_enc_alg_aes_gcm_ovr_iv(void); -void crypto_test_dec_alg_aes_gcm(void); -void crypto_test_dec_alg_aes_gcm_ovr_iv(void); -void crypto_test_gen_alg_hmac_md5(void); -void crypto_test_check_alg_hmac_md5(void); -void crypto_test_gen_alg_hmac_sha1(void); -void crypto_test_check_alg_hmac_sha1(void); -void crypto_test_gen_alg_hmac_sha256(void); -void crypto_test_check_alg_hmac_sha256(void); -void crypto_test_gen_alg_hmac_sha512(void); -void crypto_test_check_alg_hmac_sha512(void); -void crypto_test_gen_alg_aes_gmac(void); -void crypto_test_check_alg_aes_gmac(void); - /* test arrays: */ extern odp_testinfo_t crypto_suite[]; diff --git a/test/validation/api/crypto/odp_crypto_test_inp.c b/test/validation/api/crypto/odp_crypto_test_inp.c index 821bdc7e..c7076d30 100644 --- a/test/validation/api/crypto/odp_crypto_test_inp.c +++ b/test/validation/api/crypto/odp_crypto_test_inp.c @@ -631,7 +631,7 @@ static int check_alg_null(void) return check_alg_support(ODP_CIPHER_ALG_NULL, ODP_AUTH_ALG_NULL); } -void crypto_test_enc_alg_null(void) +static void crypto_test_enc_alg_null(void) { unsigned int test_vec_num = (sizeof(null_reference) / sizeof(null_reference[0])); @@ -645,7 +645,7 @@ void crypto_test_enc_alg_null(void) false); } -void crypto_test_dec_alg_null(void) +static void crypto_test_dec_alg_null(void) { unsigned int test_vec_num = (sizeof(null_reference) / sizeof(null_reference[0])); @@ -668,7 +668,7 @@ static int check_alg_3des_cbc(void) * operation for 3DES_CBC algorithm. IV for the operation is the session IV. * In addition the test verifies if the implementation can use the * packet buffer as completion event buffer.*/ -void crypto_test_enc_alg_3des_cbc(void) +static void crypto_test_enc_alg_3des_cbc(void) { unsigned int test_vec_num = (sizeof(tdes_cbc_reference) / sizeof(tdes_cbc_reference[0])); @@ -685,7 +685,7 @@ void crypto_test_enc_alg_3des_cbc(void) /* This test verifies the correctness of encode (plaintext -> ciphertext) * operation for 3DES_CBC algorithm. IV for the operation is the operation IV. * */ -void crypto_test_enc_alg_3des_cbc_ovr_iv(void) +static void crypto_test_enc_alg_3des_cbc_ovr_iv(void) { unsigned int test_vec_num = (sizeof(tdes_cbc_reference) / sizeof(tdes_cbc_reference[0])); @@ -704,7 +704,7 @@ void crypto_test_enc_alg_3des_cbc_ovr_iv(void) * In addition the test verifies if the implementation can use the * packet buffer as completion event buffer. * */ -void crypto_test_dec_alg_3des_cbc(void) +static void crypto_test_dec_alg_3des_cbc(void) { unsigned int test_vec_num = (sizeof(tdes_cbc_reference) / sizeof(tdes_cbc_reference[0])); @@ -723,7 +723,7 @@ void crypto_test_dec_alg_3des_cbc(void) * In addition the test verifies if the implementation can use the * packet buffer as completion event buffer. * */ -void crypto_test_dec_alg_3des_cbc_ovr_iv(void) +static void crypto_test_dec_alg_3des_cbc_ovr_iv(void) { unsigned int test_vec_num = (sizeof(tdes_cbc_reference) / sizeof(tdes_cbc_reference[0])); @@ -746,7 +746,7 @@ static int check_alg_aes_gcm(void) * operation for AES128_GCM algorithm. IV for the operation is the session IV. * In addition the test verifies if the implementation can use the * packet buffer as completion event buffer.*/ -void crypto_test_enc_alg_aes_gcm(void) +static void crypto_test_enc_alg_aes_gcm(void) { unsigned int test_vec_num = (sizeof(aes_gcm_reference) / sizeof(aes_gcm_reference[0])); @@ -765,7 +765,7 @@ void crypto_test_enc_alg_aes_gcm(void) * operation for AES128_GCM algorithm. IV for the operation is the session IV. * In addition the test verifies if the implementation can use the * packet buffer as completion event buffer.*/ -void crypto_test_enc_alg_aes_gcm_ovr_iv(void) +static void crypto_test_enc_alg_aes_gcm_ovr_iv(void) { unsigned int test_vec_num = (sizeof(aes_gcm_reference) / sizeof(aes_gcm_reference[0])); @@ -785,7 +785,7 @@ void crypto_test_enc_alg_aes_gcm_ovr_iv(void) * In addition the test verifies if the implementation can use the * packet buffer as completion event buffer. * */ -void crypto_test_dec_alg_aes_gcm(void) +static void crypto_test_dec_alg_aes_gcm(void) { unsigned int test_vec_num = (sizeof(aes_gcm_reference) / sizeof(aes_gcm_reference[0])); @@ -805,7 +805,7 @@ void crypto_test_dec_alg_aes_gcm(void) * In addition the test verifies if the implementation can use the * packet buffer as completion event buffer. * */ -void crypto_test_dec_alg_aes_gcm_ovr_iv(void) +static void crypto_test_dec_alg_aes_gcm_ovr_iv(void) { unsigned int test_vec_num = (sizeof(aes_gcm_reference) / sizeof(aes_gcm_reference[0])); @@ -829,7 +829,7 @@ static int check_alg_aes_cbc(void) * operation for AES128_CBC algorithm. IV for the operation is the session IV. * In addition the test verifies if the implementation can use the * packet buffer as completion event buffer.*/ -void crypto_test_enc_alg_aes_cbc(void) +static void crypto_test_enc_alg_aes_cbc(void) { unsigned int test_vec_num = (sizeof(aes_cbc_reference) / sizeof(aes_cbc_reference[0])); @@ -847,7 +847,7 @@ void crypto_test_enc_alg_aes_cbc(void) /* This test verifies the correctness of encode (plaintext -> ciphertext) * operation for AES128_CBC algorithm. IV for the operation is the operation IV. * */ -void crypto_test_enc_alg_aes_cbc_ovr_iv(void) +static void crypto_test_enc_alg_aes_cbc_ovr_iv(void) { unsigned int test_vec_num = (sizeof(aes_cbc_reference) / sizeof(aes_cbc_reference[0])); @@ -867,7 +867,7 @@ void crypto_test_enc_alg_aes_cbc_ovr_iv(void) * In addition the test verifies if the implementation can use the * packet buffer as completion event buffer. * */ -void crypto_test_dec_alg_aes_cbc(void) +static void crypto_test_dec_alg_aes_cbc(void) { unsigned int test_vec_num = (sizeof(aes_cbc_reference) / sizeof(aes_cbc_reference[0])); @@ -887,7 +887,7 @@ void crypto_test_dec_alg_aes_cbc(void) * In addition the test verifies if the implementation can use the * packet buffer as completion event buffer. * */ -void crypto_test_dec_alg_aes_cbc_ovr_iv(void) +static void crypto_test_dec_alg_aes_cbc_ovr_iv(void) { unsigned int test_vec_num = (sizeof(aes_cbc_reference) / sizeof(aes_cbc_reference[0])); @@ -911,7 +911,7 @@ static int check_alg_aes_ctr(void) * operation for AES128_CTR algorithm. IV for the operation is the session IV. * In addition the test verifies if the implementation can use the * packet buffer as completion event buffer.*/ -void crypto_test_enc_alg_aes_ctr(void) +static void crypto_test_enc_alg_aes_ctr(void) { unsigned int test_vec_num = (sizeof(aes_ctr_reference) / sizeof(aes_ctr_reference[0])); @@ -929,7 +929,7 @@ void crypto_test_enc_alg_aes_ctr(void) /* This test verifies the correctness of encode (plaintext -> ciphertext) * operation for AES128_CTR algorithm. IV for the operation is the operation IV. * */ -void crypto_test_enc_alg_aes_ctr_ovr_iv(void) +static void crypto_test_enc_alg_aes_ctr_ovr_iv(void) { unsigned int test_vec_num = (sizeof(aes_ctr_reference) / sizeof(aes_ctr_reference[0])); @@ -949,7 +949,7 @@ void crypto_test_enc_alg_aes_ctr_ovr_iv(void) * In addition the test verifies if the implementation can use the * packet buffer as completion event buffer. * */ -void crypto_test_dec_alg_aes_ctr(void) +static void crypto_test_dec_alg_aes_ctr(void) { unsigned int test_vec_num = (sizeof(aes_ctr_reference) / sizeof(aes_ctr_reference[0])); @@ -969,7 +969,7 @@ void crypto_test_dec_alg_aes_ctr(void) * In addition the test verifies if the implementation can use the * packet buffer as completion event buffer. * */ -void crypto_test_dec_alg_aes_ctr_ovr_iv(void) +static void crypto_test_dec_alg_aes_ctr_ovr_iv(void) { unsigned int test_vec_num = (sizeof(aes_ctr_reference) / sizeof(aes_ctr_reference[0])); @@ -996,7 +996,7 @@ static int check_alg_hmac_md5(void) * In addition the test verifies if the implementation can use the * packet buffer as completion event buffer. * */ -void crypto_test_gen_alg_hmac_md5(void) +static void crypto_test_gen_alg_hmac_md5(void) { unsigned int test_vec_num = (sizeof(hmac_md5_reference) / sizeof(hmac_md5_reference[0])); @@ -1010,7 +1010,7 @@ void crypto_test_gen_alg_hmac_md5(void) false); } -void crypto_test_check_alg_hmac_md5(void) +static void crypto_test_check_alg_hmac_md5(void) { unsigned int test_vec_num = (sizeof(hmac_md5_reference) / sizeof(hmac_md5_reference[0])); @@ -1036,7 +1036,7 @@ static int check_alg_hmac_sha1(void) * In addition the test verifies if the implementation can use the * packet buffer as completion event buffer. * */ -void crypto_test_gen_alg_hmac_sha1(void) +static void crypto_test_gen_alg_hmac_sha1(void) { unsigned int test_vec_num = (sizeof(hmac_sha1_reference) / sizeof(hmac_sha1_reference[0])); @@ -1050,7 +1050,7 @@ void crypto_test_gen_alg_hmac_sha1(void) false); } -void crypto_test_check_alg_hmac_sha1(void) +static void crypto_test_check_alg_hmac_sha1(void) { unsigned int test_vec_num = (sizeof(hmac_sha1_reference) / sizeof(hmac_sha1_reference[0])); @@ -1076,7 +1076,7 @@ static int check_alg_hmac_sha256(void) * In addition the test verifies if the implementation can use the * packet buffer as completion event buffer. * */ -void crypto_test_gen_alg_hmac_sha256(void) +static void crypto_test_gen_alg_hmac_sha256(void) { unsigned int test_vec_num = (sizeof(hmac_sha256_reference) / sizeof(hmac_sha256_reference[0])); @@ -1090,7 +1090,7 @@ void crypto_test_gen_alg_hmac_sha256(void) false); } -void crypto_test_check_alg_hmac_sha256(void) +static void crypto_test_check_alg_hmac_sha256(void) { unsigned int test_vec_num = (sizeof(hmac_sha256_reference) / sizeof(hmac_sha256_reference[0])); @@ -1116,7 +1116,7 @@ static int check_alg_hmac_sha512(void) * In addition the test verifies if the implementation can use the * packet buffer as completion event buffer. * */ -void crypto_test_gen_alg_hmac_sha512(void) +static void crypto_test_gen_alg_hmac_sha512(void) { unsigned int test_vec_num = (sizeof(hmac_sha512_reference) / sizeof(hmac_sha512_reference[0])); @@ -1130,7 +1130,7 @@ void crypto_test_gen_alg_hmac_sha512(void) false); } -void crypto_test_check_alg_hmac_sha512(void) +static void crypto_test_check_alg_hmac_sha512(void) { unsigned int test_vec_num = (sizeof(hmac_sha512_reference) / sizeof(hmac_sha512_reference[0])); @@ -1149,7 +1149,7 @@ static int check_alg_aes_gmac(void) return check_alg_support(ODP_CIPHER_ALG_NULL, ODP_AUTH_ALG_AES_GMAC); } -void crypto_test_gen_alg_aes_gmac(void) +static void crypto_test_gen_alg_aes_gmac(void) { unsigned int test_vec_num = (sizeof(aes_gmac_reference) / sizeof(aes_gmac_reference[0])); @@ -1163,7 +1163,7 @@ void crypto_test_gen_alg_aes_gmac(void) false); } -void crypto_test_check_alg_aes_gmac(void) +static void crypto_test_check_alg_aes_gmac(void) { unsigned int test_vec_num = (sizeof(aes_gmac_reference) / sizeof(aes_gmac_reference[0])); ----------------------------------------------------------------------- Summary of changes: example/ipsec/odp_ipsec.c | 2 +- example/ipsec/odp_ipsec_cache.c | 14 +- include/odp/api/spec/crypto.h | 38 +++++- platform/linux-generic/Makefile.am | 1 - .../linux-generic/include/odp_crypto_internal.h | 73 ---------- platform/linux-generic/odp_crypto.c | 126 +++++++++++++----- platform/linux-generic/odp_ipsec.c | 10 +- platform/linux-generic/odp_ipsec_sad.c | 6 +- test/performance/odp_crypto.c | 4 +- test/validation/api/crypto/crypto.h | 30 ----- test/validation/api/crypto/odp_crypto_test_inp.c | 147 ++++++++++++++------- test/validation/api/crypto/test_vectors.h | 110 +++++++-------- 12 files changed, 297 insertions(+), 264 deletions(-) delete mode 100644 platform/linux-generic/include/odp_crypto_internal.h hooks/post-receive --

7 years, 5 months

[COMMIT] branch api-next updated. v1.17.0.0_tigermoth_rc1-8-g634b380b

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 discards 6303c7d0e98fafe0f14c8c4dd9989b3b7633ebf4 (commit) discards 5b1ec6a624c8ea4b4645ace62ba11fc6701aa5b3 (commit) discards 68735b312926a44ddf42f9ecf96a0badd941a247 (commit) discards a7b46491ca049998dc38b0a5b29213a407931523 (commit) discards bea7fcae31d525e7f1e991f301c807cf86095aef (commit) discards 7a88e1e111d09b5b4bcdc211cbc4ab7f9c94ccfe (commit) discards dcdd06fbaffce7be63fc5f43bbe7792e3e1234fb (commit) discards a5f07dbf95f982b7c5898434e56164ff976c0a0f (commit) discards 578ecf796dc0bf7bb230b3488d263dd455ed0a18 (commit) discards 6ca5f5cb57de9f71ace37118a9b0788b2abf529e (commit) discards fa4e7f2672f5854e35544b10ce17c8d13f96fd71 (commit) discards 18b4ac5ead1d428ebea0f8f9590951159f138b4c (commit) discards 8f528c3624b449e9b93604e293bee029b077b521 (commit) discards eb8be4f5a77b45fe279c1412231c5bc7de32a166 (commit) discards b15b01036bd985d6218f9f756d108712c8d84fed (commit) discards 85b2f8e1f52929dec7f5d8933c8cb4b9373b6754 (commit) discards ba4559f569397e401ea41e67661d9fd0052b33ba (commit) discards d3d70123198484f659f1aebc6e34a4da89e10b29 (commit) discards 1adc8ef5dbcfde127c1b52df84152c187519b27e (commit) discards 177eeff39e19289e771119cfdffc515cb16f9db5 (commit) discards 49665e54259bc04b1ba0f9bc0456714d98ab13c6 (commit) discards 1f82edd05f4e83ac3a6d6a3a3cd0ec914d5ad359 (commit) discards c38fc105f0e9a88dd4ebb4d9e7ac9e1160466322 (commit) discards f2a1a84b43642f3d0911a351d9308d5501693290 (commit) discards 233d0aa078f6c70a10c84e1bc1365b18c39a7ae9 (commit) discards b1c287aa71c7559ee0cd1b1f3eef971491cf1c04 (commit) discards 9e35c84dea1b66bae27a35dfc71018a0bb455950 (commit) discards 54a0bc673c5fa6f1f579821faab8390556a6d424 (commit) discards 567764ef01021210b8aa587df90ac1477715ec5c (commit) discards 38487572609049023e51c88adbe1b2e77d62d996 (commit) discards 9e0a675bacbbc497065e66e467a0ed75b1296a16 (commit) discards 12fd3a9224a856271934986a1bad981843915d68 (commit) discards 0588040068a50d0d15a641d091fce23214b15594 (commit) discards 82f09d83ab85401f4d8d81c7c843c9b4c9f888f4 (commit) discards 8a3c2a83b81c6f5b9f697681c970593c95141828 (commit) discards 2269d302cdb9356255c9e0e004b170f016ec0e5e (commit) discards cffa4354cf0eb389e3ebb0108c71d4b1620463b7 (commit) discards 27c53bc0cd34582b772dff0b104385e8869caf07 (commit) discards 81ab0809af1b12eb5d65ed1ed6ddddfb0dfce833 (commit) discards 511178e589b1865d93ed0eb3cb0e33e3b18f8027 (commit) discards 73f047f65c214f7dd81c93e9cb54b00576650217 (commit) discards 0d6b4b8b03370a79c5f090a521f89186a821f350 (commit) discards 30762920eaed9ecb1d2e5d68f05c90b349e1b472 (commit) discards 661fa940d2d6c2897f96d22bffdf2c71d6fee2de (commit) discards 11815a8c8efc1c614d334430e24b0d9ebc913f87 (commit) discards 3842b5fa56f460b3c571dc0b5154fa2fa8291c5a (commit) discards b60b7080c27f72a197af8312a531d6c89772aaea (commit) discards 1a92f9cf847bc00d923076c1c0d32240b3e3dc5b (commit) discards da9d347e0bbe337ea86448306432080206f3ef49 (commit) discards d533d85ad15ea431a431c407dad468e38ae87ec0 (commit) discards fa7ce5da4b669e55b8d34c7d90b67070879ba5da (commit) discards d96a8207591fbcaac25b79286d7d72a537354c1f (commit) discards 21ed0fc8045e32e3263f5782401dbfe860152965 (commit) discards 87d47c93d93ed934af9502937d2aceaec59d229a (commit) discards bcbbe7e92c5a9510735a541d06342cc4923e5bbd (commit) discards 99a2871375955861c46a271162e86a4ac13a2d8b (commit) discards fe7221162f62b820b053a8b12fa2b11005769693 (commit) discards 4612aa0de04cea3b7dc1b74678a9b25d2bc832b0 (commit) discards 76997bb4087981751966df0fa1d0897486a3da1d (commit) discards 65d690fbcf03c6a4d5eb3f01bde36807833feaaa (commit) discards 8e2b2acb39e27ff172461b425abf2fef6413f522 (commit) discards d43523f0e0175ade19a7d944ef7fbd98247f5d7a (commit) discards 428099c6200e764bd50581b65084e1e4cbe07dce (commit) discards d187988a5f1c16efc67e2bc70730bd3735683742 (commit) discards f2092a68171e9cdd83ce9f055b81cba4f9b5899d (commit) discards 58a6affec5db9c2e21d21ad5513d45e4b9e07c63 (commit) discards cc727d927fe007c1fb85d97bd3225fbb4a044166 (commit) discards 0405287898a99821691928e4fd1f9afe91681c3a (commit) discards bb77b93e77c75a4a7507543ff0d38d32fe8b51ed (commit) discards b8c85795ffd6fc98813b4882ba671866d19762ba (commit) discards 015674f10e67c319e6299fe99332787c491d59c2 (commit) discards 0c7769e1e8e7893f3631d7c8b8297f87b718d27d (commit) discards 87ec9465899591ddc2125740d19a395d4b8b9608 (commit) discards 411629a3e9efb8e44f5d0c6337c565720418d653 (commit) discards 072b0d72318cfb5b847300404a2bd2130e5130c1 (commit) discards ced550922123b8fd8151d98490a78766a0bcf847 (commit) discards 630d8422564ebf4991b468cb38a29e9483fc2ec2 (commit) discards ec42b01dc4f9992d0efef95d7f55399bba115f90 (commit) discards 1b9cf6bc48e3ce6ef889e84cff400974a6ec2ed2 (commit) discards bf6d0c8164f4f53192405a238262f1135b637679 (commit) discards 5158e0deb21aa90d1e032f75e703c9fa8e0b95c0 (commit) discards ab18a721760b8a4b61c0feec8fa6724ef2990a86 (commit) discards 0980001e33b4190133d478a0aa2e718fd1e3c164 (commit) discards 297df8bbdd88a2104c6dd0f6c2e506eb5140dd1c (commit) discards 32bd7464a8d86b0d83daf1760202dbdc5eabccec (commit) discards cf7d38c194f1a9183a524790511de8bfd74a36a9 (commit) discards c3f33dfa9ad624a7450b3f03bd06af7f92b69d8b (commit) discards 94530b3d56086e446fe056098fa37da048efd1b6 (commit) discards a65377ad173426db06b023764703f158e88565e2 (commit) discards ea8e4fff42411c5534ba7fbeeefd8fec4c1ac8be (commit) discards 52b07a3ffadeb7f653b1a3a1a129402e3becd027 (commit) discards 1e41d8bb45ccc1d7f5b7340742d8c9f85eb9660c (commit) discards 7c027d493295ba07fd27697827300e4c8e15475d (commit) discards bdb7cbf620ada8682c89b5ae5a97cb84f16c0ed0 (commit) discards e4b4bab2247e7724fb4b5983e54fd62676f1d206 (commit) discards 22441cdcb569d5c6147db5d67e62fde67a3daad5 (commit) discards 2ae5d875aab20e728c231361af95e1c57336daa5 (commit) discards c370d7950524a968bbc148644f7c5fc619c78600 (commit) discards 28a3b9e30fb4e8784a8781e06e28d3f175e05749 (commit) discards ad990bbf88d95b2a4f9583b7fda718bf5d7d4212 (commit) discards d6be400839611af3ca47baa85e8fed12d0c87e29 (commit) discards d2a70019d5fb5443f80a4896dd30b710d3988e8e (commit) discards 2526489e826f49dede472782621c0e0ba8976745 (commit) discards 8ff99a64d79b6e3e350037575b9d5bc9adeca267 (commit) discards 4cb02e1caccb9179575e95448fd46979e17d0905 (commit) discards 90f2fe4ce26e7a2b66bb5eb13e372ccf3dec0d1c (commit) discards b95e7d08043ba45d12635c5afaa3fbf3a07ecc90 (commit) discards a8caa46fbe095a8308538539907e5af664fafea8 (commit) discards a72a1e82ad31d5555c644508d5f35c590b3c4073 (commit) discards 94cea0ca54d4a10f5e46c76d6047422274294aec (commit) discards 2e93b540f69eae505b4505ada1912ac0d2bdea31 (commit) discards a2c78489c30722a5d0b14e994f713e4a393a0801 (commit) discards be13cd9dfdc276d039cbd5658ec1b0166397ac0c (commit) discards 84cf048f83fb15fbfae66bca824220635ddc0339 (commit) discards 89159170e2e4fc90f6f2c8b0d7f017a3a650623d (commit) discards d4b364849c4abb4c71e0c5260e1a793ebb8dc97d (commit) discards 4ddb329e3ed4401c9e5ebd42a2e54af28a1c4df6 (commit) discards 0d50939e19104a179af57de555c35d209e5d7ae6 (commit) discards f052591a39aa7c08d4868face4e6be17696ee946 (commit) discards b8ca2afddff13fb79dabc9b04748dde24afb53e5 (commit) discards b571aebe37d22c2ec1642b51a05aedcb73f83247 (commit) discards 34b945c77b9d88ce3b984d2703e9a69883b565c9 (commit) discards c4c795f20e7b726b820481a1130847a30f55aab8 (commit) discards 871e5ba93165c5f46a339989018549fffc483299 (commit) discards 12a572044af7311bc900ec8819b6221aca6f90a4 (commit) discards a975690536d3e78bd7d6aa8a27a22f58a0c7d4ea (commit) discards 718b5ce6e5871dafab4e198f0429bd2047a0eee7 (commit) discards a3c129506c5a08c50af4722148c698ad6b575011 (commit) discards ba93e355ddf151215aa18b59cbfca08fe175fe65 (commit) discards c5ff08b1496abd9a5fcbb1944f49e54a4e9bbabe (commit) discards be65d81a9342e322b70376adab69270c5c9bb9e2 (commit) discards 71b8cfcecb99c8416200f1f54ab5d6dab004a69a (commit) discards dae20519a6825217dbe27842f1a24b1401410836 (commit) discards 5a5a8148fcd174cffd3e9140bed3259ac1af2d9f (commit) discards c54180d65bc9b86200f46b4f0ac540f74b884ee8 (commit) discards 7c665557d21db3ba7c4dd3d3845e7175a4a2acb6 (commit) discards 774f242c72008eecf5b07b341b76f577445fb4fb (commit) discards a4165611e5aa58b138946e17a079f8a7f065d08c (commit) discards fee9e59ca4a53ac30fea62d6b2f4b22a53042fe1 (commit) discards ad863d29c6e46487ed1ef3fad0766037faac919f (commit) discards 44f8d1421361c3238fed85a1a3d5ebff8f39cc88 (commit) discards 412235594802aa4e4b3f63efc464de18955265c5 (commit) discards 11620182599921c91e2d4f764b0ef921c171523b (commit) discards 043db6742a8dfc218409aba0e456365163b8b249 (commit) discards 16568d747ba2eb4a91962641e19b5da1d7a6091c (commit) discards cf17398302b4114b17d92d41de4dd4fe7d72a16a (commit) discards 26a556e03e07e62e4bcdf3dec6c76ebb02aa5efd (commit) discards 12403213da9cd4600f4e3b61a10e2369219061f0 (commit) discards 5cbb3749e3478d9ed22423399c2339b7fa39442f (commit) discards a908a4dead95321e84d6a8a23de060051dcd8969 (commit) discards 157234c02e26c66581b9a661ab3bbb62439c906d (commit) discards ab19e58de943b3324e96a2ef92e4aa533b1be165 (commit) discards 9ff682c8d0315f3f1921d5b9fe13d62897c78710 (commit) discards 1ae234f54c17374997a89e5858f9e0d7855f8cf0 (commit) discards 58bc37399f6bdb2426bf2eb6ba4eee6791a9c8a4 (commit) discards 9b3a29ddb261d2b030a7806933787aaaee497aab (commit) discards a57dc0bce7aab4600548096dd358e88ca2f4fe1c (commit) discards a1312ccf383637b5711c0f8c4bab6f43e63325dc (commit) discards 4da1cb6040dece2ece108cd383ab4212e7f7fe85 (commit) discards f6d3bc302664e2c4121e798e86758d93fdb156f5 (commit) discards 6333b39f1bd5ebe184780260566b84340104efeb (commit) discards 78ced32df325dac7ff58ff28684fdb941f5ec1b3 (commit) discards fbb6a7feba146acb1495fbdcd93e1b691a7363a0 (commit) discards 23b6eee83bc5717f4797441bddbb035e3388ff10 (commit) discards 0ec5bc6b5c3a178d7b316bdf9e18db452ba5ed58 (commit) discards 9c389e1785fd000203eb2198f9fc2778be8f83e6 (commit) discards 3d254a24a1a911aad72f0535412644824872307f (commit) discards fd192cba9c4e1f36a1bf3819f35f5e684ca80b1e (commit) discards 43cff7996bcdd6264bf6066a8be9424b2e12ca21 (commit) discards d22c949cc466bf28de559855a1cb525740578137 (commit) discards 637353bbd96770741cbb58711c78c9dc01e4ea34 (commit) discards ebdf6e27af66a58fff6a17a1c6c2cd6ae85909f1 (commit) discards cc97d3ae6d6d4c07ec77e7b33e2529154fb0ed24 (commit) discards 94cb17b703f1efba6a89207b893d9f4ef5297d8d (commit) discards c04eff910a7b18f47365f90fadb6133474e9cae5 (commit) discards 201a96f9bbcbabd904362ba05a179c72689a578e (commit) discards d61d32590d1772b70b8dcd0d0ec44d29029d7443 (commit) discards 66b363634fe1bba003cdb9e4e49a5980fc8c79f4 (commit) discards 63d92eb289261d1534b5b9e1e04291faa5e45d30 (commit) discards 825f75ed8644ef57c5648961e7982daf13cd9375 (commit) discards 18977d0684ef7a26ddd6777ca341f7b1ca9e5c3e (commit) discards f4d54b8831df52878b66bb145124a9adb4beab28 (commit) discards e733d6ba6382ccbf9d6c84a6a10bf720c2e16c0d (commit) discards ec6510b33e8b96d6d6670efb9dc3c9101baed6c6 (commit) discards af4565caa0f9d171db466554ee631338b9844cbe (commit) discards afa7e20ab3b7a6e68a556f00b49aa19ea4a29be6 (commit) discards e3108af2f0b58c2ceca422b418439bba5de04b11 (commit) discards cd196cf12f957456b24c844b2c38be5062130cf1 (commit) discards dee4a7512c21a8b7f15a4a05e6736de373df92f0 (commit) discards f70ff3bc542961d52f9b0f867298014650c8e49e (commit) discards 700c0ac917fedf532e9a7e21c42624faa4b09a5f (commit) discards 20aba9a17664fb8d5261bece23a1c20f1a3465f7 (commit) discards ce4bd52afcef245b069acfe8dc53bd62aec576fd (commit) discards 01b5f7e0c0bcec5beb58c99573906b1a4ee8e5f0 (commit) discards 5e8f87ae22ca0c3e6137f91f15c967aec958a67e (commit) discards 9e10a562dfb67b7a37c67fecff3de00be798961a (commit) discards 86d651b86c10dd77603354110644ad346dfb3e26 (commit) discards bc3cad50ec6668064bae1af164875c93832caff8 (commit) discards 9c747985d4c448ef737376c5c8180b78ae1e7378 (commit) discards 698f370e71db55624e1bd78063569369f86db389 (commit) discards edca8cd1e55898826f79383b689c2c4bd2c28b3a (commit) discards afeda4d14bb6f449cb269680cdbd56b26726eedf (commit) discards 60a1a4f1cc531d7f0117cd79daf1cbe4206e12ef (commit) discards 2fb72324f0a247ffb800b54f112eb75716b42c22 (commit) discards 90c3fdd7124ad1ed887fa6b09b7665a39021e895 (commit) discards 9d65b4659d98c0c5c2b45c2733d7cc2ef3d13123 (commit) discards 39126ab23611e57d4015b376f1e7222489ca2c63 (commit) discards beff45d25a614e7b4c84fc734fc588f1c26bb8c4 (commit) discards d340de6d0a6002d7f145d278ccf18d4c9c9b233d (commit) discards e943f8213505508125e39bf228ba80dab1cb8378 (commit) discards a197b3ca3ae732cb8b9aa8237e3ffd5249ecb361 (commit) discards bf803098eb1518dfb9e719071256fe22700b8c72 (commit) discards a2e288f35da1f3838f0650157932a93091e6c3f4 (commit) discards 7ea3096a0b64b605fd14d654a6b1f644ea72ba3d (commit) discards 458683cb05ecdf60c38d2827e8f6241ab4afa8e4 (commit) discards 9695d43dc1afa2baf968c97f1afff11e381408aa (commit) discards d74515dcb08a8f15ffee5fca621bd8dc1742a9f5 (commit) discards 24bf1003e1fbf6ca4003c31a79dfe5ddc40e38d9 (commit) discards 506bf9dcf0e071cd8b168806b1d279124551af86 (commit) discards 41472f5887d172234aaa89af0775b9e32f2209e9 (commit) discards 8f63377237e1f783f77c2baf94922f07bcb24a55 (commit) discards 75cfc6f70d5b21d6f04082e1d03a7e677a895280 (commit) discards 50cb30d14d432257f0a80da45b71bce2ddacad8d (commit) discards e04e5f90df69e3031622b77fb5273b85d47eb966 (commit) discards a9f4c8dd372b1846390ceae6f3f7c8e7578ad743 (commit) discards 13322ca632f8ffba292bec058e597719bc54142d (commit) discards bfbe4f50a2e8a2532fdcb4d2c16d42a477183c07 (commit) discards 6e79d897e3d5010991bf6e6ebf207bfd988f1129 (commit) discards c6ab55e8bc2b797af290349b56c829e38839929b (commit) discards f2da0136e11df9372ada5f01efdc4cf176680dea (commit) discards e344e4364f771f32b86d822d0c447770588fe65d (commit) discards f3fa10fa00f5040f5ce2bfd18894227a7ef76c02 (commit) discards 4e6dbf3c8151335c2a5361da3f228666c688d8fa (commit) discards f172905f96be14da4760653cba92cd1f9c820374 (commit) discards 7018fa1c5e446ca8f60490c848a95b27e942783b (commit) discards f66f92352bb5d1ed3a19fe5b5b8ca0419e525274 (commit) discards e35949df96b46d2e23ca83029f468415efcbf18a (commit) discards d248692dfe6ace13138e48eb1c23c1f5e942269c (commit) discards 88efcd91e325438d7e2b7c410213ca95a9acefe5 (commit) discards f91cde2bb770eefcfe791ce49c67ce3b1f5bf6d2 (commit) discards 3e03317f3663abc76708141233b18d6225b2482b (commit) discards cc6d4562f16e134299e21ca3e545999c97549ad0 (commit) discards 80321bd9880b03929056483be9bc9d8861636b33 (commit) discards 8c5516bba62ee7250cbf64d1f4b89ee4f0b12824 (commit) discards 32f5f3ff343b516cb0dbe98e81479e6c748f0ebf (commit) discards 3c9248f5c98b194d91712fafed4bf3b21327f2a8 (commit) discards 6b6253c30f88c80bf632436ff06c1b000860a2f1 (commit) discards c0c20e6ed7d0f86dca02a276a7f991586fa7f33d (commit) discards 7fa8e2c97ed18f8dd6e95cbc78b7e668ccb98869 (commit) discards 53120868fba0d742961817683f01b1bee25f4e4c (commit) discards 8d21533c341c0624f693af554341dd389c358238 (commit) discards a3ca7d17f74e515f9ab4a738191a6a1da96463ab (commit) discards 60d79f29df4ace1eac5ee53fbc4ab153398d36fd (commit) discards 4eae04e80a634c17ac276bb06bce468cbe28cde0 (commit) discards 3b8515fbd81fe4017632e7e48754a5b99f684d2e (commit) discards 91c0b58fc87ba0431241818758cea94438cd5498 (commit) discards 4c8578a2105e37e645e3606622fd8c6e46b77443 (commit) discards 1bc3a176474ccb199caba9a05cbfaf713ed00707 (commit) discards d5bd5c2634af91c1088a1de931f7a72666e8993e (commit) discards b2270c5b1d2badb93dd7e6dc743191c04c562ad1 (commit) discards 0b2b26281c0d1d8d00d69f9829e32c9a99b7af0f (commit) discards 1bc1b6fed4c75b3bd9305d2c9e646efc50de5fb3 (commit) discards 1e1ee0b03cc481e027b1cb911cce1b16fb2fee9a (commit) discards 859293ad9b3c862264bb0fbfe8e7037b5e04d084 (commit) discards 307ebe505ceb2de6ea03c29f37de0d3a5db850ed (commit) discards 7b835f0e9eac18eba901e42f4054110bae9b78f5 (commit) discards 7bb364313bfeed59556e167bfa848e9ea6f52669 (commit) discards 0bc12ffcf7898515c74a5567b832dcfc913d831a (commit) discards 22ec8f3aefe9b2c92020cd9aa36e9f8e5a380799 (commit) discards 2119e4548281ed50fecc5fe9f5bddcaa2adee2de (commit) discards 3547226b19e6982bf74fc8c258b89db2c5f6a39c (commit) discards 762372f299b64c8c30c3f5a0ba51fbb48e234e1e (commit) discards e420668cd3886f003c8bd6022e210bf08a0ee3b5 (commit) discards 2394317ab247fa14b4e239aec512afee7eac4524 (commit) discards 09ce9406e09eacadf8f739ae8499323ad1401d36 (commit) discards a165ff4093f666e5481ae5113f70b41e3354520d (commit) discards 41abc837a5c25d8df3429398bcb51c72b83999e5 (commit) discards 8390f890d4bd2babb63a24f7b15d2f4763e44050 (commit) discards e02f89b3a981d5f87332cd9a3dfd6b532f92c3bc (commit) discards 8eeb3366d62c34665bcef2392b22b73489d70f88 (commit) discards 705062dc19a4ce5e6ae2224c21bc9e32dae64ebc (commit) discards b4cd6c50f9f0c2e1fa975b768253d4f4b35fad07 (commit) discards e65248393a0d7263a26e4e8e4f64ac12c7142c54 (commit) discards 999042e51837a7ed8c7fb616f75707349515fc3d (commit) discards aaceddaf56175ee207fcbf9c241a7839bdea091b (commit) discards 30ed14c05ac17406c2f7890b34c4ac580b5e7a45 (commit) discards c16f1363303cd5fc11324acbc4dfebe0a9680a41 (commit) discards fbdc9ca1e38e6c97014e68bf7b83e59096a170b7 (commit) discards 2e08ac6e40551704c43233b40a9227a19fd4623b (commit) discards 5386c44d204f0b42f2773cf87126ff8981bf3270 (commit) discards 56dbc8702500f7d7e518fcea4f3b1ff853722004 (commit) discards 70714a8c35381330647a3578d3b853af4ea4a045 (commit) discards 985db92075ffcdc48eb89954a90429e4cb9b4501 (commit) discards daa04baf2cc2fc562dbf4ee8eaeed00f9594e08a (commit) discards db7cc41aeb559dd296f3a6d8570aa10326a31d5e (commit) discards ae42f98c1a1c309c0718a3b5fc8589660de0f867 (commit) discards 7e71ca2883bbdeb4765e476fcfe3334e4fbfbd88 (commit) discards 333c585111723d2cb7dae0cf1517cc1f3453df4d (commit) discards bc36acc21368ff3f27d5b3836e8524747e0ab4c9 (commit) discards f49ce736d461c3e8c2534ed216e8a70e8bee954e (commit) discards d4b85d07214fb1f566b8ac346375cfe097c0bb51 (commit) discards 127c73198b07dfe413e8ce401bb26f3e5ff71e91 (commit) discards 2cd78610004d755dbe7a8e9c29086791793aea19 (commit) discards e58e1fc97f392f63a267c2252656367b12417152 (commit) discards a3ff4f6726582e41dd1398a6939a1877b9f25edc (commit) discards 4e3598f34f16aa9e50ac1aaae2b4074cd806e419 (commit) discards 697c4a58d57c286e679dd570722d8875ccf05a27 (commit) discards 6879ecd2d136508e59cf8d9b8f15c6475ba74c99 (commit) discards 698d82ce41a3f6ca08c6f218784d3eea6ac81e42 (commit) discards cd097450cbf9d7bb6cd24654f8d43ceade5b114a (commit) discards ee5be324411a7520528a367967c28fc529d3bc2e (commit) discards 533a2fe155aa16268bfe4091a3a056a78d5dbfc6 (commit) discards b4edd15ea49b38a0c1ed2bd021ee36aa296a79b0 (commit) discards 99b74cbb3c77902322933192ce68f8c1abe21e84 (commit) discards d0e3acc0cfdab0d4c66b49ea70207d8938569b80 (commit) discards c6e3edd5dc52764e4f1772341dc568a549d7eaa9 (commit) discards 26644862f90f4dc2f6ed99534d16f8b4d136de82 (commit) discards e777674f2d484e98e3329c3e22022fb4c6d86069 (commit) discards 0275cc02d5cdb54b955cfce1988f5ee158ad0423 (commit) discards d30dc0774647b3f635afea67e56147b8e6e3f24e (commit) discards bf5d48ee13aa4fb737ee430038d5f2b865f45d47 (commit) discards 1ba2bcd7b9ebfa1a5d8dda257c7b309d3553fa03 (commit) discards 8869e18f490d0ffc35e0359a92ef96eacbf5b0b7 (commit) discards 91c4f94f1ed01ed22b7cd489016016b0599f4065 (commit) discards 1cb0a8863eb8309c3e532a168fed34d6e3257218 (commit) discards faf97a341df8e92fd692029fe2c6c353f043950b (commit) discards c7718962c6633c80eb71a0400d89c31f11f88045 (commit) discards 79ce62cf3266b0d1b05acc68be382cd6271b7371 (commit) discards 39e4ebd39f2d171bbfef5bfee6596033b83c56a0 (commit) discards f9e7f458cf7151c75a9145272c62306b96f9ff27 (commit) discards b668182d6ea0cb942c2cf43771c618c9457bf146 (commit) discards eb564bfb6f813ec3f2fe8a8d4ce0da25220b4215 (commit) discards 8fea9ff7d8fde984981e681f49133dbda8429b7f (commit) discards 15c97427d01c81dc9f4d0aafe9b0a99cdb2d1fc6 (commit) discards 00a21c6dce65a30c8250db59a42a43c658e8ca1b (commit) discards 08463cdedd4ab64ea94dbf90c7417bf403bf7aaa (commit) discards 500cb603d5e1cb4926986242ad51d995b494c2e8 (commit) discards dd394c9d9a88161e157317fa8a6eba92cb6f2e01 (commit) discards 60ad22e8bd7624432e9504d32309c691fedcf27f (commit) discards 4a38c7c61a370007bea53f9bb36279ce3ba42233 (commit) discards e91a24138eec9054fc083174e3d071269dc1e4b6 (commit) discards 3687001250f4b50af8c2f9d9aa61d3ee99976a1e (commit) discards 7a5813042d58598e1c66243d8cfed548302edfc4 (commit) discards 759a54bf66317fee539f2b2649c283be937d832a (commit) discards 9fd48a9215a7831ca951839b7187bd1eb3f7bb06 (commit) discards bf554b2d9472ed8ed04580904d0aa906cdbe1e83 (commit) discards ac89f9c568830498b186dff33e908053dbdc88c7 (commit) discards 5b08cc290a4a84ed0ffbc4a591427f1891b9ace3 (commit) discards 5551c0d76bd721110a0fa4ba1423fe1edb0fd530 (commit) discards e2169ff2026af51eec351cd679891c303ab651e0 (commit) discards e3c2e06c4420f41d7053e615ac1cc6c1dc315407 (commit) discards f9dcbcc3f45fcd6d825c087fc55c631d6b30fa8c (commit) discards 845743bd80da73f2a296f24090dfe058d3be7dec (commit) discards bbd08a6c0c31c12275089c3134c9e7e58eb0fafa (commit) discards 0468dc01b3ae1517d57cf960b511ab066a9d5f05 (commit) discards 274a0b016d8c2eed9f065186ad5458c5edb94dad (commit) discards 0ce5d628d817003ca0f96beddece3f618f4593bb (commit) discards 65a46f66bfcb6b2034d4b0563facc36cbac1e286 (commit) discards 441fb964f22b2baaa97641e6f8dda88d32d153f6 (commit) discards d5ff31f14e87c815d3a0e0461206aa2687152dd5 (commit) discards 4bcd15e2bfb839ac0ef6419aa9e7b720958638f7 (commit) discards 58a8ec90b57eae43be6461d1ae407e70a87c65d2 (commit) discards ebbd8301f396e3f2f106ed94ce5c3970ec8bacce (commit) discards a5ef33a6f2575cd011cb05c3fb1b06d1c017f879 (commit) discards 361f0fa4addf83ae9b30d5e705e1f86643a45bab (commit) discards cb17e380f1231328cbaaf35635f6db9fb5b99bb8 (commit) discards 244fce69b25af28cbe5c19b11bfc3da5aa8da95d (commit) discards 974e4477a35742b8021e25692a458d16cd2087f1 (commit) discards 4f97e500a097928e308a415c32a88465adc5f5cc (commit) discards 2ea71a57ae4b6122e3e74782aeea2846a757cb14 (commit) discards 8b30e228ba2c303b3c69ffa4fbb9f138d2523d9a (commit) discards 57783b35f4383bdfdd146f2a3333bbc8bb995896 (commit) discards 904631219eab0af46cb99e8a56742401452ac2c3 (commit) discards f7bd3a7bbb3613260ef2bad1e3ede5145571dd6c (commit) discards d3602cb56413bb31b4535976dfd3dd723a16bfc9 (commit) discards 908e27635dfe08e249407f4c4e53aa2c7ce12ea1 (commit) discards d80e025c8baebed0305648737e528580b84fae2a (commit) discards 33a0dad444fab1c1567083b289eac7727eab3b31 (commit) discards ccb2cd5eb7383f46051dff2b1e7675ed54f635b2 (commit) discards d8e4647baa7b1159480dfde4d5a2143146e8c6cb (commit) discards 20cc38e36a52f70758c3464014f4f00a94d2139d (commit) discards 9bb2a439ae2a8751df5a6007a7e242d7bcb963e5 (commit) discards a6fa9f3e721dbdb99e2a0bac320f988930e5f874 (commit) discards b2261b9485e6993642c5c0c7ea58abb8a2d356a9 (commit) discards c969cc4e6f6e2e0cc5c4e407dd696be069cf4525 (commit) discards 3a1832865c90865de3fd8bd30103995637e7851c (commit) discards ab5a099937bc3d81f610fcfc2a98bfb7e677a06a (commit) discards 9f506fecfcd408a8af0df0e9627795d0b1059730 (commit) discards c184a9c8d35c10b30014e7538a862a7bc42556e7 (commit) discards 9ebcb7c6e2f3226c915c39c81dcd1895dda3639b (commit) discards 2f137b2bc9cb9c03a586d2cb324a6a5659098c39 (commit) discards 2f1a96d47bb2e6c413ed06749633dcfe33f02b97 (commit) discards 4cdaf5527dba63858080c0942ac1c971c615f066 (commit) discards 77dff4e05611bc5b06b4bfb5dd86da6d4c3fffa5 (commit) discards a9fc17e1bbef1c3585fd5de47e5023e4d66504f5 (commit) discards b67bfce457a7546bbae4dad16b5185629eda77e5 (commit) discards 552817483e9d4b6a84d49960920f1de50029f111 (commit) discards 2e36f75db71b230021cd907a5aadf39559683d16 (commit) discards f20dee9db3da9425d8764e414b04cdcbd41bece8 (commit) discards 3faf025987a1640983080a2743e58fbb3cbac55e (commit) discards 0a3e5be140e77167173b9af4b72cdad8451aff71 (commit) discards f15441382809525bea73554ccba9ca44d0337466 (commit) discards 826ee894aa0ebd09d42a17e1de077c46bc5b366a (commit) discards 191ee818e5951e8334ec54d40d5b02065ee33c5c (commit) discards f4c213cccc49b4b28557506ad19fba49b872d24f (commit) discards 900dd9e2d3d2ae751ab2bc4e11dbd48ea7ed7030 (commit) discards 15ba8d1e557073921f8fa2cf5eb1e7673052526f (commit) discards 1d01a8cb56618aa062740a2e9ad13898c7aa5a38 (commit) discards 3ea9c1dac34e0fb4785b0d643056c731daa55e85 (commit) discards 540490ddf3a1b3da4b80ed15fc874ccdfc49b60c (commit) discards 56fd0a5135769bee1b7b841e7b8d1e391fba377f (commit) discards 0707c974ed19c859fb92778c35a2f92bf7cd9fc6 (commit) discards 8e3a2c996b3bc212b82ddb779a1ea27ae5b13d83 (commit) discards a4a49d582128e0be434c3dbd99688708396396ad (commit) discards e4b3ebcfddacc605cca78fe123a985e478262d11 (commit) discards 467285f59991e0f28d22a50c99e56f07a4380b8d (commit) discards e0e038bab9fc2a9641e1eddd50d115ace2a66cef (commit) discards 4584e90f7b19a1f7456f46e61f818e73ff0c7377 (commit) discards 419cab0fcfccc7b702a7592dff98d108c24e49bf (commit) discards 8b29e0ad33bb176374f47ae0bc2388b0d8d2b926 (commit) discards 09a0e859caa4dbd68deb459e0160aed1ff8b5168 (commit) discards 617999503a54c52daf86abcaef12542e67c3d47a (commit) discards 54e52ac90cc564e83d9fd3d22e5fd0d084fec1c3 (commit) discards 4fd46d42fb7fb7867ef269fc491eae7a7b303630 (commit) discards b8c3fffa30ff5c07fe28bab562510157050ebeff (commit) discards 0b1dbf37b4030c6da4c6f13645c63fd4ac8ff923 (commit) discards 4702cbf3b3aaa62c7f5438526164a314c86e7d37 (commit) discards fce704f34f8af56d8c63b9e77c9a4f7a590655b4 (commit) discards 8df1b60560ac49b403bfb044c04595b831bc393b (commit) discards bac3806356694060d30bf3c83e4133410fecd9ab (commit) discards 9393c7ab63c79de0037e0b63443107c0f5462654 (commit) discards 758bec9d721e3cba97d1a8abbe252f4abbd1e2d9 (commit) discards 492973829259043135528e2313a8012412e09a3b (commit) discards 432ff281b9c9b534f413cdd78b8c616fff310878 (commit) discards 2da3adc6e475a336ddb81bf4bdb495f039dca9a9 (commit) discards c29707f5604dd365412fd6c39987c9956590447b (commit) discards f28f05a4df320c6a7ba8be858bdc3d8d6b91c0b2 (commit) discards cba5ed063304a619bd709a9f37400884dce90485 (commit) discards c4c5fbb7ab395443d53efed0741136d92ef13d7a (commit) discards d4419b080f46aa347637f04445f856e2badaabfa (commit) discards 58a963ccab214829a7526498b2b63349d4f5caef (commit) discards 6ce267197a66180042916368a469ed9dcc33eaa7 (commit) discards d025907602c5cae0f46b8b5219bf392bdba8dc21 (commit) discards dd36b4758d0cd9f9929a13d42ec2ac38ae972e37 (commit) discards f9a28807aaf8781c9b9576a04dce207f95fb8118 (commit) discards 186c93faeecb570db14da3d4ce3b192a25724de1 (commit) discards 984778d1562767ab963b9f8098836b87a83a07b0 (commit) discards 2dd92b8e9c95882a5137cbccfc20c1b3fc64cb73 (commit) discards 6ae7b56334f1795203355f3f4429d3f76bce15bf (commit) discards 38485719c028918b019c6a5fc67cf05053421c83 (commit) discards 5a770508ecf93cd026eed5091d6325688c3c375d (commit) discards f6486c42c9fd0c3e3853c7a69096372ecce2bd69 (commit) discards 49228f455b870bacb9dce9edc3e03ffe7e9be2bb (commit) discards cd0d6fc0adfbc7442c36053f61dc75b1ea15ef78 (commit) discards 912d68821ff365d29c1487287d6e1c44276f3380 (commit) discards 5f9dc6f33876b5c797a046164db8a919dc7b9751 (commit) discards ce1850c781e3a60d6a2afaf52eced67ebcaa95f4 (commit) discards e91cf8bb39da24d2a7dbfbb328aa35d1c4cab4ea (commit) discards acdefa627a82975d90fc3fe686f7e8b1b62434a3 (commit) discards 35e0f869ff3db3c0b2f2100541ba4897d8bef7b4 (commit) discards ff6c083358f97f7b5b261d8e75ca7a2eaaab5dea (commit) discards 834c4787fd48b2532266c9ba49c15edc64bdb8b6 (commit) discards 2138886d47cc41cf145ce9c085bd26439b1b2438 (commit) discards d4627e38c1750ef3a0f063c72bbc0e8c3f1775a8 (commit) discards 6111bd9ec71787f86375f333ace6c731b4d3f0d4 (commit) discards 2eb3e7aa8afebb137a5aac2be4166c3ccfa3e581 (commit) discards ba70a2a8ef150ac62f2850e0b47d4708f3730a79 (commit) discards 926505016132ba543251eb109d5c9c93f8520314 (commit) discards 037e35f0f948a87e3daede33747177615aa3bab0 (commit) discards 144a2cd89865b5565a6064c3b1db4987bd1b4e58 (commit) discards e554ba1a30e0bd7f6fe0c3ccd8c8846ef41ae9e4 (commit) discards 06eed47498a6697365cb3498975caf90a581179a (commit) discards effdb6228cd9c56a0f3af7f1ef3277cbf1971c23 (commit) discards 2e2d96234dd05c5a4dac03c31d1634bc9008da0a (commit) discards a820c285a87dfa274c6290638983575bb2e63ba4 (commit) discards 44ae9773bc94f8cd349034901f08a2eed46dc822 (commit) discards 82e5497c801ee3be6f49371c065b4eb43628048c (commit) discards 3f5d8c5b1f50efe8bf017b8a0014af668c664c43 (commit) discards f72f999552de02c602864baa82bb374322415b24 (commit) discards 56ee80a8482f1161a84b3e5145fab2e0f7653ccb (commit) discards abc36ae6747eb7729ea10ab4fa806939abca8c3e (commit) discards cc9544d7d0289f20bf52636b78ec59b22852816c (commit) discards fbab0b2bab55742ceface59778de8606e3bd062c (commit) discards a1bcdb71f9c5525e02a9609fb32b767f4f76b082 (commit) discards f21b2d23874d517e147a3e096e99aa272b99dbe4 (commit) discards 3ffa326e2dbdcfcc631c672bc5f443f4ca8fe911 (commit) discards 66bc236b2059f554c378b90d5291ca4a8aecf5b4 (commit) discards 22a659377f3b181e351428708708971c819582f7 (commit) discards 458bc7ddf290806f0a95c76da6f6d4f3c8a07737 (commit) discards 12229e66492f7947c180cf540aecd53096431bc8 (commit) discards 7378c0ddeb8c34a38d0021230a65bccfc21a6f1b (commit) discards 2961df923de0b3034c09a288b28394c1a2ea1a9d (commit) discards 9fbdbe9a6a86705339858a906ea66f076cc66785 (commit) discards 0b6dec84249c688b00c3044064ed6645aff696fb (commit) discards 530fa00fb2d341a0869af63fa9ab003dc526dc6f (commit) discards f8efe73e2991c480d76eb636be61ab90f1053591 (commit) discards 91d481e072a0283216979e1a88467fdeef5cca6b (commit) discards 0ae648ccc23a8d71086746656a10b68a7c5ebe80 (commit) discards 355f20a9f0eaa99359fa1bddcce8b192fef36ad5 (commit) discards a8cf3e576ab37b597a3d7e28130affc4988f2579 (commit) discards 1588c49a0bf0332512d5e08e1feaad5e4005df31 (commit) discards 9f88e0b17e7e814f2c15c3c9ee0103196864a7d5 (commit) discards 0abda2f57e088c9db6e48a265a417f47b1e4720c (commit) discards 9107db16944d821a1c959049acc1fe3ff29f2341 (commit) discards 567c2e8a0fd6b51db8b82ce926cc41d4c0e7898b (commit) discards 91f1ce71dc3d2694152d71690c1e7638716b9391 (commit) discards 00070be1d569bd575b100d52e5e263eb89ac962c (commit) discards 7c24a62ac2cf48e42306db70fcc9967ab7709a8d (commit) discards 746253e631e4926b3e2e383ae02c258c0cca583f (commit) discards c674957bf300963c33246c01c565a888888ec6a8 (commit) discards d00173ec9c344a7f0383848c0a778dd32eb96629 (commit) discards a30f753880f71d631e54ff5a020e312d7ab5dc3c (commit) discards 0bc071471f0466b6c821d561c5b4aadb7a548a36 (commit) discards bf65cf6e5d0385262e317c7931a68d61301cb042 (commit) discards 23e46735f93fa6dfc02b3fe78000b137f3c2d983 (commit) discards df97183dd71b214df6da679bbaf795a66bae4fdc (commit) discards b7da911ca3a7d3ed172f4e4010912ef920ddcf1f (commit) discards 9d65090ebcf45deb5677ffeb4aa2a26a96235dc5 (commit) discards 13debc384227f93fbad3118d9ab28f89c451d849 (commit) discards f405a3d63893f863afb6a503ecd992829cc36cb6 (commit) discards f71a2aa01d7be1bbe6abec4610ee3708bd9b65b5 (commit) discards c28c81745896d433262cc964d341f6e2d448c12f (commit) discards c10a2195b23c5ad230dad2ee252a96d1e418b5c7 (commit) discards c5f11369e83182f6c9df7b567806e25c3ee316a4 (commit) discards ef7c7ef43f3a5d8f84d5e78e7868da241a1b4bdb (commit) discards 22b3986fea090986625f3255d57b64de35bbc475 (commit) discards 31e7ccd795e3b61374566963fb1a8fa493cfed99 (commit) discards da32d187cee59c0cb0c5ddf4fb0b22d387e8d951 (commit) discards fdea056cbbf922f09591a5b6c8012f9363d64a5f (commit) discards b1c5e3268121cd5a47a4891160307a77d2f37658 (commit) discards aac8e11d594697717aca51597738a83eda248eed (commit) discards 086cf0a8ff813bbf5a0876a5d19dc2817607a06b (commit) discards ed3cfdeed1a99f024be2538aac31b71c8eddcf07 (commit) discards 29b05df013426838fe166084fed9f1d56c59ebed (commit) discards 54c15b2da776d8c71366a2f952998be23933d6de (commit) discards c237528646417ba4056118b9e95ca1f690489274 (commit) discards 82fe6add4af42dcbc44ffc14a7b693004791d03f (commit) discards 913d9b1a83ddd6a03daa181eeb6f62fd70f506e8 (commit) discards dcb3c06f4c894c7e6eca93a56233a4dc00493ea3 (commit) discards 1f5f12f6c7d3862f1c5c29b0773a1473c3f24b06 (commit) discards 0f329751b46ce9b0378c10bf8b0040cd010736c8 (commit) discards db0c6cd9dc0dd3821aaa1320faa24c12ec578c41 (commit) discards 894bc720a8a849a6bd9b41cf20d483f9da19793c (commit) discards 0b9981a71186cd065a7429cb8fd116e70b20fc23 (commit) discards 910f5cda1a83fcfcc8f14d491b2956dceea4e827 (commit) discards 3b20a21d0a45af4f78db993449052462590db22d (commit) discards f039391ec2778ff53886b1546deb9ab614521caa (commit) discards 2e9f8ccdd0b8f7cacd9e57b851e24541416f1c58 (commit) discards 1d869f0b49dd998066672d588c68057c9149bc04 (commit) discards 98dc3a0e18246252f6eec30de9bc5bf2664c50a8 (commit) discards b843386fb4f62585c637bc81e04c0b44fa907aab (commit) discards f6772a1c2c86c1982d68fc50480748751ac36e98 (commit) discards ea51e9f8dba20f06b56c3e293b5b1eebc01e3d71 (commit) discards 58a2fd9358675a54f2ed0f43ef3574a7b4a2c7dd (commit) discards 9fa4b3c5efa041351ba915ca35b3dfe252ecb34c (commit) discards 983712f43845f8fa7967039d2fd067f9a3ecba20 (commit) discards 7e0461544a5bb9052d84843c5043c68d34b17ba3 (commit) discards 6a45b47fdb150658936a8d2f301dc3309d55050d (commit) discards 9214e4aa94f59fb6c0a193ed7083bb90abba682b (commit) discards f5f8d1b315b050520c1743a29f48c6c9e9675487 (commit) discards 03ec3dcd7ed9d55b91d58d6969114e7de71b88fe (commit) discards 362035d60fda8a566636aa5ba58250a8fae9169b (commit) discards eba96af88d36a5cf132c15e0adafb19f92706510 (commit) discards c628e7cbed766a5467fb1ee1fc3113b42e738d08 (commit) discards f1a8dab157c3288d93287a8d6a49f50c84d10342 (commit) discards a05fb250afe4bf6c82d39f28239b08fb7e405b96 (commit) discards c52864e0956c3f57a059af8c90f7ff2b8fb10e6c (commit) discards 9f084f0c90509a354452ef75325c507224c7cd93 (commit) discards b6de862e041b500ade8a94917429f196173d5d90 (commit) discards 87b505031e709ac218eece691bb2e98b2987702a (commit) discards 8acf38df013c6d89e5a2dc3f84fb928e97d27752 (commit) discards dd23be24475a4b96a3f33ea91224fd0fe2c0f083 (commit) discards b5e957111c9cb23737b7ab2a7dfa1389c61c6311 (commit) discards 2048b8030ce1150214123038f275cff1ff8895c9 (commit) discards f759631fb9c373804caeaee27c5ad7de3405e55b (commit) discards f0d6c01a0fb51904d5dd049be8402531ec185dcc (commit) discards 10f2f857f6a38c89afff6bdfcc932e18e49ca9a2 (commit) discards d16d1783b8b01c5a7bbd256567fa226775a4ba93 (commit) discards d762feebade0ac71bbfbfeb31a9ed7c181ff1d91 (commit) discards 2796eef79f73c47e29c0d40d411a5547277836ee (commit) discards d235cfacc743bf0524fbc6c7f0f5810fa85ecd93 (commit) discards a70fa333ebb25a8331bd203440fbe81bf84946b1 (commit) discards b5781eeee0fa56710ea865e67f47ad9b3656b955 (commit) discards b8693f93ee8aa586af5f39111195506d9a826c8a (commit) discards ecf6f8e63c7da7ad020dd3179481d98b86e676f9 (commit) discards ef13af84fb6e8649679b06585bec9dead71cfbe5 (commit) discards bf4660cc53039e11f11c3bcf5f8c536a23844f52 (commit) discards beaf855847ba00fe180629b4fad1b93b59ca1f0f (commit) discards 32d6c59d28b39dbe1835f19f3ec0d422091ad5b0 (commit) discards 05c128e2550c2deaaab57f043c2bdac295aa0089 (commit) discards b31642f889d6d3b8a3d4ef7abb2efd46722df577 (commit) discards 1caad5bab2e9d74ab7001ee5efe5c3d15f9fda0d (commit) discards 9a4a9bfbbad489077ed35a20b564ef650417fb84 (commit) discards 7b5ba54f3d71ceaca21b988964df4cf8d29b1f02 (commit) discards fb432fef933e276b674a29a24d3ebb9e5c91abbc (commit) discards 02c58efd7bd80ca0d7656e867c0ea70d39e17169 (commit) discards a3013bbd8d534b856693873e46fa95cefa824756 (commit) discards f452a9e04b0da3e71f86d8bb02370b7f86ec0098 (commit) discards 3665147240b4df0b322629f47ca0cd10ed97082d (commit) discards 6794ac225910c56d93fa3cf464644b633ee35f32 (commit) discards 04537e7c3942664fe61fe9adaeb95b6afcb6e36c (commit) discards cc8303560e95a12790103364240e2581cf3213bb (commit) discards ac4ba826d777262b1f25944a4ceb840469ad0bd0 (commit) discards ab531245e61a6a3f4a36dbebba4bb42f2ee65ae9 (commit) discards e28f851c8b5ec257102e63eac0cfb59ad9b30bd5 (commit) discards d551362cbdb427daec14f065259826c2f51784f5 (commit) discards 7b369d43f432053d03077c1ad30f216d2148b009 (commit) discards 39dd766513a0c51ff8747c2a53a0e0ac0f53f434 (commit) discards 3e208bb64df7c2811bb4d04359c35eb7c0a51ddb (commit) discards 8cc2ea83ca6318421bfa67044f0dc39b1a510cda (commit) discards f4d83d4e5b86f655809f97d278f1f6b5bb488849 (commit) discards ce3f91503e397b70e8470b4b61c074756d541ef2 (commit) discards 7daaf31cb033e044f5b241bc00df7d708cbee53f (commit) discards dab3168796ed7809e717d40c12dabd9b24778168 (commit) discards c09d396bd393a6cbc09f668389b6c9e172a53f7f (commit) discards 8f0af9b08006290e35b117a02212b6881987adef (commit) discards 6301ce94a988b2dee431ebbd791cad49cf6772a2 (commit) discards 0e67e186489081513b1fa141461ff44fb74ac7f1 (commit) discards 48681b60b4ccc6fc39b6fd02baec82eefe300830 (commit) discards c8cf1d87783d4b4c628f219803b78731b8d4ade4 (commit) discards 0948333e6bee32cb3de7e872ebb852bbed06e094 (commit) discards 1220a970be53403d86cbdf0be97bad7d54cdc335 (commit) discards b2ce189680ee17d6019b199c0905cb3f608a71a5 (commit) discards c3ab55dc80882b8a1309fdc198abb1ac8f02437d (commit) discards 1ecf0ad51eac59ffb71352573aa99146da2c0649 (commit) discards 64c06865788ad5c58af3c3d42d857a7ceb9f6ab9 (commit) discards eb6efdf362305c0e3045e7fae78fe3558ed3df6f (commit) discards 65ac842c34f26abbed230c857d8d34d7d7635d36 (commit) discards 7b67dfa45578985d847fb76efca47143941e04cc (commit) discards 50ee20cbc2ddac792faee909ed304efde1ab8455 (commit) discards 37b125c76beef9a32b74fd3f1ea754561772efc1 (commit) discards 6dc0b0a60d08ffb3f9b13a2ae6a9a84242bcecf1 (commit) discards 192cbb2e987211e0706c315ef2349ddc5b263d3f (commit) discards 0cc926cea639f5a4538ec8f1f25437f995484e3b (commit) discards 28d95ca27265aeaf95f06bcc7b937263f96fd826 (commit) discards 6b806e0dc32f28e7c8a15ef4fbb3a3fa215bb0f3 (commit) discards cf6425f16f8ee554815f6697a231e398ddb0546c (commit) discards 6085237938d93c68710db69f70014eca2238492a (commit) discards 03626c586519818ef4de9a2f733ebfd46a0bf6be (commit) discards c070eda5f78f9209ef3c7a0fe6dfc0cff210894b (commit) discards 07bee0be1f22f8a136982935ee06313e5bbc6f3a (commit) discards 1594671cc63d7d1ac0192acb0a8496e7fec9f4a2 (commit) discards b08633c5740311374f509cef5245f19bd53e55f7 (commit) discards 6147511e8b2d8c5ae0a3fda161f346ba40203569 (commit) discards ab82e67f3ea25b392c90557dfc4cad43750c8d94 (commit) discards 6ec6cf6347efec4bf4268c6db37f287b9de35e30 (commit) discards 442b93274d8f24f31557fe678245f65a2c499f97 (commit) discards a4dd0bade1ca02eb91178834a159c9d26f140c38 (commit) discards 4871852cc509ca998802616fadfbb5619e3324da (commit) discards 48ae68961873bb818a75aa8aa1b93d697fe39517 (commit) discards 85c4f0bd3f18900e484b0e71670fc18c555e75b1 (commit) discards 57962f1b9c3a5a41a7dd6146f9666da18e62ec9c (commit) discards 9a45802c94f58d9dd443c10e6dc204a58fa0f9ce (commit) discards 0293146428ef9c6d8d2b24e0bdd6c781486904a5 (commit) discards a6d9960b81c1c5d4dff0c25b43ac5f9de7e36b8a (commit) discards 645e5ccf90c00c634c29fbb4276a8875699d8893 (commit) discards 8cc7373f536b86ca56a080f4a4bb67edd03bded3 (commit) discards 9fcbfb975cdc500bf18117c31f54d2c9f77079c4 (commit) discards a8d5848de4cd79122ebb2a831d465e05b77e52a3 (commit) discards e259ced4849018066194b49f723d2d6d2ec559b1 (commit) discards fa657759a41b23b4fd76c30b8f3ca27d709950d2 (commit) discards 179074e0d0771c82d064e29a20531b75d17289d7 (commit) discards 32e95a4ed19e5cd567d02125c4b74bb6e41ee197 (commit) discards b9995659aabf9a20cae2ae6905b84c94b733636c (commit) discards 65ea1213c75e323c4ff8ee2de48ce6dd84b1f7f2 (commit) discards becb0250ea30f65f3beb02f0094197704f450352 (commit) discards 90e456db5f983f3fff9126dd70f6fea907fed361 (commit) discards e45799924207308fcac2928a64e6ecc3ca102a8c (commit) discards a47f5fbb6ed8122a3453f5f5a3fabf53a98d7fdf (commit) discards 414c4c75b0beb8cd4e4d2abe090921bcf058ec69 (commit) discards 2c494b4a67123c838b4b6915679cca06f9e0bdd2 (commit) discards bbb10c23626657723466a42b94612b554858ce1d (commit) discards 5c4d38e42aa63c3d8b30b243f0b58f2cab04a466 (commit) discards ca7d1dd9372957732fc1dc95d0ffe36cf34c23ba (commit) discards 064cdece468e83bb72ef9ece63e8f0e05856eeb7 (commit) discards 8fede35ce4e41dc8a5de3164be40e2e630cd0812 (commit) discards 2151bf694d870493846e02f5d85fbda189008259 (commit) discards d5a6c1289da50b0923e5db7293d21fabb22ffeb3 (commit) discards a3eae446071b31767ea8b1a27ceb412cd36ab66b (commit) discards 1ed6a4fab0cc48e1d1a8978a36b84c4d5334647c (commit) discards c62004cb48ab1cba876ae46d19adbf14641c8476 (commit) discards 8a0b084a61b07aae811df1c4fd7eab74b52a6d75 (commit) discards b39a4f517176d7f65210056026d7f7842467bb20 (commit) discards 283b4a449cefcdf7a9a781b9b126a35598cc9c65 (commit) discards 701f695013218b1bbaf97212bb00b708ec738819 (commit) discards 2deaffd485fec676e29e379451d8f1ebdde79c54 (commit) discards e2bea00c339c2aae29476b436bcd6ee3b9a51342 (commit) discards ff5dd845b8ea8a3ecafeeca366b0d950d1455a25 (commit) discards d82a651c0029a13c27065d57a68fd471785dc97c (commit) discards d01c316a31f02155f55ea898a35381ff5060bfa9 (commit) discards 0e6bdb3fd61c818aed53827e96263fd14ed6edcc (commit) discards 44dc80798aa4fb92f60e1cd38f2f518b7e11946f (commit) discards 309aab7862f8047e96062853729ec709bade5ed6 (commit) discards 70dc2963eaf9e8dbd528607fdd08ac6204c5c13c (commit) discards 3f58ed15a080a4dd9538d0a62afe8d229342249c (commit) discards 77a27212b563299959fb2a609b86bb9117a8f918 (commit) discards ca7514cf4325838ca04c3a21a972cb963efd07a4 (commit) discards 1e919d30be9ecf9683e30bba3f6109d9356b4638 (commit) discards c4aefb88d31452b3add8cf16f9eef152525c3e93 (commit) discards 52dbfc9fc964ca292a777f11336854e88538f46d (commit) discards 1a24b758857eef4caf2a1801851315b6c93edd76 (commit) discards d1e693d7177d10f382d69b659ab359fddee783b5 (commit) discards 449cd8f2c3a694b219fcbb98d7d9948bce583ca1 (commit) discards 093fb17ce654532dc1e6c379aa13a3dbab9407d6 (commit) discards 5db841fb0b0b3e705c3a10345df3d2c41bc0ef5b (commit) discards 55a303143d64b8052bca36903315970287ee0a23 (commit) discards 213835061241618c9d6f235ab0961489a604df8d (commit) discards 7e369c107095687301e55bcbcf14440d68909c37 (commit) discards 5f6132e546717ee55cf2d9d14d3caa934fa2cd07 (commit) discards 730df10b97aa15a5c617e964dabc7633975c1eca (commit) discards b9bb840b831186a412d234a08ce5c42d3af12c2a (commit) discards 4aa246430e2cc0a22b4ffdd817a4a2cdeb0b4f46 (commit) discards 43e06cc36fd00e4b03adc7a6cb4f2ac87e9e8d23 (commit) discards e9d952943ae96007d93e06593916c5cb796a8c68 (commit) discards 84720ea2e37fb9217839dd572ffdd0fa9058441e (commit) via 634b380b63de53c65b92c214d91aaf03785d69db (commit) via b1749baf2590f402ba3cbd23385b9056c99f3839 (commit) via a37fda78cb7c7d4804c0d9ae1c67801977ce1de5 (commit) via 0fe531c4ec9d49f562f91056eab29f81b98f63f6 (commit) via 8bd76909bea5d4d3a7917d00269a493628c96d5e (commit) via 4c23114ed39db175beaa317f63b782fad02b2c6f (commit) via 88fd84e7e613ce93fc078320b312d2aa8c388a8c (commit) via 2503425036ca2ee48003ef20fcb87003e5d1e956 (commit) via 49ebafae0edebbc750742d8874ad0a7588286dea (commit) via 0e62cd70d258fd5b7caea6f43f026f4659d39390 (commit) via 818129881b9a83cfc2551effb60919f4f9be01d4 (commit) via fff8ec28ee93217492ac6fa34e43c5552f7b7e15 (commit) via dffefdb3b1bf7e8ac5c7b402ae7e839e1b41dad2 (commit) via 4e4dc3e4f331314f23eac818143cc82a4244b796 (commit) via de56e68c3d3b9206c105c2e3018294363ab2cd42 (commit) via 7270611af0c37dcb431d772e0ab1aaac58e5236c (commit) via be604963afff4ff3c9d3eff167c43e5dd3cd37f1 (commit) via 8b3bf1783f1feb8769878e10c34d4767eca3afd5 (commit) via 4e283f819b10df4a0dd8dd7a7ccb9c7c8747d9d6 (commit) via 7c10aec5077c5acdf0169af664aa0a17a490ad8b (commit) via 35f6dbf2eb39ffb8c497983566925d642c23079a (commit) via 0c65d440d34974b7bde20d7d7bbca2c9ef9c98ae (commit) via c82a1ccd1c7bf8c734d350de467559900c476bc1 (commit) via 16bf7fb7a31206b3548b9e3dcfe407dd16ddca1a (commit) via bcda7bc8eb9f8654e87197581cba58dbeffe43de (commit) via c714404d01fd74dbfb524cbb487f24321659dba7 (commit) via 209922afc188329f8ed7576c3a838875496f5df1 (commit) via 97c6a2af4436684eca9cc6bb40fa21d0c09298b5 (commit) via c2bb5dbaae47c2ac48fa0462459d8333afc79ba7 (commit) via 6db9c2295f0257cde59e13da7af791be780f7878 (commit) via 4d12b321aaf08b44e19a5ec025ba246471933454 (commit) via dabd1ea4a14d52156f5f4ffcb1f04a0db6b18976 (commit) via 42bc2b39d470a0c737f445f178737f1bcbbb0c2c (commit) via 294adda76f482498f35b8a69e7f7958fb0dcbc9b (commit) via 5c186339be9301e258f5fea7b8bab660540a8baf (commit) via ca75ed66bb693cb9990022355cb57d00e086e9a0 (commit) via c93a573288b75f4d514a4051be28f05060ebbae9 (commit) via b65bae91b7451102b2c3b8e79412887e24801f36 (commit) via a8e5f4e9f4565ba8527aa175a35f424eaa6c9141 (commit) via 6d8f0b61fc7e12e2de314d8fd23096d909fe3a35 (commit) via 99183cf318a3ae5486db92f2cd570ef0259119a2 (commit) via 9531b4a10640e32c432ddd3ae3be5005f2b87b2b (commit) via 39cbe8bd3cf8789caacf2579f74f081f70a05c69 (commit) via 2cf09b42f93c77210a8edc9a7e1607b491e7e176 (commit) via fb536bdf830231860062a3e5f2c4155f225009c9 (commit) via 2d09e90e4475d98da2a465eb7184eb887e67a419 (commit) via c441e8533af2ab0db05229bf3ecdc7887a78ef87 (commit) via 538a3db2f1062b7fa9b9dd79db46433f7d031e94 (commit) via 33c27fe26b72ee1f4d545f6cce2384c05acba3b2 (commit) via e388657fadbd8840bb674ad2d88a8a4b3bd60609 (commit) via d72a93af55e15af4d75e2269f99403ce331bd288 (commit) via 7db70a7e350617fac989c565d22fc834353b0668 (commit) via b041ee919ad847ca3bab74418a32b419465729fa (commit) via f620eecbba931ee236839897d172eb741a779ca9 (commit) via fac529df6f6afada02670a711879c093612cf012 (commit) via 9b062f2cecb2f9a99b35a10c024840a1cb16bd83 (commit) via 700b934a6b2f0f388fb75612edb46f86ed6c7de5 (commit) via 9f6467880e3d9dea79889f8e57e6f2d11c22e059 (commit) via bc4174b04d46c3c7da6634c106154971dbbd9b38 (commit) via 87d92f03e7b24fd80de0438a9ae4b84afd526e87 (commit) via 84951a4e29650344e5bb7258c5976011416c8e83 (commit) via 50d09b872d62302c88f5745c47cb92405f9cf6d4 (commit) via fb80eb7d5daf322e5646d0fcdf1217563b913d6f (commit) via dbb1e310c824593e479bba0831e7a405d3e6f6e9 (commit) via b159a9a38f366464f7ea8195009d4dcc9da97ea3 (commit) via 8624e3e500b80a1f139460dfa4a59da258c24f7f (commit) via e1d708f9c17d1754daaa0a653b66d4b005e36988 (commit) via ae4515e6456ba569ae6bdda7f58ef28908abd8bb (commit) via 2db592a0bbbe5ba3d18205897b7f7cdc8b896b02 (commit) via 1af98e5850d1762e3d69123ee20bc3169f1a8c92 (commit) via f43d6e36990869225c51d85c8aa9bca5c94c6945 (commit) via 3858a6cae919ee96f6cf527fb4cedc0aa9dc479f (commit) via f02a50f41ca0e9cf6124bec087263a987329c101 (commit) via 3db812914c6ac18de4d776c7c9b1b03a238eba8a (commit) via 91271377c79d15d8e60453a7dee2476eca535709 (commit) via 9e3484aa5bceeabbad0d53acc4b17ef7449df8a3 (commit) via 2fb70ec74047ef82af22e7af222aa43ca3e0240c (commit) via a6f482bbebf372ceee7a073c94127f6e2631be04 (commit) via fe3ed7ccc4b618163b62d03c0fbc6d904f01999e (commit) via ce7921e4ee7391c20e4b762756a1a4ebc56c4fa4 (commit) via 9b093d8245821662fcd57f77ac1046b0d096ad46 (commit) via 76a066bda45519dab18d10e6cced04ce455672cc (commit) via 30f549ee9e8a2425c7f94282397c8b8f0932e91e (commit) via f0e205b65731ba269977cf7cb335a8693ae7de88 (commit) via 28ece4769e57ec9283d22db5e4181dfd8fea0ae8 (commit) via e3b53ffa66a3482298a7662c32068218e761f9a6 (commit) via 0951c9e658035be064c50a3793c6d681db92acb3 (commit) via 83602ddb9b41d79119dc68aa229ead5aa09fec4e (commit) via c203135a9fbe3a65347432e1a5758825bd83b91b (commit) via 82f89a2866eca60db7ad6f02cba358f308f421db (commit) via 9c6c0e2a934dbb1b6213236ba7993453a3ab010f (commit) via 65e56fb8a19051557d777b9c63647d1cdfff7e2c (commit) via 766233eb31169fdb0f9befe7bf0686cd1a4ec770 (commit) via e04743159a34818bea16ae5cf7fe6c490c77ebb8 (commit) via 96a21df1ba01ce775b754f791770050796dc9d8e (commit) via 4330bf15d9074f12cca6bde89e7cbbb9d53c4186 (commit) via 4760421bca7e022ff72854fed029216aafaf8136 (commit) via 424a86c940df70b00b74af8baddda831c0d2a320 (commit) via e74be68dac7f77c112c37f2a19b5aba5eb72516e (commit) via 999cbfb7878cc88ec0612958db5d213874f72a0e (commit) via 362f275e33c0486653aaabc474e123dd5c0e5586 (commit) via ea404c1892f58a753199d5f8b54084db5d67d570 (commit) via d3f61fe721ba26adf596ab52696d37809727fe9d (commit) via ca3820fd802d3edbb8a46383d039dd1d0b1d1f6d (commit) via 197a7f05b21ee9c2071f657ece032f57822afd77 (commit) via 986f103e38f4be7f54fdbe85c54618437629301d (commit) via 6fe2ad138d85c36c1b76ffe3ce6690c815b78341 (commit) via 3d504f54fa19a3037ae9b441b74ed4188a959921 (commit) via 9a8f2f65248ecac1629d7bb7827c3d9bb9ade9bc (commit) via 9096e0d49310749f63c29dda2c4530ff9e3e93e8 (commit) via da68724697c1a11b2a352f29cbeeb98a20511ea5 (commit) via 90105d86a883b06bb8b72f8bc0f3a145fb8842de (commit) via b6ac7022bcc2d1acb886109015ac41ada725038e (commit) via 1fbac51168ef9f46a5a9ca062122848c21234856 (commit) via 4fe8cc16bd453c47247ad89eb8c2679f14f456a9 (commit) via 96bba0c6eb7b712122049307873153bb24816be6 (commit) via 5ad45a67a5f68f0c805ee937a4f40573458928db (commit) via ad71c32dbb378adc15418bbad753d4d537fecb02 (commit) via 8fa327a86f51f97a19c38ffdce137d4557729572 (commit) via e151c23ab096f4428ec275a90a9d7b5ec6a9c391 (commit) via 2703fccc5e6101bcb4d7bfee0eb2a63ee90a0466 (commit) via 6cfea6b326cb06255f23b34be925b6c40e100a71 (commit) via e26a15c3123c3e9962db593cc65d7cf625c0a268 (commit) via 98014a53753e8dd6df9709b70a053a992e267507 (commit) via 01ca8a43a28b76befa2f8e792d8dd5d6b29f10bb (commit) via a7b3fbd7cd6dbfab9e1d677d1b81052d895e9415 (commit) via ff2f1849d06e759b549c00c2d8458f3f792e5ba5 (commit) via 413bb9a108aff69e88fb37c30e29843db6e3aa07 (commit) via 82280dc2d18734ae026390adbe32ad6f5a51f87a (commit) via 14d4252ae15316c29285369d7512da1e8a0b83be (commit) via 94958105863e833243fd8ca708aefb78d1ddd569 (commit) via ef3cdb9685503d407c181323e62134c66957987b (commit) via 5cfc0497f23b97622f90972442cee2b9d373382f (commit) via c8f6bc2cf7ffda2ecafce9f91403394ef7e5b857 (commit) via 1a19f6e74f95796243ae08607d4212857c45d5bd (commit) via 536d5bc32dc634b4069bf66b9f1bcf8b09b48483 (commit) via 281fc66b246707ed808f3d2248458c6a49a907e6 (commit) via deff2b9d387869657b0f43fe16cd846a5414d587 (commit) via da7dd623bb7fe35cb1e56cc4ea77ba16e96a844a (commit) via 09a290fe85764378e036bfdbbf620b4028e42137 (commit) via 9b9e3e2122ffb4ae43c6793c77bb947f775c124e (commit) via 0a35cfafa7553fbf06ebfec52591a7374596b30d (commit) via bdcea409b3bd6618ef90021462b7635a76c44e7e (commit) via d3fa57f28af14cef166882707c9e442cc7d5fbdd (commit) via ebe1dae396dd674d61e299bf0668a260368e8bd2 (commit) via 7f92fe1b0fc6256b9b9fd43216f4b42286dd1ae3 (commit) via cd3e488ab624ee7b89b2410f71485b2522f633b0 (commit) via a04031a1813691fac3b60b6ea78bd121918b40aa (commit) via bc8f3afd80be00ceebed883b93226e3e80cfb6f5 (commit) via e5ebc5d2fef1d2d28fac9ce4cf2e2afd3323d55c (commit) via 7293df2fba9245b01e4b5621bc6349eba99fcace (commit) via 884d0078fa0ade33733847ab621fbc33873ccdbc (commit) via 8d95e56faacf77db7a155ec1982ffd1652e480e0 (commit) via 435d105ecef6610c3f8fe9ab7209e05a627a4ec8 (commit) via 115ff722755cbe893a9a3681beeb8e885da02829 (commit) via 5abc8c9534b8a0fa6cc6c8da360d7e1a85634165 (commit) via 44b81ffa802eeac296616a025947d60a36d6b027 (commit) via ecfb87017bef0b26e93f1bace026cf48446923ab (commit) via 539a905ddc94fba661da0b70f733927365ef8b49 (commit) via ef4de71a554a4199a2189c44244dc31dee4a6cfc (commit) via 74a1f7e8f9a45e12b3db2fe78e38582d8a9dc97b (commit) via 023dc1907622ff9bd2c62fbc01fb7de658d8ddf3 (commit) via b35e2e7c543b9db958c72cedba9ed294c2ae7810 (commit) via 4fe49b7f3b8e26cae19d7d18b4ca34c1727b4dbb (commit) via 47c69bf74db7db943a905db53fa6f2a9e418314c (commit) via 932abadf6842106590c5c7f4ffe1594cbde720c1 (commit) via 98fa07f85f736027a8cc5768b5ce5835b97b4570 (commit) via d5542bd04f25525334311bdac08f6dd4e613a404 (commit) via 9f5ac67b1aa3d0239332ad7e7de410c4e9412492 (commit) via 4ed1ca5d9b48914dea07ed657dce9a77115d6d87 (commit) via 8ed1480f077821fcd0eb1716d5ca5e3f9eb93dcc (commit) via ab6aaa6e8bf50430b4d4a4a674751f110631fbf4 (commit) via 9e4c797a41fd7ed3b11f5e49b6d88933675ea4c8 (commit) via 08dc9d2008fa31418d4e8b53b8d4b32c18630256 (commit) via b742308f29903a494870840085e4a32ba7c6980b (commit) via 69de1a1603356f790de61c7beda2f9b0a1f8db94 (commit) via ba16f1b6085222c9a4f179031e66c2a5eb7204dd (commit) via 21f60ee8bb59c5dbf78befb83df3c33c5b5baa70 (commit) via 9754556ea86a2d3450fedf367d20924d6cca2215 (commit) via 3233e078003eb124250d6b9f5fd4138a50870ec6 (commit) via 4e876bca6624bf36d39e7e6bd93fd23c95aca12c (commit) via 6b7ce30b12ceb15cbbd97f0533e1e39cd76a8737 (commit) via 12f8d0b9b1d30668323e54882956d7e8ae914bc1 (commit) via 8192001c1c52a5721cf049b350a5091e17600c7b (commit) via 0c02ce4f2c9a40faf4318d38b5ea255628bc7074 (commit) via 950200107ec8661dc5675eb9c523bbe91aa2db46 (commit) via 03d79c56cd03f53e1581088b1424ca2f99928350 (commit) via c952f9f2ba0710c2c3204a35205d9f84a853b4c6 (commit) via 892b932e0c47d4c17c91c0c75b57b9d1ba08666c (commit) via 2792cbb20255d567ce525337c7144ceb3b2ac619 (commit) via ab5dd0def3d6b3b710a6ffa0fdc596cab2484736 (commit) via aa03ee5d9f6521072e163fb146105d088fa6738d (commit) via ecbdfec22efbcd516f383a9b6e69d07913f4040e (commit) via b9295d11b3616ba9ed579ce90da67851d65e0374 (commit) via 7f3f8cfc9fa2b9184135ad38c8ca3bc11cb0b3cd (commit) via 56432c4402d369a1ac5f7543e0066f084c6e5fb8 (commit) via fafd3bbc4539b97ff2beb27ec477a545b3301c55 (commit) via f68996fa18fea82642688f360aaa214e22975ac2 (commit) via 1487af649635433427867c5faa44c1c470675733 (commit) via 181b03913c93ff363f374871083a0d00f027dcb5 (commit) via cd764e15c2712c7d440529bc4a7a8b2791a99614 (commit) via d35c7a52dd1f2340b64c799c9280b3c8991d704c (commit) via 3cfe54f6b46cc27f5fc986a9ac125221ded8cc39 (commit) via b71637ebb55b2c3025bbdaec4c8851df85663976 (commit) via 9764134a7ab4d43d847e032b567c92ee5741efc9 (commit) via a57744162fc659eef5d5d34b58ac31aa010dc0cb (commit) via 7dfd88da00d0430580ca372d4ef93fa607b34c5c (commit) via ef7d5719af375c7a571995a6e5c3530dbd7b4d18 (commit) via 0d2b97a3dcd9748f9d46c591b3971f4654362c79 (commit) via 3b97253899e71243962989f11aaaf7a738dfefbf (commit) via 38f4f323da8192474418fe819399c9df21ea233c (commit) via 5267db6c37390456fa10fa61e732ed87468d5e7c (commit) via 70304d2ce7f3bec9d632298d98beb029b6428680 (commit) via 4cb508a8f7d7f868b58488e01f6281e7b7728c5c (commit) via e6175e64d3307f55aa10f8eba4950a643938e338 (commit) via b3aa07b59eeeadb318b932f911ae32379683dbd6 (commit) via 873c3ac262c93026c76dcba9016985cc19eaf694 (commit) via 518f5ccef90a4a1dca81589da222b75429c1bbd4 (commit) via 93d5c935fe8b7b64fe6f6018ca5080b7722be7dc (commit) via 78edc4c9425a8f79e76f38f5fabbdbd55d0438d8 (commit) via 0fb31f8e9a7fbfe9ed0977589f4c7f1ab1ff0f47 (commit) via c4c540e374ac18cda622f970f47664ff1e83aba9 (commit) via cff3e6cf290cdcc79e777ed27ee3a034f8fe2900 (commit) via 34bdbfe3d8c87f87a2da2078376fc47bf89e21fc (commit) via 32953251dbeb570a5c8797913d0b590c581d9ac9 (commit) via b6d8f2ae7f701aec08834067f4c553ff9b13cbec (commit) via 95e770e2c463724a500bfc0615d2cc63f625e3a5 (commit) via 99f8355d30b17e017138fde66aa0eb34872e65c2 (commit) via 1a4828a94afca2b6e077f83e9e7bca06a200586e (commit) via 7b9a80439b5dae3919269c7c47a010faacc11c72 (commit) via cbb6ff4116e9d47de0e1dee0b34d9af3e182efff (commit) via 25447a8b0fb509a1b853fc13aad29ca83de3a272 (commit) via 956c049a9f8735d3d6227e1d758f17da0186f192 (commit) via 02c9efe968d8f8b7da50561adc24d1e05019f596 (commit) via 40e85bc5b7bd77062a1c3d629c577a4e4e2ae4c5 (commit) via d95e91d3ec45dc3cfc4e25507ce1336d25ce5cc5 (commit) via bfc3069651c55bc31318f49e387d6fea61cf5a08 (commit) via 583adaf0ca462c3013f2ff5e5e22215444a28134 (commit) via 45bda762fdb43884aecde48cf9a383543da4b565 (commit) via d8e18da1b8d6f932c7649c535200e6684907258f (commit) via fb721ee8a241830ad2384cabae6559b90f0bddc4 (commit) via fe537d494813efcbf41b2e7be8849c186efe97fa (commit) via 00e97b43a6450e483f5775d92fe2288cb6805530 (commit) via 9573acb3da062bb0251c752c3790d4016b763342 (commit) via 30030780e347248eb6bbf9710829d9d711cc28c9 (commit) via 0023723a37fdb2dd5bbb526f4abb18dd706f27f3 (commit) via f422878461784abeddbc142cd0e7b307d771f5ca (commit) via 2ca10a68a2f150724dea690a6b9cd52a01156a2f (commit) via 5fa8ce3861acb807bd3a6b3a4eff1b7fe102c16f (commit) via c45d8a887666f1fabe73859723fc24188c3bce14 (commit) via 0c31364968b9c615d668388682e666806bcd2dd6 (commit) via a781cc2773b10264d82eecba65150fd01fb1ace9 (commit) via 7b9d96d6fba4edf68ba7ed80b240345b02757b57 (commit) via 5ad75e12050feffb6c473944fba3b84a44cce6ee (commit) via 2b991ab104173e9d1fbe82ef0591e5f5a0ecf4f1 (commit) via dffee30626e777af2fdd65bb509c1994e8db6a7b (commit) via ce14976cfca5da561ea447a3bf20f7311db08828 (commit) via 3ef84c7b7f99d5e0e7438b96c57593e813da8161 (commit) via e884f6db879d8c2c208892728580da13a73f1ecd (commit) via 96e9605bac4b68e51a5edb956547440484bbc550 (commit) via c1062fff5a358b13e9434dcd9ef0252c9c983a40 (commit) via 19193d629c85602e4d8c0b29897462b4223934de (commit) via 81ed733db4cafba894785ffe6c7aa4568b64ed91 (commit) via ecdb9238f6face4f97067d37127352786eb8df2a (commit) via c642dc8f9b311209d50ae4f1963c88d2cf6c05b1 (commit) via 5816a0be2141187d50c5c865b3754ba52718f607 (commit) via d78ccf9058f81ea838d1c6af9e9d69bf0c80efb1 (commit) via d52ad54660d0a07d32418f1e3374d8a62d0fefad (commit) via c087b86656e95dd3d760af165cb66464f7f5a466 (commit) via e9d60da192588bbd041230b1431030ca19a18959 (commit) via 9cb761fe020b76dbdd7acbcc541f6f1c0d8d90d7 (commit) via 250a492789120f128cb3004a8dacfb7b9d1cf99c (commit) via 342c869a157bcd7ef655b12b96e8b5fc20fea839 (commit) via 59c8dc22f2d216aabe0de7e591b75cc35d5bf842 (commit) via ed299d6b54c89e5535e6b2ac52e3a0e87aeebf6a (commit) via 483de1f3cd4a7f0197e17c3c2387696a742274cd (commit) via 41624953a37f20b2c08c479e710f52a86e829f61 (commit) via ce2122df54a67451741cb7f459278174e079276f (commit) via 08fcfc4a4770e6e9118a324762034e8f2c95abf7 (commit) via 5e07b9615e2d999c7a6b4825a8c556cf52a67d59 (commit) via 60557ade7d0f60ea2f7ffd7b3a30eb9b3d9521b2 (commit) via cf597d834e1334ad732c4584455d0a43a8346964 (commit) via db101b0ff8ce728984736fdce70edb2c6cbc5cc0 (commit) via 5e1170eb07b5b097efbeef42ec4ebc92ef21b09c (commit) via 430aca1f52ef19747a9cbbdc9fd6a19034bc899d (commit) via aae51fd0f29d5746f2aa6153bfd0b571aed14369 (commit) via 91be2c86b3f00891ffac173d1a39d86038d1eb9c (commit) via 4caae92593e353802b8894959fe658c09763eaf8 (commit) via 4bf15b16e4fe26ff397e8c8d12d068cc289337d6 (commit) via 096b11e8693a6dd7e681e8b21fb8ba46a1712e54 (commit) via 0ff9ae964f0d249afd566f33a104afdcb704bd77 (commit) via a22d4f28052264dab9e1485aaef5f6e9a420a682 (commit) via 2f89dc63b509228d354737e0f15fc740945508fc (commit) via 0fde7618654c49cedf78ea2ee119fe032d9f77ca (commit) via 98e397a5c1b3ab42801861d847c8053b89113f6e (commit) via 712796ca0c2a5bc32621de80ae6a9fe9cecd0d92 (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (6303c7d0e98fafe0f14c8c4dd9989b3b7633ebf4) \ N -- N -- N (634b380b63de53c65b92c214d91aaf03785d69db) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: .travis.yml | 1 - CHANGELOG | 379 +++++++++++++++++++++ DEPENDENCIES | 12 +- README | 11 +- configure.ac | 10 +- doc/application-api-guide/odp.dox | 4 +- doc/helper-guide/odp.dox | 4 +- example/generator/odp_generator.c | 341 ++++++++++++------ example/ipsec/odp_ipsec_stream.c | 6 +- helper/include/odp/helper/ip.h | 4 +- platform/linux-generic/Makefile.am | 8 +- platform/linux-generic/_ishm.c | 1 + platform/linux-generic/_modules.c | 54 --- .../linux-generic/include/odp_config_internal.h | 11 +- platform/linux-generic/include/odp_internal.h | 5 - .../linux-generic/include/odp_packet_internal.h | 2 +- platform/linux-generic/include/protocols/ip.h | 4 +- platform/linux-generic/libodp-linux.pc.in | 2 +- platform/linux-generic/m4/configure.m4 | 4 - platform/linux-generic/m4/odp_modules.m4 | 11 - platform/linux-generic/odp_init.c | 91 ----- platform/linux-generic/odp_packet.c | 4 +- platform/linux-generic/odp_schedule.c | 1 + platform/linux-generic/odp_schedule_iquery.c | 3 - platform/linux-generic/odp_timer.c | 1 - test/performance/odp_l2fwd.c | 40 +-- 26 files changed, 677 insertions(+), 337 deletions(-) delete mode 100644 platform/linux-generic/_modules.c delete mode 100644 platform/linux-generic/m4/odp_modules.m4 hooks/post-receive --

7 years, 5 months

[COMMIT] branch master updated. v1.17.0.0_tigermoth_rc1-8-g634b380b

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 634b380b63de53c65b92c214d91aaf03785d69db (commit) via b1749baf2590f402ba3cbd23385b9056c99f3839 (commit) via a37fda78cb7c7d4804c0d9ae1c67801977ce1de5 (commit) via 0fe531c4ec9d49f562f91056eab29f81b98f63f6 (commit) via 8bd76909bea5d4d3a7917d00269a493628c96d5e (commit) via 4c23114ed39db175beaa317f63b782fad02b2c6f (commit) from 88fd84e7e613ce93fc078320b312d2aa8c388a8c (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 634b380b63de53c65b92c214d91aaf03785d69db Author: Matias Elo <matias.elo(a)nokia.com> Date: Wed Jan 3 13:52:09 2018 +0200 test: l2fwd: improve cache usage Rearrange thread local fast path data to improve cache usage. Increases maximum throughput by ~10% in direct pktio mode (dpdk zero-copy). Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/performance/odp_l2fwd.c b/test/performance/odp_l2fwd.c index 27b29939..2353e241 100644 --- a/test/performance/odp_l2fwd.c +++ b/test/performance/odp_l2fwd.c @@ -137,12 +137,10 @@ typedef union { } stats_t ODP_ALIGNED_CACHE; /** - * Thread specific arguments + * Thread specific data */ typedef struct thread_args_t { - int thr_idx; - int num_pktio; - int num_groups; + stats_t stats; struct { odp_pktin_queue_t pktin; @@ -158,24 +156,22 @@ typedef struct thread_args_t { /* Groups to join */ odp_schedule_group_t group[MAX_PKTIOS]; - /* Pointer to per thread stats */ - stats_t *stats; - + int thr_idx; + int num_pktio; + int num_groups; } thread_args_t; /** * Grouping of all global data */ typedef struct { + /** Thread specific arguments */ + thread_args_t thread[MAX_WORKERS]; /** Barriers to synchronize main and workers */ odp_barrier_t init_barrier; odp_barrier_t term_barrier; - /** Per thread packet stats */ - stats_t stats[MAX_WORKERS]; /** Application (parsed) arguments */ appl_args_t appl; - /** Thread specific arguments */ - thread_args_t thread[MAX_WORKERS]; /** Table of port ethernet addresses */ odph_ethaddr_t port_eth_addr[MAX_PKTIOS]; /** Table of dst ethernet addresses */ @@ -322,7 +318,7 @@ static int run_worker_sched_mode(void *arg) odp_pktout_queue_t pktout[MAX_PKTIOS]; odp_queue_t tx_queue[MAX_PKTIOS]; thread_args_t *thr_args = arg; - stats_t *stats = thr_args->stats; + stats_t *stats = &thr_args->stats; int use_event_queue = gbl_args->appl.out_mode; pktin_mode_t in_mode = gbl_args->appl.in_mode; @@ -464,7 +460,7 @@ static int run_worker_plain_queue_mode(void *arg) odp_queue_t tx_queue; int pktio = 0; thread_args_t *thr_args = arg; - stats_t *stats = thr_args->stats; + stats_t *stats = &thr_args->stats; int use_event_queue = gbl_args->appl.out_mode; int i; @@ -592,7 +588,7 @@ static int run_worker_direct_mode(void *arg) odp_queue_t tx_queue; int pktio = 0; thread_args_t *thr_args = arg; - stats_t *stats = thr_args->stats; + stats_t *stats = &thr_args->stats; int use_event_queue = gbl_args->appl.out_mode; thr = odp_thread_id(); @@ -849,12 +845,12 @@ static int create_pktio(const char *dev, int idx, int num_rx, int num_tx, * Print statistics * * @param num_workers Number of worker threads - * @param thr_stats Pointer to stats storage + * @param thr_stats Pointers to stats storage * @param duration Number of seconds to loop in * @param timeout Number of seconds for stats calculation * */ -static int print_speed_stats(int num_workers, stats_t *thr_stats, +static int print_speed_stats(int num_workers, stats_t **thr_stats, int duration, int timeout) { uint64_t pkts = 0; @@ -882,9 +878,9 @@ static int print_speed_stats(int num_workers, stats_t *thr_stats, sleep(timeout); for (i = 0; i < num_workers; i++) { - pkts += thr_stats[i].s.packets; - rx_drops += thr_stats[i].s.rx_drops; - tx_drops += thr_stats[i].s.tx_drops; + pkts += thr_stats[i]->s.packets; + rx_drops += thr_stats[i]->s.rx_drops; + tx_drops += thr_stats[i]->s.tx_drops; } if (stats_enabled) { pps = (pkts - pkts_prev) / timeout; @@ -1471,7 +1467,7 @@ int main(int argc, char *argv[]) odph_ethaddr_t new_addr; odp_pool_param_t params; int ret; - stats_t *stats; + stats_t *stats[MAX_WORKERS]; int if_count; int (*thr_run_func)(void *); odp_instance_t instance; @@ -1641,8 +1637,6 @@ int main(int argc, char *argv[]) memset(thread_tbl, 0, sizeof(thread_tbl)); - stats = gbl_args->stats; - odp_barrier_init(&gbl_args->init_barrier, num_workers + 1); odp_barrier_init(&gbl_args->term_barrier, num_workers + 1); @@ -1669,7 +1663,7 @@ int main(int argc, char *argv[]) gbl_args->thread[i].num_groups = 1; gbl_args->thread[i].group[0] = group[i % num_groups]; - gbl_args->thread[i].stats = &stats[i]; + stats[i] = &gbl_args->thread[i].stats; odp_cpumask_zero(&thd_mask); odp_cpumask_set(&thd_mask, cpu); commit b1749baf2590f402ba3cbd23385b9056c99f3839 Author: Bogdan Pricope <bogdan.pricope(a)linaro.org> Date: Tue Jan 9 11:50:19 2018 +0200 example: generator: replace L3/L4 packet parsing with a simple one Platform packet parsing is providing information not needed by this application while consuming cycles. Replacing platform packet parsing with a limited parsing may increase performance on RX side. Signed-off-by: Bogdan Pricope <bogdan.pricope(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/generator/odp_generator.c b/example/generator/odp_generator.c index 586c3ede..f8c787e4 100644 --- a/example/generator/odp_generator.c +++ b/example/generator/odp_generator.c @@ -572,6 +572,12 @@ static int create_pktio(const char *dev, odp_pool_t pool, itf->config.pktout.bit.udp_chksum = 0; } + itf->config.parser.layer = ODP_PROTO_LAYER_L2; + if (itf->config.pktin.bit.udp_chksum) + itf->config.parser.layer = ODP_PROTO_LAYER_L4; + else if (itf->config.pktin.bit.ipv4_chksum) + itf->config.parser.layer = ODP_PROTO_LAYER_L3; + if (odp_pktio_config(itf->pktio, &itf->config)) { EXAMPLE_ERR("Error: Failed to set interface configuration %s\n", dev); @@ -781,11 +787,12 @@ static int gen_send_thread(void *arg) */ static void process_icmp_pkt(int thr, thread_args_t *thr_args, - odph_icmphdr_t *icmp) + uint8_t *_icmp) { uint64_t trecv; uint64_t tsend; uint64_t rtt_ms, rtt_us; + odph_icmphdr_t *icmp = (odph_icmphdr_t *)_icmp; if (icmp->type == ICMP_ECHOREPLY) { thr_args->counters.ctr_icmp_reply_rcv++; @@ -818,18 +825,12 @@ static void process_pkts(int thr, thread_args_t *thr_args, { odp_packet_t pkt; odp_packet_chksum_status_t csum_status; - char *buf; + uint32_t left, offset, i; odph_ipv4hdr_t *ip; - odph_icmphdr_t *icmp; - unsigned i; for (i = 0; i < len; ++i) { pkt = pkt_tbl[i]; - /* only ip pkts */ - if (!odp_packet_has_ipv4(pkt)) - continue; - csum_status = odp_packet_l3_chksum_status(pkt); if (csum_status == ODP_PACKET_CHKSUM_BAD) printf("L3 checksum error detected.\n"); @@ -842,20 +843,36 @@ static void process_pkts(int thr, thread_args_t *thr_args, if (odp_unlikely(odp_packet_has_error(pkt))) continue; + offset = odp_packet_l3_offset(pkt); + left = odp_packet_len(pkt) - offset; + + if (left < sizeof(odph_ipv4hdr_t)) + continue; + + ip = (odph_ipv4hdr_t *)((uint8_t *)odp_packet_data(pkt) + + offset); + + /* only ip pkts */ + if (ODPH_IPV4HDR_VER(ip->ver_ihl) != ODPH_IPV4) + continue; + thr_args->counters.ctr_pkt_rcv++; - buf = odp_packet_data(pkt); - ip = (odph_ipv4hdr_t *)(buf + odp_packet_l3_offset(pkt)); /* udp */ - if (ip->proto == ODPH_IPPROTO_UDP) + if (ip->proto == ODPH_IPPROTO_UDP) { thr_args->counters.ctr_udp_rcv++; + } else if (ip->proto == ODPH_IPPROTO_ICMPV4) { + uint32_t l3_size = ODPH_IPV4HDR_IHL(ip->ver_ihl) * 4; + + offset += l3_size; + left -= l3_size; - /* icmp */ - if (ip->proto == ODPH_IPPROTO_ICMPV4) { - icmp = (odph_icmphdr_t *)(buf + - odp_packet_l4_offset(pkt)); + if (left < sizeof(odph_icmphdr_t)) + continue; - process_icmp_pkt(thr, thr_args, icmp); + process_icmp_pkt(thr, thr_args, + (uint8_t *)odp_packet_data(pkt) + + offset); } } } commit a37fda78cb7c7d4804c0d9ae1c67801977ce1de5 Author: Bogdan Pricope <bogdan.pricope(a)linaro.org> Date: Mon Jan 8 16:00:55 2018 +0200 example: generator: add direct mode packet RX Update packet RX processing by adding direct pktin mode. Direct mode should increase throughput on RX side. Signed-off-by: Bogdan Pricope <bogdan.pricope(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/generator/odp_generator.c b/example/generator/odp_generator.c index b37fc7b1..586c3ede 100644 --- a/example/generator/odp_generator.c +++ b/example/generator/odp_generator.c @@ -114,8 +114,6 @@ typedef struct { } tx; struct { odp_pktin_queue_t pktin; /**< Packet input queue */ - interface_t *ifs; /**< Interfaces array */ - int ifs_count; /**< Interfaces array size */ } rx; }; odp_pool_t pool; /**< Pool for packet IO */ @@ -777,19 +775,18 @@ static int gen_send_thread(void *arg) /** * Process icmp packets * + * @param thr worker id + * @param thr_args worker argument * @param icmp icmp header address - * @param msg output buffer */ -static void process_icmp_pkt(thread_args_t *thr_args, - odph_icmphdr_t *icmp, char *msg) +static void process_icmp_pkt(int thr, thread_args_t *thr_args, + odph_icmphdr_t *icmp) { uint64_t trecv; uint64_t tsend; uint64_t rtt_ms, rtt_us; - msg[0] = 0; - if (icmp->type == ICMP_ECHOREPLY) { thr_args->counters.ctr_icmp_reply_rcv++; @@ -799,33 +796,32 @@ static void process_icmp_pkt(thread_args_t *thr_args, rtt_ms = (trecv - tsend) / ODP_TIME_MSEC_IN_NS; rtt_us = (trecv - tsend) / ODP_TIME_USEC_IN_NS - 1000 * rtt_ms; - sprintf(msg, - "ICMP Echo Reply seq %d time %" - PRIu64 ".%.03" PRIu64" ms", + printf(" [%02i] ICMP Echo Reply seq %d time %" + PRIu64 ".%.03" PRIu64" ms\n", thr, odp_be_to_cpu_16(icmp->un.echo.sequence), rtt_ms, rtt_us); } else if (icmp->type == ICMP_ECHO) { - sprintf(msg, "Icmp Echo Request"); + printf(" [%02i] ICMP Echo Request\n", thr); } } /** - * Print odp packets + * Process odp packets * * @param thr worker id + * @param thr_args worker argument * @param pkt_tbl packets to be print * @param len packet number */ -static void print_pkts(int thr, thread_args_t *thr_args, - odp_packet_t pkt_tbl[], unsigned len) +static void process_pkts(int thr, thread_args_t *thr_args, + odp_packet_t pkt_tbl[], unsigned len) { odp_packet_t pkt; + odp_packet_chksum_status_t csum_status; char *buf; odph_ipv4hdr_t *ip; odph_icmphdr_t *icmp; unsigned i; - size_t offset; - char msg[1024]; for (i = 0; i < len; ++i) { pkt = pkt_tbl[i]; @@ -834,10 +830,21 @@ static void print_pkts(int thr, thread_args_t *thr_args, if (!odp_packet_has_ipv4(pkt)) continue; + csum_status = odp_packet_l3_chksum_status(pkt); + if (csum_status == ODP_PACKET_CHKSUM_BAD) + printf("L3 checksum error detected.\n"); + + csum_status = odp_packet_l4_chksum_status(pkt); + if (csum_status == ODP_PACKET_CHKSUM_BAD) + printf("L4 checksum error detected.\n"); + + /* Drop packets with errors */ + if (odp_unlikely(odp_packet_has_error(pkt))) + continue; + thr_args->counters.ctr_pkt_rcv++; buf = odp_packet_data(pkt); ip = (odph_ipv4hdr_t *)(buf + odp_packet_l3_offset(pkt)); - offset = odp_packet_l4_offset(pkt); /* udp */ if (ip->proto == ODPH_IPPROTO_UDP) @@ -845,16 +852,16 @@ static void print_pkts(int thr, thread_args_t *thr_args, /* icmp */ if (ip->proto == ODPH_IPPROTO_ICMPV4) { - icmp = (odph_icmphdr_t *)(buf + offset); + icmp = (odph_icmphdr_t *)(buf + + odp_packet_l4_offset(pkt)); - process_icmp_pkt(thr_args, icmp, msg); - printf(" [%02i] %s\n", thr, msg); + process_icmp_pkt(thr, thr_args, icmp); } } } /** - * Main receive function + * Scheduler receive function * * @param arg thread arguments of type 'thread_args_t *' */ @@ -862,17 +869,16 @@ static int gen_recv_thread(void *arg) { int thr; thread_args_t *thr_args; - odp_packet_t pkts[MAX_RX_BURST], pkt; - odp_event_t events[MAX_RX_BURST]; + odp_packet_t pkts[MAX_RX_BURST]; + odp_event_t events[MAX_RX_BURST], ev; int pkt_cnt, ev_cnt, i; - odp_packet_chksum_status_t csum_status; int burst_size; thr = odp_thread_id(); thr_args = (thread_args_t *)arg; burst_size = args->rx_burst_size; - printf(" [%02i] created mode: RECEIVE\n", thr); + printf(" [%02i] created mode: RECEIVE SCHEDULER\n", thr); odp_barrier_wait(&barrier); for (;;) { @@ -884,29 +890,62 @@ static int gen_recv_thread(void *arg) events, burst_size); if (ev_cnt == 0) continue; + for (i = 0, pkt_cnt = 0; i < ev_cnt; i++) { - pkt = odp_packet_from_event(events[i]); + ev = events[i]; - csum_status = odp_packet_l3_chksum_status(pkt); - if (csum_status == ODP_PACKET_CHKSUM_BAD) - printf("L3 checksum error detected.\n"); + if (odp_event_type(ev) == ODP_EVENT_PACKET) + pkts[pkt_cnt++] = odp_packet_from_event(ev); + else + odp_event_free(ev); + } - csum_status = odp_packet_l4_chksum_status(pkt); - if (csum_status == ODP_PACKET_CHKSUM_BAD) - printf("L4 checksum error detected.\n"); + if (pkt_cnt) { + process_pkts(thr, thr_args, pkts, pkt_cnt); - /* Drop packets with errors */ - if (odp_unlikely(odp_packet_has_error(pkt))) { - odp_packet_free(pkt); - continue; - } - pkts[pkt_cnt++] = pkt; + odp_packet_free_multi(pkts, pkt_cnt); } + } - if (pkt_cnt) { - print_pkts(thr, thr_args, pkts, pkt_cnt); + return 0; +} + +/** + * Direct receive function + * + * @param arg thread arguments of type 'thread_args_t *' + */ +static int gen_recv_direct_thread(void *arg) +{ + int thr; + thread_args_t *thr_args; + odp_packet_t pkts[MAX_RX_BURST]; + int pkt_cnt, burst_size; + odp_pktin_queue_t pktin; + + thr = odp_thread_id(); + thr_args = (thread_args_t *)arg; + pktin = thr_args->rx.pktin; + burst_size = args->rx_burst_size; + + printf(" [%02i] created mode: RECEIVE\n", thr); + odp_barrier_wait(&barrier); + + for (;;) { + if (thr_args->stop) + break; + + pkt_cnt = odp_pktin_recv_tmo(pktin, pkts, burst_size, + ODP_PKTIN_NO_WAIT); + + if (pkt_cnt > 0) { + process_pkts(thr, thr_args, pkts, pkt_cnt); odp_packet_free_multi(pkts, pkt_cnt); + } else if (pkt_cnt == 0) { + continue; + } else { + break; } } @@ -1223,8 +1262,8 @@ int main(int argc, char *argv[]) abort(); } thr_args = &args->thread[PING_THR_RX]; - thr_args->rx.ifs = ifs; - thr_args->rx.ifs_count = args->appl.if_count; + if (!args->appl.sched) + thr_args->rx.pktin = ifs[0].pktin[0]; thr_args->pool = pool; thr_args->tp = tp; thr_args->tq = tq; @@ -1241,7 +1280,10 @@ int main(int argc, char *argv[]) thr_args->mode = args->appl.mode; memset(&thr_params, 0, sizeof(thr_params)); - thr_params.start = gen_recv_thread; + if (args->appl.sched) + thr_params.start = gen_recv_thread; + else + thr_params.start = gen_recv_direct_thread; thr_params.arg = thr_args; thr_params.thr_type = ODP_THREAD_WORKER; thr_params.instance = instance; @@ -1287,21 +1329,24 @@ int main(int argc, char *argv[]) for (i = 0; i < num_workers; ++i) { odp_cpumask_t thd_mask; int (*thr_run_func)(void *); - int if_idx, pktout_idx; + int if_idx, pktq_idx; uint64_t start_seq; + if_idx = i % args->appl.if_count; + if (args->appl.mode == APPL_MODE_RCV) { - args->thread[i].rx.ifs = ifs; - args->thread[i].rx.ifs_count = - args->appl.if_count; + pktq_idx = (i / args->appl.if_count) % + ifs[if_idx].pktin_count; + if (!args->appl.sched) + args->thread[i].rx.pktin = + ifs[if_idx].pktin[pktq_idx]; } else { - if_idx = i % args->appl.if_count; - pktout_idx = (i / args->appl.if_count) % + pktq_idx = (i / args->appl.if_count) % ifs[if_idx].pktout_count; start_seq = i * args->tx_burst_size; args->thread[i].tx.pktout = - ifs[if_idx].pktout[pktout_idx]; + ifs[if_idx].pktout[pktq_idx]; args->thread[i].tx.pktout_cfg = &ifs[if_idx].config.pktout; args->thread[i].counters.ctr_seq = start_seq; @@ -1329,7 +1374,10 @@ int main(int argc, char *argv[]) if (args->appl.mode == APPL_MODE_UDP) { thr_run_func = gen_send_thread; } else if (args->appl.mode == APPL_MODE_RCV) { - thr_run_func = gen_recv_thread; + if (args->appl.sched) + thr_run_func = gen_recv_thread; + else + thr_run_func = gen_recv_direct_thread; } else { EXAMPLE_ERR("ERR MODE\n"); exit(EXIT_FAILURE); commit 0fe531c4ec9d49f562f91056eab29f81b98f63f6 Author: Bogdan Pricope <bogdan.pricope(a)linaro.org> Date: Mon Jan 8 13:25:46 2018 +0200 example: generator: add direct mode pktio configuration Update interface configuration function to support direct mode in addition to scheduler mode. Signed-off-by: Bogdan Pricope <bogdan.pricope(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/generator/odp_generator.c b/example/generator/odp_generator.c index e7a4315a..b37fc7b1 100644 --- a/example/generator/odp_generator.c +++ b/example/generator/odp_generator.c @@ -55,6 +55,8 @@ typedef struct { odp_pktio_config_t config; odp_pktout_queue_t pktout[MAX_WORKERS]; unsigned pktout_count; + odp_pktin_queue_t pktin[MAX_WORKERS]; + unsigned pktin_count; } interface_t; /** @@ -111,6 +113,7 @@ typedef struct { odp_pktout_config_opt_t *pktout_cfg; /**< Packet output config*/ } tx; struct { + odp_pktin_queue_t pktin; /**< Packet input queue */ interface_t *ifs; /**< Interfaces array */ int ifs_count; /**< Interfaces array size */ } rx; @@ -520,10 +523,15 @@ static int create_pktio(const char *dev, odp_pool_t pool, odp_pktio_param_t pktio_param; odp_pktin_queue_param_t pktin_param; odp_pktout_queue_param_t pktout_param; - odp_pktio_op_mode_t pktout_mode; + odp_pktio_op_mode_t pktout_mode, pktin_mode; + odp_bool_t sched = args->appl.sched; odp_pktio_param_init(&pktio_param); - pktio_param.in_mode = ODP_PKTIN_MODE_SCHED; + pktio_param.in_mode = num_rx_queues ? + (sched ? ODP_PKTIN_MODE_SCHED : ODP_PKTIN_MODE_DIRECT) : + ODP_PKTIN_MODE_DISABLED; + pktio_param.out_mode = num_tx_queues ? ODP_PKTOUT_MODE_DIRECT : + ODP_PKTOUT_MODE_DISABLED; /* Open a packet IO instance */ itf->pktio = odp_pktio_open(dev, pool, &pktio_param); @@ -572,31 +580,47 @@ static int create_pktio(const char *dev, odp_pool_t pool, return -1; } - if (num_rx_queues > capa.max_input_queues) - num_rx_queues = capa.max_input_queues; - - odp_pktin_queue_param_init(&pktin_param); - pktin_param.num_queues = num_rx_queues; - pktin_param.queue_param.sched.sync = ODP_SCHED_SYNC_ATOMIC; + if (num_rx_queues) { + pktin_mode = ODP_PKTIO_OP_MT_UNSAFE; + if (num_rx_queues > capa.max_input_queues) { + num_rx_queues = capa.max_input_queues; + pktin_mode = ODP_PKTIO_OP_MT; + EXAMPLE_DBG("Warning: Force RX multithread safe mode " + "(slower)on %s\n", dev); + } - if (odp_pktin_queue_config(itf->pktio, &pktin_param)) { - EXAMPLE_ERR("Error: pktin queue config failed for %s\n", dev); - return -1; + odp_pktin_queue_param_init(&pktin_param); + pktin_param.num_queues = num_rx_queues; + pktin_param.op_mode = pktin_mode; + if (sched) + pktin_param.queue_param.sched.sync = + ODP_SCHED_SYNC_ATOMIC; + + if (odp_pktin_queue_config(itf->pktio, &pktin_param)) { + EXAMPLE_ERR("Error: pktin queue config failed " + "for %s\n", dev); + return -1; + } } - pktout_mode = ODP_PKTIO_OP_MT_UNSAFE; - if (num_tx_queues > capa.max_output_queues) { - num_tx_queues = capa.max_output_queues; - pktout_mode = ODP_PKTIO_OP_MT; - } + if (num_tx_queues) { + pktout_mode = ODP_PKTIO_OP_MT_UNSAFE; + if (num_tx_queues > capa.max_output_queues) { + num_tx_queues = capa.max_output_queues; + pktout_mode = ODP_PKTIO_OP_MT; + EXAMPLE_DBG("Warning: Force TX multithread safe mode " + "(slower) on %s\n", dev); + } - odp_pktout_queue_param_init(&pktout_param); - pktout_param.num_queues = num_tx_queues; - pktout_param.op_mode = pktout_mode; + odp_pktout_queue_param_init(&pktout_param); + pktout_param.num_queues = num_tx_queues; + pktout_param.op_mode = pktout_mode; - if (odp_pktout_queue_config(itf->pktio, &pktout_param)) { - EXAMPLE_ERR("Error: pktout queue config failed for %s\n", dev); - return -1; + if (odp_pktout_queue_config(itf->pktio, &pktout_param)) { + EXAMPLE_ERR("Error: pktout queue config failed for %s\n", + dev); + return -1; + } } ret = odp_pktio_start(itf->pktio); @@ -604,12 +628,21 @@ static int create_pktio(const char *dev, odp_pool_t pool, EXAMPLE_ABORT("Error: unable to start %s\n", dev); itf->pktout_count = num_tx_queues; - if (odp_pktout_queue(itf->pktio, itf->pktout, itf->pktout_count) != - (int)itf->pktout_count) { + if (itf->pktout_count && + odp_pktout_queue(itf->pktio, itf->pktout, itf->pktout_count) != + (int)itf->pktout_count) { EXAMPLE_ERR("Error: failed to get output queues for %s\n", dev); return -1; } + itf->pktin_count = num_rx_queues; + if (!sched && itf->pktin_count && + odp_pktin_queue(itf->pktio, itf->pktin, itf->pktin_count) != + (int)itf->pktin_count) { + EXAMPLE_ERR("Error: failed to get input queues for %s\n", dev); + return -1; + } + printf(" created pktio:%02" PRIu64 ", dev:%s, queue mode (ATOMIC queues)\n" " default pktio%02" PRIu64 "\n", @@ -1140,28 +1173,29 @@ int main(int argc, char *argv[]) ifs = malloc(sizeof(interface_t) * args->appl.if_count); - if (args->appl.mode == APPL_MODE_PING || - args->appl.mode == APPL_MODE_UDP) - num_rx_queues = 1; - else - num_rx_queues = num_workers; - - if (args->appl.mode == APPL_MODE_PING || - args->appl.mode == APPL_MODE_RCV) - num_tx_queues = 1; - else { - num_tx_queues = num_workers / args->appl.if_count; - if (num_workers % args->appl.if_count) - num_tx_queues++; - } + for (i = 0; i < args->appl.if_count; ++i) { + if (args->appl.mode == APPL_MODE_PING) { + num_rx_queues = 1; + num_tx_queues = 1; + } else if (args->appl.mode == APPL_MODE_UDP) { + num_rx_queues = 0; + num_tx_queues = num_workers / args->appl.if_count; + if (i < num_workers % args->appl.if_count) + num_tx_queues++; + } else { /* APPL_MODE_RCV*/ + num_rx_queues = num_workers / args->appl.if_count; + if (i < num_workers % args->appl.if_count) + num_rx_queues++; + num_tx_queues = 0; + } - for (i = 0; i < args->appl.if_count; ++i) if (create_pktio(args->appl.if_names[i], pool, num_rx_queues, num_tx_queues, &ifs[i])) { EXAMPLE_ERR("Error: create interface %s failed.\n", args->appl.if_names[i]); exit(EXIT_FAILURE); } + } /* Create and init worker threads */ memset(thread_tbl, 0, sizeof(thread_tbl)); commit 8bd76909bea5d4d3a7917d00269a493628c96d5e Author: Bogdan Pricope <bogdan.pricope(a)linaro.org> Date: Mon Jan 8 10:59:18 2018 +0200 example: generator: add configuration option for scheduler RX Add CLI option to enable/disable packet receive with scheduler API. Default: use direct mode API. Signed-off-by: Bogdan Pricope <bogdan.pricope(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/generator/odp_generator.c b/example/generator/odp_generator.c index b516ebf7..e7a4315a 100644 --- a/example/generator/odp_generator.c +++ b/example/generator/odp_generator.c @@ -84,6 +84,7 @@ typedef struct { int rx_burst; /**< number of packets to receive with one API call */ odp_bool_t csum; /**< use platform csum support if available */ + odp_bool_t sched; /**< use scheduler API to receive packets */ } appl_args_t; /** @@ -1394,10 +1395,11 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args) {"udp_tx_burst", required_argument, NULL, 'x'}, {"rx_burst", required_argument, NULL, 'r'}, {"csum", no_argument, NULL, 'y'}, + {"sched", no_argument, NULL, 'z'}, {NULL, 0, NULL, 0} }; - static const char *shortopts = "+I:a:b:s:d:p:i:m:n:t:w:c:x:he:f:yr:"; + static const char *shortopts = "+I:a:b:s:d:p:i:m:n:t:w:c:x:he:f:yr:z"; /* let helper collect its own arguments (e.g. --odph_proc) */ odph_parse_options(argc, argv, shortopts, longopts); @@ -1412,6 +1414,7 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args) appl_args->srcport = 0; appl_args->dstport = 0; appl_args->csum = 0; + appl_args->sched = 0; opterr = 0; /* do not issue errors on helper options */ @@ -1563,6 +1566,9 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args) case 'y': appl_args->csum = 1; break; + case 'z': + appl_args->sched = 1; + break; case 'h': usage(argv[0]); exit(EXIT_SUCCESS); @@ -1652,6 +1658,8 @@ static void usage(char *progname) " -r, --rx_burst size of RX burst\n" " -y, --csum use platform checksum support if available\n" " default is disabled\n" + " -z, --sched use scheduler API to receive packets\n" + " default is direct mode API\n" "\n", NO_PATH(progname), NO_PATH(progname) ); } commit 4c23114ed39db175beaa317f63b782fad02b2c6f Author: Bogdan Pricope <bogdan.pricope(a)linaro.org> Date: Wed Dec 13 10:45:59 2017 +0200 example: generator: add configuration option for RX burst size Add CLI option to configure RX burst size. Bigger RX burst size may increase packet RX rate. Signed-off-by: Bogdan Pricope <bogdan.pricope(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/generator/odp_generator.c b/example/generator/odp_generator.c index 0fc4c9cc..b516ebf7 100644 --- a/example/generator/odp_generator.c +++ b/example/generator/odp_generator.c @@ -28,7 +28,8 @@ #define DEFAULT_PKT_INTERVAL 1000 /* Interval between each packet */ #define DEFAULT_UDP_TX_BURST 16 #define MAX_UDP_TX_BURST 512 -#define MAX_RX_BURST 32 +#define DEFAULT_RX_BURST 32 +#define MAX_RX_BURST 512 #define APPL_MODE_UDP 0 /**< UDP mode */ #define APPL_MODE_PING 1 /**< ping mode */ @@ -80,6 +81,8 @@ typedef struct { each packet */ int udp_tx_burst; /**< number of udp packets to send with one API call */ + int rx_burst; /**< number of packets to receive with one + API call */ odp_bool_t csum; /**< use platform csum support if available */ } appl_args_t; @@ -130,6 +133,7 @@ typedef struct { /** Global arguments */ int thread_cnt; int tx_burst_size; + int rx_burst_size; } args_t; /** Global pointer to args */ @@ -828,10 +832,11 @@ static int gen_recv_thread(void *arg) odp_event_t events[MAX_RX_BURST]; int pkt_cnt, ev_cnt, i; odp_packet_chksum_status_t csum_status; + int burst_size; - (void)arg; thr = odp_thread_id(); thr_args = (thread_args_t *)arg; + burst_size = args->rx_burst_size; printf(" [%02i] created mode: RECEIVE\n", thr); odp_barrier_wait(&barrier); @@ -842,7 +847,7 @@ static int gen_recv_thread(void *arg) /* Use schedule to get buf from any input queue */ ev_cnt = odp_schedule_multi(NULL, ODP_SCHED_NO_WAIT, - events, MAX_RX_BURST); + events, burst_size); if (ev_cnt == 0) continue; for (i = 0, pkt_cnt = 0; i < ev_cnt; i++) { @@ -1076,12 +1081,16 @@ int main(int argc, char *argv[]) args->thread_cnt = num_workers; /* Burst size */ - if (args->appl.mode == APPL_MODE_PING) + if (args->appl.mode == APPL_MODE_PING) { args->tx_burst_size = 1; - else if (args->appl.mode == APPL_MODE_UDP) + args->rx_burst_size = 1; + } else if (args->appl.mode == APPL_MODE_UDP) { args->tx_burst_size = args->appl.udp_tx_burst; - else + args->rx_burst_size = 0; + } else { args->tx_burst_size = 0; + args->rx_burst_size = args->appl.rx_burst; + } /* Create packet pool */ odp_pool_param_init(&params); @@ -1383,11 +1392,12 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args) {"interval", required_argument, NULL, 'i'}, {"help", no_argument, NULL, 'h'}, {"udp_tx_burst", required_argument, NULL, 'x'}, + {"rx_burst", required_argument, NULL, 'r'}, {"csum", no_argument, NULL, 'y'}, {NULL, 0, NULL, 0} }; - static const char *shortopts = "+I:a:b:s:d:p:i:m:n:t:w:c:x:he:f:y"; + static const char *shortopts = "+I:a:b:s:d:p:i:m:n:t:w:c:x:he:f:yr:"; /* let helper collect its own arguments (e.g. --odph_proc) */ odph_parse_options(argc, argv, shortopts, longopts); @@ -1398,6 +1408,7 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args) appl_args->timeout = -1; appl_args->interval = DEFAULT_PKT_INTERVAL; appl_args->udp_tx_burst = DEFAULT_UDP_TX_BURST; + appl_args->rx_burst = DEFAULT_RX_BURST; appl_args->srcport = 0; appl_args->dstport = 0; appl_args->csum = 0; @@ -1540,6 +1551,14 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args) exit(EXIT_FAILURE); } break; + case 'r': + appl_args->rx_burst = atoi(optarg); + if (appl_args->rx_burst > MAX_RX_BURST) { + EXAMPLE_ERR("wrong Rx burst size (max %d)\n", + MAX_RX_BURST); + exit(EXIT_FAILURE); + } + break; case 'y': appl_args->csum = 1; @@ -1630,6 +1649,7 @@ static void usage(char *progname) " -n, --count the number of packets to be send\n" " -c, --cpumask to set on cores\n" " -x, --udp_tx_burst size of UDP TX burst\n" + " -r, --rx_burst size of RX burst\n" " -y, --csum use platform checksum support if available\n" " default is disabled\n" "\n", NO_PATH(progname), NO_PATH(progname) ----------------------------------------------------------------------- Summary of changes: example/generator/odp_generator.c | 339 ++++++++++++++++++++++++++------------ test/performance/odp_l2fwd.c | 40 ++--- 2 files changed, 250 insertions(+), 129 deletions(-) hooks/post-receive --

7 years, 5 months

[COMMIT] branch master updated. v1.17.0.0_tigermoth_rc1-2-g88fd84e7

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 88fd84e7e613ce93fc078320b312d2aa8c388a8c (commit) via 2503425036ca2ee48003ef20fcb87003e5d1e956 (commit) from 49ebafae0edebbc750742d8874ad0a7588286dea (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 88fd84e7e613ce93fc078320b312d2aa8c388a8c Author: Bill Fischofer <bill.fischofer(a)linaro.org> Date: Tue Jan 9 17:43:36 2018 -0600 helper: remove camelcase from icmp protocol Change ODPH_IPPROTO_ICMPv4 and ODPH_IPPROTO_ICMPv6 to ODPH_IPPROTO_ICMPV4 and ODPH_PROTO_ICMPV6 to eliminate camelcase issues in ODP examples. Signed-off-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Bogdan Pricope <bogdan.pricope(a)linaro.org> Reviewed-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/example/generator/odp_generator.c b/example/generator/odp_generator.c index b1827e9c..0fc4c9cc 100644 --- a/example/generator/odp_generator.c +++ b/example/generator/odp_generator.c @@ -426,7 +426,7 @@ static odp_packet_t setup_icmp_pkt_ref(odp_pool_t pool, ip->ttl = 64; ip->tot_len = odp_cpu_to_be_16(args->appl.payload + ODPH_ICMPHDR_LEN + ODPH_IPV4HDR_LEN); - ip->proto = ODPH_IPPROTO_ICMPv4; + ip->proto = ODPH_IPPROTO_ICMPV4; ip->id = 0; ip->chksum = 0; @@ -806,7 +806,7 @@ static void print_pkts(int thr, thread_args_t *thr_args, thr_args->counters.ctr_udp_rcv++; /* icmp */ - if (ip->proto == ODPH_IPPROTO_ICMPv4) { + if (ip->proto == ODPH_IPPROTO_ICMPV4) { icmp = (odph_icmphdr_t *)(buf + offset); process_icmp_pkt(thr_args, icmp, msg); diff --git a/example/ipsec/odp_ipsec_stream.c b/example/ipsec/odp_ipsec_stream.c index c287282e..3773ce52 100644 --- a/example/ipsec/odp_ipsec_stream.c +++ b/example/ipsec/odp_ipsec_stream.c @@ -217,7 +217,7 @@ odp_packet_t create_ipv4_packet(stream_db_entry_t *stream, ip->src_addr = odp_cpu_to_be_32(entry->tun_src_ip); ip->dst_addr = odp_cpu_to_be_32(entry->tun_dst_ip); } else { - ip->proto = ODPH_IPPROTO_ICMPv4; + ip->proto = ODPH_IPPROTO_ICMPV4; ip->src_addr = odp_cpu_to_be_32(stream->src_ip); ip->dst_addr = odp_cpu_to_be_32(stream->dst_ip); } @@ -260,7 +260,7 @@ odp_packet_t create_ipv4_packet(stream_db_entry_t *stream, inner_ip = (odph_ipv4hdr_t *)data; memset((char *)inner_ip, 0, sizeof(*inner_ip)); inner_ip->ver_ihl = 0x45; - inner_ip->proto = ODPH_IPPROTO_ICMPv4; + inner_ip->proto = ODPH_IPPROTO_ICMPV4; inner_ip->id = odp_cpu_to_be_16(stream->id); inner_ip->ttl = 64; inner_ip->tos = 0; @@ -518,7 +518,7 @@ clear_packet: icmp = (odph_icmphdr_t *)(inner_ip + 1); data = (uint8_t *)icmp; } else { - if (ODPH_IPPROTO_ICMPv4 != ip->proto) + if (ODPH_IPPROTO_ICMPV4 != ip->proto) return FALSE; icmp = (odph_icmphdr_t *)data; } diff --git a/helper/include/odp/helper/ip.h b/helper/include/odp/helper/ip.h index b96aab28..7ef8dbc3 100644 --- a/helper/include/odp/helper/ip.h +++ b/helper/include/odp/helper/ip.h @@ -251,14 +251,14 @@ typedef struct ODP_PACKED { * IP protocol values (IPv4:'proto' or IPv6:'next_hdr') * @{*/ #define ODPH_IPPROTO_HOPOPTS 0x00 /**< IPv6 hop-by-hop options */ -#define ODPH_IPPROTO_ICMPv4 0x01 /**< Internet Control Message Protocol (1) */ +#define ODPH_IPPROTO_ICMPV4 0x01 /**< Internet Control Message Protocol (1) */ #define ODPH_IPPROTO_TCP 0x06 /**< Transmission Control Protocol (6) */ #define ODPH_IPPROTO_UDP 0x11 /**< User Datagram Protocol (17) */ #define ODPH_IPPROTO_ROUTE 0x2B /**< IPv6 Routing header (43) */ #define ODPH_IPPROTO_FRAG 0x2C /**< IPv6 Fragment (44) */ #define ODPH_IPPROTO_AH 0x33 /**< Authentication Header (51) */ #define ODPH_IPPROTO_ESP 0x32 /**< Encapsulating Security Payload (50) */ -#define ODPH_IPPROTO_ICMPv6 0x3A /**< Internet Control Message Protocol (58) */ +#define ODPH_IPPROTO_ICMPV6 0x3A /**< Internet Control Message Protocol (58) */ #define ODPH_IPPROTO_INVALID 0xFF /**< Reserved invalid by IANA */ /**@}*/ commit 2503425036ca2ee48003ef20fcb87003e5d1e956 Author: Bill Fischofer <bill.fischofer(a)linaro.org> Date: Tue Jan 9 17:40:32 2018 -0600 linux-generic: remove camelcase from icmp protocol Change ODP_IPPROTO_ICMPv4 and ODP_IPPROTO_ICMPv6 to ODP_IPPROTO_ICMPV4 and ODP_IPPROTO_ICMPV6 to eliminate camelcase issues in ODP code. Signed-off-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Bogdan Pricope <bogdan.pricope(a)linaro.org> Reviewed-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/include/protocols/ip.h b/platform/linux-generic/include/protocols/ip.h index 7b6b736a..e92a3899 100644 --- a/platform/linux-generic/include/protocols/ip.h +++ b/platform/linux-generic/include/protocols/ip.h @@ -157,7 +157,7 @@ typedef struct ODP_PACKED { * IP protocol values (IPv4:'proto' or IPv6:'next_hdr') * @{*/ #define _ODP_IPPROTO_HOPOPTS 0x00 /**< IPv6 hop-by-hop options */ -#define _ODP_IPPROTO_ICMPv4 0x01 /**< Internet Control Message Protocol (1) */ +#define _ODP_IPPROTO_ICMPV4 0x01 /**< Internet Control Message Protocol (1) */ #define _ODP_IPPROTO_IPIP 0x04 /**< IP Encapsulation within IP (4) */ #define _ODP_IPPROTO_TCP 0x06 /**< Transmission Control Protocol (6) */ #define _ODP_IPPROTO_UDP 0x11 /**< User Datagram Protocol (17) */ @@ -166,7 +166,7 @@ typedef struct ODP_PACKED { #define _ODP_IPPROTO_FRAG 0x2C /**< IPv6 Fragment (44) */ #define _ODP_IPPROTO_AH 0x33 /**< Authentication Header (51) */ #define _ODP_IPPROTO_ESP 0x32 /**< Encapsulating Security Payload (50) */ -#define _ODP_IPPROTO_ICMPv6 0x3A /**< Internet Control Message Protocol (58) */ +#define _ODP_IPPROTO_ICMPV6 0x3A /**< Internet Control Message Protocol (58) */ #define _ODP_IPPROTO_DEST 0x3C /**< IPv6 Destination header (60) */ #define _ODP_IPPROTO_SCTP 0x84 /**< Stream Control Transmission protocol (132) */ diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index 83a88094..a812fec1 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -2220,10 +2220,10 @@ int packet_parse_common_l3_l4(packet_parser_t *prs, const uint8_t *parseptr, /* Parse Layer 4 headers */ switch (ip_proto) { - case _ODP_IPPROTO_ICMPv4: + case _ODP_IPPROTO_ICMPV4: /* Fall through */ - case _ODP_IPPROTO_ICMPv6: + case _ODP_IPPROTO_ICMPV6: prs->input_flags.icmp = 1; break; ----------------------------------------------------------------------- Summary of changes: example/generator/odp_generator.c | 4 ++-- example/ipsec/odp_ipsec_stream.c | 6 +++--- helper/include/odp/helper/ip.h | 4 ++-- platform/linux-generic/include/protocols/ip.h | 4 ++-- platform/linux-generic/odp_packet.c | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) hooks/post-receive --

7 years, 5 months

[COMMIT] branch caterpillar updated. v1.15.0.0-955-g4d17f8ae

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, caterpillar has been updated via 4d17f8ae64aba0e6f24877be30f86ae5880cef7e (commit) via 0b9b3c3ee67e11b798c41ac6ac8b71f80546f1d2 (commit) via 055516066c0a1104501cfd1050f0407fbec230c1 (commit) via a3f913fe4d0008641684b90d7209d23296a48767 (commit) via 2d0ddc0917fa97d4ee9d1ec7009fe1abb9c42085 (commit) via 9eebbe7d21f0b933190fd910c54c872eecfe180e (commit) from bbbe6c0ef65c16f6d7d327712f177fbf6740e96f (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 4d17f8ae64aba0e6f24877be30f86ae5880cef7e Author: Joyce Kong <joyce.kong(a)arm.com> Date: Thu Dec 7 14:19:15 2017 +0800 linux-generic: buffer: remove handle/index in metadata Signed-off-by: Joyce Kong <joyce.kong(a)arm.com> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Yi He <yi.he(a)linaro.org> diff --git a/platform/linux-generic/buffer/generic.c b/platform/linux-generic/buffer/generic.c index cf99407c..543cc530 100644 --- a/platform/linux-generic/buffer/generic.c +++ b/platform/linux-generic/buffer/generic.c @@ -193,7 +193,7 @@ static inline void buffer_free_to_pool(pool_t *pool, ring = &pool->ring->hdr; mask = pool->ring_mask; for (i = 0; i < num; i++) - buf_index[i] = buf_hdr[i]->index; + buf_index[i] = buf_hdr_to_index(buf_hdr[i]); ring_enq_multi(ring, mask, buf_index, num); @@ -233,7 +233,7 @@ static inline void buffer_free_to_pool(pool_t *pool, } for (i = 0; i < num; i++) - cache->buf_index[cache_num + i] = buf_hdr[i]->index; + cache->buf_index[cache_num + i] = buf_hdr_to_index(buf_hdr[i]); cache->num = cache_num + num; } diff --git a/platform/linux-generic/include/odp_buffer_internal.h b/platform/linux-generic/include/odp_buffer_internal.h index 514e2479..b8e8c171 100644 --- a/platform/linux-generic/include/odp_buffer_internal.h +++ b/platform/linux-generic/include/odp_buffer_internal.h @@ -43,10 +43,6 @@ typedef struct seg_entry_t { /* Common buffer header */ struct odp_buffer_hdr_t { - - /* Buffer index in the pool */ - uint32_t index; - /* Total segment count */ uint16_t segcount; diff --git a/platform/linux-generic/include/odp_pool_internal.h b/platform/linux-generic/include/odp_pool_internal.h index a124697e..cf1a423f 100644 --- a/platform/linux-generic/include/odp_pool_internal.h +++ b/platform/linux-generic/include/odp_pool_internal.h @@ -139,6 +139,14 @@ static inline odp_buffer_hdr_t *buf_hdr_from_index(pool_t *pool, return buf_hdr; } +static inline uint32_t buf_hdr_to_index(odp_buffer_hdr_t *buf_hdr) +{ + pool_t *pool = buf_hdr->pool_ptr; + uint32_t index = ((uint8_t *)buf_hdr - pool->base_addr) + / pool->block_size; + + return index; +} int buffer_alloc_multi(pool_t *pool, odp_buffer_hdr_t *buf_hdr[], int num); void buffer_free_multi(odp_buffer_hdr_t *buf_hdr[], int num_free); diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index 853d3baa..cb20eeda 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -10,6 +10,7 @@ #include <odp/api/packet.h> #include <odp_packet_internal.h> #include <odp_debug_internal.h> +#include <odp_pool_internal.h> #include <odp/api/hints.h> #include <odp/api/byteorder.h> @@ -1796,7 +1797,8 @@ void odp_packet_print_data(odp_packet_t pkt, uint32_t offset, len += snprintf(&str[len], n - len, " pool index %" PRIu32 "\n", pool->pool_idx); len += snprintf(&str[len], n - len, - " buf index %" PRIu32 "\n", hdr->buf_hdr.index); + " buf index %" PRIu32 "\n", + buf_hdr_to_index(&hdr->buf_hdr)); len += snprintf(&str[len], n - len, " segcount %" PRIu16 "\n", hdr->buf_hdr.segcount); len += snprintf(&str[len], n - len, diff --git a/platform/linux-generic/pool/generic.c b/platform/linux-generic/pool/generic.c index 7a068472..4d5f5946 100644 --- a/platform/linux-generic/pool/generic.c +++ b/platform/linux-generic/pool/generic.c @@ -259,7 +259,6 @@ static void init_buffers(pool_t *pool) seg_size = pool->headroom + pool->seg_len + pool->tailroom; /* Initialize buffer metadata */ - buf_hdr->index = i; buf_hdr->size = seg_size; buf_hdr->type = type; buf_hdr->event_type = type; commit 0b9b3c3ee67e11b798c41ac6ac8b71f80546f1d2 Author: Joyce Kong <joyce.kong(a)arm.com> Date: Wed Dec 13 18:35:20 2017 +0800 linux-dpdk: buffer: remove handle/index in metadata Signed-off-by: Joyce Kong <joyce.kong(a)arm.com> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Yi He <yi.he(a)linaro.org> diff --git a/platform/linux-dpdk/include/odp_buffer_internal.h b/platform/linux-dpdk/include/odp_buffer_internal.h index cc9c7d39..20fe5cb9 100644 --- a/platform/linux-dpdk/include/odp_buffer_internal.h +++ b/platform/linux-dpdk/include/odp_buffer_internal.h @@ -51,8 +51,6 @@ typedef union odp_buffer_bits_t { struct odp_buffer_hdr_t { /* Underlying DPDK rte_mbuf */ struct rte_mbuf mb; - /* Handle union */ - odp_buffer_bits_t handle; /* ODP buffer type, not DPDK buf type */ int type; @@ -87,8 +85,6 @@ struct odp_buffer_hdr_t { /* Total size of all allocated segs */ uint32_t totsize; - /* Index in the rte_mempool */ - uint32_t index; }; ODP_STATIC_ASSERT(BUFFER_BURST_SIZE < 256, "BUFFER_BURST_SIZE_TOO_LARGE"); diff --git a/platform/linux-dpdk/odp_packet.c b/platform/linux-dpdk/odp_packet.c index 54f34007..46e55b5f 100644 --- a/platform/linux-dpdk/odp_packet.c +++ b/platform/linux-dpdk/odp_packet.c @@ -74,7 +74,7 @@ ODP_STATIC_ASSERT(sizeof(dummy.ol_flags) == sizeof(uint64_t), static inline odp_buffer_t buffer_handle(odp_packet_hdr_t *pkt_hdr) { - return pkt_hdr->buf_hdr.handle.handle; + return (odp_buffer_t)pkt_hdr; } static inline odp_packet_hdr_t *buf_to_packet_hdr(odp_buffer_t buf) @@ -259,9 +259,6 @@ void *odp_packet_push_head(odp_packet_t pkt, uint32_t len) static void _copy_head_metadata(struct rte_mbuf *newhead, struct rte_mbuf *oldhead) { - odp_packet_t pkt = (odp_packet_t)newhead; - uint32_t saved_index = odp_packet_hdr(pkt)->buf_hdr.index; - rte_mbuf_refcnt_set(newhead, rte_mbuf_refcnt_read(oldhead)); newhead->port = oldhead->port; newhead->ol_flags = oldhead->ol_flags; @@ -274,9 +271,6 @@ static void _copy_head_metadata(struct rte_mbuf *newhead, memcpy(&newhead->tx_offload, &oldhead->tx_offload, sizeof(odp_packet_hdr_t) - offsetof(struct rte_mbuf, tx_offload)); - odp_packet_hdr(pkt)->buf_hdr.handle.handle = - (odp_buffer_t)newhead; - odp_packet_hdr(pkt)->buf_hdr.index = saved_index; } int odp_packet_extend_head(odp_packet_t *pkt, uint32_t len, void **data_ptr, @@ -1119,8 +1113,6 @@ void odp_packet_print_data(odp_packet_t pkt, uint32_t offset, len += snprintf(&str[len], n - len, "Packet\n------\n"); len += snprintf(&str[len], n - len, " pool index %" PRIu32 "\n", pool_handle_to_index(pool)); - len += snprintf(&str[len], n - len, - " buf index %" PRIu32 "\n", hdr->buf_hdr.index); len += snprintf(&str[len], n - len, " data len %" PRIu32 "\n", data_len); len += snprintf(&str[len], n - len, diff --git a/platform/linux-dpdk/pool/dpdk.c b/platform/linux-dpdk/pool/dpdk.c index 94143dfe..d2f510c9 100644 --- a/platform/linux-dpdk/pool/dpdk.c +++ b/platform/linux-dpdk/pool/dpdk.c @@ -194,7 +194,7 @@ static void odp_dpdk_mbuf_ctor(struct rte_mempool *mp, void *opaque_arg, void *raw_mbuf, - unsigned i) + unsigned i ODP_UNUSED) { struct mbuf_ctor_arg *mb_ctor_arg; struct rte_mbuf *mb = raw_mbuf; @@ -231,10 +231,7 @@ odp_dpdk_mbuf_ctor(struct rte_mempool *mp, mb->pool = mp; mb->ol_flags = 0; - /* Save index, might be useful for debugging purposes */ buf_hdr = (struct odp_buffer_hdr_t *)raw_mbuf; - buf_hdr->index = i; - buf_hdr->handle.handle = (odp_buffer_t)buf_hdr; buf_hdr->pool_hdl = mbp_ctor_arg->pool_hdl; buf_hdr->type = mb_ctor_arg->type; buf_hdr->event_type = mb_ctor_arg->type; commit 055516066c0a1104501cfd1050f0407fbec230c1 Author: Mykyta Iziumtsev <mykyta.iziumtsev(a)linaro.org> Date: Wed Dec 20 18:14:15 2017 +0100 linux-gen: move common macros to odp_internal.h Gather macros needed for upcoming mediated devices in one location. Fix signed vs. unsigned comparisons caused by incorrect MIN / MAX usage. Signed-off-by: Mykyta Iziumtsev <mykyta.iziumtsev(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Yi He <yi.he(a)linaro.org> diff --git a/platform/linux-generic/include/odp_bitmap_internal.h b/platform/linux-generic/include/odp_bitmap_internal.h index 1be4d028..dd842903 100644 --- a/platform/linux-generic/include/odp_bitmap_internal.h +++ b/platform/linux-generic/include/odp_bitmap_internal.h @@ -21,14 +21,12 @@ extern "C" { #include <stdbool.h> #include <string.h> #include <odp/api/hints.h> +#include <odp_internal.h> /* Generate unique identifier for instantiated class */ #define TOKENIZE(template, line) \ template ## _ ## line ## _ ## __COUNTER__ -/* Array size in general */ -#define ARRAY_SIZE(array) (sizeof(array) / sizeof(array[0])) - #define BITS_PER_BYTE (8) #define BITS_PER_LONG __WORDSIZE #define BYTES_PER_LONG (BITS_PER_LONG / BITS_PER_BYTE) diff --git a/platform/linux-generic/include/odp_internal.h b/platform/linux-generic/include/odp_internal.h index 6811d8d0..ece73635 100644 --- a/platform/linux-generic/include/odp_internal.h +++ b/platform/linux-generic/include/odp_internal.h @@ -161,6 +161,33 @@ uint64_t odp_cpu_hz_current(int id); uint64_t odp_cpu_arch_hz_current(int id); void sys_info_print_arch(void); +#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) + +#define MIN(a, b) \ + ({ \ + __typeof__(a) tmp_a = (a); \ + __typeof__(b) tmp_b = (b); \ + tmp_a < tmp_b ? tmp_a : tmp_b; \ + }) +#define MAX(a, b) \ + ({ \ + __typeof__(a) tmp_a = (a); \ + __typeof__(b) tmp_b = (b); \ + tmp_a > tmp_b ? tmp_a : tmp_b; \ + }) + +#define odp_container_of(pointer, type, member) \ + ((type *)(void *)(((char *)pointer) - offsetof(type, member))) + +#define DIV_ROUND_UP(a, b) \ + ({ \ + __typeof__(a) tmp_a = (a); \ + __typeof__(b) tmp_b = (b); \ + ODP_STATIC_ASSERT(__builtin_constant_p(b), ""); \ + ODP_STATIC_ASSERT((((b) - 1) & (b)) == 0, ""); \ + (tmp_a + tmp_b - 1) >> __builtin_ctz(tmp_b); \ + }) + #ifdef __cplusplus } #endif diff --git a/platform/linux-generic/include/odp_traffic_mngr_internal.h b/platform/linux-generic/include/odp_traffic_mngr_internal.h index e8254f5e..2d1fc549 100644 --- a/platform/linux-generic/include/odp_traffic_mngr_internal.h +++ b/platform/linux-generic/include/odp_traffic_mngr_internal.h @@ -34,9 +34,6 @@ extern "C" { typedef struct stat file_stat_t; -#define MAX(a, b) (((a) > (b)) ? (a) : (b)) -#define MIN(a, b) (((a) < (b)) ? (a) : (b)) - #define INPUT_WORK_RING_SIZE (16 * 1024) #define TM_QUEUE_MAGIC_NUM 0xBABEBABE diff --git a/platform/linux-generic/odp_name_table.c b/platform/linux-generic/odp_name_table.c index 3ff46b34..e2a0401b 100644 --- a/platform/linux-generic/odp_name_table.c +++ b/platform/linux-generic/odp_name_table.c @@ -14,9 +14,7 @@ #include <stdlib.h> #include <odp_name_table_internal.h> #include <odp_debug_internal.h> - -#define MAX(a, b) (((a) > (b)) ? (a) : (b)) -#define MIN(a, b) (((a) < (b)) ? (a) : (b)) +#include <odp_internal.h> /* The following constants define some tunable parameters of this module. * They are set to fairly reasonable values (perhaps somewhat biased toward @@ -298,7 +296,7 @@ static int new_name_tbl_add(void) name_tbls_idx = name_tbls.num_name_tbls; num_entries = INITIAL_NAME_TBL_SIZE << name_tbls_idx; new_name_tbl = name_tbl_alloc(name_tbls_idx, num_entries); - name_tbl_free_list_add(new_name_tbl, MIN(num_entries, 256)); + name_tbl_free_list_add(new_name_tbl, MIN(num_entries, UINT32_C(256))); name_tbls.tbls[name_tbls_idx] = new_name_tbl; name_tbls.avail_space_bit_mask |= 1 << name_tbls_idx; @@ -387,7 +385,7 @@ static hash_tbl_entry_t make_hash_tbl_entry(name_tbl_entry_t *name_tbl_entry, hash_tbl_entry_t hash_tbl_entry; uint32_t new_entry_cnt; - new_entry_cnt = MIN(entry_cnt + 1, 0x3F); + new_entry_cnt = MIN(entry_cnt + 1, UINT32_C(0x3F)); hash_tbl_entry = (hash_tbl_entry_t)(uintptr_t)name_tbl_entry; hash_tbl_entry &= ~0x3F; hash_tbl_entry |= new_entry_cnt; @@ -1006,7 +1004,7 @@ static uint32_t level2_hash_histo(secondary_hash_tbl_t *hash_tbl, collisions = linked_list_len(name_tbl_entry); } - level2_histo[MIN(collisions, 256)]++; + level2_histo[MIN(collisions, UINT32_C(256))]++; total_collisions += collisions; } @@ -1038,7 +1036,7 @@ static uint32_t level1_hash_histo(secondary_hash_tbl_t *hash_tbl, level2_histo); } - level1_histo[MIN(collisions, 256)]++; + level1_histo[MIN(collisions, UINT32_C(256))]++; total_collisions += collisions; } @@ -1147,7 +1145,8 @@ void _odp_int_name_tbl_stats_print(void) memset(primary_hash_histo, 0, sizeof(primary_hash_histo)); for (idx = 0; idx < PRIMARY_HASH_TBL_SIZE; idx++) { - collisions = MIN(name_hash_tbl.hash_collisions[idx], 256); + collisions = + MIN(name_hash_tbl.hash_collisions[idx], UINT32_C(256)); primary_hash_histo[collisions]++; } diff --git a/platform/linux-generic/odp_pkt_queue.c b/platform/linux-generic/odp_pkt_queue.c index 4f6a1eb6..502203b7 100644 --- a/platform/linux-generic/odp_pkt_queue.c +++ b/platform/linux-generic/odp_pkt_queue.c @@ -16,9 +16,7 @@ #include <odp_api.h> #include <odp_pkt_queue_internal.h> #include <odp_debug_internal.h> - -#define MAX(a, b) (((a) > (b)) ? (a) : (b)) -#define MIN(a, b) (((a) < (b)) ? (a) : (b)) +#include <odp_internal.h> #define NUM_PKTS 7 @@ -229,7 +227,7 @@ _odp_int_queue_pool_t _odp_queue_pool_create(uint32_t max_num_queues, /* Initialize the queue_blk_tbl_sizes array based upon the * max_queued_pkts. */ - max_queued_pkts = MAX(max_queued_pkts, 64 * 1024); + max_queued_pkts = MAX(max_queued_pkts, 64 * UINT32_C(1024)); queue_region_desc_init(pool, 0, max_queued_pkts / 4); queue_region_desc_init(pool, 1, max_queued_pkts / 64); queue_region_desc_init(pool, 2, max_queued_pkts / 64); @@ -241,7 +239,7 @@ _odp_int_queue_pool_t _odp_queue_pool_create(uint32_t max_num_queues, /* Now allocate the first queue_blk_tbl and add its blks to the free * list. Replenish the queue_blk_t free list. */ - initial_free_list_size = MIN(64 * 1024, max_queued_pkts / 4); + initial_free_list_size = MIN(64 * UINT32_C(1024), max_queued_pkts / 4); rc = pkt_queue_free_list_add(pool, initial_free_list_size); if (rc < 0) { free(pool->queue_num_tbl); diff --git a/platform/linux-generic/odp_timer_wheel.c b/platform/linux-generic/odp_timer_wheel.c index b37d269b..9b1e5383 100644 --- a/platform/linux-generic/odp_timer_wheel.c +++ b/platform/linux-generic/odp_timer_wheel.c @@ -627,7 +627,7 @@ static int timer_current_wheel_update(timer_wheels_t *timer_wheels, slot_idx = wheel_desc->slot_idx; num_slots = wheel_desc->num_slots; max_ticks = wheel_desc->max_ticks; - max_cnt = (uint32_t)MIN(elapsed_ticks, 32); + max_cnt = MIN(elapsed_ticks, UINT32_C(32)); current_wheel = timer_wheels->current_wheel; ret_code = 0; rc = -1; diff --git a/platform/linux-generic/odp_traffic_mngr.c b/platform/linux-generic/odp_traffic_mngr.c index ab06b3c0..20af537f 100644 --- a/platform/linux-generic/odp_traffic_mngr.c +++ b/platform/linux-generic/odp_traffic_mngr.c @@ -729,7 +729,8 @@ static uint64_t time_till_not_red(tm_shaper_params_t *shaper_params, commit_delay = (-shaper_obj->commit_cnt) / shaper_params->commit_rate; - min_time_delay = MAX(shaper_obj->shaper_params->min_time_delta, 256); + min_time_delay = + MAX(shaper_obj->shaper_params->min_time_delta, UINT64_C(256)); commit_delay = MAX(commit_delay, min_time_delay); if (shaper_params->peak_rate == 0) return commit_delay; @@ -1668,7 +1669,7 @@ static odp_tm_percent_t tm_queue_fullness(tm_wred_params_t *wred_params, return 0; fullness = (10000 * current_cnt) / max_cnt; - return (odp_tm_percent_t)MIN(fullness, 50000); + return (odp_tm_percent_t)MIN(fullness, UINT64_C(50000)); } static odp_bool_t tm_local_random_drop(tm_system_t *tm_system, @@ -2499,7 +2500,7 @@ static void tm_system_capabilities_set(odp_tm_capabilities_t *cap_ptr, memset(cap_ptr, 0, sizeof(odp_tm_capabilities_t)); max_queues = MIN(req_ptr->max_tm_queues, - ODP_TM_MAX_NUM_TM_NODES); + (uint32_t)ODP_TM_MAX_NUM_TM_NODES); shaper_supported = req_ptr->tm_queue_shaper_needed; wred_supported = req_ptr->tm_queue_wred_needed; dual_slope = req_ptr->tm_queue_dual_slope_needed; @@ -2523,8 +2524,9 @@ static void tm_system_capabilities_set(odp_tm_capabilities_t *cap_ptr, per_level_req = &req_ptr->per_level[level_idx]; max_nodes = MIN(per_level_req->max_num_tm_nodes, - ODP_TM_MAX_NUM_TM_NODES); - max_fanin = MIN(per_level_req->max_fanin_per_node, 1024); + (uint32_t)ODP_TM_MAX_NUM_TM_NODES); + max_fanin = MIN(per_level_req->max_fanin_per_node, + UINT32_C(1024)); max_priority = MIN(per_level_req->max_priority, ODP_TM_MAX_PRIORITIES - 1); min_weight = MAX(per_level_req->min_weight, diff --git a/platform/linux-generic/queue/scalable.c b/platform/linux-generic/queue/scalable.c index f4f5efb8..566d75bd 100644 --- a/platform/linux-generic/queue/scalable.c +++ b/platform/linux-generic/queue/scalable.c @@ -33,13 +33,6 @@ #define NUM_INTERNAL_QUEUES 64 -#define MIN(a, b) \ - ({ \ - __typeof__(a) tmp_a = (a); \ - __typeof__(b) tmp_b = (b); \ - tmp_a < tmp_b ? tmp_a : tmp_b; \ - }) - #define LOCK(a) _odp_ticketlock_lock(a) #define UNLOCK(a) _odp_ticketlock_unlock(a) #define LOCK_INIT(a) odp_ticketlock_init(a) diff --git a/platform/linux-generic/schedule/scalable.c b/platform/linux-generic/schedule/scalable.c index de9c6528..3940e6f0 100644 --- a/platform/linux-generic/schedule/scalable.c +++ b/platform/linux-generic/schedule/scalable.c @@ -145,10 +145,6 @@ static void remove_schedq_from_list(sched_scalable_thread_state_t *ts, /******************************************************************************* * Scheduler queues ******************************************************************************/ -#ifndef odp_container_of -#define odp_container_of(pointer, type, member) \ - ((type *)(void *)(((char *)pointer) - offsetof(type, member))) -#endif static inline void schedq_init(sched_queue_t *schedq, uint32_t prio) { commit a3f913fe4d0008641684b90d7209d23296a48767 Author: Mykyta Iziumtsev <mykyta.iziumtsev(a)linaro.org> Date: Wed Dec 20 13:57:03 2017 +0100 linux-gen: extend sysfs parsing helper functions Added char* and uint64_t sysfs attribute read functions to support upcoming native and mediated device drivers. Updated sysfs_netif_stats() to take interface name as argument instead of pktio_entry, because pktio_entry->s.name is not necessarily recognisable Linux network interface name. Signed-off-by: Mykyta Iziumtsev <mykyta.iziumtsev(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Yi He <yi.he(a)linaro.org> diff --git a/platform/linux-generic/pktio/common.c b/platform/linux-generic/pktio/common.c index 900dcbba..e6eb0990 100644 --- a/platform/linux-generic/pktio/common.c +++ b/platform/linux-generic/pktio/common.c @@ -45,7 +45,7 @@ int sock_stats_reset_fd(pktio_entry_t *pktio_entry, int fd) pktio_entry->s.name, &cur_stats); } else if (pktio_entry->s.stats_type == STATS_SYSFS) { - err = sysfs_stats(pktio_entry, &cur_stats); + err = sysfs_netif_stats(pktio_entry->s.name, &cur_stats); if (err != 0) ODP_ERR("stats error\n"); } @@ -78,7 +78,7 @@ int sock_stats_fd(pktio_entry_t *pktio_entry, pktio_entry->s.name, &cur_stats); } else if (pktio_entry->s.stats_type == STATS_SYSFS) { - sysfs_stats(pktio_entry, &cur_stats); + sysfs_netif_stats(pktio_entry->s.name, &cur_stats); } stats->in_octets = cur_stats.in_octets - diff --git a/platform/linux-generic/pktio/socket.c b/platform/linux-generic/pktio/socket.c index 7e0485b9..320de973 100644 --- a/platform/linux-generic/pktio/socket.c +++ b/platform/linux-generic/pktio/socket.c @@ -204,7 +204,7 @@ static int sock_setup_pkt(pktio_entry_t *pktio_entry, const char *netdev, pktio_entry->s.name, &cur_stats); if (err != 0) { - err = sysfs_stats(pktio_entry, &cur_stats); + err = sysfs_netif_stats(pktio_entry->s.name, &cur_stats); if (err != 0) { pktio_entry->s.stats_type = STATS_UNSUPPORTED; ODP_DBG("pktio: %s unsupported stats\n", diff --git a/platform/linux-generic/pktio/socket_mmap.c b/platform/linux-generic/pktio/socket_mmap.c index 271c2f0f..26d0a295 100644 --- a/platform/linux-generic/pktio/socket_mmap.c +++ b/platform/linux-generic/pktio/socket_mmap.c @@ -593,7 +593,7 @@ static int sock_mmap_open(odp_pktio_t id ODP_UNUSED, pktio_entry->s.name, &cur_stats); if (ret != 0) { - ret = sysfs_stats(pktio_entry, &cur_stats); + ret = sysfs_netif_stats(pktio_entry->s.name, &cur_stats); if (ret != 0) { pktio_entry->s.stats_type = STATS_UNSUPPORTED; ODP_DBG("pktio: %s unsupported stats\n", diff --git a/platform/linux-generic/pktio/sysfs.c b/platform/linux-generic/pktio/sysfs.c index f674ac42..8bd7d4fb 100644 --- a/platform/linux-generic/pktio/sysfs.c +++ b/platform/linux-generic/pktio/sysfs.c @@ -7,74 +7,158 @@ #include "config.h" #include <odp_api.h> -#include <odp_packet_io_internal.h> +#include <odp_errno_define.h> #include <pktio/sysfs.h> + #include <errno.h> #include <string.h> #include <inttypes.h> +#include <stdarg.h> +#include <stdio.h> +#include <stdlib.h> -static int sysfs_get_val(const char *fname, uint64_t *val) +ODP_PRINTF_FORMAT(3, 0) +static int _sysfs_attr_raw_get(char *buf, size_t buf_size, const char *fmt, + va_list args) { - FILE *file; - char str[128]; - int ret = -1; + char path[256]; + FILE *file; + int ret; - file = fopen(fname, "rt"); - if (file == NULL) { + ret = vsnprintf(path, sizeof(path), fmt, args); + + if (ret < 0) { __odp_errno = errno; - /* do not print debug err if sysfs is not supported by - * kernel driver. - */ - if (errno != ENOENT) - ODP_ERR("fopen %s: %s\n", fname, strerror(errno)); - return 0; + return -1; + } + + if (ret >= (ssize_t)sizeof(path)) { + __odp_errno = EINVAL; + return -1; } - if (fgets(str, sizeof(str), file) != NULL) - ret = sscanf(str, "%" SCNx64, val); + file = fopen(path, "rt"); + if (file == NULL) { + __odp_errno = errno; + return -1; + } + buf = fgets(buf, buf_size, file); (void)fclose(file); - if (ret != 1) { - ODP_ERR("read %s\n", fname); + if (buf == NULL) { + __odp_errno = errno; return -1; } return 0; } -int sysfs_stats(pktio_entry_t *pktio_entry, - odp_pktio_stats_t *stats) +ODP_PRINTF_FORMAT(3, 4) +int sysfs_attr_raw_get(char *buf, size_t buf_size, const char *fmt, ...) { - char fname[256]; - const char *dev = pktio_entry->s.name; - int ret = 0; + va_list args; + int ret; - sprintf(fname, "/sys/class/net/%s/statistics/rx_bytes", dev); - ret -= sysfs_get_val(fname, &stats->in_octets); + va_start(args, fmt); + ret = _sysfs_attr_raw_get(buf, buf_size, fmt, args); + va_end(args); - sprintf(fname, "/sys/class/net/%s/statistics/rx_packets", dev); - ret -= sysfs_get_val(fname, &stats->in_ucast_pkts); + return ret; +} + +ODP_PRINTF_FORMAT(2, 3) +int sysfs_attr_u64_get(uint64_t *value, const char *fmt, ...) +{ + char buf[20 + 1 + 1]; /* 20 digits (UINT64_MAX) + '\n' + '\0' */ + va_list args; + char *endptr; + int ret; - sprintf(fname, "/sys/class/net/%s/statistics/rx_droppped", dev); - ret -= sysfs_get_val(fname, &stats->in_discards); + va_start(args, fmt); + ret = _sysfs_attr_raw_get(buf, sizeof(buf), fmt, args); + va_end(args); - sprintf(fname, "/sys/class/net/%s/statistics/rx_errors", dev); - ret -= sysfs_get_val(fname, &stats->in_errors); + if (ret < 0) + return -1; + + if (buf[0] == '\0') { + __odp_errno = EINVAL; + return -1; + } + + *value = strtoull(buf, &endptr, 0); + + /* It is OK to have '\n' in sysfs */ + if (*endptr == '\n') + endptr++; + + if (*endptr != '\0') { + __odp_errno = EINVAL; + return -1; + } + + return 0; +} + +int sysfs_netif_stats(const char *netif_name, odp_pktio_stats_t *stats) +{ + int ret; + + /* + * Do not print debug err if sysfs is not supported by + * kernel driver. + */ + + ret = sysfs_attr_u64_get(&stats->in_octets, + "/sys/class/net/%s/statistics/rx_bytes", + netif_name); + if (ret < 0 && __odp_errno != ENOENT) + return -1; + + ret = sysfs_attr_u64_get(&stats->in_ucast_pkts, + "/sys/class/net/%s/statistics/rx_packets", + netif_name); + if (ret < 0 && __odp_errno != ENOENT) + return -1; + + ret = sysfs_attr_u64_get(&stats->in_discards, + "/sys/class/net/%s/statistics/rx_droppped", + netif_name); + if (ret < 0 && __odp_errno != ENOENT) + return -1; + + ret = sysfs_attr_u64_get(&stats->in_errors, + "/sys/class/net/%s/statistics/rx_errors", + netif_name); + if (ret < 0 && __odp_errno != ENOENT) + return -1; /* stats->in_unknown_protos is not supported in sysfs */ - sprintf(fname, "/sys/class/net/%s/statistics/tx_bytes", dev); - ret -= sysfs_get_val(fname, &stats->out_octets); + ret = sysfs_attr_u64_get(&stats->out_octets, + "/sys/class/net/%s/statistics/tx_bytes", + netif_name); + if (ret < 0 && __odp_errno != ENOENT) + return -1; - sprintf(fname, "/sys/class/net/%s/statistics/tx_packets", dev); - ret -= sysfs_get_val(fname, &stats->out_ucast_pkts); + ret = sysfs_attr_u64_get(&stats->out_ucast_pkts, + "/sys/class/net/%s/statistics/tx_packets", + netif_name); + if (ret < 0 && __odp_errno != ENOENT) + return -1; - sprintf(fname, "/sys/class/net/%s/statistics/tx_dropped", dev); - ret -= sysfs_get_val(fname, &stats->out_discards); + ret = sysfs_attr_u64_get(&stats->out_discards, + "/sys/class/net/%s/statistics/tx_dropped", + netif_name); + if (ret < 0 && __odp_errno != ENOENT) + return -1; - sprintf(fname, "/sys/class/net/%s/statistics/tx_errors", dev); - ret -= sysfs_get_val(fname, &stats->out_errors); + ret = sysfs_attr_u64_get(&stats->out_errors, + "/sys/class/net/%s/statistics/tx_errors", + netif_name); + if (ret < 0 && __odp_errno != ENOENT) + return -1; - return ret; + return 0; } diff --git a/platform/linux-generic/pktio/sysfs.h b/platform/linux-generic/pktio/sysfs.h index f8fe3072..71ac4726 100644 --- a/platform/linux-generic/pktio/sysfs.h +++ b/platform/linux-generic/pktio/sysfs.h @@ -8,16 +8,39 @@ #define ODP_PKTIO_SYSFS_H_ /** - * Get statistics for a pktio entry + * Read an attribute from /sysfs as raw string * - * @param pktio_entry Packet IO entry - * @param stats[out] Output buffer for counters + * @param buf[out] Attribute value + * @param buf_size Maximum number of bytes to read (including '\0') + * @param fmt printf-like path to the attribute + * + * @retval 0 on success, buf[] is guaranteed to be '\0'-terminated + * @retval != 0 on failure + */ +ODP_PRINTF_FORMAT(3, 4) +int sysfs_attr_raw_get(char *buf, size_t buf_size, const char *fmt, ...); + +/** + * Read an attribute from /sysfs as uint64_t + * + * @param value[out] Attribute value + * @param fmt printf-like path to the attribute * * @retval 0 on success * @retval != 0 on failure */ +ODP_PRINTF_FORMAT(2, 3) +int sysfs_attr_u64_get(uint64_t *value, const char *fmt, ...); -int sysfs_stats(pktio_entry_t *pktio_entry, - odp_pktio_stats_t *stats); +/** + * Get statistics for a network interface + * + * @param netif_name Network interface name + * @param stats[out] Output buffer for counters + * + * @retval 0 on success + * @retval != 0 on failure + */ +int sysfs_netif_stats(const char *netif_name, odp_pktio_stats_t *stats); #endif /* ODP_PKTIO_SYSFS_H_ */ commit 2d0ddc0917fa97d4ee9d1ec7009fe1abb9c42085 Author: Mykyta Iziumtsev <mykyta.iziumtsev(a)linaro.org> Date: Wed Dec 20 14:44:51 2017 +0100 linux-gen: extend ethtool helper functions Add helper function to query RX/TX queue lengths on network interface to facilitate upcoming native and mediated device drivers. Signed-off-by: Mykyta Iziumtsev <mykyta.iziumtsev(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Yi He <yi.he(a)linaro.org> diff --git a/platform/linux-generic/pktio/ethtool.c b/platform/linux-generic/pktio/ethtool.c index b71666a3..119ad75a 100644 --- a/platform/linux-generic/pktio/ethtool.c +++ b/platform/linux-generic/pktio/ethtool.c @@ -159,12 +159,27 @@ static int ethtool_stats(int fd, struct ifreq *ifr, odp_pktio_stats_t *stats) return 0; } -int ethtool_stats_get_fd(int fd, const char *name, odp_pktio_stats_t *stats) +int ethtool_stats_get_fd(int fd, const char *netif_name, + odp_pktio_stats_t *stats) { struct ifreq ifr; memset(&ifr, 0, sizeof(ifr)); - snprintf(ifr.ifr_name, IF_NAMESIZE, "%s", name); + snprintf(ifr.ifr_name, IF_NAMESIZE, "%s", netif_name); return ethtool_stats(fd, &ifr, stats); } + +int ethtool_ringparam_get_fd(int fd, const char *netif_name, + struct ethtool_ringparam *param) +{ + struct ifreq ifr; + + memset(&ifr, 0, sizeof(ifr)); + snprintf(ifr.ifr_name, IF_NAMESIZE, "%s", netif_name); + + param->cmd = ETHTOOL_GRINGPARAM; + ifr.ifr_data = (void *)param; + + return ioctl(fd, SIOCETHTOOL, &ifr); +} diff --git a/platform/linux-generic/pktio/ethtool.h b/platform/linux-generic/pktio/ethtool.h index c5a81123..c330c2e3 100644 --- a/platform/linux-generic/pktio/ethtool.h +++ b/platform/linux-generic/pktio/ethtool.h @@ -7,9 +7,32 @@ #ifndef ODP_PKTIO_ETHTOOL_H_ #define ODP_PKTIO_ETHTOOL_H_ +#include <linux/ethtool.h> + +/** + * Get statistics for a network interface + * + * @param fd Arbitrary socket file descriptor + * @param netif_name Network interface name + * @param stats[out] Output buffer for counters + * + * @retval 0 on success + * @retval != 0 on failure + */ +int ethtool_stats_get_fd(int fd, const char *netif_name, + odp_pktio_stats_t *stats); + /** - * Get ethtool statistics of a packet socket + * Get RX/TX queue parameters for a network interface + * + * @param fd Arbitrary socket file descriptor + * @param netif_name Network interface name + * @param param[out] Output buffer for parameters + * + * @retval 0 on success + * @retval != 0 on failure */ -int ethtool_stats_get_fd(int fd, const char *name, odp_pktio_stats_t *stats); +int ethtool_ringparam_get_fd(int fd, const char *netif_name, + struct ethtool_ringparam *param); #endif /*ODP_PKTIO_ETHTOOL_H_*/ commit 9eebbe7d21f0b933190fd910c54c872eecfe180e Author: Mykyta Iziumtsev <mykyta.iziumtsev(a)linaro.org> Date: Wed Dec 20 10:41:00 2017 +0100 linux-gen: add memory-mapped I/O access API Signed-off-by: Mykyta Iziumtsev <mykyta.iziumtsev(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Yi He <yi.he(a)linaro.org> diff --git a/include/odp/drv/spec/mmio.h b/include/odp/drv/spec/mmio.h new file mode 100644 index 00000000..5174515f --- /dev/null +++ b/include/odp/drv/spec/mmio.h @@ -0,0 +1,131 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +/** + * @file + * + * API to access memory-mapped I/O. + * + */ + +#ifndef ODPDRV_MMIO_H_ +#define ODPDRV_MMIO_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +/** @addtogroup odpdrv_mmio ODPDRV MMIO + * @{ + */ + +/** + * Write value to MMIO + * @param value cpu native 8-bit value to write to MMIO + * @param addr MMIO address to write at + */ +void odpdrv_mmio_u8_write(uint8_t value, volatile void *addr); + +/** + * Convert to little endian and write value to MMIO + * @param value cpu native 16-bit value to write to MMIO + * @param addr MMIO address to write at + */ +void odpdrv_mmio_u16le_write(uint16_t value, volatile void *addr); + +/** + * Convert to big endian and write value to MMIO + * @param value cpu native 16-bit value to write to MMIO + * @param addr MMIO address to write at + */ +void odpdrv_mmio_u16be_write(uint16_t value, volatile void *addr); + +/** + * Convert to little endian and write value to MMIO + * @param value cpu native 32-bit value to write to MMIO + * @param addr MMIO address to write at + */ +void odpdrv_mmio_u32le_write(uint32_t value, volatile void *addr); + +/** + * Convert to big endian and write value to MMIO + * @param value cpu native 32-bit value to write to MMIO + * @param addr MMIO address to write at + */ +void odpdrv_mmio_u32be_write(uint32_t value, volatile void *addr); + +/** + * Convert to little endian and write value to MMIO + * @param value cpu native 64-bit value to write to MMIO + * @param addr MMIO address to write at + */ +void odpdrv_mmio_u64le_write(uint64_t value, volatile void *addr); + +/** + * Convert to big endian and write value to MMIO + * @param value cpu native 64-bit value to write to MMIO + * @param addr MMIO address to write at + */ +void odpdrv_mmio_u64be_write(uint64_t value, volatile void *addr); + +/** + * Read from MMIO + * @param addr MMIO address to read at + * @return cpu native 8-bit value + */ +uint8_t odpdrv_mmio_u8_read(volatile void *addr); + +/** + * Read from MMIO and convert from little endian + * @param addr MMIO address to read at + * @return cpu native 16-bit value + */ +uint16_t odpdrv_mmio_u16le_read(volatile void *addr); + +/** + * Read from MMIO and convert from big endian + * @param addr MMIO address to read at + * @return cpu native 16-bit value + */ +uint16_t odpdrv_mmio_u16be_read(volatile void *addr); + +/** + * Read from MMIO and convert from little endian + * @param addr MMIO address to read at + * @return cpu native 32-bit value + */ +uint32_t odpdrv_mmio_u32le_read(volatile void *addr); + +/** + * Read from MMIO and convert from big endian + * @param addr MMIO address to read at + * @return cpu native 32-bit value + */ +uint32_t odpdrv_mmio_u32be_read(volatile void *addr); + +/** + * Read from MMIO and convert from little endian + * @param addr MMIO address to read at + * @return cpu native 64-bit value + */ +uint64_t odpdrv_mmio_u64le_read(volatile void *addr); + +/** + * Read from MMIO and convert from big endian + * @param addr MMIO address to read at + * @return cpu native 64-bit value + */ +uint64_t odpdrv_mmio_u64be_read(volatile void *addr); + +/** + * @} + */ + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/platform/linux-generic/include/odp/drv/mmio.h b/platform/linux-generic/include/odp/drv/mmio.h new file mode 100644 index 00000000..a3846ce1 --- /dev/null +++ b/platform/linux-generic/include/odp/drv/mmio.h @@ -0,0 +1,168 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +/** + * @file + * + * API to access memory-mapped I/O. + */ + +#ifndef ODPDRV_PLAT_MMIO_H_ +#define ODPDRV_PLAT_MMIO_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#include <odp/api/byteorder.h> +#include <odp/drv/byteorder.h> + +/** @ingroup odpdrv_mmio ODPDRV MMIO + * @{ + */ + +/* for use with type checkers such as sparse */ +#ifdef __CHECKER__ +/** @internal MMIO attribute */ +#define __odpdrv_mmio __attribute__((noderef, address_space(2))) +#else +/** @internal MMIO attribute */ +#define __odpdrv_mmio +#endif + +#define odpdrv_io_mb() __asm__ __volatile__("" ::: "memory") +#define odpdrv_io_rmb() __asm__ __volatile__("" ::: "memory") +#define odpdrv_io_wmb() __asm__ __volatile__("" ::: "memory") + +static inline void +odpdrv_mmio_u8_write(uint8_t value, volatile void __odpdrv_mmio *addr) +{ + odpdrv_io_wmb(); + *(__odp_force volatile uint8_t *)addr = value; +} + +static inline void +odpdrv_mmio_u16le_write(uint16_t value, volatile void __odpdrv_mmio *addr) +{ + odpdrv_io_wmb(); + *(__odp_force volatile odp_u16le_t *)addr = odpdrv_cpu_to_le_16(value); +} + +static inline void +odpdrv_mmio_u16be_write(uint16_t value, volatile void __odpdrv_mmio *addr) +{ + odpdrv_io_wmb(); + *(__odp_force volatile odp_u16be_t *)addr = odpdrv_cpu_to_be_16(value); +} + +static inline void +odpdrv_mmio_u32le_write(uint32_t value, volatile void __odpdrv_mmio *addr) +{ + odpdrv_io_wmb(); + *(__odp_force volatile odp_u32le_t *)addr = odpdrv_cpu_to_le_32(value); +} + +static inline void +odpdrv_mmio_u32be_write(uint32_t value, volatile void __odpdrv_mmio *addr) +{ + odpdrv_io_wmb(); + *(__odp_force volatile odp_u32be_t *)addr = odpdrv_cpu_to_be_32(value); +} + +static inline void +odpdrv_mmio_u64le_write(uint64_t value, volatile void __odpdrv_mmio *addr) +{ + odpdrv_io_wmb(); + *(__odp_force volatile odp_u64le_t *)addr = odpdrv_cpu_to_le_64(value); +} + +static inline void +odpdrv_mmio_u64be_write(uint64_t value, volatile void __odpdrv_mmio *addr) +{ + odpdrv_io_wmb(); + *(__odp_force volatile odp_u64be_t *)addr = odpdrv_cpu_to_be_64(value); +} + +static inline uint8_t +odpdrv_mmio_u8_read(volatile void __odpdrv_mmio *addr) +{ + uint8_t value = *(__odp_force volatile uint8_t *)addr; + + odpdrv_io_rmb(); + return value; +} + +static inline uint16_t +odpdrv_mmio_u16le_read(volatile void __odpdrv_mmio *addr) +{ + uint16_t value = + odpdrv_le_to_cpu_16(*(__odp_force volatile odp_u16le_t *)addr); + + odpdrv_io_rmb(); + return value; +} + +static inline uint16_t +odpdrv_mmio_u16be_read(volatile void __odpdrv_mmio *addr) +{ + uint16_t value = + odpdrv_be_to_cpu_16(*(__odp_force volatile odp_u16be_t *)addr); + + odpdrv_io_rmb(); + return value; +} + +static inline uint32_t +odpdrv_mmio_u32le_read(volatile void __odpdrv_mmio *addr) +{ + uint32_t value = + odpdrv_le_to_cpu_32(*(__odp_force volatile odp_u32le_t *)addr); + + odpdrv_io_rmb(); + return value; +} + +static inline uint32_t +odpdrv_mmio_u32be_read(volatile void __odpdrv_mmio *addr) +{ + uint32_t value = + odpdrv_be_to_cpu_32(*(__odp_force volatile odp_u32be_t *)addr); + + odpdrv_io_rmb(); + return value; +} + +static inline uint64_t +odpdrv_mmio_u64le_read(volatile void __odpdrv_mmio *addr) +{ + uint64_t value = + odpdrv_le_to_cpu_64(*(__odp_force volatile odp_u64le_t *)addr); + + odpdrv_io_rmb(); + return value; +} + +static inline uint64_t +odpdrv_mmio_u64be_read(volatile void __odpdrv_mmio *addr) +{ + uint64_t value = + odpdrv_be_to_cpu_64(*(__odp_force volatile odp_u64be_t *)addr); + + odpdrv_io_rmb(); + return value; +} + +/** + * @} + */ + +#include <odp/drv/spec/mmio.h> + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index 16316b92..9c256e29 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -257,6 +257,7 @@ our $Sparse = qr{ __kernel| __force| __iomem| + __odpdrv_mmio| __must_check| __init_refok| __kprobes| ----------------------------------------------------------------------- Summary of changes: include/odp/drv/spec/mmio.h | 131 ++++++++++++++++ platform/linux-dpdk/include/odp_buffer_internal.h | 4 - platform/linux-dpdk/odp_packet.c | 10 +- platform/linux-dpdk/pool/dpdk.c | 5 +- platform/linux-generic/buffer/generic.c | 4 +- platform/linux-generic/include/odp/drv/mmio.h | 168 +++++++++++++++++++++ .../linux-generic/include/odp_bitmap_internal.h | 4 +- .../linux-generic/include/odp_buffer_internal.h | 4 - platform/linux-generic/include/odp_internal.h | 27 ++++ platform/linux-generic/include/odp_pool_internal.h | 8 + .../include/odp_traffic_mngr_internal.h | 3 - platform/linux-generic/odp_name_table.c | 15 +- platform/linux-generic/odp_packet.c | 4 +- platform/linux-generic/odp_pkt_queue.c | 8 +- platform/linux-generic/odp_timer_wheel.c | 2 +- platform/linux-generic/odp_traffic_mngr.c | 12 +- platform/linux-generic/pktio/common.c | 4 +- platform/linux-generic/pktio/ethtool.c | 19 ++- platform/linux-generic/pktio/ethtool.h | 27 +++- platform/linux-generic/pktio/socket.c | 2 +- platform/linux-generic/pktio/socket_mmap.c | 2 +- platform/linux-generic/pktio/sysfs.c | 162 +++++++++++++++----- platform/linux-generic/pktio/sysfs.h | 33 +++- platform/linux-generic/pool/generic.c | 1 - platform/linux-generic/queue/scalable.c | 7 - platform/linux-generic/schedule/scalable.c | 4 - scripts/checkpatch.pl | 1 + 27 files changed, 558 insertions(+), 113 deletions(-) create mode 100644 include/odp/drv/spec/mmio.h create mode 100644 platform/linux-generic/include/odp/drv/mmio.h hooks/post-receive --

7 years, 5 months

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

git-lng-odp January 2018