[COMMIT] branch devel/native-drivers updated. v1.15.0.0-952-g6336beb2
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 6336beb21e88eef30fbfcd415e6d038c96f4343d (commit)
via dd3f47a788e3de0f320b3a8b45ba83bdaa64f933 (commit)
via 5096aebd6cc4f84eda65683f799f6a1c269433c1 (commit)
from 4645f4b19eb5cb596fc503559f755c034f601792 (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 6336beb21e88eef30fbfcd415e6d038c96f4343d
Author: Josep Puigdemont <josep.puigdemont(a)linaro.org>
Date: Mon Dec 11 13:02:45 2017 +0100
Introduce physmem for contiguous physical memory
This prototype provides functions to allocate blocks of contiguous
physical memory backed by hugepages. It can only serve chunks of memory
multiple of the hugepage size (which defaults to 2 MB), making it rather
inefficient.
Signed-off-by: Josep Puigdemont <josep.puigdemont(a)linaro.org>
diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am
index 7c463184..64d401fe 100644
--- a/platform/linux-generic/Makefile.am
+++ b/platform/linux-generic/Makefile.am
@@ -184,6 +184,7 @@ noinst_HEADERS = \
pktio/common.h \
pktio/sysfs.h \
pktio/dpdk.h \
+ pktio/physmem/physmem.h \
include/odp_pktio_ops_ipc.h \
include/odp_pktio_ops_loopback.h \
include/odp_pktio_ops_netmap.h \
@@ -250,6 +251,7 @@ __LIB__libodp_linux_la_SOURCES = \
odp_packet_flags.c \
odp_packet_io.c \
odp_packet_io_pool.c \
+ pktio/physmem/physmem.c \
pktio/ethtool.c \
pktio/subsystem.c \
pktio/ipc.c \
diff --git a/platform/linux-generic/pktio/physmem/physmem.c b/platform/linux-generic/pktio/physmem/physmem.c
new file mode 100644
index 00000000..54b62d2d
--- /dev/null
+++ b/platform/linux-generic/pktio/physmem/physmem.c
@@ -0,0 +1,688 @@
+/* Copyright (c) 2017, Linaro Limited
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#define _GNU_SOURCE
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <errno.h>
+#include <string.h>
+#include <stdint.h>
+#include <sys/mman.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/queue.h>
+#include <fcntl.h>
+#include <inttypes.h>
+#include <limits.h>
+
+#include <config.h>
+#include <odp_align_internal.h>
+#include <odp_debug_internal.h>
+#include <_ishmphy_internal.h>
+#include <pktio/physmem/physmem.h>
+
+#define KB * 1024ULL
+#define MB * 1024ULL KB
+
+#define lock_list()
+#define unlock_list()
+
+#define HUGEPAGES_PATH "/dev/hugepages/"
+
+#define MAX_HUGEPAGES 128
+
+/* make hugepage_info 128 bytes long */
+#define FILENAME_PATH_MAX 96
+
+struct hugepage_info {
+ struct physmem_block *block; /* the block this hugepage belongs to */
+ void *va; /* virtual address this hugepage is mapped to */
+ uint64_t pa; /* the physical address of this hugepage */
+ uint32_t size; /* size of hugepage */
+ int fd; /* the fd returned by open, for the hugepages file */
+ char filename[FILENAME_PATH_MAX];
+};
+
+typedef LIST_HEAD(block_list, physmem_block) block_list_t;
+
+struct physmem_block_data {
+ struct physmem_block block[MAX_HUGEPAGES];
+ block_list_t avail; /* blocks of huge pages ready to use */
+ block_list_t used; /* blocks allocated and being in use */
+ block_list_t empty; /* blocks without any hugepages, size 0 */
+ uint32_t hp_size;
+ uint32_t count;
+};
+
+static struct hugepage_info pages[MAX_HUGEPAGES];
+static struct physmem_block_data block_data;
+
+static int alloc_hugepage(struct hugepage_info *hp)
+{
+ static int file_id = 0;
+ int len;
+
+ if (hp == NULL)
+ return -1;
+
+ len = snprintf(hp->filename, sizeof(hp->filename),
+ HUGEPAGES_PATH "odp-%d", file_id);
+ if (len >= FILENAME_PATH_MAX) {
+ ODP_ERR("Filename too large (%d)\n", len);
+ return -1;
+ }
+
+ hp->fd = open(hp->filename, O_CREAT | O_RDWR, 0755);
+ if (hp->fd == -1) {
+ perror("open");
+ return -1;
+ }
+
+ hp->va = mmap(NULL, 2 MB, PROT_READ | PROT_WRITE, MAP_SHARED, hp->fd,
+ 0);
+ if (hp->va == MAP_FAILED) {
+ perror("mmap");
+ close(hp->fd);
+ unlink(hp->filename);
+ return -1;
+ }
+
+ /* Force memory commitment */
+ *((int *)(hp->va)) = hp->fd;
+
+ hp->size = 2 MB; /* FIXME: defaulting to 2MB huge pages */
+ hp->pa = _odp_ishmphy_getphy(hp->va);
+ if (hp->pa == PHYS_ADDR_INVALID)
+ ODP_ERR("Could not discover PA\n"); /* FIXME */
+
+ hp->block = NULL;
+
+ file_id++;
+
+ return 0;
+}
+
+static int comp_hp(const void *_a, const void *_b)
+{
+ const struct hugepage_info *a = _a;
+ const struct hugepage_info *b = _b;
+
+ if (a->pa > b->pa)
+ return 1;
+ else if (a->pa < b->pa)
+ return -1;
+ else
+ return 0;
+}
+
+static int init_hugepages(void)
+{
+ memset(pages, 0, sizeof(pages));
+
+ for (int i = 0; i < MAX_HUGEPAGES; ++i) {
+ if (alloc_hugepage(&pages[i]) != 0) {
+ ODP_ERR("Could not allocate hugepages\n");
+ return -1;
+ }
+ }
+
+ qsort(pages, MAX_HUGEPAGES, sizeof(pages[0]), comp_hp);
+
+ return 0;
+}
+
+static int comp_block(const void *_a, const void *_b)
+{
+ const struct physmem_block *a = _a;
+ const struct physmem_block *b = _b;
+
+ if (a->count > b->count)
+ return 1;
+ else if (a->count < b->count)
+ return -1;
+ else
+ return 0;
+}
+
+/*
+ * hp is a SORTED array of count elements of struct hugepage_info,
+ * it is sorted per physical address in ascending order.
+ * This returns a linked list of struct physmem_block, each block containing
+ * a reference to physically contiguous huge pages.
+ */
+static int sort_in_blocks(struct hugepage_info *hp_array, int count)
+{
+ uint32_t block_id;
+ int hp_id;
+ struct physmem_block *block;
+ struct hugepage_info *hp;
+
+ if (hp_array == NULL || count == 0)
+ return -EINVAL;
+
+ block_id = 0;
+ hp_id = 0;
+ hp = &hp_array[0];
+ do {
+ uint64_t pa_expected;
+
+ block = &block_data.block[block_id];
+ block->first = hp_id;
+ block->size = hp->size;
+ block->pa = hp->pa;
+ block->va = NULL;
+ block->count = 1;
+ block->id = block_id++;
+ block->hp_size = hp->size;
+ block->type = BLOCK_AVAIL;
+
+ block_data.count++;
+
+ ODP_DBG("New block %d\n", block->id);
+ ODP_DBG("\t%03d: VA: %016" PRIx64 ", PA: %016" PRIx64 "\n",
+ hp->fd, hp->va, hp->pa);
+
+ pa_expected = block->pa + hp->size;
+
+ /* keep adding huge pages to this block as long as their
+ * physical address coincides with the expected one */
+ while (++hp_id < count) {
+ hp++;
+
+ if (hp->pa != pa_expected)
+ break;
+
+ ODP_DBG("\t%03d: VA: %016" PRIx64 ", PA: %016" PRIx64
+ "\n", hp->fd, hp->va, hp->pa);
+
+ block->count++;
+ block->size += hp->size;
+
+ pa_expected += hp->size;
+ }
+
+ ODP_DBG("\tSize: %" PRIu64 " MB\n", (block->size / (1 MB)));
+ } while (hp_id < count);
+
+ qsort(block_data.block, block_data.count, sizeof(block_data.block[0]),
+ comp_block);
+
+ /* link sorted blocks together */
+ struct physmem_block *last = &block_data.block[0];
+ pages[last->first].block = last;
+ pages[last->first + last->count - 1].block = last;
+ LIST_INSERT_HEAD(&block_data.avail, last, next);
+ for (block_id = 1; block_id < block_data.count; ++block_id) {
+ block = &block_data.block[block_id];
+ pages[block->first].block = block;
+ pages[block->first + block->count - 1].block = block;
+ LIST_INSERT_AFTER(last, block, next);
+ last = block;
+ }
+
+ /* insert rest of blocks into the empty list */
+ for (block_id = block_data.count; block_id < MAX_HUGEPAGES; ++block_id){
+ block = &block_data.block[block_id];
+ block->id = block_id;
+ block->type = BLOCK_EMPTY;
+ LIST_INSERT_HEAD(&block_data.empty, block, next);
+ }
+
+ block_data.hp_size = block_data.block[0].hp_size;
+
+ return 0;
+}
+
+static struct physmem_block *block_get(void)
+{
+ struct physmem_block *block;
+
+ if (LIST_EMPTY(&block_data.empty))
+ return NULL;
+
+ block = LIST_FIRST(&block_data.empty);
+ LIST_REMOVE(block, next);
+
+ return block;
+}
+
+struct physmem_block *physmem_block_alloc(uint64_t size)
+{
+ struct physmem_block *block;
+ struct physmem_block *ret = NULL;
+ uint32_t num_hp;
+
+ size = ROUNDUP_ALIGN(size, block_data.hp_size);
+ num_hp = size / block_data.hp_size;
+
+ lock_list();
+
+ LIST_FOREACH(block, &block_data.avail, next) {
+ if (block->count < num_hp)
+ continue;
+ else if (block->count == num_hp) {
+ LIST_REMOVE(block, next);
+ ret = block;
+ break;
+ } else {
+ struct hugepage_info *hp;
+
+ ret = block_get();
+ if (ret == NULL)
+ break;
+
+ /* slice num_hp pages from this block */
+ block->count -= num_hp;
+ block->size = block->count * block->hp_size;
+
+ ret->first = block->first + block->count;
+ ret->count = num_hp;
+ ret->hp_size = block->hp_size;
+ ret->size = ret->hp_size * num_hp;
+ ret->va = NULL;
+
+ /* reassign pages to their corresponding block
+ * only the borders need to be updated */
+ hp = &pages[ret->first];
+ hp->block = ret;
+ ret->pa = hp->pa;
+ hp--; /* last page of the block we just sliced */
+ hp->block = block;
+ hp += num_hp; /* last page of the block we just allocated */
+ hp->block = ret;
+
+ /* place the sliced block back into the list at correct position */
+ LIST_REMOVE(block, next);
+
+ if (LIST_EMPTY(&block_data.avail)) {
+ LIST_INSERT_HEAD(&block_data.avail, block, next);
+ } else {
+ struct physmem_block *last = NULL;
+ struct physmem_block *tmp;
+
+ LIST_FOREACH(tmp, &block_data.avail, next) {
+ if (tmp->count >= block->count) {
+ LIST_INSERT_BEFORE(tmp, block, next);
+ last = NULL;
+ break;
+ }
+ last = tmp;
+ }
+ if (last)
+ LIST_INSERT_AFTER(last, block, next);
+ }
+
+ break;
+ }
+ }
+
+ if (ret != NULL) {
+ ret->type = BLOCK_USED;
+ LIST_INSERT_HEAD(&block_data.used, ret, next);
+ }
+
+ unlock_list();
+
+ return ret;
+}
+
+void physmem_block_free(struct physmem_block *block)
+{
+ if (block == NULL)
+ return;
+
+ lock_list();
+
+ LIST_REMOVE(block, next);
+
+ /* append this block to left block if available */
+ if (block->first != 0) {
+ struct hugepage_info *left_hp, *first_hp;
+ struct physmem_block *left_block;
+ uint64_t expected_pa;
+
+ first_hp = &pages[block->first];
+ left_hp = first_hp - 1;
+ left_block = left_hp->block;
+ expected_pa = left_hp->pa + left_hp->size;
+
+ if (left_block->type == BLOCK_AVAIL && block->pa == expected_pa) {
+ /* put the pages belonging to this block in to the left one */
+ left_block->count += block->count;
+ left_block->size = left_block->count * left_block->hp_size;
+
+ pages[left_block->first + left_block->count - 1].block = left_block;
+
+ block->size = 0;
+ block->pa = 0;
+ block->va = 0;
+ block->first = 0;
+ block->count = 0;
+ block->type = BLOCK_EMPTY;
+ LIST_INSERT_HEAD(&block_data.empty, block, next);
+
+ block = left_block;
+ LIST_REMOVE(block, next);
+ }
+ }
+
+ /* join with right block if available */
+ uint32_t right_idx = block->first + block->count;
+ if (right_idx < MAX_HUGEPAGES) {
+ struct hugepage_info *last_hp;
+ struct hugepage_info *right_hp;
+ struct physmem_block *right_block;
+ uint64_t expected_pa;
+
+ right_hp = &pages[right_idx];
+ last_hp = right_hp - 1;
+ right_block = right_hp->block;
+ expected_pa = last_hp->pa + last_hp->size;
+
+ if (right_block->type == BLOCK_AVAIL
+ && expected_pa == right_block->pa) {
+ block->count += right_block->count;
+ block->size = block->count * block->hp_size;
+
+ pages[block->first + block->count - 1].block = block;
+
+ LIST_REMOVE(right_block, next);
+ right_block->size = 0;
+ right_block->pa = 0;
+ right_block->va = 0;
+ right_block->first = 0;
+ right_block->count = 0;
+ right_block->type = BLOCK_EMPTY;
+ LIST_INSERT_HEAD(&block_data.empty, right_block, next);
+ }
+ }
+
+ block->type = BLOCK_AVAIL;
+ if (LIST_EMPTY(&block_data.avail)) {
+ LIST_INSERT_HEAD(&block_data.avail, block, next);
+ } else {
+ struct physmem_block *tmp, *last = NULL;
+
+ LIST_FOREACH(tmp, &block_data.avail, next) {
+ if (tmp->count >= block->count) {
+ LIST_INSERT_BEFORE(tmp, block, next);
+ last = NULL;
+ break;
+ }
+ last = tmp;
+ }
+ if (last != NULL)
+ LIST_INSERT_AFTER(last, block, next);
+ }
+
+ unlock_list();
+}
+
+int physmem_block_map(struct physmem_block *block, void *anchor_addr)
+{
+ void *addr;
+ int retval;
+ int mapped_cnt;
+ struct hugepage_info *hp;
+
+ if (block == NULL || anchor_addr == NULL)
+ return -EINVAL;
+
+ /* make sure we can actually map this memory region */
+ addr = mmap(anchor_addr, block->size,
+ PROT_READ | PROT_WRITE,
+ MAP_PRIVATE | MAP_ANONYMOUS | MAP_NORESERVE | MAP_FIXED,
+ -1, 0);
+
+ if (addr == MAP_FAILED)
+ return errno;
+
+ block->va = addr;
+ mapped_cnt = 0;
+
+ ODP_DBG("Mapping block %d at %p\n", block->id, block->va);
+
+ for (uint32_t i = 0; i < block->count; ++i) {
+ void *tmp;
+
+ hp = &pages[block->first + i];
+
+ if ((hp->va != NULL) && (munmap(hp->va, hp->size) != 0)) {
+ ODP_DBG("Error unmapping old va: %p\n", hp->va);
+ retval = -EINVAL;
+ goto exit_failure;
+ }
+
+ if (munmap(addr, hp->size) != 0) {
+ retval = errno;
+ goto exit_failure;
+ }
+
+ tmp = mmap(addr, hp->size,
+ PROT_READ | PROT_WRITE,
+ MAP_SHARED | MAP_FIXED,
+ hp->fd, 0);
+ if (tmp == MAP_FAILED) {
+ retval = errno;
+ perror("mmap");
+ ODP_DBG("Error remapping PA:0x%" PRIu64 " to %p\n",
+ hp->pa, tmp);
+ goto exit_failure;
+ }
+
+ mapped_cnt++;
+
+#ifdef ENABLE_MAP_CHECKS
+ /* check: we poison the page with the file descriptor number */
+ int fd = *((int *)tmp);
+ if (fd != hp->fd) {
+ ODP_DBG("Checking expected resulted in mismatch!\n");
+ goto exit_failure;
+ }
+
+ uint64_t pa = _odp_ishmphy_getphy(tmp);
+ if (pa != hp->pa) {
+ retval = -EFAULT;
+ ODP_DBG("Physical address error, PA orig: "
+ "0x%016" PRIx64 "\nPA new: 0x%016" PRIx64 "\n",
+ hp->pa, pa);
+ goto exit_failure;
+ }
+#endif
+
+ ODP_DBG("\t%03d: VA: 0x%016" PRIx64 " -> 0x%016" PRIx64
+ ", PA: 0x%016" PRIx64 "\n",
+ hp->fd, hp->va, tmp, hp->pa);
+
+ hp->va = addr;
+
+ addr = (void *)((char *)addr + hp->size);
+ }
+
+ return 0;
+
+exit_failure:
+
+ while (mapped_cnt--) {
+ hp = &pages[block->first + mapped_cnt];
+ munmap(hp->va, hp->size);
+ hp->va = NULL;
+ }
+ block->va = NULL;
+
+ return retval;
+}
+
+int physmem_block_unmap(struct physmem_block *block)
+{
+ struct hugepage_info *hp;
+ int ret = 0;
+
+ if (block == NULL || block->va == NULL)
+ return -EINVAL;
+
+ hp = &pages[block->first];
+ for (uint32_t i = 0; i < block->count; ++i, ++hp) {
+ *((int *)hp->va) = hp->fd;
+ if (munmap(hp->va, hp->size))
+ ret = errno;
+ }
+
+ return ret;
+}
+
+static void init_blocks(void)
+{
+ memset(&block_data, 0, sizeof(block_data));
+
+ LIST_INIT(&block_data.avail);
+ LIST_INIT(&block_data.used);
+ LIST_INIT(&block_data.empty);
+}
+
+int physmem_block_global_init(void)
+{
+ init_blocks();
+
+ if (init_hugepages())
+ return -1;
+
+ if (sort_in_blocks(pages, MAX_HUGEPAGES) != 0)
+ return -1;
+
+ return 0;
+}
+
+int physmem_block_global_term(void)
+{
+ for (int i = 0; i < MAX_HUGEPAGES; ++i) {
+ if (pages[i].fd == 0)
+ continue;
+ close(pages[i].fd);
+ unlink(pages[i].filename);
+ }
+
+ return 0;
+}
+
+#if 0
+static void zero_block(struct physmem_block *block)
+{
+ if (block == NULL || block->va == NULL)
+ return;
+
+ memset(block->va, 0, block->size);
+}
+
+/* this makes sure the VA area is also physically contiguous */
+static int check_va_area(const void *va, uint64_t size, uint64_t page_size)
+{
+ uint64_t pa;
+ uint64_t expected_pa;
+ uint64_t offset;
+
+ pa = _odp_ishmphy_getphy(va);
+ if (pa == PHYS_ADDR_INVALID)
+ return -1;
+ ODP_PRINT("VA: %p -> PA: %016" PRIx64 "\n", va, pa);
+
+ expected_pa = pa + page_size;
+ offset = page_size;
+ while (offset < size) {
+ va = (const void *)((const char *)va + offset);
+ pa = _odp_ishmphy_getphy(va);
+
+ if (pa == PHYS_ADDR_INVALID)
+ return -1;
+
+ ODP_PRINT("VA: %p -> PA: %016" PRIx64 "\n", va, pa);
+
+ if (pa != expected_pa) {
+ ODP_ERR("ERRROR: not expected PA %016" PRIx64 "...\n",
+ expected_pa);
+ return -1;
+ }
+
+ expected_pa += page_size;
+ }
+
+ return 0;
+}
+#endif
+
+int physmem_block_check(const struct physmem_block *block)
+{
+ struct hugepage_info *first, *last;
+ int ret = 0;
+
+ first = &pages[block->first];
+ last = &pages[block->first + block->count - 1];
+ if (first->block != block) {
+ ret = 1;
+ ODP_ERR("\tfirst block does not match, got %u\n",
+ first->block->id);
+ }
+ if (last->block != block) {
+ ret = 1;
+ ODP_ERR("\tlast block does not match, got %u\n",
+ last->block->id);
+ }
+ return ret;
+}
+
+static void print_pages(struct physmem_block *block)
+{
+ for (uint32_t i = 0; i < block->count; ++i) {
+ struct hugepage_info *hp = &pages[block->first + i];
+ ODP_PRINT("\t%03d: VA: 0x%p PA: 0x%016" PRIx64 "\n",
+ hp->fd, hp->va, hp->pa);
+ }
+}
+
+static void print_block_list(block_list_t *list, int pages)
+{
+ struct physmem_block *block;
+
+ LIST_FOREACH(block, list, next) {
+ ODP_PRINT("Block %" PRIu32 "\n", block->id);
+ ODP_PRINT("\tSize: %" PRIu64 " MB\n", block->size / (1 MB));
+ ODP_PRINT("\tVA start: 0x%016" PRIx64 "\n", block->va);
+ ODP_PRINT("\tPA start: 0x%016" PRIx64 "\n", block->pa);
+ ODP_PRINT("\tHP start: %u-%u\n",
+ block->first, block->first + block->count - 1);
+ ODP_PRINT("\tcount: %u hugepages\n", block->count);
+ if (pages)
+ print_pages(block);
+ }
+}
+
+void physmem_block_dump(physmem_block_type_t type, int pages)
+{
+ const char *type_str;
+ block_list_t *list;
+
+ switch (type) {
+ case BLOCK_EMPTY:
+ type_str = "EMPTY\n";
+ list = &block_data.empty;
+ break;
+ case BLOCK_AVAIL:
+ type_str = "AVAIL\n";
+ list = &block_data.avail;
+ break;
+ case BLOCK_USED:
+ type_str = "USED\n";
+ list = &block_data.used;
+ break;
+ default:
+ return;
+ }
+
+ ODP_PRINT(type_str);
+
+ print_block_list(list, pages);
+}
diff --git a/platform/linux-generic/pktio/physmem/physmem.h b/platform/linux-generic/pktio/physmem/physmem.h
new file mode 100644
index 00000000..0ebc2ba6
--- /dev/null
+++ b/platform/linux-generic/pktio/physmem/physmem.h
@@ -0,0 +1,47 @@
+/* Copyright (c) 2017, Linaro Limited
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#ifndef PHYSMEM_BLOCK_H
+#define PHYSMEM_BLOCK_H
+
+#include <sys/queue.h>
+#include <stdint.h>
+
+typedef enum {
+ BLOCK_EMPTY = 0,
+ BLOCK_AVAIL,
+ BLOCK_USED
+} physmem_block_type_t;
+
+/* a block is a chunk of physically contiguous memory that can be
+ * made of one or more huge pages
+ */
+struct physmem_block {
+ LIST_ENTRY(physmem_block) next;
+ void *va; /* virtual address where the block is mapped */
+ uint64_t pa; /* physical address where it starts */
+ uint64_t size; /* the size of this memory block */
+ uint32_t first; /* index of first hugepage belonging to this block
+ * in pages[] */
+ uint32_t count; /* number of hugepages in this block */
+ uint32_t hp_size; /* the size of the hugepages */
+ uint32_t id; /* internal ID of this block, debug purposes */
+ physmem_block_type_t type;
+};
+
+int physmem_block_global_init(void);
+int physmem_block_global_term(void);
+
+struct physmem_block *physmem_block_alloc(uint64_t);
+void physmem_block_free(struct physmem_block *);
+int physmem_block_map(struct physmem_block *block, void *addr);
+int physmem_block_unmap(struct physmem_block *block);
+
+/* if pages is not 0, it will print the pages associated to each block */
+void physmem_block_dump(physmem_block_type_t, int pages);
+int physmem_block_check(const struct physmem_block *);
+
+#endif
commit dd3f47a788e3de0f320b3a8b45ba83bdaa64f933
Author: Josep Puigdemont <josep.puigdemont(a)linaro.org>
Date: Mon Nov 27 16:19:57 2017 +0100
virtio: keep pktio data structure private
Signed-off-by: Josep Puigdemont <josep.puigdemont(a)linaro.org>
diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am
index 239f1e14..7c463184 100644
--- a/platform/linux-generic/Makefile.am
+++ b/platform/linux-generic/Makefile.am
@@ -190,7 +190,6 @@ noinst_HEADERS = \
include/odp_pktio_ops_pcap.h \
include/odp_pktio_ops_socket.h \
include/odp_pktio_ops_tap.h \
- include/odp_pktio_ops_virtio.h \
include/odp_pktio_ops_subsystem.h \
include/odp_pkt_queue_internal.h \
include/odp_queue_subsystem.h \
diff --git a/platform/linux-generic/include/odp_pktio_ops_virtio.h b/platform/linux-generic/include/odp_pktio_ops_virtio.h
deleted file mode 100644
index 93e7f000..00000000
--- a/platform/linux-generic/include/odp_pktio_ops_virtio.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright (c) 2017, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#ifndef ODP_PACKET_VIRTIO_H
-#define ODP_PACKET_VIRTIO_H
-
-#include <drv_pci_internal.h>
-
-typedef struct {
- struct pci_dev_t *pci_dev;
- int dev_id;
- char name[32]; /**< Unique identifier name */
-} pktio_ops_virtio_data_t;
-
-#endif
diff --git a/platform/linux-generic/pktio/virtio/virtio.c b/platform/linux-generic/pktio/virtio/virtio.c
index bb2b814c..94b3c950 100644
--- a/platform/linux-generic/pktio/virtio/virtio.c
+++ b/platform/linux-generic/pktio/virtio/virtio.c
@@ -23,10 +23,15 @@
#include <odp/api/hints.h>
#include <drv_pci_internal.h>
-#include <odp_pktio_ops_virtio.h>
#include "virtio_pci.h"
+typedef struct {
+ struct pci_dev_t *pci_dev;
+ int dev_id;
+ char name[32]; /**< Unique identifier name */
+} pktio_ops_virtio_data_t;
+
#define PCI_PKTIO_PREFIX "pci:"
#define PCI_PKTIO_PREFIX_LEN (sizeof(PCI_PKTIO_PREFIX) - 1)
commit 5096aebd6cc4f84eda65683f799f6a1c269433c1
Author: Josep Puigdemont <josep.puigdemont(a)linaro.org>
Date: Mon Nov 27 15:43:44 2017 +0100
virtio: move to own directory
Signed-off-by: Josep Puigdemont <josep.puigdemont(a)linaro.org>
diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am
index 76c072ad..239f1e14 100644
--- a/platform/linux-generic/Makefile.am
+++ b/platform/linux-generic/Makefile.am
@@ -262,8 +262,8 @@ __LIB__libodp_linux_la_SOURCES = \
pktio/socket_mmap.c \
pktio/sysfs.c \
pktio/tap.c \
- pktio/virtio.c \
- pktio/virtio_pci.c \
+ pktio/virtio/virtio.c \
+ pktio/virtio/virtio_pci.c \
pktio/ring.c \
pool/generic.c \
pool/subsystem.c \
diff --git a/platform/linux-generic/pktio/virtio.c b/platform/linux-generic/pktio/virtio/virtio.c
similarity index 100%
rename from platform/linux-generic/pktio/virtio.c
rename to platform/linux-generic/pktio/virtio/virtio.c
diff --git a/platform/linux-generic/pktio/virtio_pci.c b/platform/linux-generic/pktio/virtio/virtio_pci.c
similarity index 100%
rename from platform/linux-generic/pktio/virtio_pci.c
rename to platform/linux-generic/pktio/virtio/virtio_pci.c
diff --git a/platform/linux-generic/pktio/virtio_pci.h b/platform/linux-generic/pktio/virtio/virtio_pci.h
similarity index 100%
rename from platform/linux-generic/pktio/virtio_pci.h
rename to platform/linux-generic/pktio/virtio/virtio_pci.h
-----------------------------------------------------------------------
Summary of changes:
platform/linux-generic/Makefile.am | 7 +-
.../linux-generic/include/odp_pktio_ops_virtio.h | 18 -
platform/linux-generic/pktio/physmem/physmem.c | 688 +++++++++++++++++++++
platform/linux-generic/pktio/physmem/physmem.h | 47 ++
platform/linux-generic/pktio/{ => virtio}/virtio.c | 7 +-
.../linux-generic/pktio/{ => virtio}/virtio_pci.c | 0
.../linux-generic/pktio/{ => virtio}/virtio_pci.h | 0
7 files changed, 745 insertions(+), 22 deletions(-)
delete mode 100644 platform/linux-generic/include/odp_pktio_ops_virtio.h
create mode 100644 platform/linux-generic/pktio/physmem/physmem.c
create mode 100644 platform/linux-generic/pktio/physmem/physmem.h
rename platform/linux-generic/pktio/{ => virtio}/virtio.c (96%)
rename platform/linux-generic/pktio/{ => virtio}/virtio_pci.c (100%)
rename platform/linux-generic/pktio/{ => virtio}/virtio_pci.h (100%)
hooks/post-receive
--
7 years, 4 months
- 1
- 0
[COMMIT] branch 2.0 updated. v1.15.0.0-948-g63fd8863
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, 2.0 has been updated
via 63fd88635cc10caaa02fdccd3f52c9494487bdd2 (commit)
from 75f3d60e6b31544bb9b273364b2cce502262c1f8 (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 63fd88635cc10caaa02fdccd3f52c9494487bdd2
Author: Kevin Wang <kevin.wang(a)arm.com>
Date: Wed Dec 6 15:25:04 2017 +0800
linux-gen: pool: modify CONFIG_POOL_CACHE_SIZE from 256 to 255
CONFIG_POOL_CACHE_SIZE is used in pool_cache_t. In pool_cache_t,
there is another variable "num" which type is uint32_t. So if
set CONFIG_POOL_CACHE_SIZE to 256 here, the capacity of pool_cache_t
is 1028B which will waste 60B in one cache line. So reduce it to 255.
Signed-off-by: Kevin Wang <kevin.wang(a)arm.com>
Reviewed-by: Honnappa Nagarahalli <honnappa.nagarahalli(a)arm.com>
Reviewed-by: Ola Liljedahl <ola.Liljedahl(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/include/odp_config_internal.h b/platform/linux-generic/include/odp_config_internal.h
index 9720581a..3519cfc7 100644
--- a/platform/linux-generic/include/odp_config_internal.h
+++ b/platform/linux-generic/include/odp_config_internal.h
@@ -150,6 +150,6 @@
/*
* Maximum number of events in a thread local pool cache
*/
-#define CONFIG_POOL_CACHE_SIZE 256
+#define CONFIG_POOL_CACHE_SIZE 255
#endif
-----------------------------------------------------------------------
Summary of changes:
platform/linux-generic/include/odp_config_internal.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
hooks/post-receive
--
7 years, 4 months
- 1
- 0
[COMMIT] branch master updated. v1.16.0.0-22-g1b285bbd
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 1b285bbdd1abbec9853e1bc51bdb6ee02643b1a7 (commit)
via 37b4da286aeff3321084e62045d0b3ab10c07399 (commit)
via e02d9f43ea8675db5ad5202ef605e6dd8014abb5 (commit)
via 442638dd1514f8dda882d48fbb1ebc88ef9af430 (commit)
via c6573eb58dcf0d0316ada1e91ae1993100c4d559 (commit)
via aab8ff7237c117e9ed63a8b7d595aca7f5665ff9 (commit)
from c15a810b7a47f2e07200f83aa534163ca06e2b16 (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 1b285bbdd1abbec9853e1bc51bdb6ee02643b1a7
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Fri Dec 1 20:23:33 2017 +0300
travis: also use DPDK when doing cross-compile tests
Compile and use DPDK when doing cross-compilation tests. This enables us
to test that pktio/dpdk.c works on non-x86 targets.
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-and-tested-by: Matias Elo <matias.elo(a)nokia.com>
diff --git a/.travis.yml b/.travis.yml
index a3032672..25c2d0a5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -99,7 +99,8 @@ before_install:
else
sudo -E apt-get -y --no-install-suggests --no-install-recommends --force-yes install g++-"$CROSS_GNU_TYPE" ;
fi ;
- sudo -E apt-get -y --no-install-suggests --no-install-recommends --force-yes install libc6-dev:"$CROSS_ARCH" libssl-dev:"$CROSS_ARCH" zlib1g-dev:"$CROSS_ARCH" libconfig-dev:"$CROSS_ARCH" libstdc++-4.8-dev:"$CROSS_ARCH";
+ sudo -E apt-get -y --no-install-suggests --no-install-recommends --force-yes install libc6-dev:"$CROSS_ARCH" libssl-dev:"$CROSS_ARCH" zlib1g-dev:"$CROSS_ARCH" libconfig-dev:"$CROSS_ARCH" libstdc++-4.8-dev:"$CROSS_ARCH" libpcap0.8-dev:"$CROSS_ARCH" ;
+ [ "$CROSS_ARCH" = "armhf" ] || sudo -E apt-get -y --no-install-suggests --no-install-recommends --force-yes install libnuma-dev:"$CROSS_ARCH";
export PKG_CONFIG_PATH=/usr/lib/${CROSS_MULTIARCH}/pkgconfig:/usr/${CROSS_MULTIARCH}/lib/pkgconfig ;
fi
- if [ "${CC#clang}" != "${CC}" ] ;
@@ -107,16 +108,24 @@ before_install:
if [ -n "$CROSS_ARCH" ] ;
then
export CC="${CC} --target=$CROSS_GNU_TYPE" ;
+ if [ "$CROSS_ARCH" = "i386" ] ;
+ then
+ DPDK_CFLAGS="-m32" ;
+ else
+ DPDK_CROSS="$CROSS_GNU_TYPE-" ;
+ fi
fi ;
export CXX="${CC/clang/clang++}";
elif [ "$CROSS_ARCH" = "i386" ] ;
then
export CC="gcc -m32" ;
export CXX="g++ -m32" ;
+ DPDK_CFLAGS="-m32" ;
elif [ -n "$CROSS_ARCH" ] ;
then
export CC="$CROSS_GNU_TYPE"-gcc ;
export CXX="$CROSS_GNU_TYPE"-g++ ;
+ DPDK_CROSS="$CROSS_GNU_TYPE-" ;
fi
- if test ! -L /usr/lib/ccache/${CC%% *} ; then sudo ln -s -t /usr/lib/ccache/ `which ${CC%% *}` ; fi
- ccache -s
@@ -174,21 +183,48 @@ install:
if [ "${CACHED_DPDK_VERS}" != "${DPDK_VERS}" ]; then
rm -rf dpdk
fi
- - TARGET=${TARGET:-"x86_64-native-linuxapp-gcc"}
- |
- if [ -z "$CROSS_ARCH" -a ! -f "dpdk/${TARGET}/lib/libdpdk.a" ]; then
+ case "$CROSS_ARCH" in
+ "arm64")
+ TARGET="arm64-armv8a-linuxapp-gcc"
+ ;;
+ "armhf")
+ TARGET="arm-armv7a-linuxapp-gcc"
+ ;;
+ "i386")
+ TARGET="i686-native-linuxapp-gcc"
+ ;;
+ "")
+ TARGET="x86_64-native-linuxapp-gcc"
+ DPDK_MACHINE=snb
+ ;;
+ esac
+ - |
+ if [ -n "$TARGET" -a ! -f "dpdk/${TARGET}/lib/libdpdk.a" ]; then
git -c advice.detachedHead=false clone -q --depth=1 --single-branch --branch=v${DPDK_VERS} http://dpdk.org/git/dpdk dpdk
pushd dpdk
git log --oneline --decorate
+ echo $CC
+ # AArch64 && ARMv7 fixup
+ sed -i -e 's/40900/40800/g' lib/librte_eal/common/include/arch/arm/rte_vect.h
+ sed -i -e 's/!(/!(defined(__arm__) \&\& defined(__clang__) || /g' lib/librte_eal/common/include/arch/arm/rte_byteorder.h
+ sed -i -e 's/__GNUC__/defined(__arm__) \&\& defined(__clang__) || __GNUC__/' lib/librte_eal/common/include/generic/rte_byteorder.h
make config T=${TARGET} O=${TARGET}
pushd ${TARGET}
sed -ri 's,(CONFIG_RTE_LIBRTE_PMD_PCAP=).*,\1y,' .config
cat .config |grep RTE_MACHINE
- sed -ri 's,(CONFIG_RTE_MACHINE=).*,\1"snb",' .config
+ if test -n "${DPDK_MACHINE}" ; then
+ sed -ri 's,(CONFIG_RTE_MACHINE=).*,\1"'${DPDK_MACHINE}'",' .config
+ fi
+ if test -n "$CROSS_ARCH" ; then
+ sed -ri -e 's,(CONFIG_RTE_EAL_IGB_UIO=).*,\1n,' .config
+ sed -ri -e 's,(CONFIG_RTE_KNI_KMOD=).*,\1n,' .config
+ fi
popd
- make install T=${TARGET} EXTRA_CFLAGS="-fPIC"
+ make install T=${TARGET} EXTRA_CFLAGS="-fPIC $DPDK_CFLAGS" CROSS="$DPDK_CROSS"
rm -r ./doc ./${TARGET}/app ./${TARGET}/build
popd
+ EXTRA_CONF="$EXTRA_CONF --with-dpdk-path=`pwd`/dpdk/${TARGET}"
fi
# Netmap pktio
@@ -202,12 +238,10 @@ install:
popd
fi
sudo insmod ./netmap/LINUX/netmap.ko
+ EXTRA_CONF="$EXTRA_CONF --with-netmap-path=`pwd`/netmap"
fi
script:
- - if [ -z "$CROSS_ARCH" ] ; then
- EXTRA_CONF="--with-dpdk-path=`pwd`/dpdk/${TARGET} --with-netmap-path=`pwd`/netmap" ;
- fi
- ./bootstrap
- ./configure --prefix=$HOME/odp-install
--enable-user-guides
commit 37b4da286aeff3321084e62045d0b3ab10c07399
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Sat Dec 2 04:53:40 2017 +0300
linux-gen: dpdk: cast addresses to uintptr_t rather than uint64_t
This is to remove the following error:
pktio/dpdk.c: In function ‘mbuf_data_off’:
pktio/dpdk.c:126:9: error: cast from pointer to integer of different
size [-Werror=pointer-to-int-cast]
return (uint64_t)pkt_hdr->buf_hdr.seg[0].data -
^
pktio/dpdk.c:127:4: error: cast from pointer to integer of different
size [-Werror=pointer-to-int-cast]
(uint64_t)mbuf->buf_addr;
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-and-tested-by: Matias Elo <matias.elo(a)nokia.com>
diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c
index db2a8b0f..585ff462 100644
--- a/platform/linux-generic/pktio/dpdk.c
+++ b/platform/linux-generic/pktio/dpdk.c
@@ -123,8 +123,8 @@ static unsigned cache_size(uint32_t num)
static inline uint16_t mbuf_data_off(struct rte_mbuf *mbuf,
odp_packet_hdr_t *pkt_hdr)
{
- return (uint64_t)pkt_hdr->buf_hdr.seg[0].data -
- (uint64_t)mbuf->buf_addr;
+ return (uintptr_t)pkt_hdr->buf_hdr.seg[0].data -
+ (uintptr_t)mbuf->buf_addr;
}
/**
commit e02d9f43ea8675db5ad5202ef605e6dd8014abb5
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Fri Dec 1 20:11:02 2017 +0300
linux-gen: pktio: support using DPDK lt 17.08
Debian unstable ships with DPDK 16.11. Add support for building with
this version.
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-and-tested-by: Matias Elo <matias.elo(a)nokia.com>
diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c
index 07671e62..db2a8b0f 100644
--- a/platform/linux-generic/pktio/dpdk.c
+++ b/platform/linux-generic/pktio/dpdk.c
@@ -29,14 +29,27 @@
#include <rte_config.h>
#include <rte_malloc.h>
+#if __GNUC__ >= 7
+#pragma GCC diagnostic push
+#pragma GCC diagnostic warning "-Wimplicit-fallthrough=0"
+#endif
#include <rte_mbuf.h>
+#if __GNUC__ >= 7
+#pragma GCC diagnostic pop
+#endif
#include <rte_mempool.h>
#include <rte_ethdev.h>
#include <rte_ip.h>
#include <rte_ip_frag.h>
+#include <rte_log.h>
#include <rte_udp.h>
#include <rte_tcp.h>
#include <rte_string_fns.h>
+#include <rte_version.h>
+
+#if RTE_VERSION < RTE_VERSION_NUM(17, 5, 0, 0)
+#define rte_log_set_global_level rte_set_log_level
+#endif
#if ODP_DPDK_ZERO_COPY
ODP_STATIC_ASSERT(CONFIG_PACKET_HEADROOM == RTE_PKTMBUF_HEADROOM,
@@ -54,6 +67,7 @@ static int disable_pktio; /** !0 this pktio disabled, 0 enabled */
/* Has dpdk_pktio_init() been called */
static odp_bool_t dpdk_initialized;
+#ifndef RTE_BUILD_SHARED_LIB
#define MEMPOOL_OPS(hdl) \
extern void mp_hdlr_init_##hdl(void)
@@ -77,6 +91,7 @@ void refer_constructors(void)
mp_hdlr_init_ops_sp_mc();
mp_hdlr_init_ops_stack();
}
+#endif
/**
* Calculate valid cache size for DPDK packet pool
@@ -928,6 +943,11 @@ static int dpdk_close(pktio_entry_t *pktio_entry)
rte_pktmbuf_free(pkt_dpdk->rx_cache[i].s.pkt[idx++]);
}
+#if RTE_VERSION < RTE_VERSION_NUM(17, 8, 0, 0)
+ if (pktio_entry->s.state != PKTIO_STATE_OPENED)
+ rte_eth_dev_close(pkt_dpdk->port_id);
+#endif
+
return 0;
}
@@ -1064,14 +1084,16 @@ static void dpdk_mempool_free(struct rte_mempool *mp, void *arg ODP_UNUSED)
static int dpdk_pktio_term(void)
{
- uint8_t port_id;
-
if (!dpdk_initialized)
return 0;
+#if RTE_VERSION >= RTE_VERSION_NUM(17, 8, 0, 0)
+ uint8_t port_id;
+
RTE_ETH_FOREACH_DEV(port_id) {
rte_eth_dev_close(port_id);
}
+#endif
if (!ODP_DPDK_ZERO_COPY)
rte_mempool_walk(dpdk_mempool_free, NULL);
commit 442638dd1514f8dda882d48fbb1ebc88ef9af430
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Fri Dec 1 20:10:31 2017 +0300
linux-gen: add support for using system-wide DPDK
Support using distro-installed DPDK for Pkt I/O. Distributions (like
Ubuntu, Debian, etc) start providing DPDK packages. It is wise to enable
users to use distro-provided DPDK version rather than requiring to
always compile it from sources.
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-and-tested-by: Matias Elo <matias.elo(a)nokia.com>
diff --git a/m4/odp_dpdk.m4 b/m4/odp_dpdk.m4
index 636170a7..05e60cc0 100644
--- a/m4/odp_dpdk.m4
+++ b/m4/odp_dpdk.m4
@@ -16,6 +16,31 @@ AS_VAR_APPEND([DPDK_PMDS], [--no-whole-archive])
AC_SUBST([DPDK_PMDS])
])
+# _ODP_DPDK_CHECK_LIB(LDFLAGS, [LIBS], [EXTRA_LIBS])
+# ----------------------------------
+# Check if one can use -ldpdk with provided set of libs
+AC_DEFUN([_ODP_DPDK_CHECK_LIB], [dnl
+##########################################################################
+# Save and set temporary compilation flags
+##########################################################################
+OLD_LDFLAGS=$LDFLAGS
+OLD_LIBS=$LIBS
+LDFLAGS="$1 $LDFLAGS"
+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"],
+ [AC_MSG_RESULT([no])])
+
+##########################################################################
+# Restore old saved variables
+##########################################################################
+LDFLAGS=$OLD_LDFLAGS
+LIBS=$OLD_LIBS
+])
+
# ODP_DPDK_CHECK(CPPFLAGS, LDFLAGS, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND)
# -----------------------------------------------------------------------
# Check for DPDK availability
@@ -23,10 +48,7 @@ AC_DEFUN([ODP_DPDK_CHECK], [dnl
##########################################################################
# Save and set temporary compilation flags
##########################################################################
-OLD_LDFLAGS=$LDFLAGS
-OLD_LIBS=$LIBS
OLD_CPPFLAGS=$CPPFLAGS
-LDFLAGS="$2 $LDFLAGS"
CPPFLAGS="$1 $CPPFLAGS"
dpdk_check_ok=yes
@@ -34,16 +56,21 @@ dpdk_check_ok=yes
AC_CHECK_HEADERS([rte_config.h], [],
[dpdk_check_ok=no])
-AC_CHECK_LIB([dpdk], [rte_eal_init], [],
- [dpdk_check_ok=no], [-ldl -lpthread -lnuma])
+DPDK_LIBS=""
+_ODP_DPDK_CHECK_LIB([$2])
+AS_IF([test "x$DPDK_LIBS" = "x"],
+ [_ODP_DPDK_CHECK_LIB([$2], [-ldl -lpthread], [-lm])])
+AS_IF([test "x$DPDK_LIBS" = "x"],
+ [_ODP_DPDK_CHECK_LIB([$2], [-ldl -lpthread -lnuma], [-lm])])
+AS_IF([test "x$DPDK_LIBS" = "x"],
+ [dpdk_check_ok=no])
AS_IF([test "x$dpdk_check_ok" != "xno"],
- [m4_default([$3], [:])],
+ [AC_SUBST([DPDK_LIBS])
+ m4_default([$3], [:])],
[m4_default([$4], [:])])
##########################################################################
# Restore old saved variables
##########################################################################
-LDFLAGS=$OLD_LDFLAGS
-LIBS=$OLD_LIBS
CPPFLAGS=$OLD_CPPFLAGS
])
diff --git a/platform/linux-generic/m4/odp_dpdk.m4 b/platform/linux-generic/m4/odp_dpdk.m4
index 91f76e2d..471bbcd5 100644
--- a/platform/linux-generic/m4/odp_dpdk.m4
+++ b/platform/linux-generic/m4/odp_dpdk.m4
@@ -2,12 +2,27 @@
# Enable DPDK support
##########################################################################
pktio_dpdk_support=no
+
+AC_ARG_ENABLE([dpdk],
+ [AS_HELP_STRING([--enable-dpdk], [enable DPDK support for Packet I/O])],
+ [pktio_dpdk_support=$enableval
+ DPDK_PATH=system])
+
AC_ARG_WITH([dpdk-path],
[AS_HELP_STRING([--with-dpdk-path=DIR], [path to dpdk build directory])],
[DPDK_PATH="$withval"
- DPDK_CPPFLAGS="-isystem $DPDK_PATH/include"
- DPDK_LDFLAGS="-L$DPDK_PATH/lib"
- pktio_dpdk_support=yes],[])
+ 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
@@ -30,14 +45,17 @@ then
ODP_DPDK_CHECK([$DPDK_CPPFLAGS], [$DPDK_LDFLAGS], [],
[AC_MSG_FAILURE([can't find DPDK])])
- ODP_DPDK_PMDS([$DPDK_PATH/lib])
+ ODP_DPDK_PMDS([$DPDK_PMD_PATH])
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])
- DPDK_LIBS="$DPDK_LDFLAGS -ldpdk -lpthread -ldl -lpcap -lm -lnuma"
+ 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
commit c6573eb58dcf0d0316ada1e91ae1993100c4d559
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Fri Dec 1 22:41:54 2017 +0300
linux-gen: apply -msse4.2 only in x86 case
Flag -msse4.2 should be used only for i?86/x86_64 targets, it does not
make sense for any other target.
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-and-tested-by: Matias Elo <matias.elo(a)nokia.com>
diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am
index 9cb501cf..bbe6a21c 100644
--- a/platform/linux-generic/Makefile.am
+++ b/platform/linux-generic/Makefile.am
@@ -14,6 +14,12 @@ AM_CPPFLAGS += $(OPENSSL_CPPFLAGS)
AM_CPPFLAGS += $(DPDK_CPPFLAGS)
AM_CPPFLAGS += $(NETMAP_CPPFLAGS)
+if PKTIO_DPDK
+if ARCH_IS_X86
+AM_CFLAGS += -msse4.2
+endif
+endif
+
odpincludedir= $(includedir)/odp
odpinclude_HEADERS = \
include/odp/visibility_begin.h \
diff --git a/platform/linux-generic/m4/odp_dpdk.m4 b/platform/linux-generic/m4/odp_dpdk.m4
index ba0fdc93..91f76e2d 100644
--- a/platform/linux-generic/m4/odp_dpdk.m4
+++ b/platform/linux-generic/m4/odp_dpdk.m4
@@ -5,7 +5,7 @@ pktio_dpdk_support=no
AC_ARG_WITH([dpdk-path],
[AS_HELP_STRING([--with-dpdk-path=DIR], [path to dpdk build directory])],
[DPDK_PATH="$withval"
- DPDK_CPPFLAGS="-msse4.2 -isystem $DPDK_PATH/include"
+ DPDK_CPPFLAGS="-isystem $DPDK_PATH/include"
DPDK_LDFLAGS="-L$DPDK_PATH/lib"
pktio_dpdk_support=yes],[])
commit aab8ff7237c117e9ed63a8b7d595aca7f5665ff9
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Tue Oct 17 12:37:25 2017 +0300
configure: separate common DPDK check to odp_dpdk.m4
Separate DPDK macros to top-level file so that they can be reused by
other implementations (like ODP-DPDK).
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-and-tested-by: Matias Elo <matias.elo(a)nokia.com>
diff --git a/m4/odp_dpdk.m4 b/m4/odp_dpdk.m4
new file mode 100644
index 00000000..636170a7
--- /dev/null
+++ b/m4/odp_dpdk.m4
@@ -0,0 +1,49 @@
+# ODP_DPDK_PMDS(DPDK_DRIVER_PATH)
+# -------------------------------
+# Build a list of DPDK PMD drivers in DPDK_PMDS variable
+AC_DEFUN([ODP_DPDK_PMDS], [dnl
+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
+done
+AS_VAR_APPEND([DPDK_PMDS], [--no-whole-archive])
+AC_SUBST([DPDK_PMDS])
+])
+
+# ODP_DPDK_CHECK(CPPFLAGS, LDFLAGS, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND)
+# -----------------------------------------------------------------------
+# Check for DPDK availability
+AC_DEFUN([ODP_DPDK_CHECK], [dnl
+##########################################################################
+# Save and set temporary compilation flags
+##########################################################################
+OLD_LDFLAGS=$LDFLAGS
+OLD_LIBS=$LIBS
+OLD_CPPFLAGS=$CPPFLAGS
+LDFLAGS="$2 $LDFLAGS"
+CPPFLAGS="$1 $CPPFLAGS"
+
+dpdk_check_ok=yes
+
+AC_CHECK_HEADERS([rte_config.h], [],
+ [dpdk_check_ok=no])
+
+AC_CHECK_LIB([dpdk], [rte_eal_init], [],
+ [dpdk_check_ok=no], [-ldl -lpthread -lnuma])
+AS_IF([test "x$dpdk_check_ok" != "xno"],
+ [m4_default([$3], [:])],
+ [m4_default([$4], [:])])
+
+##########################################################################
+# Restore old saved variables
+##########################################################################
+LDFLAGS=$OLD_LDFLAGS
+LIBS=$OLD_LIBS
+CPPFLAGS=$OLD_CPPFLAGS
+])
diff --git a/platform/linux-generic/m4/odp_dpdk.m4 b/platform/linux-generic/m4/odp_dpdk.m4
index 1e8fa2de..ba0fdc93 100644
--- a/platform/linux-generic/m4/odp_dpdk.m4
+++ b/platform/linux-generic/m4/odp_dpdk.m4
@@ -3,9 +3,10 @@
##########################################################################
pktio_dpdk_support=no
AC_ARG_WITH([dpdk-path],
-AS_HELP_STRING([--with-dpdk-path=DIR path to dpdk build directory]),
+[AS_HELP_STRING([--with-dpdk-path=DIR], [path to dpdk build directory])],
[DPDK_PATH="$withval"
DPDK_CPPFLAGS="-msse4.2 -isystem $DPDK_PATH/include"
+ DPDK_LDFLAGS="-L$DPDK_PATH/lib"
pktio_dpdk_support=yes],[])
##########################################################################
@@ -13,17 +14,11 @@ AS_HELP_STRING([--with-dpdk-path=DIR path to dpdk build directory]),
##########################################################################
zero_copy=0
AC_ARG_ENABLE([dpdk-zero-copy],
- [ --enable-dpdk-zero-copy enable experimental zero-copy DPDK pktio mode],
+ [AS_HELP_STRING([--enable-dpdk-zero-copy], [enable experimental zero-copy DPDK pktio mode])],
[if test x$enableval = xyes; then
zero_copy=1
fi])
-##########################################################################
-# Save and set temporary compilation flags
-##########################################################################
-OLD_CPPFLAGS="$CPPFLAGS"
-CPPFLAGS="$DPDK_CPPFLAGS $CPPFLAGS"
-
##########################################################################
# Check for DPDK availability
#
@@ -32,37 +27,21 @@ CPPFLAGS="$DPDK_CPPFLAGS $CPPFLAGS"
##########################################################################
if test x$pktio_dpdk_support = xyes
then
- AC_CHECK_HEADERS([rte_config.h], [],
- [AC_MSG_FAILURE(["can't find DPDK header"])])
+ ODP_DPDK_CHECK([$DPDK_CPPFLAGS], [$DPDK_LDFLAGS], [],
+ [AC_MSG_FAILURE([can't find DPDK])])
- AS_VAR_SET([DPDK_PMDS], [-Wl,--whole-archive,])
- for filename in "$DPDK_PATH"/lib/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
- done
- AS_VAR_APPEND([DPDK_PMDS], [--no-whole-archive])
+ ODP_DPDK_PMDS([$DPDK_PATH/lib])
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])
- DPDK_LIBS="-L$DPDK_PATH/lib -ldpdk -lpthread -ldl -lpcap -lm -lnuma"
+ DPDK_LIBS="$DPDK_LDFLAGS -ldpdk -lpthread -ldl -lpcap -lm -lnuma"
AC_SUBST([DPDK_CPPFLAGS])
AC_SUBST([DPDK_LIBS])
- AC_SUBST([DPDK_PMDS])
else
pktio_dpdk_support=no
fi
-##########################################################################
-# Restore old saved variables
-##########################################################################
-CPPFLAGS=$OLD_CPPFLAGS
-
AM_CONDITIONAL([PKTIO_DPDK], [test x$pktio_dpdk_support = xyes ])
-----------------------------------------------------------------------
Summary of changes:
.travis.yml | 50 +++++++++++++++++++----
m4/odp_dpdk.m4 | 76 +++++++++++++++++++++++++++++++++++
platform/linux-generic/Makefile.am | 6 +++
platform/linux-generic/m4/odp_dpdk.m4 | 57 +++++++++++++-------------
platform/linux-generic/pktio/dpdk.c | 30 ++++++++++++--
5 files changed, 177 insertions(+), 42 deletions(-)
create mode 100644 m4/odp_dpdk.m4
hooks/post-receive
--
7 years, 5 months
- 1
- 0
[COMMIT] branch 2.0 updated. v1.15.0.0-947-g75f3d60e
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, 2.0 has been updated
via 75f3d60e6b31544bb9b273364b2cce502262c1f8 (commit)
via 61d636209fe064bca7e645af3938739290020875 (commit)
via 29e1c5d318822f1ab14e9d82b75f66159f42efcc (commit)
via 2d187fd4a4039778ca8ed78dc23ea1da436d427b (commit)
via b920c02af3e0c179435db03c71694ace2a62c4f1 (commit)
via 59877869efeb29038ba82a4b4771f5864438f8a8 (commit)
via 19fe9172ee1fd069a2db86c554db41cbfc69c42d (commit)
via 80b0d616f750e824a4bf0b0f3406ea3a3173ae0e (commit)
from 00c7441fae53949dd87855d48102f932f8f64537 (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 75f3d60e6b31544bb9b273364b2cce502262c1f8
Author: Yi He <yi.he(a)linaro.org>
Date: Mon Dec 4 15:36:08 2017 +0800
linux-dpdk: fix inconsistent *_INVALID defines
Fixed inconsistent defines of ODP_BUFFER_INVALID, ODP_EVENT_INVALID
and ODP_TIMEOUT_INVALID as NULL instead of 0xffffffff for linux-dpdk
platform, to align with linux-generic as well as abi compatible headers.
Signed-off-by: Yi He <yi.he(a)linaro.org>
Reviewed-by: Honnappa Nagarahalli <honnappa.nagarahalli(a)arm.com>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
diff --git a/platform/linux-dpdk/include/odp/api/plat/buffer_types.h b/platform/linux-dpdk/include/odp/api/plat/buffer_types.h
index 809768f3..0f5f7baa 100644
--- a/platform/linux-dpdk/include/odp/api/plat/buffer_types.h
+++ b/platform/linux-dpdk/include/odp/api/plat/buffer_types.h
@@ -31,7 +31,7 @@ extern "C" {
typedef ODP_HANDLE_T(odp_buffer_t);
-#define ODP_BUFFER_INVALID _odp_cast_scalar(odp_buffer_t, 0xffffffff)
+#define ODP_BUFFER_INVALID _odp_cast_scalar(odp_buffer_t, NULL)
typedef ODP_HANDLE_T(odp_buffer_seg_t);
diff --git a/platform/linux-dpdk/include/odp/api/plat/event_types.h b/platform/linux-dpdk/include/odp/api/plat/event_types.h
index e0f68e34..ecda702c 100644
--- a/platform/linux-dpdk/include/odp/api/plat/event_types.h
+++ b/platform/linux-dpdk/include/odp/api/plat/event_types.h
@@ -32,7 +32,7 @@ extern "C" {
typedef ODP_HANDLE_T(odp_event_t);
-#define ODP_EVENT_INVALID _odp_cast_scalar(odp_event_t, 0xffffffff)
+#define ODP_EVENT_INVALID _odp_cast_scalar(odp_event_t, NULL)
/**
* Event types
diff --git a/platform/linux-dpdk/include/odp/api/plat/timer_types.h b/platform/linux-dpdk/include/odp/api/plat/timer_types.h
index 2ae8bfec..3d97993b 100644
--- a/platform/linux-dpdk/include/odp/api/plat/timer_types.h
+++ b/platform/linux-dpdk/include/odp/api/plat/timer_types.h
@@ -37,7 +37,7 @@ typedef ODP_HANDLE_T(odp_timer_t);
typedef ODP_HANDLE_T(odp_timeout_t);
-#define ODP_TIMEOUT_INVALID _odp_cast_scalar(odp_timeout_t, 0xffffffff)
+#define ODP_TIMEOUT_INVALID _odp_cast_scalar(odp_timeout_t, NULL)
/**
* @}
commit 61d636209fe064bca7e645af3938739290020875
Author: Yi He <yi.he(a)linaro.org>
Date: Fri Dec 1 16:31:40 2017 +0800
linux-dpdk: fix platform tests
Fixed search path in pktio_run.sh for pktio_main executable,
and Makefile.am to run platform tests with wrapper script.
Signed-off-by: Yi He <yi.he(a)linaro.org>
Reviewed-by: Honnappa Nagarahalli <honnappa.nagarahalli(a)arm.com>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
diff --git a/platform/linux-dpdk/test/Makefile.am b/platform/linux-dpdk/test/Makefile.am
index a872400e..8cb27b14 100644
--- a/platform/linux-dpdk/test/Makefile.am
+++ b/platform/linux-dpdk/test/Makefile.am
@@ -14,8 +14,6 @@ SUBDIRS += validation/api/pktio
endif
endif
-TEST_EXTENSIONS = .sh
-
TESTNAME = linux-dpdk
TESTENV = tests-$(TESTNAME).env
diff --git a/platform/linux-dpdk/test/validation/api/pktio/pktio_run.sh b/platform/linux-dpdk/test/validation/api/pktio/pktio_run.sh
index 538c87d0..a08256a6 100755
--- a/platform/linux-dpdk/test/validation/api/pktio/pktio_run.sh
+++ b/platform/linux-dpdk/test/validation/api/pktio/pktio_run.sh
@@ -23,7 +23,7 @@
# running stand alone out of tree requires setting PATH
PATH=${TEST_DIR}/api/pktio:$PATH
PATH=$(dirname $0):$PATH
-PATH=$(dirname $0)/../../../../common_plat/validation/api/pktio:$PATH
+PATH=$(dirname $0)/../../../../../../test/validation/api/pktio:$PATH
PATH=.:$PATH
pktio_main_path=$(which pktio_main${EXEEXT})
commit 29e1c5d318822f1ab14e9d82b75f66159f42efcc
Author: Balakrishna Garapati <balakrishna.garapati(a)linaro.org>
Date: Thu Nov 30 22:50:48 2017 +0100
linux-dpdk: crypto bug fixes
Signed-off-by: Balakrishna Garapati <balakrishna.garapati(a)linaro.org>
Reviewed-by: Yi He <yi.he(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
diff --git a/platform/linux-dpdk/odp_crypto.c b/platform/linux-dpdk/odp_crypto.c
index 9844f2dd..ea014c8e 100644
--- a/platform/linux-dpdk/odp_crypto.c
+++ b/platform/linux-dpdk/odp_crypto.c
@@ -808,40 +808,53 @@ int odp_crypto_session_create(odp_crypto_session_param_t *param,
/* Default to successful result */
*status = ODP_CRYPTO_SES_CREATE_ERR_NONE;
- /* Cipher Data */
- cipher_xform.cipher.key.data = rte_malloc("crypto key",
- param->cipher_key.length, 0);
- if (cipher_xform.cipher.key.data == NULL) {
- ODP_ERR("Failed to allocate memory for cipher key\n");
- /* remove the crypto_session_entry_t */
- memset(entry, 0, sizeof(*entry));
- free_session(entry);
- return -1;
- }
-
cipher_xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
cipher_xform.next = NULL;
- cipher_xform.cipher.key.length = param->cipher_key.length;
- memcpy(cipher_xform.cipher.key.data,
- param->cipher_key.data,
- param->cipher_key.length);
-
- /* Authentication Data */
- auth_xform.auth.key.data = rte_malloc("auth key",
- param->auth_key.length, 0);
- if (auth_xform.auth.key.data == NULL) {
- ODP_ERR("Failed to allocate memory for auth key\n");
- /* remove the crypto_session_entry_t */
- memset(entry, 0, sizeof(*entry));
- free_session(entry);
- return -1;
+
+ if (param->cipher_key.length) {
+ /* Cipher Data */
+ cipher_xform.cipher.key.data = rte_malloc("crypto key",
+ param->cipher_key.length, 0);
+ if (cipher_xform.cipher.key.data == NULL) {
+ ODP_ERR("Failed to allocate memory for cipher key\n");
+ /* remove the crypto_session_entry_t */
+ memset(entry, 0, sizeof(*entry));
+ free_session(entry);
+ return -1;
+ }
+
+ cipher_xform.cipher.key.length = param->cipher_key.length;
+ memcpy(cipher_xform.cipher.key.data,
+ param->cipher_key.data,
+ param->cipher_key.length);
+ } else {
+ cipher_xform.cipher.key.data = 0;
+ cipher_xform.cipher.key.length = 0;
}
+
auth_xform.type = RTE_CRYPTO_SYM_XFORM_AUTH;
auth_xform.next = NULL;
- auth_xform.auth.key.length = param->auth_key.length;
- memcpy(auth_xform.auth.key.data,
- param->auth_key.data,
- param->auth_key.length);
+
+ if (param->auth_key.length) {
+ /* Authentication Data */
+ auth_xform.auth.key.data = rte_malloc("auth key",
+ param->auth_key.length, 0);
+ if (auth_xform.auth.key.data == NULL) {
+ ODP_ERR("Failed to allocate memory for auth key\n");
+ /* remove the crypto_session_entry_t */
+ memset(entry, 0, sizeof(*entry));
+ free_session(entry);
+ return -1;
+ }
+ auth_xform.auth.key.length = param->auth_key.length;
+ memcpy(auth_xform.auth.key.data,
+ param->auth_key.data,
+ param->auth_key.length);
+ } else {
+ auth_xform.auth.key.data = 0;
+ auth_xform.auth.key.length = 0;
+ }
+
/* Derive order */
if (ODP_CRYPTO_OP_ENCODE == param->op)
@@ -1271,11 +1284,13 @@ int odp_crypto_int(odp_packet_t pkt_in,
memcpy(op->sym->cipher.iv.data,
param->override_iv_ptr,
entry->iv.length);
+ op->sym->cipher.iv.phys_addr =
+ rte_malloc_virt2phy(op->sym->cipher.iv.data);
+ op->sym->cipher.iv.length = entry->iv.length;
} else if (entry->iv.data) {
memcpy(op->sym->cipher.iv.data,
entry->iv.data,
entry->iv.length);
-
op->sym->cipher.iv.phys_addr =
rte_malloc_virt2phy(op->sym->cipher.iv.data);
op->sym->cipher.iv.length = entry->iv.length;
@@ -1326,7 +1341,7 @@ int odp_crypto_int(odp_packet_t pkt_in,
(rc_auth == ODP_CRYPTO_ALG_ERR_NONE);
_odp_buffer_event_subtype_set(packet_to_buffer(out_pkt),
- ODP_EVENT_PACKET_BASIC);
+ ODP_EVENT_PACKET_CRYPTO);
op_result = get_op_result_from_packet(out_pkt);
*op_result = local_result;
commit 2d187fd4a4039778ca8ed78dc23ea1da436d427b
Author: Balakrishna Garapati <balakrishna.garapati(a)linaro.org>
Date: Thu Nov 30 14:57:27 2017 +0100
linux-dpdk: changes which are needed for odp_crypto to work
All the changes are within the linux-dpdk/odp_crypto.c file:
1) Added missing brackets which made it impossible to create
a crypto session
2) Increased the number of queues created, from nb_queue_pairs - 1
to nb_queue_pairs, what seems to work better
3) Removed a memory leak - the memory allocated for iv and aad
were not freed
Signed-off-by: Szymon Sliwa <szs(a)semihalf.com>
Signed-off-by: Balakrishna Garapati <balakrishna.garapati(a)linaro.org>
Reviewed-by: Yi He <yi.he(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
diff --git a/platform/linux-dpdk/odp_crypto.c b/platform/linux-dpdk/odp_crypto.c
index 8e0f8a9d..9844f2dd 100644
--- a/platform/linux-dpdk/odp_crypto.c
+++ b/platform/linux-dpdk/odp_crypto.c
@@ -271,7 +271,7 @@ int odp_crypto_init_global(void)
qp_conf.nb_descriptors = NB_MBUF;
- for (queue_pair = 0; queue_pair < nb_queue_pairs - 1;
+ for (queue_pair = 0; queue_pair < nb_queue_pairs;
queue_pair++) {
rc = rte_cryptodev_queue_pair_setup(cdev_id,
queue_pair,
@@ -898,11 +898,12 @@ int odp_crypto_session_create(odp_crypto_session_param_t *param,
/* Setup session */
session = rte_cryptodev_sym_session_create(cdev_id, first_xform);
- if (session == NULL)
+ if (session == NULL) {
/* remove the crypto_session_entry_t */
memset(entry, 0, sizeof(*entry));
free_session(entry);
return -1;
+ }
entry->rte_session = (intptr_t)session;
entry->cipher_xform = cipher_xform;
@@ -1216,6 +1217,9 @@ int odp_crypto_int(odp_packet_t pkt_in,
goto err;
}
+ op->sym->auth.aad.data = NULL;
+ op->sym->cipher.iv.data = NULL;
+
odp_spinlock_unlock(&global->lock);
/* Set crypto operation data parameters */
@@ -1242,9 +1246,8 @@ int odp_crypto_int(odp_packet_t pkt_in,
if (aad_len > 0) {
op->sym->auth.aad.data = rte_malloc("aad", aad_len, 0);
if (op->sym->auth.aad.data == NULL) {
- rte_crypto_op_free(op);
ODP_ERR("Failed to allocate memory for AAD");
- goto err;
+ goto err_op_free;
}
memcpy(op->sym->auth.aad.data, aad_head, aad_len);
@@ -1254,16 +1257,14 @@ int odp_crypto_int(odp_packet_t pkt_in,
}
if (entry->iv.length == 0) {
- rte_crypto_op_free(op);
ODP_ERR("Wrong IV length");
- goto err;
+ goto err_op_free;
}
op->sym->cipher.iv.data = rte_malloc("iv", entry->iv.length, 0);
if (op->sym->cipher.iv.data == NULL) {
- rte_crypto_op_free(op);
ODP_ERR("Failed to allocate memory for IV");
- goto err;
+ goto err_op_free;
}
if (param->override_iv_ptr) {
@@ -1300,18 +1301,16 @@ int odp_crypto_int(odp_packet_t pkt_in,
rc = rte_cryptodev_enqueue_burst(rte_session->dev_id,
queue_pair, &op, 1);
if (rc == 0) {
- rte_crypto_op_free(op);
ODP_ERR("Failed to enqueue packet");
- goto err;
+ goto err_op_free;
}
rc = rte_cryptodev_dequeue_burst(rte_session->dev_id,
queue_pair, &op, 1);
if (rc == 0) {
- rte_crypto_op_free(op);
ODP_ERR("Failed to dequeue packet");
- goto err;
+ goto err_op_free;
}
out_pkt = (odp_packet_t)op->sym->m_src;
@@ -1331,6 +1330,8 @@ int odp_crypto_int(odp_packet_t pkt_in,
op_result = get_op_result_from_packet(out_pkt);
*op_result = local_result;
+ rte_free(op->sym->cipher.iv.data);
+ rte_free(op->sym->auth.aad.data);
rte_crypto_op_free(op);
/* Synchronous, simply return results */
@@ -1338,6 +1339,11 @@ int odp_crypto_int(odp_packet_t pkt_in,
return 0;
+err_op_free:
+ rte_free(op->sym->cipher.iv.data);
+ rte_free(op->sym->auth.aad.data);
+ rte_crypto_op_free(op);
+
err:
if (allocated) {
odp_packet_free(out_pkt);
commit b920c02af3e0c179435db03c71694ace2a62c4f1
Author: Balakrishna Garapati <balakrishna.garapati(a)linaro.org>
Date: Tue Nov 14 17:32:03 2017 +0100
test: enable dpdk initialization before running validation on linux-dpdk
Signed-off-by: Balakrishna Garapati <balakrishna.garapati(a)linaro.org>
Reviewed-by: Yi He <yi.he(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
diff --git a/platform/linux-generic/test/wrapper-script.sh b/platform/linux-generic/test/wrapper-script.sh
new file mode 100755
index 00000000..977a032a
--- /dev/null
+++ b/platform/linux-generic/test/wrapper-script.sh
@@ -0,0 +1,3 @@
+#wrapper script for pre setting environment for validation suit.
+#currently this is empty but needs to be created to make it align with
+#linux-dpdk.
diff --git a/test/Makefile.inc b/test/Makefile.inc
index eaf791e0..3e7dfe57 100644
--- a/test/Makefile.inc
+++ b/test/Makefile.inc
@@ -20,6 +20,8 @@ AM_CFLAGS = $(CUNIT_CFLAGS)
AM_LDFLAGS = -L$(LIB) -static
+LOG_COMPILER = $(top_srcdir)/platform/@with_platform@/test/wrapper-script.sh
+
@VALGRIND_CHECK_RULES@
TESTS_ENVIRONMENT = ODP_PLATFORM=${with_platform} \
diff --git a/test/performance/Makefile.am b/test/performance/Makefile.am
index 1dccd82e..4417c484 100644
--- a/test/performance/Makefile.am
+++ b/test/performance/Makefile.am
@@ -31,6 +31,6 @@ odp_sched_latency_SOURCES = odp_sched_latency.c
odp_scheduling_SOURCES = odp_scheduling.c
odp_pktio_perf_SOURCES = odp_pktio_perf.c
-dist_check_SCRIPTS = $(TESTSCRIPTS)
+dist_check_SCRIPTS = $(TESTSCRIPTS) $(LOG_COMPILER)
dist_check_DATA = udp64.pcap
commit 59877869efeb29038ba82a4b4771f5864438f8a8
Author: Honnappa Nagarahalli <honnappa.nagarahalli(a)arm.com>
Date: Tue Nov 21 15:23:50 2017 -0600
linux-dpdk: pktio: Do not reset parse fields when parsing not enabled
When parsing of the packet is not enabled, application will not
look at parse meta data fields.
Signed-off-by: Honnappa Nagarahalli <honnappa.nagarahalli(a)arm.com>
Reviewed-by: Ola Liljedahl <ola.Liljedahl(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/pktio/dpdk.c b/platform/linux-dpdk/pktio/dpdk.c
index 832ac7ac..2d95e902 100644
--- a/platform/linux-dpdk/pktio/dpdk.c
+++ b/platform/linux-dpdk/pktio/dpdk.c
@@ -403,13 +403,14 @@ static int recv_pkt_dpdk(pktio_entry_t *pktio_entry, int index,
for (i = 0; i < nb_rx; ++i) {
odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt_table[i]);
- packet_parse_reset(pkt_hdr);
pkt_hdr->input = pktio_entry->s.handle;
if (!pktio_cls_enabled(pktio_entry) &&
- pktio_entry->s.config.parser.layer)
+ pktio_entry->s.config.parser.layer) {
+ packet_parse_reset(pkt_hdr);
packet_parse_layer(pkt_hdr,
pktio_entry->s.config.parser.layer);
+ }
packet_set_ts(pkt_hdr, ts);
}
commit 19fe9172ee1fd069a2db86c554db41cbfc69c42d
Author: Honnappa Nagarahalli <honnappa.nagarahalli(a)arm.com>
Date: Tue Nov 21 14:26:00 2017 -0600
linux-dpdk: pool: Remove unused CONFIG_POOL_MAX_NUM
CONFIG_POOL_MAX_NUM is not used in linux-dpdk.
Signed-off-by: Honnappa Nagarahalli <honnappa.nagarahalli(a)arm.com>
Reviewed-by: Ola Liljedahl <ola.Liljedahl(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_config_internal.h b/platform/linux-dpdk/include/odp_config_internal.h
index 6aadc93f..f36fcb92 100644
--- a/platform/linux-dpdk/include/odp_config_internal.h
+++ b/platform/linux-dpdk/include/odp_config_internal.h
@@ -119,11 +119,6 @@ extern "C" {
*/
#define CONFIG_BURST_SIZE 16
-/*
- * Maximum number of events in a pool
- */
-#define CONFIG_POOL_MAX_NUM (1 * 1024 * 1024)
-
/*
* Maximum number of events in a thread local pool cache
*/
diff --git a/platform/linux-dpdk/pool/dpdk.c b/platform/linux-dpdk/pool/dpdk.c
index 90d2d7c6..94143dfe 100644
--- a/platform/linux-dpdk/pool/dpdk.c
+++ b/platform/linux-dpdk/pool/dpdk.c
@@ -137,12 +137,12 @@ static int dpdk_pool_capability(odp_pool_capability_t *capa)
capa->buf.max_pools = ODP_CONFIG_POOLS;
capa->buf.max_align = ODP_CONFIG_BUFFER_ALIGN_MAX;
capa->buf.max_size = MAX_SIZE;
- capa->buf.max_num = CONFIG_POOL_MAX_NUM;
+ capa->buf.max_num = 0;
/* Packet pools */
capa->pkt.max_pools = ODP_CONFIG_POOLS;
capa->pkt.max_len = 0;
- capa->pkt.max_num = CONFIG_POOL_MAX_NUM;
+ capa->pkt.max_num = 0;
capa->pkt.min_headroom = CONFIG_PACKET_HEADROOM;
capa->pkt.min_tailroom = CONFIG_PACKET_TAILROOM;
capa->pkt.max_segs_per_pkt = CONFIG_PACKET_MAX_SEGS;
@@ -152,7 +152,7 @@ static int dpdk_pool_capability(odp_pool_capability_t *capa)
/* Timeout pools */
capa->tmo.max_pools = ODP_CONFIG_POOLS;
- capa->tmo.max_num = CONFIG_POOL_MAX_NUM;
+ capa->tmo.max_num = 0;
return 0;
}
@@ -258,11 +258,6 @@ static int check_params(odp_pool_param_t *params)
switch (params->type) {
case ODP_POOL_BUFFER:
- if (params->buf.num > capa.buf.max_num) {
- printf("buf.num too large %u\n", params->buf.num);
- return -1;
- }
-
if (params->buf.size > capa.buf.max_size) {
printf("buf.size too large %u\n", params->buf.size);
return -1;
@@ -276,12 +271,6 @@ static int check_params(odp_pool_param_t *params)
break;
case ODP_POOL_PACKET:
- if (params->pkt.num > capa.pkt.max_num) {
- printf("pkt.num too large %u\n", params->pkt.num);
-
- return -1;
- }
-
if (params->pkt.seg_len > capa.pkt.max_seg_len) {
printf("pkt.seg_len too large %u\n",
params->pkt.seg_len);
@@ -297,10 +286,6 @@ static int check_params(odp_pool_param_t *params)
break;
case ODP_POOL_TIMEOUT:
- if (params->tmo.num > capa.tmo.max_num) {
- printf("tmo.num too large %u\n", params->tmo.num);
- return -1;
- }
break;
default:
commit 80b0d616f750e824a4bf0b0f3406ea3a3173ae0e
Author: Honnappa Nagarahalli <honnappa.nagarahalli(a)arm.com>
Date: Tue Nov 21 14:21:18 2017 -0600
linux-generic: pool: allocate ring memory based on pool size
Adjust the size of ring based on configured number of
buffers in the pool.
Signed-off-by: Honnappa Nagarahalli <honnappa.nagarahalli(a)arm.com>
Reviewed-by: Ola Liljedahl <ola.Liljedahl(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/include/odp_config_internal.h b/platform/linux-generic/include/odp_config_internal.h
index 9b334df4..9720581a 100644
--- a/platform/linux-generic/include/odp_config_internal.h
+++ b/platform/linux-generic/include/odp_config_internal.h
@@ -147,11 +147,6 @@
*/
#define CONFIG_BURST_SIZE 16
-/*
- * Maximum number of events in a pool
- */
-#define CONFIG_POOL_MAX_NUM (1 * 1024 * 1024)
-
/*
* Maximum number of events in a thread local pool cache
*/
diff --git a/platform/linux-generic/include/odp_pool_internal.h b/platform/linux-generic/include/odp_pool_internal.h
index 60687b3d..a124697e 100644
--- a/platform/linux-generic/include/odp_pool_internal.h
+++ b/platform/linux-generic/include/odp_pool_internal.h
@@ -41,7 +41,7 @@ typedef struct {
ring_t hdr;
/* Ring data: buffer handles */
- uint32_t buf[CONFIG_POOL_MAX_NUM];
+ uint32_t buf[];
} pool_ring_t ODP_ALIGNED_CACHE;
diff --git a/platform/linux-generic/pool/generic.c b/platform/linux-generic/pool/generic.c
index c55f6757..7a068472 100644
--- a/platform/linux-generic/pool/generic.c
+++ b/platform/linux-generic/pool/generic.c
@@ -156,11 +156,12 @@ static int generic_pool_term_local(void)
return 0;
}
-static pool_t *reserve_pool(void)
+static pool_t *reserve_pool(uint32_t ring_size)
{
int i;
pool_t *pool;
char ring_name[ODP_POOL_NAME_LEN];
+ uint32_t ring_shm_size;
for (i = 0; i < ODP_CONFIG_POOLS; i++) {
pool = pool_entry(i);
@@ -169,10 +170,13 @@ static pool_t *reserve_pool(void)
if (pool->reserved == 0) {
pool->reserved = 1;
UNLOCK(&pool->lock);
- sprintf(ring_name, "pool_ring_%d", i);
+ snprintf(ring_name, ODP_POOL_NAME_LEN,
+ "pool_ring_%d", i);
+ ring_shm_size = sizeof(pool_ring_t) +
+ sizeof(pool->ring->buf[0]) * ring_size;
pool->ring_shm =
odp_shm_reserve(ring_name,
- sizeof(pool_ring_t),
+ ring_shm_size,
ODP_CACHE_LINE_SIZE, 0);
if (odp_unlikely(pool->ring_shm == ODP_SHM_INVALID)) {
ODP_ERR("Unable to alloc pool ring %d\n", i);
@@ -395,7 +399,12 @@ static odp_pool_t pool_create(const char *name, odp_pool_param_t *params,
if (uarea_size)
uarea_size = ROUNDUP_CACHE_LINE(uarea_size);
- pool = reserve_pool();
+ if (num <= RING_SIZE_MIN)
+ ring_size = RING_SIZE_MIN;
+ else
+ ring_size = ROUNDUP_POWER2_U32(num);
+
+ pool = reserve_pool(ring_size);
if (pool == NULL) {
ODP_ERR("No more free pools");
@@ -431,11 +440,6 @@ static odp_pool_t pool_create(const char *name, odp_pool_param_t *params,
FIRST_HP_SIZE - 1) / FIRST_HP_SIZE);
}
- if (num <= RING_SIZE_MIN)
- ring_size = RING_SIZE_MIN;
- else
- ring_size = ROUNDUP_POWER2_U32(num);
-
pool->ring_mask = ring_size - 1;
pool->num = num;
pool->align = align;
@@ -506,11 +510,6 @@ static int check_params(odp_pool_param_t *params)
switch (params->type) {
case ODP_POOL_BUFFER:
- if (params->buf.num > capa.buf.max_num) {
- printf("buf.num too large %u\n", params->buf.num);
- return -1;
- }
-
if (params->buf.size > capa.buf.max_size) {
printf("buf.size too large %u\n", params->buf.size);
return -1;
@@ -550,10 +549,6 @@ static int check_params(odp_pool_param_t *params)
break;
case ODP_POOL_TIMEOUT:
- if (params->tmo.num > capa.tmo.max_num) {
- printf("tmo.num too large %u\n", params->tmo.num);
- return -1;
- }
break;
default:
@@ -663,12 +658,12 @@ static int generic_pool_capability(odp_pool_capability_t *capa)
capa->buf.max_pools = ODP_CONFIG_POOLS;
capa->buf.max_align = ODP_CONFIG_BUFFER_ALIGN_MAX;
capa->buf.max_size = MAX_SIZE;
- capa->buf.max_num = CONFIG_POOL_MAX_NUM;
+ capa->buf.max_num = 0;
/* Packet pools */
capa->pkt.max_pools = ODP_CONFIG_POOLS;
capa->pkt.max_len = CONFIG_PACKET_MAX_LEN;
- capa->pkt.max_num = CONFIG_POOL_MAX_NUM;
+ capa->pkt.max_num = 0;
capa->pkt.min_headroom = CONFIG_PACKET_HEADROOM;
capa->pkt.max_headroom = CONFIG_PACKET_HEADROOM;
capa->pkt.min_tailroom = CONFIG_PACKET_TAILROOM;
@@ -679,7 +674,7 @@ static int generic_pool_capability(odp_pool_capability_t *capa)
/* Timeout pools */
capa->tmo.max_pools = ODP_CONFIG_POOLS;
- capa->tmo.max_num = CONFIG_POOL_MAX_NUM;
+ capa->tmo.max_num = 0;
return 0;
}
-----------------------------------------------------------------------
Summary of changes:
.../linux-dpdk/include/odp/api/plat/buffer_types.h | 2 +-
.../linux-dpdk/include/odp/api/plat/event_types.h | 2 +-
.../linux-dpdk/include/odp/api/plat/timer_types.h | 2 +-
platform/linux-dpdk/include/odp_config_internal.h | 5 -
platform/linux-dpdk/odp_crypto.c | 107 ++++++++++++---------
platform/linux-dpdk/pktio/dpdk.c | 5 +-
platform/linux-dpdk/pool/dpdk.c | 21 +---
platform/linux-dpdk/test/Makefile.am | 2 -
.../test/validation/api/pktio/pktio_run.sh | 2 +-
.../linux-generic/include/odp_config_internal.h | 5 -
platform/linux-generic/include/odp_pool_internal.h | 2 +-
platform/linux-generic/pool/generic.c | 37 +++----
platform/linux-generic/test/wrapper-script.sh | 3 +
test/Makefile.inc | 2 +
test/performance/Makefile.am | 2 +-
15 files changed, 97 insertions(+), 102 deletions(-)
create mode 100755 platform/linux-generic/test/wrapper-script.sh
hooks/post-receive
--
7 years, 5 months
- 1
- 0
[COMMIT] branch master updated. v1.16.0.0-16-gc15a810b
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 c15a810b7a47f2e07200f83aa534163ca06e2b16 (commit)
via aef79483e3d3e517b4cf2d71b3c22985326532c0 (commit)
via f49d7bad7316ed0be807f37984908fc37da68004 (commit)
from 811281a22b6274b7f41b926a9cfbe09e48a366bd (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 c15a810b7a47f2e07200f83aa534163ca06e2b16
Author: Maxim Uvarov <maxim.uvarov(a)linaro.org>
Date: Wed Dec 6 18:57:33 2017 +0300
Revert "travis: temporary turn off dpdk caching"
This reverts:
commit 73bc46197ec0 ("travis: temporary turn off dpdk caching")
Looks like dpdk build is stable now and we can turn on caching for dpdk.
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
diff --git a/.travis.yml b/.travis.yml
index 1340ef27..a3032672 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -61,7 +61,7 @@ cache:
ccache: true
pip: true
directories:
- #- dpdk
+ - dpdk
- netmap
- $HOME/cunit-install
- $HOME/doxygen-install
commit aef79483e3d3e517b4cf2d71b3c22985326532c0
Author: Maxim Uvarov <maxim.uvarov(a)linaro.org>
Date: Wed Dec 6 18:55:15 2017 +0300
gitignore add gcov files
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
diff --git a/.gitignore b/.gitignore
index b9c61424..93ab63a3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
*.d
*.gcda
*.gcno
+*.gcov
*.la
*.lo
*.o
commit f49d7bad7316ed0be807f37984908fc37da68004
Author: Maxim Uvarov <maxim.uvarov(a)linaro.org>
Date: Tue Dec 5 19:25:10 2017 +0300
travis: disable ccache for codecov
Log says:
odp_pktio_perf.gcno:cannot open notes file
Reason is codecov does not see any generated files which were not
complied due to ccache. Disabling ccache makes it work.
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
diff --git a/.travis.yml b/.travis.yml
index 976f0763..1340ef27 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -35,7 +35,7 @@ env:
# By default Linaro CODECOV_TOKEN token is used. It's ok to use it to see
# for individual commit validation. But you you want to track tests history
# you need generated new one at https://codecov.io specific for your repo.
- - CODECOV_TOKEN=8e1c0fd8-62ff-411e-a79f-5839f6662c11
+ - CODECOV_TOKEN=a733c34c-5f5c-4ff1-af4b-e9f5edb1ab5e
addons:
apt:
@@ -245,12 +245,11 @@ jobs:
- ./configure --prefix=$HOME/odp-install
--enable-user-guides
--with-dpdk-path=`pwd`/dpdk/${TARGET}
- --with-netmap-path=`pwd`/netmap CFLAGS="-O0
- -coverage"
+ --with-netmap-path=`pwd`/netmap CFLAGS="-O0 -coverage"
CXXFLAGS="-O0 -coverage" LDFLAGS="--coverage"
--enable-debug=full
--enable-helper-linux
- - sudo LD_LIBRARY_PATH="$HOME/cunit-install/$CROSS_ARCH/lib:$LD_LIBRARY_PATH" PATH=${PATH//:\.\/node_modules\/\.bin/} make check
+ - sudo CCACHE_DISABLE=1 LD_LIBRARY_PATH="$HOME/cunit-install/$CROSS_ARCH/lib:$LD_LIBRARY_PATH" PATH=${PATH//:\.\/node_modules\/\.bin/} make check
- find . -type f -iname '*.[ch]' -not -path ".git/*" -execdir gcov {} \; ; bash <(curl -s https://codecov.io/bash) -X coveragepy
- stage: test
env: TEST=distcheck
-----------------------------------------------------------------------
Summary of changes:
.gitignore | 1 +
.travis.yml | 9 ++++-----
2 files changed, 5 insertions(+), 5 deletions(-)
hooks/post-receive
--
7 years, 5 months
- 1
- 0
[COMMIT] branch api-next updated. v1.16.0.0-645-g0980001e
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 0980001e33b4190133d478a0aa2e718fd1e3c164 (commit)
via 297df8bbdd88a2104c6dd0f6c2e506eb5140dd1c (commit)
via 32bd7464a8d86b0d83daf1760202dbdc5eabccec (commit)
from cf7d38c194f1a9183a524790511de8bfd74a36a9 (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 0980001e33b4190133d478a0aa2e718fd1e3c164
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Mon Dec 4 14:45:55 2017 +0200
api: tm: remove param-in doxygen tag
All parameters are input only (tag [in]) by default. Output
parameters are better highlighted, when only those are tagged.
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/traffic_mngr.h b/include/odp/api/spec/traffic_mngr.h
index c9134e8e..b956f002 100644
--- a/include/odp/api/spec/traffic_mngr.h
+++ b/include/odp/api/spec/traffic_mngr.h
@@ -484,8 +484,8 @@ typedef struct {
* odp_tm_requirements_t record before it is first used or assigned to.
* This is done to allow for vendor specific additions to this record.
*
- * @param[in] requirements A pointer to an odp_tm_requirements_t record which
- * is to be initialized.
+ * @param requirements A pointer to an odp_tm_requirements_t record which
+ * is to be initialized.
*/
void odp_tm_requirements_init(odp_tm_requirements_t *requirements);
@@ -495,8 +495,8 @@ void odp_tm_requirements_init(odp_tm_requirements_t *requirements);
* record before it is first used or assigned to.
* This is done to allow for vendor specific additions to this record.
*
- * @param[in] egress A pointer to an odp_tm_egress_t record which
- * is to be initialized.
+ * @param egress A pointer to an odp_tm_egress_t record which
+ * is to be initialized.
*/
void odp_tm_egress_init(odp_tm_egress_t *egress);
@@ -518,7 +518,7 @@ void odp_tm_egress_init(odp_tm_egress_t *egress);
*
* @param[out] capabilities An array of odp_tm_capabilities_t records to
* be filled in.
- * @param[in] capabilities_size The number of odp_tm_capabilities_t records
+ * @param capabilities_size The number of odp_tm_capabilities_t records
* in the capabilities array.
* @return Returns < 0 upon failure. Returns N > 0,
* where N is the maximum number of different
@@ -531,16 +531,16 @@ int odp_tm_capabilities(odp_tm_capabilities_t capabilities[],
/** Create/instantiate a TM Packet Scheduling system.
*
- * @param[in] name The name to be assigned to this TM system. Cannot
- * be NULL, and also must be unique amongst all other
- * TM system names.
- * @param[in] requirements The minimum required feature set and limits needed
- * by the ODP application.
- * @param[in] egress Describes the single egress "spigot" of this
- * TM system.
- * @return Returns ODP_TM_INVALID upon failure, otherwise the
- * newly created TM system's odp_tm_t handle is
- * returned.
+ * @param name The name to be assigned to this TM system. Cannot
+ * be NULL, and also must be unique amongst all other
+ * TM system names.
+ * @param requirements The minimum required feature set and limits needed
+ * by the ODP application.
+ * @param egress Describes the single egress "spigot" of this
+ * TM system.
+ * @return Returns ODP_TM_INVALID upon failure, otherwise the
+ * newly created TM system's odp_tm_t handle is
+ * returned.
*/
odp_tm_t odp_tm_create(const char *name,
odp_tm_requirements_t *requirements,
@@ -558,21 +558,21 @@ odp_tm_t odp_tm_create(const char *name,
* the existing (built-in or created by odp_tm_create) TM system that best
* matches the requirements is returned.
*
- * @param[in] name If NULL then only uses the requirements parameter to
- * find a closest match, otherwise if the name is
- * matched by an existing TM system it is returned.
- * @param[in] requirements Used when the name is NULL (in which case the
- * closest match is returned) or when the name is
- * not-NULL, but doesn't match any existing TM system
- * in which case the requirements is used to find the
- * FIRST TM system matching exactly these limits.
- * @param[in] egress If a TM system is found, then this specifies the
- * egress "spigot" to be associated with this TM
- * system.
- * @return If an existing TM system (built-in or previously
- * created via odp_tm_create) is found, its
- * odp_tm_t value is returned, otherwise
- * ODP_TM_INVALID is returned.
+ * @param name If NULL then only uses the requirements parameter to
+ * find a closest match, otherwise if the name is
+ * matched by an existing TM system it is returned.
+ * @param requirements Used when the name is NULL (in which case the
+ * closest match is returned) or when the name is
+ * not-NULL, but doesn't match any existing TM system
+ * in which case the requirements is used to find the
+ * FIRST TM system matching exactly these limits.
+ * @param egress If a TM system is found, then this specifies the
+ * egress "spigot" to be associated with this TM
+ * system.
+ * @return If an existing TM system (built-in or previously
+ * created via odp_tm_create) is found, its
+ * odp_tm_t value is returned, otherwise
+ * ODP_TM_INVALID is returned.
*/
odp_tm_t odp_tm_find(const char *name,
odp_tm_requirements_t *requirements,
@@ -591,7 +591,7 @@ odp_tm_t odp_tm_find(const char *name,
* In addition, ODP TM implementations should fail API requests that "exceed"
* the limits or features contracted for in the requirements.
*
- * @param[in] odp_tm The odp_tm_t value of the TM system to be
+ * @param odp_tm The odp_tm_t value of the TM system to be
* queried.
* @param[out] capabilities A pointer to an odp_tm_capabilities_t record
* where the actual limits used by the TM system are
@@ -619,9 +619,9 @@ int odp_tm_capability(odp_tm_t odp_tm, odp_tm_capabilities_t *capabilities);
* TM system, other than EVENTUALLY these packets will be either sent (in ANY
* order) or freed.
*
- * @param[in] odp_tm The odp_tm_t value of the TM system to be destroyed (and
- * hence destroyed (and hence freed).
- * @return 0 upon success, < 0 upon failure.
+ * @param odp_tm The odp_tm_t value of the TM system to be destroyed (and
+ * hence destroyed (and hence freed).
+ * @return 0 upon success, < 0 upon failure.
*/
int odp_tm_destroy(odp_tm_t odp_tm);
@@ -640,13 +640,13 @@ int odp_tm_destroy(odp_tm_t odp_tm);
* calls to this function with drop_eligible_enabled == FALSE - i.e. must
* always return 0 when disabling this feature.
*
- * @param[in] odp_tm Odp_tm is used to identify the TM system
- * whose egress behavior is being changed.
- * @param[in] color The packet color whose egress marking is
- * being changed.
- * @param[in] drop_eligible_enabled If true then will set the DEI bit for
- * egressed VLAN tagged pkts with this color.
- * @return 0 upon success, < 0 upon failure.
+ * @param odp_tm Odp_tm is used to identify the TM system
+ * whose egress behavior is being changed.
+ * @param color The packet color whose egress marking is
+ * being changed.
+ * @param drop_eligible_enabled If true then will set the DEI bit for
+ * egressed VLAN tagged pkts with this color.
+ * @return 0 upon success, < 0 upon failure.
*/
int odp_tm_vlan_marking(odp_tm_t odp_tm,
odp_packet_color_t color,
@@ -669,16 +669,16 @@ int odp_tm_vlan_marking(odp_tm_t odp_tm,
* calls to this function with ecn_ce_enabled == FALSE - i.e. must always
* return 0 when disabling this feature.
*
- * @param[in] odp_tm Odp_tm is used to identify the TM system whose
- * egress behavior is being changed.
- * @param[in] color The packet color whose egress marking is
- * being changed.
- * @param[in] ecn_ce_enabled If true then egressed IPv4/IPv6 pkts whose
- * protocol field is TCP AND whose ECN subfield has
- * either one of the two values 1 or 2, will set this
- * subfield to the value ECN_CE - i.e. Congestion
- * Experienced (whose value is 3).
- * @return 0 upon success, < 0 upon failure.
+ * @param odp_tm Odp_tm is used to identify the TM system whose
+ * egress behavior is being changed.
+ * @param color The packet color whose egress marking is
+ * being changed.
+ * @param ecn_ce_enabled If true then egressed IPv4/IPv6 pkts whose
+ * protocol field is TCP AND whose ECN subfield has
+ * either one of the two values 1 or 2, will set this
+ * subfield to the value ECN_CE - i.e. Congestion
+ * Experienced (whose value is 3).
+ * @return 0 upon success, < 0 upon failure.
*/
int odp_tm_ecn_marking(odp_tm_t odp_tm,
odp_packet_color_t color,
@@ -709,15 +709,15 @@ int odp_tm_ecn_marking(odp_tm_t odp_tm,
* calls to this function with drop_prec_enabled == FALSE - i.e. must always
* return 0 when disabling this feature.
*
- * @param[in] odp_tm Odp_tm is used to identify the TM system whose
- * egress behavior is being changed.
- * @param[in] color The packet color whose egress marking is
- * being changed.
- * @param[in] drop_prec_enabled If true then egressed IPv4/IPv6 pkts with this
- * color will have the pkt's Drop Precedence
- * sub-subfield of the DSCP subfield set to
- * LOW, MEDIUM or HIGH drop precedence.
- * @return 0 upon success, < 0 upon failure.
+ * @param odp_tm Odp_tm is used to identify the TM system whose
+ * egress behavior is being changed.
+ * @param color The packet color whose egress marking is
+ * being changed.
+ * @param drop_prec_enabled If true then egressed IPv4/IPv6 pkts with this
+ * color will have the pkt's Drop Precedence
+ * sub-subfield of the DSCP subfield set to
+ * LOW, MEDIUM or HIGH drop precedence.
+ * @return 0 upon success, < 0 upon failure.
*/
int odp_tm_drop_prec_marking(odp_tm_t odp_tm,
odp_packet_color_t color,
@@ -785,8 +785,8 @@ typedef struct {
/** odp_tm_shaper_params_init() must be called to initialize any
* odp_tm_shaper_params_t record before it is first used or assigned to.
*
- * @param[in] params A pointer to an odp_tm_shaper_params_t record which
- * is to be initialized.
+ * @param params A pointer to an odp_tm_shaper_params_t record which
+ * is to be initialized.
*/
void odp_tm_shaper_params_init(odp_tm_shaper_params_t *params);
@@ -794,14 +794,14 @@ void odp_tm_shaper_params_init(odp_tm_shaper_params_t *params);
* subsequently be attached to any number (including zero) of tm_queues
* or tm_nodes.
*
- * @param[in] name Optional name associated with this shaper profile. Can
- * be NULL. If non-NULL must be unique amongst the set of
- * all other shaper profiles.
- * @param[in] params The profile parameters. See comments associated with
- * the odp_tm_shaper_params_t for more details.
- * @return Returns ODP_TM_INVALID upon failure, or the newly
- * allocated odp_tm_shaper_t value representing this
- * profile object.
+ * @param name Optional name associated with this shaper profile. Can
+ * be NULL. If non-NULL must be unique amongst the set of
+ * all other shaper profiles.
+ * @param params The profile parameters. See comments associated with
+ * the odp_tm_shaper_params_t for more details.
+ * @return Returns ODP_TM_INVALID upon failure, or the newly
+ * allocated odp_tm_shaper_t value representing this
+ * profile object.
*/
odp_tm_shaper_t odp_tm_shaper_create(const char *name,
odp_tm_shaper_params_t *params);
@@ -812,9 +812,9 @@ odp_tm_shaper_t odp_tm_shaper_create(const char *name,
* profile object. It is an error if this shaper profile is still being
* referenced by an active (connected) tm_node.
*
- * @param[in] shaper_profile Specifies the shaper profile object which is
- * being destroyed.
- * @return Returns < 0 upon failure or 0 upon success.
+ * @param shaper_profile Specifies the shaper profile object which is
+ * being destroyed.
+ * @return Returns < 0 upon failure or 0 upon success.
*/
int odp_tm_shaper_destroy(odp_tm_shaper_t shaper_profile);
@@ -822,7 +822,7 @@ int odp_tm_shaper_destroy(odp_tm_shaper_t shaper_profile);
* with the specified shaper profile object, and copies them into the supplied
* record.
*
- * @param[in] shaper_profile Specifies the shaper profile object whose
+ * @param shaper_profile Specifies the shaper profile object whose
* values are to be read.
* @param[out] params A pointer to an odp_tm_shaper_params_t record
* where the current shaper profile object values
@@ -837,12 +837,12 @@ int odp_tm_shaper_params_read(odp_tm_shaper_t shaper_profile,
* effect that all tm_input's and tm_nodes that are associated (attached?)
* with this shaper profile object will be updated with the new values.
*
- * @param[in] shaper_profile Specifies the shaper profile object whose
- * values are to be set.
- * @param[in] params A pointer to an odp_tm_shaper_params_t record
- * where the new shaper profile object values
- * are taken from.
- * @return Returns < 0 upon failure or 0 upon success.
+ * @param shaper_profile Specifies the shaper profile object whose
+ * values are to be set.
+ * @param params A pointer to an odp_tm_shaper_params_t record
+ * where the new shaper profile object values
+ * are taken from.
+ * @return Returns < 0 upon failure or 0 upon success.
*/
int odp_tm_shaper_params_update(odp_tm_shaper_t shaper_profile,
odp_tm_shaper_params_t *params);
@@ -850,10 +850,10 @@ int odp_tm_shaper_params_update(odp_tm_shaper_t shaper_profile,
/** odp_tm_shaper_lookup() can be used to find the shaper profile object
* created with the specified name.
*
- * @param[in] name Name of a previously created shaper profile. Cannot be
- * NULL.
- * @return Returns ODP_TM_INVALID upon failure, or the shaper
- * profile handle created with this name.
+ * @param name Name of a previously created shaper profile. Cannot be NULL.
+ *
+ * @return Returns ODP_TM_INVALID upon failure, or the shaper
+ * profile handle created with this name.
*/
odp_tm_shaper_t odp_tm_shaper_lookup(const char *name);
@@ -896,22 +896,22 @@ typedef struct {
/** odp_tm_sched_params_init() must be called to initialize any
* odp_tm_sched_params_t record before it is first used or assigned to.
*
- * @param[in] params A pointer to an odp_tm_sched_params_t record which
- * is to be initialized.
+ * @param params A pointer to an odp_tm_sched_params_t record which
+ * is to be initialized.
*/
void odp_tm_sched_params_init(odp_tm_sched_params_t *params);
/** odp_tm_sched_create() creates a scheduler profile object, which can
* subsequently be attached to any number (including zero) of tm_nodes.
*
- * @param[in] name Optional name associated with this scheduler profile.
- * Can be NULL. If non-NULL must be unique amongst the
- * set of all other scheduler profiles.
- * @param[in] params The profile parameters. See comments associated with
- * the odp_tm_sched_params_t for more details.
- * @return Returns ODP_TM_INVALID upon failure, or the newly
- * allocated odp_tm_sched_t value representing this profile
- * object.
+ * @param name Optional name associated with this scheduler profile.
+ * Can be NULL. If non-NULL must be unique amongst the
+ * set of all other scheduler profiles.
+ * @param params The profile parameters. See comments associated with
+ * the odp_tm_sched_params_t for more details.
+ * @return Returns ODP_TM_INVALID upon failure, or the newly
+ * allocated odp_tm_sched_t value representing this profile
+ * object.
*/
odp_tm_sched_t odp_tm_sched_create(const char *name,
odp_tm_sched_params_t *params);
@@ -922,9 +922,9 @@ odp_tm_sched_t odp_tm_sched_create(const char *name,
* profile object. It is an error if this scheduler profile is still being
* referenced by an active (connected) tm_node.
*
- * @param[in] sched_profile Specifies the shaper profile object which is
- * being destroyed.
- * @return Returns < 0 upon failure or 0 upon success.
+ * @param sched_profile Specifies the shaper profile object which is
+ * being destroyed.
+ * @return Returns < 0 upon failure or 0 upon success.
*/
int odp_tm_sched_destroy(odp_tm_sched_t sched_profile);
@@ -932,7 +932,7 @@ int odp_tm_sched_destroy(odp_tm_sched_t sched_profile);
* with the specified scheduler profile object, and copies them into the
* supplied record.
*
- * @param[in] sched_profile Specifies the scheduler profile whose values
+ * @param sched_profile Specifies the scheduler profile whose values
* are to be read.
* @param[out] params A pointer to an odp_tm_sched_params_t record
* where the current scheduler profile object
@@ -947,12 +947,12 @@ int odp_tm_sched_params_read(odp_tm_sched_t sched_profile,
* the effect that all tm_nodes that are associated (attached?) with this
* Scheduler profile object will be updated with the new values.
*
- * @param[in] sched_profile Specifies the Scheduler profile object whose
- * values are to be set.
- * @param[in] params A pointer to an odp_tm_sched_params_t record
- * where the new scheduler profile object values
- * are taken from.
- * @return Returns < 0 upon failure or 0 upon success.
+ * @param sched_profile Specifies the Scheduler profile object whose
+ * values are to be set.
+ * @param params A pointer to an odp_tm_sched_params_t record
+ * where the new scheduler profile object values
+ * are taken from.
+ * @return Returns < 0 upon failure or 0 upon success.
*/
int odp_tm_sched_params_update(odp_tm_sched_t sched_profile,
odp_tm_sched_params_t *params);
@@ -960,10 +960,10 @@ int odp_tm_sched_params_update(odp_tm_sched_t sched_profile,
/** odp_tm_sched_lookup() can be used to find the scheduler profile object
* created with the specified name.
*
- * @param[in] name Name of a previously created scheduler profile. Cannot be
- * NULL.
- * @return Returns ODP_TM_INVALID upon failure, or the scheduler
- * profile handle created with this name.
+ * @param name Name of a previously created scheduler profile. Cannot be NULL.
+ *
+ * @return Returns ODP_TM_INVALID upon failure, or the scheduler
+ * profile handle created with this name.
*/
odp_tm_sched_t odp_tm_sched_lookup(const char *name);
@@ -985,8 +985,8 @@ typedef struct {
/** odp_tm_threshold_params_init() must be called to initialize any
* odp_tm_threshold_params_t record before it is first used or assigned to.
*
- * @param[in] params A pointer to an odp_tm_threshold_params_t record which
- * is to be initialized.
+ * @param params A pointer to an odp_tm_threshold_params_t record which
+ * is to be initialized.
*/
void odp_tm_threshold_params_init(odp_tm_threshold_params_t *params);
@@ -994,14 +994,14 @@ void odp_tm_threshold_params_init(odp_tm_threshold_params_t *params);
* can subsequently be attached to any number (including zero) of tm_queues or
* tm_nodes.
*
- * @param[in] name Optional name associated with this queue threshold
- * profile. Can be NULL. If non-NULL must be unique
- * amongst the set of all other queue threshold profiles.
- * @param[in] params The profile parameters. See comments associated with
- * the odp_tm_threshold_params_t for more details.
- * @return Returns ODP_TM_INVALID upon failure, or the newly
- * allocated odp_tm_threshold_t value representing this
- * profile object.
+ * @param name Optional name associated with this queue threshold
+ * profile. Can be NULL. If non-NULL must be unique
+ * amongst the set of all other queue threshold profiles.
+ * @param params The profile parameters. See comments associated with
+ * the odp_tm_threshold_params_t for more details.
+ * @return Returns ODP_TM_INVALID upon failure, or the newly
+ * allocated odp_tm_threshold_t value representing this
+ * profile object.
*/
odp_tm_threshold_t odp_tm_threshold_create(const char *name,
odp_tm_threshold_params_t *params);
@@ -1012,9 +1012,9 @@ odp_tm_threshold_t odp_tm_threshold_create(const char *name,
* profile object. It is an error if this threshold profile is still being
* referenced by an active (connected) tm_queue or tm_node.
*
- * @param[in] threshold_profile Specifies the queue thresholds profile
- * object which is being destroyed.
- * @return Returns < 0 upon failure or 0 upon success.
+ * @param threshold_profile Specifies the queue thresholds profile
+ * object which is being destroyed.
+ * @return Returns < 0 upon failure or 0 upon success.
*/
int odp_tm_threshold_destroy(odp_tm_threshold_t threshold_profile);
@@ -1022,7 +1022,7 @@ int odp_tm_threshold_destroy(odp_tm_threshold_t threshold_profile);
* with the specified queue thresholds profile object, and copies them into the
* supplied record.
*
- * @param[in] threshold_profile Specifies the queue thresholds profile
+ * @param threshold_profile Specifies the queue thresholds profile
* object whose values are to be read.
* @param[out] params A pointer to an odp_tm_threshold_params_t
* record where the current queue thresholds
@@ -1038,12 +1038,12 @@ int odp_tm_thresholds_params_read(odp_tm_threshold_t threshold_profile,
* associated (attached?) with this queue thresholds profile object will be
* updated with the new values.
*
- * @param[in] threshold_profile Specifies the queue thresholds profile
- * object whose values are to be set.
- * @param[in] params A pointer to an odp_tm_threshold_params_t
- * record where the current queue thresholds
- * profile object values are taken from.
- * @return Returns < 0 upon failure or 0 upon success.
+ * @param threshold_profile Specifies the queue thresholds profile
+ * object whose values are to be set.
+ * @param params A pointer to an odp_tm_threshold_params_t
+ * record where the current queue thresholds
+ * profile object values are taken from.
+ * @return Returns < 0 upon failure or 0 upon success.
*/
int odp_tm_thresholds_params_update(odp_tm_threshold_t threshold_profile,
odp_tm_threshold_params_t *params);
@@ -1051,10 +1051,10 @@ int odp_tm_thresholds_params_update(odp_tm_threshold_t threshold_profile,
/** odp_tm_thresholds_lookup() can be used to find the queue thresholds
* profile object created with the specified name.
*
- * @param[in] name Name of a previously created queue thresholds profile.
- * Cannot be NULL.
- * @return Returns ODP_TM_INVALID upon failure, or the queue
- * thresholds profile handle created with this name.
+ * @param name Name of a previously created queue thresholds profile.
+ * Cannot be NULL.
+ * @return Returns ODP_TM_INVALID upon failure, or the queue
+ * thresholds profile handle created with this name.
*/
odp_tm_threshold_t odp_tm_thresholds_lookup(const char *name);
@@ -1121,8 +1121,8 @@ typedef struct {
/** odp_tm_wred_params_init() must be called to initialize any
* odp_tm_wred_params_t record before it is first used or assigned to.
*
- * @param[in] params A pointer to an odp_tm_wred_params_t record which
- * is to be initialized.
+ * @param params A pointer to an odp_tm_wred_params_t record which
+ * is to be initialized.
*/
void odp_tm_wred_params_init(odp_tm_wred_params_t *params);
@@ -1130,14 +1130,14 @@ void odp_tm_wred_params_init(odp_tm_wred_params_t *params);
* profile object, which can subsequently be attached to any number (including
* zero) of tm_queues or tm_nodes.
*
- * @param[in] name Optional name associated with this WRED profile. Can
- * be NULL. If non-NULL must be unique amongst the set of
- * all other WRED profiles.
- * @param[in] params The profile parameters. See comments associated with the
- * odp_tm_wred_params_t for more details.
- * @return Returns ODP_TM_INVALID upon failure, or the newly
- * allocated odp_tm_wred_t value representing this profile
- * object.
+ * @param name Optional name associated with this WRED profile. Can
+ * be NULL. If non-NULL must be unique amongst the set of
+ * all other WRED profiles.
+ * @param params The profile parameters. See comments associated with the
+ * odp_tm_wred_params_t for more details.
+ * @return Returns ODP_TM_INVALID upon failure, or the newly
+ * allocated odp_tm_wred_t value representing this profile
+ * object.
*/
odp_tm_wred_t odp_tm_wred_create(const char *name,
odp_tm_wred_params_t *params);
@@ -1148,9 +1148,9 @@ odp_tm_wred_t odp_tm_wred_create(const char *name,
* profile object. It is an error if this profile object is still being
* referenced by an active (connected) tm_node.
*
- * @param[in] wred_profile Specifies the WRED profile object which is
- * being destroyed.
- * @return Returns < 0 upon failure or 0 upon success.
+ * @param wred_profile Specifies the WRED profile object which is
+ * being destroyed.
+ * @return Returns < 0 upon failure or 0 upon success.
*/
int odp_tm_wred_destroy(odp_tm_wred_t wred_profile);
@@ -1158,7 +1158,7 @@ int odp_tm_wred_destroy(odp_tm_wred_t wred_profile);
* with the specified WRED profile object, and copies them into the supplied
* record.
*
- * @param[in] wred_profile Specifies the WRED profile object whose
+ * @param wred_profile Specifies the WRED profile object whose
* values are to be read.
* @param[out] params A pointer to an odp_tm_wred_params_t record
* where the current WRED profile object values
@@ -1173,12 +1173,12 @@ int odp_tm_wred_params_read(odp_tm_wred_t wred_profile,
* effect that all tm_input's and tm_nodes that are associated (attached?)
* with this WRED profile object will be updated with the new values.
*
- * @param[in] wred_profile Specifies the WRED profile object whose
- * values are to be set.
- * @param[in] params A pointer to an odp_tm_wred_params_t record
- * where the new WRED profile object values
- * are taken from.
- * @return Returns < 0 upon failure or 0 upon success.
+ * @param wred_profile Specifies the WRED profile object whose
+ * values are to be set.
+ * @param params A pointer to an odp_tm_wred_params_t record
+ * where the new WRED profile object values
+ * are taken from.
+ * @return Returns < 0 upon failure or 0 upon success.
*/
int odp_tm_wred_params_update(odp_tm_wred_t wred_profile,
odp_tm_wred_params_t *params);
@@ -1186,10 +1186,10 @@ int odp_tm_wred_params_update(odp_tm_wred_t wred_profile,
/** odp_tm_wred_lookup() can be used to find the WRED profile object created
* with the specified name.
*
- * @param[in] name Name of a previously created WRED profile. Cannot be
- * NULL.
- * @return Returns ODP_TM_INVALID upon failure, or the WRED
- * profile handle created with this name.
+ * @param name Name of a previously created WRED profile. Cannot be NULL.
+ *
+ * @return Returns ODP_TM_INVALID upon failure, or the WRED
+ * profile handle created with this name.
*/
odp_tm_wred_t odp_tm_wred_lookup(const char *name);
@@ -1237,8 +1237,8 @@ typedef struct {
/** odp_tm_node_params_init() must be called to initialize any
* odp_tm_node_params_t record before it is first used or assigned to.
*
- * @param[in] params A pointer to an odp_tm_node_params_t record which
- * is to be initialized.
+ * @param params A pointer to an odp_tm_node_params_t record which
+ * is to be initialized.
*/
void odp_tm_node_params_init(odp_tm_node_params_t *params);
@@ -1249,15 +1249,15 @@ void odp_tm_node_params_init(odp_tm_node_params_t *params);
* strict priority levels for an tm_node cannot be changed after tm_node
* creation. The level parameter MUST be in the range 0..max_level - 1.
*
- * @param[in] odp_tm Odp_tm is used to identify the TM system into which this
- * odp_tm_node object is created.
- * @param[in] name Optional name that can be used later later to find this
- * same odp_tm_node_t. Can be NULL, otherwise must be
- * unique across all odp_tm_node objects.
- * @param[in] params A pointer to a record holding (an extensible) set of
- * properties/attributes of this tm_node.
- * @return Returns ODP_TM_INVALID upon failure, otherwise returns
- * a valid odp_tm_node_t handle if successful.
+ * @param odp_tm Odp_tm is used to identify the TM system into which this
+ * odp_tm_node object is created.
+ * @param name Optional name that can be used later later to find this
+ * same odp_tm_node_t. Can be NULL, otherwise must be
+ * unique across all odp_tm_node objects.
+ * @param params A pointer to a record holding (an extensible) set of
+ * properties/attributes of this tm_node.
+ * @return Returns ODP_TM_INVALID upon failure, otherwise returns
+ * a valid odp_tm_node_t handle if successful.
*/
odp_tm_node_t odp_tm_node_create(odp_tm_t odp_tm,
const char *name,
@@ -1268,21 +1268,21 @@ odp_tm_node_t odp_tm_node_create(odp_tm_t odp_tm,
* The odp_tm_node_destroy frees the resources used by a tm_node_t object.
* The tm_node to be destroyed MUST not have any parent or child entities.
*
- * @param[in] tm_node Specifies the tm_node to be destroyed (freed).
- * @return Returns -1 upon failure, 0 upon success.
+ * @param tm_node Specifies the tm_node to be destroyed (freed).
+ * @return Returns -1 upon failure, 0 upon success.
*/
int odp_tm_node_destroy(odp_tm_node_t tm_node);
/** The odp_tm_node_shaper_config() function is used to dynamically set or
* change the shaper profile associated with this tm_node.
*
- * @param[in] tm_node Specifies the tm_node to be changed.
- * @param[in] shaper_profile Specifies the shaper profile that should
- * now be used for the shaper entity within the
- * given tm_node. Note that it is legal to specify
- * ODP_TM_INVALID indicating that this tm_node
- * no longer implements a shaper function.
- * @return Returns 0 upon success and < 0 upon failure.
+ * @param tm_node Specifies the tm_node to be changed.
+ * @param shaper_profile Specifies the shaper profile that should
+ * now be used for the shaper entity within the
+ * given tm_node. Note that it is legal to specify
+ * ODP_TM_INVALID indicating that this tm_node
+ * no longer implements a shaper function.
+ * @return Returns 0 upon success and < 0 upon failure.
*/
int odp_tm_node_shaper_config(odp_tm_node_t tm_node,
odp_tm_shaper_t shaper_profile);
@@ -1290,15 +1290,15 @@ int odp_tm_node_shaper_config(odp_tm_node_t tm_node,
/** The odp_tm_node_sched_config() function is used to dynamically set or
* change the scheduler profile associated with a tm_node.
*
- * @param[in] tm_node Specifies the tm_node to be changed.
- * @param[in] tm_fan_in_node Specifies which of the specified tm_node's
- * fan-in's weights etc are to be changed. The
- * fan-in is identified by the "producer"/parent
- * tm_node actually connected to this fan-in.
- * @param[in] sched_profile Specifies the scheduler profile that should
- * now be used for the WFQ/RR entity within the
- * given tm_node.
- * @return Returns 0 upon success and < 0 upon failure.
+ * @param tm_node Specifies the tm_node to be changed.
+ * @param tm_fan_in_node Specifies which of the specified tm_node's
+ * fan-in's weights etc are to be changed. The
+ * fan-in is identified by the "producer"/parent
+ * tm_node actually connected to this fan-in.
+ * @param sched_profile Specifies the scheduler profile that should
+ * now be used for the WFQ/RR entity within the
+ * given tm_node.
+ * @return Returns 0 upon success and < 0 upon failure.
*/
int odp_tm_node_sched_config(odp_tm_node_t tm_node,
odp_tm_node_t tm_fan_in_node,
@@ -1307,10 +1307,10 @@ int odp_tm_node_sched_config(odp_tm_node_t tm_node,
/** The odp_tm_node_threshold_config() function is used to dynamically set or
* change the queue threshold profile associated with this tm_node.
*
- * @param[in] tm_node Specifies the tm_node to be changed.
- * @param[in] thresholds_profile Specifies the queue threshold profile that
- * should now be used for the given tm_node.
- * @return Returns 0 upon success and < 0 upon failure.
+ * @param tm_node Specifies the tm_node to be changed.
+ * @param thresholds_profile Specifies the queue threshold profile that
+ * should now be used for the given tm_node.
+ * @return Returns 0 upon success and < 0 upon failure.
*/
int odp_tm_node_threshold_config(odp_tm_node_t tm_node,
odp_tm_threshold_t thresholds_profile);
@@ -1319,16 +1319,16 @@ int odp_tm_node_threshold_config(odp_tm_node_t tm_node,
* change the WRED profile associated with this tm_node or tm_node/pkt_color
* combination.
*
- * @param[in] tm_node Specifies the tm_node to be changed.
- * @param[in] pkt_color Specifies the pkt_color that this profile is to be
- * used with. Can also be the special value
- * ALL_PKT_COLORS.
- * @param[in] wred_profile Specifies the WRED profile that should now be used
- * by this tm_queue, when processing pkts of this
- * pkt_color. It can be the value ODP_TM_INVALID
- * indicating that this tm_queue/pkt_color combination
- * no longer implements WRED.
- * @return Returns 0 upon success and < 0 upon failure.
+ * @param tm_node Specifies the tm_node to be changed.
+ * @param pkt_color Specifies the pkt_color that this profile is to be
+ * used with. Can also be the special value
+ * ALL_PKT_COLORS.
+ * @param wred_profile Specifies the WRED profile that should now be used
+ * by this tm_queue, when processing pkts of this
+ * pkt_color. It can be the value ODP_TM_INVALID
+ * indicating that this tm_queue/pkt_color combination
+ * no longer implements WRED.
+ * @return Returns 0 upon success and < 0 upon failure.
*/
int odp_tm_node_wred_config(odp_tm_node_t tm_node,
odp_packet_color_t pkt_color,
@@ -1337,34 +1337,33 @@ int odp_tm_node_wred_config(odp_tm_node_t tm_node,
/** odp_tm_node_lookup() can be used to find the tm_node object created with
* the specified name.
*
- * @param[in] odp_tm Odp_tm is used to identify the TM system into which this
- * odp_tm_node object is created.
- * @param[in] name Name of a previously created tm_node. Cannot be
- * NULL.
- * @return Returns ODP_TM_INVALID upon failure, or the tm_node
- * handle created with this name.
+ * @param odp_tm Odp_tm is used to identify the TM system into which this
+ * odp_tm_node object is created.
+ * @param name Name of a previously created tm_node. Cannot be NULL.
+ *
+ * @return Returns ODP_TM_INVALID upon failure, or the tm_node
+ * handle created with this name.
*/
odp_tm_node_t odp_tm_node_lookup(odp_tm_t odp_tm, const char *name);
/** odp_tm_node_context() can be used to get the user_context value that is
* associated with the given tm_node.
*
- * @param[in] tm_node Specifies the tm_node whose user_context is to be gotten.
- * @return Returns the user_context pointer associated with this
- * tm_node. Returns NULL if the tm_node is not valid OR
- * if the user_context was NLL.
- * handle created with this name.
+ * @param tm_node Specifies the tm_node whose user_context is to be gotten.
+ * @return Returns the user_context pointer associated with this
+ * tm_node. Returns NULL if the tm_node is not valid OR
+ * if the user_context was NULL.
*/
void *odp_tm_node_context(odp_tm_node_t tm_node);
/** odp_tm_node_context_set() can be used to set the user_context value that is
* associated with the given tm_node.
*
- * @param[in] tm_node Specifies the tm_node whose user_context is to be set.
- * @param[in] user_context Generic pointer associated with the given tm_node.
- * Does not have any effect on the tm_node semantics.
- * @return Returns 0 upon success and -1 if the given tm_node
- * is not valid.
+ * @param tm_node Specifies the tm_node whose user_context is to be set.
+ * @param user_context Generic pointer associated with the given tm_node.
+ * Does not have any effect on the tm_node semantics.
+ * @return Returns 0 upon success and -1 if the given tm_node
+ * is not valid.
*/
int odp_tm_node_context_set(odp_tm_node_t tm_node, void *user_context);
@@ -1406,8 +1405,8 @@ typedef struct {
/** odp_tm_queue_params_init() must be called to initialize any
* odp_tm_queue_params_t record before it is first used or assigned to.
*
- * @param[in] params A pointer to an odp_tm_queue_params_t record which
- * is to be initialized.
+ * @param params A pointer to an odp_tm_queue_params_t record which
+ * is to be initialized.
*/
void odp_tm_queue_params_init(odp_tm_queue_params_t *params);
@@ -1419,12 +1418,12 @@ void odp_tm_queue_params_init(odp_tm_queue_params_t *params);
* number of buffers and instead limit the queue memory usage by buffer counts
* versus strictly using byte counts.
*
- * @param[in] odp_tm Odp_tm is used to identify the TM system into which this
- * odp_tm_queue object is created.
- * @param[in] params A pointer to a record holding (an extensible) set of
- * properties/attributes of this tm_queue.
- * @return Returns ODP_TM_INVALID upon failure, otherwise a valid
- * odp_tm_queue_t handle.
+ * @param odp_tm Odp_tm is used to identify the TM system into which this
+ * odp_tm_queue object is created.
+ * @param params A pointer to a record holding (an extensible) set of
+ * properties/attributes of this tm_queue.
+ * @return Returns ODP_TM_INVALID upon failure, otherwise a valid
+ * odp_tm_queue_t handle.
*/
odp_tm_queue_t odp_tm_queue_create(odp_tm_t odp_tm,
odp_tm_queue_params_t *params);
@@ -1433,44 +1432,43 @@ odp_tm_queue_t odp_tm_queue_create(odp_tm_t odp_tm,
* used by a tm_queue_t object. The tm_queue to be destroyed MUST not be
* connected in a tm system, and consequently cannot contain any pkts.
*
- * @param[in] tm_queue Specifies the tm_queue to be destroyed (freed).
- * @return Returns -1 upon failure, 0 upon success.
+ * @param tm_queue Specifies the tm_queue to be destroyed (freed).
+ * @return Returns -1 upon failure, 0 upon success.
*/
int odp_tm_queue_destroy(odp_tm_queue_t tm_queue);
/** odp_tm_queue_context() can be used to get the user_context value that is
* associated with the given tm_queue.
*
- * @param[in] tm_queue Specifies the tm_queue whose user_context is to be
- * returned.
- * @return Returns the user_context pointer associated with this
- * tm_queue. Returns NULL if the tm_quue is not valid OR
- * if the user_context was NULL.
+ * @param tm_queue Specifies the tm_queue whose user_context is to be
+ * returned.
+ * @return Returns the user_context pointer associated with this
+ * tm_queue. Returns NULL if the tm_quue is not valid OR
+ * if the user_context was NULL.
*/
void *odp_tm_queue_context(odp_tm_queue_t tm_queue);
/** odp_tm_queue_context_set() can be used to set the user_context value that is
* associated with the given tm_queue.
*
- * @param[in] tm_queue Specifies the tm_queue whose user_context is to be
- * set.
- * @param[in] user_context Generic pointer associated with the given tm_queue.
- * Does not have any effect on the tm_queue semantics.
- * @return Returns 0 upon success and -1 if the given tm_queu
- * is not valid.
+ * @param tm_queue Specifies the tm_queue whose user_context is to be set.
+ * @param user_context Generic pointer associated with the given tm_queue.
+ * Does not have any effect on the tm_queue semantics.
+ * @return Returns 0 upon success and -1 if the given tm_queue
+ * is not valid.
*/
int odp_tm_queue_context_set(odp_tm_queue_t tm_queue, void *user_context);
/** The odp_tm_queue_shaper_config() function is used to dynamically set
* or change the shaper profile associated with this tm_queue.
*
- * @param[in] tm_queue Specifies the tm_queue to be changed.
- * @param[in] shaper_profile Specifies the shaper profile that should now be
- * used for shaping the tm_queue's packet stream.
- * Note that it is legal to specify ODP_TM_INVALID
- * indicating that this tm_queue no longer
- * implements a shaper function.
- * @return Returns 0 upon success and < 0 upon failure.
+ * @param tm_queue Specifies the tm_queue to be changed.
+ * @param shaper_profile Specifies the shaper profile that should now be
+ * used for shaping the tm_queue's packet stream.
+ * Note that it is legal to specify ODP_TM_INVALID
+ * indicating that this tm_queue no longer
+ * implements a shaper function.
+ * @return Returns 0 upon success and < 0 upon failure.
*/
int odp_tm_queue_shaper_config(odp_tm_queue_t tm_queue,
odp_tm_shaper_t shaper_profile);
@@ -1480,15 +1478,15 @@ int odp_tm_queue_shaper_config(odp_tm_queue_t tm_queue,
* the name, this function affects a tm_node scheduler - specifically the
* scheduler fan-in when such fan-in comes from an tm_queue.
*
- * @param[in] tm_node Specifies the tm_node to be changed.
- * @param[in] tm_fan_in_queue Specifies which of the specified tm_node's
- * fan-in's weights etc are to be changed. The
- * fan-in is identified by the "producer"/parent
- * tm_queue actually connected to this fan-in.
- * @param[in] sched_profile Specifies the scheduler profile that should
- * now be used for the WFQ/RR entity within the
- * given tm_node.
- * @return Returns 0 upon success and < 0 upon failure.
+ * @param tm_node Specifies the tm_node to be changed.
+ * @param tm_fan_in_queue Specifies which of the specified tm_node's
+ * fan-in's weights etc are to be changed. The
+ * fan-in is identified by the "producer"/parent
+ * tm_queue actually connected to this fan-in.
+ * @param sched_profile Specifies the scheduler profile that should
+ * now be used for the WFQ/RR entity within the
+ * given tm_node.
+ * @return Returns 0 upon success and < 0 upon failure.
*/
int odp_tm_queue_sched_config(odp_tm_node_t tm_node,
odp_tm_queue_t tm_fan_in_queue,
@@ -1497,10 +1495,10 @@ int odp_tm_queue_sched_config(odp_tm_node_t tm_node,
/** The odp_tm_queue_threshold_config() function is used to dynamically set or
* change the queue threshold profile associated with this tm_queue.
*
- * @param[in] tm_queue Specifies the tm_queue to be changed.
- * @param[in] thresholds_profile Specifies the queue threshold profile that
- * should now be used for the given tm_queue.
- * @return Returns 0 upon success and < 0 upon failure.
+ * @param tm_queue Specifies the tm_queue to be changed.
+ * @param thresholds_profile Specifies the queue threshold profile that
+ * should now be used for the given tm_queue.
+ * @return Returns 0 upon success and < 0 upon failure.
*/
int odp_tm_queue_threshold_config(odp_tm_queue_t tm_queue,
odp_tm_threshold_t thresholds_profile);
@@ -1509,16 +1507,16 @@ int odp_tm_queue_threshold_config(odp_tm_queue_t tm_queue,
* the WRED profile associated with this tm_queue or tm_queue/pkt_color
* combination.
*
- * @param[in] tm_queue Specifies the tm_queue to be changed.
- * @param[in] pkt_color Specifies the pkt_color that this profile is to be
- * used with. Can also be the special value
- * ALL_PKT_COLORS.
- * @param[in] wred_profile Specifies the WRED profile that should now be used
- * by this tm_queue, when processing pkts of this
- * pkt_color. It can be the value ODP_TM_INVALID
- * indicating that this tm_queue/pkt_color combination
- * no longer implements WRED.
- * @return Returns 0 upon success and < 0 upon failure.
+ * @param tm_queue Specifies the tm_queue to be changed.
+ * @param pkt_color Specifies the pkt_color that this profile is to be
+ * used with. Can also be the special value
+ * ALL_PKT_COLORS.
+ * @param wred_profile Specifies the WRED profile that should now be used
+ * by this tm_queue, when processing pkts of this
+ * pkt_color. It can be the value ODP_TM_INVALID
+ * indicating that this tm_queue/pkt_color combination
+ * no longer implements WRED.
+ * @return Returns 0 upon success and < 0 upon failure.
*/
int odp_tm_queue_wred_config(odp_tm_queue_t tm_queue,
odp_packet_color_t pkt_color,
@@ -1532,14 +1530,14 @@ int odp_tm_queue_wred_config(odp_tm_queue_t tm_queue,
* dst_tm_node. Note that an ODP_TM_ROOT handle passed in for the
* dst_tm_node implies connection to the egress/root object of this TM system.
*
- * @param[in] src_tm_node odp_tm_node_t handle of the tm_node whose output is
- * to be connected to the fan-in of the next tm_node
- * as represented by the dst_tm_node.
- * @param[in] dst_tm_node odp_tm_node_t handle of the tm_node object that will
- * receive all of the pkt_descs from the src tm_node
- * output. If ODP_TM_ROOT, then attachment is to
- * the root egress object/spigot.
- * @return 0 upon success, < 0 on failure.
+ * @param src_tm_node odp_tm_node_t handle of the tm_node whose output is
+ * to be connected to the fan-in of the next tm_node
+ * as represented by the dst_tm_node.
+ * @param dst_tm_node odp_tm_node_t handle of the tm_node object that will
+ * receive all of the pkt_descs from the src tm_node
+ * output. If ODP_TM_ROOT, then attachment is to
+ * the root egress object/spigot.
+ * @return 0 upon success, < 0 on failure.
*/
int odp_tm_node_connect(odp_tm_node_t src_tm_node, odp_tm_node_t dst_tm_node);
@@ -1550,11 +1548,10 @@ int odp_tm_node_connect(odp_tm_node_t src_tm_node, odp_tm_node_t dst_tm_node);
* tm_queue to be in the fanin tree (directly or indirectly) of this tm_node.
* Note that it is legal for this tm_node to no fanout connection.
*
- * @param[in] src_tm_node odp_tm_node_t handle of the tm_node whose output is
- * to be disconnected from the fan-in of the next
- * tm_node.
+ * @param src_tm_node odp_tm_node_t handle of the tm_node whose output is
+ * to be disconnected from the fan-in of the next tm_node.
*
- * @return 0 upon success, < 0 on failure.
+ * @return 0 upon success, < 0 on failure.
*/
int odp_tm_node_disconnect(odp_tm_node_t src_tm_node);
@@ -1562,12 +1559,12 @@ int odp_tm_node_disconnect(odp_tm_node_t src_tm_node);
* parent tm_node or to the egress/root node. The tm_queue will then become
* one of the dst node's fan-in set.
*
- * @param[in] tm_queue Specifies the tm_queue.
- * @param[in] dst_tm_node odp_tm_node_t handle of the tm_node object that will
- * receive all of the pkt_descs from the src tm_node
- * output. If ODP_TM_ROOT, then attachment is to
- * the root egress object/spigot.
- * @return Returns 0 upon success and < 0 upon failure.
+ * @param tm_queue Specifies the tm_queue.
+ * @param dst_tm_node odp_tm_node_t handle of the tm_node object that will
+ * receive all of the pkt_descs from the src tm_node
+ * output. If ODP_TM_ROOT, then attachment is to
+ * the root egress object/spigot.
+ * @return Returns 0 upon success and < 0 upon failure.
*/
int odp_tm_queue_connect(odp_tm_queue_t tm_queue, odp_tm_node_t dst_tm_node);
@@ -1577,8 +1574,8 @@ int odp_tm_queue_connect(odp_tm_queue_t tm_queue, odp_tm_node_t dst_tm_node);
* tm_queue from its fanout. Note that it is legal for this tm_queue to
* have no fanout connection.
*
- * @param[in] tm_queue Specifies the tm_queue.
- * @return 0 upon success, < 0 on failure.
+ * @param tm_queue Specifies the tm_queue.
+ * @return 0 upon success, < 0 on failure.
*/
int odp_tm_queue_disconnect(odp_tm_queue_t tm_queue);
@@ -1597,10 +1594,10 @@ int odp_tm_queue_disconnect(odp_tm_queue_t tm_queue);
* shaper_color produced from the TM shaper entities within the tm_inputs and
* tm_nodes.
*
- * @param[in] tm_queue Specifies the tm_queue (and indirectly the TM system).
- * @param[in] pkt Handle to a packet.
- * @return Returns 0 upon success, < 0 upon failure. One of the
- * more common failure reasons is WRED drop.
+ * @param tm_queue Specifies the tm_queue (and indirectly the TM system).
+ * @param pkt Handle to a packet.
+ * @return Returns 0 upon success, < 0 upon failure. One of the
+ * more common failure reasons is WRED drop.
*/
int odp_tm_enq(odp_tm_queue_t tm_queue, odp_packet_t pkt);
@@ -1608,10 +1605,10 @@ int odp_tm_enq(odp_tm_queue_t tm_queue, odp_packet_t pkt);
* except that it also returns (an approximation to?) the current tm_queue
* packet queue count.
*
- * @param[in] tm_queue Specifies the tm_queue (and indirectly the TM system).
- * @param[in] pkt Handle to a packet.
- * @return Returns the number of packets previously enqueued on
- * this tm_queue upon success, < 0 upon failure.
+ * @param tm_queue Specifies the tm_queue (and indirectly the TM system).
+ * @param pkt Handle to a packet.
+ * @return Returns the number of packets previously enqueued on
+ * this tm_queue upon success, < 0 upon failure.
*/
int odp_tm_enq_with_cnt(odp_tm_queue_t tm_queue, odp_packet_t pkt);
@@ -1656,7 +1653,7 @@ typedef struct {
* The odp_tm_node_info() function is used to extract various bits of
* configuration associated with a given tm_node.
*
- * @param[in] tm_node Specifies the tm_node to be queried.
+ * @param tm_node Specifies the tm_node to be queried.
* @param[out] info A pointer to an odp_tm_node_info_t record that is to
* be filled in by this call.
* @return Returns < 0 upon failure, 0 upon success.
@@ -1716,11 +1713,11 @@ typedef struct {
* Note that all new additions to a fanin list always take place at the end of
* the list.
*
- * @param[in] tm_node Specifies the tm_node to be queried.
- * @param[inout] info A pointer to an odp_tm_node_fanin_info_t record that
- * is used to determine which fanin entry is to be
- * next filled in by this call.
- * @return Returns < 0 upon failure, 0 upon success.
+ * @param tm_node Specifies the tm_node to be queried.
+ * @param[in,out] info A pointer to an odp_tm_node_fanin_info_t record that
+ * is used to determine which fanin entry is to be
+ * next filled in by this call.
+ * @return Returns < 0 upon failure, 0 upon success.
*/
int odp_tm_node_fanin_info(odp_tm_node_t tm_node,
odp_tm_node_fanin_info_t *info);
@@ -1761,7 +1758,7 @@ typedef struct {
* The odp_tm_queue_info() function is used to extract various bits of
* configuration associated with a given tm_queue.
*
- * @param[in] tm_queue Specifies the tm_queue to be queried.
+ * @param tm_queue Specifies the tm_queue to be queried.
* @param[out] info A pointer to an odp_tm_queue_info_t record that is to
* be filled in by this call.
* @return Returns < 0 upon failure, 0 upon success.
@@ -1845,7 +1842,7 @@ typedef struct {
* regardless of query_flags if the cost of returning all the counts is
* comparable to the cost of checking the query_flags.
*
- * @param[in] tm_queue Specifies the tm_queue (and indirectly the
+ * @param tm_queue Specifies the tm_queue (and indirectly the
* TM system).
* @param[out] query_flags A set of flag bits indicating which counters are
* being requested to be returned in the info record.
@@ -1865,8 +1862,8 @@ int odp_tm_queue_query(odp_tm_queue_t tm_queue,
* returning all the counts is comparable to the cost of checking the
* query_flags.
*
- * @param[in] odp_tm Specifies the TM system.
- * @param[in] priority Supplies the strict priority level used to specify
+ * @param odp_tm Specifies the TM system.
+ * @param priority Supplies the strict priority level used to specify
* which tm_queues are included in the info values.
* @param[out] query_flags A set of flag bits indicating which counters are
* being requested to be returned in the info record.
@@ -1887,7 +1884,7 @@ int odp_tm_priority_query(odp_tm_t odp_tm,
* returning all the counts is comparable to the cost of checking the
* query_flags.
*
- * @param[in] odp_tm Specifies the TM system.
+ * @param odp_tm Specifies the TM system.
* @param[out] query_flags A set of flag bits indicating which counters are
* being requested to be returned in the info record.
* @param[out] info Pointer to an odp_tm_query_info_t record where the
@@ -1904,14 +1901,14 @@ int odp_tm_total_query(odp_tm_t odp_tm,
* semantic effects other than returning these queue threshold values in the
* odp_tm_query_info_t record.
*
- * @param[in] odp_tm Specifies the TM system.
- * @param[in] priority Supplies the strict priority level that
- * the threshold profile params are associated
- * with.
- * @param[in] thresholds_profile Specifies the queue threshold profile that
- * should now be associated with the supplied
- * strict priority level.
- * @return Returns 0 upon success and < 0 upon failure.
+ * @param odp_tm Specifies the TM system.
+ * @param priority Supplies the strict priority level that
+ * the threshold profile params are associated with.
+ *
+ * @param thresholds_profile Specifies the queue threshold profile that
+ * should now be associated with the supplied
+ * strict priority level.
+ * @return Returns 0 upon success and < 0 upon failure.
*/
int odp_tm_priority_threshold_config(odp_tm_t odp_tm,
uint8_t priority,
@@ -1923,11 +1920,11 @@ int odp_tm_priority_threshold_config(odp_tm_t odp_tm,
* other than returning these queue threshold values in the
* odp_tm_query_info_t record.
*
- * @param[in] odp_tm Specifies the TM system.
- * @param[in] thresholds_profile Specifies the queue threshold profile that
- * should now be used for the entire TM
- * system.
- * @return Returns 0 upon success and < 0 upon failure.
+ * @param odp_tm Specifies the TM system.
+ * @param thresholds_profile Specifies the queue threshold profile that
+ * should now be used for the entire TM
+ * system.
+ * @return Returns 0 upon success and < 0 upon failure.
*/
int odp_tm_total_threshold_config(odp_tm_t odp_tm,
odp_tm_threshold_t thresholds_profile);
@@ -1941,8 +1938,8 @@ int odp_tm_total_threshold_config(odp_tm_t odp_tm,
* since for some implementations this call could take a fairly long time
* to execute!
*
- * @param[in] odp_tm Specifies the TM system.
- * @return Returns 1 if the TM system is idle and 0 otherwise.
+ * @param odp_tm Specifies the TM system.
+ * @return Returns 1 if the TM system is idle and 0 otherwise.
*/
odp_bool_t odp_tm_is_idle(odp_tm_t odp_tm);
@@ -1950,7 +1947,7 @@ odp_bool_t odp_tm_is_idle(odp_tm_t odp_tm);
* information about the specified TM system to the ODP log. The intended use
* is for debugging.
*
- * @param[in] odp_tm Specifies the TM system.
+ * @param odp_tm Specifies the TM system.
*/
void odp_tm_stats_print(odp_tm_t odp_tm);
commit 297df8bbdd88a2104c6dd0f6c2e506eb5140dd1c
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Mon Dec 4 14:18:17 2017 +0200
api: cls: remove param-in doxygen tag
All parameters are input only (tag [in]) by default. Output
parameters are better highlighted, when only those are tagged.
Also changed tab to spaces inside documentation. Text is more
readable on various editors when tabs and spaces are not mixed.
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/classification.h b/include/odp/api/spec/classification.h
index 16bf3e6e..4db046fc 100644
--- a/include/odp/api/spec/classification.h
+++ b/include/odp/api/spec/classification.h
@@ -287,7 +287,7 @@ typedef struct odp_cls_cos_param {
*
* Initialize an odp_cls_cos_param_t to its default value for all fields
*
- * @param param Address of the odp_cls_cos_param_t to be initialized
+ * @param param Address of the odp_cls_cos_param_t to be initialized
*/
void odp_cls_cos_param_init(odp_cls_cos_param_t *param);
@@ -296,10 +296,10 @@ void odp_cls_cos_param_init(odp_cls_cos_param_t *param);
*
* Outputs classification capabilities on success.
*
- * @param[out] capability Pointer to classification capability structure.
+ * @param[out] capability Pointer to classification capability structure.
*
- * @retval 0 on success
- * @retval <0 on failure
+ * @retval 0 on success
+ * @retval <0 on failure
*/
int odp_cls_capability(odp_cls_capability_t *capability);
@@ -308,12 +308,12 @@ int odp_cls_capability(odp_cls_capability_t *capability);
*
* The use of class-of-service name is optional. Unique names are not required.
*
- * @param name Name of the class-of-service or NULL. Maximum string
- * length is ODP_COS_NAME_LEN.
- * @param param Class-of-service parameters
+ * @param name Name of the class-of-service or NULL. Maximum string
+ * length is ODP_COS_NAME_LEN.
+ * @param param Class-of-service parameters
*
- * @retval Class-of-service handle
- * @retval ODP_COS_INVALID on failure.
+ * @retval Class-of-service handle
+ * @retval ODP_COS_INVALID on failure.
*
* @note ODP_QUEUE_INVALID and ODP_POOL_INVALID are valid values for queue
* and pool associated with a class of service and when any one of these values
@@ -327,12 +327,11 @@ odp_cos_t odp_cls_cos_create(const char *name, odp_cls_cos_param_t *param);
* based on the packet parameters and hash protocol field configured with the
* class of service.
*
- * @param cos class of service
- * @param packet Packet handle
+ * @param cos class of service
+ * @param packet Packet handle
*
- * @retval Returns the queue handle on which this packet will be
- * enqueued.
- * @retval ODP_QUEUE_INVALID for error case
+ * @retval Returns the queue handle on which this packet will be enqueued.
+ * @retval ODP_QUEUE_INVALID for error case
*
* @note The packet has to be updated with valid header pointers L2, L3 and L4.
*/
@@ -341,60 +340,54 @@ odp_queue_t odp_cls_hash_result(odp_cos_t cos, odp_packet_t packet);
/**
* Discard a class-of-service along with all its associated resources
*
- * @param[in] cos_id class-of-service instance.
+ * @param cos_id class-of-service instance.
*
- * @retval 0 on success
- * @retval <0 on failure
+ * @retval 0 on success
+ * @retval <0 on failure
*/
int odp_cos_destroy(odp_cos_t cos_id);
/**
* Assign a queue for a class-of-service
*
- * @param[in] cos_id class-of-service instance.
+ * @param cos_id class-of-service instance.
+ * @param queue_id Identifier of a queue where all packets of this specific
+ * class of service will be enqueued.
*
- * @param[in] queue_id Identifier of a queue where all packets
- * of this specific class of service
- * will be enqueued.
- *
- * @retval 0 on success
- * @retval <0 on failure
+ * @retval 0 on success
+ * @retval <0 on failure
*/
int odp_cos_queue_set(odp_cos_t cos_id, odp_queue_t queue_id);
/**
* Get the queue associated with the specific class-of-service
*
-* @param[in] cos_id class-of-service instance.
-*
-* @retval queue_handle Queue handle associated with the
-* given class-of-service
+* @param cos_id class-of-service instance.
*
-* @retval ODP_QUEUE_INVALID on failure
+* @retval Queue handle associated with the given class-of-service
+* @retval ODP_QUEUE_INVALID on failure
*/
odp_queue_t odp_cos_queue(odp_cos_t cos_id);
/**
* Get the number of queues linked with the specific class-of-service
*
- * @param cos_id class-of-service instance.
+ * @param cos_id class-of-service instance.
*
- * @return Number of queues linked with the class-of-service.
+ * @return Number of queues linked with the class-of-service.
*/
uint32_t odp_cls_cos_num_queue(odp_cos_t cos_id);
/**
* Get the list of queue associated with the specific class-of-service
*
- * @param[in] cos_id class-of-service instance.
- *
- * @param[out] queue Array of queue handles associated
- * with the class-of-service.
- *
- * @param[in] num Maximum number of queue handles to output.
+ * @param cos_id class-of-service instance.
+ * @param[out] queue Array of queue handles associated with
+ * the class-of-service.
+ * @param num Maximum number of queue handles to output.
*
- * @return Number of queues linked with CoS
- * @retval 0 on failure
+ * @return Number of queues linked with CoS
+ * @retval on 0 failure
*/
uint32_t odp_cls_cos_queues(odp_cos_t cos_id, odp_queue_t queue[],
uint32_t num);
@@ -402,11 +395,11 @@ uint32_t odp_cls_cos_queues(odp_cos_t cos_id, odp_queue_t queue[],
/**
* Assign packet drop policy for specific class-of-service
*
- * @param[in] cos_id class-of-service instance.
- * @param[in] drop_policy Desired packet drop policy for this class.
+ * @param cos_id class-of-service instance.
+ * @param drop_policy Desired packet drop policy for this class.
*
- * @retval 0 on success
- * @retval <0 on failure
+ * @retval 0 on success
+ * @retval <0 on failure
*
* @note Optional.
*/
@@ -415,10 +408,9 @@ int odp_cos_drop_set(odp_cos_t cos_id, odp_cls_drop_t drop_policy);
/**
* Get the drop policy configured for a specific class-of-service instance.
*
-* @param[in] cos_id class-of-service instance.
+* @param cos_id class-of-service instance.
*
-* @retval Drop policy configured with the given
-* class-of-service
+* @retval Drop policy configured with the given class-of-service
*/
odp_cls_drop_t odp_cos_drop(odp_cos_t cos_id);
@@ -426,13 +418,14 @@ odp_cls_drop_t odp_cos_drop(odp_cos_t cos_id);
* Request to override per-port class of service
* based on Layer-2 priority field if present.
*
- * @param[in] pktio_in Ingress port identifier.
- * @param[in] num_qos Number of QoS levels, typically 8.
- * @param[in] qos_table Values of the Layer-2 QoS header field.
- * @param[in] cos_table Class-of-service assigned to each of the
- * allowed Layer-2 QOS levels.
- * @retval 0 on success
- * @retval <0 on failure
+ * @param pktio_in Ingress port identifier.
+ * @param num_qos Number of QoS levels, typically 8.
+ * @param qos_table Values of the Layer-2 QoS header field.
+ * @param cos_table Class-of-service assigned to each of the allowed
+ * Layer-2 QOS levels.
+ *
+ * @retval 0 on success
+ * @retval <0 on failure
*/
int odp_cos_with_l2_priority(odp_pktio_t pktio_in,
uint8_t num_qos,
@@ -443,16 +436,15 @@ int odp_cos_with_l2_priority(odp_pktio_t pktio_in,
* Request to override per-port class of service
* based on Layer-3 priority field if present.
*
- * @param[in] pktio_in Ingress port identifier.
- * @param[in] num_qos Number of allowed Layer-3 QoS levels.
- * @param[in] qos_table Values of the Layer-3 QoS header field.
- * @param[in] cos_table Class-of-service assigned to each of the
- * allowed Layer-3 QOS levels.
- * @param[in] l3_preference when true, Layer-3 QoS overrides
- * L2 QoS when present.
+ * @param pktio_in Ingress port identifier.
+ * @param num_qos Number of allowed Layer-3 QoS levels.
+ * @param qos_table Values of the Layer-3 QoS header field.
+ * @param cos_table Class-of-service assigned to each of the allowed
+ * Layer-3 QOS levels.
+ * @param l3_preference when true, Layer-3 QoS overrides L2 QoS when present.
*
- * @retval 0 on success
- * @retval <0 on failure
+ * @retval 0 on success
+ * @retval <0 on failure
*
* @note Optional.
*/
@@ -462,7 +454,6 @@ int odp_cos_with_l3_qos(odp_pktio_t pktio_in,
odp_cos_t cos_table[],
odp_bool_t l3_preference);
-
/**
* @typedef odp_cos_flow_set_t
* Set of header fields that take part in flow signature hash calculation:
@@ -554,7 +545,7 @@ typedef struct odp_pmr_param_t {
*
* Initialize an odp_pmr_param_t to its default values for all fields
*
- * @param param Address of the odp_pmr_param_t to be initialized
+ * @param param Address of the odp_pmr_param_t to be initialized
*/
void odp_cls_pmr_param_init(odp_pmr_param_t *param);
@@ -571,14 +562,14 @@ void odp_cls_pmr_param_init(odp_pmr_param_t *param);
* of inspecting the return value when installing such rules, and perform
* appropriate fallback action.
*
- * @param[in] terms Array of odp_pmr_param_t entries, one entry per
- * term desired.
- * @param[in] num_terms Number of terms in the match rule.
- * @param[in] src_cos source CoS handle
- * @param[in] dst_cos destination CoS handle
+ * @param terms Array of odp_pmr_param_t entries, one entry per term
+ * desired.
+ * @param num_terms Number of terms in the match rule.
+ * @param src_cos source CoS handle
+ * @param dst_cos destination CoS handle
*
- * @return Handle to the Packet Match Rule.
- * @retval ODP_PMR_INVAL on failure
+ * @return Handle to the Packet Match Rule.
+ * @retval ODP_PMR_INVAL on failure
*/
odp_pmr_t odp_cls_pmr_create(const odp_pmr_param_t *terms, int num_terms,
odp_cos_t src_cos, odp_cos_t dst_cos);
@@ -593,10 +584,10 @@ odp_pmr_t odp_cls_pmr_create(const odp_pmr_param_t *terms, int num_terms,
* may not guarantee the availability of hardware resources to create the
* same or essentially similar rule.
*
- * @param[in] pmr_id Identifier of the PMR to be destroyed
+ * @param pmr_id Identifier of the PMR to be destroyed
*
- * @retval 0 on success
- * @retval <0 on failure
+ * @retval 0 on success
+ * @retval <0 on failure
*/
int odp_cls_pmr_destroy(odp_pmr_t pmr_id);
@@ -607,31 +598,30 @@ int odp_cls_pmr_destroy(odp_pmr_t pmr_id);
* The packet pool associated with class of service will supersede the
* packet pool associated with the pktio interface.
*
-* @param cos_id class of service handle
-* @param pool_id packet pool handle
+* @param cos_id class of service handle
+* @param pool_id packet pool handle
*
-* @retval 0 on success
-* @retval <0 on failure
+* @retval 0 on success
+* @retval <0 on failure
*/
int odp_cls_cos_pool_set(odp_cos_t cos_id, odp_pool_t pool_id);
/**
* Get the pool associated with the given class of service
*
-* @param cos_id class of service handle
+* @param cos_id class of service handle
*
-* @retval pool handle of the associated pool
-* @retval ODP_POOL_INVALID if no associated pool found or
-* in case of an error
+* @retval pool handle of the associated pool
+* @retval ODP_POOL_INVALID if no associated pool found or in case of an error
*/
odp_pool_t odp_cls_cos_pool(odp_cos_t cos_id);
/**
* Get printable value for an odp_cos_t
*
- * @param hdl odp_cos_t handle to be printed
- * @return uint64_t value that can be used to print/display this
- * handle
+ * @param hdl odp_cos_t handle to be printed
+ *
+ * @return uint64_t value that can be used to print/display this handle
*
* @note This routine is intended to be used for diagnostic purposes
* to enable applications to generate a printable value that represents
@@ -642,9 +632,9 @@ uint64_t odp_cos_to_u64(odp_cos_t hdl);
/**
* Get printable value for an odp_pmr_t
*
- * @param hdl odp_pmr_t handle to be printed
- * @return uint64_t value that can be used to print/display this
- * handle
+ * @param hdl odp_pmr_t handle to be printed
+ *
+ * @return uint64_t value that can be used to print/display this handle
*
* @note This routine is intended to be used for diagnostic purposes
* to enable applications to generate a printable value that represents
commit 32bd7464a8d86b0d83daf1760202dbdc5eabccec
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Mon Dec 4 13:51:50 2017 +0200
api: queue: remove param-in doxygen tag
All parameters are input only (tag [in]) by default. Output
parameters are better highlighted, when only those are tagged.
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 73598be0..014d3362 100644
--- a/include/odp/api/spec/queue.h
+++ b/include/odp/api/spec/queue.h
@@ -309,7 +309,7 @@ int odp_queue_enq(odp_queue_t queue, odp_event_t ev);
* has to take care of them.
*
* @param queue Queue handle
- * @param[in] events Array of event handles
+ * @param events Array of event handles
* @param num Number of event handles to enqueue
*
* @return Number of events actually enqueued (0 ... num)
-----------------------------------------------------------------------
Summary of changes:
include/odp/api/spec/classification.h | 166 +++++----
include/odp/api/spec/queue.h | 2 +-
include/odp/api/spec/traffic_mngr.h | 639 +++++++++++++++++-----------------
3 files changed, 397 insertions(+), 410 deletions(-)
hooks/post-receive
--
7 years, 5 months
- 1
- 0
[COMMIT] branch api-next updated. v1.16.0.0-642-gcf7d38c1
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 cf7d38c194f1a9183a524790511de8bfd74a36a9 (commit)
via c3f33dfa9ad624a7450b3f03bd06af7f92b69d8b (commit)
via 94530b3d56086e446fe056098fa37da048efd1b6 (commit)
via a65377ad173426db06b023764703f158e88565e2 (commit)
via ea8e4fff42411c5534ba7fbeeefd8fec4c1ac8be (commit)
via 52b07a3ffadeb7f653b1a3a1a129402e3becd027 (commit)
via 1e41d8bb45ccc1d7f5b7340742d8c9f85eb9660c (commit)
via 7c027d493295ba07fd27697827300e4c8e15475d (commit)
from bdb7cbf620ada8682c89b5ae5a97cb84f16c0ed0 (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 cf7d38c194f1a9183a524790511de8bfd74a36a9
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Tue Oct 17 15:22:52 2017 +0300
api: pool: remove union from params
Remove anonymous union from pool parameter structure.
Union makes it impossible to initialize parameters per
pool type (use other values than all zeros). This change
is not visible to applications (union was anonymous).
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Balasubramanian Manoharan <bala.manoharan(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/pool.h b/include/odp/api/spec/pool.h
index 11feb1bc..05f019f3 100644
--- a/include/odp/api/spec/pool.h
+++ b/include/odp/api/spec/pool.h
@@ -195,113 +195,110 @@ typedef struct odp_pool_param_t {
/** Pool type */
int type;
- /** Variant parameters for different pool types */
- union {
- /** Parameters for buffer pools */
- struct {
- /** Number of buffers in the pool */
- uint32_t num;
-
- /** Buffer size in bytes. The maximum number of bytes
- application will store in each buffer. */
- uint32_t size;
-
- /** Minimum buffer alignment in bytes. Valid values are
- powers of two. Use 0 for default alignment.
- Default will always be a multiple of 8. */
- uint32_t align;
- } buf;
-
- /** Parameters for packet pools */
- struct {
- /** Minimum number of 'len' byte packets.
- *
- * The pool must contain at least this many packets
- * that are 'len' bytes or smaller. An implementation
- * may round up the value, as long as the 'max_num'
- * parameter below is not violated. The maximum value
- * for this field is defined by pool capability
- * pkt.max_num.
- */
- uint32_t num;
-
- /** Maximum number of packets.
- *
- * This is the maximum number of packets of any length
- * that can be allocated from the pool. The maximum
- * value is defined by pool capability pkt.max_num.
- * Use 0 when there's no requirement for the maximum
- * number of packets. The default value is 0.
- */
- uint32_t max_num;
-
- /** Minimum length of 'num' packets.
- *
- * The pool must contain at least 'num' packets up to
- * this packet length (1 ... 'len' bytes). The maximum
- * value for this field is defined by pool capability
- * pkt.max_len. Use 0 for default.
- */
- uint32_t len;
-
- /** Maximum packet length that will be allocated from
- the pool. The maximum value is defined by pool
- capability pkt.max_len. Use 0 for default (the
- pool maximum). */
- uint32_t max_len;
-
- /** Minimum number of packet data bytes that are stored
- in the first segment of a packet. The maximum value
- is defined by pool capability pkt.max_seg_len.
- Use 0 for default. */
- uint32_t seg_len;
-
- /** User area size in bytes. The maximum value is
- defined by pool capability pkt.max_uarea_size.
- Specify as 0 if no user area is needed. */
- uint32_t uarea_size;
-
- /** Minimum Headroom size in bytes. Each newly allocated
- packet from the pool must have at least this much
- headroom. The maximum value is defined by pool
- capability pkt.max_headroom.
- Use zero if headroom is not needed. */
- uint32_t headroom;
-
- /** Number of subparameters
- *
- * The number of subparameter table entries used.
- * The maximum value is defined by pool
- * capability pkt.max_num_subparam. The default value
- * is 0.
- */
- uint8_t num_subparam;
-
- /** Subparameter table
- *
- * Subparameters continue pool configuration with
- * additional packet length requirements. The first
- * table entry follows the num/len specification above.
- * So that, sub[0].len > 'len', and sub[0].num refers
- * to packet lengths between 'len' + 1 and sub[0].len.
- * Similarly, sub[1] follows sub[0] specification, and
- * so on.
- *
- * Each requirement is supported separately and may be
- * rounded up, as long as the 'max_num' parameter is
- * not violated. It's implementation specific if some
- * requirements are supported simultaneously (e.g.
- * due to subpool design).
- */
- odp_pool_pkt_subparam_t sub[ODP_POOL_MAX_SUBPARAMS];
- } pkt;
-
- /** Parameters for timeout pools */
- struct {
- /** Number of timeouts in the pool */
- uint32_t num;
- } tmo;
- };
+ /** Parameters for buffer pools */
+ struct {
+ /** Number of buffers in the pool */
+ uint32_t num;
+
+ /** Buffer size in bytes. The maximum number of bytes
+ * application will store in each buffer.
+ */
+ uint32_t size;
+
+ /** Minimum buffer alignment in bytes. Valid values are
+ * powers of two. Use 0 for default alignment.
+ * Default will always be a multiple of 8.
+ */
+ uint32_t align;
+ } buf;
+
+ /** Parameters for packet pools */
+ struct {
+ /** Minimum number of 'len' byte packets.
+ *
+ * The pool must contain at least this many packets that are
+ * 'len' bytes or smaller. An implementation may round up the
+ * value, as long as the 'max_num' parameter below is not
+ * violated. The maximum value for this field is defined by
+ * pool capability pkt.max_num.
+ */
+ uint32_t num;
+
+ /** Maximum number of packets.
+ *
+ * This is the maximum number of packets of any length that can
+ * be allocated from the pool. The maximum value is defined by
+ * pool capability pkt.max_num. Use 0 when there's no
+ * requirement for the maximum number of packets. The default
+ * value is 0.
+ */
+ uint32_t max_num;
+
+ /** Minimum length of 'num' packets.
+ *
+ * The pool must contain at least 'num' packets up to this
+ * packet length (1 ... 'len' bytes). The maximum value for
+ * this field is defined by pool capability pkt.max_len.
+ * Use 0 for default.
+ */
+ uint32_t len;
+
+ /** Maximum packet length that will be allocated from
+ * the pool. The maximum value is defined by pool capability
+ * pkt.max_len. Use 0 for default (the pool maximum).
+ */
+ uint32_t max_len;
+
+ /** Minimum number of packet data bytes that are stored in the
+ * first segment of a packet. The maximum value is defined by
+ * pool capability pkt.max_seg_len. Use 0 for default.
+ */
+ uint32_t seg_len;
+
+ /** User area size in bytes. The maximum value is defined by
+ * pool capability pkt.max_uarea_size. Specify as 0 if no user
+ * area is needed.
+ */
+ uint32_t uarea_size;
+
+ /** Minimum headroom size in bytes. Each newly allocated
+ * packet from the pool must have at least this much headroom.
+ * The maximum value is defined by pool capability
+ * pkt.max_headroom. Use zero if headroom is not needed.
+ */
+ uint32_t headroom;
+
+ /** Number of subparameters
+ *
+ * The number of subparameter table entries used. The maximum
+ * value is defined by pool capability pkt.max_num_subparam.
+ * The default value is 0.
+ */
+ uint8_t num_subparam;
+
+ /** Subparameter table
+ *
+ * Subparameters continue pool configuration with additional
+ * packet length requirements. The first table entry follows
+ * the num/len specification above. So that, sub[0].len > 'len'
+ * and sub[0].num refers to packet lengths between 'len' + 1
+ * and sub[0].len. Similarly, sub[1] follows sub[0]
+ * specification, and so on.
+ *
+ * Each requirement is supported separately and may be rounded
+ * up, as long as the 'max_num' parameter is not violated. It's
+ * implementation specific if some requirements are supported
+ * simultaneously (e.g. due to subpool design).
+ */
+ odp_pool_pkt_subparam_t sub[ODP_POOL_MAX_SUBPARAMS];
+ } pkt;
+
+ /** Parameters for timeout pools */
+ struct {
+ /** Number of timeouts in the pool */
+ uint32_t num;
+ } tmo;
+
} odp_pool_param_t;
/** Packet pool*/
commit c3f33dfa9ad624a7450b3f03bd06af7f92b69d8b
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Mon Oct 16 15:20:07 2017 +0300
validation: pool: add packet info test
Added odp_pool_info() test for packet pools.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Balasubramanian Manoharan <bala.manoharan(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/pool/pool.c b/test/validation/api/pool/pool.c
index 461715cc..84c17720 100644
--- a/test/validation/api/pool/pool.c
+++ b/test/validation/api/pool/pool.c
@@ -191,12 +191,40 @@ void pool_test_alloc_packet_subparam(void)
CU_ASSERT(odp_pool_destroy(pool) == 0);
}
+void pool_test_info_packet(void)
+{
+ odp_pool_t pool;
+ odp_pool_info_t info;
+ odp_pool_param_t param;
+ const char pool_name[] = "test_pool_name";
+
+ odp_pool_param_init(¶m);
+
+ param.type = ODP_POOL_PACKET;
+ param.pkt.num = PKT_NUM;
+ param.pkt.len = PKT_LEN;
+
+ pool = odp_pool_create(pool_name, ¶m);
+ CU_ASSERT_FATAL(pool != ODP_POOL_INVALID);
+
+ CU_ASSERT_FATAL(odp_pool_info(pool, &info) == 0);
+
+ CU_ASSERT(strncmp(pool_name, info.name, sizeof(pool_name)) == 0);
+ CU_ASSERT(info.params.type == ODP_POOL_PACKET);
+ CU_ASSERT(info.params.pkt.num == param.pkt.num);
+ CU_ASSERT(info.params.pkt.len == param.pkt.len);
+ CU_ASSERT(info.pkt.max_num >= param.pkt.num);
+
+ CU_ASSERT(odp_pool_destroy(pool) == 0);
+}
+
odp_testinfo_t pool_suite[] = {
ODP_TEST_INFO(pool_test_create_destroy_buffer),
ODP_TEST_INFO(pool_test_create_destroy_packet),
ODP_TEST_INFO(pool_test_create_destroy_timeout),
ODP_TEST_INFO(pool_test_alloc_packet),
ODP_TEST_INFO(pool_test_alloc_packet_subparam),
+ ODP_TEST_INFO(pool_test_info_packet),
ODP_TEST_INFO(pool_test_lookup_info_print),
ODP_TEST_INFO_NULL,
};
diff --git a/test/validation/api/pool/pool.h b/test/validation/api/pool/pool.h
index 3f8f5ebc..b284524e 100644
--- a/test/validation/api/pool/pool.h
+++ b/test/validation/api/pool/pool.h
@@ -16,6 +16,7 @@ void pool_test_create_destroy_timeout(void);
void pool_test_lookup_info_print(void);
void pool_test_alloc_packet(void);
void pool_test_alloc_packet_subparam(void);
+void pool_test_info_packet(void);
/* test arrays: */
extern odp_testinfo_t pool_suite[];
commit 94530b3d56086e446fe056098fa37da048efd1b6
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Mon Oct 16 15:25:01 2017 +0300
linux-gen: pool: implement max_num info
Implemented max_num info for packet pools.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/odp_pool.c b/platform/linux-generic/odp_pool.c
index 7584aec0..25f0ed3b 100644
--- a/platform/linux-generic/odp_pool.c
+++ b/platform/linux-generic/odp_pool.c
@@ -705,6 +705,9 @@ int odp_pool_info(odp_pool_t pool_hdl, odp_pool_info_t *info)
info->name = pool->name;
info->params = pool->params;
+ if (pool->params.type == ODP_POOL_PACKET)
+ info->pkt.max_num = pool->num;
+
return 0;
}
commit a65377ad173426db06b023764703f158e88565e2
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Mon Oct 16 14:57:15 2017 +0300
api: pool: add max packet num info
Packet pool parameters does not require application to specify
the maximum number of packet. Application is more portable, if
it does not restrict max_num, but instead uses this info field
after pool creation.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Balasubramanian Manoharan <bala.manoharan(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/pool.h b/include/odp/api/spec/pool.h
index 2900fc46..11feb1bc 100644
--- a/include/odp/api/spec/pool.h
+++ b/include/odp/api/spec/pool.h
@@ -358,24 +358,42 @@ odp_pool_t odp_pool_lookup(const char *name);
* Used to get information about a pool.
*/
typedef struct odp_pool_info_t {
- const char *name; /**< pool name */
- odp_pool_param_t params; /**< pool parameters */
+ /** Pool name */
+ const char *name;
+
+ /** Copy of pool parameters */
+ odp_pool_param_t params;
+
+ /** Additional info for packet pools */
+ struct {
+ /** Maximum number of packets of any length
+ *
+ * This is the maximum number of packets that can be allocated
+ * from the pool at anytime. Application can use this e.g.
+ * to prepare enough per packet contexts.
+ */
+ uint32_t max_num;
+
+ } pkt;
/** Minimum data address.
- * This is the minimum address that application accessible
- * data of any object (event) allocated from the pool may
- * locate. When there's no application accessible data
- * (e.g. ODP_POOL_TIMEOUT pools), the value may be zero.
+ *
+ * This is the minimum address that application accessible
+ * data of any object (event) allocated from the pool may
+ * locate. When there's no application accessible data
+ * (e.g. ODP_POOL_TIMEOUT pools), the value may be zero.
*/
uintptr_t min_data_addr;
/** Maximum data address.
- * This is the maximum address that application accessible
- * data of any object (event) allocated from the pool may
- * locate. When there's no application accessible data
- * (e.g. ODP_POOL_TIMEOUT pools), the value may be zero.
+ *
+ * This is the maximum address that application accessible
+ * data of any object (event) allocated from the pool may
+ * locate. When there's no application accessible data
+ * (e.g. ODP_POOL_TIMEOUT pools), the value may be zero.
*/
uintptr_t max_data_addr;
+
} odp_pool_info_t;
/**
@@ -389,7 +407,6 @@ typedef struct odp_pool_info_t {
* @retval 0 Success
* @retval -1 Failure. Info could not be retrieved.
*/
-
int odp_pool_info(odp_pool_t pool, odp_pool_info_t *info);
/**
commit ea8e4fff42411c5534ba7fbeeefd8fec4c1ac8be
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Mon Oct 16 14:06:51 2017 +0300
validation: pool: initialize params correctly
Use odp_pool_param_init() to initialize pool parameters.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Balasubramanian Manoharan <bala.manoharan(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/pool/pool.c b/test/validation/api/pool/pool.c
index c38a336c..461715cc 100644
--- a/test/validation/api/pool/pool.c
+++ b/test/validation/api/pool/pool.c
@@ -16,11 +16,11 @@
static const int default_buffer_size = 1500;
static const int default_buffer_num = 1000;
-static void pool_create_destroy(odp_pool_param_t *params)
+static void pool_create_destroy(odp_pool_param_t *param)
{
odp_pool_t pool;
- pool = odp_pool_create(NULL, params);
+ pool = odp_pool_create(NULL, param);
CU_ASSERT_FATAL(pool != ODP_POOL_INVALID);
CU_ASSERT(odp_pool_to_u64(pool) !=
odp_pool_to_u64(ODP_POOL_INVALID));
@@ -29,42 +29,41 @@ static void pool_create_destroy(odp_pool_param_t *params)
void pool_test_create_destroy_buffer(void)
{
- odp_pool_param_t params = {
- .buf = {
- .size = default_buffer_size,
- .align = ODP_CACHE_LINE_SIZE,
- .num = default_buffer_num,
- },
- .type = ODP_POOL_BUFFER,
- };
-
- pool_create_destroy(¶ms);
+ odp_pool_param_t param;
+
+ odp_pool_param_init(¶m);
+
+ param.type = ODP_POOL_BUFFER,
+ param.buf.size = default_buffer_size;
+ param.buf.align = ODP_CACHE_LINE_SIZE;
+ param.buf.num = default_buffer_num;
+
+ pool_create_destroy(¶m);
}
void pool_test_create_destroy_packet(void)
{
- odp_pool_param_t params = {
- .pkt = {
- .seg_len = 0,
- .len = default_buffer_size,
- .num = default_buffer_num,
- },
- .type = ODP_POOL_PACKET,
- };
-
- pool_create_destroy(¶ms);
+ odp_pool_param_t param;
+
+ odp_pool_param_init(¶m);
+
+ param.type = ODP_POOL_PACKET;
+ param.pkt.len = default_buffer_size;
+ param.pkt.num = default_buffer_num;
+
+ pool_create_destroy(¶m);
}
void pool_test_create_destroy_timeout(void)
{
- odp_pool_param_t params = {
- .tmo = {
- .num = default_buffer_num,
- },
- .type = ODP_POOL_TIMEOUT,
- };
-
- pool_create_destroy(¶ms);
+ odp_pool_param_t param;
+
+ odp_pool_param_init(¶m);
+
+ param.type = ODP_POOL_TIMEOUT;
+ param.tmo.num = default_buffer_num;
+
+ pool_create_destroy(¶m);
}
void pool_test_lookup_info_print(void)
@@ -72,16 +71,16 @@ void pool_test_lookup_info_print(void)
odp_pool_t pool;
const char pool_name[] = "pool_for_lookup_test";
odp_pool_info_t info;
- odp_pool_param_t params = {
- .buf = {
- .size = default_buffer_size,
- .align = ODP_CACHE_LINE_SIZE,
- .num = default_buffer_num,
- },
- .type = ODP_POOL_BUFFER,
- };
-
- pool = odp_pool_create(pool_name, ¶ms);
+ odp_pool_param_t param;
+
+ odp_pool_param_init(¶m);
+
+ param.type = ODP_POOL_BUFFER;
+ param.buf.size = default_buffer_size;
+ param.buf.align = ODP_CACHE_LINE_SIZE;
+ param.buf.num = default_buffer_num;
+
+ pool = odp_pool_create(pool_name, ¶m);
CU_ASSERT_FATAL(pool != ODP_POOL_INVALID);
pool = odp_pool_lookup(pool_name);
@@ -89,10 +88,10 @@ void pool_test_lookup_info_print(void)
CU_ASSERT_FATAL(odp_pool_info(pool, &info) == 0);
CU_ASSERT(strncmp(pool_name, info.name, sizeof(pool_name)) == 0);
- CU_ASSERT(params.buf.size <= info.params.buf.size);
- CU_ASSERT(params.buf.align <= info.params.buf.align);
- CU_ASSERT(params.buf.num <= info.params.buf.num);
- CU_ASSERT(params.type == info.params.type);
+ CU_ASSERT(param.buf.size <= info.params.buf.size);
+ CU_ASSERT(param.buf.align <= info.params.buf.align);
+ CU_ASSERT(param.buf.num <= info.params.buf.num);
+ CU_ASSERT(param.type == info.params.type);
odp_pool_print(pool);
commit 52b07a3ffadeb7f653b1a3a1a129402e3becd027
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Mon Oct 16 13:55:14 2017 +0300
validation: pool: add subparam test
Test packet pool subparameters when those are supported.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Balasubramanian Manoharan <bala.manoharan(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/pool/pool.c b/test/validation/api/pool/pool.c
index e633137a..c38a336c 100644
--- a/test/validation/api/pool/pool.c
+++ b/test/validation/api/pool/pool.c
@@ -10,6 +10,9 @@
#include "odp_cunit_common.h"
#include "pool.h"
+#define PKT_LEN 400
+#define PKT_NUM 500
+
static const int default_buffer_size = 1500;
static const int default_buffer_num = 1000;
@@ -96,10 +99,105 @@ void pool_test_lookup_info_print(void)
CU_ASSERT(odp_pool_destroy(pool) == 0);
}
+void pool_test_alloc_packet(void)
+{
+ odp_pool_t pool;
+ odp_pool_param_t param;
+ uint32_t i, num;
+ odp_packet_t pkt[PKT_NUM];
+
+ odp_pool_param_init(¶m);
+
+ param.type = ODP_POOL_PACKET,
+ param.pkt.num = PKT_NUM;
+ param.pkt.len = PKT_LEN;
+
+ pool = odp_pool_create(NULL, ¶m);
+
+ CU_ASSERT_FATAL(pool != ODP_POOL_INVALID);
+
+ num = 0;
+
+ for (i = 0; i < PKT_NUM; i++) {
+ pkt[num] = odp_packet_alloc(pool, PKT_LEN);
+ CU_ASSERT(pkt[num] != ODP_PACKET_INVALID);
+
+ if (pkt[num] != ODP_PACKET_INVALID)
+ num++;
+ }
+
+ for (i = 0; i < num; i++)
+ odp_packet_free(pkt[i]);
+
+ CU_ASSERT(odp_pool_destroy(pool) == 0);
+}
+
+void pool_test_alloc_packet_subparam(void)
+{
+ odp_pool_t pool;
+ odp_pool_capability_t capa;
+ odp_pool_param_t param;
+ uint32_t i, j, num, num_sub;
+ odp_packet_t pkt[PKT_NUM];
+
+ CU_ASSERT_FATAL(odp_pool_capability(&capa) == 0);
+ num_sub = capa.pkt.max_num_subparam;
+
+ CU_ASSERT_FATAL(num_sub <= ODP_POOL_MAX_SUBPARAMS);
+
+ odp_pool_param_init(¶m);
+
+ param.type = ODP_POOL_PACKET,
+ param.pkt.num = PKT_NUM;
+ param.pkt.len = PKT_LEN;
+ param.pkt.num_subparam = num_sub;
+
+ for (i = 0; i < num_sub; i++) {
+ param.pkt.sub[i].num = PKT_NUM;
+ param.pkt.sub[i].len = PKT_LEN + (i * 100);
+ }
+
+ pool = odp_pool_create(NULL, ¶m);
+
+ CU_ASSERT_FATAL(pool != ODP_POOL_INVALID);
+
+ num = 0;
+
+ for (i = 0; i < PKT_NUM; i++) {
+ pkt[num] = odp_packet_alloc(pool, PKT_LEN);
+ CU_ASSERT(pkt[num] != ODP_PACKET_INVALID);
+
+ if (pkt[num] != ODP_PACKET_INVALID)
+ num++;
+ }
+
+ for (i = 0; i < num; i++)
+ odp_packet_free(pkt[i]);
+
+ for (j = 0; j < num_sub; j++) {
+ num = 0;
+
+ for (i = 0; i < param.pkt.sub[j].num; i++) {
+ pkt[num] = odp_packet_alloc(pool, param.pkt.sub[j].len);
+ CU_ASSERT(pkt[num] != ODP_PACKET_INVALID);
+
+ if (pkt[num] != ODP_PACKET_INVALID)
+ num++;
+ }
+
+ for (i = 0; i < num; i++)
+ odp_packet_free(pkt[i]);
+ }
+
+ CU_ASSERT(odp_pool_destroy(pool) == 0);
+}
+
odp_testinfo_t pool_suite[] = {
ODP_TEST_INFO(pool_test_create_destroy_buffer),
ODP_TEST_INFO(pool_test_create_destroy_packet),
ODP_TEST_INFO(pool_test_create_destroy_timeout),
+ ODP_TEST_INFO(pool_test_alloc_packet),
+ ODP_TEST_INFO(pool_test_alloc_packet_subparam),
ODP_TEST_INFO(pool_test_lookup_info_print),
ODP_TEST_INFO_NULL,
};
diff --git a/test/validation/api/pool/pool.h b/test/validation/api/pool/pool.h
index 29e51763..3f8f5ebc 100644
--- a/test/validation/api/pool/pool.h
+++ b/test/validation/api/pool/pool.h
@@ -13,8 +13,9 @@
void pool_test_create_destroy_buffer(void);
void pool_test_create_destroy_packet(void);
void pool_test_create_destroy_timeout(void);
-void pool_test_create_destroy_buffer_shm(void);
void pool_test_lookup_info_print(void);
+void pool_test_alloc_packet(void);
+void pool_test_alloc_packet_subparam(void);
/* test arrays: */
extern odp_testinfo_t pool_suite[];
commit 1e41d8bb45ccc1d7f5b7340742d8c9f85eb9660c
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Mon Oct 16 12:38:27 2017 +0300
api: pool: add packet pool subparameters
Additional packet length and number specification gives
more information to implementation about intended packet
length distribution in the pool. This enables e.g. correct
initialization when pool implementation is based on multiple
fixed packet / segment sizes (subpools). The specification
does require subpool implementation but allows it.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Balasubramanian Manoharan <bala.manoharan(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/pool.h b/include/odp/api/spec/pool.h
index dc07851c..2900fc46 100644
--- a/include/odp/api/spec/pool.h
+++ b/include/odp/api/spec/pool.h
@@ -41,6 +41,9 @@ extern "C" {
* Maximum pool name length in chars including null char
*/
+/** Maximum number of packet pool subparameters */
+#define ODP_POOL_MAX_SUBPARAMS 7
+
/**
* Pool capabilities
*/
@@ -134,6 +137,12 @@ typedef struct odp_pool_capability_t {
* The value of zero means that limited only by the available
* memory size for the pool. */
uint32_t max_uarea_size;
+
+ /** Maximum number of subparameters
+ *
+ * Maximum number of packet pool subparameters. Valid range is
+ * 0 ... ODP_POOL_MAX_SUBPARAMS. */
+ uint8_t max_num_subparam;
} pkt;
/** Timeout pool capabilities */
@@ -162,6 +171,18 @@ typedef struct odp_pool_capability_t {
*/
int odp_pool_capability(odp_pool_capability_t *capa);
+/**
+ * Packet pool subparameters
+ */
+typedef struct odp_pool_pkt_subparam_t {
+ /** Number of 'len' byte packets. */
+ uint32_t num;
+
+ /** Packet length in bytes */
+ uint32_t len;
+
+} odp_pool_pkt_subparam_t;
+
/**
* Pool parameters
*
@@ -246,6 +267,33 @@ typedef struct odp_pool_param_t {
capability pkt.max_headroom.
Use zero if headroom is not needed. */
uint32_t headroom;
+
+ /** Number of subparameters
+ *
+ * The number of subparameter table entries used.
+ * The maximum value is defined by pool
+ * capability pkt.max_num_subparam. The default value
+ * is 0.
+ */
+ uint8_t num_subparam;
+
+ /** Subparameter table
+ *
+ * Subparameters continue pool configuration with
+ * additional packet length requirements. The first
+ * table entry follows the num/len specification above.
+ * So that, sub[0].len > 'len', and sub[0].num refers
+ * to packet lengths between 'len' + 1 and sub[0].len.
+ * Similarly, sub[1] follows sub[0] specification, and
+ * so on.
+ *
+ * Each requirement is supported separately and may be
+ * rounded up, as long as the 'max_num' parameter is
+ * not violated. It's implementation specific if some
+ * requirements are supported simultaneously (e.g.
+ * due to subpool design).
+ */
+ odp_pool_pkt_subparam_t sub[ODP_POOL_MAX_SUBPARAMS];
} pkt;
/** Parameters for timeout pools */
commit 7c027d493295ba07fd27697827300e4c8e15475d
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Fri Oct 13 14:41:22 2017 +0300
api: pool: relax packet pool param num
Added packet pool parameter 'max_num', so that 'num' parameter
can be round up by the implementation. Most implementations have
a fixed segment size, and need this flexibility. For example,
when 'len' is larger than the pool segment size, there may be
e.g. 2 x 'num' segments in the poool, and thus it would be
able to allocate 2 x 'num' small packets. When application
needs to limit maximum number of packets on a pool, it can
use the new max_num param for that. Otherwise, it would leave
'max_num' to zero (== no limit).
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Balasubramanian Manoharan <bala.manoharan(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/pool.h b/include/odp/api/spec/pool.h
index 35f78377..dc07851c 100644
--- a/include/odp/api/spec/pool.h
+++ b/include/odp/api/spec/pool.h
@@ -164,10 +164,11 @@ int odp_pool_capability(odp_pool_capability_t *capa);
/**
* Pool parameters
- * Used to communicate pool creation options.
- * @note A single thread may not be able to allocate all 'num' elements
- * from the pool at any particular time, as other threads or hardware
- * blocks are allowed to keep some for caching purposes.
+ *
+ * A note for all pool types: a single thread may not be able to allocate all
+ * 'num' elements from the pool at any particular time, as implementations are
+ * allowed to store some elements (per thread and HW engine) for caching
+ * purposes.
*/
typedef struct odp_pool_param_t {
/** Pool type */
@@ -192,17 +193,34 @@ typedef struct odp_pool_param_t {
/** Parameters for packet pools */
struct {
- /** The number of packets that the pool must provide
- that are packet length 'len' bytes or smaller.
- The maximum value is defined by pool capability
- pkt.max_num. */
+ /** Minimum number of 'len' byte packets.
+ *
+ * The pool must contain at least this many packets
+ * that are 'len' bytes or smaller. An implementation
+ * may round up the value, as long as the 'max_num'
+ * parameter below is not violated. The maximum value
+ * for this field is defined by pool capability
+ * pkt.max_num.
+ */
uint32_t num;
- /** Minimum packet length that the pool must provide
- 'num' packets. The number of packets may be less
- than 'num' when packets are larger than 'len'.
- The maximum value is defined by pool capability
- pkt.max_len. Use 0 for default. */
+ /** Maximum number of packets.
+ *
+ * This is the maximum number of packets of any length
+ * that can be allocated from the pool. The maximum
+ * value is defined by pool capability pkt.max_num.
+ * Use 0 when there's no requirement for the maximum
+ * number of packets. The default value is 0.
+ */
+ uint32_t max_num;
+
+ /** Minimum length of 'num' packets.
+ *
+ * The pool must contain at least 'num' packets up to
+ * this packet length (1 ... 'len' bytes). The maximum
+ * value for this field is defined by pool capability
+ * pkt.max_len. Use 0 for default.
+ */
uint32_t len;
/** Maximum packet length that will be allocated from
-----------------------------------------------------------------------
Summary of changes:
include/odp/api/spec/pool.h | 236 +++++++++++++++++++++++++-------------
platform/linux-generic/odp_pool.c | 3 +
test/validation/api/pool/pool.c | 213 +++++++++++++++++++++++++++-------
test/validation/api/pool/pool.h | 4 +-
4 files changed, 333 insertions(+), 123 deletions(-)
hooks/post-receive
--
7 years, 5 months
- 1
- 0
[COMMIT] branch master updated. v1.16.0.0-13-g811281a2
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 811281a22b6274b7f41b926a9cfbe09e48a366bd (commit)
from 5329e5211c447b9b823149baf76112eedfeb07fb (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 811281a22b6274b7f41b926a9cfbe09e48a366bd
Author: Matias Elo <matias.elo(a)nokia.com>
Date: Tue Nov 28 14:54:54 2017 +0200
travis: add enable-deprecated test configuration
Test ODP build with 'enable-deprecated' flag set.
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/.travis.yml b/.travis.yml
index b5c1b641..976f0763 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -69,6 +69,7 @@ cache:
env:
- CONF=""
- CONF="--disable-abi-compat"
+ - CONF="--enable-deprecated"
- CONF="--enable-schedule-sp"
- CONF="--enable-schedule-iquery"
- CONF="--enable-dpdk-zero-copy"
-----------------------------------------------------------------------
Summary of changes:
.travis.yml | 1 +
1 file changed, 1 insertion(+)
hooks/post-receive
--
7 years, 5 months
- 1
- 0