d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

test/ring: add functional tests for zero copy API

Browse Source 
Add functional tests for zero copy APIs. Test enqueue/dequeue
functions are created using the zero copy APIs to fit into
the existing testing method.

Signed-off-by: Honnappa Nagarahalli <honnappa.nagarahalli@arm.com>
Reviewed-by: Dharmik Thakkar <dharmik.thakkar@arm.com>
Acked-by: Konstantin Ananyev <konstantin.ananyev@intel.com>
This commit is contained in:
Honnappa Nagarahalli 2020-10-25 00:45:50 -05:00 committed by David Marchand
parent 47bec9a5ca
commit 83342a1339
2 changed files with 251 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

207
app/test/test_ring.c
View File

@ -1,5 +1,6 @@
/* SPDX-License-Identifier: BSD-3-Clause /* SPDX-License-Identifier: BSD-3-Clause
* Copyright(c) 2010-2014 Intel Corporation * Copyright(c) 2010-2014 Intel Corporation
* Copyright(c) 2020 Arm Limited
*/ */
#include <string.h> #include <string.h>
@ -68,6 +69,149 @@
static const int esize[] = {-1, 4, 8, 16, 20}; static const int esize[] = {-1, 4, 8, 16, 20};
/* Wrappers around the zero-copy APIs. The wrappers match
* the normal enqueue/dequeue API declarations.
*/
static unsigned int
test_ring_enqueue_zc_bulk(struct rte_ring *r, void * const *obj_table,
unsigned int n, unsigned int *free_space)
{
uint32_t ret;
struct rte_ring_zc_data zcd;
ret = rte_ring_enqueue_zc_bulk_start(r, n, &zcd, free_space);
if (ret != 0) {
/* Copy the data to the ring */
test_ring_copy_to(&zcd, obj_table, sizeof(void *), ret);
rte_ring_enqueue_zc_finish(r, ret);
}
return ret;
}
static unsigned int
test_ring_enqueue_zc_bulk_elem(struct rte_ring *r, const void *obj_table,
unsigned int esize, unsigned int n, unsigned int *free_space)
{
unsigned int ret;
struct rte_ring_zc_data zcd;
ret = rte_ring_enqueue_zc_bulk_elem_start(r, esize, n,
&zcd, free_space);
if (ret != 0) {
/* Copy the data to the ring */
test_ring_copy_to(&zcd, obj_table, esize, ret);
rte_ring_enqueue_zc_finish(r, ret);
}
return ret;
}
static unsigned int
test_ring_enqueue_zc_burst(struct rte_ring *r, void * const *obj_table,
unsigned int n, unsigned int *free_space)
{
unsigned int ret;
struct rte_ring_zc_data zcd;
ret = rte_ring_enqueue_zc_burst_start(r, n, &zcd, free_space);
if (ret != 0) {
/* Copy the data to the ring */
test_ring_copy_to(&zcd, obj_table, sizeof(void *), ret);
rte_ring_enqueue_zc_finish(r, ret);
}
return ret;
}
static unsigned int
test_ring_enqueue_zc_burst_elem(struct rte_ring *r, const void *obj_table,
unsigned int esize, unsigned int n, unsigned int *free_space)
{
unsigned int ret;
struct rte_ring_zc_data zcd;
ret = rte_ring_enqueue_zc_burst_elem_start(r, esize, n,
&zcd, free_space);
if (ret != 0) {
/* Copy the data to the ring */
test_ring_copy_to(&zcd, obj_table, esize, ret);
rte_ring_enqueue_zc_finish(r, ret);
}
return ret;
}
static unsigned int
test_ring_dequeue_zc_bulk(struct rte_ring *r, void **obj_table,
unsigned int n, unsigned int *available)
{
unsigned int ret;
struct rte_ring_zc_data zcd;
ret = rte_ring_dequeue_zc_bulk_start(r, n, &zcd, available);
if (ret != 0) {
/* Copy the data from the ring */
test_ring_copy_from(&zcd, obj_table, sizeof(void *), ret);
rte_ring_dequeue_zc_finish(r, ret);
}
return ret;
}
static unsigned int
test_ring_dequeue_zc_bulk_elem(struct rte_ring *r, void *obj_table,
unsigned int esize, unsigned int n, unsigned int *available)
{
unsigned int ret;
struct rte_ring_zc_data zcd;
ret = rte_ring_dequeue_zc_bulk_elem_start(r, esize, n,
&zcd, available);
if (ret != 0) {
/* Copy the data from the ring */
test_ring_copy_from(&zcd, obj_table, esize, ret);
rte_ring_dequeue_zc_finish(r, ret);
}
return ret;
}
static unsigned int
test_ring_dequeue_zc_burst(struct rte_ring *r, void **obj_table,
unsigned int n, unsigned int *available)
{
unsigned int ret;
struct rte_ring_zc_data zcd;
ret = rte_ring_dequeue_zc_burst_start(r, n, &zcd, available);
if (ret != 0) {
/* Copy the data from the ring */
test_ring_copy_from(&zcd, obj_table, sizeof(void *), ret);
rte_ring_dequeue_zc_finish(r, ret);
}
return ret;
}
static unsigned int
test_ring_dequeue_zc_burst_elem(struct rte_ring *r, void *obj_table,
unsigned int esize, unsigned int n, unsigned int *available)
{
unsigned int ret;
struct rte_ring_zc_data zcd;
ret = rte_ring_dequeue_zc_burst_elem_start(r, esize, n,
&zcd, available);
if (ret != 0) {
/* Copy the data from the ring */
test_ring_copy_from(&zcd, obj_table, esize, ret);
rte_ring_dequeue_zc_finish(r, ret);
}
return ret;
}
static const struct { static const struct {
const char *desc; const char *desc;
uint32_t api_type; uint32_t api_type;
@ -219,6 +363,58 @@ static const struct {
.felem = rte_ring_dequeue_burst_elem, .felem = rte_ring_dequeue_burst_elem,
}, },
}, },
{
.desc = "SP/SC sync mode (ZC)",
.api_type = TEST_RING_ELEM_BULK | TEST_RING_THREAD_SPSC,
.create_flags = RING_F_SP_ENQ | RING_F_SC_DEQ,
.enq = {
.flegacy = test_ring_enqueue_zc_bulk,
.felem = test_ring_enqueue_zc_bulk_elem,
},
.deq = {
.flegacy = test_ring_dequeue_zc_bulk,
.felem = test_ring_dequeue_zc_bulk_elem,
},
},
{
.desc = "MP_HTS/MC_HTS sync mode (ZC)",
.api_type = TEST_RING_ELEM_BULK | TEST_RING_THREAD_DEF,
.create_flags = RING_F_MP_HTS_ENQ | RING_F_MC_HTS_DEQ,
.enq = {
.flegacy = test_ring_enqueue_zc_bulk,
.felem = test_ring_enqueue_zc_bulk_elem,
},
.deq = {
.flegacy = test_ring_dequeue_zc_bulk,
.felem = test_ring_dequeue_zc_bulk_elem,
},
},
{
.desc = "SP/SC sync mode (ZC)",
.api_type = TEST_RING_ELEM_BURST | TEST_RING_THREAD_SPSC,
.create_flags = RING_F_SP_ENQ | RING_F_SC_DEQ,
.enq = {
.flegacy = test_ring_enqueue_zc_burst,
.felem = test_ring_enqueue_zc_burst_elem,
},
.deq = {
.flegacy = test_ring_dequeue_zc_burst,
.felem = test_ring_dequeue_zc_burst_elem,
},
},
{
.desc = "MP_HTS/MC_HTS sync mode (ZC)",
.api_type = TEST_RING_ELEM_BURST | TEST_RING_THREAD_DEF,
.create_flags = RING_F_MP_HTS_ENQ | RING_F_MC_HTS_DEQ,
.enq = {
.flegacy = test_ring_enqueue_zc_burst,
.felem = test_ring_enqueue_zc_burst_elem,
},
.deq = {
.flegacy = test_ring_dequeue_zc_burst,
.felem = test_ring_dequeue_zc_burst_elem,
},
}
}; };
static unsigned int static unsigned int
@ -243,17 +439,6 @@ test_ring_deq_impl(struct rte_ring *r, void **obj, int esize, unsigned int n,
NULL); NULL);
} }
static void**
test_ring_inc_ptr(void **obj, int esize, unsigned int n)
{
/* Legacy queue APIs? */
if (esize == -1)
return ((void **)obj) + n;
else
return (void **)(((uint32_t *)obj) +
(n * esize / sizeof(uint32_t)));
}
static void static void
test_ring_mem_init(void *obj, unsigned int count, int esize) test_ring_mem_init(void *obj, unsigned int count, int esize)
{ {

55
app/test/test_ring.h
View File

@ -42,6 +42,61 @@ test_ring_create(const char *name, int esize, unsigned int count,
socket_id, flags); socket_id, flags);
} }
static inline void*
test_ring_inc_ptr(void *obj, int esize, unsigned int n)
{
size_t sz;
sz = sizeof(void *);
/* Legacy queue APIs? */
if (esize != -1)
sz = esize;
return (void *)((uint32_t *)obj + (n * sz / sizeof(uint32_t)));
}
static inline void
test_ring_mem_copy(void *dst, void * const *src, int esize, unsigned int num)
{
size_t sz;
sz = num * sizeof(void *);
if (esize != -1)
sz = esize * num;
memcpy(dst, src, sz);
}
/* Copy to the ring memory */
static inline void
test_ring_copy_to(struct rte_ring_zc_data *zcd, void * const *src, int esize,
unsigned int num)
{
test_ring_mem_copy(zcd->ptr1, src, esize, zcd->n1);
if (zcd->n1 != num) {
if (esize == -1)
src = src + zcd->n1;
else
src = (void * const *)((const uint32_t *)src +
(zcd->n1 * esize / sizeof(uint32_t)));
test_ring_mem_copy(zcd->ptr2, src,
esize, num - zcd->n1);
}
}
/* Copy from the ring memory */
static inline void
test_ring_copy_from(struct rte_ring_zc_data *zcd, void *dst, int esize,
unsigned int num)
{
test_ring_mem_copy(dst, zcd->ptr1, esize, zcd->n1);
if (zcd->n1 != num) {
dst = test_ring_inc_ptr(dst, esize, zcd->n1);
test_ring_mem_copy(dst, zcd->ptr2, esize, num - zcd->n1);
}
}
static __rte_always_inline unsigned int static __rte_always_inline unsigned int
test_ring_enqueue(struct rte_ring *r, void **obj, int esize, unsigned int n, test_ring_enqueue(struct rte_ring *r, void **obj, int esize, unsigned int n,
unsigned int api_type) unsigned int api_type)